[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/PowerMgmt PowerMgmt.h, 1.3, 1.4 PowerMgmtM.nc, 1.6, 1.7

[Gilman Tolle]

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

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

Index: PowerMgmt.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/PowerMgmt/PowerMgmt.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PowerMgmt.h	6 Sep 2004 21:51:25 -0000	1.3
--- PowerMgmt.h	7 Sep 2004 23:32:22 -0000	1.4
***************
*** 22,25 ****
--- 22,29 ----
  };
  
+ #ifndef LPL_SLEEP_DELAY
+ #define LPL_SLEEP_DELAY 65535U
+ #endif
+ 
  enum {
    CC1K_FPL = 0,

Index: PowerMgmtM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/PowerMgmt/PowerMgmtM.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PowerMgmtM.nc	7 Sep 2004 22:15:39 -0000	1.6
--- PowerMgmtM.nc	7 Sep 2004 23:32:22 -0000	1.7
***************
*** 90,93 ****
--- 90,94 ----
        call softStart();
        call ComponentControl.start();
+       call PowerChangeTimer.start(TIMER_ONE_SHOT, LPL_CHANGE_DELAY);
        break;
      case POWERMGMT_LPL:
***************
*** 98,102 ****
        sleepTime = theTime.low32;
  #endif
!       call Leds.redOn();
        break;
      case POWERMGMT_HIBERNATE:
--- 99,104 ----
        sleepTime = theTime.low32;
  #endif
! //      call Leds.redOn();
!       call PowerChangeTimer.start(TIMER_ONE_SHOT, LPL_SLEEP_DELAY);
        break;
      case POWERMGMT_HIBERNATE:
***************
*** 110,115 ****
      }
  
-     call PowerChangeTimer.start(TIMER_ONE_SHOT, LPL_CHANGE_DELAY);
- 
      return msg;
    }
--- 112,115 ----