GoodFETCC.RF_getchannel().

Need equivalents for other targets, plus setter.

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

diff --git a/client/GoodFETCC.py b/client/GoodFETCC.py
index c1e20e1..22df102 100644 (file)
--- a/client/GoodFETCC.py
+++ b/client/GoodFETCC.py
@@ -125,12 +125,28 @@ class GoodFETCC(GoodFET):
         hz=freq*396.728515625;
         
         return hz;
         hz=freq*396.728515625;
         
         return hz;

+    
+    def RF_getchannel(self):
+        """Get the frequency in Hz."""
+        #FIXME CC1110 specific
+        freq=0;
+        try:
+            freq2=self.peekbysym("FREQ2");
+            freq1=self.peekbysym("FREQ1");
+            freq0=self.peekbysym("FREQ0");
+            freq=(freq2<<16)+(freq1<<8)+freq0;
+        except:
+            freq=0;
+            
+        return freq;
+    
+    

     lastshellcode="none";
     lastshellcode="none";

-    def shellcodefile(self,filename,wait=1):
+    def shellcodefile(self,filename,wait=1, alwaysreload=0):

         """Run a fragment of shellcode by name."""
         #FIXME: should identify chip model number, use shellcode for that chip.
         
         """Run a fragment of shellcode by name."""
         #FIXME: should identify chip model number, use shellcode for that chip.
         

-        if self.lastshellcode!=filename:
+        if self.lastshellcode!=filename or alwaysreload>0:

             self.lastshellcode=filename;
             file=__file__;
             file=file.replace("GoodFETCC.pyc","GoodFETCC.py");
             self.lastshellcode=filename;
             file=__file__;
             file=file.replace("GoodFETCC.pyc","GoodFETCC.py");

diff --git a/client/shellcode/chipcon/cc1110/reflexframe.ihx b/client/shellcode/chipcon/cc1110/reflexframe.ihx
index 3a53612..1543a40 100644 (file)
--- a/client/shellcode/chipcon/cc1110/reflexframe.ihx
+++ b/client/shellcode/chipcon/cc1110/reflexframe.ihx
@@ -19,7 +19,7 @@
 :03F0E70075E104CC
 :0EF0EA0090DF3BE0FABA01F812F08D12F1143B
 :09F0F80012F0B675E10475E103A4
 :03F0E70075E104CC
 :0EF0EA0090DF3BE0FABA01F812F08D12F1143B
 :09F0F80012F0B675E10475E103A4

-:0EF1010090DF3BE0FA53021FBA13F59000C8EE
+:0EF1010090DF3BE0FA53021FBA13F590000AAC

 :05F10F0012F0B780D3EF
 :02F114007A007F
 :03F11600BA4000FC
 :05F10F0012F0B780D3EF
 :02F114007A007F
 :03F11600BA4000FC