Merge TinyOS 2.1.1 into master.

[tinyos-2.x.git] / apps / tests / TestTrickleTimer / TestTrickleTimerAppP.nc

diff --git a/apps/tests/TestTrickleTimer/TestTrickleTimerAppP.nc b/apps/tests/TestTrickleTimer/TestTrickleTimerAppP.nc
index 35d872776fefd52ce0b7e3e5909bdac41a21a70d..0b456e97365ecd934a7b9549b4eb83b82a8ca8d4 100644 (file)
--- a/apps/tests/TestTrickleTimer/TestTrickleTimerAppP.nc
+++ b/apps/tests/TestTrickleTimer/TestTrickleTimerAppP.nc
@@ -36,6 +36,7 @@ module TestTrickleTimerAppP {
     interface TrickleTimer as TimerB;
     interface TrickleTimer as TimerC;
     interface TrickleTimer as TimerD;
+    interface Random;
   }
 }
 implementation {
@@ -82,17 +83,17 @@ implementation {
     }
   }
 
-  uint8_t i = 0;
+  uint16_t i = 0;
   event void TimerD.fired() {
     dbg("TestTrickle", "Timer D fired at %s\n", sim_time_string());
-    i++;
-    i = i % 3;
+    i = call Random.rand16();
+    i = i % 4;
     switch (i) {
     case 0:
-      //      call TimerA.reset();
+      call TimerA.reset();
       break;
     case 1:
-      //      call TimerB.reset();
+      call TimerB.reset();
       break;
     case 2:
       call TimerC.reset();