[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/DelugeMonitor DelugeControl.h, 1.7, 1.8 DelugeControlM.nc, 1.7, 1.8

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/DelugeMonitor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11704/DelugeMonitor

Modified Files:
	DelugeControl.h DelugeControlM.nc 
Log Message:
Changed the waiting period after receiving the sleep or reboot command before actually doing that to 65 seconds

Index: DelugeControl.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/DelugeMonitor/DelugeControl.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DelugeControl.h	6 Sep 2004 21:51:24 -0000	1.7
--- DelugeControl.h	7 Sep 2004 23:32:22 -0000	1.8
***************
*** 4,10 ****
  enum {
    AM_NETPROGCMDMSG = 3,
-   DELUGE_REBOOT_DELAY = 8192,
  };
  
  typedef struct NetProgCmdMsg {
    bool rebootNode:1;
--- 4,13 ----
  enum {
    AM_NETPROGCMDMSG = 3,
  };
  
+ #ifndef DELUGE_REBOOT_DELAY
+ #define DELUGE_REBOOT_DELAY 65535U
+ #endif
+ 
  typedef struct NetProgCmdMsg {
    bool rebootNode:1;

Index: DelugeControlM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/DelugeMonitor/DelugeControlM.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DelugeControlM.nc	26 Aug 2004 22:59:23 -0000	1.7
--- DelugeControlM.nc	7 Sep 2004 23:32:22 -0000	1.8
***************
*** 85,96 ****
        simpleReboot = TRUE;
        call Timer.stop();
!       call Timer.start(TIMER_ONE_SHOT, DELUGE_REBOOT_DELAY + 
! 		       call Random.rand() % (DELUGE_REBOOT_DELAY * 1));
      } else if (cmdMsg->runningImgNumChanged == TRUE) {
        simpleReboot = FALSE;
        runningImgNum = cmdMsg->runningImgNum;
        call Timer.stop();
!       call Timer.start(TIMER_ONE_SHOT, DELUGE_REBOOT_DELAY +
! 		       call Random.rand() % (DELUGE_REBOOT_DELAY * 2));
      }
  
--- 85,95 ----
        simpleReboot = TRUE;
        call Timer.stop();
!       call Timer.start(TIMER_ONE_SHOT, DELUGE_REBOOT_DELAY); 
!     
      } else if (cmdMsg->runningImgNumChanged == TRUE) {
        simpleReboot = FALSE;
        runningImgNum = cmdMsg->runningImgNum;
        call Timer.stop();
!       call Timer.start(TIMER_ONE_SHOT, DELUGE_REBOOT_DELAY);
      }