diff --git a/radio/src/gui/212x64/radio_hardware.cpp b/radio/src/gui/212x64/radio_hardware.cpp index 16868612d..1f2209574 100644 --- a/radio/src/gui/212x64/radio_hardware.cpp +++ b/radio/src/gui/212x64/radio_hardware.cpp @@ -59,7 +59,7 @@ enum menuRadioHwItems { CASE_BLUETOOTH(ITEM_RADIO_HARDWARE_BLUETOOTH_NAME) #endif #if defined(AUX_SERIAL) - ITEM_RADIO_HARDWARE_UART3_MODE, + ITEM_RADIO_HARDWARE_AUX_SERIAL_MODE, #endif ITEM_RADIO_HARDWARE_JITTER_FILTER, ITEM_RADIO_HARDWARE_DEBUG, @@ -234,8 +234,8 @@ void menuRadioHardware(event_t event) #endif #if defined(AUX_SERIAL) - case ITEM_RADIO_HARDWARE_UART3_MODE: - g_eeGeneral.auxSerialMode = editChoice(HW_SETTINGS_COLUMN, y, STR_UART3MODE, STR_UART3MODES, g_eeGeneral.auxSerialMode, 0, UART_MODE_MAX, attr, event); + case ITEM_RADIO_HARDWARE_AUX_SERIAL_MODE: + g_eeGeneral.auxSerialMode = editChoice(HW_SETTINGS_COLUMN, y, STR_AUX_SERIALMODE, STR_AUX_SERIALMODES, g_eeGeneral.auxSerialMode, 0, UART_MODE_MAX, attr, event); if (attr && checkIncDec_Ret) { auxSerialInit(g_eeGeneral.auxSerialMode, modelTelemetryProtocol()); } diff --git a/radio/src/gui/480x272/radio_hardware.cpp b/radio/src/gui/480x272/radio_hardware.cpp index 86c2ad01c..cec17ba80 100644 --- a/radio/src/gui/480x272/radio_hardware.cpp +++ b/radio/src/gui/480x272/radio_hardware.cpp @@ -57,7 +57,7 @@ enum MenuRadioHardwareItems { ITEM_RADIO_HARDWARE_BLUETOOTH_PAIRING_CODE, ITEM_RADIO_HARDWARE_BLUETOOTH_NAME, #if defined(AUX_SERIAL) - ITEM_RADIO_HARDWARE_UART3_MODE, + ITEM_RADIO_HARDWARE_AUX_SERIAL_MODE, #endif ITEM_RADIO_HARDWARE_JITTER_FILTER, ITEM_RADIO_HARDWARE_BAT_CAL, @@ -216,9 +216,9 @@ bool menuRadioHardware(event_t event) break; #if defined(AUX_SERIAL) - case ITEM_RADIO_HARDWARE_UART3_MODE: - lcdDrawText(MENUS_MARGIN_LEFT, y, STR_UART3MODE); - g_eeGeneral.auxSerialMode = editChoice(HW_SETTINGS_COLUMN+50, y, STR_UART3MODES, g_eeGeneral.auxSerialMode, 0, UART_MODE_MAX, attr, event); + case ITEM_RADIO_HARDWARE_AUX_SERIAL_MODE: + lcdDrawText(MENUS_MARGIN_LEFT, y, STR_AUX_SERIALMODE); + g_eeGeneral.auxSerialMode = editChoice(HW_SETTINGS_COLUMN+50, y, STR_AUX_SERIALMODES, g_eeGeneral.auxSerialMode, 0, UART_MODE_MAX, attr, event); if (attr && checkIncDec_Ret) { auxSerialInit(g_eeGeneral.auxSerialMode, modelTelemetryProtocol()); } diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 7b4395a4c..3fc24883e 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -94,7 +94,7 @@ ISTR(VRENCODERS); #endif #if defined(PCBTARANIS) || defined(PCBHORUS) -ISTR(UART3MODES); +ISTR(AUX_SERIALMODES); ISTR(SWTYPES); ISTR(POTTYPES); ISTR(SLIDERTYPES); @@ -552,7 +552,7 @@ const char STR_DEVICE_RESET[] = TR_DEVICE_RESET; const char STR_ALTITUDE[] = TR_ALTITUDE; const char STR_SCALE[] = TR_SCALE; const char STR_VIEW_CHANNELS[] = TR_VIEW_CHANNELS; -const char STR_UART3MODE[] = TR_UART3MODE; +const char STR_AUX_SERIALMODE[] = TR_AUX_SERIALMODE; const char STR_THROTTLE_LABEL[] = TR_THROTTLE_LABEL; const char STR_SCRIPT[] = TR_SCRIPT; const char STR_INPUTS[] = TR_INPUTS; diff --git a/radio/src/translations.h b/radio/src/translations.h index 94ed6eb6e..76b9efabd 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -96,7 +96,7 @@ extern const char STR_MMMINV[]; extern const char STR_VBEEPMODE[]; extern const char STR_TRNMODE[]; extern const char STR_TRNCHN[]; -extern const char STR_UART3MODES[]; +extern const char STR_AUX_SERIALMODES[]; extern const char STR_SWTYPES[]; extern const char STR_POTTYPES[]; extern const char STR_SLIDERTYPES[]; @@ -812,7 +812,7 @@ extern const char STR_ALTITUDE[]; extern const char STR_SCALE[]; extern const char STR_VIEW_CHANNELS[]; extern const char STR_POTWARNING[]; -extern const char STR_UART3MODE[]; +extern const char STR_AUX_SERIALMODE[]; extern const char STR_THROTTLE_LABEL[]; extern const char STR_SCRIPT[]; extern const char STR_INPUTS[]; diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 7426e5a7f..b998c2323 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -69,11 +69,11 @@ #define LEN_TRNCHN "\003" #define TR_TRNCHN "CH1CH2CH3CH4" -#define LEN_UART3MODES "\015" +#define LEN_AUX_SERIALMODES "\015" #if defined(CLI) || defined(DEBUG) -#define TR_UART3MODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trenér\0 ""LUA\0 " +#define TR_AUX_SERIALMODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trenér\0 ""LUA\0 " #else -#define TR_UART3MODES "VYP\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trenér\0 ""LUA\0 " +#define TR_AUX_SERIALMODES "VYP\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trenér\0 ""LUA\0 " #endif #define LEN_SWTYPES "\013" @@ -1018,7 +1018,7 @@ #define TR_PREFLIGHT "Předletová kontrola" #define TR_CHECKLIST TR(INDENT "Poznámky", INDENT "Zobrazit poznámky") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Ofset") -#define TR_UART3MODE "Seriový port" +#define TR_AUX_SERIALMODE "Seriový port" #define TR_SCRIPT "Skript" #define TR_INPUTS "Vstupy" #define TR_OUTPUTS "Výstupy" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 78278b7de..0d53c08cd 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -70,11 +70,11 @@ #define LEN_TRNCHN "\003" #define TR_TRNCHN "CH1CH2CH3CH4" -#define LEN_UART3MODES "\015" +#define LEN_AUX_SERIALMODES "\015" #if defined(CLI) || defined(DEBUG) -#define TR_UART3MODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Eingang\0""LUA\0 " +#define TR_AUX_SERIALMODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Eingang\0""LUA\0 " #else -#define TR_UART3MODES "AUS\0 ""Telem Mirror\0""Telemetry In\0""SBUS Eingang\0""LUA\0 " +#define TR_AUX_SERIALMODES "AUS\0 ""Telem Mirror\0""Telemetry In\0""SBUS Eingang\0""LUA\0 " #endif #define LEN_SWTYPES "\006" @@ -1025,7 +1025,7 @@ #define TR_PREFLIGHT "Vorflug-Checkliste" #define TR_CHECKLIST TR(INDENT "Checkliste", INDENT "Checkliste anzeigen") //9XR-Pro #define TR_FAS_OFFSET TR(INDENT "FAS-Ofs", INDENT "FAS-Offset") -#define TR_UART3MODE "Serieller Port" +#define TR_AUX_SERIALMODE "Serieller Port" #define TR_SCRIPT "Lua-Skript" #define TR_INPUTS "Eingaben" #define TR_OUTPUTS "Ausgaben" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 3cd4c2ccc..ae04e077e 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -70,11 +70,11 @@ #define LEN_TRNCHN "\003" #define TR_TRNCHN "CH1CH2CH3CH4" -#define LEN_UART3MODES "\015" +#define LEN_AUX_SERIALMODES "\015" #if defined(CLI) || defined(DEBUG) -#define TR_UART3MODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trainer\0""LUA\0 " +#define TR_AUX_SERIALMODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trainer\0""LUA\0 " #else -#define TR_UART3MODES "OFF\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trainer\0""LUA\0 " +#define TR_AUX_SERIALMODES "OFF\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trainer\0""LUA\0 " #endif #define LEN_SWTYPES "\006" @@ -1024,7 +1024,7 @@ #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST TR(INDENT "Checklist", INDENT "Display checklist") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS offset") -#define TR_UART3MODE "Serial port" +#define TR_AUX_SERIALMODE "Serial port" #define TR_SCRIPT "Script" #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index fa2817189..6968ad6d4 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -70,11 +70,11 @@ #define LEN_TRNCHN "\003" #define TR_TRNCHN "CH1CH2CH3CH4" -#define LEN_UART3MODES "\015" +#define LEN_AUX_SERIALMODES "\015" #if defined(CLI) || defined(DEBUG) -#define TR_UART3MODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trainer\0""LUA\0 " +#define TR_AUX_SERIALMODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trainer\0""LUA\0 " #else -#define TR_UART3MODES "OFF\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trainer\0""LUA\0 " +#define TR_AUX_SERIALMODES "OFF\0 ""Telem Mirror\0""Telemetry In\0""SBUS Trainer\0""LUA\0 " #endif #define LEN_SWTYPES "\006" @@ -1040,7 +1040,7 @@ #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") -#define TR_UART3MODE "Serial port" +#define TR_AUX_SERIALMODE "Serial port" #define TR_SCRIPT "Script" #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 8d294401b..0e49e4998 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -70,11 +70,11 @@ #define LEN_TRNCHN "\003" #define TR_TRNCHN "CH1CH2CH3CH4" -#define LEN_UART3MODES "\015" +#define LEN_AUX_SERIALMODES "\015" #if defined(CLI) || defined(DEBUG) -#define TR_UART3MODES "Debug\0 ""S-Port Pelik\0""Telemetry In\0""SBUS Trainer\0""LUA\0 " +#define TR_AUX_SERIALMODES "Debug\0 ""S-Port Pelik\0""Telemetry In\0""SBUS Trainer\0""LUA\0 " #else -#define TR_UART3MODES "POIS\0 ""S-Port Pelik\0""Telemetry In\0""SBUS Trainer\0""LUA\0 " +#define TR_AUX_SERIALMODES "POIS\0 ""S-Port Pelik\0""Telemetry In\0""SBUS Trainer\0""LUA\0 " #endif #define LEN_SWTYPES "\006" @@ -1033,7 +1033,7 @@ #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") -#define TR_UART3MODE "Serial port" +#define TR_AUX_SERIALMODE "Serial port" #define TR_SCRIPT "Script" #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 05c968aee..7e9a91f47 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -70,11 +70,11 @@ #define LEN_TRNCHN "\003" #define TR_TRNCHN "CH1CH2CH3CH4" -#define LEN_UART3MODES "\016" +#define LEN_AUX_SERIALMODES "\016" #if defined(CLI) || defined(DEBUG) -#define TR_UART3MODES "Debug\0 ""Recopie Telem\0""Télémétrie In\0""Ecolage SBUS\0 ""LUA\0 " +#define TR_AUX_SERIALMODES "Debug\0 ""Recopie Telem\0""Télémétrie In\0""Ecolage SBUS\0 ""LUA\0 " #else -#define TR_UART3MODES "OFF\0 ""Recopie Telem\0""Télémétrie In\0""Ecolage SBUS\0 ""LUA\0 " +#define TR_AUX_SERIALMODES "OFF\0 ""Recopie Telem\0""Télémétrie In\0""Ecolage SBUS\0 ""LUA\0 " #endif #define LEN_SWTYPES "\006" @@ -1035,7 +1035,7 @@ #define TR_PREFLIGHT "Vérifications avant vol" #define TR_CHECKLIST TR(INDENT "Notes", INDENT "Afficher notes") #define TR_FAS_OFFSET TR(INDENT "Corr FAS", INDENT "Correction FAS") -#define TR_UART3MODE "Port série" +#define TR_AUX_SERIALMODE "Port série" #define TR_SCRIPT "Script" #define TR_INPUTS "Entrées" #define TR_OUTPUTS "Sorties" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 7ef942227..fd065953e 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -70,11 +70,11 @@ #define LEN_TRNCHN "\003" #define TR_TRNCHN "ch1ch2ch3ch4" -#define LEN_UART3MODES "\016" +#define LEN_AUX_SERIALMODES "\016" #if defined(CLI) || defined(DEBUG) -#define TR_UART3MODES "Debug\0 ""Replica S-Port""Telemetria\0 ""SBUS Trainer\0 ""LUA\0 " +#define TR_AUX_SERIALMODES "Debug\0 ""Replica S-Port""Telemetria\0 ""SBUS Trainer\0 ""LUA\0 " #else -#define TR_UART3MODES "OFF\0 ""Replica S-Port""Telemetria\0 ""SBUS Trainer\0 ""LUA\0 " +#define TR_AUX_SERIALMODES "OFF\0 ""Replica S-Port""Telemetria\0 ""SBUS Trainer\0 ""LUA\0 " #endif #define LEN_SWTYPES "\006" @@ -1034,7 +1034,7 @@ #define TR_PREFLIGHT "Controlli Prevolo" #define TR_CHECKLIST INDENT "Mostra Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") -#define TR_UART3MODE "Porta Seriale" +#define TR_AUX_SERIALMODE "Porta Seriale" #define TR_SCRIPT "Script" #define TR_INPUTS "Ingresso" #define TR_OUTPUTS "Uscita" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index f944e9d34..98120a193 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -70,11 +70,11 @@ #define LEN_TRNCHN "\003" #define TR_TRNCHN "CH1CH2CH3CH4" -#define LEN_UART3MODES "\015" +#define LEN_AUX_SERIALMODES "\015" #if defined(CLI) || defined(DEBUG) -#define TR_UART3MODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Leerling""LUA\0 " +#define TR_AUX_SERIALMODES "Debug\0 ""Telem Mirror\0""Telemetry In\0""SBUS Leerling""LUA\0 " #else -#define TR_UART3MODES "UIT\0 ""Telem Mirror\0""Telemetry In\0""SBUS Leerling""LUA\0 " +#define TR_AUX_SERIALMODES "UIT\0 ""Telem Mirror\0""Telemetry In\0""SBUS Leerling""LUA\0 " #endif #define LEN_SWTYPES "\006" @@ -1023,7 +1023,7 @@ TR_GYR_VSRCRAW #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST TR(INDENT "Checklist", INDENT "Toon Checklist") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") -#define TR_UART3MODE "Seriele poort" +#define TR_AUX_SERIALMODE "Seriele poort" #define TR_SCRIPT "Script" #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index f6e706992..eb5f76210 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -70,11 +70,11 @@ #define LEN_TRNCHN "\003" #define TR_TRNCHN "KN1KN2KN3KN4" -#define LEN_UART3MODES "\015" /*13 decimal*/ +#define LEN_AUX_SERIALMODES "\015" /*13 decimal*/ #if defined(CLI) || defined(DEBUG) -#define TR_UART3MODES "Debug\0 ""S-Port Kopia ""Telemetria\0 ""Trener SBUS\0 ""LUA\0 " +#define TR_AUX_SERIALMODES "Debug\0 ""S-Port Kopia ""Telemetria\0 ""Trener SBUS\0 ""LUA\0 " #else -#define TR_UART3MODES "Wyłącz\0 ""S-Port Kopia ""Telemetria\0 ""Trener SBUS\0 ""LUA\0 " +#define TR_AUX_SERIALMODES "Wyłącz\0 ""S-Port Kopia ""Telemetria\0 ""Trener SBUS\0 ""LUA\0 " #endif #define LEN_SWTYPES "\006" @@ -1034,7 +1034,7 @@ #define TR_PREFLIGHT "Lista Ostrzeżeń" #define TR_CHECKLIST TR(INDENT "Czeklista",INDENT "Pokaż Listę Ostrzeżeń") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") -#define TR_UART3MODE "Port szreg." +#define TR_AUX_SERIALMODE "Port szreg." #define TR_SCRIPT "Skrypt" #define TR_INPUTS "Wejścia" #define TR_OUTPUTS "Wyjścia" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 334105849..3c9dafbee 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -70,11 +70,11 @@ #define LEN_TRNCHN "\003" #define TR_TRNCHN "CH1CH2CH3CH4" -#define LEN_UART3MODES "\017" +#define LEN_AUX_SERIALMODES "\017" #if defined(CLI) || defined(DEBUG) -#define TR_UART3MODES "Debug\0 ""S-Port Mirror\0 ""Telemetry\0 ""SBUS Trainer\0 ""LUA\0 " +#define TR_AUX_SERIALMODES "Debug\0 ""S-Port Mirror\0 ""Telemetry\0 ""SBUS Trainer\0 ""LUA\0 " #else -#define TR_UART3MODES "OFF\0 ""S-Port Mirror\0 ""Telemetry\0 ""SBUS Trainer\0 ""LUA\0 " +#define TR_AUX_SERIALMODES "OFF\0 ""S-Port Mirror\0 ""Telemetry\0 ""SBUS Trainer\0 ""LUA\0 " #endif #define LEN_SWTYPES "\006" @@ -1024,7 +1024,7 @@ #define TR_PREFLIGHT "Preflight Checks" #define TR_CHECKLIST INDENT "Display Checklist" #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") -#define TR_UART3MODE "Serial port" +#define TR_AUX_SERIALMODE "Serial port" #define TR_SCRIPT "Script" #define TR_INPUTS "Inputs" #define TR_OUTPUTS "Outputs" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index f049c5326..0d0ee51ef 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -70,11 +70,11 @@ #define LEN_TRNCHN "\003" #define TR_TRNCHN "KN1KN2KN3KN4" -#define LEN_UART3MODES "\022" +#define LEN_AUX_SERIALMODES "\022" #if defined(CLI) || defined(DEBUG) -#define TR_UART3MODES "Debug\0 ""Spegling av S-Port""Telemetri\0 ""SBUS Trainer\0 ""LUA\0 " +#define TR_AUX_SERIALMODES "Debug\0 ""Spegling av S-Port""Telemetri\0 ""SBUS Trainer\0 ""LUA\0 " #else -#define TR_UART3MODES "Av\0 ""Spegling av S-Port""Telemetri\0 ""SBUS Trainer\0 ""LUA\0 " +#define TR_AUX_SERIALMODES "Av\0 ""Spegling av S-Port""Telemetri\0 ""SBUS Trainer\0 ""LUA\0 " #endif #define LEN_SWTYPES "\006" @@ -1034,7 +1034,7 @@ #define TR_PREFLIGHT "Startkontroller" #define TR_CHECKLIST TR(INDENT "Checklista", INDENT "Visa Checklista") #define TR_FAS_OFFSET TR(INDENT "FAS Ofs", INDENT "FAS Offset") -#define TR_UART3MODE "Serieporten" +#define TR_AUX_SERIALMODE "Serieporten" #define TR_SCRIPT "Programkod" #define TR_INPUTS "Input" #define TR_OUTPUTS "Outputs"