X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.cc;h=48729fc7fc6d247a35cfdc9b77e7ac3a6b757087;hp=b051ff04aadd722434893e5757e479b75229e6cf;hb=3c9dd526729e4296e7ac231840a445de182c8734;hpb=3048ba863b5b45b24b0e2f0fdf829eef0389ef6b

diff --git a/client/goodfet.cc b/client/goodfet.cc
index b051ff0..48729fc 100755
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -40,9 +40,10 @@ 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 reflex [freq]\n\tJams on [freq] Hz." % sys.argv[0];
     print "%s sniffsimpliciti [us|eu|lf]\n\tSniffs SimpliciTI packets." % sys.argv[0];
     
     sys.exit();
@@ -72,11 +73,11 @@ if(sys.argv[1]=="reflex"):
     client.RF_idle();
     
     client.config_simpliciti();
-    client.pokebysym("MDMCFG4",0x0c); #ultrawide
-    client.pokebysym("FSCTRL1",   0x12); #IF of 457.031
+    client.pokebysym("MDMCFG4",   0x0c);  #ultrawide
+    client.pokebysym("FSCTRL1",   0x12);  #IF of 457.031
     client.pokebysym("FSCTRL0",   0x00); 
-    client.pokebysym("FSCAL2",    0x2A); #above mid
-    client.pokebysym("MCSM0"    , 0x0)   # Main Radio Control State Machine
+    client.pokebysym("FSCAL2" ,   0x2A);  #above mid
+    client.pokebysym("MCSM0"  ,   0x00);  # Main Radio Control State Machine
     
     client.pokebysym("FSCAL3"   , 0xEA)   # Frequency synthesizer calibration.
     client.pokebysym("FSCAL2"   , 0x2A)   # Frequency synthesizer calibration.
@@ -95,17 +96,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,11 +117,39 @@ 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 %f MHz." % (client.RF_getfreq()/10**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"):
-    #Reversal of transmitter code from nRF_CMD.c of OpenBeacon
     #TODO remove all poke() calls.
     
+    client.CC1110_crystal();
+    client.RF_idle();
+    
+    
     client.config_simpliciti("lf");
     #client.RF_setfreq(2481 * 10**6);