X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETEM260.py;h=6bfb1edc53bd0a32dfe06da03f3af5d930255763;hp=7bc51ace3462f1f6c6cf3857c547212b24ecb698;hb=69d45b39c9ab9f3e814dea7462773e42f461ce22;hpb=68b3ba0e68376630d0ce37c80048b3c107661007

diff --git a/client/GoodFETEM260.py b/client/GoodFETEM260.py
index 7bc51ac..6bfb1ed 100644
--- a/client/GoodFETEM260.py
+++ b/client/GoodFETEM260.py
@@ -23,40 +23,77 @@ from GoodFETSPI import GoodFETSPI;
 class GoodFETEM260(GoodFETSPI):
     EM260APP=0x01;
     seq=0;
-    def EM260trans(self,data):
+    def EM260trans(self,data,retry=1):
         """Exchange data by EM260 SPI. (Slightly nonstandard.)"""
-        self.data=data;
+        
+        if retry==0:
+            #Retries exceeded.  Send a trivial command to clear error.
+            data=[0x0A,0xA7];
         self.writecmd(0x01,0x82,len(data),data);
         
+        
         try:
             reply=ord(self.data[0]);
             if(reply==0x00):
-                print "Warning: EM260 rebooted.";
-                return self.EM260trans(data);
+                #print "Warning: EM260 rebooted.";
+                return self.EM260trans(data,retry-1);
             if(reply==0x02):
-                print "Error: Aborted Transaction.";
-                #return self.EM260trans(data);
+                #print "Error: Aborted Transaction.";
+                return self.EM260trans(data,retry-1);
             if(reply==0x03):
                 print "Error: Missing Frame Terminator.";
-                #return self.data;
+                return self.data;
+            if(reply==0x04):
+                print "Error: Reserved Error.  (Access denied?)";
+                return self.data;
         except:
             print "Error in EM260trans.";
         return self.data;
     
-    
+    def EZSPtrans(self,frame):
+        """Send an EZSP frame."""
+        data=self.EM260trans([0xFE,len(frame)+2,
+                              self.seq&0xFF,0x00,
+                              ]+frame+[
+                              0xA7]);
+        #s="EZSP< ";
+        #for foo in data:
+        #    s=s+"%02x " % ord(foo);
+        #print s;
+        
+        if ord(data[0])!=0xFE:
+            print "EZSP error: 0x%02x" % ord(data[0]);
+        if ord(data[4])==0x58:
+            print "EZSP Invalid Command";
+            return None;
+        if frame[0]!=ord(data[4]):
+            print "EZSP warning: Command 0x%02x returned type 0x%02x." % (
+                frame[0],ord(data[4]));
+        self.seq=self.seq+1;
+        return data;
+        
     def peek8(self,adr):
+        """Read a byte from the given address.  Untested."""
+        
+        data=self.EZSPtrans([0x47,adr&0xFF,10]);
+        
+        return ord(data[6]);
+    def poke8(self,adr,val):
+        """Poke a value into RAM.  Untested"""
+        self.EZSPtrans([0x46,adr&0xFF,1,val&0xFF]);
+        return val;
+    def rand16(self):
         """Read a byte from the given address."""
-        data=self.EM260trans([0xfe,0x01,self.seq,0x00,
-                            0x49,
-                            0xA7]);
-        s="";
-        for foo in data:
-            s=s+"%02x " % ord(foo);
-        print s;
         
-        return ord(data[0]);
+        data=self.EZSPtrans([0x49]);
+        if data==None:
+            print "Insufficient random data.";
+            return 0;
+        return ord(data[6])+(ord(data[7])<<8);
+    
     def info(self):
         """Read the info bytes."""
+        print "Ember EM26 Z-Stack SPI Module.";
         version=self.EM260spiversion();
         status=self.EM260spistatus();
         print "Version: %i" % (version); 
@@ -84,7 +121,7 @@ class GoodFETEM260(GoodFETSPI):
             return self.EM260spistatus();
         if status==0x02:
             return self.EM260spistatus();
-        if not status&0xC0:
+        if not status&0x80 and status&0x40:
             print "Status misread.";
             return 0;
         return status&1;