getClient() fixed.

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

diff --git a/client/GoodFET.py b/client/GoodFET.py
index 48810af..bb6741a 100755 (executable)
--- a/client/GoodFET.py
+++ b/client/GoodFET.py
@@ -7,6 +7,17 @@
 
 import sys, time, string, cStringIO, struct, glob, serial, os;
 
+def getClient(name="GoodFET"):
+    import GoodFET, GoodFETCC, GoodFETAVR, GoodFETSPI, GoodFETMSP430;
+    if(name=="GoodFET" or name=="monitor"): return GoodFET.GoodFET();
+    elif name=="cc" or name=="chipcon": return GoodFETCC.GoodFETCC();
+    elif name=="avr": return GoodFETAVR.GoodFETAVR();
+    elif name=="spi": return GoodFETSPI.GoodFETSPI();
+    elif name=="msp430": return GoodFETSPI.GoodFETMSP430();
+    
+    print "Unsupported target: %s" % name;
+    sys.exit(0);
+
 
 class GoodFET:
     """GoodFET Client Library"""
@@ -15,7 +26,8 @@ class GoodFET:
     
     def __init__(self, *args, **kargs):
         self.data=[0];
-        
+    
+
     def getConsole(self):
         from GoodFETConsole import GoodFETConsole;
         return GoodFETConsole(self);

diff --git a/client/goodfet b/client/goodfet
index 4bf9aa3..ed3b9e8 100755 (executable)
--- a/client/goodfet
+++ b/client/goodfet
@@ -8,8 +8,8 @@
 import sys, os, readline, code, binascii;
 import rlcompleter;
 
-import GoodFET;
-from GoodFET.GoodFETConsole import GoodFETConsole;
+from GoodFET import GoodFET, getClient;
+from GoodFETConsole import GoodFETConsole;
 #from GoodFET import *;
 
 from intelhex import IntelHex;
@@ -24,7 +24,7 @@ if(len(sys.argv)==1):
 driver=sys.argv[1];
 print "Using driver %s" % driver;
 #client=eval("%s()" % driver);
-client=GoodFET.getClient(driver);
+client=getClient(driver);
 console=client.getConsole();
 console.run();