From 044ed951cbf5a85442122a2febee874b523d364e Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 27 Nov 2017 16:06:34 +0100 Subject: [PATCH] translations to czech language and menu corrections: initial version --- Firmware/language_all.cpp | 88 +++++++++++++++++++++++++++------------ Firmware/language_all.h | 48 +++++++++++---------- Firmware/language_cz.h | 20 +++++++-- Firmware/language_en.h | 6 ++- Firmware/ultralcd.cpp | 28 ++++++------- 5 files changed, 121 insertions(+), 69 deletions(-) diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index 1178a69c..7126cd83 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -279,8 +279,10 @@ const char * const MSG_CALIBRATE_PINDA_LANG_TABLE[LANG_NUM] PROGMEM = { }; const char MSG_CALIBRATE_Z_AUTO_EN[] PROGMEM = "Calibrating Z"; -const char * const MSG_CALIBRATE_Z_AUTO_LANG_TABLE[1] PROGMEM = { - MSG_CALIBRATE_Z_AUTO_EN +const char MSG_CALIBRATE_Z_AUTO_CZ[] PROGMEM = "Kalibruji Z"; +const char * const MSG_CALIBRATE_Z_AUTO_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_CALIBRATE_Z_AUTO_EN, + MSG_CALIBRATE_Z_AUTO_CZ }; const char MSG_CALIBRATION_PINDA_MENU_EN[] PROGMEM = "Temp. calibration"; @@ -388,13 +390,17 @@ const char * const MSG_COUNT_X_LANG_TABLE[1] PROGMEM = { }; const char MSG_CRASHDETECT_OFF_EN[] PROGMEM = "Crash det. [off]"; -const char * const MSG_CRASHDETECT_OFF_LANG_TABLE[1] PROGMEM = { - MSG_CRASHDETECT_OFF_EN +const char MSG_CRASHDETECT_OFF_CZ[] PROGMEM = "Crash det. [vyp]"; +const char * const MSG_CRASHDETECT_OFF_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_CRASHDETECT_OFF_EN, + MSG_CRASHDETECT_OFF_CZ }; const char MSG_CRASHDETECT_ON_EN[] PROGMEM = "Crash det. [on]"; -const char * const MSG_CRASHDETECT_ON_LANG_TABLE[1] PROGMEM = { - MSG_CRASHDETECT_ON_EN +const char MSG_CRASHDETECT_ON_CZ[] PROGMEM = "Crash det. [zap]"; +const char * const MSG_CRASHDETECT_ON_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_CRASHDETECT_ON_EN, + MSG_CRASHDETECT_ON_CZ }; const char MSG_CRASH_DETECTED_EN[] PROGMEM = "Crash detected. Continue printing?"; @@ -547,6 +553,20 @@ const char * const MSG_FACTOR_LANG_TABLE[1] PROGMEM = { MSG_FACTOR_EN }; +const char MSG_FANS_CHECK_OFF_EN[] PROGMEM = "Fans check [OFF]"; +const char MSG_FANS_CHECK_OFF_CZ[] PROGMEM = "Kontr. vent.[vyp]"; +const char * const MSG_FANS_CHECK_OFF_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_FANS_CHECK_OFF_EN, + MSG_FANS_CHECK_OFF_CZ +}; + +const char MSG_FANS_CHECK_ON_EN[] PROGMEM = "Fans check [ON]"; +const char MSG_FANS_CHECK_ON_CZ[] PROGMEM = "Kontr. vent.[zap]"; +const char * const MSG_FANS_CHECK_ON_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_FANS_CHECK_ON_EN, + MSG_FANS_CHECK_ON_CZ +}; + const char MSG_FAN_SPEED_EN[] PROGMEM = "Fan speed"; const char MSG_FAN_SPEED_CZ[] PROGMEM = "Rychlost vent."; const char * const MSG_FAN_SPEED_LANG_TABLE[LANG_NUM] PROGMEM = { @@ -681,13 +701,17 @@ const char * const MSG_FREE_MEMORY_LANG_TABLE[1] PROGMEM = { }; const char MSG_FSENSOR_OFF_EN[] PROGMEM = "Fil. sensor [off]"; -const char * const MSG_FSENSOR_OFF_LANG_TABLE[1] PROGMEM = { - MSG_FSENSOR_OFF_EN +const char MSG_FSENSOR_OFF_CZ[] PROGMEM = "Fil. senzor [vyp]"; +const char * const MSG_FSENSOR_OFF_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_FSENSOR_OFF_EN, + MSG_FSENSOR_OFF_CZ }; const char MSG_FSENSOR_ON_EN[] PROGMEM = "Fil. sensor [on]"; -const char * const MSG_FSENSOR_ON_LANG_TABLE[1] PROGMEM = { - MSG_FSENSOR_ON_EN +const char MSG_FSENSOR_ON_CZ[] PROGMEM = "Fil. senzor [zap]"; +const char * const MSG_FSENSOR_ON_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_FSENSOR_ON_EN, + MSG_FSENSOR_ON_CZ }; const char MSG_HEATING_EN[] PROGMEM = "Heating"; @@ -1187,8 +1211,10 @@ const char * const MSG_PINDA_PREHEAT_LANG_TABLE[LANG_NUM] PROGMEM = { }; const char MSG_PLACE_STEEL_SHEET_EN[] PROGMEM = "Please place steel sheet on heatbed."; -const char * const MSG_PLACE_STEEL_SHEET_LANG_TABLE[1] PROGMEM = { - MSG_PLACE_STEEL_SHEET_EN +const char MSG_PLACE_STEEL_SHEET_CZ[] PROGMEM = "Umistete prosim tiskovy plat na heatbed"; +const char * const MSG_PLACE_STEEL_SHEET_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_PLACE_STEEL_SHEET_EN, + MSG_PLACE_STEEL_SHEET_CZ }; const char MSG_PLANNER_BUFFER_BYTES_EN[] PROGMEM = " PlannerBufferBytes: "; @@ -1303,8 +1329,10 @@ const char * const MSG_REBOOT_LANG_TABLE[LANG_NUM] PROGMEM = { }; const char MSG_RECOVERING_PRINT_EN[] PROGMEM = "Recovering print "; -const char * const MSG_RECOVERING_PRINT_LANG_TABLE[1] PROGMEM = { - MSG_RECOVERING_PRINT_EN +const char MSG_RECOVERING_PRINT_CZ[] PROGMEM = "Obnovovani tisku "; +const char * const MSG_RECOVERING_PRINT_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_RECOVERING_PRINT_EN, + MSG_RECOVERING_PRINT_CZ }; const char MSG_RECOVER_PRINT_EN[] PROGMEM = "Blackout occurred. Recover print?"; @@ -1323,8 +1351,10 @@ const char * const MSG_REFRESH_LANG_TABLE[1] PROGMEM = { }; const char MSG_REMOVE_STEEL_SHEET_EN[] PROGMEM = "Please remove steel sheet from heatbed."; -const char * const MSG_REMOVE_STEEL_SHEET_LANG_TABLE[1] PROGMEM = { - MSG_REMOVE_STEEL_SHEET_EN +const char MSG_REMOVE_STEEL_SHEET_CZ[] PROGMEM = "Odstrante tiskovy plat z heatbed prosim."; +const char * const MSG_REMOVE_STEEL_SHEET_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_REMOVE_STEEL_SHEET_EN, + MSG_REMOVE_STEEL_SHEET_CZ }; const char MSG_RESEND_EN[] PROGMEM = "Resend: "; @@ -1465,13 +1495,17 @@ const char * const MSG_SELFTEST_LANG_TABLE[1] PROGMEM = { }; const char MSG_SELFTEST_AXIS_EN[] PROGMEM = "Axis"; -const char * const MSG_SELFTEST_AXIS_LANG_TABLE[1] PROGMEM = { - MSG_SELFTEST_AXIS_EN +const char MSG_SELFTEST_AXIS_CZ[] PROGMEM = "Osa"; +const char * const MSG_SELFTEST_AXIS_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_SELFTEST_AXIS_EN, + MSG_SELFTEST_AXIS_CZ }; const char MSG_SELFTEST_AXIS_LENGTH_EN[] PROGMEM = "Axis length"; -const char * const MSG_SELFTEST_AXIS_LENGTH_LANG_TABLE[1] PROGMEM = { - MSG_SELFTEST_AXIS_LENGTH_EN +const char MSG_SELFTEST_AXIS_LENGTH_CZ[] PROGMEM = "Delka osy"; +const char * const MSG_SELFTEST_AXIS_LENGTH_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_SELFTEST_AXIS_LENGTH_EN, + MSG_SELFTEST_AXIS_LENGTH_CZ }; const char MSG_SELFTEST_BEDHEATER_EN[] PROGMEM = "Bed / Heater"; @@ -1674,15 +1708,15 @@ const char * const MSG_SHOW_END_STOPS_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_SHOW_END_STOPS_CZ }; -const char MSG_SILENT_MODE_OFF_EN[] PROGMEM = "Mode [high power]"; -const char MSG_SILENT_MODE_OFF_CZ[] PROGMEM = "Mod [vys. vykon]"; +const char MSG_SILENT_MODE_OFF_EN[] PROGMEM = "Mode [Normal]"; +const char MSG_SILENT_MODE_OFF_CZ[] PROGMEM = "Mod [Normal]"; const char * const MSG_SILENT_MODE_OFF_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_SILENT_MODE_OFF_EN, MSG_SILENT_MODE_OFF_CZ }; -const char MSG_SILENT_MODE_ON_EN[] PROGMEM = "Mode [silent]"; -const char MSG_SILENT_MODE_ON_CZ[] PROGMEM = "Mod [tichy]"; +const char MSG_SILENT_MODE_ON_EN[] PROGMEM = "Mode [Stealth]"; +const char MSG_SILENT_MODE_ON_CZ[] PROGMEM = "Mod [Stealth]"; const char * const MSG_SILENT_MODE_ON_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_SILENT_MODE_ON_EN, MSG_SILENT_MODE_ON_CZ @@ -1748,8 +1782,10 @@ const char * const MSG_STATS_TOTALPRINTTIME_LANG_TABLE[LANG_NUM] PROGMEM = { }; const char MSG_STEEL_SHEET_CHECK_EN[] PROGMEM = "Is steel sheet on heatbed?"; -const char * const MSG_STEEL_SHEET_CHECK_LANG_TABLE[1] PROGMEM = { - MSG_STEEL_SHEET_CHECK_EN +const char MSG_STEEL_SHEET_CHECK_CZ[] PROGMEM = "Je tiskovy plat na heatbed?"; +const char * const MSG_STEEL_SHEET_CHECK_LANG_TABLE[LANG_NUM] PROGMEM = { + MSG_STEEL_SHEET_CHECK_EN, + MSG_STEEL_SHEET_CHECK_CZ }; const char MSG_STEPPER_TOO_HIGH_EN[] PROGMEM = "Steprate too high: "; diff --git a/Firmware/language_all.h b/Firmware/language_all.h index 653d0c6a..d4ae427e 100644 --- a/Firmware/language_all.h +++ b/Firmware/language_all.h @@ -108,8 +108,8 @@ extern const char* const MSG_CALIBRATE_E_LANG_TABLE[LANG_NUM]; #define MSG_CALIBRATE_E LANG_TABLE_SELECT(MSG_CALIBRATE_E_LANG_TABLE) extern const char* const MSG_CALIBRATE_PINDA_LANG_TABLE[LANG_NUM]; #define MSG_CALIBRATE_PINDA LANG_TABLE_SELECT(MSG_CALIBRATE_PINDA_LANG_TABLE) -extern const char* const MSG_CALIBRATE_Z_AUTO_LANG_TABLE[1]; -#define MSG_CALIBRATE_Z_AUTO LANG_TABLE_SELECT_EXPLICIT(MSG_CALIBRATE_Z_AUTO_LANG_TABLE, 0) +extern const char* const MSG_CALIBRATE_Z_AUTO_LANG_TABLE[LANG_NUM]; +#define MSG_CALIBRATE_Z_AUTO LANG_TABLE_SELECT(MSG_CALIBRATE_Z_AUTO_LANG_TABLE) extern const char* const MSG_CALIBRATION_PINDA_MENU_LANG_TABLE[LANG_NUM]; #define MSG_CALIBRATION_PINDA_MENU LANG_TABLE_SELECT(MSG_CALIBRATION_PINDA_MENU_LANG_TABLE) extern const char* const MSG_CARD_MENU_LANG_TABLE[LANG_NUM]; @@ -142,10 +142,10 @@ extern const char* const MSG_CORRECTLY_LANG_TABLE[LANG_NUM]; #define MSG_CORRECTLY LANG_TABLE_SELECT(MSG_CORRECTLY_LANG_TABLE) extern const char* const MSG_COUNT_X_LANG_TABLE[1]; #define MSG_COUNT_X LANG_TABLE_SELECT_EXPLICIT(MSG_COUNT_X_LANG_TABLE, 0) -extern const char* const MSG_CRASHDETECT_OFF_LANG_TABLE[1]; -#define MSG_CRASHDETECT_OFF LANG_TABLE_SELECT_EXPLICIT(MSG_CRASHDETECT_OFF_LANG_TABLE, 0) -extern const char* const MSG_CRASHDETECT_ON_LANG_TABLE[1]; -#define MSG_CRASHDETECT_ON LANG_TABLE_SELECT_EXPLICIT(MSG_CRASHDETECT_ON_LANG_TABLE, 0) +extern const char* const MSG_CRASHDETECT_OFF_LANG_TABLE[LANG_NUM]; +#define MSG_CRASHDETECT_OFF LANG_TABLE_SELECT(MSG_CRASHDETECT_OFF_LANG_TABLE) +extern const char* const MSG_CRASHDETECT_ON_LANG_TABLE[LANG_NUM]; +#define MSG_CRASHDETECT_ON LANG_TABLE_SELECT(MSG_CRASHDETECT_ON_LANG_TABLE) extern const char* const MSG_CRASH_DETECTED_LANG_TABLE[1]; #define MSG_CRASH_DETECTED LANG_TABLE_SELECT_EXPLICIT(MSG_CRASH_DETECTED_LANG_TABLE, 0) extern const char* const MSG_CURRENT_LANG_TABLE[LANG_NUM]; @@ -202,6 +202,10 @@ extern const char* const MSG_Enqueing_LANG_TABLE[1]; #define MSG_Enqueing LANG_TABLE_SELECT_EXPLICIT(MSG_Enqueing_LANG_TABLE, 0) extern const char* const MSG_FACTOR_LANG_TABLE[1]; #define MSG_FACTOR LANG_TABLE_SELECT_EXPLICIT(MSG_FACTOR_LANG_TABLE, 0) +extern const char* const MSG_FANS_CHECK_OFF_LANG_TABLE[LANG_NUM]; +#define MSG_FANS_CHECK_OFF LANG_TABLE_SELECT(MSG_FANS_CHECK_OFF_LANG_TABLE) +extern const char* const MSG_FANS_CHECK_ON_LANG_TABLE[LANG_NUM]; +#define MSG_FANS_CHECK_ON LANG_TABLE_SELECT(MSG_FANS_CHECK_ON_LANG_TABLE) extern const char* const MSG_FAN_SPEED_LANG_TABLE[LANG_NUM]; #define MSG_FAN_SPEED LANG_TABLE_SELECT(MSG_FAN_SPEED_LANG_TABLE) extern const char* const MSG_FARM_CARD_MENU_LANG_TABLE[1]; @@ -244,10 +248,10 @@ extern const char* const MSG_FOLLOW_CALIBRATION_FLOW_LANG_TABLE[LANG_NUM]; #define MSG_FOLLOW_CALIBRATION_FLOW LANG_TABLE_SELECT(MSG_FOLLOW_CALIBRATION_FLOW_LANG_TABLE) extern const char* const MSG_FREE_MEMORY_LANG_TABLE[1]; #define MSG_FREE_MEMORY LANG_TABLE_SELECT_EXPLICIT(MSG_FREE_MEMORY_LANG_TABLE, 0) -extern const char* const MSG_FSENSOR_OFF_LANG_TABLE[1]; -#define MSG_FSENSOR_OFF LANG_TABLE_SELECT_EXPLICIT(MSG_FSENSOR_OFF_LANG_TABLE, 0) -extern const char* const MSG_FSENSOR_ON_LANG_TABLE[1]; -#define MSG_FSENSOR_ON LANG_TABLE_SELECT_EXPLICIT(MSG_FSENSOR_ON_LANG_TABLE, 0) +extern const char* const MSG_FSENSOR_OFF_LANG_TABLE[LANG_NUM]; +#define MSG_FSENSOR_OFF LANG_TABLE_SELECT(MSG_FSENSOR_OFF_LANG_TABLE) +extern const char* const MSG_FSENSOR_ON_LANG_TABLE[LANG_NUM]; +#define MSG_FSENSOR_ON LANG_TABLE_SELECT(MSG_FSENSOR_ON_LANG_TABLE) extern const char* const MSG_HEATING_LANG_TABLE[LANG_NUM]; #define MSG_HEATING LANG_TABLE_SELECT(MSG_HEATING_LANG_TABLE) extern const char* const MSG_HEATING_COMPLETE_LANG_TABLE[LANG_NUM]; @@ -410,8 +414,8 @@ extern const char* const MSG_PINDA_NOT_CALIBRATED_LANG_TABLE[LANG_NUM]; #define MSG_PINDA_NOT_CALIBRATED LANG_TABLE_SELECT(MSG_PINDA_NOT_CALIBRATED_LANG_TABLE) extern const char* const MSG_PINDA_PREHEAT_LANG_TABLE[LANG_NUM]; #define MSG_PINDA_PREHEAT LANG_TABLE_SELECT(MSG_PINDA_PREHEAT_LANG_TABLE) -extern const char* const MSG_PLACE_STEEL_SHEET_LANG_TABLE[1]; -#define MSG_PLACE_STEEL_SHEET LANG_TABLE_SELECT_EXPLICIT(MSG_PLACE_STEEL_SHEET_LANG_TABLE, 0) +extern const char* const MSG_PLACE_STEEL_SHEET_LANG_TABLE[LANG_NUM]; +#define MSG_PLACE_STEEL_SHEET LANG_TABLE_SELECT(MSG_PLACE_STEEL_SHEET_LANG_TABLE) extern const char* const MSG_PLANNER_BUFFER_BYTES_LANG_TABLE[1]; #define MSG_PLANNER_BUFFER_BYTES LANG_TABLE_SELECT_EXPLICIT(MSG_PLANNER_BUFFER_BYTES_LANG_TABLE, 0) extern const char* const MSG_PLA_FILAMENT_LOADED_LANG_TABLE[LANG_NUM]; @@ -446,16 +450,16 @@ extern const char* const MSG_PRUSA3D_HOWTO_LANG_TABLE[LANG_NUM]; #define MSG_PRUSA3D_HOWTO LANG_TABLE_SELECT(MSG_PRUSA3D_HOWTO_LANG_TABLE) extern const char* const MSG_REBOOT_LANG_TABLE[LANG_NUM]; #define MSG_REBOOT LANG_TABLE_SELECT(MSG_REBOOT_LANG_TABLE) -extern const char* const MSG_RECOVERING_PRINT_LANG_TABLE[1]; -#define MSG_RECOVERING_PRINT LANG_TABLE_SELECT_EXPLICIT(MSG_RECOVERING_PRINT_LANG_TABLE, 0) +extern const char* const MSG_RECOVERING_PRINT_LANG_TABLE[LANG_NUM]; +#define MSG_RECOVERING_PRINT LANG_TABLE_SELECT(MSG_RECOVERING_PRINT_LANG_TABLE) extern const char* const MSG_RECOVER_PRINT_LANG_TABLE[1]; #define MSG_RECOVER_PRINT LANG_TABLE_SELECT_EXPLICIT(MSG_RECOVER_PRINT_LANG_TABLE, 0) extern const char* const MSG_RECTRACT_LANG_TABLE[1]; #define MSG_RECTRACT LANG_TABLE_SELECT_EXPLICIT(MSG_RECTRACT_LANG_TABLE, 0) extern const char* const MSG_REFRESH_LANG_TABLE[1]; #define MSG_REFRESH LANG_TABLE_SELECT_EXPLICIT(MSG_REFRESH_LANG_TABLE, 0) -extern const char* const MSG_REMOVE_STEEL_SHEET_LANG_TABLE[1]; -#define MSG_REMOVE_STEEL_SHEET LANG_TABLE_SELECT_EXPLICIT(MSG_REMOVE_STEEL_SHEET_LANG_TABLE, 0) +extern const char* const MSG_REMOVE_STEEL_SHEET_LANG_TABLE[LANG_NUM]; +#define MSG_REMOVE_STEEL_SHEET LANG_TABLE_SELECT(MSG_REMOVE_STEEL_SHEET_LANG_TABLE) extern const char* const MSG_RESEND_LANG_TABLE[1]; #define MSG_RESEND LANG_TABLE_SELECT_EXPLICIT(MSG_RESEND_LANG_TABLE, 0) extern const char* const MSG_RESET_CALIBRATE_E_LANG_TABLE[1]; @@ -506,10 +510,10 @@ extern const char* const MSG_SD_WRITE_TO_FILE_LANG_TABLE[1]; #define MSG_SD_WRITE_TO_FILE LANG_TABLE_SELECT_EXPLICIT(MSG_SD_WRITE_TO_FILE_LANG_TABLE, 0) extern const char* const MSG_SELFTEST_LANG_TABLE[1]; #define MSG_SELFTEST LANG_TABLE_SELECT_EXPLICIT(MSG_SELFTEST_LANG_TABLE, 0) -extern const char* const MSG_SELFTEST_AXIS_LANG_TABLE[1]; -#define MSG_SELFTEST_AXIS LANG_TABLE_SELECT_EXPLICIT(MSG_SELFTEST_AXIS_LANG_TABLE, 0) -extern const char* const MSG_SELFTEST_AXIS_LENGTH_LANG_TABLE[1]; -#define MSG_SELFTEST_AXIS_LENGTH LANG_TABLE_SELECT_EXPLICIT(MSG_SELFTEST_AXIS_LENGTH_LANG_TABLE, 0) +extern const char* const MSG_SELFTEST_AXIS_LANG_TABLE[LANG_NUM]; +#define MSG_SELFTEST_AXIS LANG_TABLE_SELECT(MSG_SELFTEST_AXIS_LANG_TABLE) +extern const char* const MSG_SELFTEST_AXIS_LENGTH_LANG_TABLE[LANG_NUM]; +#define MSG_SELFTEST_AXIS_LENGTH LANG_TABLE_SELECT(MSG_SELFTEST_AXIS_LENGTH_LANG_TABLE) extern const char* const MSG_SELFTEST_BEDHEATER_LANG_TABLE[1]; #define MSG_SELFTEST_BEDHEATER LANG_TABLE_SELECT_EXPLICIT(MSG_SELFTEST_BEDHEATER_LANG_TABLE, 0) extern const char* const MSG_SELFTEST_CHECK_ALLCORRECT_LANG_TABLE[LANG_NUM]; @@ -596,8 +600,8 @@ extern const char* const MSG_STATS_TOTALFILAMENT_LANG_TABLE[LANG_NUM]; #define MSG_STATS_TOTALFILAMENT LANG_TABLE_SELECT(MSG_STATS_TOTALFILAMENT_LANG_TABLE) extern const char* const MSG_STATS_TOTALPRINTTIME_LANG_TABLE[LANG_NUM]; #define MSG_STATS_TOTALPRINTTIME LANG_TABLE_SELECT(MSG_STATS_TOTALPRINTTIME_LANG_TABLE) -extern const char* const MSG_STEEL_SHEET_CHECK_LANG_TABLE[1]; -#define MSG_STEEL_SHEET_CHECK LANG_TABLE_SELECT_EXPLICIT(MSG_STEEL_SHEET_CHECK_LANG_TABLE, 0) +extern const char* const MSG_STEEL_SHEET_CHECK_LANG_TABLE[LANG_NUM]; +#define MSG_STEEL_SHEET_CHECK LANG_TABLE_SELECT(MSG_STEEL_SHEET_CHECK_LANG_TABLE) extern const char* const MSG_STEPPER_TOO_HIGH_LANG_TABLE[1]; #define MSG_STEPPER_TOO_HIGH LANG_TABLE_SELECT_EXPLICIT(MSG_STEPPER_TOO_HIGH_LANG_TABLE, 0) extern const char* const MSG_STOPPED_LANG_TABLE[1]; diff --git a/Firmware/language_cz.h b/Firmware/language_cz.h index 5dc50bbc..14a1ccb9 100644 --- a/Firmware/language_cz.h +++ b/Firmware/language_cz.h @@ -102,8 +102,8 @@ #define MSG_INSERT_FILAMENT "Vlozte filament" #define MSG_CHANGING_FILAMENT "Vymena filamentu!" -#define MSG_SILENT_MODE_ON "Mod [tichy]" -#define MSG_SILENT_MODE_OFF "Mod [vys. vykon]" +#define MSG_SILENT_MODE_ON "Mod [Stealth]" +#define MSG_SILENT_MODE_OFF "Mod [Normal]" #define MSG_REBOOT "Restartujte tiskarnu" #define MSG_TAKE_EFFECT " pro projeveni zmen" @@ -334,4 +334,18 @@ #define MSG_RIGHT "Pravy:" #define MSG_MEASURED_SKEW "Merene zkoseni:" #define MSG_SLIGHT_SKEW "Lehke zkoseni:" -#define MSG_SEVERE_SKEW "Tezke zkoseni:" \ No newline at end of file +#define MSG_SEVERE_SKEW "Tezke zkoseni:" + +#define MSG_CALIBRATE_Z_AUTO "Kalibruji Z" +#define MSG_FSENSOR_OFF "Fil. senzor [vyp]" +#define MSG_FSENSOR_ON "Fil. senzor [zap]" +#define MSG_CRASHDETECT_ON "Crash det. [zap]" +#define MSG_CRASHDETECT_OFF "Crash det. [vyp]" +#define MSG_FANS_CHECK_ON "Kontr. vent.[zap]" +#define MSG_FANS_CHECK_OFF "Kontr. vent.[vyp]" +#define MSG_RECOVERING_PRINT "Obnovovani tisku " +#define MSG_SELFTEST_AXIS "Osa" +#define MSG_SELFTEST_AXIS_LENGTH "Delka osy" +#define MSG_STEEL_SHEET_CHECK "Je tiskovy plat na heatbed?" +#define MSG_REMOVE_STEEL_SHEET "Odstrante tiskovy plat z heatbed prosim." +#define MSG_PLACE_STEEL_SHEET "Umistete prosim tiskovy plat na heatbed" \ No newline at end of file diff --git a/Firmware/language_en.h b/Firmware/language_en.h index 5349e804..51f61cb5 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -101,8 +101,8 @@ #define(length=20) MSG_CHANGING_FILAMENT "Changing filament!" -#define MSG_SILENT_MODE_ON "Mode [silent]" -#define MSG_SILENT_MODE_OFF "Mode [high power]" +#define MSG_SILENT_MODE_ON "Mode [Stealth]" +#define MSG_SILENT_MODE_OFF "Mode [Normal]" #define(length=20) MSG_REBOOT "Reboot the printer" #define(length=20) MSG_TAKE_EFFECT " for take effect" @@ -364,3 +364,5 @@ #define(length=11, lines=1) MSG_INFO_PRINT_FAN "Print FAN: " #define(length=11, lines=1) MSG_INFO_FILAMENT_XDIFF "Fil. Xd:" #define(length=11, lines=1) MSG_INFO_FILAMENT_YDIFF "Fil. Ydiff:" +#define(length=17, lines=1) MSG_FANS_CHECK_ON "Fans check [ON]" +#define(length=17, lines=1) MSG_FANS_CHECK_OFF "Fans check [OFF]" diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index beeb5df4..d3886e5f 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -1582,9 +1582,9 @@ static void lcd_preheat_menu() if (farm_mode) MENU_ITEM(function, PSTR("farm - " STRINGIFY(FARM_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FARM_PREHEAT_HPB_TEMP)), lcd_preheat_farm); - MENU_ITEM(function, PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)), lcd_preheat_abs); MENU_ITEM(function, PSTR("PLA - " STRINGIFY(PLA_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PLA_PREHEAT_HPB_TEMP)), lcd_preheat_pla); MENU_ITEM(function, PSTR("PET - " STRINGIFY(PET_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PET_PREHEAT_HPB_TEMP)), lcd_preheat_pet); + MENU_ITEM(function, PSTR("ABS - " STRINGIFY(ABS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(ABS_PREHEAT_HPB_TEMP)), lcd_preheat_abs); MENU_ITEM(function, PSTR("HIPS - " STRINGIFY(HIPS_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(HIPS_PREHEAT_HPB_TEMP)), lcd_preheat_hips); MENU_ITEM(function, PSTR("PP - " STRINGIFY(PP_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(PP_PREHEAT_HPB_TEMP)), lcd_preheat_pp); MENU_ITEM(function, PSTR("FLEX - " STRINGIFY(FLEX_PREHEAT_HOTEND_TEMP) "/" STRINGIFY(FLEX_PREHEAT_HPB_TEMP)), lcd_preheat_flex); @@ -1652,17 +1652,7 @@ static void lcd_support_menu() MENU_ITEM(submenu, PSTR("Belt status"), lcd_menu_belt_status); MENU_ITEM(submenu, PSTR("Temperatures"), lcd_menu_temperatures); - if (fans_check_enabled == true) { - MENU_ITEM(function, PSTR("Check fans [EN]"), lcd_set_fan_check); - } - else { - MENU_ITEM(function, PSTR("Check fans [DIS]"), lcd_set_fan_check); - } #endif //MK1BP - -#ifdef AUTOMATIC_RECOVERY_AFTER_CRASH - MENU_ITEM(back, PSTR("Auto recover crash"), lcd_main_menu); -#endif END_MENU(); } @@ -3664,6 +3654,12 @@ static void lcd_settings_menu() } else { MENU_ITEM(function, MSG_FSENSOR_ON, lcd_fsensor_state_set); } + if (fans_check_enabled == true) { + MENU_ITEM(function, MSG_FANS_CHECK_ON, lcd_set_fan_check); + } + else { + MENU_ITEM(function, MSG_FANS_CHECK_OFF, lcd_set_fan_check); + } if (SilentModeMenu == 0) { MENU_ITEM(function, MSG_SILENT_MODE_OFF, lcd_silent_mode_set); @@ -3711,25 +3707,25 @@ static void lcd_calibration_menu() MENU_ITEM(back, MSG_MAIN, lcd_main_menu); if (!isPrintPaused) { + MENU_ITEM(function, MSG_WIZARD, lcd_wizard); + MENU_ITEM(submenu, MSG_V2_CALIBRATION, lcd_v2_calibration); MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28 W")); - MENU_ITEM(function, MSG_SELFTEST, lcd_selftest_v); + MENU_ITEM(function, MSG_SELFTEST, lcd_selftest_v); #ifdef MK1BP // MK1 // "Calibrate Z" MENU_ITEM(gcode, MSG_HOMEYZ, PSTR("G28 Z")); #else //MK1BP // MK2 -MENU_ITEM(function, MSG_CALIBRATE_BED, lcd_mesh_calibration); + MENU_ITEM(function, MSG_CALIBRATE_BED, lcd_mesh_calibration); // "Calibrate Z" with storing the reference values to EEPROM. MENU_ITEM(submenu, MSG_HOMEYZ, lcd_mesh_calibration_z); - MENU_ITEM(submenu, MSG_V2_CALIBRATION, lcd_v2_calibration); - #ifndef SNMM //MENU_ITEM(function, MSG_CALIBRATE_E, lcd_calibrate_extruder); #endif // "Mesh Bed Leveling" MENU_ITEM(submenu, MSG_MESH_BED_LEVELING, lcd_mesh_bedleveling); - MENU_ITEM(function, MSG_WIZARD, lcd_wizard); + #endif //MK1BP MENU_ITEM(submenu, MSG_BED_CORRECTION_MENU, lcd_adjust_bed); #ifndef MK1BP