3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-30 07:17:59 +00:00
Code Issues Releases Wiki Activity

🎨 Fix MarlinUI "untyped" string args (#27046)

Browse Source
This commit is contained in:
Andrew 2024-05-19 22:50:24 -04:00 committed by GitHub
parent e8d953257e
commit fde330af5a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/lcd/marlinui.cpp
View File

@ -1647,11 +1647,11 @@ void MarlinUI::host_notify(const char * const cstr) {
//
// Send the status line as a host notification
//
void MarlinUI::_set_status(const char * const cstr, const bool, const bool pgm) {
host_notify(cstr);
void MarlinUI::_set_status(const char * const ustr, const bool, const bool pgm) {
host_notify(ustr);
}
void MarlinUI::_set_alert(const char * const cstr, const int8_t, const bool pgm) {
host_notify(cstr);
void MarlinUI::_set_alert(const char * const ustr, const int8_t, const bool pgm) {
host_notify(ustr);
}
void MarlinUI::_set_status_and_level(const char * const ustr, const int8_t=0, const bool pgm) {
pgm ? host_notify_P(ustr) : host_notify(ustr);

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

@ -182,7 +182,7 @@ typedef bool (*statusResetFunc_t)();
static bool constexpr processing = false;
#endif
static void task();
static void soon(const AxisEnum axis OPTARG(MULTI_E_MANUAL, const int8_t eindex=active_extruder));
static void soon(const AxisEnum move_axis OPTARG(MULTI_E_MANUAL, const int8_t eindex=active_extruder));
};
void lcd_move_axis(const AxisEnum);
@ -370,7 +370,7 @@ public:
static constexpr uint8_t get_progress_percent() { return 0; }
#endif
static void host_notify_P(PGM_P const fstr);
static void host_notify_P(PGM_P const pstr);
static void host_notify(FSTR_P const fstr) { host_notify_P(FTOP(fstr)); }
static void host_notify(const char * const cstr);