No fs format nor file recreation and boot reason changes (updated for main) - #929
Open
tyeth wants to merge 18 commits into
Open
No fs format nor file recreation and boot reason changes (updated for main)#929tyeth wants to merge 18 commits into
tyeth wants to merge 18 commits into
Conversation
Bring PR #656 up to date with main. Conflict resolutions: - platformio.ini: take main's newer espressif32 platform (55.03.33). - Wippersnapper_FS.cpp constructor: keep main's clang-format + the PR's added delay(50) after the dependency dump. - initFilesystem(): keep the PR's brownout-aware init while folding in main's TinyUSBDevice.attach() on the non-brownout error path. - createBootFile(): keep the PR's build-then-compare/skip-if-unchanged design, but adopt main's "WipperSnapper Firmware Version" label and the new AirLift coprocessor firmware-version line. - createSecretsFile(): drop the stale #ifdef USE_DISPLAY show_scr_error() block. The display subsystem was rewritten on main (src/display removed, src/components/display added); USE_DISPLAY and WS._ui_helper no longer exist, so the block referenced removed APIs. Core behaviour (boot-out error, USB MSC re-init, fsHalt) is preserved. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
main now builds the espressif_esp32c5_devkitc_1_n8r4 target, which the reset-reason include chain in print_reset_reason did not cover, tripping the '#error Target CONFIG_IDF_TARGET is not supported' guard and leaving rtc_get_reset_reason undeclared. Add the esp32c5/rom/rtc.h case. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
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
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.
Updated/rebased-onto-
maincontinuation of #656 by @tyeth.This brings the work in #656 up to date with the current
mainbranch (which has since merged the display-v2 refactor, the bootlog-version disambiguation, the espressif32 platform bump, and many new sensor drivers) and resolves the merge conflicts.Original PR description (#656)
Conflict resolution notes
main's newer espressif32 platform (55.03.33).Wippersnapper_FS::Wippersnapper_FS()— keptmain's clang-format while preserving the PR's addeddelay(50)after the dependency dump.initFilesystem()— kept the PR's brownout-aware init while folding inmain's newTinyUSBDevice.attach()on the non-brownout error path (the brownout path deliberately avoids powering USB to save battery).createBootFile()— kept the PR's build-then-compare / skip-if-unchanged design, and folded inmain's"WipperSnapper Firmware Version"label and the new AirLift coprocessor firmware-version line.createSecretsFile()— dropped the now-stale#ifdef USE_DISPLAYWS._ui_helper->show_scr_error()block. The display subsystem was rewritten onmain(src/displayremoved,src/components/displayadded);USE_DISPLAYandWS._ui_helperno longer exist, so that block referenced removed APIs. Core behaviour (boot-out error, USB MSC re-init,fsHalt) is preserved.Build verification
raspberypi_picow(RP2040, Earle core — exercises the new reset-reason path): full build SUCCESS (RAM 36.5%, Flash 54.6%).adafruit_metro_esp32s2(TinyUSB/QSPI path): all sources compiled cleanly; only the local esptool image-packaging step failed due to a known local toolchain limitation — CI will verify the full image.Supersedes / continues #656.
🤖 Generated with Claude Code