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

ACCESS started in Companion

Browse Source
This commit is contained in:
Bertrand Songis
2019-05-10 23:21:06 +02:00
parent e77b096463
commit 8ccc354a88
3 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/moduledata.cpp
+7 -3
View File
@@ -101,10 +101,14 @@ QString ModuleData::protocolToString(unsigned protocol)
"LP45", "DSM2", "DSMX",
"PPM16", "PPMsim",
"FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT",
"Crossfire",
"TBS Crossfire",
"DIY Multiprotocol Module",
"FrSky R9M Module",
"SBUS output at VBat"
"FrSky PXX R9M",
"SBUS output at VBat",
"FrSky ACCESS ISRM",
"FrSky ACCESS R9M",
"FrSky ACCESS R9M Lite",
"FrSky ACCESS R9M Lite Pro"
};
return CHECK_IN_ARRAY(strings, protocol);
companion/src/firmwares/moduledata.h
+4
View File
@@ -48,6 +48,10 @@ enum PulsesProtocol {
PULSES_MULTIMODULE,
PULSES_PXX_R9M,
PULSES_SBUS,
PULSES_ACCESS_ISRM,
PULSES_ACCESS_R9M,
PULSES_ACCESS_R9M_LITE,
PULSES_ACCESS_R9M_LITE_PRO,
PULSES_PROTOCOL_LAST
};
companion/src/firmwares/opentx/opentxinterface.cpp
+13 -6
View File
@@ -751,26 +751,30 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
case 0:
switch (proto) {
case PULSES_OFF:
return 1;
case PULSES_PXX_XJT_X16:
case PULSES_PXX_XJT_LR12:
return 1;
return (IS_TARANIS_XLITES(board) || IS_TARANIS_X3(board)) ? 0 : 1;
case PULSES_PXX_XJT_D8:
return id.contains("eu") ? 0 : 1;
return (IS_TARANIS_XLITES(board) || IS_TARANIS_X3(board) || id.contains("eu")) ? 0 : 1;
case PULSES_PPM:
return id.contains("internalppm") ? 1 : 0;
case PULSES_ACCESS_ISRM:
return (IS_TARANIS_XLITES(board) || IS_TARANIS_X3(board)) ? 1 : 0;
default:
return 0;
}
break;
case 1:
switch (proto) {
case PULSES_OFF:
case PULSES_PPM:
return 1;
case PULSES_PXX_XJT_X16:
case PULSES_PXX_XJT_D8:
case PULSES_PXX_XJT_LR12:
return (IS_TARANIS_XLITES(board) || IS_TARANIS_X3(board)) ? 0 : 1;
case PULSES_PXX_R9M:
//case PULSES_PXX_DJT: // Unavailable for now
case PULSES_LP45:
case PULSES_DSM2:
case PULSES_DSMX:
@@ -779,10 +783,13 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
return 1;
case PULSES_MULTIMODULE:
return id.contains("multimodule") ? 1 : 0;
case PULSES_ACCESS_R9M_LITE:
case PULSES_ACCESS_R9M_LITE_PRO:
return (IS_TARANIS_XLITES(board) || IS_TARANIS_X3(board)) ? 1 : 0;
default:
return 0;
}
break;
case -1:
switch (proto) {
case PULSES_PPM:
@@ -790,7 +797,7 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
default:
return 0;
}
break;
default:
return 0;
}