From b86a92a7d6c7ee096d32dca562f0eaf4c46d714d Mon Sep 17 00:00:00 2001 From: leptun Date: Fri, 30 Aug 2019 07:59:58 +0300 Subject: [PATCH] Toggle Mode (stepper power) --- Firmware/messages.c | 11 ++++++----- Firmware/messages.h | 11 ++++++----- Firmware/ultralcd.cpp | 24 ++++++++++++------------ lang/lang_en.txt | 23 +++++++++++++---------- lang/lang_en_cz.txt | 34 +++++++++++++++++++--------------- lang/lang_en_de.txt | 34 +++++++++++++++++++--------------- lang/lang_en_es.txt | 34 +++++++++++++++++++--------------- lang/lang_en_fr.txt | 32 ++++++++++++++++++-------------- lang/lang_en_it.txt | 34 +++++++++++++++++++--------------- lang/lang_en_pl.txt | 34 +++++++++++++++++++--------------- 10 files changed, 150 insertions(+), 121 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 085cf2e9e..111ec0b44 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -9,7 +9,6 @@ //internationalized messages const char MSG_AUTO_HOME[] PROGMEM_I1 = ISTR("Auto home"); //// -const char MSG_AUTO_MODE_ON[] PROGMEM_I1 = ISTR("Mode [auto power]"); //// const char MSG_BABYSTEP_Z[] PROGMEM_I1 = ISTR("Live adjust Z"); //// c=18 const char MSG_BABYSTEP_Z_NOT_SET[] PROGMEM_I1 = ISTR("Distance between tip of the nozzle and the bed surface has not been set yet. Please follow the manual, chapter First steps, section First layer calibration."); ////c=20 r=12 const char MSG_BED[] PROGMEM_I1 = ISTR("Bed"); //// @@ -82,10 +81,12 @@ const char MSG_SELFTEST_FILAMENT_SENSOR[] PROGMEM_I1 = ISTR("Filament sensor"); const char MSG_SELFTEST_WIRINGERROR[] PROGMEM_I1 = ISTR("Wiring error"); //// const char MSG_SETTINGS[] PROGMEM_I1 = ISTR("Settings"); //// const char MSG_HW_SETUP[] PROGMEM_I1 = ISTR("HW Setup"); //// -const char MSG_SILENT_MODE_OFF[] PROGMEM_I1 = ISTR("Mode [high power]"); //// -const char MSG_SILENT_MODE_ON[] PROGMEM_I1 = ISTR("Mode [silent]"); //// -const char MSG_STEALTH_MODE_OFF[] PROGMEM_I1 = ISTR("Mode [Normal]"); //// -const char MSG_STEALTH_MODE_ON[] PROGMEM_I1 = ISTR("Mode [Stealth]"); //// +const char MSG_MODE[] PROGMEM_I1 = ISTR("Mode"); //// +const char MSG_HIGH_POWER[] PROGMEM_I1 = ISTR("High power"); //// +const char MSG_AUTO_POWER[] PROGMEM_I1 = ISTR("Auto power"); //// +const char MSG_SILENT[] PROGMEM_I1 = ISTR("Silent"); //// +const char MSG_NORMAL[] PROGMEM_I1 = ISTR("Normal"); //// +const char MSG_STEALTH[] PROGMEM_I1 = ISTR("Stealth"); //// const char MSG_STEEL_SHEET_CHECK[] PROGMEM_I1 = ISTR("Is steel sheet on heatbed?"); ////c=20 r=2 const char MSG_STOP_PRINT[] PROGMEM_I1 = ISTR("Stop print"); //// const char MSG_STOPPED[] PROGMEM_I1 = ISTR("STOPPED. "); //// diff --git a/Firmware/messages.h b/Firmware/messages.h index 334d21162..b11517177 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -10,7 +10,6 @@ extern "C" { // LCD Menu Messages //internationalized messages extern const char MSG_AUTO_HOME[]; -extern const char MSG_AUTO_MODE_ON[]; extern const char MSG_BABYSTEP_Z[]; extern const char MSG_BABYSTEP_Z_NOT_SET[]; extern const char MSG_BED[]; @@ -82,10 +81,12 @@ extern const char MSG_SELFTEST_FILAMENT_SENSOR[]; extern const char MSG_SELFTEST_WIRINGERROR[]; extern const char MSG_SETTINGS[]; extern const char MSG_HW_SETUP[]; -extern const char MSG_SILENT_MODE_OFF[]; -extern const char MSG_SILENT_MODE_ON[]; -extern const char MSG_STEALTH_MODE_OFF[]; -extern const char MSG_STEALTH_MODE_ON[]; +extern const char MSG_MODE[]; +extern const char MSG_HIGH_POWER[]; +extern const char MSG_AUTO_POWER[]; +extern const char MSG_SILENT[]; +extern const char MSG_NORMAL[]; +extern const char MSG_STEALTH[]; extern const char MSG_STEEL_SHEET_CHECK[]; extern const char MSG_STOP_PRINT[]; extern const char MSG_STOPPED[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index d0f0da91f..f690ea288 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5172,9 +5172,9 @@ do\ {\ if (SilentModeMenu == SILENT_MODE_NORMAL)\ {\ - MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_OFF), lcd_silent_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_NORMAL), lcd_silent_mode_set);\ }\ - else MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_ON), lcd_silent_mode_set);\ + else MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_STEALTH), lcd_silent_mode_set);\ if (SilentModeMenu == SILENT_MODE_NORMAL)\ {\ if (lcd_crash_detect_enabled()) MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_ON), crash_mode_switch);\ @@ -5194,16 +5194,16 @@ do\ switch (SilentModeMenu)\ {\ case SILENT_MODE_POWER:\ - MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_OFF), lcd_silent_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set);\ break;\ case SILENT_MODE_SILENT:\ - MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_ON), lcd_silent_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_SILENT), lcd_silent_mode_set);\ break;\ case SILENT_MODE_AUTO:\ - MENU_ITEM_FUNCTION_P(_T(MSG_AUTO_MODE_ON), lcd_silent_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_AUTO_POWER), lcd_silent_mode_set);\ break;\ default:\ - MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_OFF), lcd_silent_mode_set);\ + MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set);\ break; /* (probably) not needed*/\ }\ }\ @@ -6887,8 +6887,8 @@ static void lcd_tune_menu() #ifdef TMC2130 if(!farm_mode) { - if (SilentModeMenu == SILENT_MODE_NORMAL) MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_OFF), lcd_silent_mode_set); - else MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_ON), lcd_silent_mode_set); + if (SilentModeMenu == SILENT_MODE_NORMAL) MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_NORMAL), lcd_silent_mode_set); + else MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_STEALTH), lcd_silent_mode_set); if (SilentModeMenu == SILENT_MODE_NORMAL) { @@ -6900,10 +6900,10 @@ static void lcd_tune_menu() #else //TMC2130 if (!farm_mode) { //dont show in menu if we are in farm mode switch (SilentModeMenu) { - case SILENT_MODE_POWER: MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_OFF), lcd_silent_mode_set); break; - case SILENT_MODE_SILENT: MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_ON), lcd_silent_mode_set); break; - case SILENT_MODE_AUTO: MENU_ITEM_FUNCTION_P(_T(MSG_AUTO_MODE_ON), lcd_silent_mode_set); break; - default: MENU_ITEM_FUNCTION_P(_T(MSG_SILENT_MODE_OFF), lcd_silent_mode_set); break; // (probably) not needed + case SILENT_MODE_POWER: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set); break; + case SILENT_MODE_SILENT: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_SILENT), lcd_silent_mode_set); break; + case SILENT_MODE_AUTO: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_AUTO_POWER), lcd_silent_mode_set); break; + default: MENU_ITEM_TOGGLE_P(_T(MSG_MODE), _T(MSG_HIGH_POWER), lcd_silent_mode_set); break; // (probably) not needed } } #endif //TMC2130 diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 29f7c2130..344cccb88 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -412,11 +412,14 @@ #MSG_MMU_OK_RESUMING c=20 r=4 "MMU OK. Resuming..." -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" +#MSG_MODE +"Mode" -#MSG_SILENT_MODE_ON -"Mode [silent]" +#MSG_NORMAL +"Normal" + +#MSG_SILENT +"Silent" # "MMU needs user attention." @@ -424,14 +427,14 @@ # "MMU power fails" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" +#MSG_STEALTH +"Stealth" -#MSG_AUTO_MODE_ON -"Mode [auto power]" +#MSG_AUTO_POWER +"Auto power" -#MSG_SILENT_MODE_OFF -"Mode [high power]" +#MSG_HIGH_POWER +"High power" # "MMU2 connected" diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 91144ece5..0f1ce9f6e 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -550,13 +550,17 @@ "MMU OK. Resuming..." "MMU OK. Pokracuji..." -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" -"Mod [Normal]" +#MSG_MODE +"Mode" +"Mod" -#MSG_SILENT_MODE_ON -"Mode [silent]" -"Mod [tichy]" +#MSG_NORMAL +"Normal" +"\x00" + +#MSG_SILENT +"Silent" +"Tichy" # "MMU needs user attention." @@ -566,17 +570,17 @@ "MMU power fails" "MMU vypadky proudu" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" -"Mod [tichy]" +#MSG_STEALTH +"Stealth" +"Tichy" -#MSG_AUTO_MODE_ON -"Mode [auto power]" -"Mod [automaticky]" +#MSG_AUTO_POWER +"Auto power" +"Automaticky" -#MSG_SILENT_MODE_OFF -"Mode [high power]" -"Mod [vys. vykon]" +#MSG_HIGH_POWER +"High power" +"Vys. vykon" # "MMU2 connected" diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 43fc9fb93..8e059a3b7 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -550,13 +550,17 @@ "MMU OK. Resuming..." "MMU OK. Weiterdrucken..." -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" -"Modus [Normal]" +#MSG_MODE +"Mode" +"Modus" -#MSG_SILENT_MODE_ON -"Mode [silent]" -"Modus [leise]" +#MSG_NORMAL +"Normal" +"\x00" + +#MSG_SILENT +"Silent" +"Leise" # "MMU needs user attention." @@ -566,17 +570,17 @@ "MMU power fails" "MMU Netzfehler" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" -"Modus [Stealth]" +#MSG_STEALTH +"Stealth" +"\x00" -#MSG_AUTO_MODE_ON -"Mode [auto power]" -"Modus[Auto Power]" +#MSG_AUTO_POWER +"Auto power" +"\x00" -#MSG_SILENT_MODE_OFF -"Mode [high power]" -"Modus[Hohe Leist]" +#MSG_HIGH_POWER +"High power" +"Hohe leist" # "MMU2 connected" diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index efd92b123..c74c1557d 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -550,13 +550,17 @@ "MMU OK. Resuming..." "MMU OK. Resumiendo..." -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" -"Modo [Normal]" +#MSG_MODE +"Mode" +"Modo" -#MSG_SILENT_MODE_ON -"Mode [silent]" -"Modo [silencio]" +#MSG_NORMAL +"Normal" +"\x00" + +#MSG_SILENT +"Silent" +"Silencio" # "MMU needs user attention." @@ -566,17 +570,17 @@ "MMU power fails" "Fallo de energia en MMU" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" -"Modo [Silencio]" +#MSG_STEALTH +"Stealth" +"Silencio" -#MSG_AUTO_MODE_ON -"Mode [auto power]" -"Modo[fuerza auto]" +#MSG_AUTO_POWER +"Auto power" +"Fuerza auto" -#MSG_SILENT_MODE_OFF -"Mode [high power]" -"Modo [rend.pleno]" +#MSG_HIGH_POWER +"High power" +"Rend.pleno" # "MMU2 connected" diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index d2d03346f..b21b638a3 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -550,13 +550,17 @@ "MMU OK. Resuming..." "MMU OK. Reprise ..." -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" +#MSG_MODE +"Mode" "\x00" -#MSG_SILENT_MODE_ON -"Mode [silent]" -"Mode [silencieux]" +#MSG_NORMAL +"Normal" +"\x00" + +#MSG_SILENT +"Silent" +"Silencieux" # "MMU needs user attention." @@ -566,17 +570,17 @@ "MMU power fails" "Echecs alim. MMU" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" -"Mode [Furtif]" +#MSG_STEALTH +"Stealth" +"Furtif" -#MSG_AUTO_MODE_ON -"Mode [auto power]" -"Mode [puiss.auto]" +#MSG_AUTO_POWER +"Auto power" +"Puiss.auto" -#MSG_SILENT_MODE_OFF -"Mode [high power]" -"Mode [haute puiss]" +#MSG_HIGH_POWER +"High power" +"Haute puiss" # "MMU2 connected" diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index b99eb148c..f2873971e 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -550,13 +550,17 @@ "MMU OK. Resuming..." "MMU OK. Riprendendo... " -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" -"Modo [normale]" +#MSG_MODE +"Mode" +"Modo" -#MSG_SILENT_MODE_ON -"Mode [silent]" -"Modo [silenzioso]" +#MSG_NORMAL +"Normal" +"Normale" + +#MSG_SILENT +"Silent" +"Silenzioso" # "MMU needs user attention." @@ -566,17 +570,17 @@ "MMU power fails" "Mancanza corrente MMU" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" -"Modo [Silenziosa]" +#MSG_STEALTH +"Stealth" +"Silenziosa" -#MSG_AUTO_MODE_ON -"Mode [auto power]" -"Modo [auto]" +#MSG_AUTO_POWER +"Auto power" +"Auto" -#MSG_SILENT_MODE_OFF -"Mode [high power]" -"Mode [forte]" +#MSG_HIGH_POWER +"High power" +"Forte" # "MMU2 connected" diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index cf9a0c71e..c523c064b 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -550,13 +550,17 @@ "MMU OK. Resuming..." "MMU OK. Wznawianie..." -#MSG_STEALTH_MODE_OFF -"Mode [Normal]" -"Tryb [normalny]" +#MSG_MODE +"Mode" +"Tryb" -#MSG_SILENT_MODE_ON -"Mode [silent]" -"Tryb [cichy]" +#MSG_NORMAL +"Normal" +"Normalny" + +#MSG_SILENT +"Silent" +"Cichy" # "MMU needs user attention." @@ -566,17 +570,17 @@ "MMU power fails" "Zaniki zasil. MMU" -#MSG_STEALTH_MODE_ON -"Mode [Stealth]" -"Tryb [Stealth]" +#MSG_STEALTH +"Stealth" +"\x00" -#MSG_AUTO_MODE_ON -"Mode [auto power]" -"Tryb [automatycz]" +#MSG_AUTO_POWER +"Auto power" +"Automatycz" -#MSG_SILENT_MODE_OFF -"Mode [high power]" -"Tryb[wysoka wyd.]" +#MSG_HIGH_POWER +"High power" +"Wysoka wyd." # "MMU2 connected"