Fixes #3964: Added free space check before putting new data into Lua … (#3968)

* Fixes #3964: Added free space check before putting new data into Lua Telemetry Fifo

* Copy-paste error

* Compilation fix

* Another compilation fix
This commit is contained in:
Damjan Adamic
2016-11-02 12:56:43 +01:00
committed by Bertrand Songis
parent 450430f22e
commit a332f7a872
3 changed files with 15 additions and 8 deletions
+1 -1
View File
@@ -198,7 +198,7 @@ void processCrossfireTelemetryFrame()
#if defined(LUA)
default:
if (luaInputTelemetryFifo) {
if (luaInputTelemetryFifo && luaInputTelemetryFifo->hasSpace(telemetryRxBufferCount-2) ) {
for (uint8_t i=1; i<telemetryRxBufferCount-1; i++) {
// destination address and CRC are skipped
luaInputTelemetryFifo->push(telemetryRxBuffer[i]);
+4 -4
View File
@@ -201,13 +201,13 @@ void sportProcessTelemetryPacket(uint8_t * packet)
}
else if (id >= DIY_FIRST_ID && id <= DIY_LAST_ID) {
#if defined(LUA)
if (luaInputTelemetryFifo) {
if (luaInputTelemetryFifo && luaInputTelemetryFifo->hasSpace(sizeof(SportTelemetryPacket))) {
SportTelemetryPacket luaPacket;
luaPacket.physicalId = physicalId;
luaPacket.primId = primId;
luaPacket.dataId = id;
luaPacket.value = data;
for (uint8_t i=0; i<sizeof(luaPacket); i++) {
for (uint8_t i=0; i<sizeof(SportTelemetryPacket); i++) {
luaInputTelemetryFifo->push(luaPacket.raw[i]);
}
}
@@ -221,13 +221,13 @@ void sportProcessTelemetryPacket(uint8_t * packet)
}
#if defined(LUA)
else if (primId == 0x32) {
if (luaInputTelemetryFifo) {
if (luaInputTelemetryFifo && luaInputTelemetryFifo->hasSpace(sizeof(SportTelemetryPacket))) {
SportTelemetryPacket luaPacket;
luaPacket.physicalId = physicalId;
luaPacket.primId = primId;
luaPacket.dataId = id;
luaPacket.value = data;
for (uint8_t i=0; i<sizeof(luaPacket); i++) {
for (uint8_t i=0; i<sizeof(SportTelemetryPacket); i++) {
luaInputTelemetryFifo->push(luaPacket.raw[i]);
}
}