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

Renamed 'tuning sliders' to 'simplified tuning'.

Browse source
This commit is contained in:
Michael Keller 2020-12-26 01:57:11 +01:00
parent cff19dc113
commit 7fc3c7cea6
13 changed files with 196 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/main/msp/msp.c
View file

@ -47,7 +47,7 @@
#include "config/config.h"
#include "config/config_eeprom.h"
#include "config/feature.h"
#include "config/tuning_sliders.h"
#include "config/simplified_tuning.h"
#include "drivers/accgyro/accgyro.h"
#include "drivers/bus_i2c.h"
@ -2088,24 +2088,24 @@ static mspResult_e mspFcProcessOutCommandWithArg(mspDescriptor_t srcDesc, int16_
break;
#endif // USE_VTX_TABLE
#ifdef USE_TUNING_SLIDERS
#ifdef USE_SIMPLIFIED_TUNING
// Added in MSP API 1.43
case MSP_TUNING_SLIDERS:
case MSP_SIMPLIFIED_TUNING:
{
sbufWriteU8(dst, currentPidProfile->slider_pids_mode);
sbufWriteU8(dst, currentPidProfile->slider_master_multiplier);
sbufWriteU8(dst, currentPidProfile->slider_roll_pitch_ratio);
sbufWriteU8(dst, currentPidProfile->slider_i_gain);
sbufWriteU8(dst, currentPidProfile->slider_pd_ratio);
sbufWriteU8(dst, currentPidProfile->slider_pd_gain);
sbufWriteU8(dst, currentPidProfile->slider_dmin_ratio);
sbufWriteU8(dst, currentPidProfile->slider_ff_gain);
sbufWriteU8(dst, currentPidProfile->simplified_pids_mode);
sbufWriteU8(dst, currentPidProfile->simplified_master_multiplier);
sbufWriteU8(dst, currentPidProfile->simplified_roll_pitch_ratio);
sbufWriteU8(dst, currentPidProfile->simplified_i_gain);
sbufWriteU8(dst, currentPidProfile->simplified_pd_ratio);
sbufWriteU8(dst, currentPidProfile->simplified_pd_gain);
sbufWriteU8(dst, currentPidProfile->simplified_dmin_ratio);
sbufWriteU8(dst, currentPidProfile->simplified_ff_gain);
sbufWriteU8(dst, currentPidProfile->slider_dterm_filter);
sbufWriteU8(dst, currentPidProfile->slider_dterm_filter_multiplier);
sbufWriteU8(dst, currentPidProfile->simplified_dterm_filter);
sbufWriteU8(dst, currentPidProfile->simplified_dterm_filter_multiplier);
sbufWriteU8(dst, gyroConfig()->slider_gyro_filter);
sbufWriteU8(dst, gyroConfig()->slider_gyro_filter_multiplier);
sbufWriteU8(dst, gyroConfig()->simplified_gyro_filter);
sbufWriteU8(dst, gyroConfig()->simplified_gyro_filter_multiplier);
}
break;
#endif
@ -3054,25 +3054,25 @@ static mspResult_e mspProcessInCommand(mspDescriptor_t srcDesc, int16_t cmdMSP,
break;
#endif
#ifdef USE_TUNING_SLIDERS
#ifdef USE_SIMPLIFIED_TUNING
// Added in MSP API 1.43
case MSP_SET_TUNING_SLIDERS:
currentPidProfile->slider_pids_mode = sbufReadU8(src);
currentPidProfile->slider_master_multiplier = sbufReadU8(src);
currentPidProfile->slider_roll_pitch_ratio = sbufReadU8(src);
currentPidProfile->slider_i_gain = sbufReadU8(src);
currentPidProfile->slider_pd_ratio = sbufReadU8(src);
currentPidProfile->slider_pd_gain = sbufReadU8(src);
currentPidProfile->slider_dmin_ratio = sbufReadU8(src);
currentPidProfile->slider_ff_gain = sbufReadU8(src);
case MSP_SET_SIMPLIFIED_TUNING:
currentPidProfile->simplified_pids_mode = sbufReadU8(src);
currentPidProfile->simplified_master_multiplier = sbufReadU8(src);
currentPidProfile->simplified_roll_pitch_ratio = sbufReadU8(src);
currentPidProfile->simplified_i_gain = sbufReadU8(src);
currentPidProfile->simplified_pd_ratio = sbufReadU8(src);
currentPidProfile->simplified_pd_gain = sbufReadU8(src);
currentPidProfile->simplified_dmin_ratio = sbufReadU8(src);
currentPidProfile->simplified_ff_gain = sbufReadU8(src);
currentPidProfile->slider_dterm_filter = sbufReadU8(src);
currentPidProfile->slider_dterm_filter_multiplier = sbufReadU8(src);
currentPidProfile->simplified_dterm_filter = sbufReadU8(src);
currentPidProfile->simplified_dterm_filter_multiplier = sbufReadU8(src);
gyroConfigMutable()->slider_gyro_filter = sbufReadU8(src);
gyroConfigMutable()->slider_gyro_filter_multiplier = sbufReadU8(src);
gyroConfigMutable()->simplified_gyro_filter = sbufReadU8(src);
gyroConfigMutable()->simplified_gyro_filter_multiplier = sbufReadU8(src);
applyTuningSliders(currentPidProfile);
applySimplifiedTuning(currentPidProfile);
break;
#endif