From a490fa938f332ccad047c23f433de0ad3ef4434b Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 2 Mar 2022 16:25:45 -0600
Subject: [PATCH] move M423

---
 Marlin/src/gcode/{bedlevel/abl => probe}/M423.cpp | 6 +++---
 Marlin/src/module/settings.cpp                    | 2 ++
 ini/features.ini                                  | 2 +-
 platformio.ini                                    | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)
 rename Marlin/src/gcode/{bedlevel/abl => probe}/M423.cpp (94%)

diff --git a/Marlin/src/gcode/bedlevel/abl/M423.cpp b/Marlin/src/gcode/probe/M423.cpp
similarity index 94%
rename from Marlin/src/gcode/bedlevel/abl/M423.cpp
rename to Marlin/src/gcode/probe/M423.cpp
index 935c74d96d06..d3ec959e226f 100644
--- a/Marlin/src/gcode/bedlevel/abl/M423.cpp
+++ b/Marlin/src/gcode/probe/M423.cpp
@@ -24,12 +24,12 @@
  * M423.cpp - X-Axis Twist Compensation
  */
 
-#include "../../../inc/MarlinConfig.h"
+#include "../../inc/MarlinConfig.h"
 
 #if ENABLED(X_AXIS_TWIST_COMPENSATION)
 
-#include "../../gcode.h"
-#include "../../../feature/bedlevel/bedlevel.h"
+#include "../gcode.h"
+#include "../../feature/x_twist.h"
 
 /**
  * M423: Set a Z offset for X-Twist (added to the mesh on future G29).
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 159cf112b8b4..eacce212c932 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -901,6 +901,7 @@ void MarlinSettings::postprocess() {
     // X Axis Twist Compensation
     //
     #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+      _FIELD_TEST(xatc_spacing);
       EEPROM_WRITE(xatc.spacing);
       EEPROM_WRITE(xatc.start);
       EEPROM_WRITE(xatc.z_offset);
@@ -1809,6 +1810,7 @@ void MarlinSettings::postprocess() {
       // X Axis Twist Compensation
       //
       #if ENABLED(X_AXIS_TWIST_COMPENSATION)
+        _FIELD_TEST(xatc_spacing);
         EEPROM_READ(xatc.spacing);
         EEPROM_READ(xatc.start);
         EEPROM_READ(xatc.z_offset);
diff --git a/ini/features.ini b/ini/features.ini
index 7f97956b4160..a5b44646d257 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -98,7 +98,7 @@ USB_FLASH_DRIVE_SUPPORT                = src_filter=+<src/sd/usb_flashdrive/Sd2C
 HAS_MCP3426_ADC                        = src_filter=+<src/feature/adc> +<src/gcode/feature/adc>
 AUTO_BED_LEVELING_BILINEAR             = src_filter=+<src/feature/bedlevel/abl>
 AUTO_BED_LEVELING_(3POINT|(BI)?LINEAR) = src_filter=+<src/gcode/bedlevel/abl>
-X_AXIS_TWIST_COMPENSATION              = src_filter=+<src/feature/x_twist.cpp> +<src/lcd/menu/menu_x_twist.cpp> +<src/gcode/bedlevel/abl/M423.cpp>
+X_AXIS_TWIST_COMPENSATION              = src_filter=+<src/feature/x_twist.cpp> +<src/lcd/menu/menu_x_twist.cpp> +<src/gcode/probe/M423.cpp>
 MESH_BED_LEVELING                      = src_filter=+<src/feature/bedlevel/mbl> +<src/gcode/bedlevel/mbl>
 AUTO_BED_LEVELING_UBL                  = src_filter=+<src/feature/bedlevel/ubl> +<src/gcode/bedlevel/ubl>
 UBL_HILBERT_CURVE                      = src_filter=+<src/feature/bedlevel/hilbert_curve.cpp>
diff --git a/platformio.ini b/platformio.ini
index 32cfcb6ca56d..0e50da2b7392 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -150,7 +150,7 @@ default_src_filter = +<src/*> -<src/config> -<src/HAL> +<src/HAL/shared>
   -<src/feature/tmc_util.cpp> -<src/module/stepper/trinamic.cpp>
   -<src/feature/tramming.cpp>
   -<src/feature/twibus.cpp>
-  -<src/feature/x_twist.cpp> -<src/gcode/bedlevel/abl/M423.cpp>
+  -<src/feature/x_twist.cpp> -<src/gcode/probe/M423.cpp>
   -<src/feature/z_stepper_align.cpp>
   -<src/gcode/bedlevel/G26.cpp>
   -<src/gcode/bedlevel/G35.cpp>