[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/diku/evb13192/apps/TestTosRadioStack TestTosRadioStack.nc, 1.3, 1.4 TestTosRadioStackM.nc, 1.10, 1.11

[Jan Flora]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/apps/TestTosRadioStack
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12501/apps/TestTosRadioStack

Modified Files:
	TestTosRadioStack.nc TestTosRadioStackM.nc 
Log Message:
application updates

Index: TestTosRadioStack.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/apps/TestTosRadioStack/TestTosRadioStack.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TestTosRadioStack.nc	2 Dec 2005 15:58:31 -0000	1.3
--- TestTosRadioStack.nc	23 Aug 2006 09:41:13 -0000	1.4
***************
*** 13,28 ****
  	           mc13192DataM,
  	           HPLSPIM as McuSPI,
  	           ConsoleC;
  
  	Main.StdControl -> McuSPI.StdControl;
  	Main.StdControl -> RadioCRCPacketC.Control;
! 	Main.StdControl -> ConsoleC.StdControl;	
  	Main.StdControl -> SingleTimer.StdControl;
  	//Main.StdControl -> GenericComm.Control;
  	Main.StdControl -> TestTosRadioStackM.StdControl;
  	TestTosRadioStackM.Timer -> SingleTimer.Timer;
  	TestTosRadioStackM.Leds -> LedsC;
  	//TestTosRadioStackM.Send -> GenericComm.SendMsg[60];
  	//TestTosRadioStackM.Receive -> GenericComm.ReceiveMsg[60];
  	TestTosRadioStackM.ConsoleOut -> ConsoleC.ConsoleOut;
  
--- 13,33 ----
  	           mc13192DataM,
  	           HPLSPIM as McuSPI,
+ 	           ConsoleDebugM,
  	           ConsoleC;
  
  	Main.StdControl -> McuSPI.StdControl;
  	Main.StdControl -> RadioCRCPacketC.Control;
! 	Main.StdControl -> ConsoleC.StdControl;
  	Main.StdControl -> SingleTimer.StdControl;
  	//Main.StdControl -> GenericComm.Control;
  	Main.StdControl -> TestTosRadioStackM.StdControl;
+ 
  	TestTosRadioStackM.Timer -> SingleTimer.Timer;
  	TestTosRadioStackM.Leds -> LedsC;
  	//TestTosRadioStackM.Send -> GenericComm.SendMsg[60];
  	//TestTosRadioStackM.Receive -> GenericComm.ReceiveMsg[60];
+ 
+ 	// Wire debug module.
+ 	ConsoleDebugM.ConsoleOut -> ConsoleC.ConsoleOut;
  	TestTosRadioStackM.ConsoleOut -> ConsoleC.ConsoleOut;
  
***************
*** 34,37 ****
--- 39,44 ----
  
  	RadioCRCPacketC.SPI -> McuSPI.SPI;
+ 	RadioCRCPacketC.Debug -> ConsoleDebugM.Debug;
+ 	RadioCRCPacketC.ConsoleOut -> ConsoleC.ConsoleOut;
  	McuSPI.Leds -> LedsC;
  }

Index: TestTosRadioStackM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/diku/evb13192/apps/TestTosRadioStack/TestTosRadioStackM.nc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** TestTosRadioStackM.nc	19 Jan 2006 16:18:32 -0000	1.10
--- TestTosRadioStackM.nc	23 Aug 2006 09:41:13 -0000	1.11
***************
*** 53,57 ****
  		//transmitPacket();
  		call RadioControl.setChannel(0);
! 		call RadioControl.setTimerPrescale(0);
  		bufLen = 0;
  /*		call ConsoleOut.print("Chip Set Mask Id is: 0x");
--- 53,57 ----
  		//transmitPacket();
  		call RadioControl.setChannel(0);
! 		call RadioControl.setTimerPrescale(5);
  		bufLen = 0;
  /*		call ConsoleOut.print("Chip Set Mask Id is: 0x");
***************
*** 65,70 ****
  		call ConsoleOut.print("\n");*/
  		
  		//call Timer.start(TIMER_ONE_SHOT, 1000);
! 		post edTask();
  		return SUCCESS;
  	}
--- 65,71 ----
  		call ConsoleOut.print("\n");*/
  		
+ 		transmitPacket();
  		//call Timer.start(TIMER_ONE_SHOT, 1000);
! 		//post edTask();
  		return SUCCESS;
  	}