From: adam <adam@megacz.com>
Date: Mon, 11 Sep 2006 14:39:49 +0000 (+0100)
Subject: checkpoint
X-Git-Tag: mpar_demo_release~87
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=b022ca21a06a0756bcfeeb7009c6dc02b673bd0e;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 c1b52f4..00697c9 100644
--- a/src/edu/berkeley/obits/device/atmel/ChipImpl.java
+++ b/src/edu/berkeley/obits/device/atmel/ChipImpl.java
@@ -4,6 +4,16 @@ import java.io.*;
 
 public class ChipImpl extends FtdiChip implements Chip {
 
+    protected int dmask =
+        //(1<<0) |
+        (1<<1) |
+        (1<<2) |
+        //(1<<3) |
+        //(1<<4) |
+        (1<<5) |
+        (1<<6) |
+        (1<<7);
+
     public ChipImpl() {
         super();
         doReset();
@@ -17,6 +27,7 @@ public class ChipImpl extends FtdiChip implements Chip {
     }
 
     public void doReset() {
+
         flush();
 
         dbangmode(dmask);
@@ -29,13 +40,22 @@ public class ChipImpl extends FtdiChip implements Chip {
 
         reset(false);
         flush();
-        try { Thread.sleep(200); } catch (Exception e) { }
+        try { Thread.sleep(500); } catch (Exception e) { }
 
         reset(true);
         flush();
-        try { Thread.sleep(200); } catch (Exception e) { }
+        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);
+//dmask &= ~(1<<7);
         dbangmode(dmask);
         flush();
     }
@@ -60,16 +80,6 @@ public class ChipImpl extends FtdiChip implements Chip {
         }
     }
 
-    protected int dmask =
-        //(1<<0) |
-        (1<<1) |
-        (1<<2) |
-        //(1<<3) |
-        //(1<<4) |
-        (1<<5) |
-        (1<<6) |
-        (1<<7);
-
     public void reset(boolean on) {
         bits = on ? (1<<1) : 0;
         uart();
diff --git a/src/edu/berkeley/obits/device/atmel/FtdiBoard.java b/src/edu/berkeley/obits/device/atmel/FtdiBoard.java
index 9458974..9bc98fe 100644
--- a/src/edu/berkeley/obits/device/atmel/FtdiBoard.java
+++ b/src/edu/berkeley/obits/device/atmel/FtdiBoard.java
@@ -35,7 +35,7 @@ public class FtdiBoard extends Board {
     public void boot(Reader r) throws Exception {
         boolean pin;
         Chip d = chip;
-
+        /*
         d.buffered(false);
         d.doReset();
         d.config(0,10);
@@ -66,7 +66,7 @@ public class FtdiBoard extends Board {
         d.flush();
         pin = d.initErr();
         System.out.println("bad preamble #1 => " + pin + " " + (pin ? red("BAD") : green("good")));
-
+        */
         d.doReset();
 
         d.config(0,10);