From bc0400149836f5682d68437e91dd277796ab1959 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 13 May 2019 10:02:09 +0200 Subject: [PATCH] Logical issue: X9DP is NOT an X9D. Will be fixed better when we introduce radio family definitions --- radio/src/dataconstants.h | 18 +++++++++--------- radio/src/datastructs.h | 2 +- radio/src/gui/gui_common.cpp | 2 +- .../conversions/conversions_218_219.cpp | 2 +- radio/src/targets/taranis/CMakeLists.txt | 2 +- radio/src/targets/taranis/board.h | 4 ++-- radio/src/tests/frsky.cpp | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/radio/src/dataconstants.h b/radio/src/dataconstants.h index 33f4327f0..c75fb12e5 100644 --- a/radio/src/dataconstants.h +++ b/radio/src/dataconstants.h @@ -48,7 +48,7 @@ #define MAX_TRAINER_CHANNELS 16 #define MAX_TELEMETRY_SENSORS 60 #define MAX_CUSTOM_SCREENS 5 -#elif defined(PCBX9D) || defined(PCBX9E) +#elif defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) #define MAX_MODELS 60 #define MAX_OUTPUT_CHANNELS 32 // number of real output channels CH1-CH32 #define MAX_FLIGHT_MODES 9 @@ -383,22 +383,22 @@ enum SwitchSources { SWSRC_SD0, SWSRC_SD1, SWSRC_SD2, -#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) || defined(PCBXLITES) +#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBXLITES) SWSRC_SE0, SWSRC_SE1, SWSRC_SE2, #endif -#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) || defined(PCBX7) || defined(PCBXLITES) +#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBX7) || defined(PCBXLITES) SWSRC_SF0, SWSRC_SF1, SWSRC_SF2, #endif -#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) +#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) SWSRC_SG0, SWSRC_SG1, SWSRC_SG2, #endif -#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) || defined(PCBX7) +#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBX7) SWSRC_SH0, SWSRC_SH1, SWSRC_SH2, @@ -623,16 +623,16 @@ enum MixSources { MIXSRC_SB, LUA_EXPORT("sb", "Switch B") MIXSRC_SC, LUA_EXPORT("sc", "Switch C") MIXSRC_SD, LUA_EXPORT("sd", "Switch D") -#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) || defined(PCBXLITES) +#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBXLITES) MIXSRC_SE, LUA_EXPORT("se", "Switch E") #endif -#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) || defined(PCBX7) || defined(PCBXLITES) +#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBX7) || defined(PCBXLITES) MIXSRC_SF, LUA_EXPORT("sf", "Switch F") #endif -#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) +#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) MIXSRC_SG, LUA_EXPORT("sg", "Switch G") #endif -#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) || defined(PCBX7) +#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBX7) MIXSRC_SH, LUA_EXPORT("sh", "Switch H") #endif #if defined(PCBX9E) diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index 68be52dae..b086b808d 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -540,7 +540,7 @@ PACK(struct CustomScreenData { uint8_t view; #endif -#if defined(PCBX9D) || defined(PCBX9E) +#if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) #define TOPBAR_DATA \ NOBACKUP(uint8_t voltsSource); \ NOBACKUP(uint8_t altitudeSource); diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp index 3819552aa..279848a2b 100644 --- a/radio/src/gui/gui_common.cpp +++ b/radio/src/gui/gui_common.cpp @@ -704,7 +704,7 @@ bool isTrainerModeAvailable(int mode) else return true; } -#elif defined(PCBX9D) || defined(PCBX9E) +#elif defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) bool isTrainerModeAvailable(int mode) { if (IS_EXTERNAL_MODULE_ENABLED() && (mode == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || mode == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE)) diff --git a/radio/src/storage/conversions/conversions_218_219.cpp b/radio/src/storage/conversions/conversions_218_219.cpp index bbdd088aa..4c93ac43e 100644 --- a/radio/src/storage/conversions/conversions_218_219.cpp +++ b/radio/src/storage/conversions/conversions_218_219.cpp @@ -99,7 +99,7 @@ void convertModelData_218_to_219(ModelData &model) newModel.varioData.min = oldModel.frsky.varioMin; newModel.varioData.max = oldModel.frsky.varioMax; -#if defined(PCBX9D) || defined(PCBX9E) +#if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) newModel.voltsSource = oldModel.frsky.voltsSource; newModel.altitudeSource = oldModel.frsky.altitudeSource; #endif diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index 9171b24cf..c152ee0b6 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -40,7 +40,7 @@ elseif(PCB STREQUAL X9D+) set(HAPTIC YES) set(LUA_EXPORT lua_export_x9d) set(FLAVOUR x9d+) - add_definitions(-DPCBX9DP -DPCBX9D -DPCBX9) + add_definitions(-DPCBX9DP -DPCBX9) add_definitions(-DEEPROM_VARIANT=0) set(GUI_DIR 212x64) set(NAVIGATION_TYPE x9d) diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h index 558bb4a2d..5746b1fe0 100644 --- a/radio/src/targets/taranis/board.h +++ b/radio/src/targets/taranis/board.h @@ -357,12 +357,12 @@ enum EnumSwitchesPositions SW_SF1, SW_SF2, #endif -#if defined(PCBX9D) || defined(PCBX9E) +#if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) SW_SG0, SW_SG1, SW_SG2, #endif -#if defined(PCBX9D) || defined(PCBX9E) || defined(PCBX7) +#if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBX7) SW_SH0, SW_SH1, SW_SH2, diff --git a/radio/src/tests/frsky.cpp b/radio/src/tests/frsky.cpp index 22c8c7ded..903c7ff96 100644 --- a/radio/src/tests/frsky.cpp +++ b/radio/src/tests/frsky.cpp @@ -310,7 +310,7 @@ TEST(FrSkySPORT, frskySetCellVoltage) //display test lcdClear(); -#if defined(PCBX9D) || defined(PCBX9E) +#if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) g_model.voltsSource = FRSKY_VOLTS_SOURCE_A1; #endif } @@ -390,7 +390,7 @@ TEST(FrSkySPORT, frskySetCellVoltageTwoSensors) //display test lcdClear(); -#if defined(PCBX9D) || defined(PCBX9E) +#if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) g_model.voltsSource = FRSKY_VOLTS_SOURCE_A1; #endif }