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

Fixed module data type export (#6919)

Browse Source 
Fixed module data type export
This commit is contained in:
Raphael Coeffic
2019-10-10 15:33:48 +02:00
committed by Bertrand Songis
parent 54bb04f049
commit a5e7279c57
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/opentx/opentxeeprom.cpp
+9 -11
View File
@@ -2052,7 +2052,6 @@ class ModuleUnionField: public UnionField<unsigned int> {
void beforeExport() override
{
module.rfProtocol = module.multi.rfProtocol & 0xf;
rfProtExtra = (module.multi.rfProtocol >> 4) & 0x03;
}
@@ -2091,13 +2090,6 @@ class ModuleUnionField: public UnionField<unsigned int> {
attr==PULSES_PXX_R9M_LITE;
}
void beforeExport() override
{
if (module.protocol >= PULSES_PXX_XJT_X16 && module.protocol <= PULSES_PXX_XJT_LR12) {
module.subType = module.protocol - PULSES_PXX_XJT_X16;
}
}
void afterImport() override
{
if (module.protocol == PULSES_PXX_XJT_X16) {
@@ -2136,9 +2128,6 @@ class ModuleUnionField: public UnionField<unsigned int> {
void beforeExport() override
{
if (module.protocol == PULSES_ACCST_ISRM_D16 || module.protocol == PULSES_ACCESS_ISRM) {
module.subType = module.protocol - PULSES_ACCESS_ISRM;
}
for (int i=0; i<PXX2_MAX_RECEIVERS_PER_MODULE; i++) {
for (int pos=0; pos<PXX2_LEN_RX_NAME+1; pos++) {
@@ -2215,6 +2204,15 @@ class ModuleField: public TransformedField {
if (module.protocol >= PULSES_LP45 && module.protocol <= PULSES_DSMX) {
module.rfProtocol = module.protocol - PULSES_LP45;
}
else if (module.protocol == PULSES_ACCST_ISRM_D16 || module.protocol == PULSES_ACCESS_ISRM) {
module.subType = module.protocol - PULSES_ACCESS_ISRM;
}
else if (module.protocol >= PULSES_PXX_XJT_X16 && module.protocol <= PULSES_PXX_XJT_LR12) {
module.subType = module.protocol - PULSES_PXX_XJT_X16;
}
else if (module.protocol == PULSES_MULTIMODULE) {
module.rfProtocol = module.multi.rfProtocol & 0xf;
}
}
void afterImport() override