X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETEM260.py;h=ef2bf0c6fecbb25d9188a3c85c2feb6b9abc15b6;hp=0fedd58798f8ccfb3fd1b8116ee566629f2f24d5;hb=f7fdc48f01ada713d5034763a2f3395fe2a7c51b;hpb=6c02800bfe615056dfb67f0285e569e199e8142b

diff --git a/client/GoodFETEM260.py b/client/GoodFETEM260.py
index 0fedd58..ef2bf0c 100644
--- a/client/GoodFETEM260.py
+++ b/client/GoodFETEM260.py
@@ -16,7 +16,7 @@
 
 # The delay is mandatory.
 
-import sys, time, string, cStringIO, struct, glob, serial, os;
+import sys, time, string, cStringIO, struct, glob, os;
 
 from GoodFETSPI import GoodFETSPI;
 
@@ -53,35 +53,44 @@ class GoodFETEM260(GoodFETSPI):
     def EZSPtrans(self,frame):
         """Send an EZSP frame."""
         data=self.EM260trans([0xFE,len(frame)+2,
-                              self.seq,0x00,
+                              self.seq&0xFF,0x00,
                               ]+frame+[
                               0xA7]);
-        #s="";
-        #for foo in data:
-        #    s=s+"%02x " % ord(foo);
-        #print s;
+        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 because 0x%02x" % ord(data[5]);
+            return data;
         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;
-        #return ord(data[0]);
         
     def peek8(self,adr):
-        """Read a byte from the given address."""
+        """Read a byte from the given address.  Untested."""
         
-        data=self.EZSPtrans([0x47,adr&0xFF]);
+        data=self.EZSPtrans([0x47,adr&0xFF,10]);
         
-        return ord(data[0]);
-    
+        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."""
+        """Read a random 16-bit word."""
         
         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.";
@@ -89,6 +98,10 @@ class GoodFETEM260(GoodFETSPI):
         status=self.EM260spistatus();
         print "Version: %i" % (version); 
         print "Status:  %s" % (["dead","alive"][status]);
+        print ""
+        self.setVersion();
+        print "Node ID: %04x" % (self.getNodeID());
+        print "Connected to %2i neighbors." % self.neighborCount();
     def EM260spiversion(self):
         """Read the SPI version number from EM260."""
         data=self.EM260trans([0x0A,0xA7]);        
@@ -116,3 +129,35 @@ class GoodFETEM260(GoodFETSPI):
             print "Status misread.";
             return 0;
         return status&1;
+    
+    #Everything after here is ZigBee.
+    
+    def getNodeID(self):
+        """Read the EZSP node id."""
+        
+        data=self.EZSPtrans([0x27]);
+        return ord(data[5])+(ord(data[6])<<8);
+    def neighborCount(self):
+        """Read the count of neighbors, used for iterating the neighbor table."""
+        
+        data=self.EZSPtrans([0x7A]);
+        return ord(data[5]);
+    def setRadioChannel(self,channel):
+        """Set the radio channel."""
+        
+        data=self.EZSPtrans([0x9A, channel&xFF]);
+        return ord(data[5]);
+    def setVersion(self,version=2):
+        """Set the requested EZSP protocol version."""
+        
+        data=self.EZSPtrans([0x00, version]);
+        newversion=ord(data[5]);
+        if version==newversion:
+            print "Version set."
+            print "Protocol %i, stack type %i, Stack Version 0x%02x%02x." % (
+                newversion,
+                ord(data[6]),
+                ord(data[8]),
+                ord(data[7]));
+        else:
+            self.setVersion(newversion);