From 9ec9fcd164c09da7dbd6ed3cbc4303e1ec1e5287 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Tue, 18 Jun 2019 20:30:36 -0400 Subject: [PATCH] Update Configuration_adv.h --- Marlin/Configuration_adv.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index ef99b209a9..bb18872a4e 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1499,7 +1499,7 @@ #define CUSTOM_USER_MENUS #if ENABLED(CUSTOM_USER_MENUS) //#define USER_SCRIPT_DONE "M117 User Script Done" - #define USER_SCRIPT_AUDIBLE_FEEDBACK + //#define USER_SCRIPT_AUDIBLE_FEEDBACK #define USER_SCRIPT_RETURN // Return to status screen after a script #define MSG_USER_MENU "Setup Menu" @@ -1509,21 +1509,22 @@ #define COMMFANNSPEED "M106 S128 \n" #endif - #define USER_DESC_1 "Mesh Commission" - #define USER_DESC_3 "Prep for Z Adjust" + #define USER_DESC_1 "1. Run UBL" + #define USER_DESC_3 "2. Set Z Offset" + #if ENABLED(ABL_Bilinear) - #define USER_GCODE_1 "M502 \n M500 \n M501 \n M190 S75 \n T0 \n G28 \n G29 \n M500 \n G28 \n M420 S1 \n " COMMFANNSPEED " M109 S225 \n G1 X100 Y 100 \n G1 Z0 \n M77 \n M400 \n M117 Set Z Offset" - #define USER_GCODE_3 "M190 S75 \n " COMMFANNSPEED " M104 235 \n G28 \n M420 S1 \n G1 X100 Y 100 \n G1 Z0" + #define USER_GCODE_1 "M502 \n M500 \n M501 \n M190 S60 \n T0 \n G28 \n G29 \n M500 \n G28 \n M420 S1 \n " COMMFANNSPEED " M109 S225 \n G1 X100 Y 100 \n G1 Z0 \n M77 \n M400 \n M117 Set Z Offset" + #define USER_GCODE_3 "M190 S60 \n " COMMFANNSPEED " M104 235 \n G28 \n M420 S1 \n G1 X100 Y 100 \n G1 Z0" #else - #define USER_GCODE_1 "M502 \n M500 \n M501 \n M190 S75 \n T0 \n G28 \n G29 P1 \n G29 S1 \n G29 S0 \n G29 F 10.0 \n G29 A \n M500 \n G28 \n G29 L1 \n " COMMFANNSPEED " M109 S225 \n G1 X150 Y 150 \n G1 Z0 \n M77 \n M117 Set Z Offset" - #define USER_GCODE_3 "M190 S75 \n " COMMFANNSPEED " M104 235 \n G28 \n G29 L1 \n G1 X100 Y 100 \n G1 Z0" + #define USER_GCODE_1 "M502 \n M500 \n M501 \n M190 S60 \n T0 \n G28 \n G29 P1 \n G29 S1 \n G29 S0 \n G29 F 10.0 \n G29 A \n M500 \n G28 \n G29 L1 \n " COMMFANNSPEED " M109 S225 \n G1 X150 Y 150 \n G1 Z0 \n M77 \n M117 Set Z Offset" + #define USER_GCODE_3 "M190 S60 \n " COMMFANNSPEED " M104 235 \n G28 \n G29 L1 \n G1 X100 Y 100 \n G1 Z0" #endif - #define USER_DESC_4 "Fill Mesh Points" - #define USER_GCODE_4 "G29 P3 \n G29 P3 \n G29 P3 \n G29 T" + #define USER_DESC_4 "Store Settings" + #define USER_GCODE_4 "M500" #define USER_DESC_2 "PID Tune Bed" - #define USER_GCODE_2 "M303 C4 S75 E-1 U \n M500 \n M117 PID Bed Done" + #define USER_GCODE_2 "M303E-1S75U \n M500 \n M117 PID Bed Done" #define USER_DESC_5 "Run Mesh Validation" #define USER_GCODE_5 "G26"