X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.bsl;h=974df03970753dbabaed84e8a1397caa15b0b1f1;hp=dc5fd8708ca741d75407fb14a7f123084462b097;hb=cb0b62cea38146c2414ccf215626daa8acf9aca5;hpb=5ee19fee9dc2095ccb67fc2a86c53799ae47b403

diff --git a/client/goodfet.bsl b/client/goodfet.bsl
index dc5fd87..974df03 100755
--- a/client/goodfet.bsl
+++ b/client/goodfet.bsl
@@ -1386,6 +1386,13 @@ def main(itest=1):
     bsl.invertRST = 1
     bsl.invertTEST = itest
     
+    if(os.environ.get("board")=='telosb' or 
+       os.environ.get("board")=='telosbbt' or
+       os.environ.get("platform")=='telosb'):
+        bsl.swapRSTTEST = 1
+        bsl.telosI2C = 1
+        mayuseBSL = 0
+    
     if comPort is None and os.environ.get("GOODFET")!=None:
         glob_list = glob.glob(os.environ.get("GOODFET"));
         if len(glob_list) > 0:
@@ -1402,11 +1409,13 @@ def main(itest=1):
             from scanwin32 import winScan;
             scan=winScan();
             for order,comport,desc,hwid in sorted(scan.comports()):
-                if hwid.index('FTDI')==0:
-                    comPort=comport;
-                    #print "Using FTDI port %s" % port
-        
-    
+                try:
+                    if hwid.index('FTDI')==0:
+                        comPort=comport;
+                        #print "Using FTDI port %s" % port
+                except:
+                    #Do nothing.
+                    a=1;
     sys.stderr.write("MSP430 Bootstrap Loader Version: %s\n" % VERSION)
 
     try:
@@ -1421,7 +1430,8 @@ def main(itest=1):
              "swap-reset-test", "telos-latch", "telos-i2c", "telos", "telosb",
              "tmote","no-BSL-download", "force-BSL-download", "slow",
              "dumpivt", "dumpinfo", "fromweb",
-             "goodfet30", "goodfet20", "goodfet10"
+             "goodfet40", "goodfet30", "goodfet20", "goodfet10",
+             "nhbadge", "nhbadgeb", "goodfet"
             ]
         )
     except getopt.GetoptError:
@@ -1571,6 +1581,15 @@ def main(itest=1):
         elif o in ("--goodfet30", ):
             bsl.invertRST = 1
             bsl.invertTEST = 0
+        elif o in ("--goodfet40", ):
+            bsl.invertRST = 1
+            bsl.invertTEST = 1
+        elif o in ("--goodfet", ):
+            bsl.invertRST = 1
+            bsl.invertTEST = 1
+        elif o in ("--nhbadge", "--nhbadgeb" ):
+            bsl.invertRST = 1
+            bsl.invertTEST = 1
         elif o in ("--telosb", ):
             bsl.swapRSTTEST = 1
             bsl.telosI2C = 1