mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2024-11-27 13:56:24 +00:00
Fix host_action_notify and string types (#17953)
This commit is contained in:
parent
3b87fc19e4
commit
00e7599c8c
@ -37,7 +37,7 @@
|
|||||||
#include "runout.h"
|
#include "runout.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void host_action(const char * const pstr, const bool eol) {
|
void host_action(PGM_P const pstr, const bool eol) {
|
||||||
SERIAL_ECHOPGM("//action:");
|
SERIAL_ECHOPGM("//action:");
|
||||||
serialprintPGM(pstr);
|
serialprintPGM(pstr);
|
||||||
if (eol) SERIAL_EOL();
|
if (eol) SERIAL_EOL();
|
||||||
@ -74,33 +74,39 @@ void host_action(const char * const pstr, const bool eol) {
|
|||||||
PromptReason host_prompt_reason = PROMPT_NOT_DEFINED;
|
PromptReason host_prompt_reason = PROMPT_NOT_DEFINED;
|
||||||
|
|
||||||
void host_action_notify(const char * const message) {
|
void host_action_notify(const char * const message) {
|
||||||
|
host_action(PSTR("notification "), false);
|
||||||
|
SERIAL_ECHO(message);
|
||||||
|
SERIAL_EOL();
|
||||||
|
}
|
||||||
|
|
||||||
|
void host_action_notify_P(PGM_P const message) {
|
||||||
host_action(PSTR("notification "), false);
|
host_action(PSTR("notification "), false);
|
||||||
serialprintPGM(message);
|
serialprintPGM(message);
|
||||||
SERIAL_EOL();
|
SERIAL_EOL();
|
||||||
}
|
}
|
||||||
|
|
||||||
void host_action_prompt(const char * const ptype, const bool eol=true) {
|
void host_action_prompt(PGM_P const ptype, const bool eol=true) {
|
||||||
host_action(PSTR("prompt_"), false);
|
host_action(PSTR("prompt_"), false);
|
||||||
serialprintPGM(ptype);
|
serialprintPGM(ptype);
|
||||||
if (eol) SERIAL_EOL();
|
if (eol) SERIAL_EOL();
|
||||||
}
|
}
|
||||||
|
|
||||||
void host_action_prompt_plus(const char * const ptype, const char * const pstr, const char extra_char='\0') {
|
void host_action_prompt_plus(PGM_P const ptype, PGM_P const pstr, const char extra_char='\0') {
|
||||||
host_action_prompt(ptype, false);
|
host_action_prompt(ptype, false);
|
||||||
SERIAL_CHAR(' ');
|
SERIAL_CHAR(' ');
|
||||||
serialprintPGM(pstr);
|
serialprintPGM(pstr);
|
||||||
if (extra_char != '\0') SERIAL_CHAR(extra_char);
|
if (extra_char != '\0') SERIAL_CHAR(extra_char);
|
||||||
SERIAL_EOL();
|
SERIAL_EOL();
|
||||||
}
|
}
|
||||||
void host_action_prompt_begin(const PromptReason reason, const char * const pstr, const char extra_char/*='\0'*/) {
|
void host_action_prompt_begin(const PromptReason reason, PGM_P const pstr, const char extra_char/*='\0'*/) {
|
||||||
host_action_prompt_end();
|
host_action_prompt_end();
|
||||||
host_prompt_reason = reason;
|
host_prompt_reason = reason;
|
||||||
host_action_prompt_plus(PSTR("begin"), pstr, extra_char);
|
host_action_prompt_plus(PSTR("begin"), pstr, extra_char);
|
||||||
}
|
}
|
||||||
void host_action_prompt_button(const char * const pstr) { host_action_prompt_plus(PSTR("button"), pstr); }
|
void host_action_prompt_button(PGM_P const pstr) { host_action_prompt_plus(PSTR("button"), pstr); }
|
||||||
void host_action_prompt_end() { host_action_prompt(PSTR("end")); }
|
void host_action_prompt_end() { host_action_prompt(PSTR("end")); }
|
||||||
void host_action_prompt_show() { host_action_prompt(PSTR("show")); }
|
void host_action_prompt_show() { host_action_prompt(PSTR("show")); }
|
||||||
void host_prompt_do(const PromptReason reason, const char * const pstr, const char * const btn1/*=nullptr*/, const char * const btn2/*=nullptr*/) {
|
void host_prompt_do(const PromptReason reason, PGM_P const pstr, PGM_P const btn1/*=nullptr*/, PGM_P const btn2/*=nullptr*/) {
|
||||||
host_action_prompt_begin(reason, pstr);
|
host_action_prompt_begin(reason, pstr);
|
||||||
if (btn1) host_action_prompt_button(btn1);
|
if (btn1) host_action_prompt_button(btn1);
|
||||||
if (btn2) host_action_prompt_button(btn2);
|
if (btn2) host_action_prompt_button(btn2);
|
||||||
@ -127,7 +133,7 @@ void host_action(const char * const pstr, const bool eol) {
|
|||||||
serialprintPGM(m876_prefix); SERIAL_ECHOLNPAIR("ason: ", host_prompt_reason);
|
serialprintPGM(m876_prefix); SERIAL_ECHOLNPAIR("ason: ", host_prompt_reason);
|
||||||
serialprintPGM(m876_prefix); SERIAL_ECHOLNPAIR("sponse: ", response);
|
serialprintPGM(m876_prefix); SERIAL_ECHOLNPAIR("sponse: ", response);
|
||||||
#endif
|
#endif
|
||||||
const char *msg = PSTR("UNKNOWN STATE");
|
PGM_P msg = PSTR("UNKNOWN STATE");
|
||||||
const PromptReason hpr = host_prompt_reason;
|
const PromptReason hpr = host_prompt_reason;
|
||||||
host_prompt_reason = PROMPT_NOT_DEFINED; // Reset now ahead of logic
|
host_prompt_reason = PROMPT_NOT_DEFINED; // Reset now ahead of logic
|
||||||
switch (hpr) {
|
switch (hpr) {
|
||||||
|
@ -21,9 +21,9 @@
|
|||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "../inc/MarlinConfigPre.h"
|
#include "../inc/MarlinConfig.h"
|
||||||
|
|
||||||
void host_action(const char * const pstr, const bool eol=true);
|
void host_action(PGM_P const pstr, const bool eol=true);
|
||||||
|
|
||||||
#ifdef ACTION_ON_KILL
|
#ifdef ACTION_ON_KILL
|
||||||
void host_action_kill();
|
void host_action_kill();
|
||||||
@ -61,12 +61,13 @@ void host_action(const char * const pstr, const bool eol=true);
|
|||||||
|
|
||||||
void host_response_handler(const uint8_t response);
|
void host_response_handler(const uint8_t response);
|
||||||
void host_action_notify(const char * const message);
|
void host_action_notify(const char * const message);
|
||||||
void host_action_prompt_begin(const PromptReason reason, const char * const pstr, const char extra_char='\0');
|
void host_action_notify_P(PGM_P const message);
|
||||||
void host_action_prompt_button(const char * const pstr);
|
void host_action_prompt_begin(const PromptReason reason, PGM_P const pstr, const char extra_char='\0');
|
||||||
|
void host_action_prompt_button(PGM_P const pstr);
|
||||||
void host_action_prompt_end();
|
void host_action_prompt_end();
|
||||||
void host_action_prompt_show();
|
void host_action_prompt_show();
|
||||||
void host_prompt_do(const PromptReason reason, const char * const pstr, const char * const btn1=nullptr, const char * const btn2=nullptr);
|
void host_prompt_do(const PromptReason reason, PGM_P const pstr, PGM_P const btn1=nullptr, PGM_P const btn2=nullptr);
|
||||||
inline void host_prompt_open(const PromptReason reason, const char * const pstr, const char * const btn1=nullptr, const char * const btn2=nullptr) {
|
inline void host_prompt_open(const PromptReason reason, PGM_P const pstr, PGM_P const btn1=nullptr, PGM_P const btn2=nullptr) {
|
||||||
if (host_prompt_reason == PROMPT_NOT_DEFINED) host_prompt_do(reason, pstr, btn1, btn2);
|
if (host_prompt_reason == PROMPT_NOT_DEFINED) host_prompt_do(reason, pstr, btn1, btn2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1303,7 +1303,7 @@ void MarlinUI::update() {
|
|||||||
if (level < alert_level) return;
|
if (level < alert_level) return;
|
||||||
alert_level = level;
|
alert_level = level;
|
||||||
|
|
||||||
TERN_(HOST_PROMPT_SUPPORT, host_action_notify(message));
|
TERN_(HOST_PROMPT_SUPPORT, host_action_notify_P(message));
|
||||||
|
|
||||||
// Since the message is encoded in UTF8 it must
|
// Since the message is encoded in UTF8 it must
|
||||||
// only be cut on a character boundary.
|
// only be cut on a character boundary.
|
||||||
@ -1450,10 +1450,10 @@ void MarlinUI::update() {
|
|||||||
TERN(HOST_PROMPT_SUPPORT, host_action_notify(message), UNUSED(message));
|
TERN(HOST_PROMPT_SUPPORT, host_action_notify(message), UNUSED(message));
|
||||||
}
|
}
|
||||||
void MarlinUI::set_status_P(PGM_P message, const int8_t) {
|
void MarlinUI::set_status_P(PGM_P message, const int8_t) {
|
||||||
TERN(HOST_PROMPT_SUPPORT, host_action_notify(message), UNUSED(message));
|
TERN(HOST_PROMPT_SUPPORT, host_action_notify_P(message), UNUSED(message));
|
||||||
}
|
}
|
||||||
void MarlinUI::status_printf_P(const uint8_t, PGM_P const message, ...) {
|
void MarlinUI::status_printf_P(const uint8_t, PGM_P const message, ...) {
|
||||||
TERN(HOST_PROMPT_SUPPORT, host_action_notify(message), UNUSED(message));
|
TERN(HOST_PROMPT_SUPPORT, host_action_notify_P(message), UNUSED(message));
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // !HAS_DISPLAY
|
#endif // !HAS_DISPLAY
|
||||||
|
Loading…
Reference in New Issue
Block a user