Merge pull request #15092 from Ultimaker/5.3

5.3
This commit is contained in:
Jelle Spijker 2023-03-30 15:07:45 +00:00 committed by GitHub
commit 5680ea8ee8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -67,7 +67,7 @@ class PauseAtHeight(Script):
"label": "Keep motors engaged", "label": "Keep motors engaged",
"description": "Keep the steppers engaged to allow change of filament without moving the head. Applying too much force will move the head/bed anyway", "description": "Keep the steppers engaged to allow change of filament without moving the head. Applying too much force will move the head/bed anyway",
"type": "bool", "type": "bool",
"default_value": true, "default_value": false,
"enabled": "pause_method != \\\"griffin\\\"" "enabled": "pause_method != \\\"griffin\\\""
}, },
"disarm_timeout": "disarm_timeout":
@ -218,7 +218,7 @@ class PauseAtHeight(Script):
"label": "Beep at pause", "label": "Beep at pause",
"description": "Make a beep when pausing", "description": "Make a beep when pausing",
"type": "bool", "type": "bool",
"default_value": true "default_value": false
}, },
"beep_length": "beep_length":
{ {
@ -478,10 +478,11 @@ class PauseAtHeight(Script):
prepend_gcode += "M117 " + display_text + "\n" prepend_gcode += "M117 " + display_text + "\n"
# Set the disarm timeout # Set the disarm timeout
if hold_steppers_on: if pause_method != "griffin":
prepend_gcode += self.putValue(M = 84, S = 3600) + " ; Keep steppers engaged for 1h\n" if hold_steppers_on:
elif disarm_timeout > 0: prepend_gcode += self.putValue(M = 84, S = 3600) + " ; Keep steppers engaged for 1h\n"
prepend_gcode += self.putValue(M = 84, S = disarm_timeout) + " ; Set the disarm timeout\n" elif disarm_timeout > 0:
prepend_gcode += self.putValue(M = 84, S = disarm_timeout) + " ; Set the disarm timeout\n"
# Beep at pause # Beep at pause
if beep_at_pause: if beep_at_pause: