chore: 2.12.4 backports - #7729
Merged
Merged
Conversation
Hand-ported from upstream commit 2cc9784 (PR #7613). Upstream applies this to radio/src/targets/simu/simulib.cpp, which does not exist on 2.12 — that file only exists on main after f2a8d86 ("refactor(radio): move simulator to simu/") split simuInit() out of simpgmspace.cpp. On 2.12, simuInit() still lives in simpgmspace.cpp, so the fix is applied there instead. (cherry picked from commit 2cc9784) Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Co-authored-by: Peter Feerick <peter.feerick@gmail.com> Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com> (cherry picked from commit 34afae5)
(cherry picked from commit bfe6cd1)
pulsesEnableModule() gated PROTOCOL_CHANNELS_DSMP on DSM2 instead of DSMP; since DSMP=ON always forces DSM2 too, this only breaks when DSMP is turned off while DSM2 stays on, referencing the now-excluded DSMPDriver. menuModelSetup() combined the DSMP status case label with the shared MultiModule/AFHDS3/DSMP status block under one HARDWARE_EXTERNAL_MODULE guard, leaving the block gated on external-module hardware even for the internal-module MULTIMODULE case above it. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
…ype (#7736) Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
… plugins (#7737) Co-authored-by: Claude Opus 5 <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
5 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.
Tracking PR for commits backported from
main/other branches onto2.12for the 2.12.4 release. Rebase-merge only — please do not squash, the individual cherry-picked commit trail is the point.This is intended to be a quick-turnaround release, primarily to get the GX15 board fix (#7727, already merged directly to
2.12) re-released promptly.Already on
2.12(merged directly, no cherry-pick needed)2.12.Backported commits
radio/src/targets/simu/simulib.cpp, which doesn't exist on2.12(pre-dates themain-only refactor that splitsimuInit()out ofsimpgmspace.cpp). Applied the same fix directly insimpgmspace.cppinstead.backport/2.12)backport/2.12)backport/2.12)Planned, not guaranteed
These are on the radar for this release but still open upstream — will be added if/when merged, but won't hold up the release window if they aren't ready in time:
fix(lua): playNumber with PREC2 - last decimal digit missing #7364 fix(lua): playNumber with PREC2 - last decimal digit missingrejected for 2.12 due to behavioural changefix(stm32f4): Hangs during flashing firmware #7415 fix(stm32f4): Hangs during flashing firmwaredeferred to 2.12.5 as further tweaks and other mitigations neededfix(radio): exFat directory handling #7485 fix(radio): exFat directory handling- insufficient time for complete testingOutstanding Items
backport/2.12-labeled PRs milestoned 2.12.4 not yet coveredBuild-verified locally:
gtests-radio126/126 passing,zorrofirmware builds clean. Every non-mechanical commit reviewed against its source PR.