From 6bf8c768b9d562bcb08a5f44dfc63c6989a649a8 Mon Sep 17 00:00:00 2001
From: Martyn <m@rtyn.berlin>
Date: Sun, 16 Mar 2025 10:56:18 +0000
Subject: [PATCH] Automatic commit of config from 2025-03-16

---
 martyn_macros.cfg |   9 ++--
 printer.cfg       | 103 ++++++++++------------------------------------
 2 files changed, 26 insertions(+), 86 deletions(-)

diff --git a/martyn_macros.cfg b/martyn_macros.cfg
index 39a94c8..c801902 100644
--- a/martyn_macros.cfg
+++ b/martyn_macros.cfg
@@ -20,6 +20,7 @@ gcode:
     BED_MESH_CALIBRATE
     M190 S{BED_TEMP} ; Start heating the bed, wait until target temperature reached
     M109 S{EXTRUDER_TEMP} ; Finish heating the nozzle
+    CLEAN_NOZZLE
     G1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed
     G1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position
     G1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line
@@ -97,10 +98,10 @@ gcode:
   SET_PIN PIN=caselight VALUE={S}
 
 [gcode_macro CLEAN_NOZZLE]
-variable_start_x: 298
-variable_start_y: 349
-variable_start_z: 1
-variable_wipe_dist: -39
+variable_start_x: 101
+variable_start_y: 350
+variable_start_z: 0
+variable_wipe_dist: 40
 variable_wipe_qty: 5
 variable_wipe_spd: 200
 variable_raise_distance: 30
diff --git a/printer.cfg b/printer.cfg
index bade53d..00f0225 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -417,17 +417,13 @@ shaper_freq_x: 91.4
 shaper_freq_y: 70.0
 shaper_type: 3hump_ei
 
-[cartographer]
+[mcu scanner]
 canbus_uuid: 4afa67798fac
-#   Path to the serial port for the Cartographer device. Typically has the form
-#   /dev/serial/by-id/usb-cartographer_cartographer_...
-#   
-#   If you are using the CAN Bus version, replace serial: with canbus_uuid: and add the UUID.
-#   Example: canbus_uuid: 1283as878a9sd
-#
-speed: 40.
-#   Z probing dive speed.
-lift_speed: 5.0
+
+[scanner]
+mcu: scanner
+sensor: cartographer
+sensor_alt: carto
 #   Z probing lift speed.
 backlash_comp: 0.5
 #   Backlash compensation distance for removing Z backlash before measuring
@@ -440,33 +436,6 @@ x_offset: 0.0
 #   X offset of cartographer from the nozzle.
 y_offset: 21.1
 #   Y offset of cartographer from the nozzle.
-trigger_distance: 2.0
-#   cartographer trigger distance for homing.
-trigger_dive_threshold: 1.5
-#   Threshold for range vs dive mode probing. Beyond `trigger_distance +
-#   trigger_dive_threshold` a dive will be used.
-trigger_hysteresis: 0.006
-#   Hysteresis on trigger threshold for untriggering, as a percentage of the
-#   trigger threshold.
-cal_nozzle_z: 0.09
-#   Expected nozzle offset after completing manual Z offset calibration.
-cal_floor: 0.1
-#   Minimum z bound on sensor response measurement.
-cal_ceil: 5.0
-#   Maximum z bound on sensor response measurement.
-cal_speed: 1.0
-#   Speed while measuring response curve.
-cal_move_speed: 10.0
-#   Speed while moving to position for response curve measurement.
-default_model_name: default
-#   Name of default cartographer model to load.
-mesh_main_direction: x
-#   Primary travel direction during mesh measurement.
-#mesh_overscan: -1
-#   Distance to use for direction changes at mesh line ends. Omit this setting
-#   and a default will be calculated from line spacing and available travel.
-mesh_cluster_size: 1
-#   Radius of mesh grid point clusters.
 mesh_runs: 2
 #   Number of passes to make during mesh scan.
 
@@ -488,50 +457,20 @@ enable_force_move: True
 #*# <---------------------- SAVE_CONFIG ---------------------->
 #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
 #*#
-#*# [stepper_z]
-#*# position_endstop = -0.595
-#*#
-#*# [bed_mesh default]
-#*# version = 1
-#*# points =
-#*# 	  -0.004409, 0.010066, 0.026071, 0.021743, 0.032360, 0.036548, 0.010874
-#*# 	  -0.002284, 0.011424, 0.026598, 0.025001, 0.024085, 0.015917, -0.018821
-#*# 	  -0.009023, 0.001965, 0.015262, 0.004547, 0.022070, 0.011687, -0.016437
-#*# 	  -0.008284, 0.004052, 0.005031, 0.007480, 0.017266, 0.023347, -0.009908
-#*# 	  0.006076, 0.006241, 0.022458, 0.017518, 0.029025, 0.022216, -0.010496
-#*# 	  0.001451, 0.011205, 0.031219, 0.016595, 0.035812, 0.024308, -0.000468
-#*# 	  0.032141, 0.033391, 0.047148, 0.039998, 0.059403, 0.063374, 0.025391
-#*# x_count = 7
-#*# y_count = 7
-#*# mesh_x_pps = 7
-#*# mesh_y_pps = 7
-#*# algo = bicubic
-#*# tension = 0.2
-#*# min_x = 35.0
-#*# max_x = 310.0
-#*# min_y = 35.0
-#*# max_y = 310.0
-#*#
-#*# [probe]
-#*# z_offset = 7.600
-#*#
-#*# [skew_correction calilantern_skew_profile]
-#*# xy_skew = 0.007318697823262824
-#*# xz_skew = 0.0004313347372552723
-#*# yz_skew = -0.0005939714989857676
-#*#
-#*# [cartographer model default]
-#*# model_coef = 1.3808167566664236,
-#*# 	  1.7782971208884335,
-#*# 	  0.7440957262307573,
-#*# 	  0.38925725321561394,
-#*# 	  0.3653704467149959,
-#*# 	  0.32322509779067743,
-#*# 	  -0.2000778307182581,
-#*# 	  -0.2500345506963453,
-#*# 	  0.2597796529177613,
-#*# 	  0.21031350406021135
-#*# model_domain = 3.135327577993649e-07,3.321418533405997e-07
+#*# [scanner model default]
+#*# model_coef = 1.376554245995536,
+#*# 	  1.797495001462821,
+#*# 	  0.7434194577612713,
+#*# 	  0.2666818167213136,
+#*# 	  0.37851827155327655,
+#*# 	  0.6822350904676154,
+#*# 	  -0.21239763385347032,
+#*# 	  -0.6823172580725418,
+#*# 	  0.26402364970841374,
+#*# 	  0.3871094547045681
+#*# model_domain = 3.166935556957589e-07,3.333615086946824e-07
 #*# model_range = 0.100000,5.000000
-#*# model_temp = 42.029862
+#*# model_temp = 29.396225
 #*# model_offset = 0.00000
+#*# model_mode = scan
+#*# model_fw_version = CARTOGRAPHER 5.1.0