diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 9f806b18..81c8a602 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -9,16 +9,30 @@ // Firmware version #define FW_VERSION "3.1.1-RC5" #define FW_COMMIT_NR 150 -#define FW_DEV_VERSION FW_VERSION_DEBUG +// FW_VERSION_UNKNOWN means this is an unofficial build. +// The firmware should only be checked into github with this symbol. +#define FW_DEV_VERSION FW_VERSION_UNKNOWN #define FW_REPOSITORY "Prusa3D/MK3" #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 -#define FW_VERSION_RC 1 -#define FW_VERSION_GOLD 0 +// Debug version has debugging enabled (the symbol DEBUG_BUILD is set). +// The debug build may be a bit slower than the non-debug build, therefore the debug build should +// not be shipped to a customer. +#define FW_VERSION_DEBUG 6 +// This is a development build. A development build is either built from an unofficial git repository, +// or from an unofficial branch, or it does not have a label set. Only the build server should set this build type. +#define FW_VERSION_DEVEL 5 +// This is an alpha release. Only the build server should set this build type. +#define FW_VERSION_ALPHA 4 +// This is a beta release. Only the build server should set this build type. +#define FW_VERSION_BETA 3 +// This is a release candidate build. Only the build server should set this build type. +#define FW_VERSION_RC 2 +// This is a final release. Only the build server should set this build type. +#define FW_VERSION_GOLD 1 +// This is an unofficial build. The firmware should only be checked into github with this symbol, +// the build server shall never produce builds with this build type. +#define FW_VERSION_UNKNOWN 0 #if FW_DEV_VERSION == FW_VERSION_DEBUG #define DEBUG_BUILD diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 94e76298..eee08b18 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -889,21 +889,21 @@ void factory_reset() void show_fw_version_warnings() { if (FW_DEV_VERSION == FW_VERSION_GOLD || FW_DEV_VERSION == FW_VERSION_RC) return; switch (FW_DEV_VERSION) { - 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): -#if 1 + 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_DEVEL): + case(FW_VERSION_DEBUG): lcd_update_enable(false); lcd_implementation_clear(); + #if FW_DEV_VERSION == FW_VERSION_DEVEL + lcd_print_at_PGM(0, 0, PSTR("Development build !!")); + #else lcd_print_at_PGM(0, 0, PSTR("Debbugging build !!!")); + #endif lcd_print_at_PGM(0, 1, PSTR("May destroy printer!")); lcd_print_at_PGM(0, 2, PSTR("ver ")); lcd_printPGM(PSTR(FW_VERSION_FULL)); lcd_print_at_PGM(0, 3, PSTR(FW_REPOSITORY)); lcd_wait_for_click(); -#else - lcd_show_fullscreen_message_and_wait_P(MSG_FW_VERSION_DEBUG); -#endif break; default: lcd_show_fullscreen_message_and_wait_P(MSG_FW_VERSION_UNKNOWN); break; } diff --git a/Firmware/language_all.cpp b/Firmware/language_all.cpp index 9ccc1a25..eaba17fe 100644 --- a/Firmware/language_all.cpp +++ b/Firmware/language_all.cpp @@ -845,13 +845,6 @@ 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 = { @@ -859,8 +852,8 @@ const char * const MSG_FW_VERSION_RC_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_FW_VERSION_RC_CZ }; -const char MSG_FW_VERSION_UNKNOWN_EN[] PROGMEM = "WARNING: Unknown firmware version"; -const char MSG_FW_VERSION_UNKNOWN_CZ[] PROGMEM = "VAROVANI: Neznama verze firmware"; +const char MSG_FW_VERSION_UNKNOWN_EN[] PROGMEM = "WARNING: This is an unofficial, unsupported build. Use at your own risk!"; +const char MSG_FW_VERSION_UNKNOWN_CZ[] PROGMEM = "VAROVANI: Neznama, nepodporovana verze firmware. Pouziti na vlastni nebezpeci!"; const char * const MSG_FW_VERSION_UNKNOWN_LANG_TABLE[LANG_NUM] PROGMEM = { MSG_FW_VERSION_UNKNOWN_EN, MSG_FW_VERSION_UNKNOWN_CZ diff --git a/Firmware/language_all.h b/Firmware/language_all.h index 22d35f49..bc535679 100644 --- a/Firmware/language_all.h +++ b/Firmware/language_all.h @@ -290,8 +290,6 @@ 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]; diff --git a/Firmware/language_cz.h b/Firmware/language_cz.h index 6a8dead2..75c09d40 100644 --- a/Firmware/language_cz.h +++ b/Firmware/language_cz.h @@ -401,8 +401,7 @@ #define MSG_FSENS_NOT_RESPONDING "CHYBA: Filament senzor nereaguje, zkontrolujte zapojeni." -#define MSG_FW_VERSION_UNKNOWN "VAROVANI: Neznama verze firmware" +#define MSG_FW_VERSION_UNKNOWN "VAROVANI: Neznama, nepodporovana verze firmware. Pouziti na vlastni nebezpeci!" #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." diff --git a/Firmware/language_en.h b/Firmware/language_en.h index 81e3bca6..059889a6 100644 --- a/Firmware/language_en.h +++ b/Firmware/language_en.h @@ -407,8 +407,7 @@ #define(length=20, lines=4) MSG_AUTOLOADING_ONLY_IF_FSENS_ON "Autoloading filament available only when filament sensor is turned on..." #define(length=20, lines=4) MSG_FSENS_NOT_RESPONDING "ERROR: Filament sensor is not responding, please check connection." -#define(length=20, lines=8) MSG_FW_VERSION_UNKNOWN "WARNING: Unknown firmware version" +#define(length=20, lines=8) MSG_FW_VERSION_UNKNOWN "WARNING: This is an unofficial, unsupported build. Use at your own risk!" #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." \ No newline at end of file