diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index 041f910d08f0..4f63653c05d2 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1271,20 +1271,18 @@
#endif
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
- // Add a calibration procedure in the probe offsets menu to compensate
- // for the X-axis twist
- #define X_AXIS_TWIST_COMPENSATION
+ // Add a calibration procedure in the Probe Offsets menu
+ // to compensate for twist in the X-axis.
+ //#define X_AXIS_TWIST_COMPENSATION
#if ENABLED(X_AXIS_TWIST_COMPENSATION)
- //
- // Enable to init the Probe Z-Offset when starting the Wizard.
- // Use a height slightly above the estimated nozzle-to-probe Z offset.
- // For example, with an offset of -5, consider a starting height of -4.
- //
+ /**
+ * Enable to init the Probe Z-Offset when starting the Wizard.
+ * Use a height slightly above the estimated nozzle-to-probe Z offset.
+ * For example, with an offset of -5, consider a starting height of -4.
+ */
#define XATC_START_Z 0.0
- // Number of points to probe in the wizard.
- #define XATC_MAX_POINTS 3
- // Y position to probe
- #define XATC_Y_POSITION Y_CENTER
+ #define XATC_MAX_POINTS 3 // Number of points to probe in the wizard
+ #define XATC_Y_POSITION Y_CENTER // (mm) Y position to probe
#endif
#endif
#endif
diff --git a/Marlin/src/feature/bedlevel/abl/x_axis_twist_compensation.cpp b/Marlin/src/feature/bedlevel/abl/x_axis_twist_compensation.cpp
index f9f29912dd13..89090bef53fa 100644
--- a/Marlin/src/feature/bedlevel/abl/x_axis_twist_compensation.cpp
+++ b/Marlin/src/feature/bedlevel/abl/x_axis_twist_compensation.cpp
@@ -1,3 +1,24 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
#include "../../../inc/MarlinConfig.h"
#if ENABLED(X_AXIS_TWIST_COMPENSATION)
@@ -5,11 +26,10 @@
#include "../bedlevel.h"
xatc_points xatc_z_values;
-float xatc_spacing;
-float xatc_start;
+float xatc_spacing, xatc_start;
-void print_xatc_points(){
- SERIAL_ECHOLNPGM(" XATC correction values:");
+void print_xatc_points() {
+ SERIAL_ECHOLNPGM(" X-Twist Correction:");
LOOP_L_N(x, XATC_MAX_POINTS) {
SERIAL_CHAR(' ');
if (!isnan(xatc_z_values[x])) {
@@ -24,16 +44,14 @@ void print_xatc_points(){
SERIAL_EOL();
}
-float lerp(float t, float a, float b){
- return a + t * (b - a);
-}
+float lerp(const_float_t t, const_float_t a, const_float_t b) { return a + t * (b - a); }
-float x_axis_twist_compensation(const xy_pos_t &raw){
+float x_axis_twist_compensation(const xy_pos_t &raw) {
float t = (raw.x - xatc_start) / xatc_spacing;
int i = FLOOR(t);
LIMIT(i, 0, XATC_MAX_POINTS - 2);
- t = t - i;
+ t -= i;
return lerp(t, xatc_z_values[i], xatc_z_values[i + 1]);
}
-#endif //PROBE_OFFSET_MESH
\ No newline at end of file
+#endif // X_AXIS_TWIST_COMPENSATION
diff --git a/Marlin/src/feature/bedlevel/abl/x_axis_twist_compensation.h b/Marlin/src/feature/bedlevel/abl/x_axis_twist_compensation.h
index e73893335460..d4948d5dcb29 100644
--- a/Marlin/src/feature/bedlevel/abl/x_axis_twist_compensation.h
+++ b/Marlin/src/feature/bedlevel/abl/x_axis_twist_compensation.h
@@ -1,3 +1,24 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
#pragma once
#include "../../../inc/MarlinConfigPre.h"
@@ -8,4 +29,4 @@ extern float xatc_spacing;
extern float xatc_start;
float x_axis_twist_compensation(const xy_pos_t &raw);
-void print_xatc_points();
\ No newline at end of file
+void print_xatc_points();
diff --git a/Marlin/src/gcode/bedlevel/abl/G29.cpp b/Marlin/src/gcode/bedlevel/abl/G29.cpp
index 2a82ca94d277..47c32456d568 100644
--- a/Marlin/src/gcode/bedlevel/abl/G29.cpp
+++ b/Marlin/src/gcode/bedlevel/abl/G29.cpp
@@ -662,7 +662,7 @@ G29_TYPE GcodeSuite::G29() {
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
const float z = abl.measured_z + abl.Z_offset;
- z_values[abl.meshCount.x][abl.meshCount.y] = z + TERN0( X_AXIS_TWIST_COMPENSATION, x_axis_twist_compensation(abl.probePos) );
+ z_values[abl.meshCount.x][abl.meshCount.y] = z PLUS_TERN0(X_AXIS_TWIST_COMPENSATION, x_axis_twist_compensation(abl.probePos));
TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(abl.meshCount, z));
#endif
diff --git a/Marlin/src/lcd/menu/menu.cpp b/Marlin/src/lcd/menu/menu.cpp
index a24ad883f788..3056798fa1a8 100644
--- a/Marlin/src/lcd/menu/menu.cpp
+++ b/Marlin/src/lcd/menu/menu.cpp
@@ -46,6 +46,13 @@
///////////// Global Variables /////////////
////////////////////////////////////////////
+#if HAS_LEVELING && ANY(LEVEL_BED_CORNERS, PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
+ bool leveling_was_active; // = false
+#endif
+#if ANY(PROBE_MANUALLY, MESH_BED_LEVELING, X_AXIS_TWIST_COMPENSATION)
+ uint8_t manual_probe_index; // = 0
+#endif
+
// Menu Navigation
int8_t encoderTopLine, encoderLine, screen_items;
diff --git a/Marlin/src/lcd/menu/menu.h b/Marlin/src/lcd/menu/menu.h
index 7e7d4d4d7e21..048dab9b7315 100644
--- a/Marlin/src/lcd/menu/menu.h
+++ b/Marlin/src/lcd/menu/menu.h
@@ -254,3 +254,11 @@ extern uint8_t screen_history_depth;
inline void clear_menu_history() { screen_history_depth = 0; }
#define STICKY_SCREEN(S) []{ ui.defer_status_screen(); ui.goto_screen(S); }
+
+#if HAS_LEVELING && ANY(LEVEL_BED_CORNERS, PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
+ extern bool leveling_was_active;
+#endif
+
+#if ANY(PROBE_MANUALLY, MESH_BED_LEVELING, X_AXIS_TWIST_COMPENSATION)
+ extern uint8_t manual_probe_index;
+#endif
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 872b9b3840d8..7bf247f40be2 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -66,10 +66,6 @@
static_assert(LEVEL_CORNERS_Z_HOP >= 0, "LEVEL_CORNERS_Z_HOP must be >= 0. Please update your configuration.");
-#if HAS_LEVELING
- static bool leveling_was_active = false;
-#endif
-
#ifndef LEVEL_CORNERS_LEVELING_ORDER
#define LEVEL_CORNERS_LEVELING_ORDER { LF, RF, LB, RB } // Default
//#define LEVEL_CORNERS_LEVELING_ORDER { LF, LB, RF } // 3 hard-coded points
diff --git a/Marlin/src/lcd/menu/menu_bed_leveling.cpp b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
index eb286f96b9ea..a47e2517aedf 100644
--- a/Marlin/src/lcd/menu/menu_bed_leveling.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_leveling.cpp
@@ -52,8 +52,6 @@
// Motion > Level Bed handlers
//
- static uint8_t manual_probe_index;
-
// LCD probed points are from defaults
constexpr uint8_t total_probe_points = TERN(AUTO_BED_LEVELING_3POINT, 3, GRID_MAX_POINTS);
diff --git a/Marlin/src/lcd/menu/menu_motion.cpp b/Marlin/src/lcd/menu/menu_motion.cpp
index cddb7ede744d..29a908ac334d 100644
--- a/Marlin/src/lcd/menu/menu_motion.cpp
+++ b/Marlin/src/lcd/menu/menu_motion.cpp
@@ -134,6 +134,15 @@ void lcd_move_x() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_X), X_AXIS); }
#endif // E_MANUAL
+#if EITHER(PROBE_OFFSET_WIZARD, X_AXIS_TWIST_COMPENSATION)
+
+ void _goto_manual_move_z(const_float_t scale) {
+ ui.manual_move.menu_scale = scale;
+ ui.goto_screen(lcd_move_z);
+ }
+
+#endif
+
//
// "Motion" > "Move Xmm" > "Move XYZ" submenu
//
diff --git a/Marlin/src/lcd/menu/menu_probe_offset.cpp b/Marlin/src/lcd/menu/menu_probe_offset.cpp
index 12b55969a39b..add739553380 100644
--- a/Marlin/src/lcd/menu/menu_probe_offset.cpp
+++ b/Marlin/src/lcd/menu/menu_probe_offset.cpp
@@ -39,13 +39,11 @@
#include "../../feature/bedlevel/bedlevel.h"
#endif
+void _goto_manual_move_z(const_float_t);
+
// Global storage
float z_offset_backup, calculated_z_offset, z_offset_ref;
-#if HAS_LEVELING
- bool leveling_was_active;
-#endif
-
inline void z_clearance_move() {
do_z_clearance(
#ifdef Z_AFTER_HOMING
@@ -65,11 +63,6 @@ void set_offset_and_go_back(const_float_t z) {
ui.goto_previous_screen_no_defer();
}
-void _goto_manual_move_z(const_float_t scale) {
- ui.manual_move.menu_scale = scale;
- ui.goto_screen(lcd_move_z);
-}
-
void probe_offset_wizard_menu() {
START_MENU();
calculated_z_offset = probe.offset.z + current_position.z - z_offset_ref;
diff --git a/Marlin/src/lcd/menu/menu_x_axis_twist_compensation.cpp b/Marlin/src/lcd/menu/menu_x_axis_twist_compensation.cpp
index e4ec6b9354d1..85befe7589ae 100644
--- a/Marlin/src/lcd/menu/menu_x_axis_twist_compensation.cpp
+++ b/Marlin/src/lcd/menu/menu_x_axis_twist_compensation.cpp
@@ -1,3 +1,24 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (c) 2021 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
#include "../../inc/MarlinConfigPre.h"
#if ENABLED(X_AXIS_TWIST_COMPENSATION)
@@ -14,20 +35,17 @@
#define XATC_Y_POSITION ((probe.max_y() - probe.min_y())/2)
#endif
-static uint8_t manual_probe_index;
-float measured_z;
-float z_offset;
-bool was_leveling_active;
+void _goto_manual_move_z(const_float_t);
+
+float measured_z, z_offset;
//
// Step 9: X Axis Twist Compensation Wizard is finished.
//
-void xatc_wizard_done()
-{
- if (!ui.wait_for_move)
- {
+void xatc_wizard_done() {
+ if (!ui.wait_for_move) {
print_xatc_points();
- set_bed_leveling_enabled(was_leveling_active);
+ set_bed_leveling_enabled(leveling_was_active);
SET_SOFT_ENDSTOP_LOOSE(false);
ui.goto_screen(menu_advanced_settings);
}
@@ -38,32 +56,20 @@ void xatc_wizard_done()
void xatc_wizard_goto_next_point();
-#if ENABLED(PROBE_OFFSET_WIZARD)
- void _goto_manual_move_z(const_float_t);
-#else
- void _goto_manual_move_z(const_float_t scale) {
- ui.manual_move.menu_scale = scale;
- ui.goto_screen(lcd_move_z);
- }
-#endif
-
//
// Step 8: Ask the user if he wants to update the z-offset of the probe
//
-void xatc_wizard_update_z_offset(){
-
+void xatc_wizard_update_z_offset() {
MenuItem_confirm::select_screen(
- GET_TEXT(MSG_YES), GET_TEXT(MSG_NO)
- , []{
- probe.offset.z = z_offset;
- ui.goto_screen(xatc_wizard_done);
- }
- , []{
- ui.goto_screen(xatc_wizard_done);
- }
- , GET_TEXT(MSG_XATC_UPDATE_Z_OFFSET)
- , ftostr42_52(z_offset), PSTR("?")
- );
+ GET_TEXT(MSG_YES), GET_TEXT(MSG_NO)
+ , []{
+ probe.offset.z = z_offset;
+ ui.goto_screen(xatc_wizard_done);
+ }
+ , xatc_wizard_done
+ , GET_TEXT(MSG_XATC_UPDATE_Z_OFFSET)
+ , ftostr42_52(z_offset), PSTR("?")
+ );
}
//
@@ -71,14 +77,11 @@ void xatc_wizard_update_z_offset(){
//
void xatc_wizard_set_offset_and_go_to_next_point() {
// Set Z-offset at probed point
- xatc_z_values[manual_probe_index] = probe.offset.z + current_position.z - measured_z;
-
+ xatc_z_values[manual_probe_index++] = probe.offset.z + current_position.z - measured_z;
// Go to next point
- manual_probe_index ++;
ui.goto_screen(xatc_wizard_goto_next_point);
}
-
//
// Step 6: Wizard Menu. Move the nozzle down until it touches the bed.
//
@@ -119,64 +122,51 @@ void xatc_wizard_menu() {
//
// Step 5: Display "Next point: 1 / 9" while waiting for move to finish
//
-void xatc_wizard_moving()
-{
- if (ui.should_draw())
- {
+void xatc_wizard_moving() {
+ if (ui.should_draw()) {
char msg[10];
sprintf_P(msg, PSTR("%i / %u"), manual_probe_index + 1, XATC_MAX_POINTS);
MenuEditItemBase::draw_edit_screen(GET_TEXT(MSG_LEVEL_BED_NEXT_POINT), msg);
}
ui.refresh(LCDVIEW_CALL_NO_REDRAW);
- if (!ui.wait_for_move){
- ui.goto_screen(xatc_wizard_menu);
- }
+ if (!ui.wait_for_move) ui.goto_screen(xatc_wizard_menu);
}
//
// Step 4: Initiate a move to the next point
//
-void xatc_wizard_goto_next_point()
-{
- if (manual_probe_index < XATC_MAX_POINTS){
+void xatc_wizard_goto_next_point() {
+ if (manual_probe_index < XATC_MAX_POINTS) {
- float x = xatc_start + manual_probe_index * xatc_spacing;
+ const float x = xatc_start + manual_probe_index * xatc_spacing;
// Avoid probing outside the round or hexagonal area
- if (!TERN0(IS_KINEMATIC, !probe.can_reach(x, XATC_Y_POSITION))){
+ if (!TERN0(IS_KINEMATIC, !probe.can_reach(x, XATC_Y_POSITION))) {
ui.wait_for_move = true;
ui.goto_screen(xatc_wizard_moving);
// Deploy certain probes before starting probing
- #if HAS_BED_PROBE
- if (ENABLED(BLTOUCH))
- do_z_clearance(Z_CLEARANCE_DEPLOY_PROBE);
- #endif
+ TERN_(BLTOUCH, do_z_clearance(Z_CLEARANCE_DEPLOY_PROBE));
measured_z = probe.probe_at_point(x, XATC_Y_POSITION, PROBE_PT_STOW);
current_position += probe.offset_xy;
current_position.z = XATC_START_Z - probe.offset.z + measured_z;
line_to_current_position(MMM_TO_MMS(XY_PROBE_FEEDRATE));
ui.wait_for_move = false;
- } else {
- //Go to next point
- manual_probe_index++;
}
- } else {
-
+ else
+ manual_probe_index++; // Go to next point
+ }
+ else {
// Compute the z-offset by averaging the values found with this wizard
z_offset = 0;
- for(int i = 0; i < XATC_MAX_POINTS; i++){
- z_offset += xatc_z_values[i];
- }
+ LOOP_L_N(i, XATC_MAX_POINTS) z_offset += xatc_z_values[i];
z_offset /= XATC_MAX_POINTS;
// Subtract the average from the values found with this wizard.
// This way they are indipendent from the z-offset
- for(int i = 0; i < XATC_MAX_POINTS; i++){
- xatc_z_values[i] -= z_offset;
- }
-
+ LOOP_L_N(i, XATC_MAX_POINTS) xatc_z_values[i] -= z_offset;
+
ui.goto_screen(xatc_wizard_update_z_offset);
}
}
@@ -186,20 +176,18 @@ void xatc_wizard_goto_next_point()
// Move to the first probe position
//
void xatc_wizard_homing_done() {
- if (ui.should_draw())
- {
+ if (ui.should_draw()) {
MenuItem_static::draw(1, GET_TEXT(MSG_LEVEL_BED_WAITING));
- // Color UI needs a control to detect a touch
- #if BOTH(TOUCH_SCREEN, HAS_GRAPHICAL_TFT)
+ // Color UI needs a control to detect a touch
+ #if BOTH(TOUCH_SCREEN, HAS_GRAPHICAL_TFT)
touch.add_control(CLICK, 0, 0, TFT_WIDTH, TFT_HEIGHT);
- #endif
+ #endif
}
- if (ui.use_click())
- {
+ if (ui.use_click()) {
xatc_spacing = (probe.max_x() - probe.min_x()) / (XATC_MAX_POINTS - 1);
- xatc_start = probe.min_x();
+ xatc_start = probe.min_x();
SET_SOFT_ENDSTOP_LOOSE(true); // Disable soft endstops for free Z movement
@@ -220,10 +208,9 @@ void xatc_wizard_homing() {
// Step 1: Prepare for the wizard...
//
void xatc_wizard_continue() {
-
// Store Bed-Leveling-State and disable
#if HAS_LEVELING
- was_leveling_active = planner.leveling_active;
+ leveling_was_active = planner.leveling_active;
set_bed_leveling_enabled(false);
#endif
@@ -234,4 +221,4 @@ void xatc_wizard_continue() {
queue.inject_P(G28_STR);
}
-#endif // PROBE_OFFSET_MESH
+#endif // X_AXIS_TWIST_COMPENSATION
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
index 0314370287b9..f2ca044c9424 100644
--- a/Marlin/src/module/settings.cpp
+++ b/Marlin/src/module/settings.cpp
@@ -251,9 +251,9 @@ typedef struct SettingsDataStruct {
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
bed_mesh_t z_values; // G29
#if ENABLED(X_AXIS_TWIST_COMPENSATION)
- xatc_points xatc_z_values;
- float xatc_spacing;
- float xatc_start;
+ xatc_points xatc_z_values; // TBD
+ float xatc_spacing; // TBD
+ float xatc_start; // TBD
#endif
#else
float z_values[3][3];
@@ -821,9 +821,9 @@ void MarlinSettings::postprocess() {
);
#if ENABLED(X_AXIS_TWIST_COMPENSATION)
static_assert(
- sizeof(xatc_z_values) == XATC_MAX_POINTS * sizeof(xatc_z_values[0]),
- "Z-offset mesh is the wrong size."
- );
+ sizeof(xatc_z_values) == (XATC_MAX_POINTS) * sizeof(xatc_z_values[0]),
+ "Z-offset mesh is the wrong size."
+ );
#endif
#else
const xy_pos_t bilinear_start{0}, bilinear_grid_spacing{0};
@@ -3218,10 +3218,11 @@ void MarlinSettings::reset() {
}
}
- #if ENABLED(X_AXIS_TWIST_COMPENSATION)
- CONFIG_ECHO_START();
- print_xatc_points();
- #endif
+ // TODO: Create G-code for settings
+ //#if ENABLED(X_AXIS_TWIST_COMPENSATION)
+ // CONFIG_ECHO_START();
+ // print_xatc_points();
+ //#endif
#endif
diff --git a/buildroot/tests/rambo b/buildroot/tests/rambo
index b7136e445ed6..a54c04eeb21c 100755
--- a/buildroot/tests/rambo
+++ b/buildroot/tests/rambo
@@ -91,7 +91,7 @@ opt_set MOTHERBOARD BOARD_MINIRAMBO \
I2C_SLAVE_ADDRESS 63
opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER \
SDSUPPORT PCA9632 SOUND_MENU_ITEM GCODE_REPEAT_MARKERS \
- AUTO_BED_LEVELING_BILINEAR PROBE_MANUALLY LCD_BED_LEVELING G26_MESH_VALIDATION MESH_EDIT_MENU \
+ AUTO_BED_LEVELING_LINEAR PROBE_MANUALLY LCD_BED_LEVELING \
LIN_ADVANCE EXTRA_LIN_ADVANCE_K \
INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT EXPERIMENTAL_I2CBUS M100_FREE_MEMORY_WATCHER \
NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE \
@@ -99,7 +99,7 @@ opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CO
PRINTCOUNTER SERVICE_NAME_1 SERVICE_INTERVAL_1 M114_DETAIL
opt_add M100_FREE_MEMORY_DUMPER
opt_add M100_FREE_MEMORY_CORRUPTOR
-exec_test $1 $2 "MINIRAMBO | RRDGFSC | ABL Bilinear Manual | M100 | PWM_MOTOR_CURRENT | M600..." "$3"
+exec_test $1 $2 "MINIRAMBO | RRDGFSC | ABL Linear Manual | M100 | PWM_MOTOR_CURRENT | M600..." "$3"
#
# Test many less common options
@@ -118,7 +118,8 @@ opt_enable COREYX USE_XMAX_PLUG MIXING_EXTRUDER GRADIENT_MIX \
BABYSTEPPING BABYSTEP_DISPLAY_TOTAL FILAMENT_LCD_DISPLAY FILAMENT_WIDTH_SENSOR \
REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER MENU_ADDAUTOSTART SDSUPPORT SDCARD_SORT_ALPHA \
ENDSTOP_NOISE_THRESHOLD FAN_SOFT_PWM \
- FIX_MOUNTED_PROBE PROBING_ESTEPPERS_OFF AUTO_BED_LEVELING_LINEAR DEBUG_LEVELING_FEATURE PROBE_OFFSET_WIZARD \
+ FIX_MOUNTED_PROBE PROBING_ESTEPPERS_OFF PROBE_OFFSET_WIZARD \
+ AUTO_BED_LEVELING_BILINEAR X_AXIS_TWIST_COMPENSATION MESH_EDIT_MENU DEBUG_LEVELING_FEATURE G26_MESH_VALIDATION \
Z_SAFE_HOMING SHOW_TEMP_ADC_VALUES HOME_Y_BEFORE_X EMERGENCY_PARSER \
SD_ABORT_ON_ENDSTOP_HIT HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT HOST_PAUSE_M76 ADVANCED_OK M114_DETAIL \
VOLUMETRIC_DEFAULT_ON NO_WORKSPACE_OFFSETS EXTRA_FAN_SPEED FWRETRACT \
diff --git a/ini/features.ini b/ini/features.ini
index 91baa601cab1..64b292f0949d 100644
--- a/ini/features.ini
+++ b/ini/features.ini
@@ -96,6 +96,7 @@ USE_UHS3_USB = src_filter=+
AUTO_BED_LEVELING_BILINEAR = src_filter=+
AUTO_BED_LEVELING_(3POINT|(BI)?LINEAR) = src_filter=+
+X_AXIS_TWIST_COMPENSATION = src_filter=+ +
MESH_BED_LEVELING = src_filter=+ +
AUTO_BED_LEVELING_UBL = src_filter=+ +
UBL_HILBERT_CURVE = src_filter=+
diff --git a/platformio.ini b/platformio.ini
index 07821fca96b6..88cce1323796 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -74,6 +74,7 @@ default_src_filter = + - - +
-
-
-
+ -
-
-
- - - - -
@@ -96,6 +97,7 @@ default_src_filter = + - - +
-
- -
- -
+ -
- -
- -
-