X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.cc;h=7293534f806feeb42bbfdeac625a1908b15960b3;hp=bb8c068a077d852b712b6291aaf73f9f064977fa;hb=3ec1d76609ec874ea611901cfe17d702685b5cbb;hpb=2be996cbec43567d2a250e7f72db5086f2554d93

diff --git a/client/goodfet.cc b/client/goodfet.cc
index bb8c068..7293534 100755
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -117,8 +117,11 @@ if(len(sys.argv)==1):
     print "%s flash $foo.hex" % sys.argv[0];
     print "%s test" % sys.argv[0];
     print "%s term" % sys.argv[0];
+    print "    use \'?\' for list of commands";
     print "%s info" % sys.argv[0];
     print "%s infotest" % sys.argv[0];
+    print "%s radioinfo [help] [REGISTER_NAME]" % sys.argv[0];
+    print "%s specfuncreg [SPECIAL_REGISTER_NAME]" % sys.argv[0];
     print "%s halt"  % sys.argv[0];
     print "%s regs" % sys.argv[0];
     print "%s dumpcode $foo.hex [0x$start 0x$stop]" % sys.argv[0];
@@ -245,6 +248,24 @@ if(sys.argv[1]=="sniffsimpliciti"):
             packet=client.RF_rxpacket();
         printpacket(packet);
         sys.stdout.flush();
+if(sys.argv[1]=="sniffook"):
+    region="lf";
+    if len(sys.argv)>2:
+        region=sys.argv[2];
+    
+    client.CC1110_crystal();
+    client.RF_idle();
+    
+    client.config_ook(region);
+    
+    print "Listening for OOK on %f MHz" % (client.RF_getfreq()/10.0**6);
+    #Now we're ready to get packets.
+    while 1:
+        packet=None;
+        while packet==None:
+            packet=client.RF_rxpacket();
+        printpacket(packet);
+        sys.stdout.flush();
 if(sys.argv[1]=="sniffdash7"):
     region="lf";
     if len(sys.argv)>2:
@@ -396,6 +417,12 @@ if(sys.argv[1]=="info"):
     #print "SMAC  0x%010x" % client.RF_getsmac();
     #print "TMAC  0x%010x" % client.RF_gettmac();
 
+if(sys.argv[1]=="radioinfo"):
+    if (len(sys.argv) - 2) > 0:
+        client.CMDrs(sys.argv[2:]);
+    else:
+        client.CMDrs();
+
 if(sys.argv[1]=="regs"):
     client.CMDrs();
 
@@ -444,6 +471,12 @@ if(sys.argv[1]=="adctest"):
 if(sys.argv[1]=="config"):
     print "Config is %02x" % client.CCrd_config();
 
+if(sys.argv[1]=="specfuncreg"):
+    if len(sys.argv) > 2:
+        client.getSPR(sys.argv[2:]);
+    else:
+        client.getSPR();
+
 if(sys.argv[1]=="flash"):
      f=sys.argv[2];
      start=0;