thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow Status Message without LCD (#20246)

Browse Source
This commit is contained in:
Scott Lahteine
2020-11-22 18:44:17 -06:00
committed by GitHub
parent 9dedd121bf
commit 6f272e13c5
4 changed files with 147 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Marlin/src/lcd/marlinui.h
View File

@@ -373,17 +373,9 @@ public:
static constexpr uint8_t get_progress_percent() { return 0; }
#endif
#if HAS_DISPLAY
static void init();
static void update();
static void set_alert_status_P(PGM_P const message);
#if HAS_STATUS_MESSAGE
static char status_message[];
static bool has_status();
static uint8_t alert_level; // Higher levels block lower levels
static inline void reset_alert_level() { alert_level = 0; }
#if ENABLED(STATUS_MESSAGE_SCROLLING)
static uint8_t status_scroll_offset;
@@ -391,6 +383,28 @@ public:
static char* status_and_len(uint8_t &len);
#endif
static bool has_status();
static void reset_status(const bool no_welcome=false);
static void set_status(const char* const message, const bool persist=false);
static void set_status_P(PGM_P const message, const int8_t level=0);
static void status_printf_P(const uint8_t level, PGM_P const fmt, ...);
static void set_alert_status_P(PGM_P const message);
static inline void reset_alert_level() { alert_level = 0; }
#else
static constexpr bool has_status() { return false; }
static inline void reset_status(const bool=false) {}
static void set_status(const char* message, const bool=false);
static void set_status_P(PGM_P message, const int8_t=0);
static void status_printf_P(const uint8_t, PGM_P message, ...);
static inline void set_alert_status_P(PGM_P const) {}
static inline void reset_alert_level() {}
#endif
#if HAS_DISPLAY
static void init();
static void update();
static void abort_print();
static void pause_print();
static void resume_print();
@@ -481,25 +495,12 @@ public:
static bool get_blink();
static void kill_screen(PGM_P const lcd_error, PGM_P const lcd_component);
static void draw_kill_screen();
static void set_status(const char* const message, const bool persist=false);
static void set_status_P(PGM_P const message, const int8_t level=0);
static void status_printf_P(const uint8_t level, PGM_P const fmt, ...);
static void reset_status(const bool no_welcome=false);
#else // No LCD
// Send status to host as a notification
static void set_status(const char* message, const bool=false);
static void set_status_P(PGM_P message, const int8_t=0);
static void status_printf_P(const uint8_t, PGM_P message, ...);
static inline void init() {}
static inline void update() {}
static inline void return_to_status() {}
static inline void set_alert_status_P(PGM_P const) {}
static inline void reset_status(const bool=false) {}
static inline void reset_alert_level() {}
static constexpr bool has_status() { return false; }
#endif
@@ -702,7 +703,7 @@ public:
private:
#if HAS_DISPLAY
#if HAS_STATUS_MESSAGE
static void finish_status(const bool persist);
#endif