Model Setup refactoring
This commit is contained in:
@@ -154,7 +154,7 @@ void processBindFrame(uint8_t module, uint8_t * frame)
|
||||
case 0x01:
|
||||
if (reusableBuffer.moduleSetup.pxx2.bindStep == BIND_RX_NAME_SELECTED) {
|
||||
if (memcmp(&reusableBuffer.moduleSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.moduleSetup.pxx2.bindSelectedReceiverIndex], &frame[4], PXX2_LEN_RX_NAME) == 0) {
|
||||
memcpy(g_model.receiverData[reusableBuffer.moduleSetup.pxx2.bindReceiverId].name, &frame[4], PXX2_LEN_RX_NAME);
|
||||
memcpy(g_model.moduleData[module].pxx2.receiverName[reusableBuffer.moduleSetup.pxx2.bindReceiverIndex], &frame[4], PXX2_LEN_RX_NAME);
|
||||
storageDirty(EE_MODEL);
|
||||
reusableBuffer.moduleSetup.pxx2.bindStep = BIND_WAIT;
|
||||
reusableBuffer.moduleSetup.pxx2.bindWaitTimeout = get_tmr10ms() + 30;
|
||||
@@ -166,10 +166,8 @@ void processBindFrame(uint8_t module, uint8_t * frame)
|
||||
|
||||
void processTelemetryFrame(uint8_t module, uint8_t * frame)
|
||||
{
|
||||
TelemetryEndpoint origin;
|
||||
origin.module = module;
|
||||
origin.rxUid = frame[3] & 0x0F;
|
||||
sportProcessTelemetryPacketWithoutCrc(origin.value, &frame[4]);
|
||||
uint8_t origin = (module << 2) + (frame[3] & 0x03);
|
||||
sportProcessTelemetryPacketWithoutCrc(origin, &frame[4]);
|
||||
}
|
||||
|
||||
void processSpectrumAnalyserFrame(uint8_t module, uint8_t * frame)
|
||||
|
||||
@@ -150,16 +150,15 @@ void sportProcessTelemetryPacket(const uint8_t * packet)
|
||||
sportProcessTelemetryPacketWithoutCrc(TELEMETRY_ENDPOINT_SPORT, packet);
|
||||
}
|
||||
|
||||
void sportProcessTelemetryPacketWithoutCrc(uint8_t originValue, const uint8_t * packet)
|
||||
void sportProcessTelemetryPacketWithoutCrc(uint8_t origin, const uint8_t * packet)
|
||||
{
|
||||
TelemetryEndpoint & origin = (TelemetryEndpoint &)originValue;
|
||||
uint8_t physicalId = packet[0] & 0x1F;
|
||||
uint8_t primId = packet[1];
|
||||
uint16_t dataId = *((uint16_t *)(packet+2));
|
||||
uint32_t data = SPORT_DATA_S32(packet);
|
||||
|
||||
if (primId == DATA_FRAME) {
|
||||
uint8_t instance = physicalId + (origin.rxUid << 5);
|
||||
uint8_t instance = physicalId + (origin << 5);
|
||||
if (dataId == RSSI_ID && isValidIdAndInstance(RSSI_ID, instance)) {
|
||||
telemetryStreaming = TELEMETRY_TIMEOUT10ms; // reset counter only if valid packets are being detected
|
||||
data = SPORT_DATA_U8(packet);
|
||||
|
||||
@@ -158,14 +158,6 @@ void logTelemetryWriteByte(uint8_t data);
|
||||
#define TELEMETRY_ENDPOINT_NONE 0xFF
|
||||
#define TELEMETRY_ENDPOINT_SPORT 0x07
|
||||
|
||||
union TelemetryEndpoint {
|
||||
PACK(struct {
|
||||
uint8_t module:4;
|
||||
uint8_t rxUid:4;
|
||||
});
|
||||
uint8_t value;
|
||||
};
|
||||
|
||||
class OutputTelemetryBuffer {
|
||||
public:
|
||||
OutputTelemetryBuffer()
|
||||
@@ -175,7 +167,7 @@ class OutputTelemetryBuffer {
|
||||
|
||||
void setDestination(uint8_t value)
|
||||
{
|
||||
destination.value = value;
|
||||
destination = value;
|
||||
timeout = 200; /* 2s */
|
||||
}
|
||||
|
||||
@@ -189,14 +181,14 @@ class OutputTelemetryBuffer {
|
||||
|
||||
void reset()
|
||||
{
|
||||
destination.value = TELEMETRY_ENDPOINT_NONE;
|
||||
destination = TELEMETRY_ENDPOINT_NONE;
|
||||
size = 0;
|
||||
timeout = 0;
|
||||
}
|
||||
|
||||
bool isAvailable()
|
||||
{
|
||||
return destination.value == TELEMETRY_ENDPOINT_NONE;
|
||||
return destination == TELEMETRY_ENDPOINT_NONE;
|
||||
}
|
||||
|
||||
void pushByte(uint8_t byte)
|
||||
@@ -237,7 +229,7 @@ class OutputTelemetryBuffer {
|
||||
};
|
||||
uint8_t size;
|
||||
uint8_t timeout;
|
||||
TelemetryEndpoint destination;
|
||||
uint8_t destination;
|
||||
};
|
||||
|
||||
extern OutputTelemetryBuffer outputTelemetryBuffer __DMA;
|
||||
|
||||
Reference in New Issue
Block a user