Skip to content

Commit 5fb5b18

Browse files
authored
Merge pull request #6174 from iNavFlight/dzikuvx-filter-cms-menu
Update Filter menu in CMS
2 parents 6dc64bc + 4b4a04e commit 5fb5b18

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

src/main/cms/cms_menu_imu.c

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -400,13 +400,21 @@ static const CMS_Menu cmsx_menuProfileOther = {
400400
//
401401
static const OSD_Entry cmsx_menuFilterPerProfileEntries[] =
402402
{
403-
OSD_LABEL_DATA_ENTRY("-- FILTER PP --", profileIndexString),
403+
OSD_LABEL_DATA_ENTRY("-- FILTERING --", profileIndexString),
404404

405+
OSD_SETTING_ENTRY("GYRO LPF", SETTING_GYRO_LPF_HZ),
406+
OSD_SETTING_ENTRY("GYRO LPF2", SETTING_GYRO_STAGE2_LOWPASS_HZ),
405407
OSD_SETTING_ENTRY("DTERM LPF", SETTING_DTERM_LPF_HZ),
406-
OSD_SETTING_ENTRY("GYRO SLPF", SETTING_GYRO_LPF_HZ),
407-
OSD_SETTING_ENTRY("YAW SUM LIM", SETTING_PIDSUM_LIMIT_YAW),
408-
OSD_SETTING_ENTRY("YAW LPF", SETTING_YAW_LPF_HZ),
409-
408+
OSD_SETTING_ENTRY("DTERM LPF2", SETTING_DTERM_LPF2_HZ),
409+
#ifdef USE_DYNAMIC_FILTERS
410+
OSD_SETTING_ENTRY("MATRIX FILTER", SETTING_DYNAMIC_GYRO_NOTCH_ENABLED),
411+
OSD_SETTING_ENTRY("MATRIX MIN HZ", SETTING_DYNAMIC_GYRO_NOTCH_MIN_HZ), //dynamic_gyro_notch_min_hz
412+
OSD_SETTING_ENTRY("MATRIX Q", SETTING_DYNAMIC_GYRO_NOTCH_Q), //dynamic_gyro_notch_q
413+
#endif
414+
#ifdef USE_GYRO_KALMAN
415+
OSD_SETTING_ENTRY("UNICORN FILTER", SETTING_SETPOINT_KALMAN_ENABLED), //setpoint_kalman_enabled
416+
OSD_SETTING_ENTRY("UNICORN Q", SETTING_SETPOINT_KALMAN_Q), //setpoint_kalman_q
417+
#endif
410418
OSD_BACK_AND_END_ENTRY,
411419
};
412420

@@ -451,7 +459,7 @@ static const OSD_Entry cmsx_menuImuEntries[] =
451459
OSD_SUBMENU_ENTRY("PID", &cmsx_menuPid),
452460
OSD_SUBMENU_ENTRY("PID ALTMAG", &cmsx_menuPidAltMag),
453461
OSD_SUBMENU_ENTRY("PID GPSNAV", &cmsx_menuPidGpsnav),
454-
OSD_SUBMENU_ENTRY("FILT PP", &cmsx_menuFilterPerProfile),
462+
OSD_SUBMENU_ENTRY("FILTERING", &cmsx_menuFilterPerProfile),
455463

456464
// Rate profile dependent
457465
OSD_UINT8_CALLBACK_ENTRY("RATE PROF", cmsx_profileIndexOnChange, (&(const OSD_UINT8_t){ &tmpProfileIndex, 1, MAX_CONTROL_RATE_PROFILE_COUNT, 1})),

0 commit comments

Comments
 (0)