X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.ccspi;h=a1facf086154fdb394cb441b6a75aa26a3986ffc;hp=b487a6cfdade2724e3fba1acf8fdce069beaf903;hb=3ad2fc30be8b200ada0ff1e2624e460e9898f5ae;hpb=47036ca60e6550e1ace4e2f02363e3da02db1240

diff --git a/client/goodfet.ccspi b/client/goodfet.ccspi
index b487a6c..a1facf0 100755
--- a/client/goodfet.ccspi
+++ b/client/goodfet.ccspi
@@ -16,19 +16,21 @@ def printpacket(packet):
     s="";
     i=0;
     for foo in packet:
-        i=i+1;
-        if i>ord(packet[1])+2: break;
-        if i<2: continue;
         s="%s %02x" % (s,ord(foo));
-    print "%s" % s;
+    print "#%s" % s;
 
 
 if(len(sys.argv)==1):
     print "Usage: %s verb [objects]\n" % sys.argv[0];
+    print "%s info" % sys.argv[0];
     print "%s regs" % sys.argv[0];
     print "%s test" % sys.argv[0];
     print "%s peek 0x$start [0x$stop]" % sys.argv[0];
     print "%s poke 0x$adr 0x$val" % sys.argv[0];
+    
+    print "\n%s rssi" % sys.argv[0];
+    print "%s sniff" % sys.argv[0];
+    
     sys.exit();
 
 #Initialize FET and set baud rate
@@ -42,8 +44,9 @@ client.setup();
 #Might read as all ones if chip has a startup delay.
 
 if(sys.argv[1]=="info"):
-    print "Found %s" % client.identstr();
-    print "Freq: %05.05f MHz" % (client.RF_getfreq()/(10**6));
+    print "Found   %s" % client.identstr();
+    print "Freq:   %05f MHz" % (client.RF_getfreq()/(10**6));
+    print "Status: %s" % client.status();
 if(sys.argv[1]=="regs"):
     for adr in range(0x10,0x40): #*1024):
         val=client.peek(adr);
@@ -72,11 +75,15 @@ if(sys.argv[1]=="rssi"):
             string=("%s."%string);
         print "%02x %04i %s" % (rssi,rssi, string); 
 if(sys.argv[1]=="sniff"):
-    #if len(sys.argv)>2:
-        #print "Set MAC to %s" % sys.argv[2];
-        #client.tune(sys.argv[2]);
-        #client.RF_setmaclen(5);
-        
+    #Promiscuous mode.
+    client.RF_promiscuity(1);
+    
+    if len(sys.argv)>2:
+        freq=eval(sys.argv[2]);
+        if freq>100:
+            client.RF_setfreq(freq);
+        else:
+            print "Channels not yet supported."
     client.CC_RFST_RX();
     print "Listening as %010x on %i MHz" % (client.RF_getsmac(),
                                             client.RF_getfreq()/10**6);
@@ -85,7 +92,6 @@ if(sys.argv[1]=="sniff"):
     while 1:
         packet=None;
         while packet==None:
-            #time.sleep(0.1);
             packet=client.RF_rxpacket();
         printpacket(packet);
         sys.stdout.flush();