feat: add park to CANCEL_PRINT (#58)

* add park to CANCEL_PRINT * used wrong copy
mainsail-crew · Oct 23, 2021 · 00169c7 · 00169c7
1 parent a12c539
commit 00169c7
Showing 1 changed file with 75 additions and 50 deletions.
diff --git a/src/modules/mainsail/filesystem/home/pi/klipper_config/mainsail.cfg b/src/modules/mainsail/filesystem/home/pi/klipper_config/mainsail.cfg
@@ -1,3 +1,16 @@
+# Mainsail klipper definitions
+#
+# Copyright (C) 2021 Alex Zellner <alexander.zellner@googlemail.com>
+#
+# This file may be distributed under the terms of the GNU GPLv3 license
+#
+# Version 1.7
+
+# add [include mainsail.cfg] to your printer.cfg to include it to your printer.cfg
+# modify x_park, y_park, z_park_delta and extrude value at the macro _TOOLHEAD_PARK_PAUSE_CANCEL if needed
+
+# use variable_park: False at CANCEL_PRINT to disallow the parking move
+
 [virtual_sdcard]
 path: /home/pi/gcode_files
 
@@ -8,63 +21,75 @@ path: /home/pi/gcode_files
 [gcode_macro CANCEL_PRINT]
 description: Cancel the actual running print
 rename_existing: CANCEL_PRINT_BASE
+variable_park: True
 gcode:
-    TURN_OFF_HEATERS
-    CANCEL_PRINT_BASE
+  ## Move head and retract only if not already in the pause state and park set to true
+  {% if printer.pause_resume.is_paused|lower == 'false' and park|lower == 'true'%}
+    _TOOLHEAD_PARK_PAUSE_CANCEL
+  {% endif %}
+  TURN_OFF_HEATERS
+  CANCEL_PRINT_BASE
 
 [gcode_macro PAUSE]
 description: Pause the actual running print
 rename_existing: PAUSE_BASE
-# change this if you need more or less extrusion
-variable_extrude: 1.0
 gcode:
-    ##### read E from pause macro #####
-    {% set E = printer["gcode_macro PAUSE"].extrude|float %}
-    ##### set park positon for x and y #####
-    # default is your max posion from your printer.cfg
-    {% set x_park = printer.toolhead.axis_maximum.x|float - 5.0 %}
-    {% set y_park = printer.toolhead.axis_maximum.y|float - 5.0 %}
-    ##### calculate save lift position #####
-    {% set max_z = printer.toolhead.axis_maximum.z|float %}
-    {% set act_z = printer.toolhead.position.z|float %}
-    {% if act_z < (max_z - 2.0) %}
-        {% set z_safe = 2.0 %}
-    {% else %}
-        {% set z_safe = max_z - act_z %}
-    {% endif %}
-    ##### end of definitions #####
-    PAUSE_BASE
-    G91
-    {% if printer.extruder.can_extrude|lower == 'true' %}
-      G1 E-{E} F2100
-    {% else %}
-      {action_respond_info("Extruder not hot enough")}
-    {% endif %}
-    {% if "xyz" in printer.toolhead.homed_axes %}
-      G1 Z{z_safe} F900
-      G90
-      G1 X{x_park} Y{y_park} F6000
-    {% else %}
-      {action_respond_info("Printer not homed")}
-    {% endif %} 
-
+  PAUSE_BASE
+  _TOOLHEAD_PARK_PAUSE_CANCEL
+
 [gcode_macro RESUME]
 description: Resume the actual running print
 rename_existing: RESUME_BASE
 gcode:
-    ##### read E from pause macro #####
-    {% set E = printer["gcode_macro PAUSE"].extrude|float %}
-    #### get VELOCITY parameter if specified ####
-    {% if 'VELOCITY' in params|upper %}
-      {% set get_params = ('VELOCITY=' + params.VELOCITY)  %}
-    {%else %}
-      {% set get_params = "" %}
-    {% endif %}
-    ##### end of definitions #####
-    {% if printer.extruder.can_extrude|lower == 'true' %}
-      G91
-      G1 E{E} F2100
-    {% else %}
-      {action_respond_info("Extruder not hot enough")}
-    {% endif %}  
-    RESUME_BASE {get_params}
+  ##### read extrude from  _TOOLHEAD_PARK_PAUSE_CANCEL  macro #####
+  {% set extrude = printer['gcode_macro _TOOLHEAD_PARK_PAUSE_CANCEL'].extrude %}
+  #### get VELOCITY parameter if specified ####
+  {% if 'VELOCITY' in params|upper %}
+    {% set get_params = ('VELOCITY=' + params.VELOCITY)  %}
+  {%else %}
+    {% set get_params = "" %}
+  {% endif %}
+  ##### end of definitions #####
+  {% if printer.extruder.can_extrude|lower == 'true' %}
+    M83
+    G1 E{extrude} F2100
+    {% if printer.gcode_move.absolute_extrude |lower == 'true' %} M82 {% endif %}
+  {% else %}
+    {action_respond_info("Extruder not hot enough")}
+  {% endif %}  
+  RESUME_BASE {get_params}
+
+[gcode_macro _TOOLHEAD_PARK_PAUSE_CANCEL]
+description: Helper: park toolhead used in PAUSE and CANCEL_PRINT
+variable_extrude: 1.0
+gcode:
+  ##### set park positon for x and y #####
+  # default is your max posion from your printer.cfg
+  {% set x_park = printer.toolhead.axis_maximum.x|float - 5.0 %}
+  {% set y_park = printer.toolhead.axis_maximum.y|float - 5.0 %}
+  {% set z_park_delta = 2.0 %}
+  ##### calculate save lift position #####
+  {% set max_z = printer.toolhead.axis_maximum.z|float %}
+  {% set act_z = printer.toolhead.position.z|float %}
+  {% if act_z < (max_z - z_park_delta) %}
+    {% set z_safe = z_park_delta %}
+  {% else %}
+    {% set z_safe = max_z - act_z %}
+  {% endif %}
+  ##### end of definitions #####
+  {% if printer.extruder.can_extrude|lower == 'true' %}
+    M83
+    G1 E-{extrude} F2100
+    {% if printer.gcode_move.absolute_extrude |lower == 'true' %} M82 {% endif %}
+  {% else %}
+    {action_respond_info("Extruder not hot enough")}
+  {% endif %}
+  {% if "xyz" in printer.toolhead.homed_axes %}
+    G91
+    G1 Z{z_safe} F900
+    G90
+    G1 X{x_park} Y{y_park} F6000
+    {% if printer.gcode_move.absolute_coordinates|lower == 'false' %} G91 {% endif %}
+  {% else %}
+    {action_respond_info("Printer not homed")}
+  {% endif %}