Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update marlinui.h/cpp to match args #27046

Merged
merged 1 commit into from
May 20, 2024
Merged

Update marlinui.h/cpp to match args #27046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Marlin/src/lcd/marlinui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1633,11 +1633,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);
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/marlinui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,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);
Expand Down Expand Up @@ -364,7 +364,7 @@ class MarlinUI {
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);

Expand Down
Loading