Skip to content

chore(pins): re-pin zephyr + fprime-zephyr onto trimmed integration branches #487

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

Merged
Mikefly123 merged 2 commits into from
Aug 2, 2026
Merged

chore(pins): re-pin zephyr + fprime-zephyr onto trimmed integration branches #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8213c3
chore(pins): re-pin zephyr + fprime-zephyr onto trimmed integration b…
Mikefly123 Aug 1, 2026
ca7bff6
chore(pins): drop the zephyr fork entirely — pin stock upstream v4.4.1
Mikefly123 Aug 1, 2026
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
2 changes: 1 addition & 1 deletion lib/fprime-zephyr
Open in desktop
Submodule fprime-zephyr updated 1 files
+2 −28 fprime-zephyr/Drv/UspRadio/UspRadio.cpp
11 changes: 7 additions & 4 deletions west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@ manifest:

projects:
# Zephyr RTOS core — Open-Source-Space-Foundation fork, integration branch
# feat/proves-usp-radio (v4.4.1 + CDC-ACM fixes, formerly patches/0005+0007;
# constituent PRs tracked in OSSF/zephyr#3).
# feat/proves-usp-radio-trimmed (v4.4.1 + the CDC-ACM TX-FIFO drain fix,
# formerly patches/0005; constituent PR tracked in OSSF/zephyr#1).
# The poll_out bounded-wait layer (OSSF/zephyr#2) was pruned 2026-08-01:
# its added bound sits behind data->flow_ctrl, which is false on the v5e
# from both devicetree and the explicit UART_CFG_FLOW_CTRL_NONE configure,
# so the code was unreachable in the flight image.
- name: zephyr
url: https://github.com/Open-Source-Space-Foundation/zephyr
revision: 3838a2802c916accdfa671de77633ee45b69441c
revision: 1f6485eca25431b5ff27ce9a754218c9e559bbbb
path: lib/zephyr-workspace/zephyr
west-commands: scripts/west-commands.yml
import:
Expand Down
Loading