goodfet.ccspi added txpipscapy in an alpha version, starting to generate pip/pop...

[goodfet] / client / GoodFETCC.py

diff --git a/client/GoodFETCC.py b/client/GoodFETCC.py
index 8c0088a..abbe115 100644 (file)
--- a/client/GoodFETCC.py
+++ b/client/GoodFETCC.py
@@ -17,26 +17,24 @@ class GoodFETCC(GoodFET):
     """A GoodFET variant for use with Chipcon 8051 Zigbee SoC."""
     APP=0x30;
     
-    
-    
-    
     smartrfpath="/opt/smartrf7";
     def loadsymbols(self):
         try: self.SRF_loadsymbols();
         except:
             if self.verbose>0: print "SmartRF not found at %s." % self.smartrfpath;
     def SRF_chipdom(self,chip="cc1110", doc="register_definition.xml"):
+        """Loads the chip XML definitions from SmartRF7."""
         fn="%s/config/xml/%s/%s" % (self.smartrfpath,chip,doc);
         #print "Opening %s" % fn;
         return xml.dom.minidom.parse(fn)
         
     def CMDrs(self,args=[]):
         """Chip command to grab the radio state."""
-        try:
-            self.SRF_radiostate();
-        except:
-            print "Error printing radio state.";
-            print "SmartRF not found at %s." % self.smartrfpath;
+        #try:
+        self.SRF_radiostate();
+        #except:
+        #    print "Error printing radio state.";
+        #    print "SmartRF not found at %s." % self.smartrfpath;
     def SRF_bitfieldstr(self,bf):
         name="unused";
         start=0;
@@ -127,7 +125,7 @@ class GoodFETCC(GoodFET):
         return hz;
     
     def RF_getchannel(self):
-        """Get the frequency in Hz."""
+        """Get the hex channel."""
         #FIXME CC1110 specific
         freq=0;
         try:
@@ -150,6 +148,7 @@ class GoodFETCC(GoodFET):
             self.lastshellcode=filename;
             file=__file__;
             file=file.replace("GoodFETCC.pyc","GoodFETCC.py");
+            #TODO make this generic
             path=file.replace("GoodFETCC.py","shellcode/chipcon/cc1110/");
             filename=path+filename;
         
@@ -594,7 +593,7 @@ class GoodFETCC(GoodFET):
         except:
             if self.verbose>0: print "RSSI reg doesn't exist.";
         try:
-            #RSSI doesn't exist on 2.4GHz devices.  Maybe RSSIL and RSSIH?
+            #RSSI doesn't exist on some 2.4GHz devices.  Maybe RSSIL and RSSIH?
             rssilreg=self.symbols.get("RSSIL");
             rssil=self.CCpeekdatabyte(rssilreg);
             rssihreg=self.symbols.get("RSSIL");