CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hasstatus => has_status

Browse Source
This commit is contained in:
Scott Lahteine 2018-11-14 01:34:16 -06:00
parent ebf585b673
commit 54ec5528a0
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/motion/G4.cpp
View File

@ -38,7 +38,7 @@ void GcodeSuite::G4() {
SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP); SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP);
#endif #endif
if (!ui.hasstatus()) LCD_MESSAGEPGM(MSG_DWELL); if (!ui.has_status()) LCD_MESSAGEPGM(MSG_DWELL);
dwell(dwell_ms); dwell(dwell_ms);
} }

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

@ -1090,7 +1090,7 @@ void MarlinUI::finishstatus(const bool persist) {
refresh(); refresh();
} }
bool MarlinUI::hasstatus() { return (status_message[0] != '\0'); } bool MarlinUI::has_status() { return (status_message[0] != '\0'); }
void MarlinUI::setstatus(const char * const message, const bool persist) { void MarlinUI::setstatus(const char * const message, const bool persist) {
if (status_message_level > 0) return; if (status_message_level > 0) return;

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

@ -303,7 +303,7 @@ public:
#if ENABLED(STATUS_MESSAGE_SCROLLING) #if ENABLED(STATUS_MESSAGE_SCROLLING)
static uint8_t status_scroll_offset; static uint8_t status_scroll_offset;
#endif #endif
static bool hasstatus(); static bool has_status();
static uint8_t lcd_status_update_delay; static uint8_t lcd_status_update_delay;
static uint8_t status_message_level; // Higher levels block lower levels static uint8_t status_message_level; // Higher levels block lower levels
@ -346,7 +346,7 @@ public:
static void refresh() {} static void refresh() {}
static inline void reset_alert_level() {} static inline void reset_alert_level() {}
static constexpr bool hasstatus() { return true; } static constexpr bool has_status() { return true; }
#endif #endif
@ -366,7 +366,7 @@ public:
static inline void status_printf_P(const uint8_t level, PGM_P const fmt, ...) { UNUSED(level); UNUSED(fmt); } static inline void status_printf_P(const uint8_t level, PGM_P const fmt, ...) { UNUSED(level); UNUSED(fmt); }
static inline void reset_status() {} static inline void reset_status() {}
static inline void reset_alert_level() {} static inline void reset_alert_level() {}
static constexpr bool hasstatus() { return false; } static constexpr bool has_status() { return false; }
#endif #endif