Browse Source

Merge pull request #412 from PavelSindler/debug_version

initial message for debugging fw version
PavelSindler 6 years ago
parent
commit
b5f8b1d97c

+ 1 - 0
Firmware/Configuration.h

@@ -13,6 +13,7 @@
 #define FW_DEV_VERSION FW_VERSION_RC
 #define FW_VERSION_FULL FW_VERSION "-" STR(FW_COMMIT_NR)
 
+#define FW_VERSION_DEBUG 5
 #define FW_VERSION_UNKNOWN 4
 #define FW_VERSION_ALPHA 3
 #define FW_VERSION_BETA 2

+ 1 - 0
Firmware/Marlin_main.cpp

@@ -892,6 +892,7 @@ void show_fw_version_warnings() {
 	case(FW_VERSION_ALPHA): lcd_show_fullscreen_message_and_wait_P(MSG_FW_VERSION_ALPHA); break;
 	case(FW_VERSION_BETA): lcd_show_fullscreen_message_and_wait_P(MSG_FW_VERSION_BETA); break;
 	case(FW_VERSION_RC): lcd_show_fullscreen_message_and_wait_P(MSG_FW_VERSION_RC); break;
+	case(FW_VERSION_DEBUG): lcd_show_fullscreen_message_and_wait_P(MSG_FW_VERSION_DEBUG); break;
 	default: lcd_show_fullscreen_message_and_wait_P(MSG_FW_VERSION_UNKNOWN); break;
 	}
 	lcd_update_enable(true);

+ 7 - 0
Firmware/language_all.cpp

@@ -845,6 +845,13 @@ const char * const MSG_FW_VERSION_BETA_LANG_TABLE[LANG_NUM] PROGMEM = {
 	MSG_FW_VERSION_BETA_CZ
 };
 
