josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Toggle Crash det.

This commit is contained in:
leptun 2019-08-29 22:31:30 +03:00
parent 7f51e0bad8
commit db6e2e0525
10 changed files with 26 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/messages.c
View File

@ -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_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_COOLDOWN[] PROGMEM_I1 = ISTR("Cooldown"); ////
const char MSG_CRASH_DETECTED[] PROGMEM_I1 = ISTR("Crash detected."); ////c=20 r=1 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[] PROGMEM_I1 = ISTR("Crash det."); ////
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_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); //// const char MSG_ERROR[] PROGMEM_I1 = ISTR("ERROR:"); ////
const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1 const char MSG_EXTRUDER[] PROGMEM_I1 = ISTR("Extruder"); ////c=17 r=1
const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1 const char MSG_FILAMENT[] PROGMEM_I1 = ISTR("Filament"); ////c=17 r=1

4
Firmware/messages.h
View File

@ -23,9 +23,7 @@ extern const char MSG_CARD_MENU[];
extern const char MSG_CONFIRM_NOZZLE_CLEAN[]; extern const char MSG_CONFIRM_NOZZLE_CLEAN[];
extern const char MSG_COOLDOWN[]; extern const char MSG_COOLDOWN[];
extern const char MSG_CRASH_DETECTED[]; extern const char MSG_CRASH_DETECTED[];
extern const char MSG_CRASHDETECT_NA[]; extern const char MSG_CRASHDETECT[];
extern const char MSG_CRASHDETECT_OFF[];
extern const char MSG_CRASHDETECT_ON[];
extern const char MSG_ERROR[]; extern const char MSG_ERROR[];
extern const char MSG_EXTRUDER[]; extern const char MSG_EXTRUDER[];
extern const char MSG_FILAMENT[]; extern const char MSG_FILAMENT[];

15
Firmware/ultralcd.cpp
View File

@ -5177,13 +5177,10 @@ do\
else MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_ON), lcd_silent_mode_set);\ else MENU_ITEM_FUNCTION_P(_T(MSG_STEALTH_MODE_ON), lcd_silent_mode_set);\
if (SilentModeMenu == SILENT_MODE_NORMAL)\ if (SilentModeMenu == SILENT_MODE_NORMAL)\
{\ {\
if (lcd_crash_detect_enabled())\ 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);\
MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_ON), crash_mode_switch);\
}\
else MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_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) while (0)
@ -6895,10 +6892,10 @@ static void lcd_tune_menu()
if (SilentModeMenu == SILENT_MODE_NORMAL) if (SilentModeMenu == SILENT_MODE_NORMAL)
{ {
if (lcd_crash_detect_enabled()) MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_ON), crash_mode_switch); if (lcd_crash_detect_enabled()) MENU_ITEM_TOGGLE_P(_T(MSG_CRASHDETECT), _T(MSG_ON), crash_mode_switch);
else MENU_ITEM_FUNCTION_P(_T(MSG_CRASHDETECT_OFF), 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 #else //TMC2130
if (!farm_mode) { //dont show in menu if we are in farm mode if (!farm_mode) { //dont show in menu if we are in farm mode

10
lang/lang_en.txt
View File

@ -121,14 +121,8 @@
# #
"Copy selected language?" "Copy selected language?"
#MSG_CRASHDETECT_ON #MSG_CRASHDETECT
"Crash det. [on]" "Crash det."
#MSG_CRASHDETECT_NA
"Crash det. [N/A]"
#MSG_CRASHDETECT_OFF
"Crash det. [off]"
#MSG_CRASH_DETECTED c=20 r=1 #MSG_CRASH_DETECTED c=20 r=1
"Crash detected." "Crash detected."

12
lang/lang_en_cz.txt
View File

@ -162,18 +162,10 @@
"Copy selected language?" "Copy selected language?"
"Kopirovat vybrany jazyk?" "Kopirovat vybrany jazyk?"
#MSG_CRASHDETECT_ON #MSG_CRASHDETECT
"Crash det. [on]" "Crash det."
"Crash det. [zap]"
#MSG_CRASHDETECT_NA
"Crash det. [N/A]"
"\x00" "\x00"
#MSG_CRASHDETECT_OFF
"Crash det. [off]"
"Crash det. [vyp]"
#MSG_CRASH_DETECTED c=20 r=1 #MSG_CRASH_DETECTED c=20 r=1
"Crash detected." "Crash detected."
"Detekovan naraz." "Detekovan naraz."

14
lang/lang_en_de.txt
View File

@ -162,17 +162,9 @@
"Copy selected language?" "Copy selected language?"
"Gewaehlte Sprache kopieren?" "Gewaehlte Sprache kopieren?"
#MSG_CRASHDETECT_ON #MSG_CRASHDETECT
"Crash det. [on]" "Crash det."
"Crash Erk. [an]" "Crash Erk."
#MSG_CRASHDETECT_NA
"Crash det. [N/A]"
"Crash Erk. [nv]"
#MSG_CRASHDETECT_OFF
"Crash det. [off]"
"Crash Erk. [aus]"
#MSG_CRASH_DETECTED c=20 r=1 #MSG_CRASH_DETECTED c=20 r=1
"Crash detected." "Crash detected."

14
lang/lang_en_es.txt
View File

@ -162,17 +162,9 @@
"Copy selected language?" "Copy selected language?"
"Copiar idioma seleccionado?" "Copiar idioma seleccionado?"
#MSG_CRASHDETECT_ON #MSG_CRASHDETECT
"Crash det. [on]" "Crash det."
"Det. choque [act]" "Det. choque"
#MSG_CRASHDETECT_NA
"Crash det. [N/A]"
"Dec. choque [N/D]"
#MSG_CRASHDETECT_OFF
"Crash det. [off]"
"Det. choque [ina]"
#MSG_CRASH_DETECTED c=20 r=1 #MSG_CRASH_DETECTED c=20 r=1
"Crash detected." "Crash detected."

14
lang/lang_en_fr.txt
View File

@ -162,17 +162,9 @@
"Copy selected language?" "Copy selected language?"
"Copier la langue selectionne ?" "Copier la langue selectionne ?"
#MSG_CRASHDETECT_ON #MSG_CRASHDETECT
"Crash det. [on]" "Crash det."
"Detect. crash[on]" "Detect. crash"
#MSG_CRASHDETECT_NA
"Crash det. [N/A]"
"Detect. crash [N/A]"
#MSG_CRASHDETECT_OFF
"Crash det. [off]"
"Detect. crash[off]"
#MSG_CRASH_DETECTED c=20 r=1 #MSG_CRASH_DETECTED c=20 r=1
"Crash detected." "Crash detected."

14
lang/lang_en_it.txt
View File

@ -162,17 +162,9 @@
"Copy selected language?" "Copy selected language?"
"Copiare la lingua selezionata?" "Copiare la lingua selezionata?"
#MSG_CRASHDETECT_ON #MSG_CRASHDETECT
"Crash det. [on]" "Crash det."
"Rilevam.imp. [on]" "Rilevam.imp."
#MSG_CRASHDETECT_NA
"Crash det. [N/A]"
"Rilevam.imp.[N/A]"
#MSG_CRASHDETECT_OFF
"Crash det. [off]"
"Rilevam.imp.[off]"
#MSG_CRASH_DETECTED c=20 r=1 #MSG_CRASH_DETECTED c=20 r=1
"Crash detected." "Crash detected."

12
lang/lang_en_pl.txt
View File

@ -163,16 +163,8 @@
"Skopiowac wybrany jezyk?" "Skopiowac wybrany jezyk?"
#MSG_CRASHDETECT_ON #MSG_CRASHDETECT_ON
"Crash det. [on]" "Crash det."
"Wykr.zderzen [wl]" "Wykr.zderzen"
#MSG_CRASHDETECT_NA
"Crash det. [N/A]"
"Wykr.zderzen[n/d]"
#MSG_CRASHDETECT_OFF
"Crash det. [off]"
"Wykr.zderzen[wyl]"
#MSG_CRASH_DETECTED c=20 r=1 #MSG_CRASH_DETECTED c=20 r=1
"Crash detected." "Crash detected."