X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.msp430;h=0cca0fd9957a14b42e32bf0477d69a43578c5b78;hp=7eb6161972a06f75b42eaad5cf51de6289832b16;hb=830f48834c5210ad38866861238ade21b7a9a2e8;hpb=317db1594d5774d4d6aca749f3ce410b108048ff

diff --git a/client/goodfet.msp430 b/client/goodfet.msp430
index 7eb6161..0cca0fd 100755
--- a/client/goodfet.msp430
+++ b/client/goodfet.msp430
@@ -10,6 +10,7 @@ from intelhex import IntelHex16bit, IntelHex;
 if(len(sys.argv)==1):
     print "Usage: %s verb [objects]\n" % sys.argv[0];
     print "%s test" % sys.argv[0];
+    print "%s selftest" % sys.argv[0];
     print "%s dump $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s erase" % sys.argv[0];
     print "%s eraseinfo" % sys.argv[0];
@@ -81,14 +82,20 @@ if(sys.argv[1]=="selftest"):
     for i in range(0x3020,0x3030):
         client.MSP430poke(i,0xFFFF);
     client.MSP430setPC(entry);
-    time.sleep(2);
+    time.sleep(5);
     errors=0;
-    for i in range(0x3020,0x3030):
-        ret=client.peek8(i);
+    
+    if(client.peek8(0x302F)==0xFF):
+        print "Test not run.  Try again.";
+        exit(0);
+    
+    for i in range(0x3020,0x3030,2):
+        ret=client.peek16(i);
         if ret!=0:
             errors=errors+1;
             print "Failure at 0x%04x, returned %02xh." % (i,ret);
-    if ret==0:
+        
+    if errors==0:
         print "Test succeeded.  Board is ready to ship."
     else:
         print "Test failed.  Is it soldered correctly?"