X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.nrf;h=117a272d4dff9abc0581dc73abc09714f9441a50;hp=dce4dd33c7fb4b4a78a5192e1a93f35c9bdda3d3;hb=7d033e4958693f8a618679d49eeae0ed735f996b;hpb=7302819228043be0046422c5b64175df7ce1113b

diff --git a/client/goodfet.nrf b/client/goodfet.nrf
index dce4dd3..117a272 100755
--- a/client/goodfet.nrf
+++ b/client/goodfet.nrf
@@ -19,12 +19,25 @@ def printpacket(packet):
         if i>client.packetlen: break;
         s="%s %02x" % (s,ord(foo));
     print "%s" %s;
-    
+
+def printconfig():
+    print "Encoding %s" % client.RF_getenc();
+    print "Freq    %10i MHz" % (client.RF_getfreq()/10**6);
+    print "Rate    %10i kbps" % (client.RF_getrate()/1000);
+    print "PacketLen %02i bytes" % client.RF_getpacketlen();
+    print "MacLen    %2i bytes" % client.RF_getmaclen();
+    print "SMAC  0x%010x" % client.RF_getsmac();
+    print "TMAC  0x%010x" % client.RF_gettmac();
+
 
 if(len(sys.argv)==1):
     print "Usage: %s verb [objects]\n" % sys.argv[0];
     print "%s info" % sys.argv[0];
     print "%s test" % sys.argv[0];
+    print "%s regs" % sys.argv[0];
+    print "%s sniff\n\tSniffs packets by current config." % sys.argv[0];
+    print "%s sniffob\n\tSniffs OpenBeacon traffic." % sys.argv[0];
+    print "%s carrier [freq]\n\tHolds a carrier on [freq] Hz." % sys.argv[0];
     sys.exit();
 
 #Initialize FET and set baud rate
@@ -33,35 +46,88 @@ client.serInit()
 
 client.NRFsetup();
 
+if(sys.argv[1]=="info"):
+    printconfig();
 
 if(sys.argv[1]=="test"):
+    print "Old registers:"
+    printconfig();
+    
     # Set PWR_UP=1 and PRIM_RX=0 in CONFIG.
     client.poke(0x00,2);
     #Delay of 1.5ms by round-trip.
-    # Set CONT_WAVE, PLL_LOCK, and 0dBm in RF_SETUP
-    client.poke(0x06,8+10+4+2); 
-    client.RF_setfreq(2480 * 10**6);
     
-    #Print registers, just for fun.
-    print "SMAC was %010x" % client.RF_getsmac();
+    print "\n\n";
     
+    #Try all data rates
+    for foo in [250*10**3,
+                1*10**6,
+                2*10**6]:
+        client.RF_setrate(foo);
+        if(client.RF_getrate()!=foo):
+            print "ERROR Rate %i not supported.  Got %i instead." % (foo,
+                                                                     client.RF_getrate());
+    
+    print "\n\n";
     client.poke(0x0A,0xDEADBEEF,5);
-    print "SMAC set to %010x" % client.RF_getsmac();
+    #print "SMAC set to %010x" % client.RF_getsmac();
     if client.RF_getsmac()!=0xdeadbeef:
         print "ERROR: Failed to set MAC address.";
-
+    print "Final registers:"
+    printconfig();
+    
+if(sys.argv[1]=="carrier"):
+    if len(sys.argv)>2:
+        client.RF_setfreq(eval(sys.argv[2]));
+    client.RF_carrier();
+    printconfig();
+    print "\nHolding a carrier wave.";
+    while(1):
+        time.sleep(1);
 if(sys.argv[1]=="regs"):
-    for r in range(0,30):
-        print "r[0x%02x]=0x%02x" % (r,client.peek(r));
+    regnames=["CONFIG","EN_AA","EN_RXADDR","SETUP_AW","SETUP_RET",
+              "RF_CH","RF_SETUP","STATUS","OBSERVE_TX","RPD",
+              "RX_ADDR_P0","RX_ADDR_P1","RX_ADDR_P2","RX_ADDR_P3","RX_ADDR_P4","RX_ADDR_P5",
+              "TX_ADDR",
+              "RX_PW_P0","RX_PW_P1","RX_PW_P2","RX_PW_P3","RX_PW_P4","RX_PW_P5",
+              "FIFO_STATUS","?",
+              "?","?","DYNPD","?","?","?","?","?",
+              "?","?","?","?","?","?","?","?"];
+    for r in range(0,0x20):
+        print "r[0x%02x]=0x%010x //%16s " % (r,client.peek(r),regnames[r]);
+
+if(sys.argv[1]=="peek"):
+    start=0x0000;
+    if(len(sys.argv)>2):
+        start=int(sys.argv[2],16);
+    stop=start;
+    if(len(sys.argv)>3):
+        stop=int(sys.argv[3],16);
+    print "Peeking from %02x to %02x." % (start,stop);
+    while start<=stop:
+        print "%02x: %010x" % (start,client.peek(start));
+        start=start+1;
+if(sys.argv[1]=="poke"):
+    start=0x0000;
+    val=0x00;
+    if(len(sys.argv)>2):
+        start=int(sys.argv[2],16);
+    if(len(sys.argv)>3):
+        val=int(sys.argv[3],16);
+    print "Poking %02x to become %010x." % (start,val);
+    
+    client.poke(start,val);
+    print "Poked to %04x" % client.peek(start);
 
 if(sys.argv[1]=="sniffob"):
-    #Reversal of transmitter code from nRF_CMD.c
+    #Reversal of transmitter code from nRF_CMD.c of OpenBeacon
+    #TODO remove all poke() calls.
+    
     client.poke(0x00,0x00); #Stop nRF
     client.poke(0x01,0x00); #Disable Shockburst
     client.poke(0x02,0x01); #Set RX Pipe 0
-    client.poke(0x03,0x03); #SETUP_AW for 5-byte addresses.
+    client.RF_setmaclen(5); # SETUP_AW for 5-byte addresses.
     client.RF_setfreq(2481 * 10**6);
-    #client.RF_setfreq(2490 * 10**6);
     client.poke(0x06,0x09); #2MBps, -18dBm in RF_SETUP
     client.poke(0x07,0x78); #Reset status register
     
@@ -72,12 +138,29 @@ if(sys.argv[1]=="sniffob"):
     client.RF_settmac(0x424541434F);
     
     #Set packet length of 16.
-    #client.poke(0x11,16);
     client.RF_setpacketlen(16);
     
     #Power radio, prime for RX, checksum.
     client.poke(0x00,0x70|0x03|0x08);
     
+    print "Listening as %010x on %i MHz" % (client.RF_getsmac(),
+                                           client.RF_getfreq()/10**6);
+    #Now we're ready to get packets.
+    
+    while 1:
+        packet=None;
+        while packet==None:
+            #time.sleep(0.1);
+            packet=client.RF_rxpacket();
+        printpacket(packet);
+        sys.stdout.flush();
+
+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);
     
     print "Listening as %010x on %i MHz" % (client.RF_getsmac(),
                                            client.RF_getfreq()/10**6);