diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 2cacbe42c1..1c468aa618 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1,4 +1,4 @@ -//#define ABL_BLTOUCH // Replaces RGB LED +#define ABL_BLTOUCH // Replaces RGB LED #define GraphicalLCD // Will work next to MKS TFT #define TMC_2209 // Defaults to TMC2100 //#define ABL_UBL // Defaults to Bilinear diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 6a960fea4a..c828fa8789 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -2522,7 +2522,7 @@ /** * User-defined menu items that execute custom GCode */ -#if(ENABLED(ABL_UBL) || ENABLED(ABL_BLTOUCH)) +#if ANY(ABL_UBL, ABL_BLTOUCH) #define CUSTOM_USER_MENUS #endif @@ -2532,20 +2532,18 @@ #define USER_SCRIPT_RETURN // Return to status screen after a script #define CUSTOM_USER_MENU_TITLE "Leveling Tools" - #define CommBedTmp "75" - #define USER_DESC_1 "Setup" - #if (ENABLED(ABL_UBL)) - #define USER_GCODE_1 "M190S" CommBedTmp"\nG28\nG34\nG29P1\nG29P3R\nG29S1\nG29S0\n G29F0.0\nG29A\nG28\nM109S215\nG1X150Y150\nG1Z0\nM500\nM400\nM77\nM117 Set Z Offset" - #elif ENABLED(ABL_BI) - #define USER_GCODE_1 "M190S" CommBedTmp"\nM104S215\nG34\nG28\nG29\nM400\nG28\nM420S1\nM109S215\nG1X100Y100\nG1Z0\nM500\nM400\nM77\nM117 Set Z Offset" + #if ENABLED(ABL_UBL) + #define USER_GCODE_1 "M190S75nG28\nG34\nG29P1\nG29P3R\nG29S1\nG29S0\n G29F0.0\nG29A\nG28\nM109S215\nG1X150Y150\nG1Z0\nM500\nM400\nM77\nM117 Set Z Offset" + #else + #define USER_GCODE_1 "M190S75\nM104S215\nG34\nG28\nG29\nM400\nG28\nM420S1\nM109S215\nG1X100Y100\nG1Z0\nM500\nM400\nM77\nM117 Set Z Offset" #endif #define USER_DESC_2 "PID Tune" #define USER_GCODE_2 "M106S128\nM303C8S215E0U\nM500\n M117 PID Tune Done" #define USER_DESC_3 "Prep for Z Adjust" - #define USER_GCODE_3 "M190 S" CommBedTmp" \n M104 S215 \n G28 \n G29 L1 \n G1 X100 Y 100 \n G1 Z0" + #define USER_GCODE_3 "M190 S75\n M104 S215 \n G28 \n G29 L1 \n G1 X100 Y 100 \n G1 Z0" #define USER_DESC_4 "Store Settings" #define USER_GCODE_4 "M500\nM117 Settings Stored"