X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.rf;h=abb9241f89eaedb792c40eeb80deccf24b763911;hp=d65fc141659479541801c5b9c41cdab3d7ac17cd;hb=426452e03b65bd972aa0d1df48af55e190ff1114;hpb=dd17b2dbe7cae9fb7552e6f311bb243d65b250cb

diff --git a/client/goodfet.rf b/client/goodfet.rf
index d65fc14..abb9241 100755
--- a/client/goodfet.rf
+++ b/client/goodfet.rf
@@ -8,14 +8,15 @@ import binascii;
 import array;
 import time;
 
-from GoodFETNRF import GoodFETNRF;
+from GoodFETRadio import GoodFETRadio;
 from intelhex import IntelHex;
 from GoodFET import GoodFET, getClient;
 
 if(len(sys.argv)==1):
     print "Usage: %s [driver|verb] verb [objects]\n" % sys.argv[0];
-    print "driver:= cc | nrf"; #msp430
+    print "driver:= cc51 | ccspi | nrf"; #msp430
     print "verb:=   info";
+    print "         rs|radioinfo";
     print "         test";
     print "         regs";
     print "         sniff";
@@ -24,10 +25,27 @@ if(len(sys.argv)==1):
 
 driver=sys.argv[1];
 print "Using driver %s" % driver;
-#client=eval("%s()" % driver);
-client=getClient(driver);
-client.serInit();
+client=GoodFETRadio(getClient(driver));
 client.start();
+
+
+
+verb=sys.argv[2];
+
+if verb=='test':
+   client.test();
+if verb=='rssi':
+   rssireg=client.getrssi();
+   print "RSSI of %04x" % rssireg;
+if(verb=="carrier"):
+    if len(sys.argv)>2:
+        client.RF_setfreq(eval(sys.argv[3]));
+    client.RF_carrier();
+    print "\nHolding a carrier wave.";
+    while(1):
+        time.sleep(1);
+
+
 client.stop();