bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Main / Config Custom Submenus (#18177)

Browse Source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
borland1
2021-03-23 06:21:11 -07:00
committed by GitHub
parent dd92c8e927
commit df1ef496d1
36 changed files with 440 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/custom_user_menus.cpp
View File

@ -30,8 +30,8 @@ using namespace ExtUI;
using namespace Theme;
#define _ITEM_TAG(N) (10+N)
#define _USER_DESC(N) USER_DESC_##N
#define _USER_GCODE(N) USER_GCODE_##N
#define _USER_DESC(N) MAIN_MENU_ITEM_##N##_DESC
#define _USER_GCODE(N) MAIN_MENU_ITEM_##N##_GCODE
#define _USER_ITEM(N) .tag(_ITEM_TAG(N)).button(USER_ITEM_POS(N), _USER_DESC(N))
#define _USER_ACTION(N) case _ITEM_TAG(N): injectCommands_P(PSTR(_USER_GCODE(N))); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break;

14
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/main_menu.cpp
View File

@ -41,9 +41,9 @@ void MainMenu::onRedraw(draw_mode_t what) {
#define GRID_COLS 2
#define ABOUT_PRINTER_POS BTN_POS(1,1), BTN_SIZE(2,1)
#define ADVANCED_SETTINGS_POS BTN_POS(1,2), BTN_SIZE(2,1)
#if ENABLED(CUSTOM_USER_MENUS)
#if ENABLED(CUSTOM_MENU_MAIN)
#define FILAMENTCHANGE_POS BTN_POS(1,3), BTN_SIZE(1,1)
#define CUSTOM_USER_MENUS_POS BTN_POS(2,3), BTN_SIZE(1,1)
#define CUSTOM_MENU_POS BTN_POS(2,3), BTN_SIZE(1,1)
#else
#define FILAMENTCHANGE_POS BTN_POS(1,3), BTN_SIZE(2,1)
#endif
@ -63,10 +63,10 @@ void MainMenu::onRedraw(draw_mode_t what) {
#define CLEAN_NOZZLE_POS BTN_POS(4,2), BTN_SIZE(3,1)
#define MOVE_AXIS_POS BTN_POS(1,3), BTN_SIZE(3,1)
#define DISABLE_STEPPERS_POS BTN_POS(4,3), BTN_SIZE(3,1)
#if ENABLED(CUSTOM_USER_MENUS)
#if ENABLED(CUSTOM_MENU_MAIN)
#define TEMPERATURE_POS BTN_POS(1,4), BTN_SIZE(2,1)
#define FILAMENTCHANGE_POS BTN_POS(3,4), BTN_SIZE(2,1)
#define CUSTOM_USER_MENUS_POS BTN_POS(5,4), BTN_SIZE(2,1)
#define CUSTOM_MENU_POS BTN_POS(5,4), BTN_SIZE(2,1)
#else
#define TEMPERATURE_POS BTN_POS(1,4), BTN_SIZE(3,1)
#define FILAMENTCHANGE_POS BTN_POS(4,4), BTN_SIZE(3,1)
@ -91,8 +91,8 @@ void MainMenu::onRedraw(draw_mode_t what) {
.enabled(TERN_(HAS_LEVELING, 1))
.tag( 9).button(LEVELING_POS, GET_TEXT_F(MSG_LEVELING))
.tag(10).button(ABOUT_PRINTER_POS, GET_TEXT_F(MSG_INFO_MENU))
#if ENABLED(CUSTOM_USER_MENUS)
.tag(11).button(CUSTOM_USER_MENUS_POS, GET_TEXT_F(MSG_USER_MENU))
#if ENABLED(CUSTOM_MENU_MAIN)
.tag(11).button(CUSTOM_MENU_POS, GET_TEXT_F(MSG_CUSTOM_COMMANDS))
#endif
.colors(action_btn)
.tag(1).button(BACK_POS, GET_TEXT_F(MSG_BACK));
@ -117,7 +117,7 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
case 9: GOTO_SCREEN(LevelingMenu); break;
#endif
case 10: GOTO_SCREEN(AboutScreen); break;
#if ENABLED(CUSTOM_USER_MENUS)
#if ENABLED(CUSTOM_MENU_MAIN)
case 11: GOTO_SCREEN(CustomUserMenus); break;
#endif

8
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
View File

@ -22,8 +22,6 @@
#pragma once
#if ENABLED(TOUCH_UI_FTDI_EVE)
#include "../ftdi_eve_lib/ftdi_eve_lib.h"
#include "../language/language.h"
#include "../theme/theme.h"
@ -107,7 +105,7 @@ enum {
#if ENABLED(SDSUPPORT)
FILES_SCREEN_CACHE,
#endif
#if ENABLED(CUSTOM_USER_MENUS)
#if ENABLED(CUSTOM_MENU_MAIN)
CUSTOM_USER_MENUS_SCREEN_CACHE,
#endif
CHANGE_FILAMENT_SCREEN_CACHE,
@ -248,7 +246,7 @@ enum {
#include "files_screen.h"
#endif
#if ENABLED(CUSTOM_USER_MENUS)
#if ENABLED(CUSTOM_MENU_MAIN)
#include "custom_user_menus.h"
#endif
@ -262,5 +260,3 @@ enum {
#if NUM_LANGUAGES > 1
#include "language_menu.h"
#endif
#endif // TOUCH_UI_FTDI_EVE

12
Marlin/src/lcd/extui/lib/mks_ui/tft_Language_en.h
View File

@ -728,9 +728,9 @@
#define EEPROM_READ_TIPS_EN "Read settings from EEPROM?"
#define EEPROM_REVERT_TIPS_EN "Revert settings to factory defaults?"
#define MORE_CUSTOM1_TEXT_EN USER_DESC_1
#define MORE_CUSTOM2_TEXT_EN USER_DESC_2
#define MORE_CUSTOM3_TEXT_EN USER_DESC_3
#define MORE_CUSTOM4_TEXT_EN USER_DESC_4
#define MORE_CUSTOM5_TEXT_EN USER_DESC_5
#define MORE_CUSTOM6_TEXT_EN USER_DESC_6
#define MORE_CUSTOM1_TEXT_EN MAIN_MENU_ITEM_1_DESC
#define MORE_CUSTOM2_TEXT_EN MAIN_MENU_ITEM_2_DESC
#define MORE_CUSTOM3_TEXT_EN MAIN_MENU_ITEM_3_DESC
#define MORE_CUSTOM4_TEXT_EN MAIN_MENU_ITEM_4_DESC
#define MORE_CUSTOM5_TEXT_EN MAIN_MENU_ITEM_5_DESC
#define MORE_CUSTOM6_TEXT_EN MAIN_MENU_ITEM_6_DESC

12
Marlin/src/lcd/extui/lib/mks_ui/tft_Language_fr.h
View File

@ -260,9 +260,9 @@
#define EEPROM_READ_TIPS_FR "Lire les paramètres de l'EEPROM?"
#define EEPROM_REVERT_TIPS_FR "Rétablir les paramètres par défaut d'usine?"
#define MORE_CUSTOM1_TEXT_FR USER_DESC_1
#define MORE_CUSTOM2_TEXT_FR USER_DESC_2
#define MORE_CUSTOM3_TEXT_FR USER_DESC_3
#define MORE_CUSTOM4_TEXT_FR USER_DESC_4
#define MORE_CUSTOM5_TEXT_FR USER_DESC_5
#define MORE_CUSTOM6_TEXT_FR USER_DESC_6
#define MORE_CUSTOM1_TEXT_FR MAIN_MENU_ITEM_1_DESC
#define MORE_CUSTOM2_TEXT_FR MAIN_MENU_ITEM_2_DESC
#define MORE_CUSTOM3_TEXT_FR MAIN_MENU_ITEM_3_DESC
#define MORE_CUSTOM4_TEXT_FR MAIN_MENU_ITEM_4_DESC
#define MORE_CUSTOM5_TEXT_FR MAIN_MENU_ITEM_5_DESC
#define MORE_CUSTOM6_TEXT_FR MAIN_MENU_ITEM_6_DESC

12
Marlin/src/lcd/extui/lib/mks_ui/tft_Language_it.h
View File

@ -257,9 +257,9 @@
#define EEPROM_READ_TIPS_IT "Leggi le impostazioni dalla EEPROM?"
#define EEPROM_REVERT_TIPS_IT "Ripristinare le impostazioni predefinite?"
#define MORE_CUSTOM1_TEXT_IT USER_DESC_1
#define MORE_CUSTOM2_TEXT_IT USER_DESC_2
#define MORE_CUSTOM3_TEXT_IT USER_DESC_3
#define MORE_CUSTOM4_TEXT_IT USER_DESC_4
#define MORE_CUSTOM5_TEXT_IT USER_DESC_5
#define MORE_CUSTOM6_TEXT_IT USER_DESC_6
#define MORE_CUSTOM1_TEXT_IT MAIN_MENU_ITEM_1_DESC
#define MORE_CUSTOM2_TEXT_IT MAIN_MENU_ITEM_2_DESC
#define MORE_CUSTOM3_TEXT_IT MAIN_MENU_ITEM_3_DESC
#define MORE_CUSTOM4_TEXT_IT MAIN_MENU_ITEM_4_DESC
#define MORE_CUSTOM5_TEXT_IT MAIN_MENU_ITEM_5_DESC
#define MORE_CUSTOM6_TEXT_IT MAIN_MENU_ITEM_6_DESC

12
Marlin/src/lcd/extui/lib/mks_ui/tft_Language_ru.h
View File

@ -255,12 +255,12 @@
#define EEPROM_SETTINGS_READ_RU "Чтение настроек из EEPROM"
#define EEPROM_SETTINGS_REVERT_RU "Bосстановить заводские настройки по умолчанию"
#define MORE_CUSTOM1_TEXT_RU USER_DESC_1
#define MORE_CUSTOM2_TEXT_RU USER_DESC_2
#define MORE_CUSTOM3_TEXT_RU USER_DESC_3
#define MORE_CUSTOM4_TEXT_RU USER_DESC_4
#define MORE_CUSTOM5_TEXT_RU USER_DESC_5
#define MORE_CUSTOM6_TEXT_RU USER_DESC_6
#define MORE_CUSTOM1_TEXT_RU MAIN_MENU_ITEM_1_DESC
#define MORE_CUSTOM2_TEXT_RU MAIN_MENU_ITEM_2_DESC
#define MORE_CUSTOM3_TEXT_RU MAIN_MENU_ITEM_3_DESC
#define MORE_CUSTOM4_TEXT_RU MAIN_MENU_ITEM_4_DESC
#define MORE_CUSTOM5_TEXT_RU MAIN_MENU_ITEM_5_DESC
#define MORE_CUSTOM6_TEXT_RU MAIN_MENU_ITEM_6_DESC
#define EEPROM_STORE_TIPS_RU "Cохранить настройки в EEPROM?"
#define EEPROM_READ_TIPS_RU "читать настройки из EEPROM?"

12
Marlin/src/lcd/extui/lib/mks_ui/tft_Language_s_cn.h
View File

@ -495,9 +495,9 @@
#define EEPROM_READ_TIPS_CN "是否使用EEPROM参数?"
#define EEPROM_REVERT_TIPS_CN "是否恢复默认参数?"
#define MORE_CUSTOM1_TEXT_CN USER_DESC_1
#define MORE_CUSTOM2_TEXT_CN USER_DESC_2
#define MORE_CUSTOM3_TEXT_CN USER_DESC_3
#define MORE_CUSTOM4_TEXT_CN USER_DESC_4
#define MORE_CUSTOM5_TEXT_CN USER_DESC_5
#define MORE_CUSTOM6_TEXT_CN USER_DESC_6
#define MORE_CUSTOM1_TEXT_CN MAIN_MENU_ITEM_1_DESC
#define MORE_CUSTOM2_TEXT_CN MAIN_MENU_ITEM_2_DESC
#define MORE_CUSTOM3_TEXT_CN MAIN_MENU_ITEM_3_DESC
#define MORE_CUSTOM4_TEXT_CN MAIN_MENU_ITEM_4_DESC
#define MORE_CUSTOM5_TEXT_CN MAIN_MENU_ITEM_5_DESC
#define MORE_CUSTOM6_TEXT_CN MAIN_MENU_ITEM_6_DESC

12
Marlin/src/lcd/extui/lib/mks_ui/tft_Language_sp.h
View File

@ -266,9 +266,9 @@
#define EEPROM_READ_TIPS_SP "Leer la configuración de EEPROM?"
#define EEPROM_REVERT_TIPS_SP "Revert settings to factory defaults?"
#define MORE_CUSTOM1_TEXT_SP USER_DESC_1
#define MORE_CUSTOM2_TEXT_SP USER_DESC_2
#define MORE_CUSTOM3_TEXT_SP USER_DESC_3
#define MORE_CUSTOM4_TEXT_SP USER_DESC_4
#define MORE_CUSTOM5_TEXT_SP USER_DESC_5
#define MORE_CUSTOM6_TEXT_SP USER_DESC_6
#define MORE_CUSTOM1_TEXT_SP MAIN_MENU_ITEM_1_DESC
#define MORE_CUSTOM2_TEXT_SP MAIN_MENU_ITEM_2_DESC
#define MORE_CUSTOM3_TEXT_SP MAIN_MENU_ITEM_3_DESC
#define MORE_CUSTOM4_TEXT_SP MAIN_MENU_ITEM_4_DESC
#define MORE_CUSTOM5_TEXT_SP MAIN_MENU_ITEM_5_DESC
#define MORE_CUSTOM6_TEXT_SP MAIN_MENU_ITEM_6_DESC

12
Marlin/src/lcd/extui/lib/mks_ui/tft_Language_t_cn.h
View File

@ -493,9 +493,9 @@
#define EEPROM_READ_TIPS_T_CN "是否使用EEPROM參數?"
#define EEPROM_REVERT_TIPS_T_CN "是否恢復默認參數?"
#define MORE_CUSTOM1_TEXT_T_CN USER_DESC_1
#define MORE_CUSTOM2_TEXT_T_CN USER_DESC_2
#define MORE_CUSTOM3_TEXT_T_CN USER_DESC_3
#define MORE_CUSTOM4_TEXT_T_CN USER_DESC_4
#define MORE_CUSTOM5_TEXT_T_CN USER_DESC_5
#define MORE_CUSTOM6_TEXT_T_CN USER_DESC_6
#define MORE_CUSTOM1_TEXT_T_CN MAIN_MENU_ITEM_1_DESC
#define MORE_CUSTOM2_TEXT_T_CN MAIN_MENU_ITEM_2_DESC
#define MORE_CUSTOM3_TEXT_T_CN MAIN_MENU_ITEM_3_DESC
#define MORE_CUSTOM4_TEXT_T_CN MAIN_MENU_ITEM_4_DESC
#define MORE_CUSTOM5_TEXT_T_CN MAIN_MENU_ITEM_5_DESC
#define MORE_CUSTOM6_TEXT_T_CN MAIN_MENU_ITEM_6_DESC