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

Fix missing imports

Browse source
This commit is contained in:
fieldOfView 2018-09-28 13:06:36 +02:00
parent 6ecc9366cb
commit b73a71746e
2 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/USBPrinting/AvrFirmwareUpdater.py
View file

@ -1,10 +1,16 @@
# Copyright (c) 2018 Ultimaker B.V. # Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
from UM.Logger import Logger
from cura.CuraApplication import CuraApplication
from cura.PrinterOutputDevice import PrinterOutputDevice from cura.PrinterOutputDevice import PrinterOutputDevice
from cura.PrinterOutput.FirmwareUpdater import FirmwareUpdater, FirmwareUpdateState from cura.PrinterOutput.FirmwareUpdater import FirmwareUpdater, FirmwareUpdateState
from .avr_isp import stk500v2, intelHex from .avr_isp import stk500v2, intelHex
from serial import SerialException
from time import sleep
class AvrFirmwareUpdater(FirmwareUpdater): class AvrFirmwareUpdater(FirmwareUpdater):
def __init__(self, output_device: PrinterOutputDevice) -> None: def __init__(self, output_device: PrinterOutputDevice) -> None:
@ -37,10 +43,12 @@ class AvrFirmwareUpdater(FirmwareUpdater):
self.setFirmwareUpdateState(FirmwareUpdateState.communication_error) self.setFirmwareUpdateState(FirmwareUpdateState.communication_error)
try: try:
programmer.programChip(hex_file) programmer.programChip(hex_file)
except SerialException: except SerialException as e:
Logger.log("e", "A serial port exception occured during firmware update: %s" % e)
self.setFirmwareUpdateState(FirmwareUpdateState.io_error) self.setFirmwareUpdateState(FirmwareUpdateState.io_error)
return return
except: except Exception as e:
Logger.log("e", "An unknown exception occured during firmware update: %s" % e)
self.setFirmwareUpdateState(FirmwareUpdateState.unknown_error) self.setFirmwareUpdateState(FirmwareUpdateState.unknown_error)
return return

2
plugins/USBPrinting/USBPrinterOutputDevice.py
View file

@ -15,7 +15,7 @@ from cura.PrinterOutput.GenericOutputController import GenericOutputController
from .AutoDetectBaudJob import AutoDetectBaudJob from .AutoDetectBaudJob import AutoDetectBaudJob
from .AvrFirmwareUpdater import AvrFirmwareUpdater from .AvrFirmwareUpdater import AvrFirmwareUpdater
from PyQt5.QtCore import pyqtSlot, pyqtSignal, pyqtProperty from PyQt5.QtCore import pyqtSlot, pyqtSignal, pyqtProperty, QUrl
from serial import Serial, SerialException, SerialTimeoutException from serial import Serial, SerialException, SerialTimeoutException
from threading import Thread, Event from threading import Thread, Event