diff -urN jenprog-1.0/con_serial.py jenprog-1.0_jn-5148/con_serial.py --- jenprog-1.0/con_serial.py 2009-04-02 23:02:51.000000000 +0200 +++ jenprog-1.0_jn-5148/con_serial.py 2009-10-16 16:51:18.000000000 +0200 @@ -5,8 +5,8 @@ class SerialBootloader(JennicProtocol): def __init__(self, devname): - self.DEFAULT_TIMEOUT = .1 - self.MAX_TIMEOUT = 2 + self.DEFAULT_TIMEOUT = .2 # was .1 + self.MAX_TIMEOUT = 4 # was 2 if devname==None: devname='/dev/ttyUSB0' self.ser = Serial(devname, 38400, timeout=.1, parity=PARITY_NONE, stopbits=1, bytesize=8, rtscts=1, dsrdtr=0) diff -urN jenprog-1.0/flashutils.py jenprog-1.0_jn-5148/flashutils.py --- jenprog-1.0/flashutils.py 2009-04-02 23:02:52.000000000 +0200 +++ jenprog-1.0_jn-5148/flashutils.py 2009-10-16 15:55:39.000000000 +0200 @@ -11,7 +11,7 @@ def select_flash(self): self.identify_flash() - assert self.flash_jennicid in (0x00, 0x01, 0x02), "unsupported flash type" + assert self.flash_jennicid in (0x00, 0x01, 0x02, 0x03), "unsupported flash type" status = self.talk(0x2C, 0x2D, data = [self.flash_jennicid])[0] assert status == 0, "could not select detected flash type was: %d"%status @@ -35,6 +35,10 @@ self.flash_manufacturer = "Atmel" self.flash_type = "25F512" self.flash_jennicid = 0x02 + elif self.flash_manufacturer == 0x12 and self.flash_type == 0x12: + self.flash_manufacturer = "ST" + self.flash_type = "M25P40" + self.flash_jennicid = 0x03 else: self.flash_manufacturer = "unknown" self.flash_type = "unknown"