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

R9M Access Fixes

Browse Source
This commit is contained in:
Bertrand Songis
2019-06-12 14:06:11 +02:00
parent 74cd67fa35
commit f888b83add
8 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/pulses/modules_helpers.h
+3 -3
View File
@@ -108,7 +108,7 @@ inline bool isModuleR9M(uint8_t idx)
return g_model.moduleData[idx].type == MODULE_TYPE_R9M_PXX1 || g_model.moduleData[idx].type == MODULE_TYPE_R9M_LITE_PXX1;
}
inline bool isModuleR9M2(uint8_t idx)
inline bool isModuleR9MAccess(uint8_t idx)
{
return g_model.moduleData[idx].type == MODULE_TYPE_R9M_PXX2 || g_model.moduleData[idx].type == MODULE_TYPE_R9M_LITE_PXX2 || g_model.moduleData[idx].type == MODULE_TYPE_R9M_LITE_PRO_PXX2;
}
@@ -146,7 +146,7 @@ inline bool isModulePXX(uint8_t idx)
inline bool isModulePXX2(uint8_t idx)
{
return isModuleXJT2(idx) || isModuleR9M2(idx);
return isModuleXJT2(idx) || isModuleR9MAccess(idx);
}
inline bool isModuleRFAccess(uint8_t idx)
@@ -154,7 +154,7 @@ inline bool isModuleRFAccess(uint8_t idx)
if (isModuleXJT2(idx)) {
return g_model.moduleData[idx].subType == MODULE_SUBTYPE_ISRM_PXX2_ACCESS;
}
else if (isModuleR9M2(idx)) {
else if (isModuleR9MAccess(idx)) {
return true;
}
else {
radio/src/pulses/pxx2.cpp
+6 -1
View File
@@ -263,7 +263,12 @@ void Pxx2Pulses::setupAccessBindFrame(uint8_t module)
for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
Pxx2Transport::addByte(destination->candidateReceiversNames[destination->selectedReceiverIndex][i]);
}
Pxx2Transport::addByte((destination->lbtMode << 6) + (destination->flexMode << 4) + destination->rxUid); // RX_UID is the slot index (which is unique and never moved)
if (isModuleR9MAccess(module)) {
Pxx2Transport::addByte((destination->lbtMode << 6) + (destination->flexMode << 4) + destination->rxUid); // RX_UID is the slot index (which is unique and never moved)
}
else {
Pxx2Transport::addByte(0x00);
}
Pxx2Transport::addByte(g_model.header.modelId[module]);
}
else {