chore(radio): collapse carried patches into OSSF fork integration pins - #477
Merged
Conversation
…ion pins Re-pin usp_zephyr, usp, zephyr, fprime, and fprime-zephyr to the Open-Source-Space-Foundation fork integration branches (feat/proves-usp-radio) and delete the migrated carried-patch machinery (patches 0001-0003, 0005-0010, fprime-com-aggregator-bounded-timeout, fprime-sched-tick-drop; Makefile targets usp-patches / usp-core-patches / zephyr-patches and the fprime apply steps in 'submodules'; the CI 'Apply carried patches' step). fprime-yamcs-noapp-path.patch stays: it patches the pip-installed fprime-yamcs package, not a submodule. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
12 tasks
Contributor
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
…table v2) The P5_GMSK_83K addition bumped LINK_PROFILE_COUNT/TABLE_VERSION but its host UT still asserted the v1 values, failing the unit-test job. UT fixed on the constituent P5 branch (fprime-zephyr PR #20, commit c874734) and merged into the integration branch (PR #22); this bumps the submodule pin to that head. make test-unit: 11/11 pass locally. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This was referenced Jul 27, 2026
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.
Collapse carried module patches into OSSF fork integration pins
All radio-stack module fixes formerly carried as
patches/*.patchnow live onOpen-Source-Space-Foundationfork integration branches (feat/proves-usp-radio). This PR re-pins the modules and deletes the migrated carried-patch machinery.fprime-yamcs-noapp-path.patch(pip-package patch) stays, with itsmake fprime-venvapply step.Pin changes
usp_zephyrbfacd430bf3e208124d43c55fcb7f91bae6a9ac9812ee71usp351b2018a60e4a16092f1bfa030b18494da267d8ca6a3bazephyrv4.4.13838a2802c916accdfa671de77633ee45b69441clib/fprime8a62e45baf163f3ba52ecfabaa39b4aa5847a3cecfb2ae6lib/fprime-zephyr(already OSSF)c9972724b8652e15849d21a3655943d30eda65c2dc886c0Removed patches → integration PRs
Each integration PR links its constituent PRs. Note: fprime-zephyr#22 is draft because it carries the draft P5 PR #20 (flight-adoption conditions pending).
Removed machinery: Makefile targets
usp-patches,usp-core-patches,zephyr-patches, the two fprime apply steps insidesubmodules, and CI's "Apply carried patches" step.patches/README.mdrewritten.Tree equivalence (verified in a scratch workspace built from this branch)
west update+ submodule init with NO patch targets; every module checked out at the integration head. Byte-compare vs (old pin + carried patches):v4.4.1-base= v4.4.1 tag).led-blinkerin Proves Reference #2 — perf change in the integration branch, never a carried patch).Regression evidence
Fork-branch stack HIL-regressed on the two-board v5e/GRC bench: Phase A rungs 1–7 (boot, CDC, radio RX, 100× wakeup hammer, TM load, RF profile matrix, end-to-end authenticated commanding over RF) + Phase B rungs 8–10 including the 24 h unattended soak, green 2026-07-26 (28 profile cycles, zero wedge/reboot/CDC events). Reports:
logs/HIL-REGRESSION-REPORT-phaseA.md,logs/HIL-REGRESSION-REPORT-phaseB.md.Bench smoke on THIS branch's build (direct-boot v5e image, banner
3838a2802c91verified in flash): clean boot, authenticated commanding round-trip (SEND_PKT post seq-align), P0→P4 switch + RF NO_OP on both boards (wedge-fix regression) and P4→P0 restore, //dl200k.bin (178,704 B) downlink completed cleanly. Timing was ~85 s rather than the stacked-image ~35 s because draft perf PRs #475 (ComDelay divider-0 passthrough) and #476 (v5e SPI/TCXO DTS) are PCR-side changes not on this branch — consistent with ComDelay's 10 Hz cap at 721 frames; not a module regression.🤖 Generated with Claude Code