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

Merge pull request #9643 from hydra/bf-fix-video-configuration-for-frskyosd

Browse source 
Fix unable to change video system for FrSkyPixelOSD.
This commit is contained in:
Michael Keller 2020-03-28 13:51:19 +13:00 • committed by GitHub
commit d494d215a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -375,11 +375,11 @@ const char * const lookupTableRescueAltitudeMode[] = {
}; };
#endif #endif
#ifdef USE_MAX7456 #if defined(USE_MAX7456) || defined(USE_FRSKYOSD)
static const char * const lookupTableVideoSystem[] = { static const char * const lookupTableVideoSystem[] = {
"AUTO", "PAL", "NTSC" "AUTO", "PAL", "NTSC"
}; };
#endif // USE_MAX7456 #endif
#if defined(USE_ITERM_RELAX) #if defined(USE_ITERM_RELAX)
const char * const lookupTableItermRelax[] = { const char * const lookupTableItermRelax[] = {
@ -569,9 +569,9 @@ const lookupTableEntry_t lookupTables[] = {
LOOKUP_TABLE_ENTRY(lookupTableGyro), LOOKUP_TABLE_ENTRY(lookupTableGyro),
#endif #endif
LOOKUP_TABLE_ENTRY(lookupTableThrottleLimitType), LOOKUP_TABLE_ENTRY(lookupTableThrottleLimitType),
#ifdef USE_MAX7456 #if defined(USE_MAX7456) || defined(USE_FRSKYOSD)
LOOKUP_TABLE_ENTRY(lookupTableVideoSystem), LOOKUP_TABLE_ENTRY(lookupTableVideoSystem),
#endif // USE_MAX7456 #endif
#if defined(USE_ITERM_RELAX) #if defined(USE_ITERM_RELAX)
LOOKUP_TABLE_ENTRY(lookupTableItermRelax), LOOKUP_TABLE_ENTRY(lookupTableItermRelax),
LOOKUP_TABLE_ENTRY(lookupTableItermRelaxType), LOOKUP_TABLE_ENTRY(lookupTableItermRelaxType),
@ -1438,7 +1438,7 @@ const clivalue_t valueTable[] = {
#endif #endif
// PG_VCD_CONFIG // PG_VCD_CONFIG
#ifdef USE_MAX7456 #if defined(USE_MAX7456) || defined(USE_FRSKYOSD)
{ "vcd_video_system", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_VIDEO_SYSTEM }, PG_VCD_CONFIG, offsetof(vcdProfile_t, video_system) }, { "vcd_video_system", VAR_UINT8 | MASTER_VALUE | MODE_LOOKUP, .config.lookup = { TABLE_VIDEO_SYSTEM }, PG_VCD_CONFIG, offsetof(vcdProfile_t, video_system) },
{ "vcd_h_offset", VAR_INT8 | MASTER_VALUE, .config.minmax = { -32, 31 }, PG_VCD_CONFIG, offsetof(vcdProfile_t, h_offset) }, { "vcd_h_offset", VAR_INT8 | MASTER_VALUE, .config.minmax = { -32, 31 }, PG_VCD_CONFIG, offsetof(vcdProfile_t, h_offset) },
{ "vcd_v_offset", VAR_INT8 | MASTER_VALUE, .config.minmax = { -15, 16 }, PG_VCD_CONFIG, offsetof(vcdProfile_t, v_offset) }, { "vcd_v_offset", VAR_INT8 | MASTER_VALUE, .config.minmax = { -15, 16 }, PG_VCD_CONFIG, offsetof(vcdProfile_t, v_offset) },

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

@ -98,9 +98,9 @@ typedef enum {
TABLE_GYRO, TABLE_GYRO,
#endif #endif
TABLE_THROTTLE_LIMIT_TYPE, TABLE_THROTTLE_LIMIT_TYPE,
#ifdef USE_MAX7456 #if defined(USE_MAX7456) || defined(USE_FRSKYOSD)
TABLE_VIDEO_SYSTEM, TABLE_VIDEO_SYSTEM,
#endif // USE_MAX7456 #endif
#if defined(USE_ITERM_RELAX) #if defined(USE_ITERM_RELAX)
TABLE_ITERM_RELAX, TABLE_ITERM_RELAX,
TABLE_ITERM_RELAX_TYPE, TABLE_ITERM_RELAX_TYPE,