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

Fix heating cooling status message #23135

Merged
merged 20 commits into from
Mar 25, 2022
Merged

Fix heating cooling status message #23135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
051ca35
Prevent set status message for M104
robbycandra Nov 15, 2021
a0114d4
Prevent set status message for M140
robbycandra Nov 15, 2021
e26457d
Setup variable for status message reset with expired time.
robbycandra Nov 18, 2021
7218607
set status_meesage_reset_ms from set_status();
robbycandra Nov 18, 2021
22bdc36
Bed Heater status message
robbycandra Nov 18, 2021
3ba5b31
HotEnd Status Message
robbycandra Nov 18, 2021
5c432c6
define STATUS_MESSAGE_TIMEOUT
robbycandra Nov 18, 2021
0b100ed
GLOBAL_STATUS_MESSAGE is never defined
robbycandra Nov 18, 2021
72be990
move STATUS_MESSAGE_TIMEOUT to Conditionals_LCD
robbycandra Nov 19, 2021
be67847
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/23135
thinkyhead Mar 25, 2022
a816f1f
tweaks
thinkyhead Mar 25, 2022
16a3f54
Interpret negative level
thinkyhead Mar 25, 2022
e6c7dfe
Use seconds for config
thinkyhead Mar 25, 2022
04c2f81
message tweaks
thinkyhead Mar 25, 2022
3b543af
message reset callback
thinkyhead Mar 25, 2022
4590ba8
No "cooling" message for low temps
thinkyhead Mar 25, 2022
2f31b31
serial text in english only
thinkyhead Mar 25, 2022
5c7dd35
rename cb
thinkyhead Mar 25, 2022
a4cfd83
Merge 'bugfix-2.0.x' into pr/23135
thinkyhead Mar 25, 2022
17a0c24
use #warning
thinkyhead Mar 25, 2022
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
3 changes: 3 additions & 0 deletions Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1352,6 +1352,9 @@
// Scroll a longer status message into view
//#define STATUS_MESSAGE_SCROLLING

// Apply a timeout to low-priority status messages
//#define STATUS_MESSAGE_TIMEOUT_SEC 30 // (seconds)

// On the Info Screen, display XY with one decimal place when possible
//#define LCD_DECIMAL_SMALL_XY

Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/inc/Conditionals_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,10 @@
#define HAS_PRINT_PROGRESS 1
#endif

#if STATUS_MESSAGE_TIMEOUT_SEC > 0
#define HAS_STATUS_MESSAGE_TIMEOUT 1
#endif

#if ENABLED(SDSUPPORT) && SD_PROCEDURE_DEPTH
#define HAS_MEDIA_SUBCALLS 1
#endif
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/inc/Warnings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,10 @@
#warning "Contrast cannot be changed when LCD_CONTRAST_MIN >= LCD_CONTRAST_MAX."
#endif

#if PROGRESS_MSG_EXPIRE > 0 && HAS_STATUS_MESSAGE_TIMEOUT
#warning "It is recommended not to combine PROGRESS_MSG_EXPIRE with STATUS_MESSAGE_TIMEOUT_SEC."
#endif

/**
* FYSETC backlighting
*/
Expand Down
18 changes: 16 additions & 2 deletions Marlin/src/lcd/marlinui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
#endif
char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
uint8_t MarlinUI::alert_level; // = 0
#if HAS_STATUS_MESSAGE_TIMEOUT
millis_t MarlinUI::status_message_expire_ms; // = 0
#endif
statusResetFunc_t MarlinUI::status_reset_callback; // = nullptr
#endif

Expand Down Expand Up @@ -628,8 +631,17 @@ void MarlinUI::init() {

#endif // BASIC_PROGRESS_BAR

if (status_reset_callback && (*status_reset_callback)())
reset_status();
bool did_expire = status_reset_callback && (*status_reset_callback)();

#if HAS_STATUS_MESSAGE_TIMEOUT
#ifndef GOT_MS
#define GOT_MS
const millis_t ms = millis();
#endif
did_expire |= status_message_expire_ms && ELAPSED(ms, status_message_expire_ms);
#endif

if (did_expire) reset_status();

#if HAS_MARLINUI_MENU
if (use_click()) {
Expand Down Expand Up @@ -1521,6 +1533,8 @@ void MarlinUI::init() {

set_status_reset_fn();

TERN_(HAS_STATUS_MESSAGE_TIMEOUT, status_message_expire_ms = persist ? 0 : millis() + (STATUS_MESSAGE_TIMEOUT_SEC) * 1000UL);

#if HAS_WIRED_LCD

#if BASIC_PROGRESS_BAR || BOTH(FILAMENT_LCD_DISPLAY, SDSUPPORT)
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/lcd/marlinui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,10 @@ class MarlinUI {
static char status_message[];
static uint8_t alert_level; // Higher levels block lower levels

#if HAS_STATUS_MESSAGE_TIMEOUT
static millis_t status_message_expire_ms; // Reset some status messages after a timeout
#endif

#if ENABLED(STATUS_MESSAGE_SCROLLING)
static uint8_t status_scroll_offset;
static void advance_status_scroll();
Expand Down