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: USB_FlashDrive Power Loss Recovery Check #24015

Merged
merged 21 commits into from
May 23, 2022
Merged

Fix: USB_FlashDrive Power Loss Recovery Check #24015

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4bc38d9
Fix: USB Power Loss Recovery Check
robbycandra Apr 10, 2022
2c9b58d
Flatten formatting, add comments
thinkyhead Apr 16, 2022
c746416
Let CardReader handle auto#.g
thinkyhead Apr 16, 2022
c88fa69
Fix DEBUG MESSAGE location
robbycandra Apr 16, 2022
4c9b8ae
change name variable
robbycandra Apr 16, 2022
8dd9245
Use bitwise media status
robbycandra Apr 16, 2022
09acd3f
Fix SD_IGNORE_AT_STARTUP
robbycandra Apr 16, 2022
5cb6479
use bit fields
thinkyhead Apr 18, 2022
1820c18
cleanup, style
thinkyhead Apr 18, 2022
39e8c40
🧑‍💻 Add RESET_STEPPERS_ON_MEDIA_INSERT flag
thinkyhead Apr 18, 2022
c55336f
Merge branch 'bugfix-2.0.x' into pr/24015
thinkyhead Apr 18, 2022
1782206
revert a comment
thinkyhead Apr 18, 2022
39e2cfd
Pass inited flag to ui
thinkyhead Apr 18, 2022
4f54bd9
handle no media at startup
thinkyhead Apr 18, 2022
d5b6f3f
Fix Media status at startup
robbycandra Apr 20, 2022
b95892e
sp
thinkyhead Apr 21, 2022
3f7ac45
Merge branch 'bugfix-2.0.x' into pr/24015
thinkyhead Apr 24, 2022
d5ee518
Prevent media init if inserted after boot.
robbycandra Apr 27, 2022
2099492
millis is time since boot
thinkyhead May 14, 2022
dbad65e
temporary for compare
thinkyhead May 14, 2022
992ddf9
keep stat 2
thinkyhead May 23, 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
4 changes: 3 additions & 1 deletion Marlin/src/sd/cardreader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,6 @@ void CardReader::manage_media() {
if (ui.detected()) {

uint8_t old_stat = prev_stat;
prev_stat = stat; // Change now to prevent re-entry
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved

if (stat) { // Media Inserted
safe_delay(500); // Some boards need a delay to get settled
Expand All @@ -500,6 +499,9 @@ void CardReader::manage_media() {
#endif
}

if (stat == 0 && prev_stat == 2) return;
prev_stat = stat; // Change now to prevent re-entry

ui.media_changed(old_stat, stat); // Update the UI

if (stat) {
Expand Down