From: adam <adam@megacz.com>
Date: Sat, 12 Apr 2008 13:00:37 +0000 (+0100)
Subject: re-arrange some code in Server.java
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=49ccc81fb344c902af2757d275a4c388f6527f0d;p=fleet.git

re-arrange some code in Server.java
---

diff --git a/src/edu/berkeley/fleet/fpga/Server.java b/src/edu/berkeley/fleet/fpga/Server.java
index 15aaa1b..ba311f1 100644
--- a/src/edu/berkeley/fleet/fpga/Server.java
+++ b/src/edu/berkeley/fleet/fpga/Server.java
@@ -75,9 +75,8 @@ public class Server {
                     this.sp = new RXTXPort("/dev/ttyS0");
                     sp.setInputBufferSize(0);
                     sp.setOutputBufferSize(0);
-                    sp.sendBreak(100);
-                    Thread.sleep(100);
-                    sp.sendBreak(100);
+                    sp.setSerialPortParams(9600, SerialPort.DATABITS_8, SerialPort.STOPBITS_1, SerialPort.PARITY_NONE);
+                    sp.setFlowControlMode(sp.FLOWCONTROL_RTSCTS_IN | sp.FLOWCONTROL_RTSCTS_OUT);
                     try {
                         _run();
                     } finally {
@@ -100,17 +99,20 @@ public class Server {
                 System.err.println("login string: " + sb.toString());
                 if (!sb.toString().startsWith(pass_string)) return;
 
-                //try { Thread.sleep(2000); } catch(Exception e) { }
+                //try { Thread.sleep(500); } catch(Exception e) { }
                 final OutputStream os = socket.getOutputStream();
-                System.err.println("sending instructions...");
 
-                sp.setSerialPortParams(9600, SerialPort.DATABITS_8, SerialPort.STOPBITS_1, SerialPort.PARITY_NONE);
-                sp.setFlowControlMode(sp.FLOWCONTROL_RTSCTS_IN | sp.FLOWCONTROL_RTSCTS_OUT);
+                System.out.println("sending breaks");
+                for(int i=0; i<2; i++) {
+                    sp.sendBreak(100);
+                    Thread.sleep(100);
+                }
+                System.out.println("done sending breaks");
+
                 final OutputStream fos = sp.getOutputStream();
                 final InputStream fis = sp.getInputStream();
-                while(fis.available() > 0)
-                    is.read();
 
+                System.err.println("sending instructions...");
                 new Thread() {
                     public void run() {
                         try {