From: adam <adam@megacz.com>
Date: Thu, 21 Sep 2006 14:28:34 +0000 (+0100)
Subject: checkpoint
X-Git-Tag: mpar_demo_release~55
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=9c336acf3a9eefed8bcb09f7f094fd709d9a2073;p=slipway.git

checkpoint
---

diff --git a/src/com/atmel/fpslic/FpslicRawUsb.java b/src/com/atmel/fpslic/FpslicRawUsb.java
index ca3737e..f8011e5 100644
--- a/src/com/atmel/fpslic/FpslicRawUsb.java
+++ b/src/com/atmel/fpslic/FpslicRawUsb.java
@@ -64,16 +64,16 @@ public class FpslicRawUsb implements FpslicRaw {
 
     public OutputStream getConfigStream() throws IOException {
         reset();
-        config(0,3);
-        con();
-        config(0,7);
+        config(0,2);
         flush();
         return new OutputStream() {
                 int bytes = 0;
                 int bits = 0;
                 public void write(int in) throws IOException {
                     for(int i=7; i>=0; i--) {
+                        bits++;
                         config((((in & 0xff) & (1<<i))!=0)?1:0, 1);
+                        if (bits==1) con();
                     }
                 }
                 public void write(byte[] b, int off, int len) throws IOException {
@@ -114,6 +114,9 @@ public class FpslicRawUsb implements FpslicRaw {
         boolean pin;
 
         getConfigStream();
+        config(0,1);
+        con();
+        config(0,7);
         config(Integer.parseInt("10110111", 2), 8);
         config(0,1);
         flush();
@@ -138,6 +141,9 @@ public class FpslicRawUsb implements FpslicRaw {
         reset();
         try { Thread.sleep(100); } catch (Exception e) { }
         getConfigStream();
+        config(0,1);
+        con();
+        config(0,7);
         config(Integer.parseInt("11110111", 2), 8);
         config(0, 1);
         flush();
diff --git a/src/edu/berkeley/slipway/FtdiBoard.java b/src/edu/berkeley/slipway/FtdiBoard.java
index 27c9440..d84afa1 100644
--- a/src/edu/berkeley/slipway/FtdiBoard.java
+++ b/src/edu/berkeley/slipway/FtdiBoard.java
@@ -43,7 +43,6 @@ public class FtdiBoard extends Board {
 
         OutputStream os = chip.getConfigStream();
         BufferedReader br = new BufferedReader(r);
-        br.readLine();
 
         int bytes = 0;
         while(true) {