Forget 'self.' in verbose.

[goodfet] / client / GoodFETNRF.py

diff --git a/client/GoodFETNRF.py b/client/GoodFETNRF.py
index 0c62cdf..e9c44c1 100644 (file)
--- a/client/GoodFETNRF.py
+++ b/client/GoodFETNRF.py
@@ -40,29 +40,71 @@ class GoodFETNRF(GoodFET):
         for i in range(0,bytes):
             data=data+[(val>>(8*i))&0xFF];
         self.writecmd(self.NRFAPP,0x03,len(data),data);
-        if self.peek(reg,bytes)!=val:
+        if self.peek(reg,bytes)!=val and reg!=0x07:
             print "Warning, failed to set register %02x." %reg;
         return;
     
     def status(self):
         """Read the status byte."""
-        self.poke(0x07,0x78); #Reset status
         status=self.peek(0x07);
         print "Status=%02x" % status;
     
     #Radio stuff begins here.
-    def RF_freq(self,frequency):
+    def RF_setfreq(self,frequency):
         """Set the frequency in Hz."""
         
         #On the NRF24L01+, register 0x05 is the offset in
         #MHz above 2400.
         
-        mhz=frequency/1000000-2400;
-        print "Setting channel %i." % mhz 
-        self.poke(0x05,mhz);
+        chan=frequency/1000000-2400;
+        self.poke(0x05,chan);
+    def RF_getfreq(self):
+        """Get the frequency in Hz."""
+        
+        #On the NRF24L01+, register 0x05 is the offset in
+        #MHz above 2400.
+        
+        return (2400+self.peek(0x05))*10**6
+        self.poke(0x05,chan);
     def RF_getsmac(self):
         """Return the source MAC address."""
         
         #Register 0A is RX_ADDR_P0, five bytes.
         mac=self.peek(0x0A, 5);
         return mac;
+    def RF_setsmac(self,mac):
+        """Set the source MAC address."""
+        
+        #Register 0A is RX_ADDR_P0, five bytes.
+        self.poke(0x0A, mac, 5);
+        return mac;
+    def RF_gettmac(self):
+        """Return the target MAC address."""
+        
+        #Register 0x10 is TX_ADDR, five bytes.
+        mac=self.peek(0x0A, 5);
+        return mac;
+    def RF_settmac(self,mac):
+        """Set the target MAC address."""
+        
+        #Register 0x10 is TX_ADDR, five bytes.
+        self.poke(0x10, mac, 5);
+        return mac;
+    def RF_rxpacket(self):
+        """Get a packet from the radio.  Returns None if none is waiting."""
+        if self.peek(0x07) & 0x40:
+            #Packet has arrived.
+            self.writecmd(self.NRFAPP,0x80,0,None); #RX Packet
+            data=self.data;
+            self.poke(0x07,0x40);#clear bit.
+            return data;
+        elif self.peek(0x07)==0:
+            self.writecmd(self.NRFAPP,0x82,0,None); #Flush
+            self.poke(0x07,0x40);#clear bit.
+        return None;
+    packetlen=16;
+    def RF_setpacketlen(self,len=16):
+        """Set the number of bytes in the expected payload."""
+        self.poke(0x11,len);
+        self.packetlen=len;
+