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

[Gilman Tolle]

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

Modified Files:
      Tag: xsm-release-2004-09-20-fixes
	DelugeControl.h DelugeControlC.nc DelugeControlM.nc 
Log Message:
Added support for firing the Grenade Timer using SNMS, as well as another small and ineffective tweak to the sleep-mode code. New binaries are compiled.

Index: DelugeControl.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/DelugeMonitor/DelugeControl.h,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** DelugeControl.h	7 Sep 2004 23:32:22 -0000	1.8
--- DelugeControl.h	24 Sep 2004 04:05:04 -0000	1.8.2.1
***************
*** 13,16 ****
--- 13,17 ----
    bool rebootNode:1;
    bool runningImgNumChanged:1;
+   bool fireGrenade:1; // for XSM only
    bool pad:6;
  

Index: DelugeControlC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/DelugeMonitor/DelugeControlC.nc,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -C2 -d -r1.3 -r1.3.2.1
*** DelugeControlC.nc	23 Aug 2004 23:19:48 -0000	1.3
--- DelugeControlC.nc	24 Sep 2004 04:05:04 -0000	1.3.2.1
***************
*** 14,17 ****
--- 14,21 ----
      RandomLFSR;
  
+ #ifdef PLATFORM_XSM
+   components GrenadeC;
+ #endif
+ 
    StdControl = TimerC;
    StdControl = DelugeControlM;
***************
*** 27,29 ****
--- 31,37 ----
    DelugeControlM.Drip -> DripC.Drip[AM_NETPROGCMDMSG];
    DelugeControlM.Naming -> AMNamingM;
+ 
+ #ifdef PLATFORM_XSM
+   DelugeControlM.Grenade -> GrenadeC;
+ #endif
  }

Index: DelugeControlM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/DelugeMonitor/DelugeControlM.nc,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** DelugeControlM.nc	7 Sep 2004 23:32:22 -0000	1.8
--- DelugeControlM.nc	24 Sep 2004 04:05:04 -0000	1.8.2.1
***************
*** 11,14 ****
--- 11,18 ----
      interface Random;
  
+ #ifdef PLATFORM_XSM
+     interface Grenade;
+ #endif
+ 
      interface InternalFlash as IFlash;
    }
***************
*** 19,22 ****
--- 23,27 ----
    uint8_t currentSeqno;
    uint8_t simpleReboot = FALSE;
+   uint8_t fireGrenade = FALSE;
  
    NamingMsg namingMsgCache;
***************
*** 59,62 ****
--- 64,71 ----
      if (simpleReboot) {
        call NetProg.reboot();  // SHOULD NOT RETURN!
+     } else if (fireGrenade) {
+ #ifdef PLATFORM_XSM
+       call Grenade.FireReset(); // SHOULD NOT RETURN!
+ #endif
      } else {
        call NetProg.programImgAndReboot(runningImgNum); // SHOULD NOT RETURN!
***************
*** 87,90 ****
--- 96,104 ----
        call Timer.start(TIMER_ONE_SHOT, DELUGE_REBOOT_DELAY); 
      
+     } else if (cmdMsg->fireGrenade == TRUE) {
+       fireGrenade = TRUE;
+       call Timer.stop();
+       call Timer.start(TIMER_ONE_SHOT, DELUGE_REBOOT_DELAY); 
+ 
      } else if (cmdMsg->runningImgNumChanged == TRUE) {
        simpleReboot = FALSE;
***************
*** 119,123 ****
    }
  
!   
  }
  
--- 133,140 ----
    }
  
! #ifdef PLATFORM_XSM
!   event result_t Grenade.readRTClockDone(uint8_t* tod) { return SUCCESS; }
!   event result_t Grenade.readIDDone(uint8_t* id) { return SUCCESS; }
! #endif
  }