diff --git a/radio/src/gui/horus/menu_model_setup.cpp b/radio/src/gui/horus/menu_model_setup.cpp index 69fc1de80..46f89a3ef 100644 --- a/radio/src/gui/horus/menu_model_setup.cpp +++ b/radio/src/gui/horus/menu_model_setup.cpp @@ -179,6 +179,13 @@ bool menuModelSetup(evt_t event) int l_posHorz = menuHorizontalPosition; bool CURSOR_ON_CELL = (menuHorizontalPosition >= 0); + // Switch to external antenna confirmation + bool newAntennaSel; + if (warningResult) { + warningResult = 0; + g_model.moduleData[INTERNAL_MODULE].ppmPulsePol = XJT_EXTERNAL_ANTENNA; + } + MENU(STR_MENUSETUP, LBM_MODEL_ICONS, menuTabModel, e_ModelSetup, ITEM_MODEL_SETUP_MAX, { 0, 0, TIMERS_ROWS, 0, 1, 0, 0, LABEL(Throttle), 0, 0, 0, @@ -532,7 +539,15 @@ bool menuModelSetup(evt_t event) case ITEM_MODEL_INTERNAL_MODULE_ANTENNA: lcdDrawText(MENUS_MARGIN_LEFT, y, STR_ANTENNASELECTION); - g_model.moduleData[INTERNAL_MODULE].ppmPulsePol = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_VANTENNATYPES, g_model.moduleData[INTERNAL_MODULE].ppmPulsePol, 0, 1, attr, event); + 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) { + POPUP_CONFIRMATION(STR_ANTENNACONFIRM1); + const char * w = STR_ANTENNACONFIRM2; + SET_WARNING_INFO(w, strlen(w), 0); + } + else { + g_model.moduleData[INTERNAL_MODULE].ppmPulsePol = newAntennaSel; + } break; case ITEM_MODEL_TRAINER_MODE: diff --git a/radio/src/gui/horus/menus.h b/radio/src/gui/horus/menus.h index aaec3d830..c4914b120 100644 --- a/radio/src/gui/horus/menus.h +++ b/radio/src/gui/horus/menus.h @@ -383,12 +383,12 @@ void insertMix(uint8_t idx); #define MENU_X 80 #define MENU_W LCD_W-(2*MENU_X) -#define POPUP_X 130 +#define POPUP_X 120 #define POPUP_Y 70 #define POPUP_W 300 #define POPUP_H 130 #define WARNING_LINE_LEN 32 -#define WARNING_LINE_X (POPUP_X+76) +#define WARNING_LINE_X (POPUP_X+66) #define WARNING_LINE_Y (POPUP_Y+9) #define WARNING_INFOLINE_Y (WARNING_LINE_Y+68) diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 64c150879..65becded8 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -534,6 +534,11 @@ enum ModuleTypes { MODULE_TYPE_COUNT }; +enum AntennaTypes { + XJT_INTERNAL_ANTENNA, + XJT_EXTERNAL_ANTENNA +}; + #define IS_PULSES_EXTERNAL_MODULE() (g_model.moduleData[EXTERNAL_MODULE].type != MODULE_TYPE_NONE) enum FailsafeModes { diff --git a/radio/src/pulses/pxx_arm.cpp b/radio/src/pulses/pxx_arm.cpp index 071121568..94e2b2ab4 100644 --- a/radio/src/pulses/pxx_arm.cpp +++ b/radio/src/pulses/pxx_arm.cpp @@ -23,7 +23,6 @@ #define PXX_SEND_BIND 0x01 #define PXX_SEND_FAILSAFE (1 << 4) #define PXX_SEND_RANGECHECK (1 << 5) -#define PXX_INTERNAL_ANTENNA 0 const uint16_t CRCTable[]= { @@ -303,7 +302,7 @@ void setupPulsesPXX(unsigned int port) /* Ext. flag (holds antenna selection on Horus internal module, 0x00 otherwise) */ #if defined(PCBHORUS) - uint8_t antenna = PXX_INTERNAL_ANTENNA; + uint8_t antenna = XJT_INTERNAL_ANTENNA; if (port == INTERNAL_MODULE) { antenna = g_model.moduleData[INTERNAL_MODULE].ppmPulsePol; } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index cb3acac37..25c2846f2 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -543,6 +543,8 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR; const pm_char STR_MODULE_BIND[] PROGMEM = TR_MODULE_BIND; const pm_char STR_CHANNELRANGE[] PROGMEM = TR_CHANNELRANGE; const pm_char STR_ANTENNASELECTION[] PROGMEM = TR_ANTENNASELECTION; + const pm_char STR_ANTENNACONFIRM1[] PROGMEM = TR_ANTENNACONFIRM1; + const pm_char STR_ANTENNACONFIRM2[] PROGMEM = TR_ANTENNACONFIRM2; const pm_char STR_SET[] PROGMEM = TR_SET; const pm_char STR_PREFLIGHT[] PROGMEM = TR_PREFLIGHT; const pm_char STR_CHECKLIST[] PROGMEM = TR_CHECKLIST; diff --git a/radio/src/translations.h b/radio/src/translations.h index c100d9e9e..f82a648af 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -789,6 +789,8 @@ extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_MODULE_BIND[]; extern const pm_char STR_CHANNELRANGE[]; extern const pm_char STR_ANTENNASELECTION[]; + extern const pm_char STR_ANTENNACONFIRM1[]; + extern const pm_char STR_ANTENNACONFIRM2[]; extern const pm_char STR_SET[]; extern const pm_char STR_PREFLIGHT[]; extern const pm_char STR_CHECKLIST[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 18b1cb4d3..cbf5a2916 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -943,6 +943,8 @@ #define TR_TELEMETRY_NEWSENSOR INDENT "Přidat senzor ručně" #define TR_CHANNELRANGE INDENT "Rozsah kanálů" #define TR_ANTENNASELECTION INDENT "Antenna selection" +#define TR_ANTENNACONFIRM1 "Really switch?" +#define TR_ANTENNACONFIRM2 "Make sure antenna is installed!" #define TR_LOWALARM INDENT "Nízký Alarm" #define TR_CRITICALALARM INDENT "Kritický Alarm" #define TR_ENABLE_POPUP "Povolit vyskakovací okno" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index e2e27ad46..15e4032e8 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -947,6 +947,8 @@ #define TR_TELEMETRY_NEWSENSOR INDENT "Sensor hinzufügen ..." #define TR_CHANNELRANGE TR(INDENT "Kanäle", INDENT "Ausgangs Kanäle") //wg 9XR-Pro #define TR_ANTENNASELECTION INDENT "Antenna selection" +#define TR_ANTENNACONFIRM1 "Really switch?" +#define TR_ANTENNACONFIRM2 "Make sure antenna is installed!" #define TR_LOWALARM INDENT "Vor-Alarm bei" #define TR_CRITICALALARM INDENT "Kritisch-Alarm" #define TR_ENABLE_POPUP "Freigabe Popup-Fenster" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 789cb236b..54555fca0 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -969,6 +969,8 @@ #define TR_TELEMETRY_NEWSENSOR INDENT "Add a new sensor..." #define TR_CHANNELRANGE TR(INDENT "Ch. Range", INDENT "Channel Range") #define TR_ANTENNASELECTION INDENT "Antenna selection" +#define TR_ANTENNACONFIRM1 "Really switch?" +#define TR_ANTENNACONFIRM2 "Make sure antenna is installed!" #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" #define TR_ENABLE_POPUP "Enable Popup" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index dc26ea8c3..02d5e40e2 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -900,6 +900,8 @@ #define TR_TELEMETRY_NEWSENSOR INDENT "Add a new sensor..." #define TR_CHANNELRANGE INDENT "Gama de canales" #define TR_ANTENNASELECTION INDENT "Antenna selection" +#define TR_ANTENNACONFIRM1 "Really switch?" +#define TR_ANTENNACONFIRM2 "Make sure antenna is installed!" #define TR_LOWALARM INDENT "Alarma baja" #define TR_CRITICALALARM INDENT "Alarma Critica" #define TR_ENABLE_POPUP "Enable Popup" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index c92640c46..c84291d8a 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -899,6 +899,8 @@ #define TR_TELEMETRY_NEWSENSOR INDENT "Add a new sensor..." #define TR_CHANNELRANGE INDENT "Channel Range" #define TR_ANTENNASELECTION INDENT "Antenna selection" +#define TR_ANTENNACONFIRM1 "Really switch?" +#define TR_ANTENNACONFIRM2 "Make sure antenna is installed!" #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" #define TR_ENABLE_POPUP "Enable Popup" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 3d0b24adb..661276846 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -934,6 +934,8 @@ #define TR_TELEMETRY_NEWSENSOR TR(INDENT"Nouveau capteur...", INDENT "Ajout d'un nouveau capteur...") #define TR_CHANNELRANGE TR(INDENT "Canaux", INDENT "Plage de canaux") #define TR_ANTENNASELECTION INDENT "Choix antenne" +#define TR_ANTENNACONFIRM1 "Vaiment changer?" +#define TR_ANTENNACONFIRM2 "Installer l'antenne d'abord!" #define TR_LOWALARM INDENT "Alarme basse" #define TR_CRITICALALARM INDENT "Alarme critique" #define TR_ENABLE_POPUP "Activer Popup" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index f2c4d649d..5f159fae2 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -945,6 +945,8 @@ #define TR_TELEMETRY_NEWSENSOR INDENT "Aggiungi nuovo sensore..." #define TR_CHANNELRANGE INDENT "Numero Canali" #define TR_ANTENNASELECTION INDENT "Antenna selection" +#define TR_ANTENNACONFIRM1 "Really switch?" +#define TR_ANTENNACONFIRM2 "Make sure antenna is installed!" #define TR_LOWALARM INDENT "Allarme Basso" #define TR_CRITICALALARM INDENT "Allarme Critico" #define TR_ENABLE_POPUP "Abilita Popup" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 67092873b..fdd681e69 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -964,6 +964,8 @@ #define TR_TELEMETRY_NEWSENSOR INDENT "Sensor toevoegen ..." #define TR_CHANNELRANGE TR(INDENT "Kanalen", INDENT "Uitgangs Kanalen") //wg 9XR-Pro #define TR_ANTENNASELECTION INDENT "Antenna selection" +#define TR_ANTENNACONFIRM1 "Really switch?" +#define TR_ANTENNACONFIRM2 "Make sure antenna is installed!" #define TR_LOWALARM INDENT "Waarschuwing" #define TR_CRITICALALARM INDENT "Kritiek Alarm" #define TR_ENABLE_POPUP "Inschakelen Popups" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 71c16ef44..e007cf341 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -946,6 +946,8 @@ #define TR_TELEMETRY_NEWSENSOR INDENT "Dodaj nowy czujnik..." #define TR_CHANNELRANGE TR(INDENT "ZakrKn",INDENT "Zakres kanału") #define TR_ANTENNASELECTION INDENT "Antenna selection" +#define TR_ANTENNACONFIRM1 "Really switch?" +#define TR_ANTENNACONFIRM2 "Make sure antenna is installed!" #define TR_LOWALARM INDENT "Alarm niski" #define TR_CRITICALALARM INDENT "Alarm krytyczny" #define TR_ENABLE_POPUP "Aktywuj Popup" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 3735ea83b..ce29cd237 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -893,6 +893,8 @@ #define TR_TELEMETRY_NEWSENSOR INDENT "Add a new sensor..." #define TR_CHANNELRANGE INDENT "Channel Range" #define TR_ANTENNASELECTION INDENT "Antenna selection" +#define TR_ANTENNACONFIRM1 "Really switch?" +#define TR_ANTENNACONFIRM2 "Make sure antenna is installed!" #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" #define TR_ENABLE_POPUP "Enable Popup" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 8f673c6b6..b800dd2e1 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -966,6 +966,8 @@ #define TR_TELEMETRY_NEWSENSOR INDENT "Lägg till sensor..." #define TR_CHANNELRANGE INDENT "Kanalområde" #define TR_ANTENNASELECTION INDENT "Antenna selection" +#define TR_ANTENNACONFIRM1 "Really switch?" +#define TR_ANTENNACONFIRM2 "Make sure antenna is installed!" #define TR_LOWALARM INDENT "Låg-alarm" #define TR_CRITICALALARM INDENT "Kritiskt alarm" #define TR_ENABLE_POPUP "Slå på Dialog"