X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.msp430;h=368cb0f098de5a989394130b74b54b4635401172;hp=591f2ea3fabfcd768574e4a5af35bc759c376e00;hb=32f20cd81c67f9cfb9bd11b9b62942ff60d9b2f4;hpb=8f05454eedc506a9b46c2b8bce9af2480089827f

diff --git a/client/goodfet.msp430 b/client/goodfet.msp430
index 591f2ea..368cb0f 100755
--- a/client/goodfet.msp430
+++ b/client/goodfet.msp430
@@ -3,7 +3,7 @@
 import sys;
 import binascii;
 
-from GoodFET import GoodFET;
+from GoodFETMSP430 import GoodFETMSP430;
 from intelhex import IntelHex16bit;
 
 
@@ -17,18 +17,20 @@ if(len(sys.argv)==1):
     print "%s verify $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     sys.exit();
 
-#Initailize FET and set baud rate
-client=GoodFET();
+#Initialize FET and set baud rate
+client=GoodFETMSP430();
 client.serInit()
 
 #Connect to target
 client.MSP430setup();
-client.MSP430start();
 
-#client.setBaud(2);
+#Identify model number.
+client.MSP430start();
 
-if(sys.argv[1]=="monitortest"):
-    client.monitortest();
+if(sys.argv[1]=="info"):
+    print "Model    %04x " % client.MSP430coreid();
+    print "Core %08x " % client.MSP430deviceid();
+    print "Identity %04x" % client.MSP430ident();
 if(sys.argv[1]=="test"):
     client.MSP430test();
 if(sys.argv[1]=="dump"):
@@ -90,6 +92,31 @@ if(sys.argv[1]=="verify"):
                 print "ERROR at %04x, found %04x not %04x"%(i,peek,h[i>>1]);
             if(i%0x100==0):
                 print "%04x" % i;
+if(sys.argv[1]=="peek"):
+    start=0x0000;
+    if(len(sys.argv)>2):
+        start=int(sys.argv[2],16);
+    stop=start;
+    if(len(sys.argv)>3):
+        stop=int(sys.argv[3],16);
+    print "Peeking from %04x to %04x." % (start,stop);
+    while start<=stop:
+        print "%04x: %04x" % (start,client.MSP430peek(start));
+        start=start+2;
+if(sys.argv[1]=="poke"):
+    start=0x0000;
+    val=0x00;
+    if(len(sys.argv)>2):
+        start=int(sys.argv[2],16);
+    if(len(sys.argv)>3):
+        val=int(sys.argv[3],16);
+    print "Poking %06x to become %02x." % (start,val);
+    
+    while client.MSP430peek(start)!=val:
+        client.MSP430poke(start,val);
+        print "Poked to %04x" % client.MSP430peek(start);
+
+
 
 if(sys.argv[1]=="whatever"):
     for i in [0x24FF, 0x2500, 0x2502, 0x2504]: