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

Toggle FANS_CHECK

This commit is contained in:
leptun 2019-08-10 08:43:07 +03:00
parent 505deb28fd
commit 29dcb1cad3
10 changed files with 64 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Firmware/messages.c
View File

@ -104,13 +104,13 @@ const char MSG_WIZARD_QUIT[] PROGMEM_I1 = ISTR("You can always resume the Wizard
const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); //// const char MSG_YES[] PROGMEM_I1 = ISTR("Yes"); ////
const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=17 r=1 const char MSG_V2_CALIBRATION[] PROGMEM_I1 = ISTR("First layer cal."); ////c=17 r=1
const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20 const char WELCOME_MSG[] PROGMEM_I1 = ISTR(CUSTOM_MENDEL_NAME " OK."); ////c=20
const char MSG_OFF[] PROGMEM_I1 = "Off"; ////c=3 r=1
const char MSG_ON[] PROGMEM_I1 = "On"; ////c=2 r=1
//not internationalized messages //not internationalized messages
const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; //// const char MSG_SD_WORKDIR_FAIL[] PROGMEM_N1 = "workDir open failed"; ////
const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; //// const char MSG_BROWNOUT_RESET[] PROGMEM_N1 = " Brown out Reset"; ////
const char MSG_EXTERNAL_RESET[] PROGMEM_N1 = " External Reset"; //// const char MSG_EXTERNAL_RESET[] PROGMEM_N1 = " External Reset"; ////
const char MSG_FILE_SAVED[] PROGMEM_N1 = "Done saving file."; //// const char MSG_FILE_SAVED[] PROGMEM_N1 = "Done saving file."; ////
const char MSG_OFF[] PROGMEM_N1 = "Off"; ////
const char MSG_ON[] PROGMEM_N1 = "On "; ////
const char MSG_POSITION_UNKNOWN[] PROGMEM_N1 = "Home X/Y before Z"; //// const char MSG_POSITION_UNKNOWN[] PROGMEM_N1 = "Home X/Y before Z"; ////
const char MSG_SOFTWARE_RESET[] PROGMEM_N1 = " Software Reset"; //// const char MSG_SOFTWARE_RESET[] PROGMEM_N1 = " Software Reset"; ////
const char MSG_UNKNOWN_COMMAND[] PROGMEM_N1 = "Unknown command: \""; //// const char MSG_UNKNOWN_COMMAND[] PROGMEM_N1 = "Unknown command: \""; ////

4
Firmware/messages.h
View File

@ -104,12 +104,12 @@ extern const char MSG_WIZARD_QUIT[];
extern const char MSG_YES[]; extern const char MSG_YES[];
extern const char MSG_V2_CALIBRATION[]; extern const char MSG_V2_CALIBRATION[];
extern const char WELCOME_MSG[]; extern const char WELCOME_MSG[];
extern const char MSG_OFF[];
extern const char MSG_ON[];
//not internationalized messages //not internationalized messages
extern const char MSG_BROWNOUT_RESET[]; extern const char MSG_BROWNOUT_RESET[];
extern const char MSG_EXTERNAL_RESET[]; extern const char MSG_EXTERNAL_RESET[];
extern const char MSG_FILE_SAVED[]; extern const char MSG_FILE_SAVED[];
extern const char MSG_OFF[];
extern const char MSG_ON[];
extern const char MSG_POSITION_UNKNOWN[]; extern const char MSG_POSITION_UNKNOWN[];
extern const char MSG_SOFTWARE_RESET[]; extern const char MSG_SOFTWARE_RESET[];
extern const char MSG_UNKNOWN_COMMAND[]; extern const char MSG_UNKNOWN_COMMAND[];

10
Firmware/ultralcd.cpp
View File

@ -5569,10 +5569,7 @@ static void lcd_settings_menu()
SETTINGS_CUTTER; SETTINGS_CUTTER;
if (fans_check_enabled == true) MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check);
MENU_ITEM_FUNCTION_P(_i("Fans check [on]"), lcd_set_fan_check);////MSG_FANS_CHECK_ON c=17 r=1
else
MENU_ITEM_FUNCTION_P(_i("Fans check [off]"), lcd_set_fan_check);////MSG_FANS_CHECK_OFF c=17 r=1
SETTINGS_SILENT_MODE; SETTINGS_SILENT_MODE;
@ -6881,10 +6878,7 @@ static void lcd_tune_menu()
if(farm_mode) if(farm_mode)
{ {
if (fans_check_enabled == true) MENU_ITEM_TOGGLE_P(_i("Fans check"), fans_check_enabled ? _T(MSG_ON) : _T(MSG_OFF), lcd_set_fan_check);
MENU_ITEM_FUNCTION_P(_i("Fans check [on]"), lcd_set_fan_check);////MSG_FANS_CHECK_ON c=17 r=1
else
MENU_ITEM_FUNCTION_P(_i("Fans check [off]"), lcd_set_fan_check);////MSG_FANS_CHECK_OFF c=17 r=1
} }
#ifdef TMC2130 #ifdef TMC2130

12
lang/lang_en.txt
View File

@ -220,11 +220,8 @@
#MSG_SELFTEST_FAN c=20 #MSG_SELFTEST_FAN c=20
"Fan test" "Fan test"
#MSG_FANS_CHECK_ON c=17 r=1 #MSG_FANS_CHECK
"Fans check [on]" "Fans check"
#MSG_FANS_CHECK_OFF c=17 r=1
"Fans check [off]"
#MSG_FSENSOR_ON #MSG_FSENSOR_ON
"Fil. sensor [on]" "Fil. sensor [on]"
@ -929,4 +926,7 @@
"Y-correct:" "Y-correct:"
#MSG_OFF #MSG_OFF
" [off]" "Off"
#MSG_ON
"On"

18
lang/lang_en_cz.txt
View File

@ -294,13 +294,9 @@
"Fan test" "Fan test"
"Test ventilatoru" "Test ventilatoru"
#MSG_FANS_CHECK_ON c=17 r=1 #MSG_FANS_CHECK
"Fans check [on]" "Fans check"
"Kontr. vent.[zap]" "Kontr. vent."
#MSG_FANS_CHECK_OFF c=17 r=1
"Fans check [off]"
"Kontr. vent.[vyp]"
#MSG_FSENSOR_ON #MSG_FSENSOR_ON
"Fil. sensor [on]" "Fil. sensor [on]"
@ -1239,5 +1235,9 @@
"Korekce Y:" "Korekce Y:"
#MSG_OFF #MSG_OFF
" [off]" "Off"
"\x00" "Vyp"
#MSG_ON
"On"
"Zap"

18
lang/lang_en_de.txt
View File

@ -294,13 +294,9 @@
"Fan test" "Fan test"
"Lueftertest" "Lueftertest"
#MSG_FANS_CHECK_ON c=17 r=1 #MSG_FANS_CHECK
"Fans check [on]" "Fans check"
"Luefter Chk. [an]" "Luefter Chk."
#MSG_FANS_CHECK_OFF c=17 r=1
"Fans check [off]"
"Luefter Chk.[aus]"
#MSG_FSENSOR_ON #MSG_FSENSOR_ON
"Fil. sensor [on]" "Fil. sensor [on]"
@ -1240,5 +1236,9 @@
"Y-Korrektur:" "Y-Korrektur:"
#MSG_OFF #MSG_OFF
" [off]" "Off"
"\x00" "Aus"
#MSG_ON
"On"
"An"

18
lang/lang_en_es.txt
View File

@ -294,13 +294,9 @@
"Fan test" "Fan test"
"Test ventiladores" "Test ventiladores"
#MSG_FANS_CHECK_ON c=17 r=1 #MSG_FANS_CHECK
"Fans check [on]" "Fans check"
"Comprob.vent[act]" "Comprob.vent"
#MSG_FANS_CHECK_OFF c=17 r=1
"Fans check [off]"
"Comprob.vent[ina]"
#MSG_FSENSOR_ON #MSG_FSENSOR_ON
"Fil. sensor [on]" "Fil. sensor [on]"
@ -1239,5 +1235,9 @@
"Y-correcion:" "Y-correcion:"
#MSG_OFF #MSG_OFF
" [off]" "Off"
"\x00" "Ina"
#MSG_ON
"On"
"Act"

16
lang/lang_en_fr.txt
View File

@ -294,13 +294,9 @@
"Fan test" "Fan test"
"Test ventilateur" "Test ventilateur"
#MSG_FANS_CHECK_ON c=17 r=1 #MSG_FANS_CHECK
"Fans check [on]" "Fans check"
"Verif ventilo[on]" "Verif ventilo"
#MSG_FANS_CHECK_OFF c=17 r=1
"Fans check [off]"
"Verif venti [off]"
#MSG_FSENSOR_ON #MSG_FSENSOR_ON
"Fil. sensor [on]" "Fil. sensor [on]"
@ -1239,5 +1235,9 @@
"Correct-Y:" "Correct-Y:"
#MSG_OFF #MSG_OFF
" [off]" "Off"
"\x00"
#MSG_ON
"On"
"\x00" "\x00"

16
lang/lang_en_it.txt
View File

@ -294,13 +294,9 @@
"Fan test" "Fan test"
"Test ventola" "Test ventola"
#MSG_FANS_CHECK_ON c=17 r=1 #MSG_FANS_CHECK
"Fans check [on]" "Fans check"
"Controllo ventole [on]" "Control.vent"
#MSG_FANS_CHECK_OFF c=17 r=1
"Fans check [off]"
"Control.vent[off]"
#MSG_FSENSOR_ON #MSG_FSENSOR_ON
"Fil. sensor [on]" "Fil. sensor [on]"
@ -1239,5 +1235,9 @@
"Correzione-Y:" "Correzione-Y:"
#MSG_OFF #MSG_OFF
" [off]" "Off"
"\x00"
#MSG_ON
"On"
"\x00" "\x00"

18
lang/lang_en_pl.txt
View File

@ -294,13 +294,9 @@
"Fan test" "Fan test"
"Test wentylatora" "Test wentylatora"
#MSG_FANS_CHECK_ON c=17 r=1 #MSG_FANS_CHECK
"Fans check [on]" "Fans check"
"Sprawd.went. [wl]" "Sprawd.went."
#MSG_FANS_CHECK_OFF c=17 r=1
"Fans check [off]"
"Sprawd.went.[wyl]"
#MSG_FSENSOR_ON #MSG_FSENSOR_ON
"Fil. sensor [on]" "Fil. sensor [on]"
@ -1239,5 +1235,9 @@
"Korekcja Y:" "Korekcja Y:"
#MSG_OFF #MSG_OFF
" [off]" "Off"
"\x00" "Wyl"
#MSG_ON
"On"
"Wl"