X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFET.py;h=da652c3a447c797aaa32f91b20b327c2c328dcf5;hp=74974975d4f308cc2fc8ddc919c39da6092309e1;hb=43d125b5bca16f0941450bee6ba7bd94ab41dc72;hpb=78f4f21969789bec27a8e2957eb00a87d8756041

diff --git a/client/GoodFET.py b/client/GoodFET.py
index 7497497..da652c3 100755
--- a/client/GoodFET.py
+++ b/client/GoodFET.py
@@ -36,6 +36,9 @@ class GoodFET:
             115200,
             parity = serial.PARITY_NONE
             )
+        
+        #Explicitly set RTS
+        self.serialport.setRTS(1);
         #Drop DTR, which is !RST, low to begin the app.
         self.serialport.setDTR(0);
         self.serialport.flushInput()
@@ -55,6 +58,8 @@ class GoodFET:
         self.serialport.write(chr(app));
         self.serialport.write(chr(verb));
         
+        #if data!=None:
+        #    count=len(data); #Initial count ignored.
         
         #print "TX %02x %02x" % (app,verb);
         
@@ -63,9 +68,14 @@ class GoodFET:
         self.serialport.write(chr(count>>8));
         
         #print "count=%02x, len(data)=%04x" % (count,len(data));
+        
         if count!=0:
-            for d in data:
-                self.serialport.write(chr(d));
+            for i in range(0,count):
+                #print "Converting %02x at %i" % (data[i],i)
+                data[i]=chr(data[i]);
+            outstr=''.join(data);
+            #outstr=data;
+            self.serialport.write(outstr);
         if not self.besilent:
             self.readcmd();
         
@@ -208,139 +218,3 @@ class GoodFET:
         """Write bytes by I2C."""
         self.writecmd(0x02,0x01,len(bytes),bytes); #SPI/SETUP
         return ord(self.data[0]);
-class GoodFETCC(GoodFET):
-    """A GoodFET variant for use with Chipcon 8051 Zigbe SoC."""
-    def CChaltcpu(self):
-        """Halt the CPU."""
-        self.writecmd(0x30,0x86,0,self.data);
-    def CCreleasecpu(self):
-        """Resume the CPU."""
-        self.writecmd(0x30,0x87,0,self.data);
-    def CCtest(self):
-        self.CCreleasecpu();
-        self.CChaltcpu();
-        #print "Status: %s" % self.CCstatusstr();
-        
-        #Grab ident three times, should be equal.
-        ident1=self.CCident();
-        ident2=self.CCident();
-        ident3=self.CCident();
-        if(ident1!=ident2 or ident2!=ident3):
-            print "Error, repeated ident attempts unequal."
-            print "%04x, %04x, %04x" % (ident1, ident2, ident3);
-        
-        #Single step, printing PC.
-        print "Tracing execution at startup."
-        for i in range(1,15):
-            pc=self.CCgetPC();
-            byte=self.CCpeekcodebyte(i);
-            #print "PC=%04x, %02x" % (pc, byte);
-            self.CCstep_instr();
-        
-        print "Verifying that debugging a NOP doesn't affect the PC."
-        for i in range(1,15):
-            pc=self.CCgetPC();
-            self.CCdebuginstr([0x00]);
-            if(pc!=self.CCgetPC()):
-                print "ERROR: PC changed during CCdebuginstr([NOP])!";
-        
-        
-        #print "Status: %s." % self.CCstatusstr();
-        #Exit debugger
-        self.CCstop();
-        print "Done.";
-
-    def CCsetup(self):
-        """Move the FET into the CC2430/CC2530 application."""
-        #print "Initializing Chipcon.";
-        self.writecmd(0x30,0x10,0,self.data);
-    def CCrd_config(self):
-        """Read the config register of a Chipcon."""
-        self.writecmd(0x30,0x82,0,self.data);
-        return ord(self.data[0]);
-    def CCwr_config(self,config):
-        """Write the config register of a Chipcon."""
-        self.writecmd(0x30,0x81,1,[config&0xFF]);
-    
-    CCversions={0x0100:"CC1110",
-                0x8500:"CC2430",
-                0x8900:"CC2431",
-                0x8100:"CC2510",
-                0x9100:"CC2511",
-                0xFF00:"CCmissing"};
-    def CCidentstr(self):
-        ident=self.CCident();
-        chip=self.CCversions.get(ident&0xFF00);
-        return "%s/r%02x" % (chip, ident&0xFF); 
-    def CCident(self):
-        """Get a chipcon's ID."""
-        self.writecmd(0x30,0x8B,0,None);
-        chip=ord(self.data[0]);
-        rev=ord(self.data[1]);
-        return (chip<<8)+rev;
-    def CCgetPC(self):
-        """Get a chipcon's PC."""
-        self.writecmd(0x30,0x83,0,None);
-        hi=ord(self.data[0]);
-        lo=ord(self.data[1]);
-        return (hi<<8)+lo;
-    def CCdebuginstr(self,instr):
-        self.writecmd(0x30,0x88,len(instr),instr);
-        return ord(self.data[0]);
-    def CCpeekcodebyte(self,adr):
-        """Read the contents of code memory at an address."""
-        self.data=[adr&0xff, (adr&0xff00)>>8];
-        self.writecmd(0x30,0x90,2,self.data);
-        return ord(self.data[0]);
-    def CCpeekdatabyte(self,adr):
-        """Read the contents of data memory at an address."""
-        self.data=[adr&0xff, (adr&0xff00)>>8];
-        self.writecmd(0x30,0x91, 2, self.data);
-        return ord(self.data[0]);
-    def CCpokedatabyte(self,adr,val):
-        """Write a byte to data memory."""
-        self.data=[adr&0xff, (adr&0xff00)>>8, val];
-        self.writecmd(0x30, 0x92, 3, self.data);
-        return ord(self.data[0]);
-    def CCchiperase(self):
-        """Erase all of the target's memory."""
-        self.writecmd(0x30,0x80,0,None);
-    def CCstatus(self):
-        """Check the status."""
-        self.writecmd(0x30,0x84,0,None);
-        return ord(self.data[0])
-    CCstatusbits={0x80 : "erased",
-                  0x40 : "pcon_idle",
-                  0x20 : "halted",
-                  0x10 : "pm0",
-                  0x08 : "halted",
-                  0x04 : "locked",
-                  0x02 : "oscstable",
-                  0x01 : "overflow"};
-    def CCstatusstr(self):
-        """Check the status as a string."""
-        status=self.CCstatus();
-        str="";
-        i=1;
-        while i<0x100:
-            if(status&i):
-                str="%s %s" %(self.CCstatusbits[i],str);
-            i*=2;
-        return str;
-    def CCstart(self):
-        """Start debugging."""
-        self.writecmd(0x30,0x20,0,self.data);
-        ident=self.CCidentstr();
-        print "Target identifies as %s." % ident;
-        #print "Status: %s." % self.CCstatusstr();
-        self.CCreleasecpu();
-        self.CChaltcpu();
-        #print "Status: %s." % self.CCstatusstr();
-        
-    def CCstop(self):
-        """Stop debugging."""
-        self.writecmd(0x30,0x21,0,self.data);
-    def CCstep_instr(self):
-        """Step one instruction."""
-        self.writecmd(0x30,0x89,0,self.data);
-