X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.nrf;h=7d87b3bc2211c3f565d0dd29e8a1c07607666d5c;hp=5cc9b8f7332ee02965ceddfce559886f961cd467;hb=cf47ccc725fd13d7216400149190328c6077a010;hpb=1ffbcb9d3d58e2363677546f6b5d8376b2766f41

diff --git a/client/goodfet.nrf b/client/goodfet.nrf
index 5cc9b8f..7d87b3b 100755
--- a/client/goodfet.nrf
+++ b/client/goodfet.nrf
@@ -19,12 +19,20 @@ def printpacket(packet):
         if i>client.packetlen: break;
         s="%s %02x" % (s,ord(foo));
     print "%s" %s;
-    
+
+def printconfig():
+    print "SMAC  0x%010x" % client.RF_getsmac();
+    print "TMAC  0x%010x" % client.RF_gettmac();
+    print "Freq    %10i MHz" % (client.RF_getfreq()/10**6);
+    print "PacketLen %02i" % client.RF_getpacketlen();
+    print "MacLen    %02i" % client.RF_getmaclen();
 
 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 sniffob\n\tSniffs OpenBeacon traffic." % sys.argv[0];
+    print "%s regs" % sys.argv[0];
     sys.exit();
 
 #Initialize FET and set baud rate
@@ -33,6 +41,8 @@ client.serInit()
 
 client.NRFsetup();
 
+if(sys.argv[1]=="info"):
+    printconfig();
 
 if(sys.argv[1]=="test"):
     # Set PWR_UP=1 and PRIM_RX=0 in CONFIG.
@@ -43,7 +53,8 @@ if(sys.argv[1]=="test"):
     client.RF_setfreq(2480 * 10**6);
     
     #Print registers, just for fun.
-    print "SMAC was %010x" % client.RF_getsmac();
+    print "SMAC  0x%010x" % client.RF_getsmac();
+    print "Freq    %10i MHz" % (client.RF_getfreq()/10**6);
     
     client.poke(0x0A,0xDEADBEEF,5);
     print "SMAC set to %010x" % client.RF_getsmac();
@@ -51,17 +62,18 @@ if(sys.argv[1]=="test"):
         print "ERROR: Failed to set MAC address.";
 
 if(sys.argv[1]=="regs"):
-    for r in range(0,30):
-        print "r[0x%02x]=0x%02x" % (r,client.peek(r));
+    for r in range(0,0x20):
+        print "r[0x%02x]=0x%010x" % (r,client.peek(r));
 
 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,13 +84,11 @@ 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.
@@ -86,6 +96,7 @@ if(sys.argv[1]=="sniffob"):
     while 1:
         packet=None;
         while packet==None:
-            time.sleep(0.1);
+            #time.sleep(0.1);
             packet=client.RF_rxpacket();
         printpacket(packet);
+        sys.stdout.flush();