MACRO: parking_positions added to CALCULATE_DC_ENDSTOP

Rat-OS · Nov 28, 2024 · 94b174a · 94b174a
1 parent 9b4da6c
commit 94b174a
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/macros/util.cfg b/macros/util.cfg
@@ -409,21 +409,23 @@ gcode:
 		{% set idex_xcontrolpoint = svv.idex_xcontrolpoint|float %}
 		{% set idex_ycontrolpoint = svv.idex_ycontrolpoint|float %}
 
-		{% set bed_margin_x = printer["gcode_macro RatOS"].bed_margin_x|float %}
 		{% set stepper_x_position_max = printer.configfile.settings.stepper_x.position_max|float %}
+		{% set stepper_x_position_endstop = printer.configfile.settings.stepper_x.position_endstop|float %}
 		{% set dual_carriage_position_max = printer.configfile.settings.dual_carriage.position_max|float %}
 		{% set dual_carriage_position_endstop = printer.configfile.settings.dual_carriage.position_endstop|float %}
 
 		{% set line_1 = "_N_[dual_carriage]" %}
 		{% set line_2 = "position_max: %.3f" % (dual_carriage_position_max + idex_xoffset) %}
 		{% set line_3 = "position_endstop: %.3f" % (dual_carriage_position_endstop + idex_xoffset) %}
 		{% set line_4 = "_N_[gcode_macro RatOS]" %}
-		{% set line_5 = "variable_bed_margin_x: [%.3f, %.3f]" % (bed_margin_x[0], dual_carriage_position_max - stepper_x_position_max + idex_xoffset) %}
+		{% set line_5 = "variable_bed_margin_x: [%.3f, %.3f]" % (stepper_x_position_endstop|abs, dual_carriage_position_max - stepper_x_position_max + idex_xoffset) %}
 		{% set line_6 = "_N_[gcode_macro _VAOC]" %}
 		{% set line_7 = "variable_expected_camera_x_position: %.3f" % idex_xcontrolpoint %}
 		{% set line_8 = "variable_expected_camera_y_position: %.3f" % idex_ycontrolpoint %}
-		{% set line_9 = "_N_[gcode_macro T1]" %}
-		{% set line_10 = "variable_parking_position: %.3f" % (dual_carriage_position_endstop + idex_xoffset - 2) %}
-		CONSOLE_ECHO TITLE="Copy and paste to your printer.cfg" TYPE="info" MSG={'"%s_N_%s_N_%s_N_%s_N_%s_N_%s_N_%s_N_%s_N_%s_N_%s_N_ "' % (line_1, line_2, line_3, line_4, line_5, line_6, line_7, line_8, line_9, line_10)}
+		{% set line_9 = "_N_[gcode_macro T0]" %}
+		{% set line_10 = "variable_parking_position: %.3f" % (stepper_x_position_endstop + 2) %}
+		{% set line_11 = "_N_[gcode_macro T1]" %}
+		{% set line_12 = "variable_parking_position: %.3f" % (dual_carriage_position_endstop + idex_xoffset - 2) %}
+		CONSOLE_ECHO TITLE="Copy and paste to your printer.cfg" TYPE="info" MSG={'"%s_N_%s_N_%s_N_%s_N_%s_N_%s_N_%s_N_%s_N_%s_N_%s_N_%s_N_%s_N_ "' % (line_1, line_2, line_3, line_4, line_5, line_6, line_7, line_8, line_9, line_10, line_11, line_12)}
 
 	{% endif %}