From 45519d170dff9b33275f22f2a8d4014c68924159 Mon Sep 17 00:00:00 2001
From: DerAndere <26200979+DerAndere1@users.noreply.github.com>
Date: Thu, 10 Oct 2024 00:47:53 +0200
Subject: [PATCH] Fix G43 and G49

---
 Marlin/src/gcode/gcode.h                                 | 9 ++++++++-
 .../HendrikJan5D-7axis-3D-printer/platformio.ini         | 2 +-
 .../platformio.ini                                       | 2 +-
 .../DerAndere/HendrikJan5D_TRT_test/platformio.ini       | 2 +-
 ini/features.ini                                         | 3 +--
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index b13ad5c430c6..b01f30db5aac 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -44,7 +44,7 @@
  * G3   - CCW ARC
  * G4   - Dwell S<seconds> or P<milliseconds>
  * G5   - Cubic B-spline with XYZE destination and IJPQ offsets
- * G10  - Retract filament according to settings of M207 (Requires FWRETRACT)
+ * G10  - Set coordinate system and tool table. Retract filament according to settings of M207 (Requires FWRETRACT)
  * G11  - Retract recover filament according to settings of M208 (Requires FWRETRACT)
  * G12  - Clean tool (Requires NOZZLE_CLEAN_FEATURE)
  * G17  - Select Plane XY (Requires CNC_WORKSPACE_PLANES)
@@ -64,6 +64,8 @@
  * G35  - Read bed corners to help adjust bed screws: T<screw_thread> (Requires ASSISTED_TRAMMING)
  * G38  - Probe in any direction using the Z_MIN_PROBE (Requires G38_PROBE_TARGET)
  * G42  - Coordinated move to a mesh point (Requires MESH_BED_LEVELING, AUTO_BED_LEVELING_BLINEAR, or AUTO_BED_LEVELING_UBL)
+ * G43  - Tool length offset (Tool length compensation, tool centerpoint control)
+ * G49  - Cancel tool length offset (Cancel tool length compensation and tool centerpoint conrol) 
  * G60  - Save current position. (Requires SAVED_POSITIONS)
  * G61  - Apply/restore saved coordinates. (Requires SAVED_POSITIONS)
  * G76  - Calibrate first layer temperature offsets. (Requires PTC_PROBE and PTC_BED)
