X-Git-Url: http://git.rot13.org/?p=goodfet;a=blobdiff_plain;f=client%2FGoodFETMSP430.py;h=ac9ab74aeb10470f01416d87cb9641506207952e;hp=ef9c64d6a8b8b3c0ccaa4f5777f745727ff6e696;hb=1757456dc0a877f5de598ef112704105e26da916;hpb=2c6a5e35ea7cb96e92e8c3338eb63fed1e258378

diff --git a/client/GoodFETMSP430.py b/client/GoodFETMSP430.py
index ef9c64d..ac9ab74 100644
--- a/client/GoodFETMSP430.py
+++ b/client/GoodFETMSP430.py
@@ -66,7 +66,7 @@ class GoodFETMSP430(GoodFET):
         self.writecmd(self.MSP430APP,0x03,6,self.data);
         written=ord(self.data[0])+(ord(self.data[1])<<8);
         if(written!=val):
-            print "Failed to write 0x%04x to 0x$04x" % (val,adr);
+            print "Failed to write 0x%04x to 0x%04x" % (val,adr);
         return written;
     def MSP430pokeflash(self,adr,val):
         """Write the contents of flash memory at an address."""
@@ -87,6 +87,11 @@ class GoodFETMSP430(GoodFET):
         """Start debugging."""
         self.writecmd(self.MSP430APP,0x20,0,self.data);
         self.JTAGID=ord(self.data[0]);
+        if(not (self.JTAGID==0x89 or self.JTAGID==0x91)):
+            #Try once more
+            self.writecmd(self.MSP430APP,0x20,0,self.data);
+            self.JTAGID=ord(self.data[0]);
+        
         #print "Identified as %02x." % self.JTAGID;
         if(not (self.JTAGID==0x89 or self.JTAGID==0x91)):
             print "Error, misidentified as %02x.\nCheck wiring, as this should be 0x89 or 0x91." % self.JTAGID;