Standardizing Chipcon interface, bringing it into line with the NRF code.

[goodfet] / client / GoodFETCC.py

diff --git a/client/GoodFETCC.py b/client/GoodFETCC.py
index 239233e..688219d 100644 (file)
--- a/client/GoodFETCC.py
+++ b/client/GoodFETCC.py
@@ -24,7 +24,7 @@ class GoodFETCC(GoodFET):
     def loadsymbols(self):
         try: self.SRF_loadsymbols();
         except:
-            if self.verbose==1: print "SmartRF load failed.";
+            if self.verbose>0: print "SmartRF not found at %s." % self.smartrfpath;
     def SRF_chipdom(self,chip="cc1110", doc="register_definition.xml"):
         fn="%s/config/xml/%s/%s" % (self.smartrfpath,chip,doc);
         #print "Opening %s" % fn;
@@ -32,7 +32,11 @@ class GoodFETCC(GoodFET):
         
     def CMDrs(self,args=[]):
         """Chip command to grab the radio state."""
-        self.SRF_radiostate();
+        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;
@@ -72,6 +76,38 @@ class GoodFETCC(GoodFET):
                     print "%-10s=0x%02x; /* %-50s */" % (
                         name,self.CCpeekdatabyte(eval(address)), description);
                     if bitfields!="": print bitfields.rstrip();
+    def RF_setfreq(self,frequency):
+        """Set the frequency in Hz."""
+        #FIXME CC1110 specific
+        
+        hz=frequency;
+        freq=hz/396.728515625;
+        freq0=freq&0xFF;
+        freq1=(freq&0xFF00)>>8;
+        freq1=(freq&0xFF0000)>>16;
+        self.CCpokedatabyte(0xdf09,freq2);
+        self.CCpokedatabyte(0xdf09,freq1);
+        self.CCpokedatabyte(0xdf09,freq0);
+
+    def RF_getfreq(self):
+        """Get the frequency in Hz."""
+        #FIXME CC1110 specific
+        
+        #return (2400+self.peek(0x05))*10**6
+        #self.poke(0x05,chan);
+        freq2=self.CCpeekdatabyte(0xdf09);
+        freq1=self.CCpeekdatabyte(0xdf0a);
+        freq0=self.CCpeekdatabyte(0xdf0b);
+        freq=(freq2<<16)+(freq1<<8)+freq0;
+        hz=freq*396.728515625;
+        
+        return hz;
+    
+    def RF_carrier(self):
+        """Hold a carrier wave on the present frequency."""
+        # Set CONT_WAVE, PLL_LOCK, and 0dBm in RF_SETUP            
+        self.poke(0x06,8+10+4+2); 
+    
     def RF_getrssi(self):
         """Returns the received signal strenght, from 0 to 1."""
         rssireg=self.symbols.get("RSSI");
@@ -229,6 +265,12 @@ class GoodFETCC(GoodFET):
     def CCdebuginstr(self,instr):
         self.writecmd(self.APP,0x88,len(instr),instr);
         return ord(self.data[0]);
+    def peekblock(self,adr,length,memory="vn"):
+        """Return a block of data."""
+        data=[adr&0xff, (adr&0xff00)>>8,
+              length&0xFF,(length&0xFF00)>>8];
+        self.writecmd(self.APP,0x91,4,data);
+        return [ord(x) for x in self.data]
     def peek8(self,address, memory="code"):
         if(memory=="code" or memory=="flash" or memory=="vn"):
             return self.CCpeekcodebyte(address);
@@ -321,8 +363,6 @@ class GoodFETCC(GoodFET):
         self.CChaltcpu();
         #Get SmartRF Studio regs if they exist.
         self.loadsymbols(); 
-
-        #print "Status: %s." % self.status();
         
     def stop(self):
         """Stop debugging."""