diff options
author | Lipu Fei <lipu.fei815@gmail.com> | 2019-08-27 09:51:48 +0300 |
---|---|---|
committer | Lipu Fei <lipu.fei815@gmail.com> | 2019-08-27 09:52:13 +0300 |
commit | 3853fb6d192c6bc75b3e5b7f39d07f804928b599 (patch) | |
tree | 52373afaffeeaca1c9863d2dc20432c9974da3c4 /plugins/USBPrinting | |
parent | b20a349b4454d08e34b3c3ea3f537a380e4c7696 (diff) |
Add UI feedback on invalid firmware update
CURA-6537
Diffstat (limited to 'plugins/USBPrinting')
-rw-r--r-- | plugins/USBPrinting/AvrFirmwareUpdater.py | 3 | ||||
-rw-r--r-- | plugins/USBPrinting/avr_isp/intelHex.py | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/plugins/USBPrinting/AvrFirmwareUpdater.py b/plugins/USBPrinting/AvrFirmwareUpdater.py index 0f7146560d..ded2036efe 100644 --- a/plugins/USBPrinting/AvrFirmwareUpdater.py +++ b/plugins/USBPrinting/AvrFirmwareUpdater.py @@ -27,6 +27,9 @@ class AvrFirmwareUpdater(FirmwareUpdater): except (FileNotFoundError, AssertionError): Logger.log("e", "Unable to read provided hex file. Could not update firmware.") self._setFirmwareUpdateState(FirmwareUpdateState.firmware_not_found_error) + except Exception: + Logger.logException("e", "Failed to read hex file '%s'", self._firmware_file) + self._setFirmwareUpdateState(FirmwareUpdateState.invalid_firmware_error) return programmer = stk500v2.Stk500v2() diff --git a/plugins/USBPrinting/avr_isp/intelHex.py b/plugins/USBPrinting/avr_isp/intelHex.py index 671f1788f7..3c5c66d805 100644 --- a/plugins/USBPrinting/avr_isp/intelHex.py +++ b/plugins/USBPrinting/avr_isp/intelHex.py @@ -5,13 +5,16 @@ See: http://en.wikipedia.org/wiki/Intel_HEX This is a python 3 conversion of the code created by David Braam for the Cura project. """ import io +from typing import List + from UM.Logger import Logger -def readHex(filename): + +def readHex(filename: str) -> List[int]: """ Read an verify an intel hex file. Return the data as an list of bytes. """ - data = [] + data = [] # type: List[int] extra_addr = 0 f = io.open(filename, "r", encoding = "utf-8") for line in f: |