Better autotune.

[goodfet] / client / goodfet.nrf

diff --git a/client/goodfet.nrf b/client/goodfet.nrf
index 80f38fc..2492933 100755 (executable)
--- a/client/goodfet.nrf
+++ b/client/goodfet.nrf
@@ -237,13 +237,22 @@ if(sys.argv[1]=="sniffprom"):
 
 class AutoTuner():
     """This guesses addresses by searching through packets."""
-    #packets=[];
     addresses={};
     client=None;
-    def init(self,goodfet):
+    
+    #Limits on search space, because you usually know what you're looking for.
+    rate=False;
+    chan=False;
+    sync=False;
+    def init(self,goodfet,
+             rate=True,chan=True,sync=True):
         """Initializes a link to the GoodFET for autotuning."""
         self.client=goodfet;
-    def packetaddr(self,packet):
+        self.rate=rate;
+        self.chan=chan;
+        self.sync=sync;
+        return;
+    def packetaddr(self,packet,justmac=False):
         """Returns a loaded packet address, including channel and rate."""
         
         sync=self.client.RF_getsmac()&0xFF;
@@ -252,14 +261,29 @@ class AutoTuner():
         #MAC,RF_CH,RATE
         for i in range(0,5):
             mac="%s%02x" % (mac,ord(packet[i]));
+        if justmac:
+            return mac;
         ch=self.client.peek(0x05);
         rate=self.client.peek(0x06);
         return "%02x,%s,%02x,%02x" % (
             sync,mac,ch,rate);
+    def validmac(self,packet):
+        sync=self.client.RF_getsmac()&0xFF;
+        mac=self.packetaddr(packet,justmac=True);
+        if (ord(packet[0])&0x80)^(sync&0x80):
+            #print "%02x%02x invalid entry." % (sync,ord(packet[0]));
+            return False;
+        if mac=='5555555555' or mac=='aaaaaaaaaa':
+            return False;
+        return True;
+        
     def handle(self,packet):
         """Handles a packet."""
         #printpacket(packet);
-        #self.packets.append(packet);
+        if not self.validmac(packet):
+            #print "Dropped packet:";
+            #printpacket(packet);
+            return;
         addr=self.packetaddr(packet);
         
         #Increment the address count.
@@ -275,31 +299,39 @@ class AutoTuner():
                 addr,count,rate);
         return;
     tunecount=0;
-    def retune(self,freqmod=0x52):
+    def retune(self):
         """Tunes to another channel or preamble looking for the next packet."""
-        count=self.tunecount+1;
-        self.tunecount=count;
+        count=self.tunecount;
+        self.tunecount=count+1;
         
         #Swap the SYNC value most often.
-        sync=0xAA;
-        if count&1:
-            sync=0x55;
-        self.client.RF_setsmac(sync);
-        count=(count>>1);
+        if self.sync:
+            sync=0xAA;
+            if count&1:
+                sync=0x55;
+            self.client.RF_setsmac(sync);
+            count=(count>>1);
         
-        #Then the data rate.
-        rate=0;
-        
-        #This swaps between 1Mbps and 2Mbps.
-        #TODO add support for 256kbps, if anyone uses it.
-        if count&1:
-            rate=rate|0x08;
-        #print "Setting rate to 0x%02x" % rate;
-        if(rate==0x20):
-            rate=0x08;
-        self.client.poke(0x06,rate);
-        count=(count>>2);
+        if self.rate:
+            #Then the data rate.
+            rate=0;
+            
+            #This swaps between 1Mbps and 2Mbps.
+            #TODO add support for 256kbps, if anyone uses it.
+            if count&1:
+                rate=rate|0x08;
+            #print "Setting rate to 0x%02x" % rate;
+            if(rate==0x20):
+                rate=0x08;
+            self.client.poke(0x06,rate);
+            count=(count>>1);
         
+        if self.chan:
+            self.client.poke(0x05,
+                             (count+16)&0x7f);
+            print "Tuned to %i MHz" % (
+                self.client.RF_getfreq()
+                /(10**6));
         #Grab two packets to clear buffers.
         #Should retune only after a few packets to reduce this delay.
         packet=client.RF_rxpacket();
@@ -311,14 +343,14 @@ if(sys.argv[1]=="autotune"):
     #Reversal of transmitter code from nRF_CMD.c of OpenBeacon
     #TODO remove all poke() calls.
     guesser=AutoTuner();
-    guesser.init(client);
+    guesser.init(client,rate=True,sync=True,chan=True);
     
     client.poke(0x00,0x00); #Stop nRF
     client.poke(0x01,0x00); #Disable Shockburst
     client.poke(0x02,0x01); #Set RX Pipe 0
     
     #client.RF_setfreq(2481 * 10**6);
-    #client.poke(0x06,0x09); #2MBps, -18dBm in RF_SETUP
+    client.poke(0x06,0x09); #2MBps, -18dBm in RF_SETUP
     client.poke(0x07,0x78); #Reset status register
     
     #OpenBeacon defines these in little endian as follows.
@@ -340,10 +372,14 @@ if(sys.argv[1]=="autotune"):
     print "sync,mac,r5,r6";
     #Now we're ready to get packets.
     while 1:
-        packet=None;
-        while packet==None:
-            packet=client.RF_rxpacket();
-        guesser.handle(packet);
+        #Full second on each packet.
+        start=time.mktime(time.localtime());
+        while (time.mktime(time.localtime())-start) < 5:
+            packet=None;
+            while packet==None:
+                packet=client.RF_rxpacket();
+            guesser.handle(packet);
+        #print "Retuning."
         guesser.retune();
         sys.stdout.flush();
 
@@ -362,7 +398,7 @@ if(sys.argv[1]=="sniffmskb"):
     #Other keyboards will be different.
     
     
-    client.RF_setmaclen(2);
+    client.RF_setmaclen(5);
     
     #Known pairs.  The channel and the low address bytes must match.
     #client.RF_setfreq((2400+0x13) * 10**6);
@@ -526,8 +562,12 @@ if(sys.argv[1]=="sniff"):
     #client.poke(0x00,0x00); #Stop nRF
     client.poke(0x07,0x78); #Reset status register
     
-    #Power radio, prime for RX, checksum.
-    client.poke(0x00,0x70|0x03|0x08);
+    #Power radio, prime for RX, no checksum.
+    client.poke(0x00,0x70|0x03);
+    #Mac packet length.
+    client.RF_setpacketlen(32);
+    #Mac length, reduced
+    client.RF_setmaclen(3); # SETUP_AW for shortest
     
     print "Listening as %010x on %i MHz" % (client.RF_getsmac(),
                                            client.RF_getfreq()/10**6);