Beacon/first layer improvements

configuration/homing.cfg

@@ -15,8 +15,7 @@ variable_safe_home_x: "middle"                 # float|middle = z-homing x locat
 variable_safe_home_y: "middle"                 # float|middle = z-homing y location
 variable_driver_type_x: "tmc2209"              # tmc2209|tmc2130|tmc5160 = stepper driver type for sensorless homing
 variable_driver_type_y: "tmc2209"              # tmc2209|tmc2130|tmc5160 = stepper driver type for sensorless homing
-variable_stowable_probe_stop_on_error: False   # internal use only. Do not touch! 
-
+variable_stowable_probe_stop_on_error: False   # internal use only. Do not touch!
 
 [ratos_homing]
 axes: xyz
@@ -79,10 +78,7 @@ gcode:
 	{% set homing_x = homing_x if homing_x else homing %}
 	{% set speed = printer["gcode_macro RatOS"].macro_travel_speed|float * 60 %}
 	{% set printable_x_max = printer["gcode_macro RatOS"].printable_x_max|float %}
-	{% set safe_home_x = printer["gcode_macro RatOS"].safe_home_x %}
-	{% if safe_home_x is not defined or safe_home_x|lower == 'middle' %}
-		{% set safe_home_x = printable_x_max / 2 %}
-	{% endif %}
+	{% set safe_home_x, safe_home_y = printer.ratos.safe_home_position %}
 
 	# parameter
 	{% set X = true if params.X|lower == 'true' else false %}
@@ -125,10 +121,7 @@ gcode:
 	{% set homing_y = homing_y if homing_y else homing %}
 	{% set speed = printer["gcode_macro RatOS"].macro_travel_speed|float * 60 %}
 	{% set printable_y_max = printer["gcode_macro RatOS"].printable_y_max|float %}
-	{% set safe_home_y = printer["gcode_macro RatOS"].safe_home_y %}
-	{% if safe_home_y is not defined or safe_home_y|lower == 'middle' %}
-		{% set safe_home_y = printable_y_max / 2 %}
-	{% endif %}
+	{% set safe_home_x, safe_home_y = printer.ratos.safe_home_position %}
 
 	# parameter
 	{% set X = true if params.X|lower == 'true' else false %}
@@ -159,6 +152,8 @@ gcode:
 
 	# beacon contact config
 	{% set beacon_contact_z_homing = true if printer["gcode_macro RatOS"].beacon_contact_z_homing|default(false)|lower == 'true' else false %}
+	{% set beacon_contact_start_print_true_zero = true if printer["gcode_macro RatOS"].beacon_contact_start_print_true_zero|default(false)|lower == 'true' else false %}
+	{% set beacon_z_home_position_fuzzing_radius = printer["gcode_macro RatOS"].beacon_z_home_position_fuzzing_radius|default(0)|float %}
 
 	# parameter
 	{% set X = true if params.X|lower == 'true' else false %}
@@ -175,24 +170,23 @@ gcode:
 		{% else %}
 			{% if z_probe == "stowable" %}
 				DEPLOY_PROBE
-				_MOVE_TO_SAFE_Z_HOME
-				{% if printer.configfile.settings.beacon is defined and beacon_contact_z_homing %}
-					BEACON_AUTO_CALIBRATE SKIP_MODEL_CREATION=1
-					_MOVE_TO_SAFE_Z_HOME Z_HOP=True
+			{% endif %}
+			_MOVE_TO_SAFE_Z_HOME
+			{% if printer.fastconfig.settings.beacon is defined and beacon_contact_z_homing %}				
+				{% if beacon_contact_start_print_true_zero %}
+					# The critical zero probing happens during start print after heat soaking, not here.
+					BEACON_AUTO_CALIBRATE SKIP_MODEL_CREATION=1 SKIP_MULTIPOINT_PROBING=1
 				{% else %}
-					G28 Z
-				{% endif %}
-				_Z_HOP
-				STOW_PROBE
-			{% else %}
-				_MOVE_TO_SAFE_Z_HOME
-				{% if printer.configfile.settings.beacon is defined and beacon_contact_z_homing %}
+					# The critical zero probing happens here.
 					BEACON_AUTO_CALIBRATE SKIP_MODEL_CREATION=1
