X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.cc;h=7a8fe49b258120e1ac92520b35e62d8e05d194cb;hp=10442b1852fc160f1f3d00d20dbb974f0e2dd062;hb=d9bb1794d9f9d0c0398efa0e91954a0a8c4596e5;hpb=7544a1e347bc72edc26e6e4e7b9eec059c3324e3

diff --git a/client/goodfet.cc b/client/goodfet.cc
index 10442b1..7a8fe49 100755
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -3,7 +3,7 @@
 import sys;
 import binascii;
 
-from GoodFET import GoodFET;
+from GoodFET import GoodFETCC;
 from intelhex import IntelHex;
 
 
@@ -22,8 +22,8 @@ if(len(sys.argv)==1):
     sys.exit();
 
 #Initailize FET and set baud rate
-client=GoodFET();
-client.serInit("/dev/ttyUSB0")
+client=GoodFETCC();
+client.serInit()
 
 #Connect to target
 client.CCsetup();
@@ -31,6 +31,9 @@ client.CCstart();
 
 if(sys.argv[1]=="test"):
     client.CCtest();
+if(sys.argv[1]=="deadtest"):
+    for i in range(1,10):
+        print "IDENT as %s" % client.CCidentstr();
 if(sys.argv[1]=="dumpcode"):
     f = sys.argv[2];
     start=0x0000;
@@ -67,10 +70,12 @@ if(sys.argv[1]=="dumpdata"):
             print "Dumped %04x."%i;
         i+=1;
     h.write_hex_file(f);
+if(sys.argv[1]=="status"):
+    print "Status: %s" %client.CCstatusstr();
 if(sys.argv[1]=="erase"):
-  print "Status: %s" % client.CCstatusstr();
-  client.CCchiperase();
-  print "Status: %s" %client.CCstatusstr();
+    print "Status: %s" % client.CCstatusstr();
+    client.CCchiperase();
+    print "Status: %s" %client.CCstatusstr();
 
 # if(sys.argv[1]=="flash"):
 #     f=sys.argv[2];
@@ -83,11 +88,11 @@ if(sys.argv[1]=="erase"):
     
 #     h = IntelHex(f);
     
-#     client.MSP430masserase();
+#     client.CCchiperase();
 #     for i in h._buf.keys():
 #         #print "%04x: %04x"%(i,h[i>>1]);
 #         if(i>=start and i<=stop  and i&1==0):
-#             client.MSP430writeflash(i,h[i>>1]);
+#             client.CCwriteflash(i,h[i>>1]);
 #             if(i%0x100==0):
 #                 print "%04x" % i;
 if(sys.argv[1]=="writedata"):
@@ -106,8 +111,8 @@ if(sys.argv[1]=="writedata"):
             client.CCpokedatabyte(i,h[i]);
             if(i%0x100==0):
                 print "%04x" % i;
-if(sys.argv[1]=="flashtest"):
-    client.MSP430flashtest();
+#if(sys.argv[1]=="flashtest"):
+#    client.CCflashtest();
 if(sys.argv[1]=="peekdata"):
     start=0x0000;
     if(len(sys.argv)>2):