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

Wake up on sd card and go to main screen on remove #27197

Merged
merged 9 commits into from
Jul 6, 2024
Merged

Wake up on sd card and go to main screen on remove #27197

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0ea398e
Wake up screen on media insert/remove
dbuezas Jun 21, 2024
9acde27
Back to main menu on card remove
dbuezas Jun 21, 2024
68014c1
Fix test
dbuezas Jun 25, 2024
1421273
fix test
dbuezas Jun 27, 2024
c7d42f5
only wake up if lcd can sleep
dbuezas Jun 30, 2024
c8e81fa
tweak
thinkyhead Jul 5, 2024
e461ad3
try this way
thinkyhead Jul 6, 2024
457b1bc
tweaks
thinkyhead Jul 6, 2024
f866c6b
Merge branch 'bugfix-2.1.x' into pr/27197
thinkyhead Jul 6, 2024
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
1 change: 1 addition & 0 deletions Marlin/src/lcd/marlinui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1828,6 +1828,7 @@ void MarlinUI::host_notify(const char * const cstr) {
#endif

void MarlinUI::media_changed(const uint8_t old_status, const uint8_t status) {
TERN_(HAS_DISPLAY_SLEEP, refresh_screen_timeout());
if (old_status == status) {
TERN_(EXTENSIBLE_UI, ExtUI::onMediaError()); // Failed to mount/unmount
return;
Expand Down
1 change: 1 addition & 0 deletions Marlin/src/sd/cardreader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@ void CardReader::manage_media() {
}
else {
TERN_(HAS_SD_DETECT, release()); // Card is released
TERN_(HAS_WIRED_LCD, ui.return_to_status()); // Force SPI/I2C LCD models to return to status screen
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
}

ui.media_changed(old_stat, stat); // Update the UI or flag an error
Expand Down