[Tinyos-2-commits] CVS: tinyos-2.x/support/sdk/java/net/tinyos/tools ListenRaw.java, 1.1.2.3, 1.1.2.4

[Phil Levis]

Update of /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/tools
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13303/net/tinyos/tools

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	ListenRaw.java 
Log Message:
Fixed packetizer issues in tinyos.jar (rebuilt with new serial parameters),
added micaz and telos options to ListenRaw, adding Makefile for sim/.
Also, modified toplevel makefile so that it does packet -> message -> sf,
then everything else. The problem is that message depends on packet classes,
and those classes depend on a mig-generated file. Java doesn't know how
to generate the file, so complains.


Index: ListenRaw.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/support/sdk/java/net/tinyos/tools/Attic/ListenRaw.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -d -r1.1.2.3 -r1.1.2.4
*** ListenRaw.java	26 Jul 2005 20:31:00 -0000	1.1.2.3
--- ListenRaw.java	29 Jun 2006 18:34:41 -0000	1.1.2.4
***************
*** 51,55 ****
  public class ListenRaw {
      private static String CLASS_NAME = "net.tinyos.tools.ListenRaw";
!     private static final int MAX_MSG_SIZE = 36;
      private static final int PORT_SPEED_MICA2 = 57600;
      private static final int PORT_SPEED_MICA2DOT = 19200;
--- 51,57 ----
  public class ListenRaw {
      private static String CLASS_NAME = "net.tinyos.tools.ListenRaw";
!     private static final int MAX_MSG_SIZE = 40;
!     private static final int PORT_SPEED_TELOS = 115200;
!     private static final int PORT_SPEED_MICAZ = 57600;
      private static final int PORT_SPEED_MICA2 = 57600;
      private static final int PORT_SPEED_MICA2DOT = 19200;
***************
*** 79,83 ****
  	//port.setFlowControlMode(SerialPort.FLOWCONTROL_NONE);
  	// These are the mote UART parameters
! 	port.setSerialPortParams(portSpeed, 8, 1, false);
  	printPortStatus();
  	System.out.println();
--- 81,85 ----
  	//port.setFlowControlMode(SerialPort.FLOWCONTROL_NONE);
  	// These are the mote UART parameters
! 	port.setSerialPortParams(portSpeed, 8, SerialPort.STOPBITS_1, false);
  	printPortStatus();
  	System.out.println();
***************
*** 109,112 ****
--- 111,116 ----
  	System.err.println("  -h, --help:    usage help");
  	System.err.println("  -p:            print available ports");
+ 	System.err.println("  -telos:        Telos ("+PORT_SPEED_TELOS+" bps) [default]");
+ 	System.err.println("  -micaz:        Mica2 ("+PORT_SPEED_MICAZ+" bps) [default]");
  	System.err.println("  -mica2:        Mica2 ("+PORT_SPEED_MICA2+" bps) [default]");
  	System.err.println("  -mica2dot:        Mica2Dot ("+PORT_SPEED_MICA2DOT+" bps)");
***************
*** 128,131 ****
--- 132,141 ----
  		printUsage();
  	    }
+ 	    if (args[i].equals("-telos")) {
+ 	        speed = PORT_SPEED_TELOS;
+ 	    }
+ 	    if (args[i].equals("-micaz")) {
+ 	        speed = PORT_SPEED_MICAZ;
+ 	    }
  	    if (args[i].equals("-mica2")) {
  	        speed = PORT_SPEED_MICA2;