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

[Taranis] Telemetry on battery serial port only enabled if UART3 mode is

set to telemetry
This commit is contained in:
bsongis 2014-06-23 17:38:00 +02:00
parent 9d4fbfc3ea
commit dafb700be2
8 changed files with 8 additions and 9 deletions

View file

@ -5589,7 +5589,7 @@ void menuModelTelemetry(uint8_t event)
#if defined(CPUARM)
case ITEM_TELEMETRY_PROTOCOL_TYPE:
g_model.telemetryProtocol = selectMenuItem(TELEM_COL2, y, STR_TELEMETRY_TYPE, "\016FrSky S.PORT\0 FrSky D\0 FrSky D (batt)", g_model.telemetryProtocol, PROTOCOL_TELEMETRY_FIRST, PROTOCOL_TELEMETRY_LAST, attr, event);
g_model.telemetryProtocol = selectMenuItem(TELEM_COL2, y, STR_TELEMETRY_TYPE, "\017FrSky S.PORT\0 FrSky D\0 FrSky D (cable)", g_model.telemetryProtocol, PROTOCOL_TELEMETRY_FIRST, CASE_PCBTARANIS(g_eeGeneral.uart3Mode==UART_MODE_TELEMETRY ? PROTOCOL_FRSKY_D_SECONDARY : PROTOCOL_FRSKY_D) CASE_PCBSKY9X(PROTOCOL_FRSKY_D_SECONDARY) attr, event);
break;
#endif

View file

@ -1698,8 +1698,7 @@ enum TelemetryProtocol
PROTOCOL_TELEMETRY_FIRST,
PROTOCOL_FRSKY_SPORT = PROTOCOL_TELEMETRY_FIRST,
PROTOCOL_FRSKY_D,
PROTOCOL_FRSKY_D_SECONDARY,
PROTOCOL_TELEMETRY_LAST = PROTOCOL_FRSKY_D_SECONDARY
PROTOCOL_FRSKY_D_SECONDARY
};
PACK(typedef struct t_ModelData {

View file

@ -787,7 +787,7 @@
#define TR_ANTENNAPROBLEM CENTER "Problém s TX anténou!"
#define TR_MODELIDUSED TR("ID již použito","ID modelu je již použito")
#define TR_MODULE INDENT "Modul"
#define TR_TELEMETRY_TYPE "Telemetry Type"
#define TR_TELEMETRY_TYPE TR("Type", "Telemetry Type")
#define TR_CHANNELRANGE INDENT "Rozsah kanálů"
#define TR_LOWALARM INDENT "Nízký Alarm"
#define TR_CRITICALALARM INDENT "Kritický Alarm"

View file

@ -787,7 +787,7 @@
#define TR_ANTENNAPROBLEM CENTER "TX Antennen Problem!"
#define TR_MODELIDUSED TR("ID schon benutzt","Modell ID schon benutzt")
#define TR_MODULE INDENT "Modul-Typ"
#define TR_TELEMETRY_TYPE "Telemetry Type"
#define TR_TELEMETRY_TYPE TR("Type", "Telemetry Type")
#define TR_CHANNELRANGE INDENT "Ausgangs Kanäle"
#define TR_LOWALARM INDENT "Vor-Alarm bei"
#define TR_CRITICALALARM INDENT "Kritisch Alarm"

View file

@ -787,7 +787,7 @@
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED TR("ID already used","Model ID already used")
#define TR_MODULE INDENT "Module"
#define TR_TELEMETRY_TYPE "Telemetry Type"
#define TR_TELEMETRY_TYPE TR("Type", "Telemetry Type")
#define TR_CHANNELRANGE TR(INDENT "Ch. Range", INDENT "Channel Range")
#define TR_LOWALARM INDENT "Low Alarm"
#define TR_CRITICALALARM INDENT "Critical Alarm"

View file

@ -787,7 +787,7 @@
#define TR_ANTENNAPROBLEM CENTER "¡Problema antena TX!"
#define TR_MODELIDUSED TR("ID en uso", "ID modelo en uso")
#define TR_MODULE INDENT "Modulo"
#define TR_TELEMETRY_TYPE "Telemetry Type"
#define TR_TELEMETRY_TYPE TR("Type", "Telemetry Type")
#define TR_CHANNELRANGE INDENT "Gama de canales"
#define TR_LOWALARM INDENT "Alarma baja"
#define TR_CRITICALALARM INDENT "Alarma Critica"

View file

@ -787,7 +787,7 @@
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED TR("ID already used","Model ID already used")
#define TR_MODULE INDENT "Module"
#define TR_TELEMETRY_TYPE "Telemetry Type"
#define TR_TELEMETRY_TYPE TR("Type", "Telemetry Type")
#define TR_CHANNELRANGE INDENT "Channel Range"
#define TR_LOWALARM INDENT "Low Alarm"
#define TR_CRITICALALARM INDENT "Critical Alarm"

View file

@ -787,7 +787,7 @@
#define TR_ANTENNAPROBLEM CENTER "TX Antenna problem!"
#define TR_MODELIDUSED TR("ID already used","Model ID already used")
#define TR_MODULE INDENT "Module"
#define TR_TELEMETRY_TYPE "Telemetry Type"
#define TR_TELEMETRY_TYPE TR("Type", "Telemetry Type")
#define TR_CHANNELRANGE INDENT "Channel Range"
#define TR_LOWALARM INDENT "Low Alarm"
#define TR_CRITICALALARM INDENT "Critical Alarm"