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

Remove stale baro parameter baro_cf_alt

Browse source
This commit is contained in:
Bruce Luckcuck 2019-01-16 18:26:13 -05:00
parent e0fc9300ed
commit 9e53d97e4d
3 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/main/interface/settings.c
View file

@ -621,7 +621,6 @@ const clivalue_t valueTable[] = {
{ "baro_tab_size", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, BARO_SAMPLE_COUNT_MAX }, PG_BAROMETER_CONFIG, offsetof(barometerConfig_t, baro_sample_count) }, { "baro_tab_size", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, BARO_SAMPLE_COUNT_MAX }, PG_BAROMETER_CONFIG, offsetof(barometerConfig_t, baro_sample_count) },
{ "baro_noise_lpf", VAR_UINT16 | MASTER_VALUE, .config.minmax = { 0, 1000 }, PG_BAROMETER_CONFIG, offsetof(barometerConfig_t, baro_noise_lpf) }, { "baro_noise_lpf", VAR_UINT16 | MASTER_VALUE, .config.minmax = { 0, 1000 }, PG_BAROMETER_CONFIG, offsetof(barometerConfig_t, baro_noise_lpf) },
{ "baro_cf_vel", VAR_UINT16 | MASTER_VALUE, .config.minmax = { 0, 1000 }, PG_BAROMETER_CONFIG, offsetof(barometerConfig_t, baro_cf_vel) }, { "baro_cf_vel", VAR_UINT16 | MASTER_VALUE, .config.minmax = { 0, 1000 }, PG_BAROMETER_CONFIG, offsetof(barometerConfig_t, baro_cf_vel) },
{ "baro_cf_alt", VAR_UINT16 | MASTER_VALUE, .config.minmax = { 0, 1000 }, PG_BAROMETER_CONFIG, offsetof(barometerConfig_t, baro_cf_alt) },
#endif #endif
// PG_RX_CONFIG // PG_RX_CONFIG

3
src/main/sensors/barometer.c
View file

@ -52,14 +52,13 @@
baro_t baro; // barometer access functions baro_t baro; // barometer access functions
PG_REGISTER_WITH_RESET_FN(barometerConfig_t, barometerConfig, PG_BAROMETER_CONFIG, 0); PG_REGISTER_WITH_RESET_FN(barometerConfig_t, barometerConfig, PG_BAROMETER_CONFIG, 1);
void pgResetFn_barometerConfig(barometerConfig_t *barometerConfig) void pgResetFn_barometerConfig(barometerConfig_t *barometerConfig)
{ {
barometerConfig->baro_sample_count = 21; barometerConfig->baro_sample_count = 21;
barometerConfig->baro_noise_lpf = 600; barometerConfig->baro_noise_lpf = 600;
barometerConfig->baro_cf_vel = 985; barometerConfig->baro_cf_vel = 985;
barometerConfig->baro_cf_alt = 965;
barometerConfig->baro_hardware = BARO_DEFAULT; barometerConfig->baro_hardware = BARO_DEFAULT;
// For backward compatibility; ceate a valid default value for bus parameters // For backward compatibility; ceate a valid default value for bus parameters

1
src/main/sensors/barometer.h
View file

@ -45,7 +45,6 @@ typedef struct barometerConfig_s {
uint8_t baro_sample_count; // size of baro filter array uint8_t baro_sample_count; // size of baro filter array
uint16_t baro_noise_lpf; // additional LPF to reduce baro noise uint16_t baro_noise_lpf; // additional LPF to reduce baro noise
uint16_t baro_cf_vel; // apply Complimentary Filter to keep the calculated velocity based on baro velocity (i.e. near real velocity) uint16_t baro_cf_vel; // apply Complimentary Filter to keep the calculated velocity based on baro velocity (i.e. near real velocity)
uint16_t baro_cf_alt; // apply CF to use ACC for height estimation
} barometerConfig_t; } barometerConfig_t;
PG_DECLARE(barometerConfig_t, barometerConfig); PG_DECLARE(barometerConfig_t, barometerConfig);