From: travisutk <travisutk@12e2690d-a6be-4b82-a7b7-67c4a43b65c8>
Date: Tue, 7 Dec 2010 20:18:26 +0000 (+0000)
Subject: Closer to CC1110 carrier.
X-Git-Url: http://git.rot13.org/?p=goodfet;a=commitdiff_plain;h=3fe9208501908b0522deaf3f7e938f4640f2b624

Closer to CC1110 carrier.

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

diff --git a/client/GoodFET.py b/client/GoodFET.py
index 62a0e44..97e7996 100755
--- a/client/GoodFET.py
+++ b/client/GoodFET.py
@@ -377,11 +377,11 @@ class GoodFET:
         #TODO include memory in symbol.
         reg=self.symbols.get(name);
         return self.peek8(reg,"data");
-    def pokebysym(self,name,val):
+    def pokebysim(self,name,val):
         """Write a value by its symbol name."""
         #TODO include memory in symbol.
         reg=self.symbols.get(name);
-        return self.poke8(reg,val,"data");
+        return self.pokebyte(reg,val);
     def pokebyte(self,address,value):
         """Set a byte of memory by the monitor."""
         self.data=[address&0xff,address>>8,value];
diff --git a/client/GoodFETCC.py b/client/GoodFETCC.py
index 6f85a0e..2d69fbf 100644
--- a/client/GoodFETCC.py
+++ b/client/GoodFETCC.py
@@ -81,13 +81,16 @@ class GoodFETCC(GoodFET):
         #FIXME CC1110 specific
         
         hz=frequency;
-        freq=hz/396.728515625;
+        freq=int(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);
+        freq2=(freq&0xFF0000)>>16;
+        
+        self.pokebysim("FREQ2",freq2);
+        self.pokebysim("FREQ1",freq1);
+        self.pokebysim("FREQ0",freq0);
+        
 
     def RF_getfreq(self):
         """Get the frequency in Hz."""
diff --git a/client/goodfet.cc b/client/goodfet.cc
index 2e94fff..d463b1c 100755
--- a/client/goodfet.cc
+++ b/client/goodfet.cc
@@ -6,7 +6,7 @@
 # This code is being rewritten and refactored.  You've been warned!
 
 import sys;
-import binascii;
+import binascii, time;
 
 from GoodFETCC import GoodFETCC;
 from GoodFETConsole import GoodFETConsole;
@@ -29,6 +29,9 @@ if(len(sys.argv)==1):
     print "%s peek 0x$iram" % sys.argv[0];
     print "%s poke 0x$iram 0x$val" % sys.argv[0];
     print "%s peekcode 0x$start [0x$stop]" % sys.argv[0];
+    
+    print "%s carrier [freq]\n\tHolds a carrier on [freq] Hz." % sys.argv[0];
+    
     sys.exit();
 
 #Initailize FET and set baud rate
@@ -41,6 +44,15 @@ client.setup();
 client.start();
 
 
+if(sys.argv[1]=="carrier"):
+    if len(sys.argv)>2:
+        client.RF_setfreq(eval(sys.argv[2]));
+    client.RF_carrier();
+    #printconfig();
+    print "\nHolding a carrier wave.";
+    while(1):
+        time.sleep(1);
+
 if(sys.argv[1]=="explore"):
     print "Exploring undefined commands."
     print "Status: %s" %client.status();