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

checkpoint
---

diff --git a/src/com/atmel/fpslic/FpslicRawUsb.java b/src/com/atmel/fpslic/FpslicRawUsb.java
index cbc6e80..9bc3393 100644
--- a/src/com/atmel/fpslic/FpslicRawUsb.java
+++ b/src/com/atmel/fpslic/FpslicRawUsb.java
@@ -77,7 +77,7 @@ public class FpslicRawUsb implements FpslicRaw {
                     FpslicRawUsb.this.flush();
                 }
                 public void close() throws IOException {
-                    rcon();
+
                     flush();
                     if (!initErr())
                         throw new RuntimeException("initialization failed at " + bytes);
@@ -88,6 +88,12 @@ public class FpslicRawUsb implements FpslicRaw {
                         try { Thread.sleep(20); } catch (Exception e) { }
                         config(0,1);
                     }
+
+                    // turn off the CON pin we've been pulling low...
+                    dmask &= ~(1<<0);
+                    ftdiuart.dbus_mode(dmask);
+
+
                     avrrst(false);
                     try { Thread.sleep(100); } catch (Exception e) { }
                     ftdiuart.purge();
@@ -168,11 +174,6 @@ public class FpslicRawUsb implements FpslicRaw {
     private void data(boolean on)   throws IOException { dbang(5, on); }
     private boolean initErr()       throws IOException { flush(); return (ftdiuart.readPins() & (1<<4))!=0; }
 
-    private void rcon() throws IOException {
-        dmask &= ~(1<<0);
-        ftdiuart.dbus_mode(dmask);
-    }
-
     private static String red(Object o) { return "\033[31m"+o+"\033[0m"; }
     private static String green(Object o) { return "\033[32m"+o+"\033[0m"; }
 }