From c9af38945626421891417211a6172232e4e461be Mon Sep 17 00:00:00 2001
From: sokolovjek <sokolovgek@mail.ru>
Date: Wed, 7 Feb 2024 15:01:01 +0000
Subject: [PATCH 1/3] STEAPP-903: Added to the manager adjust_basement_auto in
 spiral mode the movement of the tool head in 35mm from the collet

---
 stereotech_config/common/probe_main.cfg | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/stereotech_config/common/probe_main.cfg b/stereotech_config/common/probe_main.cfg
index bc3fecce2ee3..acb551a4d4cb 100644
--- a/stereotech_config/common/probe_main.cfg
+++ b/stereotech_config/common/probe_main.cfg
@@ -263,9 +263,11 @@ gcode:
     {% set offsets = printer.probe.offsets %}
     {% set wcs_offsets = printer.gcode_move.wcs_offsets[wcs + 3] %}
     {% set x = wcs_offsets[0] - offsets[0] %}
-    {% set y = wcs_offsets[1] - offsets[1] %}
+    # {% set y = (wcs_offsets[1] - offsets[1]) if wcs == 0 else (wcs_offsets[1] - offsets[1] - 40) %}
+    {% set y = (wcs_offsets[1] - offsets[1]) %}
     {% set z = wcs_offsets[2] + offsets[2] %}
     {% set a = '0' if wcs == 0 else '90' %}
+    {% set y = y if wcs == 0 else (y - 35) %}
     G28 A
     G0 A{a} F3600
     G0 Z150 F3600

From 1af711cdec6af70d89b5190cd508bb619168c9f0 Mon Sep 17 00:00:00 2001
From: sokolovjek <sokolovgek@mail.ru>
Date: Thu, 8 Feb 2024 06:20:57 +0000
Subject: [PATCH 2/3] STEAPP-903: Added to the manager adjust_basement_auto in
 spiral mode the movement of the toolhead in 35mm from the collet

---
 stereotech_config/common/probe_main.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/stereotech_config/common/probe_main.cfg b/stereotech_config/common/probe_main.cfg
index acb551a4d4cb..f2ab76c782c3 100644
--- a/stereotech_config/common/probe_main.cfg
+++ b/stereotech_config/common/probe_main.cfg
@@ -263,7 +263,6 @@ gcode:
     {% set offsets = printer.probe.offsets %}
     {% set wcs_offsets = printer.gcode_move.wcs_offsets[wcs + 3] %}
     {% set x = wcs_offsets[0] - offsets[0] %}
-    # {% set y = (wcs_offsets[1] - offsets[1]) if wcs == 0 else (wcs_offsets[1] - offsets[1] - 40) %}
     {% set y = (wcs_offsets[1] - offsets[1]) %}
     {% set z = wcs_offsets[2] + offsets[2] %}
     {% set a = '0' if wcs == 0 else '90' %}

From 8dcc4169c9f55006bc7dd9c3954c42de2352660d Mon Sep 17 00:00:00 2001
From: sokolovjek <sokolovgek@mail.ru>
Date: Thu, 8 Feb 2024 06:21:36 +0000
Subject: [PATCH 3/3] STEAPP-903: Added to the manager adjust_basement_auto in
 spiral mode the movement of the toolhead in 35mm from the collet

---
 stereotech_config/common/probe_main.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stereotech_config/common/probe_main.cfg b/stereotech_config/common/probe_main.cfg
index f2ab76c782c3..df476a743387 100644
--- a/stereotech_config/common/probe_main.cfg
+++ b/stereotech_config/common/probe_main.cfg
@@ -263,7 +263,7 @@ gcode:
     {% set offsets = printer.probe.offsets %}
     {% set wcs_offsets = printer.gcode_move.wcs_offsets[wcs + 3] %}
     {% set x = wcs_offsets[0] - offsets[0] %}
-    {% set y = (wcs_offsets[1] - offsets[1]) %}
+    {% set y = wcs_offsets[1] - offsets[1] %}
     {% set z = wcs_offsets[2] + offsets[2] %}
     {% set a = '0' if wcs == 0 else '90' %}
     {% set y = y if wcs == 0 else (y - 35) %}