diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 1d4523c6c..f177d6f1a 100644 --- a/Marlin/Configuration_adv.h +++ b/Marlin/Configuration_adv.h @@ -3801,97 +3801,95 @@ */ // Custom Menu: Main Menu -//#if DISABLED(TAZPro, TAZProXT) - #if defined(LULZBOT_UNIVERSAL_TOOLHEAD) - - #define CUSTOM_MENU_MAIN +#if defined(LULZBOT_UNIVERSAL_TOOLHEAD) + + #define CUSTOM_MENU_MAIN - #if ENABLED(CUSTOM_MENU_MAIN) - #define CUSTOM_MENU_MAIN_TITLE "Tool Heads" - //#define CUSTOM_MENU_MAIN_SCRIPT_DONE "M117 Tool Changed" - #define CUSTOM_MENU_MAIN_SCRIPT_AUDIBLE_FEEDBACK - #define CUSTOM_MENU_MAIN_SCRIPT_RETURN // Return to status screen after a script - #define CUSTOM_MENU_MAIN_ONLY_IDLE // Only show custom menu when the machine is idle - - #if ANY(TAZ6) - #define DEFAULT_PID "P28.79I1.91D108.51" - #else - #define DEFAULT_PID "P21.0I1.78D61.93" - #endif - - #if ANY(TAZ6, Workhorse) - #define E_CURRENT_Aero "875" - #define E_CURRENT_Std "750" - #define E_CURRENT_Moar "750" - #define E_CURRENT_BMG "875" - #define E_CURRENT_ARST "875" - #else - #define E_CURRENT_Aero "960" - #define E_CURRENT_BMG "960" - #endif - - #if ANY(Sidekick_289, Sidekick_747) - #define MAIN_MENU_ITEM_1_DESC "SK175|0.50mm|BRASS" - #define MAIN_MENU_ITEM_1_GCODE "M92E420\nM301P26.29I2.57D72.59\nM906E" E_CURRENT_Aero "\nM500\nM117 SK175|0.50mm|BRASS" - - #define MAIN_MENU_ITEM_2_DESC "SK285|0.50mm|BRASS" - #define MAIN_MENU_ITEM_2_GCODE "M92E420\nM301P26.90I2.41D75.19\nM906E" E_CURRENT_Aero "\nM500\nM117 SK285|0.50mm|BRASS" - #endif - #if DISABLED(TAZ6, Workhorse) - #define MAIN_MENU_ITEM_3_DESC "M175v2|0.50mm|CRB CU" - #define MAIN_MENU_ITEM_3_GCODE "M92E415\nM301P24.54I2.52D61.75\nM906E" E_CURRENT_BMG "\nM500\nM117 M175|0.50mm|CRB CU" - - #define MAIN_MENU_ITEM_4_DESC "SL|0.25mm|NKL-PL CU" - #define MAIN_MENU_ITEM_4_GCODE "M92E420\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 SL|0.25mm|NKL-PL CU" - - #define MAIN_MENU_ITEM_5_DESC "SE|0.50mm|NKL-PL CU" - #define MAIN_MENU_ITEM_5_GCODE "M92E420\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 SE|0.50mm|NKL-PL CU" - - #define MAIN_MENU_ITEM_6_DESC "HE|0.50mm|HRD STEEL" - #define MAIN_MENU_ITEM_6_GCODE "M92E420\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 HE|0.50mm|HRD STEEL" - - #define MAIN_MENU_ITEM_7_DESC "HS|0.80mm|HRD STEEL" - #define MAIN_MENU_ITEM_7_GCODE "M92E420\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 HS|0.80mm|HRD STEEL" - - #define MAIN_MENU_ITEM_8_DESC "HS+|1.20mm|HRD STEEL" - #define MAIN_MENU_ITEM_8_GCODE "M92E420\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 HS+|1.20mm|HRD STEEL" - - #define MAIN_MENU_ITEM_9_DESC "H175|0.50mm|NKL-PL CU" - #define MAIN_MENU_ITEM_9_GCODE "M92E409\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 HM|0.50mm|NKL-PL CU" - #else - #define MAIN_MENU_ITEM_3_DESC "M175|0.50mm|CRB CU" - #define MAIN_MENU_ITEM_3_GCODE "M92E415\nM301P24.54I2.52D61.75\nM907E" E_CURRENT_BMG "\nM500\nM117 M175|0.50mm|CRB CU" - - #define MAIN_MENU_ITEM_4_DESC "SL|0.25mm|NKL-PL CU" - #define MAIN_MENU_ITEM_4_GCODE "M92E420\nM301" DEFAULT_PID "\nM907E" E_CURRENT_Aero "\nM500\nM117 SL|0.25mm|NKL-PL CU" - - #define MAIN_MENU_ITEM_5_DESC "SE|0.50mm|NKL-PL CU" - #define MAIN_MENU_ITEM_5_GCODE "M92E420\nM301" DEFAULT_PID "\nM907E" E_CURRENT_Aero "\nM500\nM117 SE|0.50mm|NKL-PL CU" - - #define MAIN_MENU_ITEM_6_DESC "HE|0.50mm|HRD STEEL" - #define MAIN_MENU_ITEM_6_GCODE "M92E420\nM301" DEFAULT_PID "\nM907E" E_CURRENT_Aero "\nM500\nM117 HE|0.50mm|HRD STEEL" - - #define MAIN_MENU_ITEM_7_DESC "HS|0.80mm|HRD STEEL" - #define MAIN_MENU_ITEM_7_GCODE "M92E420\nM301" DEFAULT_PID "\nM907E" E_CURRENT_Aero "\nM500\nM117 HS|0.80mm|HRD STEEL" - - #define MAIN_MENU_ITEM_8_DESC "HS+|1.20mm|HRD STEEL" - #define MAIN_MENU_ITEM_8_GCODE "M92E420\nM301" DEFAULT_PID "\nM907E" E_CURRENT_Aero "\nM500\nM117 HS+|1.20mm|HRD STEEL" - - #define MAIN_MENU_ITEM_9_DESC "H175|0.50mm|NKL-PL CU" - #define MAIN_MENU_ITEM_9_GCODE "M92E409\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 HM|0.50mm|NKL-PL CU" - #endif - - #if defined(TAZ6) - #define MAIN_MENU_ITEM_1_DESC "Standard|0.5mm" - #define MAIN_MENU_ITEM_1_GCODE "M92E814\nM206X0Y5\nM301" DEFAULT_PID "\nM907E" E_CURRENT_Std "\nM500\nM117 Standard|0.5mm" - #endif + #if ENABLED(CUSTOM_MENU_MAIN) + #define CUSTOM_MENU_MAIN_TITLE "Tool Heads" + //#define CUSTOM_MENU_MAIN_SCRIPT_DONE "M117 Tool Changed" + #define CUSTOM_MENU_MAIN_SCRIPT_AUDIBLE_FEEDBACK + #define CUSTOM_MENU_MAIN_SCRIPT_RETURN // Return to status screen after a script + #define CUSTOM_MENU_MAIN_ONLY_IDLE // Only show custom menu when the machine is idle + #if ANY(TAZ6) + #define DEFAULT_PID "P28.79I1.91D108.51" + #else + #define DEFAULT_PID "P21.0I1.78D61.93" #endif + + #if ANY(TAZ6, Workhorse) + #define E_CURRENT_Aero "875" + #define E_CURRENT_Std "750" + #define E_CURRENT_Moar "750" + #define E_CURRENT_BMG "875" + #define E_CURRENT_ARST "875" + #else + #define E_CURRENT_Aero "960" + #define E_CURRENT_BMG "960" + #endif + + #if ANY(Sidekick_289, Sidekick_747) + #define MAIN_MENU_ITEM_1_DESC "SK175|0.50mm|BRASS" + #define MAIN_MENU_ITEM_1_GCODE "M92E420\nM301P26.29I2.57D72.59\nM906E" E_CURRENT_Aero "\nM500\nM117 SK175|0.50mm|BRASS" + + #define MAIN_MENU_ITEM_2_DESC "SK285|0.50mm|BRASS" + #define MAIN_MENU_ITEM_2_GCODE "M92E420\nM301P26.90I2.41D75.19\nM906E" E_CURRENT_Aero "\nM500\nM117 SK285|0.50mm|BRASS" + #endif + #if DISABLED(TAZ6, Workhorse) + #define MAIN_MENU_ITEM_3_DESC "M175v2|0.50mm|CRB CU" + #define MAIN_MENU_ITEM_3_GCODE "M92E415\nM301P24.54I2.52D61.75\nM906E" E_CURRENT_BMG "\nM500\nM117 M175v2|0.50mm|CRB CU" + + #define MAIN_MENU_ITEM_4_DESC "SL|0.25mm|NKL-PL CU" + #define MAIN_MENU_ITEM_4_GCODE "M92E420\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 SL|0.25mm|NKL-PL CU" + + #define MAIN_MENU_ITEM_5_DESC "SE|0.50mm|NKL-PL CU" + #define MAIN_MENU_ITEM_5_GCODE "M92E420\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 SE|0.50mm|NKL-PL CU" + + #define MAIN_MENU_ITEM_6_DESC "HE|0.50mm|HRD STEEL" + #define MAIN_MENU_ITEM_6_GCODE "M92E420\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 HE|0.50mm|HRD STEEL" + + #define MAIN_MENU_ITEM_7_DESC "HS|0.80mm|HRD STEEL" + #define MAIN_MENU_ITEM_7_GCODE "M92E420\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 HS|0.80mm|HRD STEEL" + + #define MAIN_MENU_ITEM_8_DESC "HS+|1.20mm|HRD STEEL" + #define MAIN_MENU_ITEM_8_GCODE "M92E420\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 HS+|1.20mm|HRD STEEL" + + #define MAIN_MENU_ITEM_9_DESC "H175|0.50mm|NKL-PL CU" + #define MAIN_MENU_ITEM_9_GCODE "M92E409\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 H175|0.50mm|NKL-PL CU" + #else + #define MAIN_MENU_ITEM_3_DESC "M175v2|0.50mm|CRB CU" + #define MAIN_MENU_ITEM_3_GCODE "M92E415\nM301P24.54I2.52D61.75\nM907E" E_CURRENT_BMG "\nM500\nM117 M175v2|0.50mm|CRB CU" + + #define MAIN_MENU_ITEM_4_DESC "SL|0.25mm|NKL-PL CU" + #define MAIN_MENU_ITEM_4_GCODE "M92E420\nM301" DEFAULT_PID "\nM907E" E_CURRENT_Aero "\nM500\nM117 SL|0.25mm|NKL-PL CU" + + #define MAIN_MENU_ITEM_5_DESC "SE|0.50mm|NKL-PL CU" + #define MAIN_MENU_ITEM_5_GCODE "M92E420\nM301" DEFAULT_PID "\nM907E" E_CURRENT_Aero "\nM500\nM117 SE|0.50mm|NKL-PL CU" + + #define MAIN_MENU_ITEM_6_DESC "HE|0.50mm|HRD STEEL" + #define MAIN_MENU_ITEM_6_GCODE "M92E420\nM301" DEFAULT_PID "\nM907E" E_CURRENT_Aero "\nM500\nM117 HE|0.50mm|HRD STEEL" + + #define MAIN_MENU_ITEM_7_DESC "HS|0.80mm|HRD STEEL" + #define MAIN_MENU_ITEM_7_GCODE "M92E420\nM301" DEFAULT_PID "\nM907E" E_CURRENT_Aero "\nM500\nM117 HS|0.80mm|HRD STEEL" + + #define MAIN_MENU_ITEM_8_DESC "HS+|1.20mm|HRD STEEL" + #define MAIN_MENU_ITEM_8_GCODE "M92E420\nM301" DEFAULT_PID "\nM907E" E_CURRENT_Aero "\nM500\nM117 HS+|1.20mm|HRD STEEL" + + #define MAIN_MENU_ITEM_9_DESC "H175|0.50mm|NKL-PL CU" + #define MAIN_MENU_ITEM_9_GCODE "M92E409\nM301" DEFAULT_PID "\nM906E" E_CURRENT_Aero "\nM500\nM117 H175|0.50mm|NKL-PL CU" + #endif + + #if defined(TAZ6) + #define MAIN_MENU_ITEM_1_DESC "Standard|0.5mm" + #define MAIN_MENU_ITEM_1_GCODE "M92E814\nM206X0Y5\nM301" DEFAULT_PID "\nM907E" E_CURRENT_Std "\nM500\nM117 Standard|0.5mm" + #endif + #endif -//#endif +#endif // Custom Menu: Configuration Menu -//#define CUSTOM_MENU_CONFIG +#define CUSTOM_MENU_CONFIG #if ENABLED(CUSTOM_MENU_CONFIG) //#define CUSTOM_MENU_CONFIG_TITLE "Custom Commands" #define CUSTOM_MENU_CONFIG_SCRIPT_DONE "M117 Wireless Script Done" diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp index b3290b947..3a926074f 100644 --- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp +++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp @@ -42,16 +42,16 @@ void CustomUserMenus::onRedraw(draw_mode_t what) { .cmd(CLEAR(true, true, true)); } - // #if HAS_USER_ITEM(16, 17, 18, 19, 20) - // #define _MORE_THAN_FIFTEEN 1 - // #else + //#if HAS_USER_ITEM(16, 17, 18, 19, 20) + // #define _MORE_THAN_FIFTEEN 1 + //#else #define _MORE_THAN_FIFTEEN 0 - // #endif - // #if _MORE_THAN_FIFTEEN || HAS_USER_ITEM(11, 12, 13, 14, 15) - // #define _MORE_THAN_TEN 1 - // #else + //#endif + //#if _MORE_THAN_FIFTEEN || HAS_USER_ITEM(11, 12, 13, 14, 15) + // #define _MORE_THAN_TEN 1 + //#else #define _MORE_THAN_TEN 0 - // #endif + //#endif #if ENABLED(TOUCH_UI_PORTRAIT) #define GRID_ROWS 11 @@ -60,10 +60,10 @@ void CustomUserMenus::onRedraw(draw_mode_t what) { #define BACK_POS BTN_POS(1,11), BTN_SIZE(1,1) #else // #if _MORE_THAN_TEN || HAS_USER_ITEM(6, 7, 8, 9, 10) - // #define _MORE_THAN_FIVE 1 + #define _MORE_THAN_FIVE 1 // #else - #define _MORE_THAN_FIVE 0 - // #endif + // #define _MORE_THAN_FIVE 0 + //#endif #define GRID_ROWS 6 #define GRID_COLS (1 + _MORE_THAN_FIVE + _MORE_THAN_TEN + _MORE_THAN_FIFTEEN) #define USER_ITEM_POS(N) BTN_POS((1+((N-1)/5)), ((N-1) % 5 + 1)), BTN_SIZE(1,1) @@ -74,26 +74,33 @@ void CustomUserMenus::onRedraw(draw_mode_t what) { CommandProcessor cmd; cmd.colors(normal_btn) .font(Theme::font_medium) - #if HAS_USER_ITEM(1) - _USER_ITEM(1) + #if defined(MAIN_MENU_ITEM_3_DESC) + //_USER_ITEM(1) + .tag(_ITEM_TAG(11)).button(USER_ITEM_POS(1), MAIN_MENU_ITEM_3_DESC) #endif - #if HAS_USER_ITEM(2) - _USER_ITEM(2) + #if defined(MAIN_MENU_ITEM_4_DESC) + //_USER_ITEM(2) + .tag(_ITEM_TAG(12)).button(USER_ITEM_POS(2), MAIN_MENU_ITEM_4_DESC) #endif - #if HAS_USER_ITEM(3) - _USER_ITEM(3) + #if defined(MAIN_MENU_ITEM_5_DESC) + //_USER_ITEM(3) + .tag(_ITEM_TAG(13)).button(USER_ITEM_POS(3), MAIN_MENU_ITEM_5_DESC) #endif - #if HAS_USER_ITEM(4) - _USER_ITEM(4) + #if defined(MAIN_MENU_ITEM_6_DESC) + //_USER_ITEM(4) + .tag(_ITEM_TAG(14)).button(USER_ITEM_POS(4), MAIN_MENU_ITEM_6_DESC) #endif - #if HAS_USER_ITEM(5) - _USER_ITEM(5) + #if defined(MAIN_MENU_ITEM_7_DESC) + //_USER_ITEM(5) + .tag(_ITEM_TAG(15)).button(USER_ITEM_POS(5), MAIN_MENU_ITEM_7_DESC) #endif - #if HAS_USER_ITEM(6) - _USER_ITEM(6) + #if defined(MAIN_MENU_ITEM_8_DESC) + //_USER_ITEM(6) + .tag(_ITEM_TAG(16)).button(USER_ITEM_POS(6), MAIN_MENU_ITEM_8_DESC) #endif - #if HAS_USER_ITEM(7) - _USER_ITEM(7) + #if defined(MAIN_MENU_ITEM_9_DESC) + //_USER_ITEM(7) + .tag(_ITEM_TAG(17)).button(USER_ITEM_POS(7), MAIN_MENU_ITEM_9_DESC) #endif #if HAS_USER_ITEM(8) _USER_ITEM(8) @@ -141,26 +148,33 @@ void CustomUserMenus::onRedraw(draw_mode_t what) { bool CustomUserMenus::onTouchEnd(uint8_t tag) { switch (tag) { - #if HAS_USER_ITEM(1) - _USER_ACTION(1) + #if defined(MAIN_MENU_ITEM_3_DESC) + //_USER_ACTION(1) + case _ITEM_TAG(11): injectCommands_P(PSTR(MAIN_MENU_ITEM_3_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; #endif - #if HAS_USER_ITEM(2) - _USER_ACTION(2) + #if defined(MAIN_MENU_ITEM_4_DESC) + //_USER_ACTION(2) + case _ITEM_TAG(12): injectCommands_P(PSTR(MAIN_MENU_ITEM_4_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; #endif - #if HAS_USER_ITEM(3) - _USER_ACTION(3) + #if defined(MAIN_MENU_ITEM_5_DESC) + //_USER_ACTION(3) + case _ITEM_TAG(13): injectCommands_P(PSTR(MAIN_MENU_ITEM_5_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; #endif - #if HAS_USER_ITEM(4) - _USER_ACTION(4) + #if defined(MAIN_MENU_ITEM_6_DESC) + //_USER_ACTION(4) + case _ITEM_TAG(14): injectCommands_P(PSTR(MAIN_MENU_ITEM_6_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; #endif - #if HAS_USER_ITEM(5) - _USER_ACTION(5) + #if defined(MAIN_MENU_ITEM_7_DESC) + //_USER_ACTION(5) + case _ITEM_TAG(15): injectCommands_P(PSTR(MAIN_MENU_ITEM_7_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; #endif - #if HAS_USER_ITEM(6) - _USER_ACTION(6) + #if defined(MAIN_MENU_ITEM_8_DESC) + //_USER_ACTION(6) + case _ITEM_TAG(16): injectCommands_P(PSTR(MAIN_MENU_ITEM_8_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; #endif - #if HAS_USER_ITEM(7) - _USER_ACTION(7) + #if defined(MAIN_MENU_ITEM_9_DESC) + //_USER_ACTION(7) + case _ITEM_TAG(17): injectCommands_P(PSTR(MAIN_MENU_ITEM_9_GCODE)); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break; #endif #if HAS_USER_ITEM(8) _USER_ACTION(8) diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp index 93f9c4c22..b41699a8d 100644 --- a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp +++ b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp @@ -84,12 +84,14 @@ void LevelingMenu::onRedraw(draw_mode_t what) { .enabled(EITHER(Z_STEPPER_AUTO_ALIGN,MECHANICAL_GANTRY_CALIBRATION)) .tag(2).button(LEVEL_AXIS_POS, GET_TEXT_F(MSG_LEVEL_X_AXIS)) .tag(3).button(PROBE_BED_POS, GET_TEXT_F(MSG_PROBE_BED)) + #if DISABLED (AUTO_BED_LEVELING_BILINEAR) .enabled(ENABLED(HAS_MESH)) .tag(4).button(SHOW_MESH_POS, GET_TEXT_F(MSG_SHOW_MESH)) .enabled(ENABLED(HAS_MESH)) .tag(5).button(EDIT_MESH_POS, GET_TEXT_F(MSG_EDIT_MESH)) .enabled(ENABLED(G26_MESH_VALIDATION)) .tag(6).button(TEST_MESH_POS, GET_TEXT_F(MSG_PRINT_TEST)) + #endif #if ENABLED(BLTOUCH) .tag(7).button(BLTOUCH_RESET_POS, GET_TEXT_F(MSG_BLTOUCH_RESET)) .tag(8).button(BLTOUCH_TEST_POS, GET_TEXT_F(MSG_BLTOUCH_SELFTEST)) diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h index 9a3f9b6e9..f5ac8556d 100644 --- a/Marlin/src/lcd/language/language_en.h +++ b/Marlin/src/lcd/language/language_en.h @@ -152,7 +152,7 @@ namespace Language_en { PROGMEM Language_Str MSG_MESH_X = _UxGT("Index X"); PROGMEM Language_Str MSG_MESH_Y = _UxGT("Index Y"); PROGMEM Language_Str MSG_MESH_EDIT_Z = _UxGT("Z Value"); - PROGMEM Language_Str MSG_CUSTOM_COMMANDS = _UxGT("Custom Commands"); + PROGMEM Language_Str MSG_CUSTOM_COMMANDS = _UxGT("Tool Heads"); PROGMEM Language_Str MSG_M48_TEST = _UxGT("M48 Probe Test"); PROGMEM Language_Str MSG_M48_POINT = _UxGT("M48 Point"); PROGMEM Language_Str MSG_M48_OUT_OF_BOUNDS = _UxGT("Probe out of bounds");