X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=client%2Fgoodfet.ccspi;h=80e9fae02fa9cb1c8d5e5c2adf894436bc533e7e;hb=426452e03b65bd972aa0d1df48af55e190ff1114;hp=359f2c4e954f42fe0379a5c2799869026ad7ce1f;hpb=2230a0e25c0ac42d71acbb3c6519e5124ee93867;p=goodfet

diff --git a/client/goodfet.ccspi b/client/goodfet.ccspi
index 359f2c4..80e9fae 100755
--- a/client/goodfet.ccspi
+++ b/client/goodfet.ccspi
@@ -92,6 +92,7 @@ if(sys.argv[1]=="rssi"):
 if(sys.argv[1]=="sniff" or sys.argv[1]=="sniffdissect"):
     #Promiscuous mode.
     client.RF_promiscuity(1);
+    client.RF_autocrc(0);
     
     if len(sys.argv)>2:
         freq=eval(sys.argv[2]);
@@ -116,6 +117,7 @@ if(sys.argv[1]=="bsniff"):
     #Just broadcast.
     client.RF_promiscuity(0);
     client.RF_setsmac(0xFFFFFFFF);
+    client.RF_autocrc(1);
     
     if len(sys.argv)>2:
         freq=eval(sys.argv[2]);
@@ -150,44 +152,89 @@ if(sys.argv[1]=="txtest"):
                             0xff, 0xff, 0xff, 0xff,
                             0xde, 0xad, 0xbe, 0xef,
                             0xba, 0xbe, 0xc0]);
+if(sys.argv[1]=="txtoscount"):
+    '''
+    Clone of what TinyOS's BlinkToLED demo code does.
+    Specify a channel a TinyOS mote programmed with BlinkToLED is on, and this will act as the second device.
+    '''
+    client.RF_promiscuity(1);
+    client.RF_autocrc(1);
+    if len(sys.argv)>2:
+        freq=eval(sys.argv[2]);
+        if freq>100:
+            client.RF_setfreq(freq);
+        else:
+            client.RF_setchan(freq);
+    client.CC_RFST_RX();
+    print "Listening as %010x on %i MHz" % (client.RF_getsmac(), client.RF_getfreq()/10**6);
+    print "Transmitting like the TinyOS CountToRadio program on %i MHz" % (client.RF_getfreq()/10**6);
+    #i = 0;
+    #countpkt = [0x0f, 0x41, 0x88, 0xFF, 0x22, 0x00, 0xff, 0xff, 0x01, 0x00, 0x3f, 0x06, 0xFF, 0x00, 0x00];
+    while 1:
+        packet=None;
+        while packet==None:
+            packet=client.RF_rxpacket();
+        print "Recd:",
+        client.printpacket(packet);
+        pkt = packet[:14]# + "\x00\x00";
+        print "Sent:",
+        client.printpacket(pkt)
+        client.RF_txpacket(pkt);
+        #TODO expand to actually do increments itself, if desired:
+        #pkt = countpkt[:];
+        #pkt[3] = i;
+        #for j in pkt:
+        #    print hex(j)[2:],;
+        #print;
+        #client.RF_txpacket(pkt);
+        #if i >= 31: i = 0;
+        #else:       i += 1;
+        #time.sleep(1);
 
-if(sys.argv[1]=="txpiptest"):
+if(sys.argv[1]=="txpiptest"):# or sys.argv[1]=="txpipscapy"):
     if len(sys.argv)>2:
         freq=eval(sys.argv[2]);
         if freq>100:
             client.RF_setfreq(freq);
         else:
-            print "Channels not yet supported."
+            client.RF_setchan(freq);
     print "Transmitting on as %010x on %i MHz" % (
         client.RF_getsmac(),
         client.RF_getfreq()/10**6);
     
+    client.RF_setsync(0xFFFF);
+    
     while 1:
-        client.RF_txpacket([0x3f, 0x01, 0x08, 0x82,
-                            0xDE, 0xff, 0xff, 0xff,
-                            0xde, 0xad, 0xbe, 0xef,
-                            0xba, 0xbe, 0xc0,
-                            
-                            0x00, 0x00, 0x00,
-                            0x00, 0x00, 0x00,
-                            0x00, 0x00, 0x00,
-                            0x00, 0x00, 0x00,
-                            
-                            #0x00, 0xA7,  #CC2420 SFD
-                            
-                            0x0f, 0x01, 0x08, 0x82,
-                            0xff, 0xff, 0xff, 0xff,
-                            0xde, 0xad, 0xbe, 0xef,
-                            0xba, 0xbe, 0xc0,
-                            
-                            0xff, 0xff, 0xff, 0xff,
-                            0xff, 0xff, 0xff, 0xff,
-                            0xff, 0xff, 0xff, 0xff,
-                            0xff, 0xff, 0xff, 0xff,
-                            0xff, 0xff, 0xff, 0xff,
-                            0xff, 0xff, 0xff, 0xff,
-                            0xff, 0xff, 0xff, 0xff,
-                            ]);
+        client.RF_txpacket([
+                0x7f, 
+                #Real header, must begin with SFD.
+                0x00, 0x00, 0x00,
+                0x00, 0xA7,
+                
+                #Length
+                0x1f, 0x01, 0x08, 0x82,
+                0xDF, 0xff, 0xff, 0xff,
+                0xde, 0xad, 0xbe, 0xef,
+                0xba, 0xbe, 0xc0,
+                
+                #Preamble
+                0x00, 0x00, 0x00,
+                #SFD
+                0x00, 0xA7,  #CC2420 SFD
+                #Packet In Packet
+                0x0f, 0x01, 0x08, 0x82,
+                0xff, 0xff, 0xff, 0xff,
+                0xde, 0xad, 0xbe, 0xef,
+                0xba, 0xbe, 0xc0,
+                
+                0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff,
+                0xff, 0xff, 0xff, 0xff,
+                ]);
 
 if(sys.argv[1]=="peek"):
     start=0x0000;