From d8213c392d0b12f2183fbedba0043151e080265b Mon Sep 17 00:00:00 2001 From: Michael Pham Date: Sat, 1 Aug 2026 10:48:17 -0700 Subject: [PATCH] chore(pins): re-pin zephyr + fprime-zephyr onto trimmed integration branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drops two changes from the USP radio changeset as part of the pre-merge blast-radius trim. Both were pruned on the merits; neither costs any measured throughput. fprime-zephyr c81485f -> 3da24b8 (feat/proves-usp-radio-trimmed) Removes the re-arm semaphore (OSSF/fprime-zephyr#19, closed). It had a measured null result — 35.8 s before and after, 1.00x on the downlink ladder — and the PR body itself retracted its premise: the k_sleep poll it replaced never actually slept at saturation. The GFSK RX->TX wedge fix (#23) was rebased off it onto feat/usp-radio. Verified: the rebased tree differs from the pre-trim tree by exactly the semaphore's 30 lines in UspRadio.cpp — quiesceRadio(), the TX_DONE timeout recovery, the comStatus-SUCCESS-after-drop path and the TxOutcomePolicy UTs are all intact. P5_GMSK_83K (#20, draft) was rebased onto the new #23 head and is retained unchanged. zephyr 3838a28 -> 144acbc (feat/proves-usp-radio-trimmed) Removes the cdc_acm poll_out bounded wait (OSSF/zephyr#2, closed). The added bound sits behind data->flow_ctrl, which is false on the v5e from both directions: hw-flow-control is absent from the cdc_acm_uart0 node (verified in the generated devicetree, not just source), and the sole uart_configure() caller sets UART_CFG_FLOW_CTRL_NONE. The code was unreachable in the flight image. The TX-FIFO drain fix (#1) is explicitly RETAINED — it is reachable wherever a USB host is enumerated, which includes the self-hosted integration-uart/integration-radio runners and their Korad power-cycle and re-enumeration steps. Fork delta drops from +21/-1 to +11/-0. Old branches feat/proves-usp-radio are retained on both forks pending review of this pin; pruned branches are retained for recoverability. Co-Authored-By: Claude --- lib/fprime-zephyr | 2 +- west.yml | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/fprime-zephyr b/lib/fprime-zephyr index c81485ff..3da24b8e 160000 --- a/lib/fprime-zephyr +++ b/lib/fprime-zephyr @@ -1 +1 @@ -Subproject commit c81485ff8c73a76772ae85f3b388a2d57d0ec9fc +Subproject commit 3da24b8e631327cad09ac55503a082c088f7e00a diff --git a/west.yml b/west.yml index 3eb4c708..3a49ada6 100644 --- a/west.yml +++ b/west.yml @@ -15,11 +15,15 @@ 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: 144acbce8713ff856e15577487b8bd5dd571c5c2 path: lib/zephyr-workspace/zephyr west-commands: scripts/west-commands.yml import: