Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

Logical issue: X9DP is NOT an X9D. Will be fixed better when we introduce radio family definitions

Browse source
This commit is contained in:
Bertrand Songis 2019-05-13 10:02:09 +02:00
parent c2af1efcd4
commit bc04001498
7 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

18
radio/src/dataconstants.h
View file

@ -48,7 +48,7 @@
#define MAX_TRAINER_CHANNELS 16 #define MAX_TRAINER_CHANNELS 16
#define MAX_TELEMETRY_SENSORS 60 #define MAX_TELEMETRY_SENSORS 60
#define MAX_CUSTOM_SCREENS 5 #define MAX_CUSTOM_SCREENS 5
#elif defined(PCBX9D) || defined(PCBX9E) #elif defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E)
#define MAX_MODELS 60 #define MAX_MODELS 60
#define MAX_OUTPUT_CHANNELS 32 // number of real output channels CH1-CH32 #define MAX_OUTPUT_CHANNELS 32 // number of real output channels CH1-CH32
#define MAX_FLIGHT_MODES 9 #define MAX_FLIGHT_MODES 9
@ -383,22 +383,22 @@ enum SwitchSources {
SWSRC_SD0, SWSRC_SD0,
SWSRC_SD1, SWSRC_SD1,
SWSRC_SD2, 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_SE0,
SWSRC_SE1, SWSRC_SE1,
SWSRC_SE2, SWSRC_SE2,
#endif #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_SF0,
SWSRC_SF1, SWSRC_SF1,
SWSRC_SF2, SWSRC_SF2,
#endif #endif
#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) #if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E)
SWSRC_SG0, SWSRC_SG0,
SWSRC_SG1, SWSRC_SG1,
SWSRC_SG2, SWSRC_SG2,
#endif #endif
#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) || defined(PCBX7) #if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBX7)
SWSRC_SH0, SWSRC_SH0,
SWSRC_SH1, SWSRC_SH1,
SWSRC_SH2, SWSRC_SH2,
@ -623,16 +623,16 @@ enum MixSources {
MIXSRC_SB, LUA_EXPORT("sb", "Switch B") MIXSRC_SB, LUA_EXPORT("sb", "Switch B")
MIXSRC_SC, LUA_EXPORT("sc", "Switch C") MIXSRC_SC, LUA_EXPORT("sc", "Switch C")
MIXSRC_SD, LUA_EXPORT("sd", "Switch D") 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") MIXSRC_SE, LUA_EXPORT("se", "Switch E")
#endif #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") MIXSRC_SF, LUA_EXPORT("sf", "Switch F")
#endif #endif
#if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9E) #if defined(PCBHORUS) || defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E)
MIXSRC_SG, LUA_EXPORT("sg", "Switch G") MIXSRC_SG, LUA_EXPORT("sg", "Switch G")
#endif #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") MIXSRC_SH, LUA_EXPORT("sh", "Switch H")
#endif #endif
#if defined(PCBX9E) #if defined(PCBX9E)

2
radio/src/datastructs.h
View file

@ -540,7 +540,7 @@ PACK(struct CustomScreenData {
uint8_t view; uint8_t view;
#endif #endif
#if defined(PCBX9D) || defined(PCBX9E) #if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E)
#define TOPBAR_DATA \ #define TOPBAR_DATA \
NOBACKUP(uint8_t voltsSource); \ NOBACKUP(uint8_t voltsSource); \
NOBACKUP(uint8_t altitudeSource); NOBACKUP(uint8_t altitudeSource);

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

@ -704,7 +704,7 @@ bool isTrainerModeAvailable(int mode)
else else
return true; return true;
} }
#elif defined(PCBX9D) || defined(PCBX9E) #elif defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E)
bool isTrainerModeAvailable(int mode) bool isTrainerModeAvailable(int mode)
{ {
if (IS_EXTERNAL_MODULE_ENABLED() && (mode == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || mode == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE)) if (IS_EXTERNAL_MODULE_ENABLED() && (mode == TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE || mode == TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE))

2
radio/src/storage/conversions/conversions_218_219.cpp
View file

@ -99,7 +99,7 @@ void convertModelData_218_to_219(ModelData &model)
newModel.varioData.min = oldModel.frsky.varioMin; newModel.varioData.min = oldModel.frsky.varioMin;
newModel.varioData.max = oldModel.frsky.varioMax; newModel.varioData.max = oldModel.frsky.varioMax;
#if defined(PCBX9D) || defined(PCBX9E) #if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E)
newModel.voltsSource = oldModel.frsky.voltsSource; newModel.voltsSource = oldModel.frsky.voltsSource;
newModel.altitudeSource = oldModel.frsky.altitudeSource; newModel.altitudeSource = oldModel.frsky.altitudeSource;
#endif #endif

2
radio/src/targets/taranis/CMakeLists.txt
View file

@ -40,7 +40,7 @@ elseif(PCB STREQUAL X9D+)
set(HAPTIC YES) set(HAPTIC YES)
set(LUA_EXPORT lua_export_x9d) set(LUA_EXPORT lua_export_x9d)
set(FLAVOUR x9d+) set(FLAVOUR x9d+)
add_definitions(-DPCBX9DP -DPCBX9D -DPCBX9) add_definitions(-DPCBX9DP -DPCBX9)
add_definitions(-DEEPROM_VARIANT=0) add_definitions(-DEEPROM_VARIANT=0)
set(GUI_DIR 212x64) set(GUI_DIR 212x64)
set(NAVIGATION_TYPE x9d) set(NAVIGATION_TYPE x9d)

4
radio/src/targets/taranis/board.h
View file

@ -357,12 +357,12 @@ enum EnumSwitchesPositions
SW_SF1, SW_SF1,
SW_SF2, SW_SF2,
#endif #endif
#if defined(PCBX9D) || defined(PCBX9E) #if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E)
SW_SG0, SW_SG0,
SW_SG1, SW_SG1,
SW_SG2, SW_SG2,
#endif #endif
#if defined(PCBX9D) || defined(PCBX9E) || defined(PCBX7) #if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBX7)
SW_SH0, SW_SH0,
SW_SH1, SW_SH1,
SW_SH2, SW_SH2,

4
radio/src/tests/frsky.cpp
View file

@ -310,7 +310,7 @@ TEST(FrSkySPORT, frskySetCellVoltage)
//display test //display test
lcdClear(); lcdClear();
#if defined(PCBX9D) || defined(PCBX9E) #if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E)
g_model.voltsSource = FRSKY_VOLTS_SOURCE_A1; g_model.voltsSource = FRSKY_VOLTS_SOURCE_A1;
#endif #endif
} }
@ -390,7 +390,7 @@ TEST(FrSkySPORT, frskySetCellVoltageTwoSensors)
//display test //display test
lcdClear(); lcdClear();
#if defined(PCBX9D) || defined(PCBX9E) #if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E)
g_model.voltsSource = FRSKY_VOLTS_SOURCE_A1; g_model.voltsSource = FRSKY_VOLTS_SOURCE_A1;
#endif #endif
} }