Merge pull request #5782 from etracer65/video_type_enum

Add descriptive enumeration for vcd_video_system values
This commit is contained in:
borisbstyle 2018-04-30 08:18:24 +02:00 committed by GitHub
commit d5380a670b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions

View File

@ -329,6 +329,12 @@ static const char * const lookupTableThrottleLimitType[] = {
"OFF", "SCALE", "CLIP"
};
#ifdef USE_MAX7456
static const char * const lookupTableVideoSystem[] = {
"AUTO", "PAL", "NTSC"
};
#endif // USE_MAX7456
#define LOOKUP_TABLE_ENTRY(name) { name, ARRAYLEN(name) }
const lookupTableEntry_t lookupTables[] = {
@ -397,6 +403,9 @@ const lookupTableEntry_t lookupTables[] = {
LOOKUP_TABLE_ENTRY(lookupTableGyro),
#endif
LOOKUP_TABLE_ENTRY(lookupTableThrottleLimitType),
#ifdef USE_MAX7456
LOOKUP_TABLE_ENTRY(lookupTableVideoSystem),
#endif // USE_MAX7456
};
#undef LOOKUP_TABLE_ENTRY
@ -921,7 +930,7 @@ const clivalue_t valueTable[] = {
// PG_VCD_CONFIG
#ifdef USE_MAX7456
{ "vcd_video_system", VAR_UINT8 | MASTER_VALUE, .config.minmax = { 0, 2 }, 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_v_offset", VAR_INT8 | MASTER_VALUE, .config.minmax = { -15, 16 }, PG_VCD_CONFIG, offsetof(vcdProfile_t, v_offset) },
#endif

View File

@ -91,6 +91,9 @@ typedef enum {
TABLE_GYRO,
#endif
TABLE_THROTTLE_LIMIT_TYPE,
#ifdef USE_MAX7456
TABLE_VIDEO_SYSTEM,
#endif // USE_MAX7456
LOOKUP_TABLE_COUNT
} lookupTableIndex_e;