CRSF Baro Altitude and Vario, AirSpeed (fixed conflicts from #11100)#11168
Open
sensei-hacker wants to merge 5 commits intoiNavFlight:maintenance-10.xfrom
Open
CRSF Baro Altitude and Vario, AirSpeed (fixed conflicts from #11100)#11168sensei-hacker wants to merge 5 commits intoiNavFlight:maintenance-10.xfrom
sensei-hacker wants to merge 5 commits intoiNavFlight:maintenance-10.xfrom
Conversation
Contributor
PR Compliance Guide 🔍All compliance sections have been disabled in the configurations. |
![qodo-code-review[bot]](https://avatars.githubusercontent.com/in/484649?s=60&v=4){kind=small}
…tions Remove three dead-code stub definitions from crsf.h that have no corresponding implementation: - CRSF_FRAME_AIRSPEED_PAYLOAD_SIZE (airspeed is handled by PR iNavFlight#11025) - CRSF_FRAMETYPE_AIRSPEED_SENSOR (same) - CRSF_FRAME_BAROMETER_ALTITUDE_PAYLOAD_SIZE (superseded by the new 3-byte CRSF_FRAME_BAROMETER_ALTITUDE_VARIO_PAYLOAD_SIZE)
sensei-hacker
changed the base branch from
maintenance-9.x
to
maintenance-10.x
Run update_cli_docs.py to sync Settings.md with the new crsf_use_legacy_baro_packet setting added in settings.yaml.
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.
User description
Fixes merge conflicts from #11100
PR Type
Enhancement
Description
Adds barometer altitude and vario sensor support to CRSF telemetry
Combines altitude and vertical speed into single packet frame
Implements legacy barometer packet mode configuration option
Updates frame type definitions and payload sizes for new sensors
Diagram Walkthrough
File Walkthrough
crsf.h
Add barometer altitude vario sensor frame typessrc/main/rx/crsf.h
CRSF_FRAME_BAROMETER_ALTITUDE_VARIO_PAYLOAD_SIZEconstant (3bytes)
CRSF_FRAME_AIRSPEED_PAYLOAD_SIZEconstant (2 bytes)CRSF_FRAMETYPE_BAROMETER_ALTITUDEtoCRSF_FRAMETYPE_BAROMETER_ALTITUDE_VARIO_SENSORCRSF_FRAMETYPE_AIRSPEED_SENSORframe type definitioncrsf.c
Implement barometer altitude vario sensor telemetrysrc/main/telemetry/crsf.c
#includefor SCHAR_MIN/SCHAR_MAX constants#include "sensors/pitotmeter.h"for airspeed sensor supportASL)
crsfBarometerAltitude()tocrsfFrameBarometerAltitudeVarioSensor()formula with TBS CRSF standard constants
index
combined altitude-vario packet
telemetry.c
Add legacy barometer packet configuration optionsrc/main/telemetry/telemetry.c
crsf_use_legacy_baro_packetfield to telemetry config resettemplate
telemetry.h
Add legacy baro packet config fieldsrc/main/telemetry/telemetry.h
bool crsf_use_legacy_baro_packetfield totelemetryConfig_tstructure
settings.yaml
Add CRSF legacy baro packet YAML settingsrc/main/fc/settings.yaml
crsf_use_legacy_baro_packetsetting definition to telemetryconfig group
Settings.md
Document CRSF legacy barometer packet settingdocs/Settings.md
crsf_use_legacy_baro_packetsettingmodes