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

R9M ACCESS / ACCST refactoring

Browse Source
This commit is contained in:
Bertrand Songis
2019-05-28 11:00:12 +02:00
parent 15c65a6c91
commit d8dbe5abda
9 changed files with 32 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/pulses/modules_constants.h
+1 -1
View File
@@ -37,7 +37,7 @@ enum ModuleSubtypeR9M_PXX2 {
MODULE_SUBTYPE_R9M_PXX2_ACCESS,
MODULE_SUBTYPE_R9M_PXX2_FCC,
MODULE_SUBTYPE_R9M_PXX2_EU,
#if defined(MODULE_R9M_FLEX)
#if defined(R9M_PROTO_FLEX)
MODULE_SUBTYPE_R9M_PXX2_FLEX,
#endif
MODULE_SUBTYPE_R9M_PXX2_COUNT,
radio/src/pulses/modules_helpers.h
+1 -1
View File
@@ -155,7 +155,7 @@ inline bool isModuleRFAccess(uint8_t idx)
return g_model.moduleData[idx].subType == MODULE_SUBTYPE_ISRM_PXX2_ACCESS;
}
else if (isModuleR9M2(idx)) {
return g_model.moduleData[idx].subType == MODULE_SUBTYPE_R9M_PXX2_ACCESS;
return true;
}
else {
return false;
radio/src/pulses/pxx2.cpp
+4 -7
View File
@@ -227,10 +227,7 @@ void Pxx2Pulses::setupAccstBindFrame(uint8_t module)
for (uint8_t i=0; i<PXX2_LEN_RX_NAME; i++) {
Pxx2Transport::addByte(0x00);
}
if (g_model.moduleData[module].type == MODULE_TYPE_PXX2_ISRM)
Pxx2Transport::addByte((g_model.moduleData[module].pxx.receiver_telem_off << 7) + (g_model.moduleData[module].pxx.receiver_telem_off << 6));
else
Pxx2Transport::addByte(0x00);
Pxx2Transport::addByte((g_model.moduleData[module].pxx.receiver_telem_off << 7) + (g_model.moduleData[module].pxx.receiver_telem_off << 6));
Pxx2Transport::addByte(g_model.header.modelId[module]);
}
@@ -357,10 +354,10 @@ void Pxx2Pulses::setupFrame(uint8_t module)
setupRegisterFrame(module);
break;
case MODULE_MODE_BIND:
if (g_model.moduleData[module].subType == MODULE_SUBTYPE_ISRM_PXX2_ACCESS || g_model.moduleData[module].subType == MODULE_SUBTYPE_R9M_PXX2_ACCESS)
setupAccessBindFrame(module);
else
if (g_model.moduleData[module].type == MODULE_TYPE_PXX2_ISRM && g_model.moduleData[module].subType != MODULE_SUBTYPE_ISRM_PXX2_ACCESS)
setupAccstBindFrame(module);
else
setupAccessBindFrame(module);
break;
case MODULE_MODE_RESET:
setupResetFrame(module);