uploader: ignore bad character encodings for older bootloaders

this prevents the uploader from throwing an exception with older
bootloaders
This commit is contained in:
Andrew Tridgell
2014-04-04 13:02:44 +11:00
committed by Lorenz Meier
parent 1ecd3e9291
commit ec2197fd1b
+4
View File
@@ -389,6 +389,7 @@ class uploader(object):
self.otp_pid = self.otp[12:8:-1] self.otp_pid = self.otp[12:8:-1]
self.otp_coa = self.otp[32:160] self.otp_coa = self.otp[32:160]
# show user: # show user:
try:
print("type: " + self.otp_id.decode('Latin-1')) print("type: " + self.otp_id.decode('Latin-1'))
print("idtype: " + binascii.b2a_qp(self.otp_idtype).decode('Latin-1')) print("idtype: " + binascii.b2a_qp(self.otp_idtype).decode('Latin-1'))
print("vid: " + binascii.hexlify(self.otp_vid).decode('Latin-1')) print("vid: " + binascii.hexlify(self.otp_vid).decode('Latin-1'))
@@ -401,6 +402,9 @@ class uploader(object):
self.sn = self.sn + x self.sn = self.sn + x
print(binascii.hexlify(x).decode('Latin-1'), end='') # show user print(binascii.hexlify(x).decode('Latin-1'), end='') # show user
print('') print('')
except Exception:
# ignore bad character encodings
pass
print("erase...") print("erase...")
self.__erase() self.__erase()