[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/java/net/tinyos/deluge DelugeControl.java, 1.6, 1.6.2.1

[Gilman Tolle]

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

Modified Files:
      Tag: xsm-release-2004-09-20-fixes
	DelugeControl.java 
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.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/java/net/tinyos/deluge/DelugeControl.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -d -r1.6 -r1.6.2.1
*** DelugeControl.java	26 Aug 2004 23:45:53 -0000	1.6
--- DelugeControl.java	24 Sep 2004 04:05:04 -0000	1.6.2.1
***************
*** 60,63 ****
--- 60,65 ----
        if (((String)cleanedArgs.get(i)).equals("reboot")) {
  	command = "reboot";
+       } else if (((String)cleanedArgs.get(i)).equals("grenade")) {
+ 	command = "grenade";
        } else if (((String)cleanedArgs.get(i)).equals("reprogram")) {
  	command = "reprogram";
***************
*** 77,85 ****
  
    private void usage() {
!       System.out.println("java DelugeControl [OPTIONS]... {reboot, reprogram <id>}");
        System.err.println("  --id <node ID> : send command to a specific node");
        System.err.println("  --ttl <hop count> : limit number of hops");
        System.out.println("  --group <group ID> : send command to specific group");
        System.out.println("NOTE: \"reprogram factory\" will load the factory image");
        System.exit(1);
    }
--- 79,88 ----
  
    private void usage() {
!       System.out.println("java DelugeControl [OPTIONS]... {reboot, grenade, reprogram <id>}");
        System.err.println("  --id <node ID> : send command to a specific node");
        System.err.println("  --ttl <hop count> : limit number of hops");
        System.out.println("  --group <group ID> : send command to specific group");
        System.out.println("NOTE: \"reprogram factory\" will load the factory image");
+       System.out.println("NOTE: \"grenade\" will fire the grenade timer on the XSM, which will load the factory image");
        System.exit(1);
    }
***************
*** 118,121 ****
--- 121,126 ----
      if (command.equals("reboot")) {
        dcMsg.set_rebootNode((byte)1);
+     } else if (command.equals("grenade")) {
+       dcMsg.set_fireGrenade((byte)1);
      } else if (command.equals("reprogram")) {
        dcMsg.set_runningImgNumChanged((byte)1);