Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / apps / AntiTheft / Nodes / AntiTheftC.nc

diff --git a/apps/AntiTheft/Nodes/AntiTheftC.nc b/apps/AntiTheft/Nodes/AntiTheftC.nc
index 8696be00e094e332c7102c47b7b619bf02578151..3d502a929713062d388d1dd524f5501483391feb 100644 (file)
--- a/apps/AntiTheft/Nodes/AntiTheftC.nc
+++ b/apps/AntiTheft/Nodes/AntiTheftC.nc
@@ -13,6 +13,8 @@
  *
  * @author David Gay
  */
+#include "antitheft.h"
+
 module AntiTheftC
 {
   uses {
@@ -36,7 +38,7 @@ implementation
 {
   enum {
     /* Threshold for considering mote in a dark place */
-    DARK_THRESHOLD = 200, 
+    DARK_THRESHOLD = 600, 
 
     /* Amount of time warning leds should stay on (in checkInterval counts) */
     WARNING_TIME = 3,
@@ -103,11 +105,12 @@ implementation
        /* Report the identity of this node, using the collection protocol */
 
        /* Get the payload part of alertMsg and fill in our data */
-       alert_t *newAlert = call AlertRoot.getPayload(&alertMsg);
-       newAlert->stolenId = TOS_NODE_ID;
-
-       /* and send it... */
-       check(call AlertRoot.send(&alertMsg, sizeof *newAlert));
+       alert_t *newAlert = call AlertRoot.getPayload(&alertMsg, sizeof(alert_t));
+       if (newAlert != NULL) {
+         newAlert->stolenId = TOS_NODE_ID;
+         /* and send it... */
+         check(call AlertRoot.send(&alertMsg, sizeof *newAlert));
+       }
       }
   }
 
@@ -135,13 +138,13 @@ implementation
   }
 
   /* Radio started. Now start the collection protocol and set the
-     radio to a 2% low-power-listening duty cycle */
+     wakeup interval for low-power-listening wakeup to half a second. */
   event void RadioControl.startDone(error_t ok) {
     if (ok == SUCCESS)
       {
        call DisseminationControl.start();
        call CollectionControl.start();
-       call LowPowerListening.setLocalDutyCycle(200);
+       call LowPowerListening.setLocalWakeupInterval(512);
       }
     else
       errorLed();