1.1 --- a/upload.py	Mon Aug 24 13:00:39 2015 +0200
     1.2 +++ b/upload.py	Mon Aug 24 14:48:40 2015 +0200
     1.3 @@ -86,21 +86,13 @@
     1.4          if not verify_only:
     1.5              writeToPort("P%05x%02x\n" % (addr, value))
     1.6              resp = readFromPort()
     1.7 -            if resp == "P":
     1.8 -                i += 1
     1.9 -                continue
    1.10 -            else:
    1.11 -                closePort()
    1.12 -                openPort()
    1.13 -
    1.14 -        for attempt in "first", "second":
    1.15 +            success = resp == "P"
    1.16 +        else:
    1.17              writeToPort("R%05x\n" % addr)
    1.18              resp = readFromPort()
    1.19 -            if resp == "%02X" % value or resp == "%X" % value:
    1.20 -                break
    1.21 -            closePort()
    1.22 -            openPort()
    1.23 -        else:
    1.24 +            success = resp == "%02X" % value or resp == "%X" % value
    1.25 +
    1.26 +        if not success:
    1.27              print >>sys.stderr, "%s of location %05x failed: %s" % (verify_only and "Verify" or "Program", addr, resp)
    1.28              return False
    1.29