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 344d9a5..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");
@@ -169,6 +205,7 @@ class GoodFETCC(GoodFET):
     
 
     CCversions={0x0100:"cc1110",
+                0x1100:"cc1111",
                 0x8500:"cc2430",
                 0x8900:"cc2431",
                 0x8100:"cc2510",
@@ -177,6 +214,7 @@ class GoodFETCC(GoodFET):
                 0xB500:"cc2531",
                 0xFF00:"CCmissing"};
     CCpagesizes={0x01: 1024, #"CC1110",
+                 0x11: 1024, #"CC1111",
                  0x85: 2048, #"CC2430",
                  0x89: 2048, #"CC2431",
                  0x81: 1024, #"CC2510",
@@ -189,7 +227,11 @@ class GoodFETCC(GoodFET):
     def CCidentstr(self):
         ident=self.CCident();
         chip=self.CCversions.get(ident&0xFF00);
-        return "%s/r%02x" % (chip, ident&0xFF); 
+        pagesize=self.CCpagesizes.get(ident>0xFF);
+        try:
+            return "%s/r%0.4x/ps0x%0.4x" % (chip, ident, pagesize); 
+        except:
+            return "%04x" % ident;
     def CCident(self):
         """Get a chipcon's ID."""
         self.writecmd(self.APP,0x8B,0,None);
@@ -203,7 +245,7 @@ class GoodFETCC(GoodFET):
         size=self.CCpagesizes.get(chip);
         if(size<10):
             print "ERROR: Pagesize undefined.";
-            print "chip=%02x" %chip;
+            print "chip=%0.4x" %chip;
             sys.exit(1);
             #return 2048;
         return size;
@@ -223,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);
@@ -315,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."""