Packet sniffing kinda works.

[goodfet] / client / goodfet.cc

diff --git a/client/goodfet.cc b/client/goodfet.cc
index 14709b3..9f0b353 100755 (executable)
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -16,10 +16,11 @@ from intelhex import IntelHex;
 def printpacket(packet):
     s="";
     i=0;
+    #print "Printing packet."
     for foo in packet:
         i=i+1;
         #if i>client.packetlen: break;
-        s="%s %02x" % (s,ord(foo));
+        s="%s %02x" % (s,foo);
     print "%s" %s;
 
 if(len(sys.argv)==1):
@@ -40,7 +41,8 @@ if(len(sys.argv)==1):
     print "%s peek 0x$iram" % sys.argv[0];
     print "%s poke 0x$iram 0x$val" % sys.argv[0];
     print "%s peekcode 0x$start [0x$stop]" % sys.argv[0];
-    
+    print "\n"
+    print "%s rssi [freq]\n\tGraphs signal strength on [freq] Hz." % sys.argv[0];
     print "%s carrier [freq]\n\tHolds a carrier on [freq] Hz." % sys.argv[0];
     print "%s reflex [freq]\n\tJams on [freq] Hz." % sys.argv[0];
     print "%s sniffsimpliciti [us|eu|lf]\n\tSniffs SimpliciTI packets." % sys.argv[0];
@@ -95,17 +97,16 @@ if(sys.argv[1]=="reflex"):
     
     #FIXME, ugly
     RFST=0xDFE1
-    client.pokebyte(RFST,0x01); #SCAL
+    client.CC_RFST_CAL(); #SCAL
     time.sleep(1);
     
     maxrssi=0;
     while 1:
         
-        client.pokebyte(RFST,0x02); #SRX
+        client.CC_RFST_RX(); #SRX
         rssi=client.RF_getrssi();
-        client.pokebyte(RFST,0x04); #idle
+        client.CC_RFST_IDLE(); #idle
         time.sleep(0.01);
-        rssi=rssi;
         string="";
         for foo in range(0,rssi>>2):
             string=("%s."%string);
@@ -117,16 +118,42 @@ if(sys.argv[1]=="reflex"):
             client.RF_carrier();
             time.sleep(1);
             print "JAMMING JAMMING JAMMING JAMMING";
+if(sys.argv[1]=="rssi"):
+    client.CC1110_crystal();
+    client.RF_idle();
+    
+    client.config_simpliciti();
+    
+    threshold=200;
+    if len(sys.argv)>2:
+        client.RF_setfreq(eval(sys.argv[2]));
+    print "Listening on %3.6f MHz." % (client.RF_getfreq()/10.0**6);
+        
+    #FIXME, ugly
+    RFST=0xDFE1
+    client.CC_RFST_CAL();
+    time.sleep(1);
+    
+    while 1:
+        client.CC_RFST_RX();
+        rssi=client.RF_getrssi();
+        client.CC_RFST_IDLE(); #idle
+        time.sleep(0.01);
+        string="";
+        for foo in range(0,rssi>>2):
+            string=("%s."%string);
+        print "%02x %04i %s" % (rssi,rssi, string); 
 
 if(sys.argv[1]=="sniffsimpliciti"):
     #TODO remove all poke() calls.
+    region="us";
+    if len(sys.argv)>2:
+        region=sys.argv[2];
     
     client.CC1110_crystal();
     client.RF_idle();
     
-    
-    client.config_simpliciti("lf");
-    #client.RF_setfreq(2481 * 10**6);
+    client.config_simpliciti(region);
     
     #OpenBeacon defines these in little endian as follows.
     #client.RF_setmaclen(5); # SETUP_AW for 5-byte addresses.
@@ -139,8 +166,8 @@ if(sys.argv[1]=="sniffsimpliciti"):
     #client.RF_setpacketlen(16);
     
     
-    print "Listening as %010x on %i MHz" % (client.RF_getsmac(),
-                                           client.RF_getfreq()/10**6);
+    print "Listening as %x on %f MHz" % (client.RF_getsmac(),
+                                           client.RF_getfreq()/10.0**6);
     #Now we're ready to get packets.
     while 1:
         packet=None;
@@ -152,16 +179,6 @@ if(sys.argv[1]=="sniffsimpliciti"):
 
 
 
-if(sys.argv[1]=="explore"):
-    print "Exploring undefined commands."
-    print "Status: %s" %client.status();
-    
-    cmd=0x04; #read status
-    for foo in range(0,0x5):
-        client.CCcmd([(0x0F<<3)|(0x00)|0x03,0x09<<3]);
-        print "Status %02x: %s" % (foo,client.status());
-    for foo in range(0,3):
-        print "PC: %04x" % client.CCgetPC();
 if(sys.argv[1]=="term"):
     GoodFETConsole(client).run();
 if(sys.argv[1]=="test"):