Refactoring the client. I probably broke something.

[goodfet] / client / goodfet.monitor

diff --git a/client/goodfet.monitor b/client/goodfet.monitor
index 2a81c55..bf093cd 100755 (executable)
--- a/client/goodfet.monitor
+++ b/client/goodfet.monitor
@@ -3,7 +3,7 @@
 import sys;
 import binascii;
 
 import sys;
 import binascii;
 

-from GoodFET import GoodFET;
+from GoodFET.GoodFET import GoodFET;

 from intelhex import IntelHex16bit;
 
 if(len(sys.argv)==1):
 from intelhex import IntelHex16bit;
 
 if(len(sys.argv)==1):


@@ -45,9 +45,7 @@ if(sys.argv[1]=="exec"):
     client.execute(code);
     
 if(sys.argv[1]=="info"):
     client.execute(code);
     
 if(sys.argv[1]=="info"):

-    a=client.peekbyte(0xff0);
-    b=client.peekbyte(0xff1);
-    print "GoodFET with %02x%02x MCU" % (a,b);
+    print "GoodFET with %s MCU" % client.infostring();

 if(sys.argv[1]=="ramfill"):
     client.monitor_ram_pattern();
 if(sys.argv[1]=="ramdepth"):
 if(sys.argv[1]=="ramfill"):
     client.monitor_ram_pattern();
 if(sys.argv[1]=="ramdepth"):