3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2019-09-06 17:26:42 +02:00
commit 5e41443bef
No known key found for this signature in database
GPG key ID: 3710727397403C91
4 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cura/PrinterOutput/FirmwareUpdater.py
View file

@ -75,4 +75,4 @@ class FirmwareUpdateState(IntEnum):
communication_error = 4 communication_error = 4
io_error = 5 io_error = 5
firmware_not_found_error = 6 firmware_not_found_error = 6
invalid_firmware_error = 7

2
plugins/FirmwareUpdater/FirmwareUpdaterMachineAction.qml
View file

@ -151,8 +151,6 @@ Cura.MachineAction
return catalog.i18nc("@label","Firmware update failed due to an input/output error."); return catalog.i18nc("@label","Firmware update failed due to an input/output error.");
case 6: case 6:
return catalog.i18nc("@label","Firmware update failed due to missing firmware."); return catalog.i18nc("@label","Firmware update failed due to missing firmware.");
case 7:
return catalog.i18nc("@label","Firmware update failed due to invalid firmware file.");
} }
} }

3
plugins/USBPrinting/AvrFirmwareUpdater.py
View file

@ -27,9 +27,6 @@ class AvrFirmwareUpdater(FirmwareUpdater):
except (FileNotFoundError, AssertionError): except (FileNotFoundError, AssertionError):
Logger.log("e", "Unable to read provided hex file. Could not update firmware.") Logger.log("e", "Unable to read provided hex file. Could not update firmware.")
self._setFirmwareUpdateState(FirmwareUpdateState.firmware_not_found_error) 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 return
programmer = stk500v2.Stk500v2() programmer = stk500v2.Stk500v2()

7
plugins/USBPrinting/avr_isp/intelHex.py
View file

@ -5,16 +5,13 @@ 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. This is a python 3 conversion of the code created by David Braam for the Cura project.
""" """
import io import io
from typing import List
from UM.Logger import Logger 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. Read an verify an intel hex file. Return the data as an list of bytes.
""" """
data = [] # type: List[int] data = []
extra_addr = 0 extra_addr = 0
f = io.open(filename, "r", encoding = "utf-8") f = io.open(filename, "r", encoding = "utf-8")
for line in f: for line in f: