From 8dec96edbb5df3be41af0dcb3f63d37a7f8fa53b Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 27 Feb 2006 10:36:47 +0100 Subject: [PATCH] checkpoint --- src/edu/berkeley/cs/obits/AtmelSerial.java | 125 -------------------- src/edu/berkeley/{cs => }/obits/Atmel.java | 2 +- src/edu/berkeley/obits/AtmelSerial.java | 42 +++++++ src/edu/berkeley/{cs => }/obits/Device.java | 2 +- .../{cs => }/obits/device/atmel/AtmelDevice.java | 4 +- .../{cs => }/obits/device/atmel/AvrDrone.c | 0 .../{cs => }/obits/device/atmel/AvrDrone.java | 4 +- 7 files changed, 48 insertions(+), 131 deletions(-) delete mode 100644 src/edu/berkeley/cs/obits/AtmelSerial.java rename src/edu/berkeley/{cs => }/obits/Atmel.java (99%) create mode 100644 src/edu/berkeley/obits/AtmelSerial.java rename src/edu/berkeley/{cs => }/obits/Device.java (94%) rename src/edu/berkeley/{cs => }/obits/device/atmel/AtmelDevice.java (99%) rename src/edu/berkeley/{cs => }/obits/device/atmel/AvrDrone.c (100%) rename src/edu/berkeley/{cs => }/obits/device/atmel/AvrDrone.java (97%) diff --git a/src/edu/berkeley/cs/obits/AtmelSerial.java b/src/edu/berkeley/cs/obits/AtmelSerial.java deleted file mode 100644 index b43d0f9..0000000 --- a/src/edu/berkeley/cs/obits/AtmelSerial.java +++ /dev/null @@ -1,125 +0,0 @@ -package edu.berkeley.cs.obits; - -import edu.berkeley.cs.obits.device.atmel.*; -import org.ibex.util.*; -import java.io.*; -import java.util.*; -import gnu.io.*; - -public class AtmelSerial { - - public static SerialPort detectObitsPort() throws Exception { - Enumeration e = CommPortIdentifier.getPortIdentifiers(); - while(e.hasMoreElements()) { - CommPortIdentifier cpi = (CommPortIdentifier)e.nextElement(); - Log.info(AtmelSerial.class, "trying " + cpi.getName()); - } - SerialPort ret = new RXTXPort("/dev/cu.usbserial-FTBUODP4"); - Log.info(AtmelSerial.class, "returning " + ret); - return ret; - } - - public static void main(String[] s) throws Exception { - SerialPort sp = detectObitsPort(); - sp.setSerialPortParams(9600, SerialPort.DATABITS_8, SerialPort.STOPBITS_1, SerialPort.PARITY_NONE); - //sp.setFlowControlMode(sp.FLOWCONTROL_NONE); - OutputStream out = sp.getOutputStream(); - InputStream in = sp.getInputStream(); - int count = 0; - PrintWriter pw = new PrintWriter(new OutputStreamWriter(out)); - /* - pw.println("Y38,N,8,1"); - pw.flush(); - sp.setSerialPortParams(38400, SerialPort.DATABITS_8, SerialPort.STOPBITS_1, SerialPort.PARITY_NONE); - - pw.println("GI"); - pw.flush(); - */ - - pw.println(); - pw.flush(); - pw.println("^@"); - pw.println("^@"); - pw.println("^@"); - pw.flush(); - try { Thread.sleep(3000); } catch (Exception e) { } - - pw.println("GK\"IMG\""); - pw.println("GK\"IMG\""); - pw.println(); - pw.flush(); - try { Thread.sleep(1000); } catch (Exception e) { } - /* - pw.println("GI"); - pw.flush(); - */ - int[] data = new int[104 * 104]; - for(int i=0; i<104*104; i++) data[i] = 1; - for(int i=0; i<104; i++) data[i*104+i] = 0; - for(int i=0; i<104; i++) data[i*104+(104-i)] = 0; - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - PCX.dump(104, 104, data, new DataOutputStream(baos)); - byte[] outb = baos.toByteArray(); - int len = outb.length; - pw.println("GM\"IMG\""+len); - pw.flush(); - DataOutputStream dout = new DataOutputStream(out); - for(int i=0; i> 24), (int)(foo >> 16), (int)(foo >> 8), (int)(foo >> 0)); - count++; - if (count % 100 == 0) Log.info(AtmelSerial.class, "wrote " + count + " configuration octets"); - } - device.flush(); - long end = System.currentTimeMillis(); - Log.info(AtmelSerial.class, "finished in " + ((end-begin)/1000) + "s"); - System.exit(0); - } catch (Exception e) { e.printStackTrace(); } - */ - System.exit(0); - } - -} diff --git a/src/edu/berkeley/cs/obits/Atmel.java b/src/edu/berkeley/obits/Atmel.java similarity index 99% rename from src/edu/berkeley/cs/obits/Atmel.java rename to src/edu/berkeley/obits/Atmel.java index 1f01adb..1918cb0 100644 --- a/src/edu/berkeley/cs/obits/Atmel.java +++ b/src/edu/berkeley/obits/Atmel.java @@ -1,4 +1,4 @@ -package edu.berkeley.cs.obits; +package edu.berkeley.obits; import java.util.*; import java.io.*; import org.ibex.util.*; diff --git a/src/edu/berkeley/obits/AtmelSerial.java b/src/edu/berkeley/obits/AtmelSerial.java new file mode 100644 index 0000000..464f0c0 --- /dev/null +++ b/src/edu/berkeley/obits/AtmelSerial.java @@ -0,0 +1,42 @@ +package edu.berkeley.obits; + +import edu.berkeley.obits.device.atmel.*; +import org.ibex.util.*; +import org.ibex.graphics.Picture; +import java.io.*; +import java.util.*; +import gnu.io.*; + +public class AtmelSerial { + + public static SerialPort detectObitsPort() throws Exception { + Enumeration e = CommPortIdentifier.getPortIdentifiers(); + while(e.hasMoreElements()) { + CommPortIdentifier cpi = (CommPortIdentifier)e.nextElement(); + Log.info(AtmelSerial.class, "trying " + cpi.getName()); + } + SerialPort ret = new RXTXPort("/dev/cu.usbserial-FTCBWI2P"); + Log.info(AtmelSerial.class, "returning " + ret); + return ret; + } + + public static void main(String[] s) throws Exception { + AvrDrone device = new AvrDrone(detectObitsPort()); + int count = 0; + try { + long begin = System.currentTimeMillis(); + BufferedReader br = new BufferedReader(new InputStreamReader(System.in)); + for(String str = br.readLine(); str != null; str = br.readLine()) { + long foo = Long.parseLong(str, 16); + device.mode4((int)(foo >> 24), (int)(foo >> 16), (int)(foo >> 8), (int)(foo >> 0)); + count++; + if (count % 100 == 0) Log.info(AtmelSerial.class, "wrote " + count + " configuration octets"); + } + device.flush(); + long end = System.currentTimeMillis(); + Log.info(AtmelSerial.class, "finished in " + ((end-begin)/1000) + "s"); + System.exit(0); + } catch (Exception e) { e.printStackTrace(); } + } + +} diff --git a/src/edu/berkeley/cs/obits/Device.java b/src/edu/berkeley/obits/Device.java similarity index 94% rename from src/edu/berkeley/cs/obits/Device.java rename to src/edu/berkeley/obits/Device.java index 8f26d34..b56114b 100644 --- a/src/edu/berkeley/cs/obits/Device.java +++ b/src/edu/berkeley/obits/Device.java @@ -1,4 +1,4 @@ -package edu.berkeley.cs.obits; +package edu.berkeley.obits; import java.util.*; diff --git a/src/edu/berkeley/cs/obits/device/atmel/AtmelDevice.java b/src/edu/berkeley/obits/device/atmel/AtmelDevice.java similarity index 99% rename from src/edu/berkeley/cs/obits/device/atmel/AtmelDevice.java rename to src/edu/berkeley/obits/device/atmel/AtmelDevice.java index 42425cf..07be997 100644 --- a/src/edu/berkeley/cs/obits/device/atmel/AtmelDevice.java +++ b/src/edu/berkeley/obits/device/atmel/AtmelDevice.java @@ -1,6 +1,6 @@ -package edu.berkeley.cs.obits.device.atmel; +package edu.berkeley.obits.device.atmel; -import edu.berkeley.cs.obits.*; +import edu.berkeley.obits.*; //import static edu.berkeley.cs.obits.device.atmel.Wires.*; import java.util.*; diff --git a/src/edu/berkeley/cs/obits/device/atmel/AvrDrone.c b/src/edu/berkeley/obits/device/atmel/AvrDrone.c similarity index 100% rename from src/edu/berkeley/cs/obits/device/atmel/AvrDrone.c rename to src/edu/berkeley/obits/device/atmel/AvrDrone.c diff --git a/src/edu/berkeley/cs/obits/device/atmel/AvrDrone.java b/src/edu/berkeley/obits/device/atmel/AvrDrone.java similarity index 97% rename from src/edu/berkeley/cs/obits/device/atmel/AvrDrone.java rename to src/edu/berkeley/obits/device/atmel/AvrDrone.java index aa12dce..e45800a 100644 --- a/src/edu/berkeley/cs/obits/device/atmel/AvrDrone.java +++ b/src/edu/berkeley/obits/device/atmel/AvrDrone.java @@ -1,6 +1,6 @@ -package edu.berkeley.cs.obits.device.atmel; +package edu.berkeley.obits.device.atmel; -import edu.berkeley.cs.obits.*; +import edu.berkeley.obits.*; import org.ibex.util.Log; import java.io.*; import java.util.*; -- 1.7.10.4