X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2Fgoodfet.cc;h=7293534f806feeb42bbfdeac625a1908b15960b3;hp=c83a7bda542c638c326e389db5afdc8d23419414;hb=1ef22a7f7983e4bb7513686cd573776a8338c904;hpb=e44403822e6c8729c2d54714aceea3c9774f41b2

diff --git a/client/goodfet.cc b/client/goodfet.cc
index c83a7bd..7293534 100755
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -51,8 +51,12 @@ def handlesimplicitipacket(packet):
         counter=packet[11];
         button=packet[12];
         x=packet[13];
+        if x>=128: x=0-(x^0xFF)-1;
         y=packet[14];
+        if y>=128: y=0-(y^0xFF)-1;
         z=packet[15];
+        if z>=128: z=0-(z^0xFF)-1;
+        
         print "%09i %03i %4i %4i %4i" % (simplepacketcount,button,x,y,z);
         sys.stdout.flush();
     elif port==0x02:
@@ -113,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];
@@ -132,7 +139,10 @@ if(len(sys.argv)==1):
     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];
-    
+    print "%s snifficlicker [us]\n\tSniffs iClicker." % sys.argv[0];
+    print "\n";
+    print "%s simpliciti [us|eu|lf]\n\tSimpliciti access point for Chronos watch." % sys.argv[0];
+    print "%s iclicker [us|eu|lf]\n\tSniffs iClicker packets as ASCII." % sys.argv[0];
     
     sys.exit();
 
@@ -238,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:
@@ -257,6 +285,49 @@ if(sys.argv[1]=="sniffdash7"):
             packet=client.RF_rxpacket();
         printpacket(packet);
         sys.stdout.flush();
+if(sys.argv[1]=="snifficlicker"):
+    region="us";
+    if len(sys.argv)>2:
+        region=sys.argv[2];
+    
+    client.CC1110_crystal();
+    client.RF_idle();
+    
+    client.config_iclicker(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]=="iclicker"):
+    buttons=[0, 'A', 'j', 3, 4, 'B',
+             6, 7, 8, 9, 'E', 0xB, 0xC,
+             'C', 'D', 0xF];
+    region="us";
+    if len(sys.argv)>2:
+        region=sys.argv[2];
+    
+    client.CC1110_crystal();
+    client.RF_idle();
+    
+    client.config_iclicker(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);
+        button=((packet[5]&1)<<3) | (packet[6]>>5);
+        print "Button %c" % buttons[button];
+        sys.stdout.flush();
 
 if(sys.argv[1]=="simpliciti"):
     region="us";
@@ -346,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();
 
@@ -394,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;