[Tinyos-2-commits] CVS: tinyos-2.x/apps/tests/TestSimTimers TestTimerC.nc, 1.1, 1.2

Phil Levis scipio at users.sourceforge.net
Mon Apr 9 18:27:15 PDT 2007


Update of /cvsroot/tinyos/tinyos-2.x/apps/tests/TestSimTimers
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27331

Modified Files:
	TestTimerC.nc 
Log Message:
Don't trigger 0 length timers!


Index: TestTimerC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/apps/tests/TestSimTimers/TestTimerC.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestTimerC.nc	10 Apr 2007 01:23:13 -0000	1.1
--- TestTimerC.nc	10 Apr 2007 01:27:10 -0000	1.2
***************
*** 97,101 ****
      if (aTime & 0xff) {
        call A.stop();
!       aTime = call Random.rand32() & 0x3ff;
        call A.startPeriodic(aTime);
      }
--- 97,101 ----
      if (aTime & 0xff) {
        call A.stop();
!       aTime = 1 + (call Random.rand32() & 0x3ff);
        call A.startPeriodic(aTime);
      }
***************
*** 105,109 ****
      check('B', bStart, bTime);
      call B.stop();
!     bTime = call Random.rand32() & 0x3ff;
      call B.startPeriodic(bTime);
      bStart = sim_time();
--- 105,109 ----
      check('B', bStart, bTime);
      call B.stop();
!     bTime = 1 + (call Random.rand32() & 0x3ff);
      call B.startPeriodic(bTime);
      bStart = sim_time();
***************
*** 114,118 ****
      if (cTime & 0xff) {
        call C.stop();
!       cTime = call Random.rand32() & 0x3ff;
      }
      call C.startOneShot(cTime);
--- 114,118 ----
      if (cTime & 0xff) {
        call C.stop();
!       cTime = 1 + (call Random.rand32() & 0x3ff);
      }
      call C.startOneShot(cTime);
***************
*** 122,126 ****
    event void D.fired() {
      check('D', dStart, dTime);
!     dTime = call Random.rand32() & 0x3ff;
      call D.startOneShot(dTime);
      dStart = sim_time();
--- 122,126 ----
    event void D.fired() {
      check('D', dStart, dTime);
!     dTime = 1 + (call Random.rand32() & 0x3ff);
      call D.startOneShot(dTime);
      dStart = sim_time();



More information about the Tinyos-2-commits mailing list