piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Model Setup refactoring

Browse Source
This commit is contained in:
Bertrand Songis
2019-04-03 11:27:43 +02:00
parent 46dc85aa7e
commit 1d5b780c2f
12 changed files with 134 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/pulses/pxx2.cpp
+4 -4
View File
@@ -122,7 +122,7 @@ void Pxx2Pulses::setupChannelsFrame(uint8_t module)
void Pxx2Pulses::setupTelemetryFrame(uint8_t module)
{
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_TELEMETRY);
Pxx2Transport::addByte(outputTelemetryBuffer.destination.rxUid);
Pxx2Transport::addByte(outputTelemetryBuffer.destination & 0x03);
for (uint8_t i = 0; i < sizeof(SportTelemetryPacket); i++) {
Pxx2Transport::addByte(outputTelemetryBuffer.data[i]);
}
@@ -234,7 +234,7 @@ void Pxx2Pulses::setupBindFrame(uint8_t module)
for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.bindCandidateReceiversNames[reusableBuffer.moduleSetup.pxx2.bindSelectedReceiverIndex][i]);
}
Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.bindReceiverId); // RX_UID is the slot index (which is unique and never moved)
Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.bindReceiverIndex); // RX_UID is the slot index (which is unique and never moved)
Pxx2Transport::addByte(g_model.header.modelId[module]);
}
else {
@@ -280,7 +280,7 @@ void Pxx2Pulses::setupPowerMeter(uint8_t module)
void Pxx2Pulses::setupShareMode(uint8_t module)
{
addFrameType(PXX2_TYPE_C_MODULE, PXX2_TYPE_ID_SHARE);
Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.shareReceiverId);
Pxx2Transport::addByte(reusableBuffer.moduleSetup.pxx2.shareReceiverIndex);
}
void Pxx2Pulses::setupFrame(uint8_t module)
@@ -313,7 +313,7 @@ void Pxx2Pulses::setupFrame(uint8_t module)
setupShareMode(module);
break;
default:
if (outputTelemetryBuffer.destination.module == module) {
if (outputTelemetryBuffer.destination == module) {
setupTelemetryFrame(module);
outputTelemetryBuffer.reset();
}