From fde330af5a4143affc8bbc74af246e8bb5ac9c46 Mon Sep 17 00:00:00 2001 From: Andrew <18502096+classicrocker883@users.noreply.github.com> Date: Sun, 19 May 2024 22:50:24 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Fix=20MarlinUI=20"untyped"=20str?= =?UTF-8?q?ing=20args=20(#27046)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/src/lcd/marlinui.cpp | 8 ++++---- Marlin/src/lcd/marlinui.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp index 930a87a520..7f10363eac 100644 --- a/Marlin/src/lcd/marlinui.cpp +++ b/Marlin/src/lcd/marlinui.cpp @@ -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); diff --git a/Marlin/src/lcd/marlinui.h b/Marlin/src/lcd/marlinui.h index 53300a4400..835102546d 100644 --- a/Marlin/src/lcd/marlinui.h +++ b/Marlin/src/lcd/marlinui.h @@ -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);