3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #413 from PavelSindler/initial_messages_update

Browse Source 
initial message not shown on release candidate versions
This commit is contained in:
bubnikv 2018-01-17 17:40:43 +01:00 committed by GitHub
commit 3852ba0b36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Firmware/Configuration.h
View File

@ -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)

2
Firmware/Marlin_main.cpp
View File

@ -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;