From e4cad11951493dddcbc5155b5578b266cdf8733d Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sun, 31 Mar 2019 10:42:02 -0400 Subject: [PATCH] Add commission menu --- Marlin/Configuration.h | 11 ++++++++--- Marlin/Configuration_adv.h | 34 +++++++++++++++++----------------- 2 files changed, 25 insertions(+), 20 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index beac61c561..f0c12ea073 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -995,8 +995,13 @@ // @section machine // The size of the print bed -#define X_BED_SIZE 398 -#define Y_BED_SIZE 398 +#if ENABLED(PetsfangMicroswiss) + #define X_BED_SIZE 398 + #define Y_BED_SIZE 390 +#else + #define X_BED_SIZE 398 + #define Y_BED_SIZE 398 +#endif // Travel limits (mm) after homing, corresponding to endstop positions. #define X_MIN_POS 0 @@ -1425,7 +1430,7 @@ #if ENABLED(NOZZLE_PARK_FEATURE) // Specify a park position as { X, Y, Z } - #define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MIN_POS + 10), 10 } + #define NOZZLE_PARK_POINT { (X_MIN_POS + 10), (Y_MIN_POS + 30), 10 } #define NOZZLE_PARK_XY_FEEDRATE 100 // X and Y axes feedrate in mm/s (also used for delta printers Z axis) #define NOZZLE_PARK_Z_FEEDRATE 5 // Z axis feedrate in mm/s (not used for delta printers) #endif diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 80b812c4de..c6b6bed028 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -1999,30 +1999,30 @@ #define GCODE_MACROS_SLOT_SIZE 50 // Maximum length of a single macro #endif -/** - * User-defined menu items that execute custom GCode - */ -//#define CUSTOM_USER_MENUS + +#define CUSTOM_USER_MENUS + #if ENABLED(CUSTOM_USER_MENUS) - //#define CUSTOM_USER_MENU_TITLE "Custom Commands" - #define USER_SCRIPT_DONE "M117 User Script Done" + //#define USER_SCRIPT_DONE "M117 User Script Done" #define USER_SCRIPT_AUDIBLE_FEEDBACK - //#define USER_SCRIPT_RETURN // Return to status screen after a script + #define USER_SCRIPT_RETURN // Return to status screen after a script + #define CUSTOM_USER_MENU_TITLE "Commissioning" - #define USER_DESC_1 "Home & UBL Info" - #define USER_GCODE_1 "G28\nG29 W" + #define USER_DESC_1 "Mesh Commission" - #define USER_DESC_2 "Preheat for " PREHEAT_1_LABEL - #define USER_GCODE_2 "M140 S" STRINGIFY(PREHEAT_1_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_1_TEMP_HOTEND) + #define USER_GCODE_1 "M117 \n M502 \n M500 \n M501 \n M190 S65 \n M117 Probing.... \n M104 S225 \n G28 \n G29 \n M500 \n G28 \n M420 S \n M109 S225 \n G1 X100 Y 100 \n G1 Z0 \n M77 \n M117 Set Z Offset" + + #define USER_DESC_2 "PID Tune" + #define USER_GCODE_2 "M106 S128 \n M303 C8 S225 E1 U \n M500 \n M117 PID Tune Done" - #define USER_DESC_3 "Preheat for " PREHEAT_2_LABEL - #define USER_GCODE_3 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nM104 S" STRINGIFY(PREHEAT_2_TEMP_HOTEND) + #define USER_DESC_3 "Prep for Z Adjust" + #define USER_GCODE_3 "M190 S65\n M104 235 \n G28 \n G29 L1 \n G1 X100 Y 100 \n G1 Z0" - #define USER_DESC_4 "Heat Bed/Home/Level" - #define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29" + #define USER_DESC_4 "Store Settings" + #define USER_GCODE_4 "M500" - #define USER_DESC_5 "Home & Info" - #define USER_GCODE_5 "G28\nM503" + //#define USER_DESC_5 "Run Mesh Validation" + //#define USER_GCODE_5 "G26" #endif /**