Pārlūkot izejas kodu

Text grooming

Added language mutations of error messages, menu items.
Synced wording of crash detection in messages.
rPi port -> RPi port.
Minor menu items alignment.
Michal Průša 7 gadi atpakaļ
vecāks
revīzija
5e5588c72c

+ 1 - 1
Firmware/Configuration.h

@@ -9,7 +9,7 @@
 
 // Firmware version
 #define FW_version "3.1.1-RC4"
-#define FW_build   139
+#define FW_build   139g
 //#define FW_build   --BUILD-NUMBER--
 #define FW_version_build FW_version " b" STR(FW_build)
 

+ 79 - 23
Firmware/language_all.cpp

@@ -34,9 +34,18 @@ const char * const MSG_AUTHOR_LANG_TABLE[1] PROGMEM = {
 	MSG_AUTHOR_EN
 };
 
-const char MSG_AUTOLOAD_FILAMENT_EN[] PROGMEM = "AUTOLoad filament";
-const char * const MSG_AUTOLOAD_FILAMENT_LANG_TABLE[1] PROGMEM = {
-	MSG_AUTOLOAD_FILAMENT_EN
+const char MSG_AUTOLOADING_ENABLED_EN[] PROGMEM = "Autoloading filament is active, just press the knob and insert filament...";
+const char MSG_AUTOLOADING_ENABLED_CZ[] PROGMEM = "Automaticke zavedeni filamentu aktivni, stisknete tlacitko a vlozte filament...";
+const char * const MSG_AUTOLOADING_ENABLED_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_AUTOLOADING_ENABLED_EN,
+	MSG_AUTOLOADING_ENABLED_CZ
+};
+
+const char MSG_AUTOLOAD_FILAMENT_EN[] PROGMEM = "AutoLoad filament";
+const char MSG_AUTOLOAD_FILAMENT_CZ[] PROGMEM = "AutoZavedeni fil.";
+const char * const MSG_AUTOLOAD_FILAMENT_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_AUTOLOAD_FILAMENT_EN,
+	MSG_AUTOLOAD_FILAMENT_CZ
 };
 
 const char MSG_AUTO_HOME_EN[] PROGMEM = "Auto home";
@@ -418,6 +427,20 @@ const char * const MSG_CRASH_DETECTED_LANG_TABLE[1] PROGMEM = {
 	MSG_CRASH_DETECTED_EN
 };
 
+const char MSG_CRASH_DET_ONLY_IN_NORMAL_EN[] PROGMEM = "Crash detection can be turned on only in Normal mode.";
+const char MSG_CRASH_DET_ONLY_IN_NORMAL_CZ[] PROGMEM = "Crash detekce muze byt zapnuta pouze v Normal modu";
+const char * const MSG_CRASH_DET_ONLY_IN_NORMAL_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_CRASH_DET_ONLY_IN_NORMAL_EN,
+	MSG_CRASH_DET_ONLY_IN_NORMAL_CZ
+};
+
+const char MSG_CRASH_DET_STEALTH_FORCE_OFF_EN[] PROGMEM = "WARNING: Crash detection disabled in Stealth mode";
+const char MSG_CRASH_DET_STEALTH_FORCE_OFF_CZ[] PROGMEM = "POZOR: Crash detekce deaktivovana ve Stealth modu";
+const char * const MSG_CRASH_DET_STEALTH_FORCE_OFF_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_CRASH_DET_STEALTH_FORCE_OFF_EN,
+	MSG_CRASH_DET_STEALTH_FORCE_OFF_CZ
+};
+
 const char MSG_CURRENT_EN[] PROGMEM = "Current";
 const char MSG_CURRENT_CZ[] PROGMEM = "Pouze aktualni";
 const char * const MSG_CURRENT_LANG_TABLE[LANG_NUM] PROGMEM = {
@@ -758,13 +781,17 @@ const char * const MSG_FSENSOR_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
 };
 
 const char MSG_FSENS_AUTOLOAD_OFF_EN[] PROGMEM = "F. autoload [off]";
-const char * const MSG_FSENS_AUTOLOAD_OFF_LANG_TABLE[1] PROGMEM = {
-	MSG_FSENS_AUTOLOAD_OFF_EN
+const char MSG_FSENS_AUTOLOAD_OFF_CZ[] PROGMEM = "F. autozav. [off]";
+const char * const MSG_FSENS_AUTOLOAD_OFF_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_FSENS_AUTOLOAD_OFF_EN,
+	MSG_FSENS_AUTOLOAD_OFF_CZ
 };
 
 const char MSG_FSENS_AUTOLOAD_ON_EN[] PROGMEM = "F. autoload  [on]";
