diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index 2cceb362f..831ed2ab8 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -693,8 +693,8 @@ PACK(struct ModuleData { union { struct { int8_t delay:6; - uint8_t pulsePol:1; - uint8_t outputType:1; // false = open drain, true = push pull + uint8_t pulsePol:1; // For PXX: false = internal antenna, true = exetrnal antenna + uint8_t outputType:1; // false = open drain, true = push pull int8_t frameLength; } ppm; NOBACKUP(struct { diff --git a/radio/src/gui/horus/menu_model_setup.cpp b/radio/src/gui/horus/menu_model_setup.cpp index 28ba66c85..f5b5b64f0 100644 --- a/radio/src/gui/horus/menu_model_setup.cpp +++ b/radio/src/gui/horus/menu_model_setup.cpp @@ -183,7 +183,7 @@ bool menuModelSetup(evt_t event) bool newAntennaSel; if (warningResult) { warningResult = 0; - g_model.moduleData[INTERNAL_MODULE].ppmPulsePol = XJT_EXTERNAL_ANTENNA; + g_model.moduleData[INTERNAL_MODULE].ppm.pulsePol = XJT_EXTERNAL_ANTENNA; } MENU(STR_MENUSETUP, LBM_MODEL_ICONS, menuTabModel, e_ModelSetup, ITEM_MODEL_SETUP_MAX, @@ -539,14 +539,14 @@ bool menuModelSetup(evt_t event) case ITEM_MODEL_INTERNAL_MODULE_ANTENNA: lcdDrawText(MENUS_MARGIN_LEFT, y, STR_ANTENNASELECTION); - newAntennaSel = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_VANTENNATYPES, g_model.moduleData[INTERNAL_MODULE].ppmPulsePol, 0, 1, attr, event); - if (newAntennaSel != g_model.moduleData[INTERNAL_MODULE].ppmPulsePol && newAntennaSel == XJT_EXTERNAL_ANTENNA) { + newAntennaSel = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_VANTENNATYPES, g_model.moduleData[INTERNAL_MODULE].ppm.pulsePol, 0, 1, attr, event); + if (newAntennaSel != g_model.moduleData[INTERNAL_MODULE].ppm.pulsePol && newAntennaSel == XJT_EXTERNAL_ANTENNA) { POPUP_CONFIRMATION(STR_ANTENNACONFIRM1); const char * w = STR_ANTENNACONFIRM2; SET_WARNING_INFO(w, strlen(w), 0); } else { - g_model.moduleData[INTERNAL_MODULE].ppmPulsePol = newAntennaSel; + g_model.moduleData[INTERNAL_MODULE].ppm.pulsePol = newAntennaSel; } break; diff --git a/radio/src/pulses/pxx_arm.cpp b/radio/src/pulses/pxx_arm.cpp index 94e2b2ab4..f66c47a38 100644 --- a/radio/src/pulses/pxx_arm.cpp +++ b/radio/src/pulses/pxx_arm.cpp @@ -304,7 +304,7 @@ void setupPulsesPXX(unsigned int port) #if defined(PCBHORUS) uint8_t antenna = XJT_INTERNAL_ANTENNA; if (port == INTERNAL_MODULE) { - antenna = g_model.moduleData[INTERNAL_MODULE].ppmPulsePol; + antenna = g_model.moduleData[INTERNAL_MODULE].ppm.pulsePol; } putPcmByte (antenna, port); #else