Refactoring the client. I probably broke something.

[goodfet] / client / goodfet.avr

diff --git a/client/goodfet.avr b/client/goodfet.avr
index 8692dcf..ea40460 100755 (executable)
--- a/client/goodfet.avr
+++ b/client/goodfet.avr
@@ -3,7 +3,7 @@
 import sys;
 import binascii;
 
-from GoodFETAVR import GoodFETAVR;
+from GoodFET.GoodFETAVR import GoodFETAVR;
 from intelhex import IntelHex16bit, IntelHex;
 
 if(len(sys.argv)==1):
@@ -11,7 +11,7 @@ if(len(sys.argv)==1):
     print "%s test" % sys.argv[0];
     print "%s info" % sys.argv[0];
     print "%s lockbits [value]" % sys.argv[0];
-    #print "%s dump $foo.hex [0x$start 0x$stop]" % sys.argv[0];
+    print "%s dumpflash $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     print "%s erase" % sys.argv[0];
     #print "%s flash $foo.hex [0x$start 0x$stop]" % sys.argv[0];
     #print "%s verify $foo.hex [0x$start 0x$stop]" % sys.argv[0];
@@ -28,11 +28,12 @@ client.start();
 if(sys.argv[1]=="glitch"):
     print "Identifies as %s" % client.identstr();
     client.glitchVoltages(0x880, 0xfff);
-    for i in range(1,20):
+    for i in range(1,2000):
         client.start();
-        print "Identifies as %s, fused 0x%02x" % (
+        print "Identifies as %s, fused 0x%02x; eeprom(0)=%02x" % (
             client.identstr(),
-            client.lockbits());
+            client.lockbits(),
+            client.eeprompeek(0));
 if(sys.argv[1]=="glitchgraph"):
     print "Identifies as %s" % client.identstr();
     for voltage in range(0x860,0x890,5):
@@ -50,7 +51,7 @@ if(sys.argv[1]=="glitchgraph"):
         print "%04x %s" % (voltage,str);
         #print "%f, %i" % (voltage*(3.3/4096.0),count);
 if(sys.argv[1]=="info"):
-    print "Identifies as %s" % client.identstr();
+    print "Identifies as %s, lock=%02x" % (client.identstr(),client.lockbits());
 if(sys.argv[1]=="erase"):
     print "Erasing %s" % client.identstr();
     client.erase();
@@ -58,12 +59,27 @@ if(sys.argv[1]=="lockbits"):
     print "Lockbits are 0x%02x" % client.lockbits();
     if(len(sys.argv)>2):
         print "Lockbits set 0x%02x" %  client.setlockbits(int(sys.argv[2],16));
-#if(sys.argv[1]=="lock"):
+if(sys.argv[1]=="lock"):
+    client.setlockbits(0xFC);
+
+if(sys.argv[1]=="unlock"):
+    print "Identifies as %s" % client.identstr();
+    client.glitchVoltages(0x880, 0xfff);
+    for i in range(1,20):
+        client.start();
+        print "Identifies as %s, fused 0x%02x; eeprom(0)=%02x" % (
+            client.identstr(),
+            client.lockbits(),
+            client.eeprompeek(0));
+        if(client.lockbits()==0xFF):
+            client.setlockbits(0xFF);
+            print "Chip unlocked!"
+            exit();
 #if(sys.argv[1]=="unlock"):
     
 
 
-if(sys.argv[1]=="dump"):
+if(sys.argv[1]=="dumpflash"):
     f = sys.argv[2];
     start=0x0000;
     stop=0xFFFF;
@@ -96,6 +112,7 @@ if(sys.argv[1]=="peekeeprom"):
     while start<=stop:
         print "%06x: %02x" % (start,client.eeprompeek(start));
         start=start+1;
+
 if(sys.argv[1]=="peekflash"):
     start=0x0000;
     if(len(sys.argv)>2):