diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index cef5564ec0..bba0bc17a7 100644 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -8,14 +8,14 @@ //#define MachineEnder2 //#define MachineEnder3 //#define MachineEnder4 -//#define MachineEnder5 +#define MachineEnder5 //#define MachineEnder5Plus //#define MachineMini //#define MachineCR20 //Buzzer doesnt work //#define MachineCR20Pro //#define MachineCR10 //#define MachineCR10S -#define MachineCR10SV2 +//#define MachineCR10SV2 //#define MachineCR10SPro // Graphics LCD Requires soldering R64 and R66 //#define MachineCRX //#define MachineCR10Max @@ -30,7 +30,7 @@ //#define PLUS // Adds bltouch, allmetal, bilinear (standard), lerdge, 93 e steps/mm -//#define Big_UI // Lightweight status screen +#define Big_UI // Lightweight status screen //#define OrigLCD // Upgraded mainboard with single cable Ender LCD //#define GraphicLCD //Full graphics LCD for Ender 4, CR-X or CR10SPro @@ -120,8 +120,8 @@ UBL and Extreme are recommended with solid bed mounts as it becomes a one time commissioning. Standard is recommended in most other scenarios. */ -//#define MeshFast -#define MeshStd +#define MeshFast +//#define MeshStd //#define MeshFine //#define MeshExtreme @@ -273,7 +273,7 @@ #define Z_STOP_PIN 19 #endif -#if ANY(MachineEnder2, MachineEnder3, MachineCR10) && NONE(Melzi_To_SBoardUpgrade, SKR13) +#if ANY(MachineEnder2, MachineEnder3, MachineEnder5, MachineCR10) && NONE(Melzi_To_SBoardUpgrade, SKR13) #define MachineCR10Orig #endif @@ -473,7 +473,7 @@ // This defines the number of extruders // :[1, 2, 3, 4, 5, 6] -#if(ENABLED(Dual_BowdenSplitterY) || ENABLED(Dual_CyclopsSingleNozzle) || ENABLED(Dual_ChimeraDualNozzle)) +#if ANY(Dual_BowdenSplitterY, Dual_CyclopsSingleNozzle, Dual_ChimeraDualNozzle) #define EXTRUDERS 2 #else #define EXTRUDERS 1 @@ -482,7 +482,7 @@ #define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // For Cyclops or any "multi-extruder" that shares a single nozzle. -#if(ENABLED(Dual_BowdenSplitterY) || ENABLED(Dual_CyclopsSingleNozzle)) +#if ANY(Dual_BowdenSplitterY, Dual_CyclopsSingleNozzle) #define SINGLENOZZLE #endif @@ -824,7 +824,7 @@ #define PID_MAX BANG_MAX // Limits current to nozzle while PID is active (see PID_FUNCTIONAL_RANGE below); 255=full current #define PID_K1 0.95 // Smoothing factor within any PID loop #if ENABLED(PIDTEMP) -#if(DISABLED(MachineCR10Orig)) +#if NONE(MachineCR10Orig, LowMemoryBoard) #define PID_EDIT_MENU #define PID_AUTOTUNE_MENU // Add PID Autotune to the LCD "Temperature" menu to run M303 and apply the result. #endif @@ -903,8 +903,8 @@ * heater. If your configuration is significantly different than this and you don't understand * the issues involved, don't use bed PID until someone else verifies that your hardware works. */ - #if(DISABLED(MachineCR10Orig, LowMemoryBoard)) -#define PIDTEMPBED +#if(NONE(MachineCR10Orig, LowMemoryBoard)) + #define PIDTEMPBED #endif //#define BED_LIMIT_SWITCHING @@ -944,16 +944,17 @@ * * *** IT IS HIGHLY RECOMMENDED TO LEAVE THIS OPTION ENABLED! *** */ -#define PREVENT_COLD_EXTRUSION -#define EXTRUDE_MINTEMP 160 - -/** - * Prevent a single extrusion longer than EXTRUDE_MAXLENGTH. - * Note: For Bowden Extruders make this large enough to allow load/unload. - */ -#define PREVENT_LENGTHY_EXTRUDE -#define EXTRUDE_MAXLENGTH 500 +#if DISABLED(MachineCR10Orig) + #define PREVENT_COLD_EXTRUSION + #define EXTRUDE_MINTEMP 160 + /** + * Prevent a single extrusion longer than EXTRUDE_MAXLENGTH. + * Note: For Bowden Extruders make this large enough to allow load/unload. + */ + #define PREVENT_LENGTHY_EXTRUDE + #define EXTRUDE_MAXLENGTH 500 +#endif //=========================================================================== //======================== Thermal Runaway Protection ======================= //=========================================================================== @@ -983,7 +984,7 @@ // Uncomment one of these options to enable CoreXY, CoreXZ, or CoreYZ kinematics // either in the usual order or reversed -#if(ENABLED(MachineEnder4)) +#if ENABLED(MachineEnder4) #define COREXY #endif //#define COREXZ @@ -1051,7 +1052,7 @@ #define Y_MAX_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. #define Z_MAX_ENDSTOP_INVERTING true // set to true to invert the logic of the endstop. -#if (DISABLED(ABL_EZABL)&& DISABLED(ABL_BLTOUCH)) +#if NONE(ABL_EZABL, ABL_BLTOUCH) #define Z_MIN_ENDSTOP_INVERTING false // set to true to invert the logic of the endstop. #define Z_MIN_PROBE_ENDSTOP_INVERTING false // set to true to invert the logic of the probe. #else @@ -1295,7 +1296,9 @@ * * See https://github.com/synthetos/TinyG/wiki/Jerk-Controlled-Motion-Explained */ -#define S_CURVE_ACCELERATION +#if DISABLED(MachineCR10Orig) + #define S_CURVE_ACCELERATION +#endif //=========================================================================== //============================= Z Probe Options ============================= @@ -1352,7 +1355,7 @@ * A Fix-Mounted Probe either doesn't deploy or needs manual deployment. * (e.g., an inductive probe or a nozzle-based probe-switch.) */ -#if ENABLED(ABL_EZABL) || ENABLED(ABL_NCSW) +#if ANY(ABL_EZABL, ABL_NCSW) #define FIX_MOUNTED_PROBE #endif @@ -1388,7 +1391,9 @@ // A probe that is deployed and stowed with a solenoid pin (SOL1_PIN) #if ENABLED(ABL_BLTOUCH) - #define PROBING_FANS_OFF // Turn fans off when probing + #if DISABLED(MachineCR10Orig) + #define PROBING_FANS_OFF // Turn fans off when probing + #endif #if ENABLED(MachineEnder4) && DISABLED(SKR13) #define SOLENOID_PROBE PIN_15 @@ -1430,10 +1435,10 @@ * * Specify a Probe position as { X, Y, Z } */ -#if ENABLED(MachineCRX) && ENABLED(HotendStock) +#if ENABLED(MachineCRX, HotendStock) #if ENABLED(ABL_BLTOUCH) #define NOZZLE_TO_PROBE_OFFSET { -22, -45, 0 } - #elif ENABLED(ABL_EZABL) || ENABLED(ABL_NCSW) + #elif ANY(ABL_EZABL, ABL_NCSW) #define NOZZLE_TO_PROBE_OFFSET { -44, -10, 0 } #endif #elif ANY(MachineCR10SPro, MachineCR10Max) && ENABLED(HotendStock) @@ -1498,7 +1503,9 @@ * A total of 2 does fast/slow probes with a weighted average. * A total of 3 or more adds more slow probes, taking the average. */ -#define MULTIPLE_PROBING 2 +#if DISABLED(MachineCR10Orig) + #define MULTIPLE_PROBING 2 +#endif //#define EXTRA_PROBING 1 /** @@ -1527,7 +1534,7 @@ #define Z_PROBE_OFFSET_RANGE_MAX 20 // Enable the M48 repeatability test to test probe accuracy -#if (ANY(ABL_EZABL, ABL_BLTOUCH, ABL_NCSW) && DISABLED(MachineCR10Orig)) +#if ANY(ABL_EZABL, ABL_BLTOUCH, ABL_NCSW) && DISABLED(MachineCR10Orig) #define Z_MIN_PROBE_REPEATABILITY_TEST #endif @@ -1544,7 +1551,7 @@ * These options are most useful for the BLTouch probe, but may also improve * readings with inductive probes and piezo sensors. */ -#if ((ENABLED(ABL_EZABL) || ENABLED(ABL_NCSW)) && ENABLED(BED_AC)) +#if ((ENABLED(ABL_EZABL) || ENABLED(ABL_NCSW)) && ENABLED(BED_AC)) && DISABLED(MachineCR10Orig) #define PROBING_HEATERS_OFF // Turn heaters off when probing #endif #if ENABLED(PROBING_HEATERS_OFF) @@ -1782,10 +1789,10 @@ #define MAX_SOFTWARE_ENDSTOP_Y #define MAX_SOFTWARE_ENDSTOP_Z #endif -#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) -#if ENABLED(MIN_SOFTWARE_ENDSTOPS) || ENABLED(MAX_SOFTWARE_ENDSTOPS) - #define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD -#endif +#if(NONE(MachineCR10Orig, LowMemoryBoard)) + #if ENABLED(MIN_SOFTWARE_ENDSTOPS) || ENABLED(MAX_SOFTWARE_ENDSTOPS) + #define SOFT_ENDSTOPS_MENU_ITEM // Enable/Disable software endstops from the LCD + #endif #endif /** * Filament Runout Sensors @@ -1897,7 +1904,9 @@ // Gradually reduce leveling correction until a set height is reached, // at which point movement will be level to the machine's XY plane. // The height can be set with M420 Z - #define ENABLE_LEVELING_FADE_HEIGHT + #if DISABLED(MachineCR10Orig) + #define ENABLE_LEVELING_FADE_HEIGHT + #endif // For Cartesian machines, instead of dividing moves on mesh boundaries, // split up moves into short segments like a Delta. This follows the @@ -2004,7 +2013,7 @@ * Add a bed leveling sub-menu for ABL or MBL. * Include a guided procedure if manual probing is enabled. */ -#if DISABLED(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH) && (DISABLED(MachineCRX) || ENABLED(GraphicLCD)) +#if NONE(ABL_EZABL, ABL_NCSW, ABL_BLTOUCH, MachineCR10Orig) && (DISABLED(MachineCRX) || ENABLED(GraphicLCD)) #define LCD_BED_LEVELING #endif @@ -2013,7 +2022,7 @@ #define LCD_PROBE_Z_RANGE 8 // Z Range centered on Z_MIN_POS for LCD Z adjustment #endif -#if(DISABLED(MachineCR10Orig) && DISABLED(SolidBedMounts)) +#if NONE(MachineCR10Orig, SolidBedMounts) // Add a menu item to move between bed corners for manual bed adjustment #define LEVEL_BED_CORNERS #endif @@ -2154,13 +2163,13 @@ * M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.) */ #define EEPROM_SETTINGS // Persistent storage with M500 and M501 -#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) +#if NONE(MachineCR10Orig, LowMemoryBoard) #define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. #else #define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! #endif #if ENABLED(EEPROM_SETTINGS) - //#define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors. + #define EEPROM_AUTO_INIT // Init EEPROM automatically on any errors. #endif // @@ -2321,7 +2330,7 @@ * * View the current statistics with M78. */ -#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) +#if NONE(MachineCR10Orig, LowMemoryBoard) #define PRINTCOUNTER #endif //============================================================================= @@ -2461,8 +2470,8 @@ // // Add individual axis homing items (Home X, Home Y, and Home Z) to the LCD menu. // -#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) -#define INDIVIDUAL_AXIS_HOMING_MENU +#if NONE(MachineCR10Orig, LowMemoryBoard) + #define INDIVIDUAL_AXIS_HOMING_MENU #endif // // SPEAKER/BUZZER @@ -2470,6 +2479,7 @@ // If you have a speaker that can produce tones, enable it here. // By default Marlin assumes you have a buzzer with a fixed frequency. // + #define SPEAKER diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 69f7a9976b..81a8a60a42 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -140,7 +140,9 @@ #define THERMAL_PROTECTION_PERIOD 60 // Seconds #define THERMAL_PROTECTION_HYSTERESIS 10 // Degrees Celsius - #define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #if DISABLED(MachineCR10Orig) + #define ADAPTIVE_FAN_SLOWING // Slow part cooling fan if temperature drops + #endif #if BOTH(ADAPTIVE_FAN_SLOWING, PIDTEMP) #define NO_FAN_SLOWING_IN_PID_TUNING // Don't slow fan speed during M303 #endif @@ -228,16 +230,16 @@ * Also, if the temperature is set to a value below mintemp, it will not be changed by autotemp. * On an Ultimaker, some initial testing worked with M109 S215 B260 F1 in the start.gcode */ - #if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) -#define AUTOTEMP +#if NONE(MachineCR10Orig, LowMemoryBoard) + #define AUTOTEMP #endif #if ENABLED(AUTOTEMP) #define AUTOTEMP_OLDWEIGHT 0.98 #endif // Show extra position information in M114 - #if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) -#define M114_DETAIL +#if NONE(MachineCR10Orig, LowMemoryBoard) + #define M114_DETAIL #endif // Show Temperature ADC value // Enable for M105 to include ADC values read from temperature sensors. @@ -610,7 +612,9 @@ * This feature was designed for Delta's with very fast Z moves however higher speed cartesians may function * If the machine cannot raise the probe fast enough after a trigger, it may enter a fault state. */ - #define BLTOUCH_HS_MODE + #if NONE(MachineCR10Orig, LowMemoryBoard) + #define BLTOUCH_HS_MODE + #endif // Safety: Enable voltage mode settings in the LCD menu. //#define BLTOUCH_LCD_VOLTAGE_MENU @@ -671,7 +675,7 @@ #define DEFAULT_MINSEGMENTTIME 20000 // (ms) // If defined the movements slow down when the look ahead buffer is only half full -#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) +#if NONE(MachineCR10Orig, LowMemoryBoard) #define SLOWDOWN #endif // Frequency limit @@ -901,17 +905,17 @@ #endif // HAS_LCD_MENU // Scroll a longer status message into view -#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) -#define STATUS_MESSAGE_SCROLLING +#if NONE(MachineCR10Orig, LowMemoryBoard) + #define STATUS_MESSAGE_SCROLLING -// On the Info Screen, display XY with one decimal place when possible -#define LCD_DECIMAL_SMALL_XY + // On the Info Screen, display XY with one decimal place when possible + #define LCD_DECIMAL_SMALL_XY #endif // The timeout (in ms) to return to the status screen from sub-menus #define LCD_TIMEOUT_TO_STATUS 15000 // Add an 'M73' G-code to set the current percentage -#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) +#if NONE(MachineCR10Orig, LowMemoryBoard) #define LCD_SET_PROGRESS_MANUALLY #endif #if HAS_CHARACTER_LCD && HAS_PRINT_PROGRESS @@ -940,16 +944,14 @@ // Reverse SD sort to show "more recent" files first, according to the card's FAT. // Since the FAT gets out of order with usage, SDCARD_SORT_ALPHA is recommended. - #if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) - #define SDCARD_RATHERRECENTFIRST -#endif -#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) - #define SD_MENU_CONFIRM_START // Confirm the selected SD file before printing + #if NONE(MachineCR10Orig, LowMemoryBoard) + #define SDCARD_RATHERRECENTFIRST + #define SD_MENU_CONFIRM_START // Confirm the selected SD file before printing - //#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files + //#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files - #define EVENT_GCODE_SD_STOP "G28XY" // G-code to run on Stop Print (e.g., "G28XY" or "G27") -#endif + #define EVENT_GCODE_SD_STOP "G28XY" // G-code to run on Stop Print (e.g., "G28XY" or "G27") + #endif /** * Continue after Power-Loss (Creality3D) @@ -1010,13 +1012,12 @@ // Note: Only affects SCROLL_LONG_FILENAMES with SDSORT_CACHE_NAMES but not SDSORT_DYNAMIC_RAM. #endif - // This allows hosts to request long names for files and folders with M33 - #define LONG_FILENAME_HOST_SUPPORT - // Enable this option to scroll long filenames in the SD card menu - #if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) - #define SCROLL_LONG_FILENAMES -#endif + #if NONE(MachineCR10Orig, LowMemoryBoard) + // This allows hosts to request long names for files and folders with M33 + #define LONG_FILENAME_HOST_SUPPORT + #define SCROLL_LONG_FILENAMES + #endif // Leave the heaters on after Stop Print (not recommended!) //#define SD_ABORT_NO_COOLDOWN @@ -1038,7 +1039,9 @@ /** * Auto-report SdCard status with M27 S */ - #define AUTO_REPORT_SD_STATUS + #if NONE(MachineCR10Orig, LowMemoryBoard) + #define AUTO_REPORT_SD_STATUS + #endif /** * Support for USB thumb drives using an Arduino USB Host Shield or @@ -1136,9 +1139,8 @@ // A bigger font is available for edit items. Costs 3120 bytes of PROGMEM. // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese. -#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) //#define USE_BIG_EDIT_FONT -#endif + // A smaller font may be used on the Info Screen. Costs 2300 bytes of PROGMEM. // Western only. Not available for Cyrillic, Kana, Turkish, Greek, or Chinese. //#define USE_SMALL_INFOFONT @@ -1179,7 +1181,7 @@ //#define STATUS_COMBINE_HEATERS // Use combined heater images instead of separate ones //#define STATUS_HOTEND_NUMBERLESS // Use plain hotend icons instead of numbered ones (with 2+ hotends) #define STATUS_HOTEND_INVERTED // Show solid nozzle bitmaps when heating (Requires STATUS_HOTEND_ANIM) - #if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) + #if NONE(MachineCR10Orig, LowMemoryBoard) #define STATUS_HOTEND_ANIM // Use a second bitmap to indicate hotend heating #define STATUS_BED_ANIM // Use a second bitmap to indicate bed heating #endif @@ -1190,7 +1192,6 @@ //#define STATUS_HEAT_PERCENT // Show heating in a progress bar //#define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash) //#define BOOT_MARLIN_LOGO_ANIMATED // Animated Marlin logo. Costs ~‭3260 (or ~940) bytes of PROGMEM. - #define BOOT_MARLIN_LOGO_SMALL // Show a smaller Marlin logo on the Boot Screen (saving 399 bytes of flash) //#define GAMES_EASTER_EGG // Add extra blank lines above the "Games" sub-menu @@ -1432,7 +1433,7 @@ * Repeatedly attempt G29 leveling until it succeeds. * Stop after G29_MAX_RETRIES attempts. */ -#if ENABLED(ABL_BI) && DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard) +#if ENABLED(ABL_BI) && NONE(MachineCR10Orig, LowMemoryBoard) #define G29_RETRY_AND_RECOVER #endif #if ENABLED(G29_RETRY_AND_RECOVER) @@ -1541,8 +1542,8 @@ // The number of linear motions that can be in the plan at any give time. // THE BLOCK_BUFFER_SIZE NEEDS TO BE A POWER OF 2 (e.g. 8, 16, 32) because shifts and ors are used to do the ring-buffering. #if ENABLED(SDSUPPORT) - #if(ENABLED(MachineCR10Orig) || ENABLED(LowMemoryBoard)) - #define BLOCK_BUFFER_SIZE 4 // SD,LCD,Buttons take more memory, block buffer needs to be smaller + #if(ENABLED(MachineCR10Orig) || ENABLED(LowMemoryBoard)) + #define BLOCK_BUFFER_SIZE 4 // SD,LCD,Buttons take more memory, block buffer needs to be smaller #else #define BLOCK_BUFFER_SIZE 16 #endif @@ -1603,10 +1604,14 @@ // Therefore some clients abort after 30 seconds in a timeout. // Some other clients start sending commands while receiving a 'wait'. // This "wait" is only sent when the buffer is empty. 1 second is a good value here. -#define NO_TIMEOUTS 1000 // Milliseconds +#if NONE(MachineCR10Orig, LowMemoryBoard) + #define NO_TIMEOUTS 1000 // Milliseconds +#endif // Some clients will have this feature soon. This could make the NO_TIMEOUTS unnecessary. -#define ADVANCED_OK +#if NONE(MachineCR10Orig, LowMemoryBoard) + #define ADVANCED_OK +#endif // Printrun may have trouble receiving long strings all at once. // This option inserts short delays between lines of serial output. @@ -2468,13 +2473,13 @@ /** * Auto-report temperatures with M155 S */ -#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) +#if NONE(MachineCR10Orig, LowMemoryBoard) #define AUTO_REPORT_TEMPERATURES #endif /** * Include capabilities in M115 output */ -#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) +#if NONE(MachineCR10Orig, LowMemoryBoard) #define EXTENDED_CAPABILITIES_REPORT #endif /** @@ -2521,7 +2526,7 @@ /** * Spend 28 bytes of SRAM to optimize the GCode parser */ -#if(DISABLED(MachineCR10Orig) && DISABLED(LowMemoryBoard)) +#if NONE(MachineCR10Orig, LowMemoryBoard) #define FASTER_GCODE_PARSER #endif @@ -2563,7 +2568,7 @@ * User-defined menu items that execute custom GCode */ #if(ENABLED(ABL_UBL) || ENABLED(ABL_BI)) - #define CUSTOM_USER_MENUS + //#define CUSTOM_USER_MENUS #endif #if ENABLED(CUSTOM_USER_MENUS) @@ -2583,16 +2588,16 @@ #elif ENABLED(ABL_BI) #define USER_GCODE_1 "M190S" CommBedTmp "\nG28\nG29\nM400\nM104S215\nG28\nM109S215\nM420S1\nG1X100Y100F5000\nG1Z0\nM500\nM117 Set Z Offset" #endif + #if NONE(MachineCR10Orig, LowMemoryBoard) + #define USER_DESC_2 "PID Tune" + #define USER_GCODE_2 "M106S128\nM303C8S215E0U\nM500\nM117 PID Tune Done" - #define USER_DESC_2 "PID Tune" - #define USER_GCODE_2 "M106S128\nM303C8S215E0U\nM500\nM117 PID Tune Done" - - #define USER_DESC_3 "Prep for Z Adjust" - #define USER_GCODE_3 "M190S" CommBedTmp "\nM104S215\nG28\nG29L1\nG1 X100Y100F5000\nG1Z0" - - #define USER_DESC_4 "Store Settings" - #define USER_GCODE_4 "M500\nM117 Settings Stored" + #define USER_DESC_3 "Prep for Z Adjust" + #define USER_GCODE_3 "M190S" CommBedTmp "\nM104S215\nG28\nG29L1\nG1 X100Y100F5000\nG1Z0" + #define USER_DESC_4 "Store Settings" + #define USER_GCODE_4 "M500\nM117 Settings Stored" + #endif //#define USER_DESC_5 "Run Mesh Validation" //#define USER_GCODE_5 "G26" #endif @@ -2613,7 +2618,9 @@ */ #define HOST_ACTION_COMMANDS #if ENABLED(HOST_ACTION_COMMANDS) - #define HOST_PROMPT_SUPPORT + #if DISABLED(MachineCR10Orig) + #define HOST_PROMPT_SUPPORT + #endif #endif /**