Bluetooth trainer byte parsing: catch XOR state errors
In XOR state only 0x7E ^ 0x20 = 0x5E or 0x7D ^ 0x20 = 0x5D are expected. Copy of my https://github.com/opentx/opentx/pull/8427
This commit is contained in:
+16
-2
@@ -208,8 +208,22 @@ void Bluetooth::processTrainerByte(uint8_t data)
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case STATE_DATA_XOR:
|
case STATE_DATA_XOR:
|
||||||
appendTrainerByte(data ^ STUFF_MASK);
|
switch (data) {
|
||||||
dataState = STATE_DATA_IN_FRAME;
|
case BYTE_STUFF ^ STUFF_MASK:
|
||||||
|
case START_STOP ^ STUFF_MASK:
|
||||||
|
// Expected content, save the data
|
||||||
|
appendTrainerByte(data ^ STUFF_MASK);
|
||||||
|
dataState = STATE_DATA_IN_FRAME;
|
||||||
|
break;
|
||||||
|
case START_STOP: // Illegal situation, as we have START_STOP, try to start from the beginning
|
||||||
|
bufferIndex = 0;
|
||||||
|
dataState = STATE_DATA_IN_FRAME;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
// Illegal situation, start looking for a new START_STOP byte
|
||||||
|
dataState = STATE_DATA_START;
|
||||||
|
break;
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case STATE_DATA_IDLE:
|
case STATE_DATA_IDLE:
|
||||||
|
|||||||
Reference in New Issue
Block a user