Fix telemetry for Spektrum/SRXL #13814
Merged
Conversation
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
Member
haslinghuis
commented
Aug 11, 2024
- fixes Spektrum serial Rx telemetry not working with BF 4.4. #12614
|
Do you want to test this code? You can flash it directly from Betaflight Configurator:
WARNING: It may be unstable. Use only for testing! |
blckmn
approved these changes
Aug 12, 2024
ledvinap
reviewed
Aug 12, 2024
src/main/target/common_pre.h
Outdated
| @@ -330,6 +330,10 @@ | |||
| #define USE_THRUST_LINEARIZATION | |||
| #define USE_TPA_MODE | |||
|
|
|||
| #if defined(USE_SERIALRX_SRXL2) && !defined(USE_SERIALRX_SPEKTRUM) | |||
There was a problem hiding this comment.
Is common_pre.h good place? it will be hard to modify in target.h.
But that would mean moving #ifdef USE_SERIALRX_SPEKTRUM (below) too and that would complicate things even mode.
src/main/target/common_pre.h
Outdated
| #if defined(USE_SERIALRX_SRXL2) && !defined(USE_SERIALRX_SPEKTRUM) | ||
| #define USE_SERIALRX_SPEKTRUM | ||
| #endif | ||
|
|
||
| #ifdef USE_SERIALRX_SPEKTRUM |
There was a problem hiding this comment.
Did you try this:
Suggested change
| #ifdef USE_SERIALRX_SPEKTRUM | |
| #if defined(USE_SERIALRX_SPEKTRUM) || defined(USE_SERIALRX_SRXL2) |
There was a problem hiding this comment.
Would work if we change it here too
betaflight/src/main/target/common_post.h
Lines 268 to 282 in f890287
ledvinap
approved these changes
Aug 12, 2024
|
Please fix #endif comments too |
blckmn
approved these changes
Aug 12, 2024
|
Great work! With SERIALRX_SPEKTRUM now I'm having telemetry running with my Spektrum SPM4651t. |
nerdCopter
approved these changes
Aug 14, 2024
haslinghuis
added a commit
to haslinghuis/betaflight
that referenced
this pull request
Aug 14, 2024
* Fix telemetry for Spektrum/SRXL * Update after ledvinap review * Update comments
blckmn
pushed a commit
that referenced
this pull request
Aug 15, 2024
mituritsyn
added a commit
to mituritsyn/betaflight
that referenced
this pull request
Sep 20, 2024
This reverts commit 04fe4b4.
mituritsyn
added a commit
to mituritsyn/betaflight
that referenced
this pull request
Sep 20, 2024
This reverts commit eb7f8ee.
haslinghuis
added a commit
that referenced
this pull request
Sep 24, 2024
* rename dMin, remove D_MIN_GAIN_MAX * rename vars * fix logic * fix logic * Revert "fix tests" This reverts commit c518c9c. * Revert "add yaw and other adjustment cases" This reverts commit 2cacd4b. * Revert "fix unit test" This reverts commit 3d88f41. * Revert "fix D adjustments change dmax instead of D" This reverts commit 7ee4e7f. * Revert "Fix telemetry for Spektrum/SRXL (#13814)" This reverts commit 04fe4b4. * review adjustments and test fixes * Reapply "Fix telemetry for Spektrum/SRXL (#13814)" This reverts commit eb7f8ee. * fix logic * Apply suggestions from code review Co-authored-by: Jan Post <Rm2k-Freak@web.de> Co-authored-by: Mark Haslinghuis <mark@numloq.nl> * fix d_max slider --------- Co-authored-by: Jan Post <Rm2k-Freak@web.de> Co-authored-by: Mark Haslinghuis <mark@numloq.nl>
|
backport to 4.5-maintenance? |
|
Agree for |
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.