-					_MOVE_TO_SAFE_Z_HOME Z_HOP=True
-				{% else %}
-					G28 Z
 				{% endif %}
-				_Z_HOP
+				_MOVE_TO_SAFE_Z_HOME Z_HOP=True
+			{% else %}
+				G28 Z
+			{% endif %}
+			_Z_HOP
+			{% if z_probe == "stowable" %}
+				STOW_PROBE
 			{% endif %}
 		{% endif %}
 	{% endif %}
@@ -239,22 +233,22 @@ gcode:
 		{% for axis in printer["gcode_macro RatOS"].x_axes %}
 			{% set stepper = "stepper_" ~ axis|lower %}
 			{% set stepper_driver = printer["gcode_macro RatOS"].x_driver_types[loop.index0] ~ " " ~ stepper %}
-			SET_TMC_CURRENT STEPPER={stepper} CURRENT={printer.configfile.config[stepper_driver].run_current}
+			SET_TMC_CURRENT STEPPER={stepper} CURRENT={printer.fastconfig.config[stepper_driver].run_current}
 		{% endfor %}
 	{% else %}
 		{% set x_driver = printer["gcode_macro RatOS"].driver_type_x|lower ~ " stepper_x" %}
-		SET_TMC_CURRENT STEPPER=stepper_x CURRENT={printer.configfile.config[x_driver].run_current}
+		SET_TMC_CURRENT STEPPER=stepper_x CURRENT={printer.fastconfig.config[x_driver].run_current}
 	{% endif %}
 
 	{% if printer["gcode_macro RatOS"].y_axes is defined %}
 		{% for axis in printer["gcode_macro RatOS"].y_axes %}
 			{% set stepper = "stepper_" ~ axis|lower %}
 			{% set stepper_driver = printer["gcode_macro RatOS"].y_driver_types[loop.index0] ~ " " ~ stepper %}
-			SET_TMC_CURRENT STEPPER={stepper} CURRENT={printer.configfile.config[stepper_driver].run_current}
+			SET_TMC_CURRENT STEPPER={stepper} CURRENT={printer.fastconfig.config[stepper_driver].run_current}
 		{% endfor %}
 	{% else %}
 		{% set y_driver = printer["gcode_macro RatOS"].driver_type_y|lower ~ " stepper_y" %}
-		SET_TMC_CURRENT STEPPER=stepper_y CURRENT={printer.configfile.config[y_driver].run_current}
+		SET_TMC_CURRENT STEPPER=stepper_y CURRENT={printer.fastconfig.config[y_driver].run_current}
 	{% endif %}
 
 	# Wait for currents to settle
@@ -305,22 +299,22 @@ gcode:
 		{% for axis in printer["gcode_macro RatOS"].x_axes %}
 			{% set stepper = "stepper_" ~ axis|lower %}
 			{% set stepper_driver = printer["gcode_macro RatOS"].x_driver_types[loop.index0] ~ " " ~ stepper %}
-			SET_TMC_CURRENT STEPPER={stepper} CURRENT={printer.configfile.config[stepper_driver].run_current}
+			SET_TMC_CURRENT STEPPER={stepper} CURRENT={printer.fastconfig.config[stepper_driver].run_current}
 		{% endfor %}
 	{% else %}
 		{% set x_driver = printer["gcode_macro RatOS"].driver_type_x|lower ~ " stepper_x" %}
-		SET_TMC_CURRENT STEPPER=stepper_x CURRENT={printer.configfile.config[x_driver].run_current}
+		SET_TMC_CURRENT STEPPER=stepper_x CURRENT={printer.fastconfig.config[x_driver].run_current}
 	{% endif %}
 
 	{% if printer["gcode_macro RatOS"].y_axes is defined %}
 		{% for axis in printer["gcode_macro RatOS"].y_axes %}
 			{% set stepper = "stepper_" ~ axis|lower %}
 			{% set stepper_driver = printer["gcode_macro RatOS"].y_driver_types[loop.index0] ~ " " ~ stepper %}
