Conversation
Co-authored-by: Peter Feerick <5500713+pfeerick@users.noreply.github.com> Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com> (cherry picked from commit e623f3c)
isExternalModuleAvailable()'s DSMP-disabled guard referenced MODULE_TYPE_DSMP, which doesn't exist as an enum value (only MODULE_TYPE_LEMON_DSMP does). Currently dead since DSMP is always defined on STM32 targets, but would fail to compile if DSMP were ever disabled. Introduced by PR #7469 (e623f3c).
Contributor
|
@pfeerick thank you for taking care of Companion.. and the module name! |
Member
Author
|
No worries. This is only on hold for main until checked to see it actually works as it is code port only, not tested. |
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>
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
2 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.
Forward-port of #7469 (merged into
2.12as e623f3c) ontomain.Cherry-picked the squashed PR commit and resolved conflicts against main's since-refactored
ModuleData::isProtocolAvailable()andDSMPModuleStatus::getStatusString(). Also fixes a latent bug carried in from the original PR:gui_common.cppreferenced the nonexistentMODULE_TYPE_DSMPinstead ofMODULE_TYPE_LEMON_DSMP(the original fix for this, in d584237, was accidentally reverted by a later "chore: formatting" commit before the squash-merge).Both firmware (DSMP-enabled target) and companion builds verified clean, no new warnings.
See #7469 for the original feature description.