Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / apps / tests / TestDip / TestDipP-Master.nc

diff --git a/apps/tests/TestDip/TestDipP-Master.nc b/apps/tests/TestDip/TestDipP-Master.nc
index e5404619d0dcd76681a59b2cea15dcb89708ddd8..ec3d7bebb860ae185c88245fd2488ab8c3675dd1 100644 (file)
--- a/apps/tests/TestDip/TestDipP-Master.nc
+++ b/apps/tests/TestDip/TestDipP-Master.nc
@@ -13,6 +13,7 @@ module TestDipP {
   uses interface Boot;
   uses interface AMSend as SerialSend;
   uses interface SplitControl as SerialControl;
+  uses interface SplitControl as AMControl;
 }
 
 implementation {
@@ -35,8 +36,20 @@ implementation {
   void bookkeep();
 
   event void SerialControl.startDone(error_t err) {
+    if(err != SUCCESS) {
+      call SerialControl.start();
+      return;
+    }
+    call AMControl.start();
+  }
+
+  event void AMControl.startDone(error_t err) {
+    if(err != SUCCESS) {
+      call AMControl.start();
+      return;
+    }
     call StdControl.start();
-    if(TOS_NODE_ID == 0) {
+    if(TOS_NODE_ID == 1) {
       data = 0xBEEF;
       dbg("TestDipP","Updating data items\n");
       /*
@@ -46,14 +59,14 @@ implementation {
     }
   }
   
-  event void SerialControl.stopDone(error_t err) {
-    
-  }
+  event void SerialControl.stopDone(error_t err) { }
+  event void AMControl.stopDone(error_t err) { }
 
   event void Boot.booted() {
     call SerialControl.start();
     dbg("TestDipP", "Booted at %s\n", sim_time_string());
   }
+
   /*
   event void DisseminationValue1.changed() {
     uint16_t val = *(uint16_t*) call DisseminationValue1.get();
@@ -70,7 +83,7 @@ implementation {
     if(count < newCount) {
       count++;
     }
-    dbg("TestDIPP", "Got an update, %u complete now at %s\n", count, sim_time_string());
+    dbg("TestDipP", "Got an update, %u complete now at %s\n", count, sim_time_string());
     call Leds.led0Toggle();
 
     dipTestMsgPtr = (dip_test_msg_t*) call SerialSend.getPayload(&testMsg, 0);
@@ -81,6 +94,7 @@ implementation {
     
 
     if(newCount == count) {
+      dbg("TestDipP","Dissemination COMPLETE!\n");
       call Leds.set(7);
     }