+const char MSG_FW_VERSION_DEBUG_EN[] PROGMEM = "This is development firmware version which contains additional debugging features. Using this version may cause printer damage.";
+const char MSG_FW_VERSION_DEBUG_CZ[] PROGMEM = "Toto je vyvojova verze firmwaru obsahujici funkce pro debugging. Pouziti teto verze muze poskodit Vasi tiskarnu.";
+const char * const MSG_FW_VERSION_DEBUG_LANG_TABLE[LANG_NUM] PROGMEM = {
+	MSG_FW_VERSION_DEBUG_EN,
+	MSG_FW_VERSION_DEBUG_CZ
+};
+
 const char MSG_FW_VERSION_RC_EN[] PROGMEM = "This firmware version is release candidate. Some of the features may not work properly.";
 const char MSG_FW_VERSION_RC_CZ[] PROGMEM = "Tato verze firmware je release candidate. Nektere z funkci nemusi pracovat spolehlive.";
 const char * const MSG_FW_VERSION_RC_LANG_TABLE[LANG_NUM] PROGMEM = {

+ 2 - 0
Firmware/language_all.h

@@ -290,6 +290,8 @@ extern const char* const MSG_FW_VERSION_ALPHA_LANG_TABLE[LANG_NUM];
 #define MSG_FW_VERSION_ALPHA LANG_TABLE_SELECT(MSG_FW_VERSION_ALPHA_LANG_TABLE)
 extern const char* const MSG_FW_VERSION_BETA_LANG_TABLE[LANG_NUM];
 #define MSG_FW_VERSION_BETA LANG_TABLE_SELECT(MSG_FW_VERSION_BETA_LANG_TABLE)
+extern const char* const MSG_FW_VERSION_DEBUG_LANG_TABLE[LANG_NUM];
+#define MSG_FW_VERSION_DEBUG LANG_TABLE_SELECT(MSG_FW_VERSION_DEBUG_LANG_TABLE)
 extern const char* const MSG_FW_VERSION_RC_LANG_TABLE[LANG_NUM];
 #define MSG_FW_VERSION_RC LANG_TABLE_SELECT(MSG_FW_VERSION_RC_LANG_TABLE)
 extern const char* const MSG_FW_VERSION_UNKNOWN_LANG_TABLE[LANG_NUM];

+ 27 - 27
Firmware/language_cz.h

@@ -74,7 +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_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"
@@ -265,7 +265,7 @@
 #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_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."
@@ -345,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 [N/A]"
@@ -355,12 +355,12 @@ ve
 #define MSG_CRASHDETECT_OFF					"Crash det.  [vyp]"
 #define MSG_FANS_CHECK_ON					"Kontr. vent.[zap]"
 #define MSG_FANS_CHECK_OFF					        "Kontr. vent.[vyp]"
-#define(length=17, lines=1) MSG_FSENS_AUTOLOAD_ON   "F. autozav. [zap]"
-#define(length=17, lines=1) MSG_FSENS_AUTOLOAD_OFF  "F. autozav. [vyp]"
-#define(length=17, lines=1) MSG_FSENS_AUTOLOAD_NA  "F. autozav. [N/A]"
+#define MSG_FSENS_AUTOLOAD_ON   "F. autozav. [zap]"
+#define MSG_FSENS_AUTOLOAD_OFF  "F. autozav. [vyp]"
+#define MSG_FSENS_AUTOLOAD_NA  "F. autozav. [N/A]"
 #define MSG_RECOVERING_PRINT				"Obnovovani tisku    "
-#define(length=20, lines=1) MSG_CRASH_DETECTED   "Detekovan naraz."
-#define(length=20, lines=2) MSG_CRASH_DETECTED2   "Naraz detekovan, pokracovat v tisku?"
+#define MSG_CRASH_DETECTED   "Detekovan naraz."
+#define MSG_CRASH_DETECTED2   "Naraz detekovan, pokracovat v tisku?"
 
 #define MSG_SELFTEST_AXIS					"Osa"
 #define MSG_SELFTEST_AXIS_LENGTH			"Delka osy"
@@ -378,31 +378,31 @@ ve
 #define MSG_SORT_TIME						"Trideni     [Cas]"
 #define MSG_SORT_ALPHA						"Trideni [Abeceda]"
 #define MSG_SORT_NONE						"Trideni   [Zadne]"
-#define(length=20, lines=1) MSG_SORTING                            "Trideni souboru"
-
+#define MSG_SORTING                            "Trideni souboru"
 
-#define(length=12, lines=1) MSG_INFO_NOZZLE_FAN                 "Trysk. vent:"
-#define(length=12, lines=1) MSG_INFO_PRINT_FAN                  "Tisk. vent:"
 
+#define MSG_INFO_NOZZLE_FAN                 "Trysk. vent:"
+#define MSG_INFO_PRINT_FAN                  "Tisk. vent:"
 
-#define(length=17, lines=1) MSG_SECOND_SERIAL_ON                 "RPi port    [zap]"
-#define(length=17, lines=1) MSG_SECOND_SERIAL_OFF                "RPi port    [vyp]"
 
-#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 MSG_SECOND_SERIAL_ON                 "RPi port    [zap]"
+#define MSG_SECOND_SERIAL_OFF                "RPi port    [vyp]"
 
-#define(length=20, lines=4) MSG_CRASH_DET_ONLY_IN_NORMAL        "\x1b[2JCrash detekce muze\x1b[1;0Hbyt zapnuta pouze v\x1b[2;0HNormal modu"
-#define(length=20, lines=4) MSG_CRASH_DET_STEALTH_FORCE_OFF     "\x1b[2JPOZOR:\x1b[1;0HCrash detekce\x1b[2;0Hdeaktivovana ve\x1b[3;0HStealth modu"
+#define MSG_INFO_EXTRUDER                "Extruder info"
+#define MSG_MENU_VOLTAGES               "Napeti"
+#define MSG_MENU_TEMPERATURES           "Teploty"
+#define MSG_MENU_BELT_STATUS            "Stav remenu"
 
-#define(length=20, lines=4) MSG_AUTOLOADING_ENABLED             "Automaticke zavadeni filamentu aktivni, stisknete tlacitko a vlozte filament..."
-#define(length=20, lines=4) MSG_AUTOLOADING_ONLY_IF_FSENS_ON    "Automaticke zavadeni filamentu dostupne pouze pri zapnutem filament senzoru..."
+#define MSG_CRASH_DET_ONLY_IN_NORMAL        "\x1b[2JCrash detekce muze\x1b[1;0Hbyt zapnuta pouze v\x1b[2;0HNormal modu"
+#define MSG_CRASH_DET_STEALTH_FORCE_OFF     "\x1b[2JPOZOR:\x1b[1;0HCrash detekce\x1b[2;0Hdeaktivovana ve\x1b[3;0HStealth modu"
 
-#define(length=20, lines=4) MSG_FSENS_NOT_RESPONDING     "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni."
+#define MSG_AUTOLOADING_ENABLED             "Automaticke zavadeni filamentu aktivni, stisknete tlacitko a vlozte filament..."
+#define MSG_AUTOLOADING_ONLY_IF_FSENS_ON    "Automaticke zavadeni filamentu dostupne pouze pri zapnutem filament senzoru..."
 
-#define(length=20, lines=8) MSG_FW_VERSION_UNKNOWN		 "VAROVANI: Neznama verze firmware"
-#define(length=20, lines=8) MSG_FW_VERSION_ALPHA		 "Pouzivate alpha verzi firmwaru. Jedna se o vyvojovou verzi. Pouzivani teto verze firmware neni doporuceno a muze zpusobit poskozeni tiskarny." 
-#define(length=20, lines=8) MSG_FW_VERSION_BETA			 "Pouzivate beta verzi firmwaru. Jedna se o vyvojovou verzi. Pouzivani teto verze firmware neni doporuceno a muze zpusobit poskozeni tiskarny."
-#define(length=20, lines=8) MSG_FW_VERSION_RC			 "Tato verze firmware je release candidate. Nektere z funkci nemusi pracovat spolehlive."
+#define MSG_FSENS_NOT_RESPONDING     "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni."
 
+#define MSG_FW_VERSION_UNKNOWN		 "VAROVANI: Neznama verze firmware"
+#define MSG_FW_VERSION_ALPHA		 "Pouzivate alpha verzi firmwaru. Jedna se o vyvojovou verzi. Pouzivani teto verze firmware neni doporuceno a muze zpusobit poskozeni tiskarny." 
+#define MSG_FW_VERSION_BETA			 "Pouzivate beta verzi firmwaru. Jedna se o vyvojovou verzi. Pouzivani teto verze firmware neni doporuceno a muze zpusobit poskozeni tiskarny."
+#define MSG_FW_VERSION_RC			 "Tato verze firmware je release candidate. Nektere z funkci nemusi pracovat spolehlive."
+#define MSG_FW_VERSION_DEBUG		 "Toto je vyvojova verze firmwaru obsahujici funkce pro debugging. Pouziti teto verze muze poskodit Vasi tiskarnu."

+ 1 - 0
Firmware/language_en.h

@@ -411,3 +411,4 @@
 #define(length=20, lines=8) MSG_FW_VERSION_ALPHA		 "You are using firmware alpha version. This is development version. Using this version is not recommended and may cause printer damage." 
 #define(length=20, lines=8) MSG_FW_VERSION_BETA			 "You are using firmware beta version. This is development version. Using this version is not recommended and may cause printer damage."
 #define(length=20, lines=8) MSG_FW_VERSION_RC			 "This firmware version is release candidate. Some of the features may not work properly."
+#define(length=20, lines=8) MSG_FW_VERSION_DEBUG		 "This is development firmware version which contains additional debugging features. Using this version may cause printer damage."