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

Make Griffin a selectable method instead of snooping it from gcode

Browse source
This commit is contained in:
fieldOfView 2020-03-20 12:56:07 +01:00
parent c4d1ab4ff1
commit 87633e7818
1 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
View file

@ -54,9 +54,9 @@ class PauseAtHeight(Script):
"label": "Method", "label": "Method",
"description": "The method or gcode command to use for pausing.", "description": "The method or gcode command to use for pausing.",
"type": "enum", "type": "enum",
"options": {"marlin": "Marlin (M0)", "bq": "BQ (M25)", "reprap": "RepRap (M226)", "repetier": "Repetier (@pause)"}, "options": {"marlin": "Marlin (M0)", "griffin": "Griffin (M0, firmware retract)", "bq": "BQ (M25)", "reprap": "RepRap (M226)", "repetier": "Repetier (@pause)"},
"default_value": "marlin", "default_value": "marlin",
"value": "\\\"reprap\\\" if machine_gcode_flavor==\\\"RepRap (RepRap)\\\" else \\\"repetier\\\" if machine_gcode_flavor==\\\"Repetier\\\" else \\\"bq\\\" if \\\"BQ\\\" in machine_name else \\\"marlin\\\"" "value": "\\\"griffin\\\" if machine_gcode_flavor==\\\"Griffin\\\" else \\\"reprap\\\" if machine_gcode_flavor==\\\"RepRap (RepRap)\\\" else \\\"repetier\\\" if machine_gcode_flavor==\\\"Repetier\\\" else \\\"bq\\\" if \\\"BQ\\\" in machine_name else \\\"marlin\\\""
}, },
"head_park_x": "head_park_x":
{ {
@ -64,7 +64,8 @@ class PauseAtHeight(Script):
"description": "What X location does the head move to when pausing.", "description": "What X location does the head move to when pausing.",
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 190 "default_value": 190,
"enabled": "pause_method != \\\"griffin\\\""
}, },
"head_park_y": "head_park_y":
{ {
@ -72,7 +73,8 @@ class PauseAtHeight(Script):
"description": "What Y location does the head move to when pausing.", "description": "What Y location does the head move to when pausing.",
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 190 "default_value": 190,
"enabled": "pause_method != \\\"griffin\\\""
}, },
"retraction_amount": "retraction_amount":
{ {
@ -80,7 +82,8 @@ class PauseAtHeight(Script):
"description": "How much filament must be retracted at pause.", "description": "How much filament must be retracted at pause.",
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 0 "default_value": 0,
"enabled": "pause_method != \\\"griffin\\\""
}, },
"retraction_speed": "retraction_speed":
{ {
@ -88,7 +91,8 @@ class PauseAtHeight(Script):
"description": "How fast to retract the filament.", "description": "How fast to retract the filament.",
"unit": "mm/s", "unit": "mm/s",
"type": "float", "type": "float",
"default_value": 25 "default_value": 25,
"enabled": "pause_method != \\\"griffin\\\""
}, },
"extrude_amount": "extrude_amount":
{ {
@ -96,7 +100,8 @@ class PauseAtHeight(Script):
"description": "How much filament should be extruded after pause. This is needed when doing a material change on Ultimaker2's to compensate for the retraction after the change. In that case 128+ is recommended.", "description": "How much filament should be extruded after pause. This is needed when doing a material change on Ultimaker2's to compensate for the retraction after the change. In that case 128+ is recommended.",
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 0 "default_value": 0,
"enabled": "pause_method != \\\"griffin\\\""
}, },
"extrude_speed": "extrude_speed":
{ {
@ -104,7 +109,8 @@ class PauseAtHeight(Script):
"description": "How fast to extrude the material after pause.", "description": "How fast to extrude the material after pause.",
"unit": "mm/s", "unit": "mm/s",
"type": "float", "type": "float",
"default_value": 3.3333 "default_value": 3.3333,
"enabled": "pause_method != \\\"griffin\\\""
}, },
"redo_layers": "redo_layers":
{ {
@ -120,7 +126,8 @@ class PauseAtHeight(Script):
"description": "Change the temperature during the pause.", "description": "Change the temperature during the pause.",
"unit": "°C", "unit": "°C",
"type": "int", "type": "int",
"default_value": 0 "default_value": 0,
"enabled": "pause_method != \\\"griffin\\\""
}, },
"display_text": "display_text":
{ {
@ -206,13 +213,12 @@ class PauseAtHeight(Script):
pause_method = self.getSettingValueByKey("pause_method") pause_method = self.getSettingValueByKey("pause_method")
pause_command = { pause_command = {
"marlin": self.putValue(M = 0), "marlin": self.putValue(M = 0),
"griffin": self.putValue(M = 0),
"bq": self.putValue(M = 25), "bq": self.putValue(M = 25),
"reprap": self.putValue(M = 226), "reprap": self.putValue(M = 226),
"repetier": self.putValue("@pause") "repetier": self.putValue("@pause")
}[pause_method] }[pause_method]
is_griffin = False
# T = ExtruderManager.getInstance().getActiveExtruderStack().getProperty("material_print_temperature", "value") # T = ExtruderManager.getInstance().getActiveExtruderStack().getProperty("material_print_temperature", "value")
# use offset to calculate the current height: <current_height> = <current_z> - <layer_0_z> # use offset to calculate the current height: <current_height> = <current_z> - <layer_0_z>
@ -232,8 +238,6 @@ class PauseAtHeight(Script):
# Scroll each line of instruction for each layer in the G-code # Scroll each line of instruction for each layer in the G-code
for line in lines: for line in lines:
if ";FLAVOR:Griffin" in line:
is_griffin = True
# Fist positive layer reached # Fist positive layer reached
if ";LAYER:0" in line: if ";LAYER:0" in line:
layers_started = True layers_started = True
@ -336,7 +340,7 @@ class PauseAtHeight(Script):
else: else:
prepend_gcode += ";current layer: {layer}\n".format(layer = current_layer) prepend_gcode += ";current layer: {layer}\n".format(layer = current_layer)
if not is_griffin: if pause_method != "griffin":
# Retraction # Retraction
prepend_gcode += self.putValue(M = 83) + " ; switch to relative E values for any needed retraction\n" prepend_gcode += self.putValue(M = 83) + " ; switch to relative E values for any needed retraction\n"
if retraction_amount != 0: if retraction_amount != 0:
@ -366,7 +370,7 @@ class PauseAtHeight(Script):
# Wait till the user continues printing # Wait till the user continues printing
prepend_gcode += pause_command + " ; Do the actual pause\n" prepend_gcode += pause_command + " ; Do the actual pause\n"
if not is_griffin: if pause_method != "griffin":
if control_temperatures: if control_temperatures:
# Set extruder resume temperature # Set extruder resume temperature
prepend_gcode += self.putValue(M = 109, S = int(target_temperature.get(current_t, 0))) + " ; resume temperature\n" prepend_gcode += self.putValue(M = 109, S = int(target_temperature.get(current_t, 0))) + " ; resume temperature\n"