From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Wed, 16 Nov 2011 20:28:38 +0000 (+0000)
Subject: Adds support for new config variable.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=9ba7e4f5ec74d83c1c167655dbd0de02db15e9f9

Adds support for new config variable.
Set \$board=telosb instead of \$platform.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@1063 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---

diff --git a/client/GoodFET.py b/client/GoodFET.py
index 8c5d945..9bf627c 100755
--- a/client/GoodFET.py
+++ b/client/GoodFET.py
@@ -171,7 +171,7 @@ class GoodFET:
                     a=1;
         
         baud=115200;
-        if(os.environ.get("platform")=='arduino'):
+        if(os.environ.get("platform")=='arduino' or os.environ.get("board")=='arduino'):
             baud=19200; #Slower, for now.
         self.serialport = serial.Serial(
             port,
@@ -196,7 +196,7 @@ class GoodFET:
                 self.serialport.flushOutput()
                 
                 #TelosB reset, prefer software to I2C SPST Switch.
-                if(os.environ.get("platform")=='telosb'):
+                if(os.environ.get("platform")=='telosb' or  os.environ.get("board")=='telosb'):
                     #print "TelosB Reset";
                     self.telosBReset();
                 else:
@@ -223,7 +223,6 @@ class GoodFET:
             connected=1;
             olds=self.infostring();
             clocking=self.monitorclocking();
-            #if(os.environ.get("platform")!='arduino'):
             for foo in range(1,30):
                 if not self.monitorecho():
                     if self.verbose:
@@ -610,7 +609,7 @@ class GoodFET:
         self.MONpoke16(0x56, clock);
     def monitorgetclock(self):
         """Get the clocking value."""
-        if(os.environ.get("platform")=='arduino'):
+        if(os.environ.get("platform")=='arduino' or os.environ.get("board")=='arduino'):
             return 0xDEAD;
         #Check for MSP430 before peeking this.
         return self.MONpeek16(0x56);
@@ -618,7 +617,7 @@ class GoodFET:
     # every client.
     
     def infostring(self):
-        if(os.environ.get("platform")=='arduino'):
+        if(os.environ.get("platform")=='arduino' or os.environ.get("board")=='arduino'):
             return "Arduino";
         else:
             a=self.MONpeek8(0xff0);
diff --git a/client/goodfet.bsl b/client/goodfet.bsl
index 6c8ee50..6eded35 100755
--- a/client/goodfet.bsl
+++ b/client/goodfet.bsl
@@ -1386,7 +1386,7 @@ def main(itest=1):
     bsl.invertRST = 1
     bsl.invertTEST = itest
     
-    if(os.environ.get("platform")=='telosb'):
+    if(os.environ.get("board")=='telosb' or os.environ.get("platform")=='telosb'):
         bsl.swapRSTTEST = 1
         bsl.telosI2C = 1
         mayuseBSL = 0