Updated AntiTheft app to manually start dissemination. Not tested, but should compile.

diff --git a/apps/AntiTheft/Nodes/AntiTheftAppC.nc b/apps/AntiTheft/Nodes/AntiTheftAppC.nc
index c41c554838d6d6ff641f9121b5aec54f364bcc35..44f9ba8162c4b6cbfd1f595cfedbd398bd583544 100644 (file)
--- a/apps/AntiTheft/Nodes/AntiTheftAppC.nc
+++ b/apps/AntiTheft/Nodes/AntiTheftAppC.nc
@@ -46,9 +46,11 @@ implementation
   AntiTheftC.ReadStream -> AccelXStreamC;
   AntiTheftC.Mts300Sounder -> SounderC;
 
-  /* Instantiate and wire our settings dissemination service */
-  components new DisseminatorC(settings_t, DIS_SETTINGS),
+  components DisseminationC;
+  AntiTheftC.DisseminationControl -> DisseminationC;
 
+  /* Instantiate and wire our settings dissemination service */
+  components new DisseminatorC(settings_t, DIS_SETTINGS);
   AntiTheftC.SettingsValue -> DisseminatorC;
 
   /* Instantiate and wire our collection service for theft alerts */

diff --git a/apps/AntiTheft/Nodes/AntiTheftC.nc b/apps/AntiTheft/Nodes/AntiTheftC.nc
index 031eee64bc35f63db402ab3630a7049d0e24ade0..8696be00e094e332c7102c47b7b619bf02578151 100644 (file)
--- a/apps/AntiTheft/Nodes/AntiTheftC.nc
+++ b/apps/AntiTheft/Nodes/AntiTheftC.nc
@@ -25,6 +25,7 @@ module AntiTheftC
     interface DisseminationValue<settings_t> as SettingsValue;
     interface Send as AlertRoot;
     interface StdControl as CollectionControl;
+    interface StdControl as DisseminationControl;
     interface SplitControl as RadioControl;
     interface LowPowerListening;
     interface AMSend as TheftSend;
@@ -138,6 +139,7 @@ implementation
   event void RadioControl.startDone(error_t ok) {
     if (ok == SUCCESS)
       {
+       call DisseminationControl.start();
        call CollectionControl.start();
        call LowPowerListening.setLocalDutyCycle(200);
       }

diff --git a/apps/AntiTheft/Root/AntiTheftRootAppC.nc b/apps/AntiTheft/Root/AntiTheftRootAppC.nc
index f961ed966353d886ee9011bcffbde09586df4d42..f3f3c4a8c4be4d9c430f43455fe74b08a7386d2c 100644 (file)
--- a/apps/AntiTheft/Root/AntiTheftRootAppC.nc
+++ b/apps/AntiTheft/Root/AntiTheftRootAppC.nc
@@ -38,6 +38,8 @@ implementation
   AntiTheftRootC.LowPowerListening -> Radio;
   AntiTheftRootC.Leds -> LedsC;
 
+  components DisseminationC;
+  AntiTheftRootC.DisseminationControl -> DisseminationC;
   /* Next, instantiate and wire a disseminator (to send settings) and a
      serial receiver (to receive settings from the PC) */
   components new DisseminatorC(settings_t, DIS_SETTINGS),

diff --git a/apps/AntiTheft/Root/AntiTheftRootC.nc b/apps/AntiTheft/Root/AntiTheftRootC.nc
index c86b240395221cf558e2686ee5b9d1ec08f3f198..7a9a2630a5f1943de48676fb9dd22847e2bb3cbc 100644 (file)
--- a/apps/AntiTheft/Root/AntiTheftRootC.nc
+++ b/apps/AntiTheft/Root/AntiTheftRootC.nc
@@ -29,6 +29,7 @@ module AntiTheftRootC
     interface Receive as SettingsReceive;
 
     interface StdControl as CollectionControl;
+    interface StdControl as DisseminationControl;
     interface RootControl;
     interface Receive as AlertsReceive;
     interface AMSend as AlertsForward;
@@ -55,6 +56,7 @@ implementation
     if (error == SUCCESS)
       {
        call LowPowerListening.setLocalDutyCycle(200);
+       call DisseminationControl.start();
        call CollectionControl.start();
        call RootControl.setRoot();
       }