New parameter added in TELEMETRY screen to choose S.PORT or D protocol.
This commit is contained in:
@@ -5360,6 +5360,7 @@ void menuModelCustomScripts(uint8_t event)
|
||||
#endif
|
||||
|
||||
enum menuModelTelemetryItems {
|
||||
CASE_CPUARM(ITEM_TELEMETRY_PROTOCOL_TYPE)
|
||||
#if defined(CPUARM)
|
||||
ITEM_TELEMETRY_RXBATT_LABEL,
|
||||
ITEM_TELEMETRY_RXBATT_ALARM1,
|
||||
@@ -5496,7 +5497,7 @@ enum menuModelTelemetryItems {
|
||||
|
||||
void menuModelTelemetry(uint8_t event)
|
||||
{
|
||||
MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, RXBATT_ROWS CHANNEL_ROWS, CHANNEL_ROWS, CASE_CPUARM(CHANNEL_ROWS) CASE_CPUARM(CHANNEL_ROWS) RSSI_ROWS, USRDATA_LINES 0, 0, IF_FAS_OFFSET(0) CASE_CPUARM(0) CASE_VARIO(LABEL(Vario)) CASE_VARIO(0) CASE_VARIO(VARIO_RANGE_ROWS) CASE_PCBTARANIS(LABEL(TopBar)) CASE_PCBTARANIS(0) SCREEN_TYPE_ROWS, 2, 2, 2, 2, SCREEN_TYPE_ROWS, 2, 2, 2, 2, CASE_CPUARM(SCREEN_TYPE_ROWS) CASE_CPUARM(2) CASE_CPUARM(2) CASE_CPUARM(2) CASE_CPUARM(2) });
|
||||
MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, CASE_CPUARM(0) RXBATT_ROWS CHANNEL_ROWS, CHANNEL_ROWS, CASE_CPUARM(CHANNEL_ROWS) CASE_CPUARM(CHANNEL_ROWS) RSSI_ROWS, USRDATA_LINES 0, 0, IF_FAS_OFFSET(0) CASE_CPUARM(0) CASE_VARIO(LABEL(Vario)) CASE_VARIO(0) CASE_VARIO(VARIO_RANGE_ROWS) CASE_PCBTARANIS(LABEL(TopBar)) CASE_PCBTARANIS(0) SCREEN_TYPE_ROWS, 2, 2, 2, 2, SCREEN_TYPE_ROWS, 2, 2, 2, 2, CASE_CPUARM(SCREEN_TYPE_ROWS) CASE_CPUARM(2) CASE_CPUARM(2) CASE_CPUARM(2) CASE_CPUARM(2)});
|
||||
|
||||
uint8_t sub = m_posVert - 1;
|
||||
|
||||
@@ -5530,7 +5531,15 @@ void menuModelTelemetry(uint8_t event)
|
||||
#endif
|
||||
FrSkyChannelData & channel = g_model.frsky.channels[ch];
|
||||
uint8_t dest = TELEM_A1-1+ch;
|
||||
|
||||
switch (k) {
|
||||
|
||||
#if defined(CPUARM)
|
||||
case ITEM_TELEMETRY_PROTOCOL_TYPE:
|
||||
g_model.telemetryProtocol = selectMenuItem(TELEM_COL2, y, "Telemetry Type", "\006S.PORTD\0 ", g_model.telemetryProtocol, PROTOCOL_FRSKY_SPORT, PROTOCOL_FRSKY_D, attr, event);
|
||||
break;
|
||||
#endif
|
||||
|
||||
#if defined(CPUARM)
|
||||
case ITEM_TELEMETRY_RXBATT_LABEL:
|
||||
lcd_putsLeft(y, "RxBatt");
|
||||
|
||||
@@ -1693,11 +1693,17 @@ enum ThrottleSources {
|
||||
THROTTLE_SOURCE_CH1,
|
||||
};
|
||||
|
||||
enum TelemetryProtocol
|
||||
{
|
||||
PROTOCOL_FRSKY_SPORT,
|
||||
PROTOCOL_FRSKY_D,
|
||||
};
|
||||
|
||||
PACK(typedef struct t_ModelData {
|
||||
ModelHeader header;
|
||||
TimerData timers[MAX_TIMERS];
|
||||
AVR_FIELD(uint8_t protocol:3);
|
||||
ARM_FIELD(uint8_t spare:3);
|
||||
ARM_FIELD(uint8_t telemetryProtocol:3);
|
||||
uint8_t thrTrim:1; // Enable Throttle Trim
|
||||
AVR_FIELD(int8_t ppmNCH:4)
|
||||
ARM_FIELD(int8_t spare2:4)
|
||||
|
||||
@@ -68,30 +68,9 @@ uint8_t frskyRxBufferCount = 0;
|
||||
FrskyData frskyData;
|
||||
|
||||
#if defined(CPUARM)
|
||||
enum TelemetryProtocol
|
||||
{
|
||||
PROTOCOL_NONE,
|
||||
PROTOCOL_FRSKY_D,
|
||||
PROTOCOL_FRSKY_SPORT,
|
||||
};
|
||||
|
||||
uint8_t telemetryProtocol = 255;
|
||||
#define IS_FRSKY_D_PROTOCOL() (telemetryProtocol == PROTOCOL_FRSKY_D)
|
||||
#define IS_FRSKY_SPORT_PROTOCOL() (telemetryProtocol == PROTOCOL_FRSKY_SPORT)
|
||||
|
||||
TelemetryProtocol telemetryProtocol = PROTOCOL_NONE;
|
||||
|
||||
TelemetryProtocol getTelemetryProtocol()
|
||||
{
|
||||
if (IS_MODULE_XJT(EXTERNAL_MODULE))
|
||||
return PROTOCOL_FRSKY_SPORT;
|
||||
|
||||
#if defined(PCBTARANIS)
|
||||
if (IS_MODULE_XJT(INTERNAL_MODULE))
|
||||
return PROTOCOL_FRSKY_SPORT;
|
||||
#endif
|
||||
|
||||
return PROTOCOL_FRSKY_D;
|
||||
}
|
||||
#else
|
||||
#define IS_FRSKY_D_PROTOCOL() (true)
|
||||
#define IS_FRSKY_SPORT_PROTOCOL() (false)
|
||||
@@ -301,9 +280,8 @@ enum AlarmsCheckSteps {
|
||||
void telemetryWakeup()
|
||||
{
|
||||
#if defined(CPUARM)
|
||||
TelemetryProtocol currentProtocol = getTelemetryProtocol();
|
||||
if (telemetryProtocol != currentProtocol) {
|
||||
telemetryProtocol = currentProtocol;
|
||||
if (telemetryProtocol != g_model.telemetryProtocol) {
|
||||
telemetryProtocol = g_model.telemetryProtocol;
|
||||
telemetryInit();
|
||||
}
|
||||
#endif
|
||||
@@ -600,13 +578,8 @@ void telemetryReset()
|
||||
|
||||
void telemetryInit(void)
|
||||
{
|
||||
#if defined(PCBTARANIS)
|
||||
if (IS_MODULE_XJT(INTERNAL_MODULE) || IS_MODULE_XJT(EXTERNAL_MODULE))
|
||||
telemetryPortInit(FRSKY_SPORT_BAUDRATE);
|
||||
else
|
||||
telemetryPortInit(FRSKY_D_BAUDRATE);
|
||||
#elif defined(PCBSKY9X)
|
||||
if (IS_MODULE_XJT(EXTERNAL_MODULE))
|
||||
#if defined(CPUARM)
|
||||
if (telemetryProtocol == PROTOCOL_FRSKY_SPORT)
|
||||
telemetryPortInit(FRSKY_SPORT_BAUDRATE);
|
||||
else
|
||||
telemetryPortInit(FRSKY_D_BAUDRATE);
|
||||
|
||||
Reference in New Issue
Block a user