@@ -601,6 +603,11 @@ class GcodeSuite {
     static void G42();
   #endif
 
+  #if HAS_TOOL_LENGTH_COMPENSATION
+    static void G43();
+    static void G49();  
+  #endif
+
   #if ENABLED(CNC_COORDINATE_SYSTEMS)
     static void G53();
     static void G54();
diff --git a/config/examples/DerAndere/HendrikJan5D-7axis-3D-printer/platformio.ini b/config/examples/DerAndere/HendrikJan5D-7axis-3D-printer/platformio.ini
index 81be93d9a8a7..a36582f65057 100644
--- a/config/examples/DerAndere/HendrikJan5D-7axis-3D-printer/platformio.ini
+++ b/config/examples/DerAndere/HendrikJan5D-7axis-3D-printer/platformio.ini
@@ -56,7 +56,7 @@ lib_deps           =
 default_src_filter = +<src/*> -<src/config> -<src/tests>
   ; LCDs and Controllers
   -<src/lcd/HD44780> -<src/lcd/dogm> -<src/lcd/TFTGLCD> -<src/lcd/tft> -<src/lcd/tft_io>
-  -<src/lcd/e3v2> -<src/lcd/menu> -<src/lcd/extui> -<src/lcd/touch>
+  -<src/lcd/e3v2> -<src/lcd/sovol_rts> -<src/lcd/menu> -<src/lcd/extui> -<src/lcd/touch>
   -<src/lcd/lcdprint.cpp>
   ; Marlin HAL
   -<src/HAL>
diff --git a/config/examples/DerAndere/HendrikJan5D-multi-axis-3D-printer_TRT/platformio.ini b/config/examples/DerAndere/HendrikJan5D-multi-axis-3D-printer_TRT/platformio.ini
index 81be93d9a8a7..a36582f65057 100644
--- a/config/examples/DerAndere/HendrikJan5D-multi-axis-3D-printer_TRT/platformio.ini
+++ b/config/examples/DerAndere/HendrikJan5D-multi-axis-3D-printer_TRT/platformio.ini
@@ -56,7 +56,7 @@ lib_deps           =
 default_src_filter = +<src/*> -<src/config> -<src/tests>
   ; LCDs and Controllers
   -<src/lcd/HD44780> -<src/lcd/dogm> -<src/lcd/TFTGLCD> -<src/lcd/tft> -<src/lcd/tft_io>
-  -<src/lcd/e3v2> -<src/lcd/menu> -<src/lcd/extui> -<src/lcd/touch>
+  -<src/lcd/e3v2> -<src/lcd/sovol_rts> -<src/lcd/menu> -<src/lcd/extui> -<src/lcd/touch>
   -<src/lcd/lcdprint.cpp>
   ; Marlin HAL
   -<src/HAL>
diff --git a/config/examples/DerAndere/HendrikJan5D_TRT_test/platformio.ini b/config/examples/DerAndere/HendrikJan5D_TRT_test/platformio.ini
index 81be93d9a8a7..a36582f65057 100644
--- a/config/examples/DerAndere/HendrikJan5D_TRT_test/platformio.ini
+++ b/config/examples/DerAndere/HendrikJan5D_TRT_test/platformio.ini
@@ -56,7 +56,7 @@ lib_deps           =
 default_src_filter = +<src/*> -<src/config> -<src/tests>
   ; LCDs and Controllers
   -<src/lcd/HD44780> -<src/lcd/dogm> -<src/lcd/TFTGLCD> -<src/lcd/tft> -<src/lcd/tft_io>
-  -<src/lcd/e3v2> -<src/lcd/menu> -<src/lcd/extui> -<src/lcd/touch>
+  -<src/lcd/e3v2> -<src/lcd/sovol_rts> -<src/lcd/menu> -<src/lcd/extui> -<src/lcd/touch>
   -<src/lcd/lcdprint.cpp>
   ; Marlin HAL
   -<src/HAL>
diff --git a/ini/features.ini b/ini/features.ini
index 250f4be23f60..dabf283a2268 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -239,7 +239,6 @@ HAS_FANCHECK                           = build_src_filter=+<src/feature/fancheck
 HAS_FANMUX                             = build_src_filter=+<src/feature/fanmux.cpp>
 FILAMENT_WIDTH_SENSOR                  = build_src_filter=+<src/feature/filwidth.cpp> +<src/gcode/feature/filwidth>
 FWRETRACT                              = build_src_filter=+<src/feature/fwretract.cpp> +<src/gcode/feature/fwretract>
-HAS_TOOL_LENGTH_COMPENSATION           = build_src_filter=+<src/gcode/feature/fwretract>
 HOST_ACTION_COMMANDS                   = build_src_filter=+<src/feature/host_actions.cpp>
 HOTEND_IDLE_TIMEOUT                    = build_src_filter=+<src/feature/hotend_idle.cpp> +<src/gcode/temp/M86_M87.cpp>
 JOYSTICK                               = build_src_filter=+<src/feature/joystick.cpp>
@@ -319,7 +318,7 @@ FILAMENT_LOAD_UNLOAD_GCODES            = build_src_filter=+<src/gcode/feature/pa
 HAS_STEALTHCHOP                        = build_src_filter=+<src/gcode/feature/trinamic/M569.cpp>
 CNC_WORKSPACE_PLANES                   = build_src_filter=+<src/gcode/geometry/G17-G19.cpp>
 CNC_COORDINATE_SYSTEMS                 = build_src_filter=+<src/gcode/geometry/G53-G59.cpp>
-HAS_TOOL_LENGTH_COMPENSATION           = src_filter=+<src/gcode/geometry/G10_G11.cpp> +<src/gcode/geometry/G43_G49.cpp>
+HAS_TOOL_LENGTH_COMPENSATION           = build_src_filter=+<src/gcode/feature/fwretract> +<src/gcode/feature/fwretract/G10_G11.cpp> +<src/gcode/geometry/G43_G49.cpp>
 HAS_HOME_OFFSET                        = build_src_filter=+<src/gcode/geometry/M206_M428.cpp>
 EXPECTED_PRINTER_CHECK                 = build_src_filter=+<src/gcode/host/M16.cpp>
 HOST_KEEPALIVE_FEATURE                 = build_src_filter=+<src/gcode/host/M113.cpp>