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

Add local variant configuration version

This commit is contained in:
Ted Hess 2017-12-09 16:54:21 -05:00
parent ad6b53892e
commit 38b65a85df
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Firmware/Configuration.h
View File

@ -4,8 +4,14 @@
#include "boards.h" #include "boards.h"
#include "Configuration_prusa.h" #include "Configuration_prusa.h"
// Stringize helpers
#define XSTR(s) #s
#define STR(s) XSTR(s)
// Firmware version // Firmware version
#define FW_version "3.1.0" #define FW_version "3.1.0"
#define FW_local_variant 3
#define FW_report_version FW_version " r" STR(FW_local_variant)
#define FW_PRUSA3D_MAGIC "PRUSA3DFW" #define FW_PRUSA3D_MAGIC "PRUSA3DFW"
#define FW_PRUSA3D_MAGIC_LEN 10 #define FW_PRUSA3D_MAGIC_LEN 10

5
Firmware/ultralcd.cpp
View File

@ -1484,6 +1484,9 @@ static void lcd_support_menu()
MENU_ITEM(back, MSG_MAIN, lcd_main_menu); MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
MENU_ITEM(back, PSTR("Firmware:"), lcd_main_menu);
MENU_ITEM(back, PSTR(" " FW_report_version), lcd_main_menu);
#if 0
// Ideally this block would be optimized out by the compiler. // Ideally this block would be optimized out by the compiler.
const uint8_t fw_string_len = strlen_P(FW_VERSION_STR_P()); const uint8_t fw_string_len = strlen_P(FW_VERSION_STR_P());
if (fw_string_len < 6) { if (fw_string_len < 6) {
@ -1491,7 +1494,7 @@ static void lcd_support_menu()
} else { } else {
MENU_ITEM(back, PSTR("FW - " FW_version), lcd_main_menu); MENU_ITEM(back, PSTR("FW - " FW_version), lcd_main_menu);
} }
#endif
MENU_ITEM(back, MSG_PRUSA3D, lcd_main_menu); MENU_ITEM(back, MSG_PRUSA3D, lcd_main_menu);
MENU_ITEM(back, MSG_PRUSA3D_FORUM, lcd_main_menu); MENU_ITEM(back, MSG_PRUSA3D_FORUM, lcd_main_menu);
MENU_ITEM(back, MSG_PRUSA3D_HOWTO, lcd_main_menu); MENU_ITEM(back, MSG_PRUSA3D_HOWTO, lcd_main_menu);