-
-
Notifications
You must be signed in to change notification settings - Fork 19.3k
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.
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
Sanitize HOST_PROMPT_SUPPORT
notifications
#22833
Merged
thinkyhead
merged 19 commits into
MarlinFirmware:bugfix-2.0.x
from
The-EG:sane-action-notifications
Feb 8, 2022
Merged
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
93dee40
Sanitize HOST_PROMPT_SUPPORT notifications
The-EG 2a29486
Fix up some status messages
thinkyhead fa8f232
Suppress "chitchat" messages
thinkyhead 4186bab
Merge 'upstream/bugfix-2.0.x' into pr/22833
thinkyhead 9ea805c
Refactor Host Actions as HostUI singleton
thinkyhead 6fafb8e
fix, move warnings
thinkyhead dd5958f
action arg
thinkyhead 644e246
stepper patch
thinkyhead d603a6b
Merge 'upstream/bugfix-2.0.x' into pr/22833
thinkyhead 0c3afb6
Merge remote-tracking branch 'github-desktop-the-eg/sane-action-notif…
thinkyhead d7e9873
style updates
thinkyhead c86c08a
Merge branch 'bugfix-2.0.x' into pr/22833
thinkyhead 93b877e
notify strings
thinkyhead f48f19f
Merge branch 'bugfix-2.0.x' into pr/22833
thinkyhead e48153a
Add some host action option comments
thinkyhead ed31787
Merge branch 'bugfix-2.0.x' into pr/22833
thinkyhead c37d46f
only call ExtUI::onFactoryReset once
thinkyhead 436d9b2
Merge 'bugfix-2.0.x' into pr/22833
thinkyhead 3241487
Update rambo test
thinkyhead File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -615,6 +615,7 @@ volatile bool Temperature::raw_temps_ready = false; | |
SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH); | ||
TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH)); | ||
TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH)); | ||
TERN_(HOST_PROMPT_SUPPORT, host_action_notify(STR_PID_TEMP_TOO_HIGH)); | ||
return; | ||
} | ||
|
||
|
@@ -710,6 +711,7 @@ volatile bool Temperature::raw_temps_ready = false; | |
SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH); | ||
TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH)); | ||
TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH)); | ||
TERN_(HOST_PROMPT_SUPPORT, host_action_notify(STR_PID_TEMP_TOO_HIGH)); | ||
break; | ||
} | ||
|
||
|
@@ -747,12 +749,14 @@ volatile bool Temperature::raw_temps_ready = false; | |
TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0)); | ||
TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TUNING_TIMEOUT)); | ||
TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT)); | ||
TERN_(HOST_PROMPT_SUPPORT, host_action_notify(STR_PID_TIMEOUT)); | ||
SERIAL_ECHOLNPGM(STR_PID_TIMEOUT); | ||
break; | ||
} | ||
|
||
if (cycles > ncycles && cycles > 2) { | ||
SERIAL_ECHOLNPGM(STR_PID_AUTOTUNE_FINISHED); | ||
TERN_(HOST_PROMPT_SUPPORT, host_action_notify("PID Autotune Finished!")); // TODO: New str value? | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Text sent to the host in this manner should be translatable. Only serial messages associated with host protocols should be hardcoded in English. |
||
|
||
#if EITHER(PIDTEMPBED, PIDTEMPCHAMBER) | ||
PGM_P const estring = GHV(PSTR("chamber"), PSTR("bed"), NUL_STR); | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One caveat with this concept is that the status message may be changed very often, either by G-code or by the host itself or one of its plugins. Note that the "Machine Ready" message, the current printing file's name, or some other non-null string is used as a response to "resetting" the status message.