From f81c1a7da461fccc7e5fc87550d424b301d09de5 Mon Sep 17 00:00:00 2001
From: Martyn <m@rtyn.berlin>
Date: Sat, 21 Jun 2025 12:13:23 +0100
Subject: [PATCH] Automatic commit of config from 2025-06-21

---
 martyn_macros.cfg |  6 +++++-
 mmu/mmu_vars.cfg  |  6 +++---
 printer.cfg       | 25 +++++++++++++------------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/martyn_macros.cfg b/martyn_macros.cfg
index 8b458b0..6e0692c 100644
--- a/martyn_macros.cfg
+++ b/martyn_macros.cfg
@@ -39,6 +39,7 @@ gcode:
     M117 Carto Touch
     G28 Z
     CARTOGRAPHER_TOUCH
+    G1 Z10 ; carto leaves it at Z=5 which is theoretically okay, but cleaning then might skip steps and cause problems.
     M117 Final heat {EXTRUDER_TEMP}/{BED_TEMP}
     STATUS_HEATING
     M190 S{BED_TEMP} ; Start heating the bed, wait until target temperature reached
@@ -160,7 +161,7 @@ gcode:
 [gcode_macro CLEAN_NOZZLE]
 variable_start_x: 101
 variable_start_y: 354
-variable_start_z: 5
+variable_start_z: 7
 variable_wipe_dist: -40
 variable_wipe_qty: 5
 variable_wipe_spd: 200
@@ -171,6 +172,9 @@ gcode:
    G28
  {% endif %}
  
+ G91 ; relative
+ G1 Z10 ; just in case!
+
  G90                                            ; absolute positioning
  ## Move nozzle to start position
  G1 X{start_x} Y{start_y} F6000
diff --git a/mmu/mmu_vars.cfg b/mmu/mmu_vars.cfg
index 8c97960..264c376 100644
--- a/mmu/mmu_vars.cfg
+++ b/mmu/mmu_vars.cfg
@@ -1,5 +1,5 @@
 [Variables]
-mmu__revision = 3845
+mmu__revision = 3894
 mmu_calibration_bowden_home = 'encoder'
 mmu_calibration_bowden_lengths = [1425.1, 1425.1, 1425.1, 1425.1, 1425.1, 1425.1, 1425.1, 1425.1]
 mmu_calibration_clog_length = 8.9
@@ -22,9 +22,9 @@ mmu_state_gate_spool_id = [-1, -1, -1, -1, -1, -1, -1, -1]
 mmu_state_gate_status = [0, 0, 2, 0, 0, 0, 0, 0]
 mmu_state_gate_temperature = [200, 200, 200, 200, 200, 200, 200, 200]
 mmu_state_last_tool = -1
-mmu_state_tool_selected = -1
+mmu_state_tool_selected = 0
 mmu_state_tool_to_gate_map = [2, 2, 2, 2, 2, 2, 2, 2]
-mmu_statistics_counters = {'servo_down': {'count': 1151, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 262, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 67, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}}
+mmu_statistics_counters = {'servo_down': {'count': 1152, 'limit': 5000, 'warning': 'Inspect servo arm for wear/damage', 'pause': False}, 'mmu_restarts': {'count': 270, 'limit': -1, 'warning': ''}, 'cutter_blade': {'count': 67, 'limit': 3000, 'warning': 'Inspect/replace filament cutting blade', 'pause': False}}
 mmu_statistics_gate_0 = {'pauses': 0, 'loads': 2, 'load_distance': 0.0, 'load_delta': 0.0, 'unloads': 0, 'unload_distance': 0.0, 'unload_delta': 0.0, 'load_failures': 2, 'unload_failures': 0, 'quality': -1.0}
 mmu_statistics_gate_1 = {'pauses': 7, 'loads': 17, 'load_distance': 21959.049, 'load_delta': 7303.358, 'unloads': 16, 'unload_distance': 9610.7, 'unload_delta': 534.671, 'load_failures': 8, 'unload_failures': 5, 'quality': 0.39797587469336376}
 mmu_statistics_gate_2 = {'pauses': 1, 'loads': 17, 'load_distance': 20817.321, 'load_delta': 4752.43, 'unloads': 18, 'unload_distance': 15111.1, 'unload_delta': 1780.351, 'load_failures': 8, 'unload_failures': 3, 'quality': 0.5951171707295873}
diff --git a/printer.cfg b/printer.cfg
index 2e290fc..19b53c0 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -443,21 +443,22 @@ enable_force_move: True
 #*# mode = touch
 #*# scanner_touch_threshold = 3000
 #*# scanner_touch_speed = 3
+#*# scanner_touch_z_offset = 0.200
 #*#
 #*# [scanner model default]
-#*# model_coef = 1.4660235274886952,
-#*# 	  1.8088603709207522,
-#*# 	  0.7349055898946472,
-#*# 	  0.2687409591730736,
-#*# 	  0.47813534708329936,
-#*# 	  0.669955108628895,
-#*# 	  -0.3235976797345473,
-#*# 	  -0.6702739199959514,
-#*# 	  0.2940760023005045,
-#*# 	  0.3745733001336773
-#*# model_domain = 3.2050348407481734e-07,3.335190657416707e-07
+#*# model_coef = 1.4576195916953936,
+#*# 	  1.785851337777226,
+#*# 	  0.7482684560674038,
+#*# 	  0.37149574454302975,
+#*# 	  0.45525587058229405,
+#*# 	  0.38020169514738367,
+#*# 	  -0.3194453631539581,
+#*# 	  -0.3210922662765739,
+#*# 	  0.3090302568640316,
+#*# 	  0.23578147304339162
+#*# model_domain = 3.20112000993792e-07,3.3365602490491824e-07
 #*# model_range = 0.200000,5.100000
-#*# model_temp = 30.248095
+#*# model_temp = 66.713254
 #*# model_offset = 0.00000
 #*# model_mode = touch
 #*# model_fw_version = CARTOGRAPHER 5.0.0