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

Starting UMOCheckup before connection was established now works correctly

Browse source 
CURA-1385
This commit is contained in:
Jaime van Kessel 2016-06-23 13:10:57 +02:00
parent 488740c60d
commit b14ae94190
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/UltimakerMachineActions/UMOCheckupMachineAction.py
View file

@ -18,6 +18,11 @@ class UMOCheckupMachineAction(MachineAction):
self._y_min_endstop_test_completed = False self._y_min_endstop_test_completed = False
self._z_min_endstop_test_completed = False self._z_min_endstop_test_completed = False
self._check_started = False
Application.getInstance().getOutputDeviceManager().outputDevicesChanged.connect(self._onOutputDevicesChanged)
onBedTestCompleted = pyqtSignal() onBedTestCompleted = pyqtSignal()
onHotendTestCompleted = pyqtSignal() onHotendTestCompleted = pyqtSignal()
@ -28,6 +33,13 @@ class UMOCheckupMachineAction(MachineAction):
bedTemperatureChanged = pyqtSignal() bedTemperatureChanged = pyqtSignal()
hotendTemperatureChanged = pyqtSignal() hotendTemperatureChanged = pyqtSignal()
def _onOutputDevicesChanged(self):
# Check if this action was started, but no output device was found the first time.
# If so, re-try now that an output device has been added/removed.
if self._output_device is None and self._check_started:
self.startCheck()
def _getPrinterOutputDevices(self): def _getPrinterOutputDevices(self):
return [printer_output_device for printer_output_device in return [printer_output_device for printer_output_device in
Application.getInstance().getOutputDeviceManager().getOutputDevices() if Application.getInstance().getOutputDeviceManager().getOutputDevices() if
@ -46,6 +58,8 @@ class UMOCheckupMachineAction(MachineAction):
pass pass
self._output_device = None self._output_device = None
self._check_started = False
# Ensure everything is reset (and right signals are emitted again) # Ensure everything is reset (and right signals are emitted again)
self._bed_test_completed = False self._bed_test_completed = False
self.onBedTestCompleted.emit() self.onBedTestCompleted.emit()
@ -121,6 +135,7 @@ class UMOCheckupMachineAction(MachineAction):
@pyqtSlot() @pyqtSlot()
def startCheck(self): def startCheck(self):
self._check_started = True
output_devices = self._getPrinterOutputDevices() output_devices = self._getPrinterOutputDevices()
if output_devices: if output_devices:
self._output_device = output_devices[0] self._output_device = output_devices[0]