radios/ccspi firmware fixed off-by-one error on packet rx; GoodFET.py added serInit...

[goodfet] / client / GoodFETNRF.py

diff --git a/client/GoodFETNRF.py b/client/GoodFETNRF.py
index 6afd934..85a687b 100644 (file)
--- a/client/GoodFETNRF.py
+++ b/client/GoodFETNRF.py
@@ -26,6 +26,18 @@ class GoodFETNRF(GoodFET):
         self.writecmd(self.NRFAPP,0x00,len(data),data);
         return self.data;
     
+    def tune(self,tuning="aa,c78c65805e,14,09"):
+        """Tune the radio."""
+        #MAC,rA,r5,r6
+        fields=tuning.split(",");
+        ra=int(fields[1],16);
+        r5=int(fields[2],16);
+        r6=int(fields[3],16);
+        self.poke(0x0a,ra,5);
+        self.poke(0x05,r5,1);
+        self.poke(0x06,r6,1);
+        self.RF_setmaclen(3);
+        return;
     def peek(self,reg,bytes=-1):
         """Read an NRF Register.  For long regs, result is flipped."""
         data=[reg,0,0,0,0,0];
@@ -74,7 +86,7 @@ class GoodFETNRF(GoodFET):
         return "GFSK";
     def RF_getrate(self):
         rate=self.peek(0x06)&0x28;
-        if rate==0x28:
+        if rate==0x20:
             rate=250*10**3; #256kbps
         elif rate==0x08:
             rate=2*10**6;  #2Mbps
@@ -91,7 +103,7 @@ class GoodFETNRF(GoodFET):
         elif rate==250*10**3:
             r6=r6|0x20;
         print "Setting r6=%02x." % r6;
-        self.poke(0x06,r6); #Write new setting.
+        self.poke(0x06,r6); #Write new rate.
     def RF_setfreq(self,frequency):
         """Set the frequency in Hz."""
         
@@ -100,6 +112,8 @@ class GoodFETNRF(GoodFET):
         
         chan=frequency/1000000-2400;
         self.poke(0x05,chan);
+
+
     def RF_getfreq(self):
         """Get the frequency in Hz."""
         
@@ -162,7 +176,7 @@ class GoodFETNRF(GoodFET):
         """Hold a carrier wave on the present frequency."""
         # Set CONT_WAVE, PLL_LOCK, and 0dBm in RF_SETUP            
         self.poke(0x06,8+10+4+2); 
-        
+    
     packetlen=16;
     def RF_setpacketlen(self,len=16):
         """Set the number of bytes in the expected payload."""
@@ -176,14 +190,16 @@ class GoodFETNRF(GoodFET):
     maclen=5;
     def RF_getmaclen(self):
         """Get the number of bytes in the MAC address."""
-        choices=[0, 3, 4, 5];
+        choices=[2, 3, 4, 5];
         choice=self.peek(0x03)&3;
         self.maclen=choices[choice];
         return self.maclen;
     def RF_setmaclen(self,len):
         """Set the number of bytes in the MAC address."""
-        choices=["illegal", "illegal", "illegal", 
-                 1, 2, 3];
+        choices=["illegal", "illegal",
+                 0,       #undocumented 
+                 1, 2, 3  #documented
+                 ];
         choice=choices[len];
         self.poke(0x03,choice);
         self.maclen=len;