sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Miscellaneous LCD code renaming, reordering (#12430)

Browse Source 
* Move special characters to language.h
* Apply some naming standards
* Clean up menu item draw functions
* Rename some Temperature methods
* UI => ExtUI
This commit is contained in:
Scott Lahteine
2018-11-14 13:13:51 -06:00
committed by GitHub
parent edfd106bc5
commit d82c350de7
17 changed files with 197 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Marlin/src/lcd/extensible_ui/ui_api.cpp
View File

@ -93,7 +93,7 @@ static struct {
uint8_t manual_motion : 1;
} flags;
namespace UI {
namespace ExtUI {
#ifdef __SAM3X8E__
/**
* Implement a special millis() to allow time measurement
@ -593,7 +593,7 @@ namespace UI {
#if ENABLED(PARK_HEAD_ON_PAUSE)
enqueue_and_echo_commands_P(PSTR("M125"));
#endif
UI::onStatusChanged(PSTR(MSG_PRINT_PAUSED));
ExtUI::onStatusChanged(PSTR(MSG_PRINT_PAUSED));
#endif
}
@ -605,7 +605,7 @@ namespace UI {
card.startFileprint();
print_job_timer.start();
#endif
UI::onStatusChanged(PSTR(MSG_PRINTING));
ExtUI::onStatusChanged(PSTR(MSG_PRINTING));
#endif
}
@ -613,7 +613,7 @@ namespace UI {
#if ENABLED(SDSUPPORT)
wait_for_heatup = wait_for_user = false;
card.abort_sd_printing = true;
UI::onStatusChanged(PSTR(MSG_PRINT_ABORTED));
ExtUI::onStatusChanged(PSTR(MSG_PRINT_ABORTED));
#endif
}
@ -678,7 +678,7 @@ namespace UI {
#endif
}
} // namespace UI
} // namespace ExtUI
// At the moment, we piggy-back off the ultralcd calls, but this could be cleaned up in the future
@ -686,7 +686,7 @@ void MarlinUI::init() {
#if ENABLED(SDSUPPORT) && PIN_EXISTS(SD_DETECT)
SET_INPUT_PULLUP(SD_DETECT_PIN);
#endif
UI::onStartup();
ExtUI::onStartup();
}
void MarlinUI::update() {
@ -698,23 +698,23 @@ void MarlinUI::update() {
if (sd_status) {
card.initsd();
if (card.cardOK)
UI::onMediaInserted();
ExtUI::onMediaInserted();
else
UI::onMediaError();
ExtUI::onMediaError();
}
else {
const bool ok = card.cardOK;
card.release();
if (ok) UI::onMediaRemoved();
if (ok) ExtUI::onMediaRemoved();
}
}
#endif // SDSUPPORT
UI::_processManualMoveToDestination();
UI::onIdle();
ExtUI::_processManualMoveToDestination();
ExtUI::onIdle();
}
void MarlinUI::setstatus(const char * const message, const bool persist/*=false*/) { UI::onStatusChanged(message); }
void MarlinUI::setstatusPGM(PGM_P const message, int8_t level/*=0*/) { UI::onStatusChanged((progmem_str)message); }
void MarlinUI::setstatus(const char * const message, const bool persist/*=false*/) { ExtUI::onStatusChanged(message); }
void MarlinUI::setstatusPGM(PGM_P const message, int8_t level/*=0*/) { ExtUI::onStatusChanged((progmem_str)message); }
void MarlinUI::setalertstatusPGM(PGM_P const message) { setstatusPGM(message, 0); }
void MarlinUI::status_printf_P(const uint8_t level, const char * const fmt, ...) {
@ -724,13 +724,13 @@ void MarlinUI::status_printf_P(const uint8_t level, const char * const fmt, ...)
vsnprintf_P(buff, sizeof(buff), fmt, args);
va_end(args);
buff[63] = '\0';
UI::onStatusChanged(buff);
ExtUI::onStatusChanged(buff);
}
void MarlinUI::kill_screen(PGM_P const msg) {
if (!flags.printer_killed) {
flags.printer_killed = true;
UI::onPrinterKilled(msg);
ExtUI::onPrinterKilled(msg);
}
}