bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Extended reporting options (#16741)

Browse Source
This commit is contained in:
Gurmeet Athwal
2020-05-06 10:04:04 +05:30
committed by GitHub
parent 9ce950e3c1
commit a4c981469e
15 changed files with 268 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/extui/ui_api.cpp
View File

@ -893,7 +893,7 @@ namespace ExtUI {
bool isMachineHomed() { return all_axes_homed(); }
PGM_P getFirmwareName_str() {
static const char firmware_name[] PROGMEM = "Marlin " SHORT_BUILD_VERSION;
static PGMSTR(firmware_name, "Marlin " SHORT_BUILD_VERSION);
return firmware_name;
}

6
Marlin/src/lcd/ultralcd.cpp
View File

@ -1347,13 +1347,13 @@ void MarlinUI::update() {
PGM_P printing = GET_TEXT(MSG_PRINTING);
PGM_P welcome = GET_TEXT(WELCOME_MSG);
#if SERVICE_INTERVAL_1 > 0
static const char service1[] PROGMEM = { "> " SERVICE_NAME_1 "!" };
static PGMSTR(service1, "> " SERVICE_NAME_1 "!");
#endif
#if SERVICE_INTERVAL_2 > 0
static const char service2[] PROGMEM = { "> " SERVICE_NAME_2 "!" };
static PGMSTR(service2, "> " SERVICE_NAME_2 "!");
#endif
#if SERVICE_INTERVAL_3 > 0
static const char service3[] PROGMEM = { "> " SERVICE_NAME_3 "!" };
static PGMSTR(service3, "> " SERVICE_NAME_3 "!");
#endif
PGM_P msg;
if (printingIsPaused())