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

[Horus] Give pxx its own substruct instead of using ppm (cosmetics)

Browse source
This commit is contained in:
Arne Schwabe 2016-09-05 15:57:27 +02:00
parent fd138cf22a
commit c16317609f
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/datastructs.h
View file

@ -656,7 +656,7 @@ PACK(struct ModuleData {
union { union {
struct { struct {
int8_t delay:6; int8_t delay:6;
uint8_t pulsePol:1; // For PXX: false = internal antenna, true = external antenna uint8_t pulsePol:1;
uint8_t outputType:1; // false = open drain, true = push pull uint8_t outputType:1; // false = open drain, true = push pull
int8_t frameLength; int8_t frameLength;
} ppm; } ppm;
@ -666,6 +666,12 @@ PACK(struct ModuleData {
uint8_t lowPowerMode:1; uint8_t lowPowerMode:1;
int8_t optionValue; int8_t optionValue;
} multi); } multi);
NOBACKUP(struct {
uint8_t spare:6;
uint8_t external_antenna:1; // false = internal antenna, true = external antenna
uint8_t spare2:1;
uint8_t spare3;
} pxx);
}; };
}); });

8
radio/src/gui/480x272/model_setup.cpp
View file

@ -227,7 +227,7 @@ bool menuModelSetup(event_t event)
bool newAntennaSel; bool newAntennaSel;
if (warningResult) { if (warningResult) {
warningResult = 0; warningResult = 0;
g_model.moduleData[INTERNAL_MODULE].ppm.pulsePol = XJT_EXTERNAL_ANTENNA; g_model.moduleData[INTERNAL_MODULE].pxx.external_antenna = XJT_EXTERNAL_ANTENNA;
} }
MENU(STR_MENUSETUP, MODEL_ICONS, menuTabModel, MENU_MODEL_SETUP, ITEM_MODEL_SETUP_MAX, MENU(STR_MENUSETUP, MODEL_ICONS, menuTabModel, MENU_MODEL_SETUP, ITEM_MODEL_SETUP_MAX,
@ -567,14 +567,14 @@ bool menuModelSetup(event_t event)
case ITEM_MODEL_INTERNAL_MODULE_ANTENNA: case ITEM_MODEL_INTERNAL_MODULE_ANTENNA:
lcdDrawText(MENUS_MARGIN_LEFT, y, STR_ANTENNASELECTION); lcdDrawText(MENUS_MARGIN_LEFT, y, STR_ANTENNASELECTION);
newAntennaSel = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_VANTENNATYPES, g_model.moduleData[INTERNAL_MODULE].ppm.pulsePol, 0, 1, attr, event); newAntennaSel = editChoice(MODEL_SETUP_2ND_COLUMN, y, STR_VANTENNATYPES, g_model.moduleData[INTERNAL_MODULE].pxx.external_antenna, 0, 1, attr, event);
if (newAntennaSel != g_model.moduleData[INTERNAL_MODULE].ppm.pulsePol && newAntennaSel == XJT_EXTERNAL_ANTENNA) { if (newAntennaSel != g_model.moduleData[INTERNAL_MODULE].pxx.external_antenna && newAntennaSel == XJT_EXTERNAL_ANTENNA) {
POPUP_CONFIRMATION(STR_ANTENNACONFIRM1); POPUP_CONFIRMATION(STR_ANTENNACONFIRM1);
const char * w = STR_ANTENNACONFIRM2; const char * w = STR_ANTENNACONFIRM2;
SET_WARNING_INFO(w, strlen(w), 0); SET_WARNING_INFO(w, strlen(w), 0);
} }
else { else {
g_model.moduleData[INTERNAL_MODULE].ppm.pulsePol = newAntennaSel; g_model.moduleData[INTERNAL_MODULE].pxx.external_antenna = newAntennaSel;
} }
break; break;

2
radio/src/pulses/pxx_arm.cpp
View file

@ -377,7 +377,7 @@ void setupPulsesPXX(uint8_t port)
#if defined(PCBHORUS) #if defined(PCBHORUS)
uint8_t antenna = XJT_INTERNAL_ANTENNA; uint8_t antenna = XJT_INTERNAL_ANTENNA;
if (port == INTERNAL_MODULE) { if (port == INTERNAL_MODULE) {
antenna = g_model.moduleData[INTERNAL_MODULE].ppm.pulsePol; antenna = g_model.moduleData[INTERNAL_MODULE].pxx.external_antenna;
} }
putPcmByte(port, antenna); putPcmByte(port, antenna);
#else #else