From ab38676ffd60bff6543fdc9a9f09df60e68c326f Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 9 May 2019 10:30:36 +0200 Subject: [PATCH] SPORT telemetry push fix (part 1) --- radio/src/targets/horus/telemetry_driver.cpp | 2 +- radio/src/targets/taranis/telemetry_driver.cpp | 2 +- radio/src/telemetry/telemetry.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/targets/horus/telemetry_driver.cpp b/radio/src/targets/horus/telemetry_driver.cpp index a63330414..491325d21 100644 --- a/radio/src/targets/horus/telemetry_driver.cpp +++ b/radio/src/targets/horus/telemetry_driver.cpp @@ -207,7 +207,7 @@ extern "C" void TELEMETRY_USART_IRQHandler(void) if (telemetryProtocol == PROTOCOL_TELEMETRY_FRSKY_SPORT) { static uint8_t prevdata; if (prevdata == 0x7E && outputTelemetryBuffer.size > 0 && outputTelemetryBuffer.destination == TELEMETRY_ENDPOINT_SPORT && data == outputTelemetryBuffer.sport.physicalId) { - sportSendBuffer(outputTelemetryBuffer.data, outputTelemetryBuffer.size); + sportSendBuffer(outputTelemetryBuffer.data + 1, outputTelemetryBuffer.size - 1); } prevdata = data; } diff --git a/radio/src/targets/taranis/telemetry_driver.cpp b/radio/src/targets/taranis/telemetry_driver.cpp index 25db78104..a05b6753e 100644 --- a/radio/src/targets/taranis/telemetry_driver.cpp +++ b/radio/src/targets/taranis/telemetry_driver.cpp @@ -159,7 +159,7 @@ extern "C" void TELEMETRY_USART_IRQHandler(void) if (telemetryProtocol == PROTOCOL_TELEMETRY_FRSKY_SPORT) { static uint8_t prevdata; if (prevdata == 0x7E && outputTelemetryBuffer.destination == TELEMETRY_ENDPOINT_SPORT && data == outputTelemetryBuffer.sport.physicalId) { - sportSendBuffer(outputTelemetryBuffer.data, outputTelemetryBuffer.size); + sportSendBuffer(outputTelemetryBuffer.data + 1, outputTelemetryBuffer.size - 1); } prevdata = data; } diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h index 6d7400e2b..30d4529e3 100644 --- a/radio/src/telemetry/telemetry.h +++ b/radio/src/telemetry/telemetry.h @@ -209,7 +209,7 @@ class OutputTelemetryBuffer { { size = 0; uint16_t crc = 0; - sport.physicalId = packet.physicalId; // no bytestuffing, no CRC + pushByte(packet.physicalId); // no bytestuffing, no CRC for (uint8_t i=1; i