Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 09:16:07 +03:00
Code Issues Wiki Activity

Merge pull request #6300 from mikeller/fix_smartport_overflow

Browse source 
Fixed frame received detection logic for SmartPort.
This commit is contained in:
Michael Keller 2018-07-08 15:12:26 +12:00 • committed by GitHub
commit 5f549498cf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -203,6 +203,8 @@ typedef struct smartPortFrame_s {
static smartPortWriteFrameFn *smartPortWriteFrame;
static timeUs_t lastTelemetryFrameReceivedUs;
#if defined(USE_MSP_OVER_TELEMETRY)
static bool smartPortMspReplyPending = false;
#endif
@ -232,6 +234,7 @@ smartPortPayload_t *smartPortDataReceive(uint16_t c, bool *clearToSend, smartPor
if ((c == FSSP_SENSOR_ID1) && checkQueueEmpty()) {
// our slot is starting, no need to decode more
*clearToSend = true;
lastTelemetryFrameReceivedUs = micros();
skipUntilStart = true;
} else if (c == FSSP_SENSOR_ID2) {
checksum = 0;
@ -253,6 +256,7 @@ smartPortPayload_t *smartPortDataReceive(uint16_t c, bool *clearToSend, smartPor
checksum += c;
if (!useChecksum && (smartPortRxBytes == sizeof(smartPortPayload_t))) {
lastTelemetryFrameReceivedUs = micros();
skipUntilStart = true;
return (smartPortPayload_t *)&rxBuffer;
@ -263,6 +267,8 @@ smartPortPayload_t *smartPortDataReceive(uint16_t c, bool *clearToSend, smartPor
checksum += c;
checksum = (checksum & 0xFF) + (checksum >> 8);
if (checksum == 0xFF) {
lastTelemetryFrameReceivedUs = micros();
return (smartPortPayload_t *)&rxBuffer;
}
}
@ -809,7 +815,6 @@ static bool serialCheckQueueEmpty(void)
void handleSmartPortTelemetry(void)
{
static bool clearToSend = false;
static volatile timeUs_t lastTelemetryFrameReceivedUs;
static smartPortPayload_t *payload = NULL;
const uint32_t requestTimeout = millis() + SMARTPORT_SERVICE_TIMEOUT_MS;
@ -818,9 +823,6 @@ void handleSmartPortTelemetry(void)
while (serialRxBytesWaiting(smartPortSerialPort) > 0 && !payload) {
uint8_t c = serialRead(smartPortSerialPort);
payload = smartPortDataReceive(c, &clearToSend, serialCheckQueueEmpty, true);
if (payload) {
lastTelemetryFrameReceivedUs = micros();
}
}
if (cmpTimeUs(micros(), lastTelemetryFrameReceivedUs) >= SMARTPORT_MIN_TELEMETRY_RESPONSE_DELAY_US) {