Added 'goodfet.cc sniffdash7'.

[goodfet] / client / goodfet.cc

diff --git a/client/goodfet.cc b/client/goodfet.cc
index a7a0494..3b3ade4 100755 (executable)
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -128,6 +128,8 @@ if(len(sys.argv)==1):
     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];
+    print "%s sniffdash7 [lf]\n\tSniffs Dash7. (untested)" % sys.argv[0];
+    
     
     sys.exit();
 
@@ -219,7 +221,6 @@ if(sys.argv[1]=="rssi"):
         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];
@@ -229,6 +230,25 @@ if(sys.argv[1]=="sniffsimpliciti"):
     
     client.config_simpliciti(region);
     
+    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;
+        while packet==None:
+            packet=client.RF_rxpacket();
+        printpacket(packet);
+        sys.stdout.flush();
+if(sys.argv[1]=="sniffdash7"):
+    region="lf";
+    if len(sys.argv)>2:
+        region=sys.argv[2];
+    
+    client.CC1110_crystal();
+    client.RF_idle();
+    
+    client.config_dash7(region);
+    
     print "Listening as %x on %f MHz" % (client.RF_getsmac(),
                                            client.RF_getfreq()/10.0**6);
     #Now we're ready to get packets.
@@ -240,7 +260,6 @@ if(sys.argv[1]=="sniffsimpliciti"):
         sys.stdout.flush();
 
 if(sys.argv[1]=="simpliciti"):
-    #TODO remove all poke() calls.
     region="us";
     if len(sys.argv)>2:
         region=sys.argv[2];