Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

Cosmetics (one TODO done)

Browse source
This commit is contained in:
bsongis 2014-05-16 17:08:35 +02:00
parent 3b85414f2e
commit 487cd04030
4 changed files with 129 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

74
radio/src/gui/menu_general.cpp
View file

@ -70,12 +70,12 @@ LanguagePack * languagePacks[] = {
enum EnumTabDiag { enum EnumTabDiag {
e_Setup, e_Setup,
IF_SDCARD(e_Sd) CASE_SDCARD(e_Sd)
e_Trainer, e_Trainer,
e_Vers, e_Vers,
e_Keys, e_Keys,
e_Ana, e_Ana,
IF_CPUARM(e_Hardware) CASE_CPUARM(e_Hardware)
e_Calib e_Calib
}; };
@ -90,12 +90,12 @@ void menuGeneralCalib(uint8_t event);
const MenuFuncP_PROGMEM menuTabDiag[] PROGMEM = { const MenuFuncP_PROGMEM menuTabDiag[] PROGMEM = {
menuGeneralSetup, menuGeneralSetup,
IF_SDCARD(menuGeneralSdManager) CASE_SDCARD(menuGeneralSdManager)
menuGeneralTrainer, menuGeneralTrainer,
menuGeneralVersion, menuGeneralVersion,
menuGeneralDiagKeys, menuGeneralDiagKeys,
menuGeneralDiagAna, menuGeneralDiagAna,
IF_CPUARM(menuGeneralHardware) CASE_CPUARM(menuGeneralHardware)
menuGeneralCalib menuGeneralCalib
}; };
@ -126,33 +126,33 @@ const MenuFuncP_PROGMEM menuTabDiag[] PROGMEM = {
#endif #endif
#if defined(SPLASH) && !defined(FSPLASH) #if defined(SPLASH) && !defined(FSPLASH)
#define IF_SPLASH_PARAM(x) x, #define CASE_SPLASH_PARAM(x) x,
#else #else
#define IF_SPLASH_PARAM(x) #define CASE_SPLASH_PARAM(x)
#endif #endif
enum menuGeneralSetupItems { enum menuGeneralSetupItems {
IF_RTCLOCK(ITEM_SETUP_DATE) CASE_RTCLOCK(ITEM_SETUP_DATE)
IF_RTCLOCK(ITEM_SETUP_TIME) CASE_RTCLOCK(ITEM_SETUP_TIME)
IF_BATTGRAPH(ITEM_SETUP_BATT_RANGE) CASE_BATTGRAPH(ITEM_SETUP_BATT_RANGE)
ITEM_SETUP_SOUND_LABEL, ITEM_SETUP_SOUND_LABEL,
IF_AUDIO(ITEM_SETUP_BEEP_MODE) CASE_AUDIO(ITEM_SETUP_BEEP_MODE)
IF_BUZZER(ITEM_SETUP_BUZZER_MODE) CASE_BUZZER(ITEM_SETUP_BUZZER_MODE)
IF_VOICE(ITEM_SETUP_SPEAKER_VOLUME) CASE_VOICE(ITEM_SETUP_SPEAKER_VOLUME)
IF_CPUARM(ITEM_SETUP_BEEP_VOLUME) CASE_CPUARM(ITEM_SETUP_BEEP_VOLUME)
IF_CPUARM(ITEM_SETUP_WAV_VOLUME) CASE_CPUARM(ITEM_SETUP_WAV_VOLUME)
IF_CPUARM(ITEM_SETUP_BACKGROUND_VOLUME) CASE_CPUARM(ITEM_SETUP_BACKGROUND_VOLUME)
ITEM_SETUP_BEEP_LENGTH, ITEM_SETUP_BEEP_LENGTH,
IF_AUDIO(ITEM_SETUP_SPEAKER_PITCH) CASE_AUDIO(ITEM_SETUP_SPEAKER_PITCH)
IF_VARIO_CPUARM(ITEM_SETUP_VARIO_LABEL) CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_LABEL)
IF_VARIO_CPUARM(ITEM_SETUP_VARIO_VOLUME) CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_VOLUME)
IF_VARIO_CPUARM(ITEM_SETUP_VARIO_PITCH) CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_PITCH)
IF_VARIO_CPUARM(ITEM_SETUP_VARIO_RANGE) CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_RANGE)
IF_VARIO_CPUARM(ITEM_SETUP_VARIO_REPEAT) CASE_VARIO_CPUARM(ITEM_SETUP_VARIO_REPEAT)
IF_HAPTIC(ITEM_SETUP_HAPTIC_LABEL) CASE_HAPTIC(ITEM_SETUP_HAPTIC_LABEL)
IF_HAPTIC(ITEM_SETUP_HAPTIC_MODE) CASE_HAPTIC(ITEM_SETUP_HAPTIC_MODE)
IF_HAPTIC(ITEM_SETUP_HAPTIC_LENGTH) CASE_HAPTIC(ITEM_SETUP_HAPTIC_LENGTH)
IF_HAPTIC(ITEM_SETUP_HAPTIC_STRENGTH) CASE_HAPTIC(ITEM_SETUP_HAPTIC_STRENGTH)
ITEM_SETUP_CONTRAST, ITEM_SETUP_CONTRAST,
ITEM_SETUP_ALARMS_LABEL, ITEM_SETUP_ALARMS_LABEL,
ITEM_SETUP_BATTERY_WARNING, ITEM_SETUP_BATTERY_WARNING,
@ -165,19 +165,19 @@ enum menuGeneralSetupItems {
ITEM_SETUP_BACKLIGHT_LABEL, ITEM_SETUP_BACKLIGHT_LABEL,
ITEM_SETUP_BACKLIGHT_MODE, ITEM_SETUP_BACKLIGHT_MODE,
ITEM_SETUP_BACKLIGHT_DELAY, ITEM_SETUP_BACKLIGHT_DELAY,
IF_CPUARM(ITEM_SETUP_BRIGHTNESS) CASE_CPUARM(ITEM_SETUP_BRIGHTNESS)
IF_REVPLUS(ITEM_SETUP_BACKLIGHT_COLOR) CASE_REVPLUS(ITEM_SETUP_BACKLIGHT_COLOR)
CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_OFF) CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_OFF)
CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_ON) CASE_PWM_BACKLIGHT(ITEM_SETUP_BACKLIGHT_BRIGHTNESS_ON)
ITEM_SETUP_FLASH_BEEP, ITEM_SETUP_FLASH_BEEP,
IF_SPLASH_PARAM(ITEM_SETUP_DISABLE_SPLASH) CASE_SPLASH_PARAM(ITEM_SETUP_DISABLE_SPLASH)
IF_GPS(ITEM_SETUP_TIMEZONE) CASE_GPS(ITEM_SETUP_TIMEZONE)
IF_GPS(ITEM_SETUP_GPSFORMAT) CASE_GPS(ITEM_SETUP_GPSFORMAT)
IF_PXX(ITEM_SETUP_COUNTRYCODE) CASE_PXX(ITEM_SETUP_COUNTRYCODE)
IF_CPUARM(ITEM_SETUP_LANGUAGE) CASE_CPUARM(ITEM_SETUP_LANGUAGE)
IF_CPUARM(ITEM_SETUP_IMPERIAL) CASE_CPUARM(ITEM_SETUP_IMPERIAL)
IF_FAI_CHOICE(ITEM_SETUP_FAI) IF_FAI_CHOICE(ITEM_SETUP_FAI)
IF_MAVLINK(ITEM_MAVLINK_BAUD) CASE_MAVLINK(ITEM_MAVLINK_BAUD)
ITEM_SETUP_RX_CHANNEL_ORD, ITEM_SETUP_RX_CHANNEL_ORD,
ITEM_SETUP_STICK_MODE_LABELS, ITEM_SETUP_STICK_MODE_LABELS,
ITEM_SETUP_STICK_MODE, ITEM_SETUP_STICK_MODE,
@ -212,7 +212,7 @@ void menuGeneralSetup(uint8_t event)
} }
#endif #endif
MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+1, {0, IF_RTCLOCK(2) IF_RTCLOCK(2) IF_BATTGRAPH(1) LABEL(SOUND), IF_AUDIO(0) IF_BUZZER(0) IF_VOICE(0) IF_CPUARM(0) IF_CPUARM(0) IF_CPUARM(0) 0, IF_AUDIO(0) IF_VARIO_CPUARM(LABEL(VARIO)) IF_VARIO_CPUARM(0) IF_VARIO_CPUARM(0) IF_VARIO_CPUARM(0) IF_VARIO_CPUARM(0) IF_HAPTIC(LABEL(HAPTIC)) IF_HAPTIC(0) IF_HAPTIC(0) IF_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, IF_CPUARM(0) IF_REVPLUS(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, IF_SPLASH_PARAM(0) IF_GPS(0) IF_GPS(0) IF_PXX(0) IF_CPUARM(0) IF_CPUARM(0) IF_FAI_CHOICE(0) 0, COL_TX_MODE, CASE_PCBTARANIS(0) 1/*to force edit mode*/}); MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+1, {0, CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) CASE_VOICE(0) CASE_CPUARM(0) CASE_CPUARM(0) CASE_CPUARM(0) 0, CASE_AUDIO(0) CASE_VARIO_CPUARM(LABEL(VARIO)) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, CASE_CPUARM(0) CASE_REVPLUS(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) CASE_CPUARM(0) CASE_CPUARM(0) IF_FAI_CHOICE(0) 0, COL_TX_MODE, CASE_PCBTARANIS(0) 1/*to force edit mode*/});
uint8_t sub = m_posVert - 1; uint8_t sub = m_posVert - 1;
@ -1387,14 +1387,14 @@ enum menuGeneralHwItems {
ITEM_SETUP_HW_STICK_RV_GAIN, ITEM_SETUP_HW_STICK_RV_GAIN,
ITEM_SETUP_HW_STICK_RH_GAIN, ITEM_SETUP_HW_STICK_RH_GAIN,
IF_ROTARY_ENCODERS(ITEM_SETUP_HW_ROTARY_ENCODER) IF_ROTARY_ENCODERS(ITEM_SETUP_HW_ROTARY_ENCODER)
IF_BLUETOOTH(ITEM_SETUP_HW_BT_BAUDRATE) CASE_BLUETOOTH(ITEM_SETUP_HW_BT_BAUDRATE)
ITEM_SETUP_HW_MAX ITEM_SETUP_HW_MAX
}; };
#define GENERAL_HW_PARAM_OFS (2+(15*FW)) #define GENERAL_HW_PARAM_OFS (2+(15*FW))
void menuGeneralHardware(uint8_t event) void menuGeneralHardware(uint8_t event)
{ {
MENU(STR_HARDWARE, menuTabDiag, e_Hardware, ITEM_SETUP_HW_MAX+1, {0, 0, (uint8_t)-1, 0, 0, 0, IF_ROTARY_ENCODERS(0) IF_BLUETOOTH(0)}); MENU(STR_HARDWARE, menuTabDiag, e_Hardware, ITEM_SETUP_HW_MAX+1, {0, 0, (uint8_t)-1, 0, 0, 0, IF_ROTARY_ENCODERS(0) CASE_BLUETOOTH(0)});
uint8_t sub = m_posVert - 1; uint8_t sub = m_posVert - 1;

58
radio/src/gui/menu_model.cpp
View file

@ -45,23 +45,23 @@
enum EnumTabModel { enum EnumTabModel {
e_ModelSelect, e_ModelSelect,
e_ModelSetup, e_ModelSetup,
IF_HELI(e_Heli) CASE_HELI(e_Heli)
IF_FLIGHT_MODES(e_FlightModesAll) CASE_FLIGHT_MODES(e_FlightModesAll)
e_InputsAll, e_InputsAll,
e_MixAll, e_MixAll,
e_Limits, e_Limits,
IF_CURVES(e_CurvesAll) CASE_CURVES(e_CurvesAll)
#if LCD_W >= 212 #if LCD_W >= 212
IF_GVARS(e_GVars) CASE_GVARS(e_GVars)
#endif #endif
e_LogicalSwitches, e_LogicalSwitches,
e_CustomFunctions, e_CustomFunctions,
#if defined(LUA_MODEL_SCRIPTS) #if defined(LUA_MODEL_SCRIPTS)
e_CustomScripts, e_CustomScripts,
#endif #endif
IF_FRSKY(e_Telemetry) CASE_FRSKY(e_Telemetry)
IF_MAVLINK(e_MavSetup) CASE_MAVLINK(e_MavSetup)
IF_TEMPLATES(e_Templates) CASE_TEMPLATES(e_Templates)
}; };
void menuModelSelect(uint8_t event); void menuModelSelect(uint8_t event);
@ -83,23 +83,23 @@ void menuModelExpoOne(uint8_t event);
const MenuFuncP_PROGMEM menuTabModel[] PROGMEM = { const MenuFuncP_PROGMEM menuTabModel[] PROGMEM = {
menuModelSelect, menuModelSelect,
menuModelSetup, menuModelSetup,
IF_HELI(menuModelHeli) CASE_HELI(menuModelHeli)
IF_FLIGHT_MODES(menuModelFlightModesAll) CASE_FLIGHT_MODES(menuModelFlightModesAll)
menuModelExposAll, menuModelExposAll,
menuModelMixAll, menuModelMixAll,
menuModelLimits, menuModelLimits,
IF_CURVES(menuModelCurvesAll) CASE_CURVES(menuModelCurvesAll)
#if LCD_W >= 212 && defined(GVARS) && defined(FLIGHT_MODES) #if LCD_W >= 212 && defined(GVARS) && defined(FLIGHT_MODES)
IF_GVARS(menuModelGVars) CASE_GVARS(menuModelGVars)
#endif #endif
menuModelLogicalSwitches, menuModelLogicalSwitches,
menuModelCustomFunctions, menuModelCustomFunctions,
#if defined(LUA_MODEL_SCRIPTS) #if defined(LUA_MODEL_SCRIPTS)
menuModelCustomScripts, menuModelCustomScripts,
#endif #endif
IF_FRSKY(menuModelTelemetry) CASE_FRSKY(menuModelTelemetry)
IF_MAVLINK(menuTelemetryMavlinkSetup) CASE_MAVLINK(menuTelemetryMavlinkSetup)
IF_TEMPLATES(menuModelTemplates) CASE_TEMPLATES(menuModelTemplates)
}; };
#define COPY_MODE 1 #define COPY_MODE 1
@ -890,8 +890,8 @@ enum menuModelSetupItems {
ITEM_MODEL_THROTTLE_REVERSED, ITEM_MODEL_THROTTLE_REVERSED,
ITEM_MODEL_THROTTLE_TRACE, ITEM_MODEL_THROTTLE_TRACE,
ITEM_MODEL_THROTTLE_TRIM, ITEM_MODEL_THROTTLE_TRIM,
CASE_PCBTARANIS(ITEM_MODEL_PREFLIGHT_LABEL) CASE_CPUARM(ITEM_MODEL_PREFLIGHT_LABEL)
CASE_PCBTARANIS(ITEM_MODEL_CHECKLIST_DISPLAY) CASE_CPUARM(ITEM_MODEL_CHECKLIST_DISPLAY)
ITEM_MODEL_THROTTLE_WARNING, ITEM_MODEL_THROTTLE_WARNING,
ITEM_MODEL_SWITCHES_WARNING, ITEM_MODEL_SWITCHES_WARNING,
CASE_PCBTARANIS(ITEM_MODEL_POT_WARNING) CASE_PCBTARANIS(ITEM_MODEL_POT_WARNING)
@ -2877,14 +2877,14 @@ bool swapExpoMix(uint8_t expo, uint8_t &idx, uint8_t up)
enum ExposFields { enum ExposFields {
CASE_PCBTARANIS(EXPO_FIELD_INPUT_NAME) CASE_PCBTARANIS(EXPO_FIELD_INPUT_NAME)
IF_CPUARM(EXPO_FIELD_NAME) CASE_CPUARM(EXPO_FIELD_NAME)
CASE_PCBTARANIS(EXPO_FIELD_SOURCE) CASE_PCBTARANIS(EXPO_FIELD_SOURCE)
CASE_PCBTARANIS(EXPO_FIELD_SCALE) CASE_PCBTARANIS(EXPO_FIELD_SCALE)
EXPO_FIELD_WEIGHT, EXPO_FIELD_WEIGHT,
CASE_PCBTARANIS(EXPO_FIELD_OFFSET) CASE_PCBTARANIS(EXPO_FIELD_OFFSET)
CASE_9X(EXPO_FIELD_EXPO) CASE_9X(EXPO_FIELD_EXPO)
IF_CURVES(EXPO_FIELD_CURVE) CASE_CURVES(EXPO_FIELD_CURVE)
IF_FLIGHT_MODES(EXPO_FIELD_FLIGHT_PHASE) CASE_FLIGHT_MODES(EXPO_FIELD_FLIGHT_PHASE)
EXPO_FIELD_SWITCH, EXPO_FIELD_SWITCH,
EXPO_FIELD_SIDE, EXPO_FIELD_SIDE,
CASE_PCBTARANIS(EXPO_FIELD_TRIM) CASE_PCBTARANIS(EXPO_FIELD_TRIM)
@ -2914,7 +2914,7 @@ void menuModelExpoOne(uint8_t event)
putsMixerSource(7*FW+FW/2, 0, MIXSRC_Rud+ed->chn, 0); putsMixerSource(7*FW+FW/2, 0, MIXSRC_Rud+ed->chn, 0);
#endif #endif
SUBMENU(STR_MENUINPUTS, EXPO_FIELD_MAX, {CASE_PCBTARANIS(0) IF_CPUARM(0) CASE_PCBTARANIS(0) CASE_PCBTARANIS((ed->srcRaw >= MIXSRC_FIRST_TELEM ? (uint8_t)0 : (uint8_t)HIDDEN_ROW)) 0, CASE_PCBTARANIS(0) CASE_9X(0) IF_CURVES(CURVE_ROWS) IF_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/}); SUBMENU(STR_MENUINPUTS, EXPO_FIELD_MAX, {CASE_PCBTARANIS(0) CASE_CPUARM(0) CASE_PCBTARANIS(0) CASE_PCBTARANIS((ed->srcRaw >= MIXSRC_FIRST_TELEM ? (uint8_t)0 : (uint8_t)HIDDEN_ROW)) 0, CASE_PCBTARANIS(0) CASE_9X(0) CASE_CURVES(CURVE_ROWS) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/});
SET_SCROLLBAR_X(EXPO_ONE_2ND_COLUMN+10*FW); SET_SCROLLBAR_X(EXPO_ONE_2ND_COLUMN+10*FW);
@ -3070,13 +3070,13 @@ void menuModelExpoOne(uint8_t event)
} }
enum MixFields { enum MixFields {
IF_CPUARM(MIX_FIELD_NAME) CASE_CPUARM(MIX_FIELD_NAME)
MIX_FIELD_SOURCE, MIX_FIELD_SOURCE,
MIX_FIELD_WEIGHT, MIX_FIELD_WEIGHT,
MIX_FIELD_OFFSET, MIX_FIELD_OFFSET,
MIX_FIELD_TRIM, MIX_FIELD_TRIM,
IF_CURVES(MIX_FIELD_CURVE) CASE_CURVES(MIX_FIELD_CURVE)
IF_FLIGHT_MODES(MIX_FIELD_FLIGHT_PHASE) CASE_FLIGHT_MODES(MIX_FIELD_FLIGHT_PHASE)
MIX_FIELD_SWITCH, MIX_FIELD_SWITCH,
MIX_FIELD_WARNING, MIX_FIELD_WARNING,
MIX_FIELD_MLTPX, MIX_FIELD_MLTPX,
@ -3115,11 +3115,11 @@ void menuModelMixOne(uint8_t event)
#else #else
if (m_posVert == MIX_FIELD_TRIM && md2->srcRaw > NUM_STICKS) if (m_posVert == MIX_FIELD_TRIM && md2->srcRaw > NUM_STICKS)
#endif #endif
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_CPUARM(0) 0, 0, 0, CASE_9X(0) IF_CURVES(0) IF_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}) SUBMENU_NOTITLE(MIX_FIELD_COUNT, {CASE_CPUARM(0) 0, 0, 0, CASE_9X(0) CASE_CURVES(0) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/})
else else
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_CPUARM(0) 0, 0, 0, CASE_9X(1) IF_CURVES(1) IF_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); SUBMENU_NOTITLE(MIX_FIELD_COUNT, {CASE_CPUARM(0) 0, 0, 0, CASE_9X(1) CASE_CURVES(1) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/});
#else #else
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_CPUARM(0) 0, 0, 0, CASE_9X(1) CASE_PCBTARANIS(0) IF_CURVES(1) IF_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); SUBMENU_NOTITLE(MIX_FIELD_COUNT, {CASE_CPUARM(0) 0, 0, 0, CASE_9X(1) CASE_PCBTARANIS(0) CASE_CURVES(1) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/});
#endif #endif
#if MENU_COLUMNS > 1 #if MENU_COLUMNS > 1
@ -5373,11 +5373,11 @@ enum menuModelTelemetryItems {
#if defined(CPUARM) #if defined(CPUARM)
ITEM_TELEMTETRY_PERSISTENT_MAH, ITEM_TELEMTETRY_PERSISTENT_MAH,
#endif #endif
IF_VARIO(ITEM_TELEMETRY_VARIO_LABEL) CASE_VARIO(ITEM_TELEMETRY_VARIO_LABEL)
#if defined(VARIO) #if defined(VARIO)
ITEM_TELEMETRY_VARIO_SOURCE, ITEM_TELEMETRY_VARIO_SOURCE,
#endif #endif
IF_VARIO(ITEM_TELEMETRY_VARIO_RANGE) CASE_VARIO(ITEM_TELEMETRY_VARIO_RANGE)
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
ITEM_TELEMETRY_TOP_BAR_LABEL, ITEM_TELEMETRY_TOP_BAR_LABEL,
ITEM_TELEMETRY_TOP_BAR_ALTITUDE, ITEM_TELEMETRY_TOP_BAR_ALTITUDE,
@ -5458,7 +5458,7 @@ enum menuModelTelemetryItems {
void menuModelTelemetry(uint8_t event) void menuModelTelemetry(uint8_t event)
{ {
MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, CHANNEL_ROWS CHANNEL_ROWS RSSI_ROWS USRDATA_LINES 0, 0, IF_FAS_OFFSET(0) IF_CPUARM(0) IF_VARIO(LABEL(Vario)) IF_VARIO(0) IF_VARIO(VARIO_RANGE_ROWS) CASE_PCBTARANIS(LABEL(TopBar)) CASE_PCBTARANIS(0) SCREEN_TYPE_ROWS, 2, 2, 2, 2, SCREEN_TYPE_ROWS, 2, 2, 2, 2, IF_CPUARM(SCREEN_TYPE_ROWS) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) IF_CPUARM(2) }); MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, CHANNEL_ROWS CHANNEL_ROWS RSSI_ROWS USRDATA_LINES 0, 0, IF_FAS_OFFSET(0) CASE_CPUARM(0) CASE_VARIO(LABEL(Vario)) CASE_VARIO(0) CASE_VARIO(VARIO_RANGE_ROWS) CASE_PCBTARANIS(LABEL(TopBar)) CASE_PCBTARANIS(0) SCREEN_TYPE_ROWS, 2, 2, 2, 2, SCREEN_TYPE_ROWS, 2, 2, 2, 2, CASE_CPUARM(SCREEN_TYPE_ROWS) CASE_CPUARM(2) CASE_CPUARM(2) CASE_CPUARM(2) CASE_CPUARM(2) });
uint8_t sub = m_posVert - 1; uint8_t sub = m_posVert - 1;

