From: adam <adam@megacz.com>
Date: Mon, 11 Sep 2006 14:41:43 +0000 (+0100)
Subject: checkpoint
X-Git-Tag: mpar_demo_release~86
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=7f6492ec8a39f2bb510d5be0b92031f231a2a935;p=slipway.git

checkpoint
---

diff --git a/src/edu/berkeley/obits/device/atmel/Chip.java b/src/edu/berkeley/obits/device/atmel/Chip.java
index 82035df..36c21c0 100644
--- a/src/edu/berkeley/obits/device/atmel/Chip.java
+++ b/src/edu/berkeley/obits/device/atmel/Chip.java
@@ -15,8 +15,6 @@ public interface Chip {
     public boolean con();
 
     //remove
-    public void buffered();
-    public void buffered(boolean buf);
     public void flush();
     public int readPins();
 }
diff --git a/src/edu/berkeley/obits/device/atmel/ChipImpl.java b/src/edu/berkeley/obits/device/atmel/ChipImpl.java
index 00697c9..ec48f7b 100644
--- a/src/edu/berkeley/obits/device/atmel/ChipImpl.java
+++ b/src/edu/berkeley/obits/device/atmel/ChipImpl.java
@@ -19,13 +19,6 @@ public class ChipImpl extends FtdiChip implements Chip {
         doReset();
     }
 
-    public boolean buffered = true;
-    public void buffered() { buffered = true; }
-    public void buffered(boolean buf) {
-        if (!buf) flush();
-        buffered = buf;
-    }
-
     public void doReset() {
 
         flush();
@@ -46,16 +39,6 @@ public class ChipImpl extends FtdiChip implements Chip {
         flush();
         try { Thread.sleep(500); } catch (Exception e) { }
 
-System.out.println("\ndisagree:"+(dmask ^ (        //(1<<0) |
-        (1<<1) |
-        (1<<2) |
-        //(1<<3) |
-        //(1<<4) |
-        (1<<5) |
-        (1<<6) |
-        (1<<7)))+"\n");
-
-//dmask &= ~(1<<7);
         dbangmode(dmask);
         flush();
     }
diff --git a/src/edu/berkeley/obits/device/atmel/FtdiBoard.java b/src/edu/berkeley/obits/device/atmel/FtdiBoard.java
index 9bc98fe..e90aaca 100644
--- a/src/edu/berkeley/obits/device/atmel/FtdiBoard.java
+++ b/src/edu/berkeley/obits/device/atmel/FtdiBoard.java
@@ -77,7 +77,6 @@ public class FtdiBoard extends Board {
         BufferedReader br = new BufferedReader(r);
         br.readLine();
         int bytes = 0;
-        d.buffered();
         //System.out.println("cts="+""+"  pins=" + pad(Integer.toString(d.readPins()&0xff,2),8));
         while(true) {
             String s = br.readLine();