From db6e2e0525052685d7a7843e17c5fcc609f60bde Mon Sep 17 00:00:00 2001 From: leptun Date: Thu, 29 Aug 2019 22:31:30 +0300 Subject: [PATCH] Toggle Crash det. --- Firmware/messages.c | 4 +--- Firmware/messages.h | 4 +--- Firmware/ultralcd.cpp | 15 ++++++--------- lang/lang_en.txt | 10 ++-------- lang/lang_en_cz.txt | 12 ++---------- lang/lang_en_de.txt | 14 +++----------- lang/lang_en_es.txt | 14 +++----------- lang/lang_en_fr.txt | 14 +++----------- lang/lang_en_it.txt | 14 +++----------- lang/lang_en_pl.txt | 12 ++---------- 10 files changed, 26 insertions(+), 87 deletions(-) diff --git a/Firmware/messages.c b/Firmware/messages.c index 5eac34a0..085cf2e9 100644 --- a/Firmware/messages.c +++ b/Firmware/messages.c @@ -22,9 +22,7 @@ const char MSG_CARD_MENU[] PROGMEM_I1 = ISTR("Print from SD"); //// const char MSG_CONFIRM_NOZZLE_CLEAN[] PROGMEM_I1 = ISTR("Please clean the nozzle for calibration. Click when done."); ////c=20 r=8 const char MSG_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); //// const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1 -const char MSG_CRASHDETECT_NA[] PROGMEM_I1 = ISTR("Crash det. [N/A]"); //// -const char MSG_CRASHDETECT_OFF[] PROGMEM_I1 = ISTR("Crash det. [off]"); //// -const char MSG_CRASHDETECT_ON[] PROGMEM_I1 = ISTR("Crash det. [on]"); //// +const char MSG_CRASHDETECT[] PROGMEM_I1 = ISTR("Crash det."); //// const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); //// const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1 diff --git a/Firmware/messages.h b/Firmware/messages.h index 10d14074..334d2116 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -23,9 +23,7 @@ extern const char MSG_CARD_MENU[]; extern const char MSG_CONFIRM_NOZZLE_CLEAN[]; extern const char MSG_COOLDOWN[]; extern const char MSG_CRASH_DETECTED[]; -extern const char MSG_CRASHDETECT_NA[]; -extern const char MSG_CRASHDETECT_OFF[]; -extern const char MSG_CRASHDETECT_ON[]; +extern const char MSG_CRASHDETECT[]; extern const char MSG_ERROR[]; extern const char MSG_EXTRUDER[]; extern const char MSG_FILAMENT[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 713f590c..d0f0da91 100755 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -5177,13 +5177,10 @@ do\ else MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_ON), lcd_silent_mode_set);\ if (SilentModeMenu == SILENT_MODE_NORMAL)\ {\ - if (lcd_crash_detect_enabled())\ - {\ - MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_ON), crash_mode_switch);\ - }\ - else MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_OFF), crash_mode_switch);\ + if (lcd_crash_detect_enabled()) MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_ON), crash_mode_switch);\ + else MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_OFF), crash_mode_switch);\ }\ - else MENU_ITEM_SUBMENU_P(_T(MSG_CRASHDETECT_NA), lcd_crash_mode_info);\ + else MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), NULL, lcd_crash_mode_info);\ }\ }\ while (0) @@ -6895,10 +6892,10 @@ static void lcd_tune_menu() if (SilentModeMenu == SILENT_MODE_NORMAL) { - if (lcd_crash_detect_enabled()) MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_ON), crash_mode_switch); - else MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_OFF), crash_mode_switch); + if (lcd_crash_detect_enabled()) MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_ON), crash_mode_switch); + else MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_OFF), crash_mode_switch); } - else MENU_ITEM_SUBMENU_P(_T(MSG_CRASHDETECT_NA), lcd_crash_mode_info); + else MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), NULL, lcd_crash_mode_info); } #else //TMC2130 if (!farm_mode) { //dont show in menu if we are in farm mode diff --git a/lang/lang_en.txt b/lang/lang_en.txt index 41501d06..29f7c213 100755 --- a/lang/lang_en.txt +++ b/lang/lang_en.txt @@ -121,14 +121,8 @@ # "Copy selected language?" -#MSG_CRASHDETECT_ON -"Crash det. [on]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" - -#MSG_CRASHDETECT_OFF -"Crash det. [off]" +#MSG_CRASHDETECT +"Crash det." #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." diff --git a/lang/lang_en_cz.txt b/lang/lang_en_cz.txt index 88ffa69c..91144ece 100755 --- a/lang/lang_en_cz.txt +++ b/lang/lang_en_cz.txt @@ -162,18 +162,10 @@ "Copy selected language?" "Kopirovat vybrany jazyk?" -#MSG_CRASHDETECT_ON -"Crash det. [on]" -"Crash det. [zap]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" +#MSG_CRASHDETECT +"Crash det." "\x00" -#MSG_CRASHDETECT_OFF -"Crash det. [off]" -"Crash det. [vyp]" - #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." "Detekovan naraz." diff --git a/lang/lang_en_de.txt b/lang/lang_en_de.txt index 68859bd8..43fc9fb9 100755 --- a/lang/lang_en_de.txt +++ b/lang/lang_en_de.txt @@ -162,17 +162,9 @@ "Copy selected language?" "Gewaehlte Sprache kopieren?" -#MSG_CRASHDETECT_ON -"Crash det. [on]" -"Crash Erk. [an]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" -"Crash Erk. [nv]" - -#MSG_CRASHDETECT_OFF -"Crash det. [off]" -"Crash Erk. [aus]" +#MSG_CRASHDETECT +"Crash det." +"Crash Erk." #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." diff --git a/lang/lang_en_es.txt b/lang/lang_en_es.txt index b33a5e08..efd92b12 100755 --- a/lang/lang_en_es.txt +++ b/lang/lang_en_es.txt @@ -162,17 +162,9 @@ "Copy selected language?" "Copiar idioma seleccionado?" -#MSG_CRASHDETECT_ON -"Crash det. [on]" -"Det. choque [act]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" -"Dec. choque [N/D]" - -#MSG_CRASHDETECT_OFF -"Crash det. [off]" -"Det. choque [ina]" +#MSG_CRASHDETECT +"Crash det." +"Det. choque" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." diff --git a/lang/lang_en_fr.txt b/lang/lang_en_fr.txt index 512a5255..d2d03346 100755 --- a/lang/lang_en_fr.txt +++ b/lang/lang_en_fr.txt @@ -162,17 +162,9 @@ "Copy selected language?" "Copier la langue selectionne ?" -#MSG_CRASHDETECT_ON -"Crash det. [on]" -"Detect. crash[on]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" -"Detect. crash [N/A]" - -#MSG_CRASHDETECT_OFF -"Crash det. [off]" -"Detect. crash[off]" +#MSG_CRASHDETECT +"Crash det." +"Detect. crash" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." diff --git a/lang/lang_en_it.txt b/lang/lang_en_it.txt index 839cbec7..b99eb148 100755 --- a/lang/lang_en_it.txt +++ b/lang/lang_en_it.txt @@ -162,17 +162,9 @@ "Copy selected language?" "Copiare la lingua selezionata?" -#MSG_CRASHDETECT_ON -"Crash det. [on]" -"Rilevam.imp. [on]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" -"Rilevam.imp.[N/A]" - -#MSG_CRASHDETECT_OFF -"Crash det. [off]" -"Rilevam.imp.[off]" +#MSG_CRASHDETECT +"Crash det." +"Rilevam.imp." #MSG_CRASH_DETECTED c=20 r=1 "Crash detected." diff --git a/lang/lang_en_pl.txt b/lang/lang_en_pl.txt index 09d393b7..cf9a0c71 100755 --- a/lang/lang_en_pl.txt +++ b/lang/lang_en_pl.txt @@ -163,16 +163,8 @@ "Skopiowac wybrany jezyk?" #MSG_CRASHDETECT_ON -"Crash det. [on]" -"Wykr.zderzen [wl]" - -#MSG_CRASHDETECT_NA -"Crash det. [N/A]" -"Wykr.zderzen[n/d]" - -#MSG_CRASHDETECT_OFF -"Crash det. [off]" -"Wykr.zderzen[wyl]" +"Crash det." +"Wykr.zderzen" #MSG_CRASH_DETECTED c=20 r=1 "Crash detected."