[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/PowerMgmt PowerMgmtC.nc, 1.5, 1.6 PowerMgmtM.nc, 1.5, 1.6

[Gilman Tolle]

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

Modified Files:
	PowerMgmtC.nc PowerMgmtM.nc 
Log Message:
Added XSM Sounder to Deployer Response
Debug/Testing code for Drip and PowerMgmt
Cleanups

Added a copy of the most recent compiled XSM binary.



Index: PowerMgmtC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/PowerMgmt/PowerMgmtC.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PowerMgmtC.nc	26 Aug 2004 22:59:23 -0000	1.5
--- PowerMgmtC.nc	7 Sep 2004 22:15:39 -0000	1.6
***************
*** 20,23 ****
--- 20,24 ----
      HPLPowerManagementM as Power,
      LedsC as Leds,
+     SimpleTime,
      TimerC;
    
***************
*** 62,65 ****
--- 63,68 ----
    PowerMgmtM.PowerChangeTimer -> TimerC.Timer[unique("Timer")];
  
+   PowerMgmtM.Time -> SimpleTime.Time;
+ 
    PowerMgmtM.MA_LPLMode -> MgmtAttrsC.MgmtAttr[unique("MgmtAttr")];
  }

Index: PowerMgmtM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/PowerMgmt/PowerMgmtM.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PowerMgmtM.nc	26 Aug 2004 02:04:56 -0000	1.5
--- PowerMgmtM.nc	7 Sep 2004 22:15:39 -0000	1.6
***************
*** 31,34 ****
--- 31,36 ----
  
      interface Leds;
+ 
+     interface Time;
    }
  }
***************
*** 38,42 ****
    NamingMsg namingMsgCache;
    PowerMgmtCmdMsg cmdMsgCache;
!   
    command result_t StdControl.init() {
      call Drip.init(); (void) unique("Drip");
--- 40,49 ----
    NamingMsg namingMsgCache;
    PowerMgmtCmdMsg cmdMsgCache;
! 
! #ifdef DBG_POWERMGMT
!   uint32_t wakeupTime;
!   uint32_t sleepTime;
! #endif
! 
    command result_t StdControl.init() {
      call Drip.init(); (void) unique("Drip");
***************
*** 59,62 ****
--- 66,72 ----
    event TOS_MsgPtr Receive.receive(TOS_MsgPtr msg, void* payload, 
  				   uint16_t payloadLen) {
+ #ifdef DBG_POWERMGMT
+     tos_time_t theTime;
+ #endif
  
      NamingMsg *namingMsg = (NamingMsg *) payload;
***************
*** 72,75 ****
--- 82,89 ----
      switch (cmdMsg->powerMode) {
      case POWERMGMT_ON:
+ #ifdef DBG_POWERMGMT
+       theTime = call Time.get();
+       wakeupTime = theTime.low32;
+ #endif
        call Leds.redOn();
        call PowerDisable();
***************
*** 80,83 ****
--- 94,101 ----
        break;
      case POWERMGMT_SLEEP:
+ #ifdef DBG_POWERMGMT
+       theTime = call Time.get();
+       sleepTime = theTime.low32;
+ #endif
        call Leds.redOn();
        break;