From d3830b6b347bb2949594e98be1d9942b16266cfe Mon Sep 17 00:00:00 2001 From: Ivan Efimov Date: Fri, 8 Dec 2023 15:37:33 -0600 Subject: [PATCH] Make lookupTableThrottleLimitType an extern variable (#13204) --- src/main/cli/settings.c | 3 +-- src/main/cli/settings.h | 2 ++ src/main/cms/cms_menu_imu.c | 6 +----- src/main/cms/cms_menu_quick.c | 7 ++----- 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/cli/settings.c b/src/main/cli/settings.c index 7533fa073d3..c9b188c61f0 100644 --- a/src/main/cli/settings.c +++ b/src/main/cli/settings.c @@ -375,11 +375,10 @@ static const char * const lookupOverclock[] = { }; #endif -static const char * const lookupTableThrottleLimitType[] = { +const char * const lookupTableThrottleLimitType[] = { "OFF", "SCALE", "CLIP" }; - #ifdef USE_GPS_RESCUE static const char * const lookupTableRescueSanityType[] = { "RESCUE_SANITY_OFF", "RESCUE_SANITY_ON", "RESCUE_SANITY_FS_ONLY" diff --git a/src/main/cli/settings.h b/src/main/cli/settings.h index 06150196b8e..27c4ea56780 100644 --- a/src/main/cli/settings.h +++ b/src/main/cli/settings.h @@ -270,3 +270,5 @@ extern const char * const lookupTableOffOn[]; extern const char * const lookupTableSimplifiedTuningPidsMode[]; extern const char * const lookupTableCMSMenuBackgroundType[]; + +extern const char * const lookupTableThrottleLimitType[]; diff --git a/src/main/cms/cms_menu_imu.c b/src/main/cms/cms_menu_imu.c index 3239cf250d7..685b4256373 100644 --- a/src/main/cms/cms_menu_imu.c +++ b/src/main/cms/cms_menu_imu.c @@ -78,10 +78,6 @@ static uint8_t rateProfileIndex; static char rateProfileIndexString[MAX_RATE_PROFILE_NAME_LENGTH + PROFILE_INDEX_STRING_ADDITIONAL_SIZE]; static controlRateConfig_t rateProfile; -static const char * const osdTableThrottleLimitType[] = { - "OFF", "SCALE", "CLIP" -}; - #ifdef USE_MULTI_GYRO static const char * const osdTableGyroToUse[] = { "FIRST", "SECOND", "BOTH" @@ -435,7 +431,7 @@ static const OSD_Entry cmsx_menuRateProfileEntries[] = { "THR MID", OME_UINT8, NULL, &(OSD_UINT8_t) { &rateProfile.thrMid8, 0, 100, 1} }, { "THR EXPO", OME_UINT8, NULL, &(OSD_UINT8_t) { &rateProfile.thrExpo8, 0, 100, 1} }, - { "THR LIM TYPE",OME_TAB, NULL, &(OSD_TAB_t) { &rateProfile.throttle_limit_type, THROTTLE_LIMIT_TYPE_COUNT - 1, osdTableThrottleLimitType} }, + { "THR LIM TYPE",OME_TAB, NULL, &(OSD_TAB_t) { &rateProfile.throttle_limit_type, THROTTLE_LIMIT_TYPE_COUNT - 1, lookupTableThrottleLimitType} }, { "THR LIM %", OME_UINT8, NULL, &(OSD_UINT8_t) { &rateProfile.throttle_limit_percent, 25, 100, 1} }, { "BACK", OME_Back, NULL, NULL }, diff --git a/src/main/cms/cms_menu_quick.c b/src/main/cms/cms_menu_quick.c index aad64601756..9659a8950f0 100644 --- a/src/main/cms/cms_menu_quick.c +++ b/src/main/cms/cms_menu_quick.c @@ -45,6 +45,8 @@ #include "sensors/battery.h" +#include "cli/settings.h" + #include "cms_menu_quick.h" static controlRateConfig_t rateProfile; @@ -85,11 +87,6 @@ static const void *cmsx_RateProfileWriteback(displayPort_t *pDisp, const OSD_Ent return NULL; } - -static const char * const osdTableThrottleLimitType[] = { - "OFF", "SCALE", "CLIP" -}; - static const OSD_Entry menuMainEntries[] = { { "-- QUICK --", OME_Label, NULL, NULL },