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

[Kristin Wright]

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

Modified Files:
      Tag: tos-1-1-8-candidate
	DelugeControl.h DelugeControlM.nc 
Log Message:
merge with trunk using the tos-1-1-8-postbugfix trunk snapshot

Index: DelugeControl.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/DelugeMonitor/DelugeControl.h,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -d -r1.8 -r1.8.4.1
*** DelugeControl.h	7 Sep 2004 23:32:22 -0000	1.8
--- DelugeControl.h	11 Nov 2004 13:43:25 -0000	1.8.4.1
***************
*** 16,19 ****
--- 16,20 ----
  
    uint8_t runningImgNum;
+   uint16_t rebootDelay;
  } NetProgCmdMsg;
  

Index: DelugeControlM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/DelugeMonitor/DelugeControlM.nc,v
retrieving revision 1.8
retrieving revision 1.8.4.1
diff -C2 -d -r1.8 -r1.8.4.1
*** DelugeControlM.nc	7 Sep 2004 23:32:22 -0000	1.8
--- DelugeControlM.nc	11 Nov 2004 13:43:25 -0000	1.8.4.1
***************
*** 85,89 ****
        simpleReboot = TRUE;
        call Timer.stop();
!       call Timer.start(TIMER_ONE_SHOT, DELUGE_REBOOT_DELAY); 
      
      } else if (cmdMsg->runningImgNumChanged == TRUE) {
--- 85,91 ----
        simpleReboot = TRUE;
        call Timer.stop();
!       call Timer.start(TIMER_ONE_SHOT, 
! 		       (cmdMsg->rebootDelay == 0 ? DELUGE_REBOOT_DELAY : 
! 			cmdMsg->rebootDelay));
      
      } else if (cmdMsg->runningImgNumChanged == TRUE) {
***************
*** 91,95 ****
        runningImgNum = cmdMsg->runningImgNum;
        call Timer.stop();
!       call Timer.start(TIMER_ONE_SHOT, DELUGE_REBOOT_DELAY);
      }
  
--- 93,99 ----
        runningImgNum = cmdMsg->runningImgNum;
        call Timer.stop();
!       call Timer.start(TIMER_ONE_SHOT, 
! 		       (cmdMsg->rebootDelay == 0 ? DELUGE_REBOOT_DELAY : 
! 			cmdMsg->rebootDelay));
      }