From 81a14c17323ffe33dbccb27596e5a20a910dd3d4 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Fri, 20 Mar 2015 17:52:49 +0400 Subject: [PATCH] Instance numbers synced with FrSky servo channel changer, and displayed on telemetry page to ease choosing a new ID --- radio/src/gui/Taranis/menu_model_telemetry.cpp | 2 ++ radio/src/telemetry/frsky_sport.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/Taranis/menu_model_telemetry.cpp b/radio/src/gui/Taranis/menu_model_telemetry.cpp index 00fba7aa2..5374b029f 100644 --- a/radio/src/gui/Taranis/menu_model_telemetry.cpp +++ b/radio/src/gui/Taranis/menu_model_telemetry.cpp @@ -478,6 +478,8 @@ void menuModelTelemetry(uint8_t event) else { lcd_putsAtt(TELEM_COL2, y, "---", 0); // TODO shortcut } + TelemetrySensor * sensor = & g_model.telemetrySensors[index]; + lcd_outdezAtt(TELEM_COL2+10*FW, y, sensor->instance, 0); if (attr) { s_editMode = 0; s_currIdx = index; diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp index 2c8c0e412..8d5b224c1 100644 --- a/radio/src/telemetry/frsky_sport.cpp +++ b/radio/src/telemetry/frsky_sport.cpp @@ -167,7 +167,7 @@ void processSportUpdatePacket(uint8_t *packet) void processSportPacket(uint8_t *packet) { - uint8_t dataId = packet[0]; + uint8_t dataId = (packet[0] & 0x1F) + 1; uint8_t prim = packet[1]; uint16_t appId = *((uint16_t *)(packet+2));