X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.msp430;h=9745a5a174bcb5ef20ab63779b6bf3305359f890;hp=f9c744c1a0ab60fef86b6449e2437ca7361a0d02;hb=27317fc9af778f929496abb25ddb1ac68b1beb4e;hpb=1706a7f4cfa73ed716b56f5b0322bfb67b560ade

diff --git a/client/goodfet.msp430 b/client/goodfet.msp430
index f9c744c..9745a5a 100755
--- a/client/goodfet.msp430
+++ b/client/goodfet.msp430
@@ -30,10 +30,12 @@ client.MSP430start();
 #print "started"
 
 if(sys.argv[1]=="info"):
-    print "Model    %08x " % client.MSP430deviceid();
-    print "Core     %04x " % client.MSP430coreid();
-    print "Identity %04x" % client.MSP430ident();
-    print "Identifies as %s" % client.MSP430identstr();
+    #print "Model    %08x " % client.MSP430deviceid();
+    #print "Core     %04x " % client.MSP430coreid();
+    #print "Identity %04x" % client.MSP430ident();
+    print "Identifies as %s (%04x)" % (
+        client.MSP430identstr(),
+        client.MSP430ident());
 if(sys.argv[1]=="test"):
     client.MSP430test();
 if(sys.argv[1]=="dump"):
@@ -116,10 +118,10 @@ if(sys.argv[1]=="poke"):
         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);
+    print "Poking %06x to become %04x." % (start,val);
     
     while client.MSP430peek(start)!=val:
-        client.MSP430poke(start,val);
+        client.MSP430pokeflash(start,val);
         print "Poked to %04x" % client.MSP430peek(start);