Revert "MACRO: use gcode positions instead of toolhead positions for …

…VAOC" This reverts commit 597f890.
Rat-OS · Nov 9, 2024 · ea3bf2b · ea3bf2b
1 parent 597f890
commit ea3bf2b
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/macros/idex/vaoc.cfg b/macros/idex/vaoc.cfg
@@ -401,9 +401,9 @@ gcode:
 		# set control point for primary toolhead
 
 		# get current toolhead position
-		{% set x = printer.gcode_move.gcode_position.x|float %}
-		{% set y = printer.gcode_move.gcode_position.y|float %}
-		{% set z = printer.gcode_move.gcode_position.z|float %}
+		{% set x = printer.toolhead.position.x|float %}
+		{% set y = printer.toolhead.position.y|float %}
+		{% set z = printer.toolhead.position.z|float %}
 
 		# save current toolhead position 
 		SAVE_VARIABLE VARIABLE=idex_xcontrolpoint VALUE={x}
@@ -824,11 +824,11 @@ gcode:
 	{% if is_fixed %}
 		{% if (idex_xcontrolpoint - printer.gcode_move.gcode_position.x|float)|abs > 3 %}
 			M84
-			{ action_raise_error("Unexpected x-coordinate detected, VAOC aborted. Expected %.3f but got %.3f." % (idex_xcontrolpoint, printer.gcode_move.gcode_position.x|float)) }
+			{ action_raise_error("Unexpected y-coordinate detected, VAOC aborted. Expected %.3f but got %.3f." % (idex_xcontrolpoint, printer.gcode_move.gcode_position.x|float)) }
 		{% endif %}
 		{% if (idex_ycontrolpoint - printer.gcode_move.gcode_position.y|float)|abs > 3 %}
 			M84
-			{ action_raise_error("Unexpected y-coordinate detected, VAOC aborted. Expected %.3f but got %.3f." % (idex_ycontrolpoint, printer.gcode_move.gcode_position.y|float)) }
+			{ action_raise_error("Unexpected x-coordinate detected, VAOC aborted. Expected %.3f but got %.3f." % (idex_ycontrolpoint, printer.gcode_move.gcode_position.y|float)) }
 		{% endif %}
 	{% endif %}