X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.nrf;h=a64e7c8ad418305dd1f1c780eebc247e4b6f6cfa;hp=14f3e9bf95b0987b0db9697fcb9cf38200e1b5c6;hb=46911acb1c879cf7f43f2ac0ae56478a1b4fee24;hpb=a84301b1952e524c5ebc4731cddc6b0ec406a9a8

diff --git a/client/goodfet.nrf b/client/goodfet.nrf
index 14f3e9b..a64e7c8 100755
--- a/client/goodfet.nrf
+++ b/client/goodfet.nrf
@@ -46,9 +46,14 @@ if(len(sys.argv)==1):
     print "%s test" % sys.argv[0];
     print "%s regs" % sys.argv[0];
     print "%s pyregs" % 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 snifftp\n\tSniffs Tunrning Point Clicker traffic." % sys.argv[0];
+    print "%s snifftp\n\tSniffs Turning Point Clicker traffic." % sys.argv[0];
+    print "%s snifftp\n\tSniffs SparkFun Dongle traffic." % sys.argv[0];
+    
+    print "%s hosttp\n\tHosts Turning Point Clicker traffic." % sys.argv[0];
+
     print "%s carrier [freq]\n\tHolds a carrier on [freq] Hz." % sys.argv[0];
     sys.exit();
 
@@ -161,7 +166,8 @@ if(sys.argv[1]=="sniffob"):
             packet=client.RF_rxpacket();
         printpacket(packet);
         sys.stdout.flush();
-if(sys.argv[1]=="snifftp"):
+
+if(sys.argv[1]=="sniffsf"):
     #Reversal of transmitter code from nRF_CMD.c of OpenBeacon
     #TODO remove all poke() calls.
     
@@ -169,21 +175,49 @@ if(sys.argv[1]=="snifftp"):
     client.poke(0x01,0x00); #Disable Shockburst
     client.poke(0x02,0x01); #Set RX Pipe 0
     
-    client.RF_setfreq((2400+0x29) * 10**6);
-    client.poke(0x06,0x00); #1Mbps
+    client.RF_setfreq(2402 * 10**6);
+    client.poke(0x06,0x07); #1Mbps
     client.poke(0x07,0x78); #Reset status register
     
     #OpenBeacon defines these in little endian as follows.
-    client.RF_setmaclen(3); # SETUP_AW for 3-byte addresses.
-    client.RF_setsmac(0x123456);
+    client.RF_setmaclen(5); # SETUP_AW for 5-byte addresses.
+    #0x01, 0x02, 0x03, 0x02, 0x01
+    client.RF_setsmac(0xe7e7e7e7e7);
     #'O', 'C', 'A', 'E', 'B'
-    client.RF_settmac(0x424541434F);
+    client.RF_settmac(0xe7e7e7e7e7);
     
     #Set packet length of 16.
-    client.RF_setpacketlen(6);
+    client.RF_setpacketlen(4);
     
     #Power radio, prime for RX, one-byte checksum.
-    client.poke(0x00,0x70|0x03); #| with 0x08 for one byte, 0x04 for two.
+    client.poke(0x00,0x70|0x03|0x08); #0x08 for one byte, 0x04 for two.
+    
+    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]=="snifftp"):
+    client.poke(0x00,0x00); #Stop nRF
+    client.poke(0x01,0x00); #Disable Shockburst
+    client.poke(0x02,0x01); #Set RX Pipe 0
+    
+    client.RF_setfreq((2400+0x29) * 10**6);
+    client.poke(0x06,0x00); #1Mbps
+    client.poke(0x07,0x78); #Reset status register
+    
+    client.RF_setmaclen(3); # SETUP_AW for 3-byte addresses.
+    client.RF_setsmac(0x123456);
+    client.RF_setpacketlen(4);
+    
+    #Power radio, prime for RX, two-byte checksum.
+    client.poke(0x00,0x70|0x03|0x04|0x08);
     
     print "Listening as %010x on %i MHz" % (client.RF_getsmac(),
                                            client.RF_getfreq()/10**6);
@@ -196,6 +230,38 @@ if(sys.argv[1]=="snifftp"):
         printpacket(packet);
         sys.stdout.flush();
 
+if(sys.argv[1]=="hosttp"):
+    client.poke(0x00,0x00); #Stop nRF
+    client.poke(0x01,0x00); #Disable Shockburst
+    client.poke(0x02,0x01); #Set RX Pipe 0
+    
+    chan=0x29;
+
+    client.RF_setfreq((2400+chan) * 10**6);
+    client.poke(0x06,0x00); #1Mbps
+    client.poke(0x07,0x78); #Reset status register
+    
+    client.RF_setmaclen(3); # SETUP_AW for 3-byte addresses.
+    client.RF_setsmac(0x123456);
+    client.RF_setpacketlen(4);
+    
+    #Power radio, prime for RX, two-byte checksum.
+    client.poke(0x00,0x70|0x03|0x04|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:
+            packet=client.RF_rxpacket();
+        mac=((ord(packet[0])<<16)+
+             (ord(packet[1])<<8)+
+             ord(packet[2]));
+        key=packet[3];
+        print "%c from %06x" % (key,mac);
+        sys.stdout.flush();
+
 if(sys.argv[1]=="sniff"):
     #client.poke(0x00,0x00); #Stop nRF
     client.poke(0x07,0x78); #Reset status register