fix: clear hasPendingWork queue before shutdown on multiple node types to prevent corruption - #2673
Open
NickDunklee wants to merge 4 commits into
Open
Conversation
Contributor
|
PR title doesn't fully reflect the changes. Also some of it is similar to #2663 |
Contributor
Author
|
Updating here for read consistency - that other PR disables auto-shutdown on powered nodes. This PR makes sure contacts are synced before the node powers off to prevent corruption. Thanks @disq ! 🤜 🤛 |
- hasPendingWork() extended so simple_repeater and
companion_radio both gate sleep and shutdown for
pending contact writes
- shutdown loops using hasPendingWork instead of ShutdownHandler
idea in previous PR
- uiTask shutdown behavior - all three variants (ui-new,
ui-tiny, ui-orig) now set a _wants_shutdown flag instead of
calling powerOff() directly
- "Power off in 5 seconds…" messages added everywhere a
shutdown is announced
- "all" (hopefully) eInk displays are now tagged together
using isEInk() constant
- "all" eInk displays will send a final "Shut Down" message
so the displays show "Shut Down" after a successful shutdown
- removed display text from ui-orig as none of those paths
have displays
- changed text formatting/syntax across all strings to match
- low power, "!"
- user-chosen or otherwise, "..."
- removed mention of 5 seconds since it could be 0-5 seconds
to shutdown after contact flush
NickDunklee
force-pushed
the
shutdown-contact-sync-pending-work
branch
from
June 5, 2026 21:50
f6e2bc9 to
f16c496
Compare
Contributor
Author
|
Updated to take into account recent dev changes, removed some code that would never be executed, and cleaned up messaging. |
NickDunklee
changed the title
Contributor
Author
|
Update: #2663 was about disabling power off when on mains power. This PR is about a different failure mode: making sure a manual/physical shutdown doesn't cut power while a contact-list write is still pending in the 5s lazy-write window ( |
NickDunklee
changed the title
NickDunklee
changed the title
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This PR is a cleanup and is in ref to my comments in #2627
Update: This PR has been updated so it can still be merged, as it is still relevant to clearing pending work before shutdown to try and prevent corruption during power off - which was different from another PR mentioned in comments. It also fixed some minor messaging text for consistency.
@ripplebiz had some recommendations for existing code flows, so I refactored to leverage that. It compiles against a few sensor/repeater/companion node types, but I haven't tested it yet.
AUTO_SHUTDOWN_MILLIVOLTS, no power checks, no power paths will still just run until the board dies - probably room for future improvements there_wants_shutdownflag instead of callingpowerOff()directly