Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-26 01:35:41 +03:00
Code Issues Wiki Activity

Fixed review

Browse source
This commit is contained in:
Filipp Bakanov 2022-01-28 21:01:11 +03:00
parent bbc46d9cad
commit e19469c0ba
No known key found for this signature in database
GPG key ID: A8B7CC1737CDF1D2
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/cli/settings.c
View file

@ -1718,7 +1718,7 @@ const clivalue_t valueTable[] = {
// PG_POSITION
{ "position_alt_source", VAR_INT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_POSITION_ALT_SOURCE }, PG_POSITION, offsetof(positionConfig_t, altSource) },
{ "position_alt_num_sats_gps_use", VAR_INT8 | MASTER_VALUE, .config.minmaxUnsigned = { 4, 50 }, PG_POSITION, offsetof(positionConfig_t, altNumSatsGpsUse) },
{ "position_alt_num_gps_sats", VAR_INT8 | MASTER_VALUE, .config.minmaxUnsigned = { 4, 50 }, PG_POSITION, offsetof(positionConfig_t, altNumSatsGpsUse) },
{ "position_alt_num_baro_fallback", VAR_INT8 | MASTER_VALUE, .config.minmaxUnsigned = { 4, 50 }, PG_POSITION, offsetof(positionConfig_t, altNumSatsBaroFallback) },
// PG_MODE_ACTIVATION_CONFIG
#if defined(USE_CUSTOM_BOX_NAMES)

8
src/main/flight/position.c
View file

@ -55,9 +55,9 @@ typedef enum {
PG_REGISTER_WITH_RESET_TEMPLATE(positionConfig_t, positionConfig, PG_POSITION, 2);
PG_RESET_TEMPLATE(positionConfig_t, positionConfig,
.altSource = DEFAULT,
.altNumSatsGpsUse = 10,
.altNumSatsBaroFallback = 7,
.altSource = DEFAULT,
.altNumSatsGpsUse = 10,
.altNumSatsBaroFallback = 7,
);
static int32_t estimatedAltitudeCm = 0; // in cm
@ -106,7 +106,7 @@ void calculateEstimatedAltitude(timeUs_t currentTimeUs)
int32_t baroAlt = 0;
int32_t gpsAlt = 0;
uint16_t gpsNumSat = 0;
uint8_t gpsNumSat = 0;
#if defined(USE_GPS) && defined(USE_VARIO)
int16_t gpsVertSpeed = 0;