From: adam <adam@megacz.com>
Date: Mon, 11 Sep 2006 13:39:30 +0000 (+0100)
Subject: checkpoint
X-Git-Tag: mpar_demo_release~97
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=217426234598bc0610985b2d80bb5765c13bab0b;p=slipway.git

checkpoint
---

diff --git a/src/edu/berkeley/obits/device/atmel/ChipImpl.java b/src/edu/berkeley/obits/device/atmel/ChipImpl.java
index 5cb10ec..df0e97e 100644
--- a/src/edu/berkeley/obits/device/atmel/ChipImpl.java
+++ b/src/edu/berkeley/obits/device/atmel/ChipImpl.java
@@ -16,6 +16,7 @@ public class ChipImpl extends FtdiChip implements Chip {
 
         con(false);
         flush();
+
         buffered(false);
         reset(false);
         //avrrst(false);
diff --git a/src/edu/berkeley/obits/device/atmel/FtdiChip.java b/src/edu/berkeley/obits/device/atmel/FtdiChip.java
index 20f4a2a..fd96c64 100644
--- a/src/edu/berkeley/obits/device/atmel/FtdiChip.java
+++ b/src/edu/berkeley/obits/device/atmel/FtdiChip.java
@@ -27,11 +27,8 @@ public class FtdiChip {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     public void flush() {
         try {
-            byte[] bytes = baos.toByteArray();
-            baos = new ByteArrayOutputStream();
-            out.write(bytes, 0, bytes.length);
-            out.flush();
-        } catch (IOException e) { throw new RuntimeException(e); }
+            getOutputStream().flush();
+        } catch (Exception e) { throw new RuntimeException(e); }
     }
 
     protected static int mask =