-const char * const MSG_FSENS_AUTOLOAD_ON_LANG_TABLE[1] PROGMEM = {
-	MSG_FSENS_AUTOLOAD_ON_EN
+const char MSG_FSENS_AUTOLOAD_ON_CZ[] PROGMEM = "F. autozav.  [on]";
+const char * const MSG_FSENS_AUTOLOAD_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_FSENS_AUTOLOAD_ON_EN,
+	MSG_FSENS_AUTOLOAD_ON_CZ
 };
 
 const char MSG_HEATING_EN[] PROGMEM = "Heating";
@@ -837,13 +864,17 @@ const char * const MSG_INFO_FILAMENT_YDIFF_LANG_TABLE[1] PROGMEM = {
 };
 
 const char MSG_INFO_NOZZLE_FAN_EN[] PROGMEM = "Nozzle FAN:";
-const char * const MSG_INFO_NOZZLE_FAN_LANG_TABLE[1] PROGMEM = {
-	MSG_INFO_NOZZLE_FAN_EN
+const char MSG_INFO_NOZZLE_FAN_CZ[] PROGMEM = "Trysk. vent:";
+const char * const MSG_INFO_NOZZLE_FAN_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_INFO_NOZZLE_FAN_EN,
+	MSG_INFO_NOZZLE_FAN_CZ
 };
 
 const char MSG_INFO_PRINT_FAN_EN[] PROGMEM = "Print FAN: ";
-const char * const MSG_INFO_PRINT_FAN_LANG_TABLE[1] PROGMEM = {
-	MSG_INFO_PRINT_FAN_EN
+const char MSG_INFO_PRINT_FAN_CZ[] PROGMEM = "Tisk. vent:";
+const char * const MSG_INFO_PRINT_FAN_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_INFO_PRINT_FAN_EN,
+	MSG_INFO_PRINT_FAN_CZ
 };
 
 const char MSG_INIT_SDCARD_EN[] PROGMEM = "Init. SD card";
@@ -1044,6 +1075,13 @@ const char * const MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2_LANG_TABLE[LANG_NUM] P
 	MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2_CZ
 };
 
+const char MSG_MENU_BELT_STATUS_EN[] PROGMEM = "Belt status";
+const char MSG_MENU_BELT_STATUS_CZ[] PROGMEM = "Stav remenu";
+const char * const MSG_MENU_BELT_STATUS_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_MENU_BELT_STATUS_EN,
+	MSG_MENU_BELT_STATUS_CZ
+};
+
 const char MSG_MENU_CALIBRATION_EN[] PROGMEM = "Calibration";
 const char MSG_MENU_CALIBRATION_CZ[] PROGMEM = "Kalibrace";
 const char * const MSG_MENU_CALIBRATION_LANG_TABLE[LANG_NUM] PROGMEM = {
@@ -1051,6 +1089,20 @@ const char * const MSG_MENU_CALIBRATION_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_MENU_CALIBRATION_CZ
 };
 
+const char MSG_MENU_TEMPERATURES_EN[] PROGMEM = "Temperatures";
+const char MSG_MENU_TEMPERATURES_CZ[] PROGMEM = "Teploty";
+const char * const MSG_MENU_TEMPERATURES_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_MENU_TEMPERATURES_EN,
+	MSG_MENU_TEMPERATURES_CZ
+};
+
+const char MSG_MENU_VOLTAGES_EN[] PROGMEM = "Voltages";
+const char MSG_MENU_VOLTAGES_CZ[] PROGMEM = "Napeti";
+const char * const MSG_MENU_VOLTAGES_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_MENU_VOLTAGES_EN,
+	MSG_MENU_VOLTAGES_CZ
+};
+
 const char MSG_MESH_BED_LEVELING_EN[] PROGMEM = "Mesh Bed Leveling";
 const char * const MSG_MESH_BED_LEVELING_LANG_TABLE[1] PROGMEM = {
 	MSG_MESH_BED_LEVELING_EN
@@ -1551,12 +1603,12 @@ const char * const MSG_SD_WRITE_TO_FILE_LANG_TABLE[1] PROGMEM = {
 	MSG_SD_WRITE_TO_FILE_EN
 };
 
-const char MSG_SECOND_SERIAL_OFF_EN[] PROGMEM = "rPi port    [off]";
+const char MSG_SECOND_SERIAL_OFF_EN[] PROGMEM = "RPi port    [off]";
 const char * const MSG_SECOND_SERIAL_OFF_LANG_TABLE[1] PROGMEM = {
 	MSG_SECOND_SERIAL_OFF_EN
 };
 
-const char MSG_SECOND_SERIAL_ON_EN[] PROGMEM = "rPi port     [on]";
+const char MSG_SECOND_SERIAL_ON_EN[] PROGMEM = "RPi port     [on]";
 const char * const MSG_SECOND_SERIAL_ON_LANG_TABLE[1] PROGMEM = {
 	MSG_SECOND_SERIAL_ON_EN
 };
@@ -1849,26 +1901,28 @@ const char * const MSG_SOFTWARE_RESET_LANG_TABLE[1] PROGMEM = {
 };
 
 const char MSG_SORTING_EN[] PROGMEM = "Sorting files";
-const char * const MSG_SORTING_LANG_TABLE[1] PROGMEM = {
-	MSG_SORTING_EN
+const char MSG_SORTING_CZ[] PROGMEM = "Trideni souboru";
+const char * const MSG_SORTING_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_SORTING_EN,
+	MSG_SORTING_CZ
 };
 
-const char MSG_SORT_ALPHA_EN[] PROGMEM = "Sort: [Alphabet]";
+const char MSG_SORT_ALPHA_EN[] PROGMEM = "Sort:  [Alphabet]";
 const char MSG_SORT_ALPHA_CZ[] PROGMEM = "Trideni [Abeceda]";
 const char * const MSG_SORT_ALPHA_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_SORT_ALPHA_EN,
 	MSG_SORT_ALPHA_CZ
 };
 
