From: gtolle <gtolle>
Date: Sat, 14 Apr 2007 00:35:07 +0000 (+0000)
Subject: Updated AntiTheft app to manually start dissemination. Not tested, but should compile.
X-Git-Tag: tinyos/2.0.1~49
X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=commitdiff_plain;h=2f4074d1cdeebc129285f8c568f83a83eec98d71

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 c41c5548..44f9ba81 100644
--- 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 031eee64..8696be00 100644
--- 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 f961ed96..f3f3c4a8 100644
--- 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 c86b2403..7a9a2630 100644
--- 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();
       }