Sync with upstream

AdamYellen · Mar 19, 2024 · 44223d7 · 44223d7
1 parent 27c6b08
commit 44223d7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.last_sync_id b/.last_sync_id
@@ -1 +1 @@
-f8dad75e072ed3cedd6e2179ff192917548deb00
+c3366bb83294e6d1ec908a14d25dc9b091fde428
diff --git a/klicky-macros.cfg b/klicky-macros.cfg
@@ -51,7 +51,6 @@ gcode:
     # mandatory to save the new safe position
     M400
     SET_VELOCITY_LIMIT ACCEL={printer.configfile.settings.printer.max_accel}
-    SET_VELOCITY_LIMIT ACCEL_TO_DECEL={printer.configfile.settings.printer.max_accel_to_decel}
     RESTORE_GCODE_STATE NAME={function} MOVE={move} MOVE_SPEED={speed}
 
 
@@ -650,6 +649,10 @@ gcode:
           _KlickyDebug msg="homing_override clearing axis homed state if not already homing Z"
           M84
         {% endif %}
+    {% else %}
+        _KlickyDebug msg="All axis homed"
+        {% set safe_z = printer.gcode_move.gcode_position.z|float %}
+        _KlickyDebug msg="Setting Safe_z to {printer.gcode_move.gcode_position.z}mm as Z is now above configured safe_z"
     {% endif %}
 
     {% if home_z %}
@@ -673,7 +676,7 @@ gcode:
             {% if verbose %}
                 { action_respond_info("Homing Y") }
             {% endif %}
-            {% if 'z' in printer.toolhead.homed_axes %}
+            {% if 'z' in printer.toolhead.homed_axes and printer.gcode_move.gcode_position.z < safe_z %}
                 _KlickyDebug msg="homing_override moving toolhead to {safe_z}mm from {printer.gcode_move.gcode_position.z}mm in Y homing seq"
                 {% if verbose %}
                     { action_respond_info("moving to a safe Z distance") }
@@ -707,7 +710,7 @@ gcode:
         {% if verbose %}
             { action_respond_info("Homing X") }
         {% endif %}
-        {% if 'z' in printer.toolhead.homed_axes %}
+        {% if 'z' in printer.toolhead.homed_axes and printer.gcode_move.gcode_position.z < safe_z %}
             _KlickyDebug msg="homing_override moving toolhead to {safe_z}mm from {printer.gcode_move.gcode_position.z}mm in X homing seq"
             {% if verbose %}
                 { action_respond_info("moving to a safe Z distance") }
@@ -738,7 +741,7 @@ gcode:
         {% if verbose %}
             { action_respond_info("Homing Y") }
         {% endif %}
-        {% if 'z' in printer.toolhead.homed_axes %}
+        {% if 'z' in printer.toolhead.homed_axes and printer.gcode_move.gcode_position.z < safe_z %}
             _KlickyDebug msg="homing_override moving toolhead to {safe_z}mm from {printer.gcode_move.gcode_position.z}mm in Y homing seq"
             {% if verbose %}
                 { action_respond_info("moving to a safe Z distance") }
@@ -767,7 +770,7 @@ gcode:
         {% if verbose %}
             { action_respond_info("Homing Z") }
         {% endif %}
-        {% if 'z' in printer.toolhead.homed_axes %}
+        {% if 'z' in printer.toolhead.homed_axes and printer.gcode_move.gcode_position.z < safe_z %}
             _KlickyDebug msg="homing_override moving toolhead to {safe_z}mm from {printer.gcode_move.gcode_position.z}mm in Y homing seq"
             {% if verbose %}
                 { action_respond_info("moving to a safe Z distance") }
@@ -857,6 +860,7 @@ gcode:
         G28 Z0
         _KlickyDebug msg="_Home_Z_ toolhead too low, raising it to {safe_z}mm from {printer.gcode_move.gcode_position.z}mm"
         G0 Z{safe_z} F{z_drop_feedrate}
+
     {% endif %}
 
     _exit_point function=Home_Z
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		f8dad75e072ed3cedd6e2179ff192917548deb00
		c3366bb83294e6d1ec908a14d25dc9b091fde428