Fix merge conflicts, add can_send_raw_gcode ability, rename to sendRawCommand, small fixes

This commit is contained in:
ChrisTerBeke 2018-03-15 16:51:25 +01:00
commit d4d9a58d04
13 changed files with 602 additions and 139 deletions

View file

@ -111,8 +111,8 @@ class PrinterOutputModel(QObject):
self._controller.homeBed(self)
@pyqtSlot(str)
def sendCustomCommand(self, command: str):
self._controller.sendCustomCommand(self, command)
def sendRawCommand(self, command: str):
self._controller.sendRawCommand(self, command)
@pyqtProperty("QVariantList", constant = True)
def extruders(self):
@ -242,6 +242,20 @@ class PrinterOutputModel(QObject):
return self._controller.can_pre_heat_bed
return False
# Does the printer support pre-heating the bed at all
@pyqtProperty(bool, constant=True)
def canPreHeatHotends(self):
if self._controller:
return self._controller.can_pre_heat_hotends
return False
# Does the printer support sending raw G-code at all
@pyqtProperty(bool, constant=True)
def canSendRawGcode(self):
if self._controller:
return self._controller.can_send_raw_gcode
return False
# Does the printer support pause at all
@pyqtProperty(bool, constant=True)
def canPause(self):