STEAPP-872: renamed params and added condition for moved with adjust…

…_offset
stereotech · Feb 13, 2024 · 1dcff52 · 1dcff52
1 parent b7efa6f
commit 1dcff52
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/stereotech_config/wizards/bed_level_manual.cfg b/stereotech_config/wizards/bed_level_manual.cfg
@@ -35,7 +35,7 @@ axes: z
 steps: 0.05, 0.1, 1, 10
 default_step: 1
 jog_gcode:
-    JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE='3d'
+    JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE='manual_probe'
 action_gcode:
     ACCEPT_Z_ENDSTOP
     SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step}

diff --git a/stereotech_config/wizards/common.cfg b/stereotech_config/wizards/common.cfg
@@ -101,13 +101,15 @@ gcode:
     {% set direction = '+' if params.DIRECTION|default(1)|int else '-' %}
     {% set step_name = params.STEP_NAME %}
     {% set val = printer["wizard_step_jog " ~ step_name].step %}
-    {% set mode = params.MODE|default('5d') %}
-    {% if mode == '5d' %}
+    {% set mode = params.MODE|default('relative') %}
+    {% if mode == 'relative' %}
         G91
         G1 {axis ~ direction ~ val} F1500
         G90
-    {% elif mode == '3d' %}
+    {% elif mode == 'manual_probe' %}
         TESTZ Z={direction ~ val}
+    {% elif mode == 'nozzle_offset' %}
+        SET_GCODE_OFFSET {axis}_ADJUST={direction ~ val} MOVE=1
     {% endif %}
 
 [wizard_step CHANGE_MATERIAL_COMPLETED]

diff --git a/stereotech_config/wizards/nozzle_offset_5d.cfg b/stereotech_config/wizards/nozzle_offset_5d.cfg
@@ -52,7 +52,7 @@ axes: z
 steps: 0.05, 0.1, 1, 10
 default_step: 1
 jog_gcode:
-    JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE='5d'
+    JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name}
 action_gcode:
     ADJUST_PROBE_OFFSET_Z ADJUST_CALIBRATION=1 ADJUST_WCS=1
     SET_WCS_FROM_AUTO_WCS

diff --git a/stereotech_config/wizards/nozzle_offset_fiber.cfg b/stereotech_config/wizards/nozzle_offset_fiber.cfg
@@ -62,7 +62,7 @@ axes: z
 steps: 0.05, 0.1, 1
 default_step: 0.1
 jog_gcode:
-    JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name}
+    JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE=nozzle_offset
 action_gcode:
     SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step}
 cancel_gcode:

diff --git a/stereotech_config/wizards/nozzle_offset_hybrid.cfg b/stereotech_config/wizards/nozzle_offset_hybrid.cfg
@@ -70,7 +70,7 @@ axes: z
 steps: 0.05, 0.1, 1
 default_step: 0.1
 jog_gcode:
-    JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name}
+    JOG_DO_MOVE {rawparams} STEP_NAME={wizard.wizard_step_name} MODE=nozzle_offset
 action_gcode:
     SET_WIZARD_STEP WIZARD={wizard.name} STEP={wizard.next_step}
 cancel_gcode: