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

diff --git a/client/GoodFET.py b/client/GoodFET.py
index b6d9033..e459a91 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):
@@ -378,6 +378,11 @@ class GoodFET:
         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);
@@ -511,15 +516,25 @@ 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"):
+        """Peek a natively sized word of memory."""
         return self.peek(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 loadsymbols(self):
+        """Load symbols from a file."""
         return;