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

Make lookupTableThrottleLimitType an extern variable (#13204)

Browse source
This commit is contained in:
Ivan Efimov 2023-12-08 15:37:33 -06:00 • committed by GitHub
parent 380d39e570
commit d3830b6b34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/cli/settings.c
View file

@ -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"

2
src/main/cli/settings.h
View file

@ -270,3 +270,5 @@ extern const char * const lookupTableOffOn[];
extern const char * const lookupTableSimplifiedTuningPidsMode[];
extern const char * const lookupTableCMSMenuBackgroundType[];
extern const char * const lookupTableThrottleLimitType[];

6
src/main/cms/cms_menu_imu.c
View file

@ -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 },

7
src/main/cms/cms_menu_quick.c
View file

@ -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 },