From 4084c9b3d5945e438c4fb11485e5a101b1b62c80 Mon Sep 17 00:00:00 2001 From: Dominic Clifton Date: Thu, 26 Mar 2020 17:25:30 +0100 Subject: [PATCH] Fix unable to change video system for FrSkyPixelOSD. --- src/main/cli/settings.c | 10 +++++----- src/main/cli/settings.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/cli/settings.c b/src/main/cli/settings.c index 03039d3f53..dfde683211 100644 --- a/src/main/cli/settings.c +++ b/src/main/cli/settings.c @@ -375,11 +375,11 @@ const char * const lookupTableRescueAltitudeMode[] = { }; #endif -#ifdef USE_MAX7456 +#if defined(USE_MAX7456) || defined(USE_FRSKYOSD) static const char * const lookupTableVideoSystem[] = { "AUTO", "PAL", "NTSC" }; -#endif // USE_MAX7456 +#endif #if defined(USE_ITERM_RELAX) const char * const lookupTableItermRelax[] = { @@ -569,9 +569,9 @@ const lookupTableEntry_t lookupTables[] = { LOOKUP_TABLE_ENTRY(lookupTableGyro), #endif LOOKUP_TABLE_ENTRY(lookupTableThrottleLimitType), -#ifdef USE_MAX7456 +#if defined(USE_MAX7456) || defined(USE_FRSKYOSD) LOOKUP_TABLE_ENTRY(lookupTableVideoSystem), -#endif // USE_MAX7456 +#endif #if defined(USE_ITERM_RELAX) LOOKUP_TABLE_ENTRY(lookupTableItermRelax), LOOKUP_TABLE_ENTRY(lookupTableItermRelaxType), @@ -1432,7 +1432,7 @@ const clivalue_t valueTable[] = { #endif // 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_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) }, diff --git a/src/main/cli/settings.h b/src/main/cli/settings.h index 090b5316af..cd4f37701a 100644 --- a/src/main/cli/settings.h +++ b/src/main/cli/settings.h @@ -98,9 +98,9 @@ typedef enum { TABLE_GYRO, #endif TABLE_THROTTLE_LIMIT_TYPE, -#ifdef USE_MAX7456 +#if defined(USE_MAX7456) || defined(USE_FRSKYOSD) TABLE_VIDEO_SYSTEM, -#endif // USE_MAX7456 +#endif #if defined(USE_ITERM_RELAX) TABLE_ITERM_RELAX, TABLE_ITERM_RELAX_TYPE,