readChunk (may replace readMem) is implemented, moving memory into regs then reading...

[goodfet] / client / GoodFETNRF.py

diff --git a/client/GoodFETNRF.py b/client/GoodFETNRF.py
index 007ae0f..e95b9cf 100644 (file)
--- a/client/GoodFETNRF.py
+++ b/client/GoodFETNRF.py
@@ -91,7 +91,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 +100,8 @@ class GoodFETNRF(GoodFET):
         
         chan=frequency/1000000-2400;
         self.poke(0x05,chan);
+
+
     def RF_getfreq(self):
         """Get the frequency in Hz."""
         
@@ -145,9 +147,22 @@ class GoodFETNRF(GoodFET):
             self.writecmd(self.NRFAPP,0x82,0,None); #Flush
             self.poke(0x07,0x40);#clear bit.
         return None;
+    def RF_txpacket(self,payload):
+        """Transmit a packet.  Untested."""
+        if self.peek(0x07) & 0x40:
+            #Packet has arrived.
+            self.writecmd(self.NRFAPP,0x81,0,None); #RX Packet
+            data=self.data;
+            self.poke(0x07,0x40);#clear bit.
+            return data;
+        elif self.peek(0x07)==0:
+            self.writecmd(self.NRFAPP,0x83,0,None); #Flush
+            self.poke(0x07,0x40);#clear bit.
+        return None;
+
     def RF_carrier(self):
         """Hold a carrier wave on the present frequency."""
-        # Set CONT_WAVE, PLL_LOCK, and 0dBm in RF_SETUP
+        # Set CONT_WAVE, PLL_LOCK, and 0dBm in RF_SETUP            
         self.poke(0x06,8+10+4+2); 
         
     packetlen=16;
@@ -163,7 +178,7 @@ class GoodFETNRF(GoodFET):
     maclen=5;
     def RF_getmaclen(self):
         """Get the number of bytes in the MAC address."""
-        choices=["illegal", 3, 4, 5];
+        choices=[0, 3, 4, 5];
         choice=self.peek(0x03)&3;
         self.maclen=choices[choice];
         return self.maclen;