From: adam <adam@megacz.com>
Date: Wed, 20 Sep 2006 07:40:33 +0000 (+0100)
Subject: checkpoint
X-Git-Tag: mpar_demo_release~82
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=b072f6bfb7090fc257c99d385eab39f23c9858d6;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 570a7d6..7936d41 100644
--- a/src/edu/berkeley/obits/device/atmel/ChipImpl.java
+++ b/src/edu/berkeley/obits/device/atmel/ChipImpl.java
@@ -77,10 +77,16 @@ public class ChipImpl extends FtdiChip implements Chip {
     //         let it float upward from either mode.
     public void reset(boolean on) {
         bits = on ? (1<<1) : 0;
-        mask = on ? (1<<0) : ((1<<0) | (1<<1));
+        mask = ((1<<0) | (1<<1));
         uart();
         flush();
-        if (on) dbangmode(dmask);
+        if (on) {
+            mask = (1<<0);
+            uart();
+            flush();
+            dbangmode(dmask);
+            flush();
+        }
     }
 
     public void avrrst(boolean on) { dbang(7, on); }