From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Sat, 22 May 2010 23:21:42 +0000 (+0000)
Subject: Long registers.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=0a80646c9c1732fa8ec74e33de1ebd3afe5eb9cd

Long registers.

git-svn-id: https://svn.code.sf.net/p/goodfet/code/trunk@551 12e2690d-a6be-4b82-a7b7-67c4a43b65c8
---

diff --git a/client/GoodFETNRF.py b/client/GoodFETNRF.py
index e9c44c1..4b2f6c9 100644
--- a/client/GoodFETNRF.py
+++ b/client/GoodFETNRF.py
@@ -82,7 +82,7 @@ class GoodFETNRF(GoodFET):
         """Return the target MAC address."""
         
         #Register 0x10 is TX_ADDR, five bytes.
-        mac=self.peek(0x0A, 5);
+        mac=self.peek(0x10, 5);
         return mac;
     def RF_settmac(self,mac):
         """Set the target MAC address."""
@@ -90,6 +90,7 @@ class GoodFETNRF(GoodFET):
         #Register 0x10 is TX_ADDR, five bytes.
         self.poke(0x10, mac, 5);
         return mac;
+
     def RF_rxpacket(self):
         """Get a packet from the radio.  Returns None if none is waiting."""
         if self.peek(0x07) & 0x40:
@@ -107,4 +108,22 @@ class GoodFETNRF(GoodFET):
         """Set the number of bytes in the expected payload."""
         self.poke(0x11,len);
         self.packetlen=len;
-    
+    def RF_getpacketlen(self):
+        """Set the number of bytes in the expected payload."""
+        len=self.peek(0x11);
+        self.packetlen=len;
+        return len;
+    maclen=5;
+    def RF_getmaclen(self):
+        """Get the number of bytes in the MAC address."""
+        choices=["illegal", 3, 4, 5];
+        choice=self.peek(0x03)&3;
+        self.maclen=choices[choice];
+        return self.maclen;
+    def RF_setmaclen(self,len):
+        """Set the number of bytes in the MAC address."""
+        choices=["illegal", "illegal", "illegal", 
+                 1, 2, 3];
+        choice=choices[len];
+        self.poke(0x03,choice);
+        self.maclen=len;
diff --git a/client/goodfet.nrf b/client/goodfet.nrf
index dce4dd3..f475a36 100755
--- a/client/goodfet.nrf
+++ b/client/goodfet.nrf
@@ -19,12 +19,20 @@ def printpacket(packet):
         if i>client.packetlen: break;
         s="%s %02x" % (s,ord(foo));
     print "%s" %s;
-    
+
+def printconfig():
+    print "SMAC  0x%010x" % client.RF_getsmac();
+    print "TMAC  0x%010x" % client.RF_gettmac();
+    print "Freq    %10i MHz" % (client.RF_getfreq()/10**6);
+    print "PacketLen %02i" % client.RF_getpacketlen();
+    print "MacLen    %02i" % client.RF_getmaclen();
 
 if(len(sys.argv)==1):
     print "Usage: %s verb [objects]\n" % sys.argv[0];
     print "%s info" % sys.argv[0];
     print "%s test" % sys.argv[0];
+    print "%s sniffob\n\tSniffs OpenBeacon traffic." % sys.argv[0];
+    print "%s regs" % sys.argv[0];
     sys.exit();
 
 #Initialize FET and set baud rate
@@ -33,6 +41,8 @@ client.serInit()
 
 client.NRFsetup();
 
+if(sys.argv[1]=="info"):
+    printconfig();
 
 if(sys.argv[1]=="test"):
     # Set PWR_UP=1 and PRIM_RX=0 in CONFIG.
@@ -43,7 +53,8 @@ if(sys.argv[1]=="test"):
     client.RF_setfreq(2480 * 10**6);
     
     #Print registers, just for fun.
-    print "SMAC was %010x" % client.RF_getsmac();
+    print "SMAC  0x%010x" % client.RF_getsmac();
+    print "Freq    %10i MHz" % (client.RF_getfreq()/10**6);
     
     client.poke(0x0A,0xDEADBEEF,5);
     print "SMAC set to %010x" % client.RF_getsmac();
@@ -51,17 +62,20 @@ if(sys.argv[1]=="test"):
         print "ERROR: Failed to set MAC address.";
 
 if(sys.argv[1]=="regs"):
-    for r in range(0,30):
-        print "r[0x%02x]=0x%02x" % (r,client.peek(r));
+    for r in range(0,0x20):
+        reglen=1;
+        if r==0x0a or r==0x0b or r==0x10: reglen=5;
+        print "r[0x%02x]=0x%010x" % (r,client.peek(r,reglen));
 
 if(sys.argv[1]=="sniffob"):
-    #Reversal of transmitter code from nRF_CMD.c
+    #Reversal of transmitter code from nRF_CMD.c of OpenBeacon
+    #TODO remove all poke() calls.
+    
     client.poke(0x00,0x00); #Stop nRF
     client.poke(0x01,0x00); #Disable Shockburst
     client.poke(0x02,0x01); #Set RX Pipe 0
-    client.poke(0x03,0x03); #SETUP_AW for 5-byte addresses.
+    client.RF_setmaclen(5); # SETUP_AW for 5-byte addresses.
     client.RF_setfreq(2481 * 10**6);
-    #client.RF_setfreq(2490 * 10**6);
     client.poke(0x06,0x09); #2MBps, -18dBm in RF_SETUP
     client.poke(0x07,0x78); #Reset status register
     
@@ -72,13 +86,11 @@ if(sys.argv[1]=="sniffob"):
     client.RF_settmac(0x424541434F);
     
     #Set packet length of 16.
-    #client.poke(0x11,16);
     client.RF_setpacketlen(16);
     
     #Power radio, prime for RX, checksum.
     client.poke(0x00,0x70|0x03|0x08);
     
-    
     print "Listening as %010x on %i MHz" % (client.RF_getsmac(),
                                            client.RF_getfreq()/10**6);
     #Now we're ready to get packets.