-const char MSG_SORT_NONE_EN[] PROGMEM = "Sort: [None]";
-const char MSG_SORT_NONE_CZ[] PROGMEM = "Trideni [Zadne]";
+const char MSG_SORT_NONE_EN[] PROGMEM = "Sort:      [None]";
+const char MSG_SORT_NONE_CZ[] PROGMEM = "Trideni   [Zadne]";
 const char * const MSG_SORT_NONE_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_SORT_NONE_EN,
 	MSG_SORT_NONE_CZ
 };
 
-const char MSG_SORT_TIME_EN[] PROGMEM = "Sort: [Time]";
-const char MSG_SORT_TIME_CZ[] PROGMEM = "Trideni [Cas]";
+const char MSG_SORT_TIME_EN[] PROGMEM = "Sort:      [Time]";
+const char MSG_SORT_TIME_CZ[] PROGMEM = "Trideni     [Cas]";
 const char * const MSG_SORT_TIME_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_SORT_TIME_EN,
 	MSG_SORT_TIME_CZ
@@ -1882,8 +1936,10 @@ const char * const MSG_SPEED_LANG_TABLE[LANG_NUM] PROGMEM = {
 };
 
 const char MSG_STACK_ERROR_EN[] PROGMEM = "Error - static memory has been overwritten";
-const char * const MSG_STACK_ERROR_LANG_TABLE[1] PROGMEM = {
-	MSG_STACK_ERROR_EN
+const char MSG_STACK_ERROR_CZ[] PROGMEM = "Chyba - Doslo k prepisu staticke pameti!";
+const char * const MSG_STACK_ERROR_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_STACK_ERROR_EN,
+	MSG_STACK_ERROR_CZ
 };
 
 const char MSG_STATISTICS_EN[] PROGMEM = "Statistics  ";
@@ -2013,7 +2069,7 @@ const char * const MSG_TEMP_CALIBRATION_ON_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_TEMP_CALIBRATION_ON_CZ
 };
 
-const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF_EN[] PROGMEM = "SD card [normal]";
+const char MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF_EN[] PROGMEM = "SD card  [normal]";
 const char * const MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF_LANG_TABLE[1] PROGMEM = {
 	MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF_EN
 };

+ 26 - 14
Firmware/language_all.h

@@ -32,8 +32,10 @@ extern const char* const MSG_AMAX_LANG_TABLE[1];
 #define MSG_AMAX LANG_TABLE_SELECT_EXPLICIT(MSG_AMAX_LANG_TABLE, 0)
 extern const char* const MSG_AUTHOR_LANG_TABLE[1];
 #define MSG_AUTHOR LANG_TABLE_SELECT_EXPLICIT(MSG_AUTHOR_LANG_TABLE, 0)