2
radio/src/gui/view_telemetry.cpp
View file

@ -50,7 +50,7 @@ uint8_t barsThresholds[THLD_MAX];
enum FrskyViews { enum FrskyViews {
e_frsky_custom_screen_1, e_frsky_custom_screen_1,
e_frsky_custom_screen_2, e_frsky_custom_screen_2,
IF_CPUARM(e_frsky_custom_screen_3) CASE_CPUARM(e_frsky_custom_screen_3)
e_frsky_voltages, e_frsky_voltages,
e_frsky_after_flight, e_frsky_after_flight,
FRSKY_VIEW_MAX = e_frsky_after_flight FRSKY_VIEW_MAX = e_frsky_after_flight

126
radio/src/opentx.h
View file

@ -42,52 +42,50 @@
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
// TODO change all IF_xxx by CASE_xxx when used with a comma!
#if defined(PCBSKY9X) #if defined(PCBSKY9X)
#define IS_PCBSKY9X true #define IS_PCBSKY9X true
#define CASE_PCBSKY9X(x) x, #define CASE_PCBSKY9X(x) x,
#else #else
#define IS_PCBSKY9X false #define IS_PCBSKY9X false
#define CASE_PCBSKY9X(x) #define CASE_PCBSKY9X(x)
#endif #endif
#if defined(PCBTARANIS) #if defined(PCBTARANIS)
#define IS_PCBTARANIS() true #define IS_PCBTARANIS() true
#define IF_PCBTARANIS(x) (x) #define IF_PCBTARANIS(x) (x)
#define CASE_PCBTARANIS(x) x, #define CASE_PCBTARANIS(x) x,
#define IF_9X(x) (0) #define IF_9X(x) (0)
#define CASE_9X(x) #define CASE_9X(x)
#else #else
#define IS_PCBTARANIS() false #define IS_PCBTARANIS() false
#define IF_PCBTARANIS(x) (0) #define IF_PCBTARANIS(x) (0)
#define CASE_PCBTARANIS(x) #define CASE_PCBTARANIS(x)
#define IF_9X(x) (x) #define IF_9X(x) (x)
#define CASE_9X(x) x, #define CASE_9X(x) x,
#endif #endif
#if defined(CPUARM) #if defined(CPUARM)
#define IF_CPUARM(x) x, #define CASE_CPUARM(x) x,
#else #else
#define IF_CPUARM(x) #define CASE_CPUARM(x)
#endif #endif
#if defined(VARIO) && defined(CPUARM) #if defined(VARIO) && defined(CPUARM)
#define IF_VARIO_CPUARM(x) x, #define CASE_VARIO_CPUARM(x) x,
#else #else
#define IF_VARIO_CPUARM(x) #define CASE_VARIO_CPUARM(x)
#endif #endif
#if defined(LUA) #if defined(LUA)
#define IF_LUA(x) x, #define CASE_LUA(x) x,
#else #else
#define IF_LUA(x) #define CASE_LUA(x)
#endif #endif
#if defined(BATTGRAPH) || defined(PCBTARANIS) #if defined(BATTGRAPH) || defined(PCBTARANIS)
#define IF_BATTGRAPH(x) x, #define CASE_BATTGRAPH(x) x,
#else #else
#define IF_BATTGRAPH(x) #define CASE_BATTGRAPH(x)
#endif #endif
#if defined(CPUARM) || defined(CPUM2560) #if defined(CPUARM) || defined(CPUM2560)
@ -97,123 +95,123 @@
#endif #endif
#if defined(RTCLOCK) #if defined(RTCLOCK)
#define IF_RTCLOCK(x) x, #define CASE_RTCLOCK(x) x,
#else #else
#define IF_RTCLOCK(x) #define CASE_RTCLOCK(x)
#endif #endif
#if defined(BUZZER) #if defined(BUZZER)
#define IF_BUZZER(x) x, #define CASE_BUZZER(x) x,
#else #else
#define IF_BUZZER(x) #define CASE_BUZZER(x)
#endif #endif
#if defined(AUDIO) #if defined(AUDIO)
#define IF_AUDIO(x) x, #define CASE_AUDIO(x) x,
#else #else
#define IF_AUDIO(x) #define CASE_AUDIO(x)
#endif #endif
#if defined(VOICE) #if defined(VOICE)
#define IF_VOICE(x) x, #define CASE_VOICE(x) x,
#else #else
#define IF_VOICE(x) #define CASE_VOICE(x)
#endif #endif
#if defined(PWM_BACKLIGHT) #if defined(PWM_BACKLIGHT)
#define CASE_PWM_BACKLIGHT(x) x, #define CASE_PWM_BACKLIGHT(x) x,
#else #else
#define CASE_PWM_BACKLIGHT(x) #define CASE_PWM_BACKLIGHT(x)
#endif #endif
#if defined(FRSKY) && defined(FRSKY_HUB) && defined(GPS) #if defined(FRSKY) && defined(FRSKY_HUB) && defined(GPS)
#define IF_GPS(x) x, #define CASE_GPS(x) x,
#else #else
#define IF_GPS(x) #define CASE_GPS(x)
#endif #endif
#if defined(VARIO) #if defined(VARIO)
#define IF_VARIO(x) x, #define CASE_VARIO(x) x,
#else #else
#define IF_VARIO(x) #define CASE_VARIO(x)
#endif #endif
#if defined(HAPTIC) #if defined(HAPTIC)
#define IF_HAPTIC(x) x, #define CASE_HAPTIC(x) x,
#else #else
#define IF_HAPTIC(x) #define CASE_HAPTIC(x)
#endif #endif
#if defined(SPLASH) #if defined(SPLASH)
#define IF_SPLASH(x) x, #define CASE_SPLASH(x) x,
#else #else
#define IF_SPLASH(x) #define CASE_SPLASH(x)
#endif #endif
#if defined(FRSKY) #if defined(FRSKY)
#define IF_FRSKY(x) x, #define CASE_FRSKY(x) x,
#else #else
#define IF_FRSKY(x) #define CASE_FRSKY(x)
#endif #endif
#if defined(MAVLINK) #if defined(MAVLINK)
#define IF_MAVLINK(x) x, #define CASE_MAVLINK(x) x,
#else #else
#define IF_MAVLINK(x) #define CASE_MAVLINK(x)
#endif #endif
#if defined(PXX) #if defined(PXX)
#define IF_PXX(x) x, #define CASE_PXX(x) x,
#else #else
#define IF_PXX(x) #define CASE_PXX(x)
#endif #endif
#if defined(SDCARD) #if defined(SDCARD)
#define IF_SDCARD(x) x, #define CASE_SDCARD(x) x,
#else #else
#define IF_SDCARD(x) #define CASE_SDCARD(x)
#endif #endif
#if defined(BLUETOOTH) #if defined(BLUETOOTH)
#define IF_BLUETOOTH(x) x, #define CASE_BLUETOOTH(x) x,
#else #else
#define IF_BLUETOOTH(x) #define CASE_BLUETOOTH(x)
#endif #endif
#if defined(HELI) #if defined(HELI)
#define IF_HELI(x) x, #define CASE_HELI(x) x,
#else #else
#define IF_HELI(x) #define CASE_HELI(x)
#endif #endif
#if defined(TEMPLATES) #if defined(TEMPLATES)
#define IF_TEMPLATES(x) x, #define CASE_TEMPLATES(x) x,
#else #else
#define IF_TEMPLATES(x) #define CASE_TEMPLATES(x)
#endif #endif
#if defined(FLIGHT_MODES) #if defined(FLIGHT_MODES)
#define IF_FLIGHT_MODES(x) x, #define CASE_FLIGHT_MODES(x) x,
#else #else
#define IF_FLIGHT_MODES(x) #define CASE_FLIGHT_MODES(x)
#endif #endif
#if defined(CURVES) #if defined(CURVES)
#define IF_CURVES(x) x, #define CASE_CURVES(x) x,
#else #else
#define IF_CURVES(x) #define CASE_CURVES(x)
#endif #endif
#if defined(GVARS) #if defined(GVARS)
#define IF_GVARS(x) x, #define CASE_GVARS(x) x,
#else #else
#define IF_GVARS(x) #define CASE_GVARS(x)
#endif #endif
#if defined(PCBTARANIS) && defined(REVPLUS) #if defined(PCBTARANIS) && defined(REVPLUS)
#define IF_REVPLUS(x) x, #define CASE_REVPLUS(x) x,
#else #else
#define IF_REVPLUS(x) #define CASE_REVPLUS(x)
#endif #endif
#if ROTARY_ENCODERS > 0 #if ROTARY_ENCODERS > 0