summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormorganjm <morganjm@SEA-1850000576.ant.amazon.com>2012-10-20 14:32:00 -0700
committermorganjm <morganjm@SEA-1850000576.ant.amazon.com>2012-10-20 14:32:00 -0700
commite7d415df6d7e4ead4ed438e3b03f572be758fb8e (patch)
treeda2e1261ec8b943c4aa9fbb33b1b95152a83820a
parent3d8cd24d93d3ffc192751ecf38afac2144cbb768 (diff)
Fixes for SB5544 RouterHEADmaster
Added a delay between commands. Fixed reversed input/ouput in switch command.
-rw-r--r--.classpath2
-rw-r--r--src/net/tuschhcm/routercontrol/router/ShinyBow5544Router.java27
2 files changed, 25 insertions, 4 deletions
diff --git a/.classpath b/.classpath
index 39185dc..a0f6036 100644
--- a/.classpath
+++ b/.classpath
@@ -4,7 +4,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="lib" path="rxtx/RXTXcomm.jar">
<attributes>
- <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="RouterControl/rxtx"/>
+ <attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="router-control/rxtx"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin"/>
diff --git a/src/net/tuschhcm/routercontrol/router/ShinyBow5544Router.java b/src/net/tuschhcm/routercontrol/router/ShinyBow5544Router.java
index 17d9bd7..ef0e41e 100644
--- a/src/net/tuschhcm/routercontrol/router/ShinyBow5544Router.java
+++ b/src/net/tuschhcm/routercontrol/router/ShinyBow5544Router.java
@@ -10,7 +10,8 @@ import gnu.io.SerialPort;
*
*/
public class ShinyBow5544Router implements Router {
-
+ private static final int MSG_DELAY = 50;
+
private final SerialPort mSerialPort;
private final PrintStream mOut;
@@ -24,7 +25,7 @@ public class ShinyBow5544Router implements Router {
CommPortIdentifier portId = CommPortIdentifier.getPortIdentifier(portName);
// 9600 baud, 8 bit, no parity, 1 stop bit
- mSerialPort = (SerialPort) portId.open("routercontrol", 1000);
+ mSerialPort = (SerialPort) portId.open("routercontrol", 100);
mSerialPort.setSerialPortParams(9600,
SerialPort.DATABITS_8,
SerialPort.STOPBITS_1,
@@ -48,7 +49,13 @@ public class ShinyBow5544Router implements Router {
}
- mOut.format("SBI0%dO0%d", output, input);
+ mOut.format("SBI0%dO0%d", input, output);
+ try {
+ Thread.sleep(MSG_DELAY);
+
+ } catch (InterruptedException e) {
+ // ignore
+ }
}
@Override
@@ -59,6 +66,13 @@ public class ShinyBow5544Router implements Router {
} else {
mOut.print("SBSYSMOF");
}
+
+ try {
+ Thread.sleep(MSG_DELAY);
+
+ } catch (InterruptedException e) {
+ // ignore
+ }
}
@Override
@@ -69,6 +83,13 @@ public class ShinyBow5544Router implements Router {
} else {
mOut.print("SBSYSMUK");
}
+
+ try {
+ Thread.sleep(MSG_DELAY);
+
+ } catch (InterruptedException e) {
+ // ignore
+ }
}
@Override