diff options
| author | bubnikv <bubnikv@gmail.com> | 2018-01-17 19:40:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-17 19:40:43 +0300 |
| commit | 3852ba0b36a004d69f543b1003ce1777be4a9560 (patch) | |
| tree | 538c604967b1adf0ef04001c579555bfa1f3993d | |
| parent | b2c257478cd45760a6e1f67830e66ba46132bc68 (diff) | |
| parent | 4843f2c48e87d1f62f0ad98b559346f970af3170 (diff) | |
Merge pull request #413 from PavelSindler/initial_messages_update
initial message not shown on release candidate versions
| -rw-r--r-- | Firmware/Configuration.h | 2 | ||||
| -rw-r--r-- | Firmware/Marlin_main.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Firmware/Configuration.h b/Firmware/Configuration.h index 3351463b1..258b8c923 100644 --- a/Firmware/Configuration.h +++ b/Firmware/Configuration.h @@ -9,7 +9,7 @@ // Firmware version #define FW_VERSION "3.1.1-RC5" -#define FW_COMMIT_NR 148 +#define FW_COMMIT_NR 149 #define FW_DEV_VERSION FW_VERSION_RC #define FW_VERSION_FULL FW_VERSION "-" STR(FW_COMMIT_NR) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 306fc66fa..2f5c6f76d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -887,7 +887,7 @@ void factory_reset() } void show_fw_version_warnings() { - if (FW_DEV_VERSION == FW_VERSION_GOLD) return; + 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; |