-extern const char* const MSG_AUTOLOAD_FILAMENT_LANG_TABLE[1];
-#define MSG_AUTOLOAD_FILAMENT LANG_TABLE_SELECT_EXPLICIT(MSG_AUTOLOAD_FILAMENT_LANG_TABLE, 0)
+extern const char* const MSG_AUTOLOADING_ENABLED_LANG_TABLE[LANG_NUM];
+#define MSG_AUTOLOADING_ENABLED LANG_TABLE_SELECT(MSG_AUTOLOADING_ENABLED_LANG_TABLE)
+extern const char* const MSG_AUTOLOAD_FILAMENT_LANG_TABLE[LANG_NUM];
+#define MSG_AUTOLOAD_FILAMENT LANG_TABLE_SELECT(MSG_AUTOLOAD_FILAMENT_LANG_TABLE)
 extern const char* const MSG_AUTO_HOME_LANG_TABLE[1];
 #define MSG_AUTO_HOME LANG_TABLE_SELECT_EXPLICIT(MSG_AUTO_HOME_LANG_TABLE, 0)
 extern const char* const MSG_A_RETRACT_LANG_TABLE[1];
@@ -152,6 +154,10 @@ 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_CRASH_DET_ONLY_IN_NORMAL_LANG_TABLE[LANG_NUM];
+#define MSG_CRASH_DET_ONLY_IN_NORMAL LANG_TABLE_SELECT(MSG_CRASH_DET_ONLY_IN_NORMAL_LANG_TABLE)
+extern const char* const MSG_CRASH_DET_STEALTH_FORCE_OFF_LANG_TABLE[LANG_NUM];
+#define MSG_CRASH_DET_STEALTH_FORCE_OFF LANG_TABLE_SELECT(MSG_CRASH_DET_STEALTH_FORCE_OFF_LANG_TABLE)
 extern const char* const MSG_CURRENT_LANG_TABLE[LANG_NUM];
 #define MSG_CURRENT LANG_TABLE_SELECT(MSG_CURRENT_LANG_TABLE)
 extern const char* const MSG_DATE_LANG_TABLE[LANG_NUM];
@@ -266,10 +272,10 @@ 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_FSENS_AUTOLOAD_OFF_LANG_TABLE[1];
-#define MSG_FSENS_AUTOLOAD_OFF LANG_TABLE_SELECT_EXPLICIT(MSG_FSENS_AUTOLOAD_OFF_LANG_TABLE, 0)
-extern const char* const MSG_FSENS_AUTOLOAD_ON_LANG_TABLE[1];
-#define MSG_FSENS_AUTOLOAD_ON LANG_TABLE_SELECT_EXPLICIT(MSG_FSENS_AUTOLOAD_ON_LANG_TABLE, 0)
+extern const char* const MSG_FSENS_AUTOLOAD_OFF_LANG_TABLE[LANG_NUM];
+#define MSG_FSENS_AUTOLOAD_OFF LANG_TABLE_SELECT(MSG_FSENS_AUTOLOAD_OFF_LANG_TABLE)
+extern const char* const MSG_FSENS_AUTOLOAD_ON_LANG_TABLE[LANG_NUM];
+#define MSG_FSENS_AUTOLOAD_ON LANG_TABLE_SELECT(MSG_FSENS_AUTOLOAD_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];
@@ -292,10 +298,10 @@ extern const char* const MSG_INFO_FILAMENT_XDIFF_LANG_TABLE[1];
 #define MSG_INFO_FILAMENT_XDIFF LANG_TABLE_SELECT_EXPLICIT(MSG_INFO_FILAMENT_XDIFF_LANG_TABLE, 0)
 extern const char* const MSG_INFO_FILAMENT_YDIFF_LANG_TABLE[1];
 #define MSG_INFO_FILAMENT_YDIFF LANG_TABLE_SELECT_EXPLICIT(MSG_INFO_FILAMENT_YDIFF_LANG_TABLE, 0)
-extern const char* const MSG_INFO_NOZZLE_FAN_LANG_TABLE[1];
-#define MSG_INFO_NOZZLE_FAN LANG_TABLE_SELECT_EXPLICIT(MSG_INFO_NOZZLE_FAN_LANG_TABLE, 0)
-extern const char* const MSG_INFO_PRINT_FAN_LANG_TABLE[1];
-#define MSG_INFO_PRINT_FAN LANG_TABLE_SELECT_EXPLICIT(MSG_INFO_PRINT_FAN_LANG_TABLE, 0)
+extern const char* const MSG_INFO_NOZZLE_FAN_LANG_TABLE[LANG_NUM];
+#define MSG_INFO_NOZZLE_FAN LANG_TABLE_SELECT(MSG_INFO_NOZZLE_FAN_LANG_TABLE)
+extern const char* const MSG_INFO_PRINT_FAN_LANG_TABLE[LANG_NUM];
+#define MSG_INFO_PRINT_FAN LANG_TABLE_SELECT(MSG_INFO_PRINT_FAN_LANG_TABLE)
 extern const char* const MSG_INIT_SDCARD_LANG_TABLE[1];
 #define MSG_INIT_SDCARD LANG_TABLE_SELECT_EXPLICIT(MSG_INIT_SDCARD_LANG_TABLE, 0)
 extern const char* const MSG_INSERT_FILAMENT_LANG_TABLE[LANG_NUM];
