added shimmer baud rate alias, updated makefiles to force mig

diff --git a/support/sdk/java/net/tinyos/message/Makefile b/support/sdk/java/net/tinyos/message/Makefile
index 567cd7a10aecb5fe89d1045da896373e7d4f221e..291c73e010a18469a01ae8645d5fbe15e0542fff 100644 (file)
--- a/support/sdk/java/net/tinyos/message/Makefile
+++ b/support/sdk/java/net/tinyos/message/Makefile
@@ -1,6 +1,6 @@
-# Top-level Makefile for tools/java 
+# Top-level Makefile for tools/java
 
-INITIAL_TARGETS = SerialPacket.class
+INITIAL_TARGETS = SerialPacket.class SerialPacket.java
 
 ROOT = ../../..
 include $(ROOT)/Makefile.include
@@ -8,5 +8,5 @@ include $(ROOT)/Makefile.include
 TOS=$(shell ncc -print-tosdir)
 SERIAL_H = $(TOSDIR)/lib/serial/Serial.h
 
-SerialPacket.java: $(SERIAL_H)
+SerialPacket.java: $(SERIAL_H) FORCE
        mig -o $@ -java-classname=net.tinyos.message.SerialPacket java $(SERIAL_H) serial_packet -I$(TOSDIR)/types

diff --git a/support/sdk/java/net/tinyos/packet/BaudRate.java b/support/sdk/java/net/tinyos/packet/BaudRate.java
index 0217961c4dac059b97d621703fcf487d78b53f5b..1cab50f87943b94e1f592c6f46c384e4d9f242c7 100644 (file)
--- a/support/sdk/java/net/tinyos/packet/BaudRate.java
+++ b/support/sdk/java/net/tinyos/packet/BaudRate.java
@@ -21,5 +21,6 @@ class BaudRate {
        Platform.add(Platform.x, "eyesIFX",       57600);
        Platform.add(Platform.x, "intelmote2", 115200);
        Platform.add(Platform.x, "iris",      57600);
+       Platform.add(Platform.x, "shimmer",      115200);
     }
 }

diff --git a/support/sdk/java/net/tinyos/tools/ListenRaw.java b/support/sdk/java/net/tinyos/tools/ListenRaw.java
index a8a4953c20680553acbd9ba75334192e0e064585..95d6076a7a76bf57ad5c38c0a74f69cb084ff2de 100644 (file)
--- a/support/sdk/java/net/tinyos/tools/ListenRaw.java
+++ b/support/sdk/java/net/tinyos/tools/ListenRaw.java
@@ -58,6 +58,7 @@ public class ListenRaw {
     private static final int PORT_SPEED_MICA = 19200;
     private static final int PORT_SPEED_RENE = 19200;
     private static final int PORT_SPEED_IRIS = 57600;
+    private static final int PORT_SPEED_SHIMMER = 115200;
     private static final int LENGTH_OFFSET = 4;
     private int packetLength;
     private int portSpeed;
@@ -111,13 +112,14 @@ public class ListenRaw {
        System.err.println("options are:");
        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("  -telos:        Telos ("+PORT_SPEED_TELOS+" bps)");
        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)");
+       System.err.println("  -mica2dot:     Mica2Dot ("+PORT_SPEED_MICA2DOT+" bps)");
        System.err.println("  -mica:         Mica ("+PORT_SPEED_MICA+" bps)");
        System.err.println("  -rene:         Rene ("+PORT_SPEED_RENE+" bps)");
        System.err.println("  -iris:         Iris ("+PORT_SPEED_IRIS+" bps) [default]");
+       System.err.println("  -shimmer:      Shimmer ("+PORT_SPEED_SHIMMER+" bps)");
        System.exit(-1);
     }
 
@@ -154,6 +156,9 @@ public class ListenRaw {
            if (args[i].equals("-iris")) {
                speed = PORT_SPEED_IRIS;
            }
+           if (args[i].equals("-shimmer")) {
+               speed = PORT_SPEED_SHIMMER;
+           }
        }
 
        if (args[args.length - 1].charAt(0) == '-') {

diff --git a/support/sdk/java/net/tinyos/tools/Makefile b/support/sdk/java/net/tinyos/tools/Makefile
index 7caa0c866c0ca004c95bf9bff25a8e613eadfe79..f9dd844311f6bd7574dc7904ebcd203a237968ef 100644 (file)
--- a/support/sdk/java/net/tinyos/tools/Makefile
+++ b/support/sdk/java/net/tinyos/tools/Makefile
@@ -5,13 +5,13 @@
 # @author  TinyOS Team
 #
 
-INITIAL_TARGETS = PrintfMsg.class
+INITIAL_TARGETS = PrintfMsg.class PrintfMsg.java
 
 ROOT = ../../..
 include $(ROOT)/Makefile.include
 
 PRINTF_H = $(TOSDIR)/lib/printf/printf.h
 
-PrintfMsg.java: $(PRINTF_H)
+PrintfMsg.java: $(PRINTF_H) FORCE
        mig java $(CFLAGS) -java-classname=net.tinyos.tools.PrintfMsg $(PRINTF_H) printf_msg -o $@