Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-21 07:15:09 +03:00
Code Activity

Fix PXX2 on xlite

Browse source
This commit is contained in:
3djc 2019-07-27 09:38:55 +02:00
parent 151827ada5
commit f22174d2bb
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -565,7 +565,10 @@ bool isInternalModuleAvailable(int moduleType)
if (moduleType == MODULE_TYPE_NONE) if (moduleType == MODULE_TYPE_NONE)
return true; return true;
#if defined(PXX1) && defined(INTERNAL_MODULE_PXX1) #if defined(PXX2) && defined(INTERNAL_MODULE_PXX1)
if (moduleType == MODULE_TYPE_XJT_PXX1)
return !isModuleUsingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type);
#elif defined(PXX1)
if (moduleType == MODULE_TYPE_XJT_PXX1) if (moduleType == MODULE_TYPE_XJT_PXX1)
return !isModuleUsingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type); return !isModuleUsingSport(EXTERNAL_MODULE, g_model.moduleData[EXTERNAL_MODULE].type);
#else #else
@ -573,7 +576,7 @@ bool isInternalModuleAvailable(int moduleType)
return false; return false;
#endif #endif
#if defined(PXX2) #if defined(PXX2) && !defined(INTERNAL_MODULE_PXX1)
if (moduleType == MODULE_TYPE_ISRM_PXX2) if (moduleType == MODULE_TYPE_ISRM_PXX2)
#if defined(INTMODULE_USART) #if defined(INTMODULE_USART)
return true; return true;

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

@ -147,6 +147,7 @@ elseif(PCB STREQUAL XLITE)
add_definitions(-DPCBXLITE -DSOFTWARE_VOLUME -DEXTERNAL_ANTENNA -DSTICKS_PWM) add_definitions(-DPCBXLITE -DSOFTWARE_VOLUME -DEXTERNAL_ANTENNA -DSTICKS_PWM)
add_definitions(-DEEPROM_VARIANT=0x2000) add_definitions(-DEEPROM_VARIANT=0x2000)
add_definitions(-DPWR_BUTTON_${PWR_BUTTON}) add_definitions(-DPWR_BUTTON_${PWR_BUTTON})
set(PXX2 ON)
set(GUI_DIR 128x64) set(GUI_DIR 128x64)
set(NAVIGATION_TYPE xlite) set(NAVIGATION_TYPE xlite)
set(BITMAPS_TARGET 9x_bitmaps) set(BITMAPS_TARGET 9x_bitmaps)

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

@ -535,6 +535,9 @@ extern HardwareOptions hardwareOptions;
#elif !defined(PXX1) || defined(PCBXLITES) || defined(PCBX9LITE) #elif !defined(PXX1) || defined(PCBXLITES) || defined(PCBX9LITE)
#define IS_PXX2_INTERNAL_ENABLED() (true) #define IS_PXX2_INTERNAL_ENABLED() (true)
#define IS_PXX1_INTERNAL_ENABLED() (false) #define IS_PXX1_INTERNAL_ENABLED() (false)
#elif defined(INTERNAL_MODULE_PXX1)
#define IS_PXX2_INTERNAL_ENABLED() (false)
#define IS_PXX1_INTERNAL_ENABLED() (true)
#else #else
// TODO #define PXX2_PROBE // TODO #define PXX2_PROBE
// TODO #define IS_PXX2_INTERNAL_ENABLED() (hardwareOptions.pxx2Enabled) // TODO #define IS_PXX2_INTERNAL_ENABLED() (hardwareOptions.pxx2Enabled)