Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-17 21:35:44 +03:00
Code Issues Wiki Activity

Add request / response delay to SmartPort (fixes MSP over SmartPort issues on r-XSR).

Browse source
This commit is contained in:
Michael Keller 2017-12-29 15:58:15 +13:00 • committed by mikeller
parent 3c166a3e44
commit 706eea40bb
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/main/telemetry/smartport.c
View file

@ -58,6 +58,8 @@
#include "telemetry/smartport.h" #include "telemetry/smartport.h"
#include "telemetry/msp_shared.h" #include "telemetry/msp_shared.h"
#define SMARTPORT_MIN_TELEMETRY_RESPONSE_DELAY_US 500
// these data identifiers are obtained from https://github.com/opentx/opentx/blob/master/radio/src/telemetry/frsky_hub.h // these data identifiers are obtained from https://github.com/opentx/opentx/blob/master/radio/src/telemetry/frsky_hub.h
enum enum
{ {
@ -141,7 +143,7 @@ typedef struct smartPortFrame_s {
uint8_t crc; uint8_t crc;
} __attribute__((packed)) smartPortFrame_t; } __attribute__((packed)) smartPortFrame_t;
#define SMARTPORT_MSP_PAYLOAD_SIZE (sizeof(smartPortPayload_t) - sizeof(uint8_t)) #define SMARTPORT_MSP_PAYLOAD_SIZE (sizeof(smartPortPayload_t) - sizeof(uint8_t))
static smartPortWriteFrameFn *smartPortWriteFrame; static smartPortWriteFrameFn *smartPortWriteFrame;
@ -584,17 +586,24 @@ static bool serialCheckQueueEmpty(void)
void handleSmartPortTelemetry(void) void handleSmartPortTelemetry(void)
{ {
static bool clearToSend = false; static bool clearToSend = false;
static volatile timeUs_t lastTelemetryFrameReceivedUs;
static smartPortPayload_t *payload = NULL;
const uint32_t requestTimeout = millis() + SMARTPORT_SERVICE_TIMEOUT_MS; const uint32_t requestTimeout = millis() + SMARTPORT_SERVICE_TIMEOUT_MS;
if (telemetryState == TELEMETRY_STATE_INITIALIZED_SERIAL && smartPortSerialPort) { if (telemetryState == TELEMETRY_STATE_INITIALIZED_SERIAL && smartPortSerialPort) {
smartPortPayload_t *payload = NULL;
while (serialRxBytesWaiting(smartPortSerialPort) > 0 && !payload) { while (serialRxBytesWaiting(smartPortSerialPort) > 0 && !payload) {
uint8_t c = serialRead(smartPortSerialPort); uint8_t c = serialRead(smartPortSerialPort);
payload = smartPortDataReceive(c, &clearToSend, serialCheckQueueEmpty, true); payload = smartPortDataReceive(c, &clearToSend, serialCheckQueueEmpty, true);
if (payload) {
lastTelemetryFrameReceivedUs = micros();
}
} }
processSmartPortTelemetry(payload, &clearToSend, &requestTimeout); if (cmpTimeUs(micros(), lastTelemetryFrameReceivedUs) >= SMARTPORT_MIN_TELEMETRY_RESPONSE_DELAY_US) {
processSmartPortTelemetry(payload, &clearToSend, &requestTimeout);
payload = NULL;
}
} }
} }
#endif #endif