feat(color): telemetry queues for Lua, enhance default widget options (#5926)
This commit is contained in:
@@ -311,12 +311,8 @@ void processCrossfireTelemetryFrame(uint8_t module, uint8_t* rxBuffer,
|
||||
crossfireModuleStatus[module].queryCompleted = true;
|
||||
}
|
||||
|
||||
if (luaInputTelemetryFifo && luaInputTelemetryFifo->hasSpace(rxBufferCount - 2)) {
|
||||
for (uint8_t i = 1; i < rxBufferCount - 1; i++) {
|
||||
// destination address and CRC are skipped
|
||||
luaInputTelemetryFifo->push(rxBuffer[i]);
|
||||
}
|
||||
}
|
||||
// destination address and CRC are skipped
|
||||
pushTelemetryDataToQueues(rxBuffer + 1, rxBufferCount - 2);
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -391,18 +391,12 @@ void sportProcessTelemetryPacketWithoutCrc(uint8_t module, uint8_t origin, const
|
||||
}
|
||||
else if (dataId >= DIY_STREAM_FIRST_ID && dataId <= DIY_STREAM_LAST_ID) {
|
||||
#if defined(LUA)
|
||||
if (luaInputTelemetryFifo &&
|
||||
luaInputTelemetryFifo->hasSpace(sizeof(SportTelemetryPacket))) {
|
||||
|
||||
SportTelemetryPacket luaPacket;
|
||||
luaPacket.physicalId = physicalId;
|
||||
luaPacket.primId = primId;
|
||||
luaPacket.dataId = dataId;
|
||||
luaPacket.value = data;
|
||||
for (uint8_t i=0; i<sizeof(SportTelemetryPacket); i++) {
|
||||
luaInputTelemetryFifo->push(luaPacket.raw[i]);
|
||||
}
|
||||
}
|
||||
SportTelemetryPacket luaPacket;
|
||||
luaPacket.physicalId = physicalId;
|
||||
luaPacket.primId = primId;
|
||||
luaPacket.dataId = dataId;
|
||||
luaPacket.value = data;
|
||||
pushTelemetryDataToQueues(luaPacket.raw, sizeof(SportTelemetryPacket));
|
||||
#endif
|
||||
}
|
||||
else if (dataId >= RB3040_CH1_2_FIRST_ID && dataId <= RB3040_CH7_8_LAST_ID) {
|
||||
@@ -433,16 +427,12 @@ void sportProcessTelemetryPacketWithoutCrc(uint8_t module, uint8_t origin, const
|
||||
}
|
||||
#if defined(LUA)
|
||||
else if (primId == 0x32) {
|
||||
if (luaInputTelemetryFifo && luaInputTelemetryFifo->hasSpace(sizeof(SportTelemetryPacket))) {
|
||||
SportTelemetryPacket luaPacket;
|
||||
luaPacket.physicalId = physicalId;
|
||||
luaPacket.primId = primId;
|
||||
luaPacket.dataId = dataId;
|
||||
luaPacket.value = data;
|
||||
for (uint8_t i=0; i<sizeof(SportTelemetryPacket); i++) {
|
||||
luaInputTelemetryFifo->push(luaPacket.raw[i]);
|
||||
}
|
||||
}
|
||||
SportTelemetryPacket luaPacket;
|
||||
luaPacket.physicalId = physicalId;
|
||||
luaPacket.primId = primId;
|
||||
luaPacket.dataId = dataId;
|
||||
luaPacket.value = data;
|
||||
pushTelemetryDataToQueues(luaPacket.raw, sizeof(SportTelemetryPacket));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -315,11 +315,7 @@ void processGhostTelemetryFrame(uint8_t module, uint8_t* buffer, uint32_t length
|
||||
#if defined(LUA)
|
||||
default:
|
||||
// destination address and CRC are skipped
|
||||
if (luaInputTelemetryFifo && luaInputTelemetryFifo->hasSpace(length - 2) ) {
|
||||
for (uint8_t i = 1; i < length - 1; i++) {
|
||||
luaInputTelemetryFifo->push(buffer[i]);
|
||||
}
|
||||
}
|
||||
pushTelemetryDataToQueues(buffer + 1, length - 2);
|
||||
break;
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -468,7 +468,38 @@ void logTelemetryWriteByte(uint8_t data)
|
||||
OutputTelemetryBuffer outputTelemetryBuffer __DMA_NO_CACHE;
|
||||
|
||||
#if defined(LUA)
|
||||
Fifo<uint8_t, LUA_TELEMETRY_INPUT_FIFO_SIZE> * luaInputTelemetryFifo = NULL;
|
||||
TelemetryQueue* luaInputTelemetryFifo = nullptr;
|
||||
#if defined(COLORLCD)
|
||||
std::list<TelemetryQueue*> telemetryQueues;
|
||||
|
||||
void registerTelemetryQueue(TelemetryQueue* queue)
|
||||
{
|
||||
telemetryQueues.emplace_back(queue);
|
||||
}
|
||||
|
||||
void deregisterTelemetryQueue(TelemetryQueue* queue)
|
||||
{
|
||||
telemetryQueues.remove(queue);
|
||||
}
|
||||
#endif
|
||||
|
||||
static void pushDataToQueue(TelemetryQueue* queue, uint8_t* data, int length)
|
||||
{
|
||||
if (queue && queue->hasSpace(length)) {
|
||||
for (uint8_t i = 0; i < length; i += 1) {
|
||||
queue->push(data[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void pushTelemetryDataToQueues(uint8_t* data, int length)
|
||||
{
|
||||
#if defined(COLORLCD)
|
||||
for (auto it = telemetryQueues.cbegin(); it != telemetryQueues.cend(); ++it)
|
||||
pushDataToQueue(*it, data, length);
|
||||
#endif
|
||||
pushDataToQueue(luaInputTelemetryFifo, data, length);
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(HARDWARE_INTERNAL_MODULE)
|
||||
|
||||
@@ -236,7 +236,11 @@ extern OutputTelemetryBuffer outputTelemetryBuffer __DMA_NO_CACHE;
|
||||
#if defined(LUA)
|
||||
#include "fifo.h"
|
||||
#define LUA_TELEMETRY_INPUT_FIFO_SIZE 256
|
||||
extern Fifo<uint8_t, LUA_TELEMETRY_INPUT_FIFO_SIZE> * luaInputTelemetryFifo;
|
||||
typedef Fifo<uint8_t, LUA_TELEMETRY_INPUT_FIFO_SIZE> TelemetryQueue;
|
||||
extern TelemetryQueue* luaInputTelemetryFifo;
|
||||
void registerTelemetryQueue(TelemetryQueue*);
|
||||
void deregisterTelemetryQueue(TelemetryQueue*);
|
||||
void pushTelemetryDataToQueues(uint8_t* data, int length);
|
||||
#endif
|
||||
|
||||
void processPXX2Frame(uint8_t idx, const uint8_t* frame,
|
||||
|
||||
Reference in New Issue
Block a user