github.com/lowobservable.coax
1
0
Fork 0
mirror of https://github.com/lowobservable/coax.git synced 2026-05-04 23:26:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix firmware data expansion bug

Browse Source
This commit is contained in:
Andrew Kay
2020-03-23 21:31:51 -05:00
parent 7c6b1ed78e
commit 849810153b
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
interface1/firmware/firmware.ino
View File

@@ -35,13 +35,13 @@ void handleTransmitReceiveCommand(uint8_t *buffer, int bufferCount) {
sendErrorMessage(ERROR_INVALID_MESSAGE); sendErrorMessage(ERROR_INVALID_MESSAGE);
return; return;
} }
uint16_t transmitRepeatCount = ((buffer[0] << 8) | buffer[1]) & 0x7fff;
uint16_t transmitRepeatOffset = buffer[0] >> 7;
uint16_t *transmitBuffer = (uint16_t *) (buffer + 2); uint16_t *transmitBuffer = (uint16_t *) (buffer + 2);
uint16_t transmitBufferCount = (bufferCount - 6) / 2; uint16_t transmitBufferCount = (bufferCount - 6) / 2;
uint16_t transmitRepeatCount = ((buffer[0] << 8) | buffer[1]) & 0x7fff;
uint16_t transmitRepeatOffset = buffer[0] >> 7;
uint16_t receiveBufferSize = (buffer[bufferCount - 4] << 8) | buffer[bufferCount - 3]; uint16_t receiveBufferSize = (buffer[bufferCount - 4] << 8) | buffer[bufferCount - 3];
uint16_t receiveTimeout = (buffer[bufferCount - 2] << 8) | buffer[bufferCount - 1]; uint16_t receiveTimeout = (buffer[bufferCount - 2] << 8) | buffer[bufferCount - 1];
@@ -54,12 +54,15 @@ void handleTransmitReceiveCommand(uint8_t *buffer, int bufferCount) {
if (transmitRepeatCount > 1) { if (transmitRepeatCount > 1) {
uint8_t *source = ((uint8_t *) transmitBuffer) + (transmitRepeatOffset * 2); uint8_t *source = ((uint8_t *) transmitBuffer) + (transmitRepeatOffset * 2);
uint8_t *destination = ((uint8_t *) transmitBuffer) + (transmitBufferCount * 2); uint8_t *destination = ((uint8_t *) transmitBuffer) + (transmitBufferCount * 2);
size_t length = (transmitBufferCount - transmitRepeatOffset) * 2;
uint16_t sourceCount = transmitBufferCount - transmitRepeatOffset;
size_t length = sourceCount * 2;
for (int index = 1; index < transmitRepeatCount; index++) { for (int index = 1; index < transmitRepeatCount; index++) {
memcpy(destination, source, length); memcpy(destination, source, length);
transmitBufferCount += (transmitBufferCount - transmitRepeatOffset); transmitBufferCount += sourceCount;
destination += length; destination += length;
} }