Merge remote-tracking branch 'upstream/import-2.0.x' into import-2.0.x

This commit is contained in:
Scott Lahteine 2020-04-22 14:48:31 -05:00
commit e80bdbc1a3
4 changed files with 5536 additions and 7 deletions

View file

@ -2961,15 +2961,27 @@
/**
* 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_DESC_1 "Level Gantry"
#define USER_GCODE_1 "M117 " USER_DESC_1 "\nG28\nG0 Z" STRINGIFY(Z_MAX_POS) "\nM211 S0\nG28 R10 F240\nM211 S1\nG28 Z\nM0 Gantry Leveled"
#define USER_DESC_1 "Home & UBL Info"
#define USER_GCODE_1 "G28\nG29 W"
#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_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_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
#define USER_DESC_5 "Home & Info"
#define USER_GCODE_5 "G28\nM503"
#endif
/**

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -323,12 +323,12 @@
//#define PSU_NAME "Power Supply"
#if ENABLED(PSU_CONTROL)
#define PSU_ACTIVE_HIGH true // Set 'false' for ATX, 'true' for X-Box
#define PSU_ACTIVE_HIGH true // Set 'false' for ATX, 'true' for X-Box
//#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
#define PSU_POWERUP_DELAY 100 // (ms) Delay for the PSU to warm up to full power
#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
#define AUTO_POWER_CONTROL // Enable automatic control of the PS_ON pin
#define AUTO_POWER_CONTROL // Enable automatic control of the PS_ON pin
#if ENABLED(AUTO_POWER_CONTROL)
#define AUTO_POWER_FANS // Turn on PSU if fans need power
#define AUTO_POWER_E_FANS