From 54ec5528a0d8ebf4573af3ec78d8141d8a90dceb Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 14 Nov 2018 01:34:16 -0600 Subject: [PATCH] hasstatus => has_status --- Marlin/src/gcode/motion/G4.cpp | 2 +- Marlin/src/lcd/ultralcd.cpp | 2 +- Marlin/src/lcd/ultralcd.h | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/src/gcode/motion/G4.cpp b/Marlin/src/gcode/motion/G4.cpp index 6a0b6c2dd..fcee5df40 100644 --- a/Marlin/src/gcode/motion/G4.cpp +++ b/Marlin/src/gcode/motion/G4.cpp @@ -38,7 +38,7 @@ void GcodeSuite::G4() { SERIAL_ECHOLNPGM(MSG_Z_MOVE_COMP); #endif - if (!ui.hasstatus()) LCD_MESSAGEPGM(MSG_DWELL); + if (!ui.has_status()) LCD_MESSAGEPGM(MSG_DWELL); dwell(dwell_ms); } diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index ba0230441..945fa427d 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -1090,7 +1090,7 @@ void MarlinUI::finishstatus(const bool persist) { 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) { if (status_message_level > 0) return; diff --git a/Marlin/src/lcd/ultralcd.h b/Marlin/src/lcd/ultralcd.h index 7e1db1f80..b67b6e96a 100644 --- a/Marlin/src/lcd/ultralcd.h +++ b/Marlin/src/lcd/ultralcd.h @@ -303,7 +303,7 @@ public: #if ENABLED(STATUS_MESSAGE_SCROLLING) static uint8_t status_scroll_offset; #endif - static bool hasstatus(); + static bool has_status(); static uint8_t lcd_status_update_delay; static uint8_t status_message_level; // Higher levels block lower levels @@ -346,7 +346,7 @@ public: static void refresh() {} static inline void reset_alert_level() {} - static constexpr bool hasstatus() { return true; } + static constexpr bool has_status() { return true; } #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 reset_status() {} static inline void reset_alert_level() {} - static constexpr bool hasstatus() { return false; } + static constexpr bool has_status() { return false; } #endif