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

Companion bugfixes

Browse source
This commit is contained in:
bsongis 2014-05-16 23:02:31 +02:00
parent 96ddda7bef
commit ef15ccf321
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
companion/src/firmwares/opentx/opentxSky9xsimulator.cpp
View file

@ -37,7 +37,7 @@
#define AUDIO #define AUDIO
#define VOICE #define VOICE
#define HAPTIC #define HAPTIC
#define PXX // #define PXX
#define DSM2 #define DSM2
#define DSM2_PPM #define DSM2_PPM
#define DBLKEYS #define DBLKEYS

6
companion/src/firmwares/opentx/opentxinterface.cpp
View file

@ -741,9 +741,9 @@ int OpenTxEepromInterface::isAvailable(Protocol proto, int port)
case 0: case 0:
switch (proto) { switch (proto) {
case PPM: case PPM:
case PXX_XJT_X16: // case PXX_XJT_X16:
case PXX_XJT_D8: // case PXX_XJT_D8:
case PXX_XJT_LR12: // case PXX_XJT_LR12:
case LP45: case LP45:
case DSM2: case DSM2:
case DSMX: case DSMX:

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

@ -1390,7 +1390,7 @@ void menuModelSetup(uint8_t event)
case ITEM_MODEL_EXTERNAL_MODULE_MODE: case ITEM_MODEL_EXTERNAL_MODULE_MODE:
lcd_putsLeft(y, STR_MODE); lcd_putsLeft(y, STR_MODE);
lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, STR_TARANIS_PROTOCOLS, g_model.externalModule, m_posHorz==0 ? attr : 0); lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN, y, STR_TARANIS_PROTOCOLS, g_model.externalModule, m_posHorz==0 ? attr : 0);
if (g_model.externalModule == MODULE_TYPE_XJT) if (IS_MODULE_XJT(EXTERNAL_MODULE))
lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_XJT_PROTOCOLS, 1+g_model.moduleData[EXTERNAL_MODULE].rfProtocol, m_posHorz==1 ? attr : 0); lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_XJT_PROTOCOLS, 1+g_model.moduleData[EXTERNAL_MODULE].rfProtocol, m_posHorz==1 ? attr : 0);
else if (IS_MODULE_DSM2(EXTERNAL_MODULE)) else if (IS_MODULE_DSM2(EXTERNAL_MODULE))
lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_DSM_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].rfProtocol, m_posHorz==1 ? attr : 0); lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_DSM_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].rfProtocol, m_posHorz==1 ? attr : 0);
@ -1399,6 +1399,7 @@ void menuModelSetup(uint8_t event)
case 0: case 0:
g_model.externalModule = checkIncDec(event, g_model.externalModule, MODULE_TYPE_NONE, MODULE_TYPE_COUNT-1, EE_MODEL, isModuleAvailable); g_model.externalModule = checkIncDec(event, g_model.externalModule, MODULE_TYPE_NONE, MODULE_TYPE_COUNT-1, EE_MODEL, isModuleAvailable);
if (checkIncDec_Ret) { if (checkIncDec_Ret) {
g_model.moduleData[EXTERNAL_MODULE].rfProtocol = 0;
g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0; g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0;
if (g_model.externalModule == MODULE_TYPE_PPM) if (g_model.externalModule == MODULE_TYPE_PPM)
g_model.moduleData[EXTERNAL_MODULE].channelsCount = 0; g_model.moduleData[EXTERNAL_MODULE].channelsCount = 0;

6
radio/src/gui/menus.cpp
View file

@ -1576,10 +1576,16 @@ bool isAssignableFunctionAvailable(int function)
bool isModuleAvailable(int module) bool isModuleAvailable(int module)
{ {
#if defined(PCBSKY9X)
if (module == MODULE_TYPE_NONE)
return false;
#endif
#if !defined(PXX) #if !defined(PXX)
if (module == MODULE_TYPE_XJT) if (module == MODULE_TYPE_XJT)
return false; return false;
#endif #endif
return true; return true;
} }