Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-23 16:25:16 +03:00
Code Issues Wiki Activity

getCapability review (#4238)

Browse source 
* getCapability review

* X7 has haptic too

* Typo

* @bsongis feedback and other cosmetics
This commit is contained in:
3djc 2017-01-15 20:53:05 +01:00 • committed by Bertrand Songis
parent 616eb9206d
commit 81e042971c
1 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

34
companion/src/firmwares/opentx/opentxinterface.cpp
View file

@ -451,7 +451,7 @@ int OpenTxFirmware::getCapability(Capability capability)
else
return id.contains("imperial") ? 1 : 0;
case ModelImage:
return (board == BOARD_TARANIS_X9D || board == BOARD_TARANIS_X9DP || board == BOARD_TARANIS_X9E);
return (board == BOARD_TARANIS_X9D || IS_TARANIS_PLUS(board) || IS_HORUS(board));
case HasBeeper:
return (!IS_ARM(board));
case HasPxxCountry:
@ -518,7 +518,7 @@ int OpenTxFirmware::getCapability(Capability capability)
case Pots:
if (IS_HORUS(board))
return 3;
else if (board == BOARD_TARANIS_X7)
else if (IS_TARANIS_X7(board))
return 2;
else if (IS_TARANIS_X9E(board))
return 4;
@ -529,7 +529,7 @@ int OpenTxFirmware::getCapability(Capability capability)
case Sliders:
if (IS_HORUS(board))
return 4;
else if (board == BOARD_TARANIS_X7)
else if (IS_TARANIS_X7(board))
return 0;
else if (IS_TARANIS_X9E(board))
return 4;
@ -540,7 +540,7 @@ int OpenTxFirmware::getCapability(Capability capability)
case Switches:
if (IS_TARANIS_X9E(board))
return 18;
else if (board == BOARD_TARANIS_X7)
else if (IS_TARANIS_X7(board))
return 6;
else if (IS_HORUS_OR_TARANIS(board))
return 8;
@ -549,6 +549,8 @@ int OpenTxFirmware::getCapability(Capability capability)
case SwitchesPositions:
if (IS_TARANIS_X9E(board))
return 18 * 3;
else if (IS_TARANIS_X7(board))
return 6 * 3;
else if (IS_HORUS_OR_TARANIS(board))
return 8 * 3;
else
@ -594,7 +596,7 @@ int OpenTxFirmware::getCapability(Capability capability)
case SoundPitch:
return 1;
case Haptic:
return (IS_2560(board) || IS_SKY9X(board) || IS_TARANIS_PLUS(board) || id.contains("haptic"));
return (IS_2560(board) || IS_SKY9X(board) || IS_TARANIS_PLUS(board) || IS_TARANIS_X7(board) || IS_TARANIS_X9E(board) || IS_HORUS(board) || id.contains("haptic"));
case ModelTrainerEnable:
if (IS_HORUS_OR_TARANIS(board))
return 1;
@ -637,13 +639,13 @@ int OpenTxFirmware::getCapability(Capability capability)
case TelemetryCustomScreensFieldsPerLine:
return HAS_LARGE_LCD(board) ? 3 : 2;
case NoTelemetryProtocol:
return IS_TARANIS(board) ? 1 : 0;
return IS_HORUS_OR_TARANIS(board) ? 1 : 0;
case TelemetryUnits:
return 0;
case TelemetryMaxMultiplier:
return (IS_ARM(board) ? 32 : 8);
case PPMCenter:
return (IS_TARANIS(board) ? 500 : (id.contains("ppmca") ? 125 : 0));
return (IS_HORUS_OR_TARANIS(board) ? 500 : (id.contains("ppmca") ? 125 : 0));
case PPMUnitMicroseconds:
return id.contains("ppmus") ? 1 : 0;
case SYMLimits:
@ -700,7 +702,7 @@ int OpenTxFirmware::getCapability(Capability capability)
else
return 1;
case GetThrSwitch:
return (IS_TARANIS(board) ? SWITCH_SF1 : SWITCH_THR);
return (IS_HORUS_OR_TARANIS(board) ? SWITCH_SF1 : SWITCH_THR);
case HasDisplayText:
return IS_ARM(board) ? 1 : 0;
case HasTopLcd:
@ -714,11 +716,11 @@ int OpenTxFirmware::getCapability(Capability capability)
case RtcTime:
return IS_ARM(board) || IS_2560(board) ? 1 : 0;
case LuaScripts:
return IS_TARANIS(board) && id.contains("lua") ? 7 : 0;
return IS_HORUS_OR_TARANIS(board) && id.contains("lua") ? 7 : 0;
case LuaInputsPerScript:
return IS_TARANIS(board) ? 10 : 0;
return IS_HORUS_OR_TARANIS(board) ? 10 : 0;
case LuaOutputsPerScript:
return IS_TARANIS(board) ? 6 : 0;
return IS_HORUS_OR_TARANIS(board) ? 6 : 0;
case LimitsPer1000:
case EnhancedCurves:
return IS_ARM(board);
@ -727,9 +729,9 @@ int OpenTxFirmware::getCapability(Capability capability)
case HasMahPersistent:
return (IS_ARM(board) ? true : false);
case MultiposPots:
return IS_TARANIS(board) ? 3 : 0;
return IS_HORUS_OR_TARANIS(board) ? 3 : 0;
case MultiposPotsPositions:
return IS_TARANIS(board) ? 6 : 0;
return IS_HORUS_OR_TARANIS(board) ? 6 : 0;
case SimulatorVariant:
if (board == BOARD_STOCK)
return SIMU_STOCK_VARIANTS;
@ -745,11 +747,11 @@ int OpenTxFirmware::getCapability(Capability capability)
return IS_ARM(board) ? 1 : 0;
case HasInputDiff:
case HasMixerExpo:
return (IS_TARANIS(board) ? true : false);
return (IS_HORUS_OR_TARANIS(board) ? true : false);
case MixersMonitor:
return id.contains("mixersmon") ? 1 : 0;
case HasBatMeterRange:
return (IS_TARANIS(board) ? true : id.contains("battgraph"));
return (IS_HORUS_OR_TARANIS(board) ? true : id.contains("battgraph"));
case DangerousFunctions:
return id.contains("danger") ? 1 : 0;
default:
@ -1046,7 +1048,7 @@ bool OpenTxEepromInterface::checkVariant(unsigned int version, unsigned int vari
std::cout << " wrong variant (" << variant << ")";
return false;
}
else if (board == BOARD_TARANIS_X9E) {
else if (IS_TARANIS_X9E(board)) {
if (variant != TARANIS_X9E_VARIANT) {
std::cout << " wrong variant (" << variant << ")";
return false;