X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFET.py;h=65fb46cce5a35170e660f25f95fb6ac7716b44ce;hp=b6d9033cf424de229727114ebb6a5f15bae950b8;hb=5fb0341d348e101b30794945a6c91546e25e8e7b;hpb=298b6f182122a80ef2407f2b43831c2ccb7923a3

diff --git a/client/GoodFET.py b/client/GoodFET.py
index b6d9033..65fb46c 100755
--- a/client/GoodFET.py
+++ b/client/GoodFET.py
@@ -287,9 +287,9 @@ class GoodFET:
                     return self.data;
             except TypeError:
                 if self.connected:
-                    print "Error: waiting for serial read timed out (most likely).";
-                    print "This shouldn't happen after syncing.  Exiting for safety.";                    
-                    sys.exit(-1)
+                    print "Warning: waiting for serial read timed out (most likely).";
+                    #print "This shouldn't happen after syncing.  Exiting for safety.";                    
+                    #sys.exit(-1)
                 return self.data;
     #Glitching stuff.
     def glitchApp(self,app):
@@ -372,12 +372,26 @@ class GoodFET:
     def eeprompeek(self,address):
         """Read a word of memory from the monitor."""
         return self.peekbyte(address)+(self.peekbyte(address+1)<<8);
-    
-    def pokebyte(self,address,value):
+    def peekbysym(self,name):
+        """Read a value by its symbol name."""
+        #TODO include memory in symbol.
+        reg=self.symbols.get(name);
+        return self.peek8(reg,"data");
+    def pokebysym(self,name,val):
+        """Write a value by its symbol name."""
+        #TODO include memory in symbol.
+        reg=self.symbols.get(name);
+        return self.pokebyte(reg,val);
+    def pokebyte(self,address,value,memory="vn"):
         """Set a byte of memory by the monitor."""
         self.data=[address&0xff,address>>8,value];
         self.writecmd(0,0x03,3,self.data);
         return ord(self.data[0]);
+    def poke16(self,address,value):
+        """Set a word of memory by the monitor."""
+        self.pokebyte(address,value&0xFF);
+        self.pokebyte(address,(value>>8)&0xFF);
+        return value;
     def setsecret(self,value):
         """Set a secret word for later retreival.  Used by glitcher."""
         self.eeprompoke(0,value);
@@ -464,6 +478,30 @@ class GoodFET:
             if self.verbose: print "Comm error recognized by monitorecho().";
             return 0;
         return 1;
+
+    def monitor_info(self):
+        print "GoodFET with %s MCU" % self.infostring();
+        print "Clocked at %s" % self.monitorclocking();
+        return 1;
+
+    def monitor_list_apps(self, full=False): 
+        self.monitor_info()
+        old_value = self.besilent
+        self.besilent = True    # turn off automatic call to readcmd
+        self.writecmd(self.MONITORAPP, 0x82, 1, [int(full)]);
+        self.besilent = old_value
+        
+        # read the build date string 
+        self.readcmd()
+        print "Build Date: %s" % self.data
+        print "Firmware apps:"
+        while True:
+            self.readcmd()
+            if self.count == 0:
+                break
+            print self.data
+        return 1;
+
     def monitorclocking(self):
         """Return the 16-bit clocking value."""
         return "0x%04x" % self.monitorgetclock();
@@ -476,7 +514,7 @@ class GoodFET:
         return self.peek16(0x56);
     # The following functions ought to be implemented in
     # every client.
-
+    
     def infostring(self):
         a=self.peekbyte(0xff0);
         b=self.peekbyte(0xff1);
@@ -511,15 +549,31 @@ class GoodFET:
         """Dump an intel hex file from code memory."""
         print "Dump not implemented.";
     def peek32(self,address, memory="vn"):
+        """Peek 32 bits."""
         return (self.peek16(address,memory)+
                 (self.peek16(address+2,memory)<<16));
     def peek16(self,address, memory="vn"):
+        """Peek 16 bits of memory."""
         return (self.peek8(address,memory)+
                 (self.peek8(address+1,memory)<<8));
     def peek8(self,address, memory="vn"):
+        """Peek a byte of memory."""
         return self.peekbyte(address); #monitor
     def peekword(self,address, memory="vn"):
-        return self.peek(address); #monitor
-    
+        """Peek a natively sized word of memory."""
+        return self.peek16(address); #monitor
+    def peekblock(self,address,length,memory="vn"):
+        """Return a block of data."""
+        data=range(0,length);
+        for foo in range(0,length):
+            data[foo]=self.peek8(address+foo,memory);
+        return data;
+    def pokeblock(self,address,bytes,memory="vn"):
+        """Poke a block of a data into memory at an address."""
+        for foo in bytes:
+            self.pokebyte(address,foo,memory);
+            address=address+1;
+        return;
     def loadsymbols(self):
+        """Load symbols from a file."""
         return;