From b95eb9df922789af024bb28b0cd334a04dd6f68b Mon Sep 17 00:00:00 2001
From: Martyn <m@rtyn.berlin>
Date: Wed, 19 Mar 2025 14:00:23 +0000
Subject: [PATCH] Automatic commit of config from 2025-03-19

---
 martyn_macros.cfg | 44 ++++++++++++++++++++++++++++-
 printer.cfg       | 70 ++++++++++++++++++++---------------------------
 2 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/martyn_macros.cfg b/martyn_macros.cfg
index 310bb0d..ca7310c 100644
--- a/martyn_macros.cfg
+++ b/martyn_macros.cfg
@@ -310,4 +310,46 @@ gcode:
     G92 E0
     G1 E{purge_distance} F{speed} # purge
     G1 E-{unload_distance} F{max_velocity} # fast-unload
-    RESTORE_GCODE_STATE NAME=unload_state
\ No newline at end of file
+    RESTORE_GCODE_STATE NAME=unload_state
+
+[gcode_macro _SAFE_X_HOME]
+; This macro is to ensure that we're not at y=home when X is homed.
+gcode:
+  G90
+  SET_KINEMATIC_POSITION Y=20
+  G0 Y0 F50000
+  G28 X
+
+[gcode_macro _SAFE_Z_HOME_LIFT]
+; Lift the Z no matter what (replicate z-hop from [safe_z_home]
+gcode:
+  G90
+  SET_KINEMATIC_POSITION Z=0
+  G0 Z10 F1000
+
+[gcode_macro _SAFE_Z_HOME]
+; this macro recreates the save_z_home setup center the toolhead before z home.
+gcode:
+  G0 X175 Y175 F50000
+  G28 Z
+
+[homing_override]
+; The ebb36 mount often catches on the drag chain at the back of the printer.
+; This ensures that if X is asked to be homed, first Y is homed and then y is
+; moved away from the back of the printer and then homed.
+axes: xyz
+gcode:
+  #z hop no matter what
+  _SAFE_Z_HOME_LIFT
+  {% if not 'Z' in params and not 'Y' in params and 'X' in params %} # Home X
+  _SAFE_X_HOME
+  {% elif not 'Z' in params and not 'X' in params and 'Y' in params %} #Home Y
+  G28 Y
+  {% elif not 'Z' in params %} #Home X+Y
+  _SAFE_X_HOME
+  G28 Y
+  {% else %} #Home X+Y+Z
+  _SAFE_X_HOME
+  G28 Y
+  _SAFE_Z_HOME
+  {% endif %}
diff --git a/printer.cfg b/printer.cfg
index 00d0cc0..c0fbcd5 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -280,16 +280,16 @@ resistance3: 1228.0
 timeout: 1800
 
 # Klicky probe replaces this!
-[safe_z_home]
-##  XY Location of the Z Endstop Switch
-##  Update -10,-10 to the XY coordinates of your endstop pin 
-##  (such as 157,305) after going through Z Endstop Pin
-##  Location Definition step.
-#home_xy_position:232,350
-home_xy_position: 175,175
-speed:100
-z_hop:10
-z_hop_speed:10
+# [safe_z_home]
+# ##  XY Location of the Z Endstop Switch
+# ##  Update -10,-10 to the XY coordinates of your endstop pin 
+# ##  (such as 157,305) after going through Z Endstop Pin
+# ##  Location Definition step.
+# #home_xy_position:232,350
+# home_xy_position: 175,175
+# speed:100
+# z_hop:10
+# z_hop_speed:10
 
 
 ##  Use QUAD_GANTRY_LEVEL to level a gantry.
@@ -442,16 +442,6 @@ mesh_runs: 2
 [force_move]
 enable_force_move: True
 
-# [homing_override]
-# ; The ebb36 mount often catches on the drag chain at the back of the printer.
-# ; This ensures that if X is asked to be homed, first Y is homed and then y is
-# ; moved away from the back of the printer and then homed.
-# axes: x
-# gcode:
-#   G28 Y0
-#   G0 Y20
-#   G28 X0
-
 # Let's not yet...
 #[filament_motion_sensor encoder_sensor]
 #switch_pin: PG12
@@ -468,33 +458,33 @@ enable_force_move: True
 #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
 #*#
 #*# [scanner model default]
-#*# model_coef = 1.3714349204313003,
-#*# 	  1.771619967953663,
-#*# 	  0.7376769636810911,
-#*# 	  0.4005342066633172,
-#*# 	  0.4092971326129284,
-#*# 	  0.27409611655292754,
-#*# 	  -0.27266055102209064,
-#*# 	  -0.17630727863988965,
-#*# 	  0.3043533109653262,
-#*# 	  0.18123404004063173
-#*# model_domain = 3.1514820782885167e-07,3.3326149736881295e-07
+#*# model_coef = 1.4050831858687034,
+#*# 	  1.8219447940830515,
+#*# 	  0.7738341113330293,
+#*# 	  0.39901472219479744,
+#*# 	  0.2680326035724343,
+#*# 	  0.17965483078663627,
+#*# 	  -0.05775648804119655,
+#*# 	  -0.009252690277367137,
+#*# 	  0.16228924774561448,
+#*# 	  0.061116700668611953
+#*# model_domain = 3.2083850283845136e-07,3.3397281426221727e-07
 #*# model_range = 0.100000,5.000000
-#*# model_temp = 37.720820
-#*# model_offset = 0.15000
+#*# model_temp = 46.457695
+#*# model_offset = 0.00000
 #*# model_mode = scan
 #*# model_fw_version = CARTOGRAPHER 5.1.0
 #*#
 #*# [bed_mesh default]
 #*# version = 1
 #*# points =
-#*# 	  0.038049, 0.033443, 0.046620, 0.045980, 0.068916, 0.058127, 0.050284
-#*# 	  0.013975, 0.021985, 0.036277, 0.037763, 0.056129, 0.038217, 0.017225
-#*# 	  -0.001053, 0.003695, 0.007177, 0.006227, 0.019149, 0.021600, -0.010771
-#*# 	  -0.005999, 0.010618, 0.016111, 0.015814, 0.015824, 0.023147, 0.000558
-#*# 	  0.010902, 0.017401, 0.026787, 0.013984, 0.029697, 0.023782, -0.002451
-#*# 	  0.009438, 0.025120, 0.043248, 0.025485, 0.046232, 0.040130, 0.010416
-#*# 	  0.051986, 0.058225, 0.072224, 0.060504, 0.077500, 0.081257, 0.049641
+#*# 	0.038049, 0.033443, 0.046620, 0.045980, 0.068916, 0.058127, 0.050284
+#*# 	0.013975, 0.021985, 0.036277, 0.037763, 0.056129, 0.038217, 0.017225
+#*# 	-0.001053, 0.003695, 0.007177, 0.006227, 0.019149, 0.021600, -0.010771
+#*# 	-0.005999, 0.010618, 0.016111, 0.015814, 0.015824, 0.023147, 0.000558
+#*# 	0.010902, 0.017401, 0.026787, 0.013984, 0.029697, 0.023782, -0.002451
+#*# 	0.009438, 0.025120, 0.043248, 0.025485, 0.046232, 0.040130, 0.010416
+#*# 	0.051986, 0.058225, 0.072224, 0.060504, 0.077500, 0.081257, 0.049641
 #*# x_count = 7
 #*# y_count = 7
 #*# mesh_x_pps = 7