Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / apps / tutorials / LowPowerSensing / Sampler / LowPowerSensingPeriodicSamplerC.nc

diff --git a/apps/tutorials/LowPowerSensing/Sampler/LowPowerSensingPeriodicSamplerC.nc b/apps/tutorials/LowPowerSensing/Sampler/LowPowerSensingPeriodicSamplerC.nc
index 17a1b1efca03166275e445b4d63a947d44e6016e..2ebdd544632fabedebf796ebad97fc8e68c589ad 100644 (file)
--- a/apps/tutorials/LowPowerSensing/Sampler/LowPowerSensingPeriodicSamplerC.nc
+++ b/apps/tutorials/LowPowerSensing/Sampler/LowPowerSensingPeriodicSamplerC.nc
@@ -68,7 +68,7 @@ implementation {
   }
   
   void sendSampleMsg() {
-    call LPL.setRxSleepInterval(&sample_msg, 0);
+    call LPL.setRemoteWakeupInterval(&sample_msg, 0);
     if(call SampleSend.send(BASE_STATION_ADDR, &sample_msg, sizeof(nx_sensor_sample_t)) != SUCCESS)
       post sendSampleMsgTask();
     else call Leds.led2On();
@@ -78,7 +78,7 @@ implementation {
   task void sendSampleMsgTask() { sendSampleMsg(); }
        
   event void Boot.booted() {
-    call LPL.setLocalSleepInterval(LPL_INTERVAL);
+    call LPL.setLocalWakeupInterval(LPL_INTERVAL);
     call AMControl.start();
   }
   
@@ -92,7 +92,7 @@ implementation {
   
   event void SampleLogRead.readDone(sensor_sample_t* sample, error_t error) {
     if(error == SUCCESS) {
-      nx_sensor_sample_t* nx_sample = call SampleSend.getPayload(&sample_msg);
+      nx_sensor_sample_t* nx_sample = call SampleSend.getPayload(&sample_msg, sizeof(nx_sample));
       call SampleNxConverter.copyToNx(nx_sample, sample);
       sendSampleMsg();
     }