GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 16:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jaime van Kessel 2016-07-29 15:20:34 +02:00
commit 601a6e987d
4 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/UltimakerMachineActions/BedLevelMachineAction.py
View File

@ -18,6 +18,11 @@ class BedLevelMachineAction(MachineAction):
pass pass
def _reset(self): def _reset(self):
self._bed_level_position = 0
pass
@pyqtSlot()
def startBedLeveling(self):
self._bed_level_position = 0 self._bed_level_position = 0
printer_output_devices = self._getPrinterOutputDevices() printer_output_devices = self._getPrinterOutputDevices()
if printer_output_devices: if printer_output_devices:
@ -52,4 +57,5 @@ class BedLevelMachineAction(MachineAction):
output_device.moveHead(0, 0, -3) output_device.moveHead(0, 0, -3)
self._bed_level_position += 1 self._bed_level_position += 1
elif self._bed_level_position >= 3: elif self._bed_level_position >= 3:
output_device.sendCommand("M18") # Turn off all motors so the user can move the axes
self.setFinished() self.setFinished()

20
plugins/UltimakerMachineActions/BedLevelMachineAction.qml
View File

@ -55,13 +55,29 @@ Cura.MachineAction
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
width: childrenRect.width width: childrenRect.width
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
Button
{
id: startBedLevelingButton
text: catalog.i18nc("@action:button","Start Bed Leveling")
onClicked:
{
startBedLevelingButton.visible = false;
bedlevelingButton.visible = true;
checkupMachineAction.heatupHotendStarted = false;
checkupMachineAction.heatupBedStarted = false;
manager.startCheck();
}
}
Button Button
{ {
id: bedlevelingButton id: bedlevelingButton
text: catalog.i18nc("@action:button","Move to Next Position"); text: catalog.i18nc("@action:button","Move to Next Position")
visible: false
onClicked: onClicked:
{ {
manager.moveToNextLevelPosition() manager.moveToNextLevelPosition();
} }
} }
} }

1
plugins/UltimakerMachineActions/UMOCheckupMachineAction.py
View File

@ -155,6 +155,7 @@ class UMOCheckupMachineAction(MachineAction):
if output_devices: if output_devices:
self._output_device = output_devices[0] self._output_device = output_devices[0]
try: try:
self._output_device.sendCommand("M18") # Turn off all motors so the user can move the axes
self._output_device.startPollEndstop() self._output_device.startPollEndstop()
self._output_device.bedTemperatureChanged.connect(self.bedTemperatureChanged) self._output_device.bedTemperatureChanged.connect(self.bedTemperatureChanged)
self._output_device.hotendTemperaturesChanged.connect(self.hotendTemperatureChanged) self._output_device.hotendTemperaturesChanged.connect(self.hotendTemperatureChanged)

7
plugins/UltimakerMachineActions/UMOCheckupMachineAction.qml
View File

@ -53,9 +53,10 @@ Cura.MachineAction
text: catalog.i18nc("@action:button","Start Printer Check"); text: catalog.i18nc("@action:button","Start Printer Check");
onClicked: onClicked:
{ {
checkupMachineAction.heatupHotendStarted = false checkupMachineAction.heatupHotendStarted = false;
checkupMachineAction.heatupBedStarted = false checkupMachineAction.heatupBedStarted = false;
manager.startCheck() manager.startCheck();
startCheckButton.visible = false;
} }
} }
} }