@@ -362,8 +368,14 @@ extern const char* const MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1_LANG_TABLE[LANG_
 #define MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1 LANG_TABLE_SELECT(MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE1_LANG_TABLE)
 extern const char* const MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2_LANG_TABLE[LANG_NUM];
 #define MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2 LANG_TABLE_SELECT(MSG_MEASURE_BED_REFERENCE_HEIGHT_LINE2_LANG_TABLE)
+extern const char* const MSG_MENU_BELT_STATUS_LANG_TABLE[LANG_NUM];
+#define MSG_MENU_BELT_STATUS LANG_TABLE_SELECT(MSG_MENU_BELT_STATUS_LANG_TABLE)
 extern const char* const MSG_MENU_CALIBRATION_LANG_TABLE[LANG_NUM];
 #define MSG_MENU_CALIBRATION LANG_TABLE_SELECT(MSG_MENU_CALIBRATION_LANG_TABLE)
+extern const char* const MSG_MENU_TEMPERATURES_LANG_TABLE[LANG_NUM];
+#define MSG_MENU_TEMPERATURES LANG_TABLE_SELECT(MSG_MENU_TEMPERATURES_LANG_TABLE)
+extern const char* const MSG_MENU_VOLTAGES_LANG_TABLE[LANG_NUM];
+#define MSG_MENU_VOLTAGES LANG_TABLE_SELECT(MSG_MENU_VOLTAGES_LANG_TABLE)
 extern const char* const MSG_MESH_BED_LEVELING_LANG_TABLE[1];
 #define MSG_MESH_BED_LEVELING LANG_TABLE_SELECT_EXPLICIT(MSG_MESH_BED_LEVELING_LANG_TABLE, 0)
 extern const char* const MSG_MIN_LANG_TABLE[1];
@@ -622,8 +634,8 @@ extern const char* const MSG_SLIGHT_SKEW_LANG_TABLE[LANG_NUM];
 #define MSG_SLIGHT_SKEW LANG_TABLE_SELECT(MSG_SLIGHT_SKEW_LANG_TABLE)
 extern const char* const MSG_SOFTWARE_RESET_LANG_TABLE[1];
 #define MSG_SOFTWARE_RESET LANG_TABLE_SELECT_EXPLICIT(MSG_SOFTWARE_RESET_LANG_TABLE, 0)
-extern const char* const MSG_SORTING_LANG_TABLE[1];
-#define MSG_SORTING LANG_TABLE_SELECT_EXPLICIT(MSG_SORTING_LANG_TABLE, 0)
+extern const char* const MSG_SORTING_LANG_TABLE[LANG_NUM];
+#define MSG_SORTING LANG_TABLE_SELECT(MSG_SORTING_LANG_TABLE)
 extern const char* const MSG_SORT_ALPHA_LANG_TABLE[LANG_NUM];
 #define MSG_SORT_ALPHA LANG_TABLE_SELECT(MSG_SORT_ALPHA_LANG_TABLE)
 extern const char* const MSG_SORT_NONE_LANG_TABLE[LANG_NUM];
@@ -632,8 +644,8 @@ extern const char* const MSG_SORT_TIME_LANG_TABLE[LANG_NUM];
 #define MSG_SORT_TIME LANG_TABLE_SELECT(MSG_SORT_TIME_LANG_TABLE)
 extern const char* const MSG_SPEED_LANG_TABLE[LANG_NUM];
 #define MSG_SPEED LANG_TABLE_SELECT(MSG_SPEED_LANG_TABLE)
-extern const char* const MSG_STACK_ERROR_LANG_TABLE[1];
-#define MSG_STACK_ERROR LANG_TABLE_SELECT_EXPLICIT(MSG_STACK_ERROR_LANG_TABLE, 0)
+extern const char* const MSG_STACK_ERROR_LANG_TABLE[LANG_NUM];
+#define MSG_STACK_ERROR LANG_TABLE_SELECT(MSG_STACK_ERROR_LANG_TABLE)
 extern const char* const MSG_STATISTICS_LANG_TABLE[LANG_NUM];
 #define MSG_STATISTICS LANG_TABLE_SELECT(MSG_STATISTICS_LANG_TABLE)
 extern const char* const MSG_STATS_FILAMENTUSED_LANG_TABLE[LANG_NUM];

+ 29 - 5
Firmware/language_cz.h

@@ -74,6 +74,7 @@
 #define MSG_PREHEAT                         "Predehrev"
 #define MSG_UNLOAD_FILAMENT                 "Vyjmout filament"
 #define MSG_LOAD_FILAMENT					"Zavest filament"
+#define(length=17) MSG_AUTOLOAD_FILAMENT    "AutoZavedeni fil."
 #define MSG_LOAD_FILAMENT_1					"Zavest filament 1"
 #define MSG_LOAD_FILAMENT_2					"Zavest filament 2"
 #define MSG_LOAD_FILAMENT_3					"Zavest filament 3"
@@ -261,9 +262,11 @@
 
 #define MSG_MESH_BED_LEVELING									"Mesh Bed Leveling"
 #define MSG_MENU_CALIBRATION									"Kalibrace"
-#define MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF					"SD card [normal]"
+#define MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF					"SD card  [normal]"
 #define MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON					"SD card [FlshAir]"
 
+#define(length=20, lines=4) MSG_STACK_ERROR                     "Chyba - Doslo k prepisu staticke pameti!"
+
 #define MSG_LOOSE_PULLEY								"Uvolnena remenicka"
 #define MSG_FILAMENT_LOADING_T0							"Vlozte filament do extruderu 1. Potvrdte tlacitkem."
 #define MSG_FILAMENT_LOADING_T1							"Vlozte filament do extruderu 2. Potvrdte tlacitkem."
@@ -342,7 +345,7 @@
 #define MSG_MEASURED_SKEW					"Merene zkoseni:"
 #define MSG_SLIGHT_SKEW						"Lehke zkoseni:"
 #define MSG_SEVERE_SKEW						"Tezke zkoseni:"
-
+ve
 #define MSG_CALIBRATE_Z_AUTO				"Kalibruji Z"
 #define MSG_FSENSOR_OFF						"Fil. senzor [vyp]"
 #define MSG_FSENSOR_NA						"Fil. senzor [err]"
@@ -351,7 +354,9 @@
 #define MSG_CRASHDETECT_NA					"Crash det.  [N/A]"
 #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_FANS_CHECK_OFF					        "Kontr. vent.[vyp]"
+#define(length=17, lines=1) MSG_FSENS_AUTOLOAD_ON   "F. autozav.  [on]"
+#define(length=17, lines=1) MSG_FSENS_AUTOLOAD_OFF  "F. autozav. [off]"
 #define MSG_RECOVERING_PRINT				"Obnovovani tisku    "
 #define MSG_SELFTEST_AXIS					"Osa"
 #define MSG_SELFTEST_AXIS_LENGTH			"Delka osy"
@@ -363,6 +368,25 @@
 #define MSG_UNLOAD_SUCCESSFULL				"Opakovat vysunuti filamentu?"
 #define MSG_FILE_INCOMPLETE					"Soubor nekompletni. Pokracovat?"
 #define MSG_FILE_CNT						"Nektere soubory nebudou setrideny. Maximalni pocet souboru pro setrideni je 100."
-#define MSG_SORT_TIME						"Trideni [Cas]"
+#define MSG_SORT_TIME						"Trideni     [Cas]"
 #define MSG_SORT_ALPHA						"Trideni [Abeceda]"
-#define MSG_SORT_NONE						"Trideni [Zadne]"
+#define MSG_SORT_NONE						"Trideni   [Zadne]"
+#define(length=20, lines=1) MSG_SORTING                            "Trideni souboru"
+
+
+#define(length=11, lines=1) MSG_INFO_NOZZLE_FAN                 "Trysk. vent:"
+#define(length=11, lines=1) MSG_INFO_PRINT_FAN                  "Tisk. vent:"
+
+
+#define(length=17, lines=1) MSG_SECOND_SERIAL_ON                "RPi port     [on]"
+#define(length=17, lines=1) MSG_SECOND_SERIAL_OFF                "RPi port    [off]"
+
+#define(length=15, lines=1) MSG_INFO_EXTRUDER                "Extruder info"
+#define(length=15, lines=1) MSG_MENU_VOLTAGES               "Napeti"
+#define(length=15, lines=1) MSG_MENU_TEMPERATURES           "Teploty"
+#define(length=15, lines=1) MSG_MENU_BELT_STATUS            "Stav remenu"
+
+#define(length=20, lines=4) MSG_CRASH_DET_ONLY_IN_NORMAL        "Crash detekce muze byt zapnuta pouze v Normal modu"
+#define(length=20, lines=4) MSG_CRASH_DET_STEALTH_FORCE_OFF     "POZOR: Crash detekce deaktivovana ve Stealth modu"
+
+#define(length=20, lines=4) MSG_AUTOLOADING_ENABLED     "Automaticke zavedeni filamentu aktivni, stisknete tlacitko a vlozte filament..."

+ 16 - 7
Firmware/language_en.h

@@ -70,7 +70,7 @@
 #define MSG_SETTINGS                         "Settings"
 #define MSG_PREHEAT                         "Preheat"
 #define(length=17) MSG_UNLOAD_FILAMENT               "Unload filament"
-#define(length=17) MSG_AUTOLOAD_FILAMENT             "AUTOLoad filament"
+#define(length=17) MSG_AUTOLOAD_FILAMENT             "AutoLoad filament"
 #define(length=17) MSG_LOAD_FILAMENT                 "Load filament"
 #define(length=17) MSG_LOAD_FILAMENT_1				"Load filament 1"
 #define(length=17) MSG_LOAD_FILAMENT_2				"Load filament 2"
@@ -282,7 +282,7 @@
 
 #define MSG_MESH_BED_LEVELING									"Mesh Bed Leveling"
 #define MSG_MENU_CALIBRATION									"Calibration"
-#define(length=19, lines=1) MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF					"SD card [normal]"
+#define(length=19, lines=1) MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_OFF					"SD card  [normal]"
 #define(length=19, lines=1) MSG_TOSHIBA_FLASH_AIR_COMPATIBILITY_ON					"SD card [FlshAir]"
 #define(length=20, lines=1) MSG_PRINTER_DISCONNECTED			"Printer disconnected"
 #define(length=20, lines=1) MSG_FINISHING_MOVEMENTS				"Finishing movements"
@@ -369,6 +369,9 @@
 #define(length=20, lines=2) MSG_CRASH_DETECTED					"Crash detected. Continue printing?"
 
 #define(length=15, lines=1) MSG_INFO_EXTRUDER				"Extruder info"
+#define(length=15, lines=1) MSG_MENU_VOLTAGES               "Voltages"
+#define(length=15, lines=1) MSG_MENU_TEMPERATURES           "Temperatures"
+#define(length=15, lines=1) MSG_MENU_BELT_STATUS            "Belt status"
 
 #define(length=11, lines=1) MSG_INFO_NOZZLE_FAN				"Nozzle FAN:"
 #define(length=11, lines=1) MSG_INFO_PRINT_FAN				"Print FAN: "
@@ -383,10 +386,16 @@
 #define(length=20, lines=2) MSG_FILE_INCOMPLETE					"File incomplete. Continue anyway?"
 
 #define(length=20, lines=4) MSG_DEFAULT_SETTINGS_LOADED			"Default settings loaded"
-#define(length=17, lines=1) MSG_SORT_TIME						"Sort: [Time]"
-#define(length=17, lines=1) MSG_SORT_ALPHA						"Sort: [Alphabet]"
-#define(length=17, lines=1) MSG_SORT_NONE						"Sort: [None]"
+#define(length=17, lines=1) MSG_SORT_TIME						"Sort:      [Time]"
+#define(length=17, lines=1) MSG_SORT_ALPHA						"Sort:  [Alphabet]"
+#define(length=17, lines=1) MSG_SORT_NONE						"Sort:      [None]"
 #define(length=20, lines=1) MSG_SORTING							"Sorting files"
 #define(length=20, lines=4) MSG_FILE_CNT						"Some files will not be sorted. Max. No. of files in 1 folder for sorting is 100."
-#define(length=17, lines=1) MSG_SECOND_SERIAL_ON				"rPi port     [on]"
-#define(length=17, lines=1) MSG_SECOND_SERIAL_OFF				"rPi port    [off]"
+#define(length=17, lines=1) MSG_SECOND_SERIAL_ON				"RPi port     [on]"
+#define(length=17, lines=1) MSG_SECOND_SERIAL_OFF				"RPi port    [off]"
+
+#define(length=20, lines=4) MSG_CRASH_DET_ONLY_IN_NORMAL        "Crash detection can be turned on only in Normal mode."
+#define(length=20, lines=4) MSG_CRASH_DET_STEALTH_FORCE_OFF     "WARNING: Crash detection disabled in Stealth mode"
+
+#define(length=20, lines=4) MSG_AUTOLOADING_ENABLED     "Autoloading filament is active, just press the knob and insert filament..."
+

+ 12 - 11
Firmware/ultralcd.cpp

@@ -1583,8 +1583,9 @@ static void lcd_menu_temperatures()
 static void lcd_menu_voltages()
 {
 	float volt_pwr = VOLT_DIV_REF * ((float)current_voltage_raw_pwr / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC;
-	float volt_bed = VOLT_DIV_REF * ((float)current_voltage_raw_bed / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC;
-	fprintf_P(lcdout, PSTR(ESC_H(1,1)"PWR:      %d.%01dV" ESC_H(1,2)"BED:      %d.%01dV"), (int)volt_pwr, (int)(10*fabs(volt_pwr - (int)volt_pwr)), (int)volt_bed, (int)(10*fabs(volt_bed - (int)volt_bed)));
+	//float volt_bed = VOLT_DIV_REF * ((float)current_voltage_raw_bed / (1023 * OVERSAMPLENR)) / VOLT_DIV_FAC;
+	//fprintf_P(lcdout, PSTR(ESC_H(1,1)"PWR:      %d.%01dV" ESC_H(1,2)"BED:      %d.%01dV"), (int)volt_pwr, (int)(10*fabs(volt_pwr - (int)volt_pwr)), (int)volt_bed, (int)(10*fabs(volt_bed - (int)volt_bed)));
+    fprintf_P(lcdout, PSTR( ESC_H(1,1)"PWR:      %d.%01dV"), (int)volt_pwr, (int)(10*fabs(volt_pwr - (int)volt_pwr))) ;
     if (lcd_clicked())
     {
         lcd_quick_feedback();
@@ -1691,11 +1692,13 @@ static void lcd_support_menu()
   if (!IS_SD_PRINTING && !is_usb_printing && (lcd_commands_type != LCD_COMMAND_V2_CAL)) MENU_ITEM(function, MSG_XYZ_DETAILS, lcd_service_mode_show_result);
   MENU_ITEM(submenu, MSG_INFO_EXTRUDER, lcd_menu_extruder_info);
     
-  MENU_ITEM(submenu, PSTR("Belt status"), lcd_menu_belt_status);
+  MENU_ITEM(submenu, MSG_MENU_BELT_STATUS, lcd_menu_belt_status);
     
-  MENU_ITEM(submenu, PSTR("Temperatures"), lcd_menu_temperatures);
+  MENU_ITEM(submenu, MSG_MENU_TEMPERATURES, lcd_menu_temperatures);
 
-  MENU_ITEM(submenu, PSTR("Voltages"), lcd_menu_voltages);
+  MENU_ITEM(submenu, MSG_MENU_VOLTAGES, lcd_menu_voltages);
+    
+  MENU_ITEM(submenu, PSTR("Debug"), lcd_menu_debug);
   #endif //MK1BP
   END_MENU();
 }
@@ -1932,7 +1935,7 @@ void lcd_LoadFilament()
   {
 	  if (filament_autoload_enabled)
 	  {
-		  lcd_show_fullscreen_message_and_wait_P(PSTR("Autoloading filament is active, just insert filament..."));
+		  lcd_show_fullscreen_message_and_wait_P(MSG_AUTOLOADING_ENABLED);
 		  return;
 	  }
 	  custom_message = true;
@@ -3288,7 +3291,7 @@ static void lcd_sort_type_set() {
 
 static void lcd_crash_mode_info2()
 {
-	lcd_show_fullscreen_message_and_wait_P(PSTR("WARNING: crashdetection unavailable in STEALTH mode."));
+	lcd_show_fullscreen_message_and_wait_P(MSG_CRASH_DET_STEALTH_FORCE_OFF);
 }
 
 
@@ -3315,7 +3318,7 @@ static void lcd_silent_mode_set() {
 
 static void lcd_crash_mode_info()
 {
-	lcd_show_fullscreen_message_and_wait_P(PSTR("Crash-detection can be used only in NORMAL mode."));
+	lcd_show_fullscreen_message_and_wait_P(MSG_CRASH_DET_ONLY_IN_NORMAL);
 }
 
 
@@ -5060,8 +5063,6 @@ static void lcd_main_menu()
     
   MENU_ITEM(submenu, PSTR("Fail stats"), lcd_menu_fails_stats);
 
-  MENU_ITEM(submenu, PSTR("Debug"), lcd_menu_debug);
-
   MENU_ITEM(submenu, MSG_SUPPORT, lcd_support_menu);
 
   END_MENU();
@@ -7195,4 +7196,4 @@ void copy_and_scalePID_d()
 }
 */
 
-#endif //ULTRA_LCD
+#endif //ULTRA_LCD