[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/rf230/RadioCountToDiag RadioCountToDiagC.nc, 1.1, 1.2 RadioCountToDiagP.nc, 1.1, 1.2

[Miklos Maroti]

Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/rf230/RadioCountToDiag
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8305/apps/tests/rf230/RadioCountToDiag

Modified Files:
	RadioCountToDiagC.nc RadioCountToDiagP.nc 
Log Message:
add LPL tests and remove bad TX check from RF230LayerP

Index: RadioCountToDiagC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/rf230/RadioCountToDiag/RadioCountToDiagC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RadioCountToDiagC.nc	7 May 2008 20:42:45 -0000	1.1
--- RadioCountToDiagC.nc	8 May 2008 21:31:13 -0000	1.2
***************
*** 49,51 ****
--- 49,53 ----
  	components ActiveMessageAddressC;
  	RadioCountToDiagP.ActiveMessageAddress -> ActiveMessageAddressC;
+ 
+ 	RadioCountToDiagP.LowPowerListening -> ActiveMessageC;
  }

Index: RadioCountToDiagP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/rf230/RadioCountToDiag/RadioCountToDiagP.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RadioCountToDiagP.nc	7 May 2008 20:42:45 -0000	1.1
--- RadioCountToDiagP.nc	8 May 2008 21:31:13 -0000	1.2
***************
*** 42,45 ****
--- 42,46 ----
  
  		interface ActiveMessageAddress;
+ 		interface LowPowerListening;
  	}
  }
***************
*** 49,52 ****
--- 50,57 ----
  #endif
  
+ #ifndef SLEEP_INTERVAL
+ #define SLEEP_INTERVAL	50
+ #endif
+ 
  implementation
  {
***************
*** 63,66 ****
--- 68,74 ----
  		else
  		{
+ #ifdef LOW_POWER_LISTENING
+ 			call LowPowerListening.setLocalSleepInterval(SLEEP_INTERVAL);
+ #endif		
  			call SendTimer.startPeriodic(SEND_PERIOD);
  			call ReportTimer.startPeriodic(1000);
***************
*** 100,104 ****
  
  	uint32_t sendCount;
- 	uint32_t sendError;
  	uint32_t sendDoneSuccess;
  	uint32_t sendDoneError;
--- 108,111 ----
***************
*** 113,117 ****
  		{
  			call DiagMsg.uint16(sendCount);
- 			call DiagMsg.uint16(sendError);
  			call DiagMsg.uint16(sendDoneSuccess);
  			call DiagMsg.uint16(sendDoneError);
--- 120,123 ----
***************
*** 138,141 ****
--- 144,150 ----
  		call Packet.clear(&txMsg);
  		call PacketAcknowledgements.requestAck(&txMsg);
+ #ifdef LOW_POWER_LISTENING
+ 		call LowPowerListening.setRxSleepInterval(&txMsg, SLEEP_INTERVAL);
+ #endif
  
  		addr = call ActiveMessageAddress.amAddress();
***************
*** 149,154 ****
  		if( call AMSend.send(addr, &txMsg, sizeof(ping_t)) == SUCCESS )
  			++sendCount;
- 		else
- 			++sendError;
  	}
  
--- 158,161 ----