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

Schwabe/multi protocol update (#4352)

Browse source 
* Add multi frisky eu protocols

* Also implement MULTI_STATUS, the alternative to MULTI_TELEMETRY used by er9x/ersky9x
This commit is contained in:
Arne Schwabe 2017-01-31 07:41:08 +01:00 • committed by Bertrand Songis
parent cab26a6a0f
commit 59d9ec131b
15 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

27
radio/src/telemetry/multi.cpp
View file

@ -18,6 +18,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "telemetry.h"
MultiModuleStatus multiModuleStatus;
uint8_t multiBindStatus = MULTI_NORMAL_OPERATION;
@ -36,6 +37,7 @@ enum MultiBufferState : uint8_t {
NoProtocolDetected,
MultiFirstByteReceived,
ReceivingMultiProtocol,
ReceivingMultiStatus,
SpektrumTelemetryFallback,
FrskyTelemetryFallbackFirstByte,
FrskyTelemetryFallbackNextBytes,
@ -67,15 +69,6 @@ static void processMultiStatusPacket(const uint8_t *data)
if (wasBinding && !multiModuleStatus.isBinding() && multiBindStatus == MULTI_BIND_INITIATED)
multiBindStatus = MULTI_BIND_FINISHED;
// set moduleFlag to bind status
/*
if (moduleFlag[EXTERNAL_MODULE] != MODULE_RANGECHECK)
// Two times the same status in a row to avoid race conditions
if (multiModuleStatus.isBinding() == wasBinding) {
multiModuleStatus.isBinding() ? moduleFlag[EXTERNAL_MODULE] = MODULE_BIND : MODULE_NORMAL_MODE;
}
*/
}
static void processMultiTelemetryPaket(const uint8_t *packet)
@ -257,9 +250,14 @@ void processMultiTelemetryData(const uint8_t data)
break;
case MultiFirstByteReceived:
telemetryRxBufferCount = 0;
if (data == 'P') {
telemetryRxBufferCount = 0;
multiTelemetryBufferState = ReceivingMultiProtocol;
} else if (data >= 5 && data <= 10) {
// Protocol indented for er9x/ersky9, accept only 5-10 as packet length to have
// a bit of validation
multiTelemetryBufferState = ReceivingMultiStatus;
} else {
TRACE("[MP] invalid second byte 0x%02X", data);
multiTelemetryBufferState = NoProtocolDetected;
@ -269,6 +267,15 @@ void processMultiTelemetryData(const uint8_t data)
case ReceivingMultiProtocol:
processMultiTelemetryByte(data);
break;
case ReceivingMultiStatus:
// Ignore multi status
telemetryRxBuffer[telemetryRxBufferCount++] = data;
if (telemetryRxBufferCount>5) {
processMultiStatusPacket(telemetryRxBuffer);
telemetryRxBufferCount=0;
multiTelemetryBufferState = NoProtocolDetected;
}
}
}