mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-19 14:25:20 +03:00
consistent gyro and dterm filter names
This commit is contained in:
ctzsnooze
parent
8702bba3ec
commit
99a7479b8c
16 changed files with 219 additions and 219 deletions
|
|
@ -699,8 +699,8 @@ static CMS_Menu cmsx_menuProfileOther = {
|
|||
};
|
||||
|
||||
|
||||
static uint16_t gyroConfig_gyro_lowpass_hz;
|
||||
static uint16_t gyroConfig_gyro_lowpass2_hz;
|
||||
static uint16_t gyroConfig_gyro_lpf1_static_hz;
|
||||
static uint16_t gyroConfig_gyro_lpf2_static_hz;
|
||||
static uint16_t gyroConfig_gyro_soft_notch_hz_1;
|
||||
static uint16_t gyroConfig_gyro_soft_notch_cutoff_1;
|
||||
static uint16_t gyroConfig_gyro_soft_notch_hz_2;
|
||||
|
|
@ -711,8 +711,8 @@ static const void *cmsx_menuGyro_onEnter(displayPort_t *pDisp)
|
|||
{
|
||||
UNUSED(pDisp);
|
||||
|
||||
gyroConfig_gyro_lowpass_hz = gyroConfig()->gyro_lowpass_hz;
|
||||
gyroConfig_gyro_lowpass2_hz = gyroConfig()->gyro_lowpass2_hz;
|
||||
gyroConfig_gyro_lpf1_static_hz = gyroConfig()->gyro_lpf1_static_hz;
|
||||
gyroConfig_gyro_lpf2_static_hz = gyroConfig()->gyro_lpf2_static_hz;
|
||||
gyroConfig_gyro_soft_notch_hz_1 = gyroConfig()->gyro_soft_notch_hz_1;
|
||||
gyroConfig_gyro_soft_notch_cutoff_1 = gyroConfig()->gyro_soft_notch_cutoff_1;
|
||||
gyroConfig_gyro_soft_notch_hz_2 = gyroConfig()->gyro_soft_notch_hz_2;
|
||||
|
|
@ -727,8 +727,8 @@ static const void *cmsx_menuGyro_onExit(displayPort_t *pDisp, const OSD_Entry *s
|
|||
UNUSED(pDisp);
|
||||
UNUSED(self);
|
||||
|
||||
gyroConfigMutable()->gyro_lowpass_hz = gyroConfig_gyro_lowpass_hz;
|
||||
gyroConfigMutable()->gyro_lowpass2_hz = gyroConfig_gyro_lowpass2_hz;
|
||||
gyroConfigMutable()->gyro_lpf1_static_hz = gyroConfig_gyro_lpf1_static_hz;
|
||||
gyroConfigMutable()->gyro_lpf2_static_hz = gyroConfig_gyro_lpf2_static_hz;
|
||||
gyroConfigMutable()->gyro_soft_notch_hz_1 = gyroConfig_gyro_soft_notch_hz_1;
|
||||
gyroConfigMutable()->gyro_soft_notch_cutoff_1 = gyroConfig_gyro_soft_notch_cutoff_1;
|
||||
gyroConfigMutable()->gyro_soft_notch_hz_2 = gyroConfig_gyro_soft_notch_hz_2;
|
||||
|
|
@ -742,9 +742,9 @@ static const OSD_Entry cmsx_menuFilterGlobalEntries[] =
|
|||
{
|
||||
{ "-- FILTER GLB --", OME_Label, NULL, NULL, 0 },
|
||||
|
||||
{ "GYRO LPF", OME_UINT16, NULL, &(OSD_UINT16_t) { &gyroConfig_gyro_lowpass_hz, 0, FILTER_FREQUENCY_MAX, 1 }, 0 },
|
||||
{ "GYRO LPF1", OME_UINT16, NULL, &(OSD_UINT16_t) { &gyroConfig_gyro_lpf1_static_hz, 0, LPF_MAX_HZ, 1 }, 0 },
|
||||
#ifdef USE_GYRO_LPF2
|
||||
{ "GYRO LPF2", OME_UINT16, NULL, &(OSD_UINT16_t) { &gyroConfig_gyro_lowpass2_hz, 0, FILTER_FREQUENCY_MAX, 1 }, 0 },
|
||||
{ "GYRO LPF2", OME_UINT16, NULL, &(OSD_UINT16_t) { &gyroConfig_gyro_lpf2_static_hz, 0, LPF_MAX_HZ, 1 }, 0 },
|
||||
#endif
|
||||
{ "GYRO NF1", OME_UINT16, NULL, &(OSD_UINT16_t) { &gyroConfig_gyro_soft_notch_hz_1, 0, 500, 1 }, 0 },
|
||||
{ "GYRO NF1C", OME_UINT16, NULL, &(OSD_UINT16_t) { &gyroConfig_gyro_soft_notch_cutoff_1, 0, 500, 1 }, 0 },
|
||||
|
|
@ -778,12 +778,12 @@ static uint16_t dynFiltNotchQ;
|
|||
static uint16_t dynFiltNotchMinHz;
|
||||
#endif
|
||||
#ifdef USE_DYN_LPF
|
||||
static uint16_t dynFiltGyroMin;
|
||||
static uint16_t dynFiltGyroMax;
|
||||
static uint8_t dynFiltGyroExpo;
|
||||
static uint16_t dynFiltDtermMin;
|
||||
static uint16_t dynFiltDtermMax;
|
||||
static uint8_t dynFiltDtermExpo;
|
||||
static uint16_t gyroLpfDynMin;
|
||||
static uint16_t gyroLpfDynMax;
|
||||
static uint8_t gyroLpfDynExpo;
|
||||
static uint16_t dtermLpfDynMin;
|
||||
static uint16_t dtermLpfDynMax;
|
||||
static uint8_t dtermLpfDynExpo;
|
||||
#endif
|
||||
|
||||
static const void *cmsx_menuDynFilt_onEnter(displayPort_t *pDisp)
|
||||
|
|
@ -798,12 +798,12 @@ static const void *cmsx_menuDynFilt_onEnter(displayPort_t *pDisp)
|
|||
#endif
|
||||
#ifdef USE_DYN_LPF
|
||||
const pidProfile_t *pidProfile = pidProfiles(pidProfileIndex);
|
||||
dynFiltGyroMin = gyroConfig()->dyn_lpf_gyro_min_hz;
|
||||
dynFiltGyroMax = gyroConfig()->dyn_lpf_gyro_max_hz;
|
||||
dynFiltGyroExpo = gyroConfig()->dyn_lpf_curve_expo;
|
||||
dynFiltDtermMin = pidProfile->dyn_lpf_dterm_min_hz;
|
||||
dynFiltDtermMax = pidProfile->dyn_lpf_dterm_max_hz;
|
||||
dynFiltDtermExpo = pidProfile->dyn_lpf_curve_expo;
|
||||
gyroLpfDynMin = gyroConfig()->gyro_lpf1_dyn_min_hz;
|
||||
gyroLpfDynMax = gyroConfig()->gyro_lpf1_dyn_max_hz;
|
||||
gyroLpfDynExpo = gyroConfig()->gyro_lpf1_dyn_expo;
|
||||
dtermLpfDynMin = pidProfile->dterm_lpf1_dyn_min_hz;
|
||||
dtermLpfDynMax = pidProfile->dterm_lpf1_dyn_max_hz;
|
||||
dtermLpfDynExpo = pidProfile->dterm_lpf1_dyn_expo;
|
||||
#endif
|
||||
|
||||
return NULL;
|
||||
|
|
@ -822,12 +822,12 @@ static const void *cmsx_menuDynFilt_onExit(displayPort_t *pDisp, const OSD_Entry
|
|||
#endif
|
||||
#ifdef USE_DYN_LPF
|
||||
pidProfile_t *pidProfile = currentPidProfile;
|
||||
gyroConfigMutable()->dyn_lpf_gyro_min_hz = dynFiltGyroMin;
|
||||
gyroConfigMutable()->dyn_lpf_gyro_max_hz = dynFiltGyroMax;
|
||||
gyroConfigMutable()->dyn_lpf_curve_expo = dynFiltGyroExpo;
|
||||
pidProfile->dyn_lpf_dterm_min_hz = dynFiltDtermMin;
|
||||
pidProfile->dyn_lpf_dterm_max_hz = dynFiltDtermMax;
|
||||
pidProfile->dyn_lpf_curve_expo = dynFiltDtermExpo;
|
||||
gyroConfigMutable()->gyro_lpf1_dyn_min_hz = gyroLpfDynMin;
|
||||
gyroConfigMutable()->gyro_lpf1_dyn_max_hz = gyroLpfDynMax;
|
||||
gyroConfigMutable()->gyro_lpf1_dyn_expo = gyroLpfDynExpo;
|
||||
pidProfile->dterm_lpf1_dyn_min_hz = dtermLpfDynMin;
|
||||
pidProfile->dterm_lpf1_dyn_max_hz = dtermLpfDynMax;
|
||||
pidProfile->dterm_lpf1_dyn_expo = dtermLpfDynExpo;
|
||||
#endif
|
||||
|
||||
return NULL;
|
||||
|
|
@ -845,12 +845,12 @@ static const OSD_Entry cmsx_menuDynFiltEntries[] =
|
|||
#endif
|
||||
|
||||
#ifdef USE_DYN_LPF
|
||||
{ "LPF GYRO MIN", OME_UINT16, NULL, &(OSD_UINT16_t) { &dynFiltGyroMin, 0, 1000, 1 }, 0 },
|
||||
{ "LPF GYRO MAX", OME_UINT16, NULL, &(OSD_UINT16_t) { &dynFiltGyroMax, 0, 1000, 1 }, 0 },
|
||||
{ "GYRO DLPF EXPO", OME_UINT8, NULL, &(OSD_UINT8_t) { &dynFiltGyroExpo, 0, 10, 1 }, 0 },
|
||||
{ "DTERM DLPF MIN", OME_UINT16, NULL, &(OSD_UINT16_t) { &dynFiltDtermMin, 0, 1000, 1 }, 0 },
|
||||
{ "DTERM DLPF MAX", OME_UINT16, NULL, &(OSD_UINT16_t) { &dynFiltDtermMax, 0, 1000, 1 }, 0 },
|
||||
{ "DTERM DLPF EXPO", OME_UINT8, NULL, &(OSD_UINT8_t) { &dynFiltDtermExpo, 0, 10, 1 }, 0 },
|
||||
{ "GYRO DLPF MIN", OME_UINT16, NULL, &(OSD_UINT16_t) { &gyroLpfDynMin, 0, 1000, 1 }, 0 },
|
||||
{ "GYRO DLPF MAX", OME_UINT16, NULL, &(OSD_UINT16_t) { &gyroLpfDynMax, 0, 1000, 1 }, 0 },
|
||||
{ "GYRO DLPF EXPO", OME_UINT8, NULL, &(OSD_UINT8_t) { &gyroLpfDynExpo, 0, 10, 1 }, 0 },
|
||||
{ "DTERM DLPF MIN", OME_UINT16, NULL, &(OSD_UINT16_t) { &dtermLpfDynMin, 0, 1000, 1 }, 0 },
|
||||
{ "DTERM DLPF MAX", OME_UINT16, NULL, &(OSD_UINT16_t) { &dtermLpfDynMax, 0, 1000, 1 }, 0 },
|
||||
{ "DTERM DLPF EXPO", OME_UINT8, NULL, &(OSD_UINT8_t) { &dtermLpfDynExpo, 0, 10, 1 }, 0 },
|
||||
#endif
|
||||
|
||||
{ "BACK", OME_Back, NULL, NULL, 0 },
|
||||
|
|
@ -870,8 +870,8 @@ static CMS_Menu cmsx_menuDynFilt = {
|
|||
|
||||
#endif
|
||||
|
||||
static uint16_t cmsx_dterm_lowpass_hz;
|
||||
static uint16_t cmsx_dterm_lowpass2_hz;
|
||||
static uint16_t cmsx_dterm_lpf1_static_hz;
|
||||
static uint16_t cmsx_dterm_lpf2_static_hz;
|
||||
static uint16_t cmsx_dterm_notch_hz;
|
||||
static uint16_t cmsx_dterm_notch_cutoff;
|
||||
static uint16_t cmsx_yaw_lowpass_hz;
|
||||
|
|
@ -882,11 +882,11 @@ static const void *cmsx_FilterPerProfileRead(displayPort_t *pDisp)
|
|||
|
||||
const pidProfile_t *pidProfile = pidProfiles(pidProfileIndex);
|
||||
|
||||
cmsx_dterm_lowpass_hz = pidProfile->dterm_lowpass_hz;
|
||||
cmsx_dterm_lowpass2_hz = pidProfile->dterm_lowpass2_hz;
|
||||
cmsx_dterm_notch_hz = pidProfile->dterm_notch_hz;
|
||||
cmsx_dterm_notch_cutoff = pidProfile->dterm_notch_cutoff;
|
||||
cmsx_yaw_lowpass_hz = pidProfile->yaw_lowpass_hz;
|
||||
cmsx_dterm_lpf1_static_hz = pidProfile->dterm_lpf1_static_hz;
|
||||
cmsx_dterm_lpf2_static_hz = pidProfile->dterm_lpf2_static_hz;
|
||||
cmsx_dterm_notch_hz = pidProfile->dterm_notch_hz;
|
||||
cmsx_dterm_notch_cutoff = pidProfile->dterm_notch_cutoff;
|
||||
cmsx_yaw_lowpass_hz = pidProfile->yaw_lowpass_hz;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -898,11 +898,11 @@ static const void *cmsx_FilterPerProfileWriteback(displayPort_t *pDisp, const OS
|
|||
|
||||
pidProfile_t *pidProfile = currentPidProfile;
|
||||
|
||||
pidProfile->dterm_lowpass_hz = cmsx_dterm_lowpass_hz;
|
||||
pidProfile->dterm_lowpass2_hz = cmsx_dterm_lowpass2_hz;
|
||||
pidProfile->dterm_notch_hz = cmsx_dterm_notch_hz;
|
||||
pidProfile->dterm_notch_cutoff = cmsx_dterm_notch_cutoff;
|
||||
pidProfile->yaw_lowpass_hz = cmsx_yaw_lowpass_hz;
|
||||
pidProfile->dterm_lpf1_static_hz = cmsx_dterm_lpf1_static_hz;
|
||||
pidProfile->dterm_lpf2_static_hz = cmsx_dterm_lpf2_static_hz;
|
||||
pidProfile->dterm_notch_hz = cmsx_dterm_notch_hz;
|
||||
pidProfile->dterm_notch_cutoff = cmsx_dterm_notch_cutoff;
|
||||
pidProfile->yaw_lowpass_hz = cmsx_yaw_lowpass_hz;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
|
@ -911,10 +911,10 @@ static const OSD_Entry cmsx_menuFilterPerProfileEntries[] =
|
|||
{
|
||||
{ "-- FILTER PP --", OME_Label, NULL, NULL, 0 },
|
||||
|
||||
{ "DTERM LPF", OME_UINT16, NULL, &(OSD_UINT16_t){ &cmsx_dterm_lowpass_hz, 0, FILTER_FREQUENCY_MAX, 1 }, 0 },
|
||||
{ "DTERM LPF2", OME_UINT16, NULL, &(OSD_UINT16_t){ &cmsx_dterm_lowpass2_hz, 0, FILTER_FREQUENCY_MAX, 1 }, 0 },
|
||||
{ "DTERM NF", OME_UINT16, NULL, &(OSD_UINT16_t){ &cmsx_dterm_notch_hz, 0, FILTER_FREQUENCY_MAX, 1 }, 0 },
|
||||
{ "DTERM NFCO", OME_UINT16, NULL, &(OSD_UINT16_t){ &cmsx_dterm_notch_cutoff, 0, FILTER_FREQUENCY_MAX, 1 }, 0 },
|
||||
{ "DTERM LPF1", OME_UINT16, NULL, &(OSD_UINT16_t){ &cmsx_dterm_lpf1_static_hz, 0, LPF_MAX_HZ, 1 }, 0 },
|
||||
{ "DTERM LPF2", OME_UINT16, NULL, &(OSD_UINT16_t){ &cmsx_dterm_lpf2_static_hz, 0, LPF_MAX_HZ, 1 }, 0 },
|
||||
{ "DTERM NF", OME_UINT16, NULL, &(OSD_UINT16_t){ &cmsx_dterm_notch_hz, 0, LPF_MAX_HZ, 1 }, 0 },
|
||||
{ "DTERM NFCO", OME_UINT16, NULL, &(OSD_UINT16_t){ &cmsx_dterm_notch_cutoff, 0, LPF_MAX_HZ, 1 }, 0 },
|
||||
{ "YAW LPF", OME_UINT16, NULL, &(OSD_UINT16_t){ &cmsx_yaw_lowpass_hz, 0, 500, 1 }, 0 },
|
||||
|
||||
{ "BACK", OME_Back, NULL, NULL, 0 },
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue