[Taranis] frsky_sport kept as before with the fix from André!

This commit is contained in:
bsongis@gmail.com
2013-07-14 18:32:00 +00:00
parent b941aa0277
commit 50c7a8b5db
+9 -10
View File
@@ -38,6 +38,7 @@
#define START_STOP 0x7e #define START_STOP 0x7e
#define BYTESTUFF 0x7d #define BYTESTUFF 0x7d
#define STUFF_MASK 0x20
// FrSky PRIM IDs (1 byte) // FrSky PRIM IDs (1 byte)
#define DATA_FRAME 0x10 #define DATA_FRAME 0x10
@@ -123,7 +124,8 @@ uint8_t frskyTxBufferCount = 0;
uint8_t link_counter = 0; uint8_t link_counter = 0;
FrskyData frskyData; FrskyData frskyData;
#if defined(DEBUG) #if defined(DEBUG) && !defined(SIMU)
#include "../fifo.h"
extern FIL g_telemetryFile; extern FIL g_telemetryFile;
Fifo<512> debugTelemetryFifo; Fifo<512> debugTelemetryFifo;
#endif #endif
@@ -389,7 +391,7 @@ void processSportPacket(uint8_t *packet)
enum FrSkyDataState { enum FrSkyDataState {
STATE_DATA_IDLE, STATE_DATA_IDLE,
STATE_DATA_IN_FRAME, STATE_DATA_IN_FRAME,
STATE_DATA_STUFF, STATE_DATA_XOR,
}; };
void processSerialData(uint8_t data) void processSerialData(uint8_t data)
@@ -402,7 +404,7 @@ void processSerialData(uint8_t data)
btPushByte(data); btPushByte(data);
#endif #endif
#if defined(DEBUG) #if defined(DEBUG) && !defined(SIMU)
debugTelemetryFifo.push(data); debugTelemetryFifo.push(data);
#endif #endif
@@ -412,17 +414,14 @@ void processSerialData(uint8_t data)
} }
else { else {
switch (dataState) { switch (dataState) {
case STATE_DATA_STUFF: case STATE_DATA_XOR:
if (data == 0x5E) frskyRxBuffer[numPktBytes++] = data ^ STUFF_MASK;
frskyRxBuffer[numPktBytes++] = 0x7E;
else if (data == 0x5D)
frskyRxBuffer[numPktBytes++] = 0x7D;
dataState = STATE_DATA_IN_FRAME; dataState = STATE_DATA_IN_FRAME;
break; break;
case STATE_DATA_IN_FRAME: case STATE_DATA_IN_FRAME:
if (data == BYTESTUFF) if (data == BYTESTUFF)
dataState = STATE_DATA_STUFF; dataState = STATE_DATA_XOR; // XOR next byte
else else
frskyRxBuffer[numPktBytes++] = data; frskyRxBuffer[numPktBytes++] = data;
break; break;
@@ -508,7 +507,7 @@ void telemetryWakeup()
varioWakeup(); varioWakeup();
#endif #endif
#if defined(DEBUG) #if defined(DEBUG) && !defined(SIMU)
static tmr10ms_t lastTime = 0; static tmr10ms_t lastTime = 0;
tmr10ms_t newTime = get_tmr10ms(); tmr10ms_t newTime = get_tmr10ms();
uint8_t data; uint8_t data;