-			SET_TMC_CURRENT STEPPER={stepper} CURRENT={printer.configfile.config[stepper_driver].run_current}
+			SET_TMC_CURRENT STEPPER={stepper} CURRENT={printer.fastconfig.config[stepper_driver].run_current}
 		{% endfor %}
 	{% else %}
 		{% set y_driver = printer["gcode_macro RatOS"].driver_type_y|lower ~ " stepper_y" %}
-		SET_TMC_CURRENT STEPPER=stepper_y CURRENT={printer.configfile.config[y_driver].run_current}
+		SET_TMC_CURRENT STEPPER=stepper_y CURRENT={printer.fastconfig.config[y_driver].run_current}
 	{% endif %}
 
 	# Wait for currents to settle
@@ -332,34 +326,14 @@ gcode:
 [gcode_macro _Z_HOP]
 description: Move Z axis up by Z_HOP distance at Z_HOP_SPEED. In relative mode it will move Z axis up by Z_HOP distance. In absolute mode it will move Z axis to Z_HOP distance.
 gcode:
-	{% set z_hop = printer.configfile.config.ratos_homing.z_hop|float %}
-	{% set z_hop_speed = printer.configfile.config.ratos_homing.z_hop_speed|float * 60 %}
+	{% set z_hop = printer.fastconfig.config.ratos_homing.z_hop|float %}
+	{% set z_hop_speed = printer.fastconfig.config.ratos_homing.z_hop_speed|float * 60 %}
 
 	G0 Z{z_hop} F{z_hop_speed}
 
-[gcode_macro _MOVE_TO_SAFE_Z_HOME]
-description: Move to safe home position with optional Z_HOP (pass Z_HOP=True as parameter)
+[gcode_macro __MOVE_TO_SAFE_Z_HOME_ECHO_DEBUG]
 gcode:
-	{% set speed = printer["gcode_macro RatOS"].macro_travel_speed|float * 60 %}
-	{% set printable_x_max = printer["gcode_macro RatOS"].printable_x_max|float %}
-	{% set printable_y_max = printer["gcode_macro RatOS"].printable_y_max|float %}
-	{% set safe_home_x = printer["gcode_macro RatOS"].safe_home_x %}
-	{% if safe_home_x is not defined or safe_home_x|lower == 'middle' %}
-		{% set safe_home_x = printable_x_max / 2 %}
-	{% endif %}
-	{% set safe_home_y = printer["gcode_macro RatOS"].safe_home_y %}
-	{% if safe_home_y is not defined or safe_home_y|lower == 'middle' %}
-		{% set safe_home_y = printable_y_max / 2 %}
-	{% endif %}
-
-	{% if params.Z_HOP is defined %}
-		_Z_HOP
-	{% endif %}
-
-	DEBUG_ECHO PREFIX="_MOVE_TO_SAFE_Z_HOME" MSG="axis_maximum.x: {printer.toolhead.axis_maximum.x}, axis_maximum.y: {printer.toolhead.axis_maximum.y}, bed_margin_x: {printer['gcode_macro RatOS'].bed_margin_x}, bed_margin_y: {printer['gcode_macro RatOS'].bed_margin_y}, safe_home_x: {safe_home_x}, safe_home_y: {safe_home_y}, printable_x_max: {printable_x_max}, printable_y_max: {printable_y_max}"
-
-	# Go to safe home
-	G0 X{safe_home_x} Y{safe_home_y} F{speed}
+	DEBUG_ECHO PREFIX="_MOVE_TO_SAFE_Z_HOME" MSG="x: {params.X}, y: {params.Y}, z_hop: {params.Z_HOP}, fuzzy_radius: {params.FUZZY_RADIUS}, axis_maximum.x: {printer.toolhead.axis_maximum.x}, axis_maximum.y: {printer.toolhead.axis_maximum.y}, bed_margin_x: {printer['gcode_macro RatOS'].bed_margin_x}, bed_margin_y: {printer['gcode_macro RatOS'].bed_margin_y}, printable_x_max: {printer['gcode_macro RatOS'].printable_x_max}, printable_y_max: {printer['gcode_macro RatOS'].printable_y_max}"
 
 [gcode_macro MAYBE_HOME]
 description: Only home unhomed axis