X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFET.py;h=2ee654e8a762e2d8d28ce19ea610d54301b7cef5;hp=ec1c47034498062aa6e453964e70970e9c23d7b0;hb=dffb4095b5c57ed45748646d224b719015ebd92f;hpb=f217c730250832ae74a60b9d494111eac3763fd6

diff --git a/client/GoodFET.py b/client/GoodFET.py
index ec1c470..2ee654e 100755
--- a/client/GoodFET.py
+++ b/client/GoodFET.py
@@ -69,7 +69,7 @@ class GoodFET:
         return self.symbols.get(name);
     def timeout(self):
         print "timeout\n";
-    def serInit(self, port=None, timeout=0.5):
+    def serInit(self, port=None, timeout=2):
         """Open the serial port"""
         # Make timeout None to wait forever, 0 for non-blocking mode.
         
@@ -77,6 +77,8 @@ class GoodFET:
             glob_list = glob.glob(os.environ.get("GOODFET"));
             if len(glob_list) > 0:
                 port = glob_list[0];
+            else:
+                port = os.environ.get("GOODFET");
         if port is None:
             glob_list = glob.glob("/dev/tty.usbserial*");
             if len(glob_list) > 0:
@@ -86,6 +88,7 @@ class GoodFET:
             if len(glob_list) > 0:
                 port = glob_list[0];
         
+        
         self.serialport = serial.Serial(
             port,
             #9600,