getCapability review (#4238)
* getCapability review * X7 has haptic too * Typo * @bsongis feedback and other cosmetics
This commit is contained in:
@@ -451,7 +451,7 @@ int OpenTxFirmware::getCapability(Capability capability)
|
|||||||
else
|
else
|
||||||
return id.contains("imperial") ? 1 : 0;
|
return id.contains("imperial") ? 1 : 0;
|
||||||
case ModelImage:
|
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:
|
case HasBeeper:
|
||||||
return (!IS_ARM(board));
|
return (!IS_ARM(board));
|
||||||
case HasPxxCountry:
|
case HasPxxCountry:
|
||||||
@@ -518,7 +518,7 @@ int OpenTxFirmware::getCapability(Capability capability)
|
|||||||
case Pots:
|
case Pots:
|
||||||
if (IS_HORUS(board))
|
if (IS_HORUS(board))
|
||||||
return 3;
|
return 3;
|
||||||
else if (board == BOARD_TARANIS_X7)
|
else if (IS_TARANIS_X7(board))
|
||||||
return 2;
|
return 2;
|
||||||
else if (IS_TARANIS_X9E(board))
|
else if (IS_TARANIS_X9E(board))
|
||||||
return 4;
|
return 4;
|
||||||
@@ -529,7 +529,7 @@ int OpenTxFirmware::getCapability(Capability capability)
|
|||||||
case Sliders:
|
case Sliders:
|
||||||
if (IS_HORUS(board))
|
if (IS_HORUS(board))
|
||||||
return 4;
|
return 4;
|
||||||
else if (board == BOARD_TARANIS_X7)
|
else if (IS_TARANIS_X7(board))
|
||||||
return 0;
|
return 0;
|
||||||
else if (IS_TARANIS_X9E(board))
|
else if (IS_TARANIS_X9E(board))
|
||||||
return 4;
|
return 4;
|
||||||
@@ -540,7 +540,7 @@ int OpenTxFirmware::getCapability(Capability capability)
|
|||||||
case Switches:
|
case Switches:
|
||||||
if (IS_TARANIS_X9E(board))
|
if (IS_TARANIS_X9E(board))
|
||||||
return 18;
|
return 18;
|
||||||
else if (board == BOARD_TARANIS_X7)
|
else if (IS_TARANIS_X7(board))
|
||||||
return 6;
|
return 6;
|
||||||
else if (IS_HORUS_OR_TARANIS(board))
|
else if (IS_HORUS_OR_TARANIS(board))
|
||||||
return 8;
|
return 8;
|
||||||
@@ -549,6 +549,8 @@ int OpenTxFirmware::getCapability(Capability capability)
|
|||||||
case SwitchesPositions:
|
case SwitchesPositions:
|
||||||
if (IS_TARANIS_X9E(board))
|
if (IS_TARANIS_X9E(board))
|
||||||
return 18 * 3;
|
return 18 * 3;
|
||||||
|
else if (IS_TARANIS_X7(board))
|
||||||
|
return 6 * 3;
|
||||||
else if (IS_HORUS_OR_TARANIS(board))
|
else if (IS_HORUS_OR_TARANIS(board))
|
||||||
return 8 * 3;
|
return 8 * 3;
|
||||||
else
|
else
|
||||||
@@ -594,7 +596,7 @@ int OpenTxFirmware::getCapability(Capability capability)
|
|||||||
case SoundPitch:
|
case SoundPitch:
|
||||||
return 1;
|
return 1;
|
||||||
case Haptic:
|
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:
|
case ModelTrainerEnable:
|
||||||
if (IS_HORUS_OR_TARANIS(board))
|
if (IS_HORUS_OR_TARANIS(board))
|
||||||
return 1;
|
return 1;
|
||||||
@@ -637,13 +639,13 @@ int OpenTxFirmware::getCapability(Capability capability)
|
|||||||
case TelemetryCustomScreensFieldsPerLine:
|
case TelemetryCustomScreensFieldsPerLine:
|
||||||
return HAS_LARGE_LCD(board) ? 3 : 2;
|
return HAS_LARGE_LCD(board) ? 3 : 2;
|
||||||
case NoTelemetryProtocol:
|
case NoTelemetryProtocol:
|
||||||
return IS_TARANIS(board) ? 1 : 0;
|
return IS_HORUS_OR_TARANIS(board) ? 1 : 0;
|
||||||
case TelemetryUnits:
|
case TelemetryUnits:
|
||||||
return 0;
|
return 0;
|
||||||
case TelemetryMaxMultiplier:
|
case TelemetryMaxMultiplier:
|
||||||
return (IS_ARM(board) ? 32 : 8);
|
return (IS_ARM(board) ? 32 : 8);
|
||||||
case PPMCenter:
|
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:
|
case PPMUnitMicroseconds:
|
||||||
return id.contains("ppmus") ? 1 : 0;
|
return id.contains("ppmus") ? 1 : 0;
|
||||||
case SYMLimits:
|
case SYMLimits:
|
||||||
@@ -700,7 +702,7 @@ int OpenTxFirmware::getCapability(Capability capability)
|
|||||||
else
|
else
|
||||||
return 1;
|
return 1;
|
||||||
case GetThrSwitch:
|
case GetThrSwitch:
|
||||||
return (IS_TARANIS(board) ? SWITCH_SF1 : SWITCH_THR);
|
return (IS_HORUS_OR_TARANIS(board) ? SWITCH_SF1 : SWITCH_THR);
|
||||||
case HasDisplayText:
|
case HasDisplayText:
|
||||||
return IS_ARM(board) ? 1 : 0;
|
return IS_ARM(board) ? 1 : 0;
|
||||||
case HasTopLcd:
|
case HasTopLcd:
|
||||||
@@ -714,11 +716,11 @@ int OpenTxFirmware::getCapability(Capability capability)
|
|||||||
case RtcTime:
|
case RtcTime:
|
||||||
return IS_ARM(board) || IS_2560(board) ? 1 : 0;
|
return IS_ARM(board) || IS_2560(board) ? 1 : 0;
|
||||||
case LuaScripts:
|
case LuaScripts:
|
||||||
return IS_TARANIS(board) && id.contains("lua") ? 7 : 0;
|
return IS_HORUS_OR_TARANIS(board) && id.contains("lua") ? 7 : 0;
|
||||||
case LuaInputsPerScript:
|
case LuaInputsPerScript:
|
||||||
return IS_TARANIS(board) ? 10 : 0;
|
return IS_HORUS_OR_TARANIS(board) ? 10 : 0;
|
||||||
case LuaOutputsPerScript:
|
case LuaOutputsPerScript:
|
||||||
return IS_TARANIS(board) ? 6 : 0;
|
return IS_HORUS_OR_TARANIS(board) ? 6 : 0;
|
||||||
case LimitsPer1000:
|
case LimitsPer1000:
|
||||||
case EnhancedCurves:
|
case EnhancedCurves:
|
||||||
return IS_ARM(board);
|
return IS_ARM(board);
|
||||||
@@ -727,9 +729,9 @@ int OpenTxFirmware::getCapability(Capability capability)
|
|||||||
case HasMahPersistent:
|
case HasMahPersistent:
|
||||||
return (IS_ARM(board) ? true : false);
|
return (IS_ARM(board) ? true : false);
|
||||||
case MultiposPots:
|
case MultiposPots:
|
||||||
return IS_TARANIS(board) ? 3 : 0;
|
return IS_HORUS_OR_TARANIS(board) ? 3 : 0;
|
||||||
case MultiposPotsPositions:
|
case MultiposPotsPositions:
|
||||||
return IS_TARANIS(board) ? 6 : 0;
|
return IS_HORUS_OR_TARANIS(board) ? 6 : 0;
|
||||||
case SimulatorVariant:
|
case SimulatorVariant:
|
||||||
if (board == BOARD_STOCK)
|
if (board == BOARD_STOCK)
|
||||||
return SIMU_STOCK_VARIANTS;
|
return SIMU_STOCK_VARIANTS;
|
||||||
@@ -745,11 +747,11 @@ int OpenTxFirmware::getCapability(Capability capability)
|
|||||||
return IS_ARM(board) ? 1 : 0;
|
return IS_ARM(board) ? 1 : 0;
|
||||||
case HasInputDiff:
|
case HasInputDiff:
|
||||||
case HasMixerExpo:
|
case HasMixerExpo:
|
||||||
return (IS_TARANIS(board) ? true : false);
|
return (IS_HORUS_OR_TARANIS(board) ? true : false);
|
||||||
case MixersMonitor:
|
case MixersMonitor:
|
||||||
return id.contains("mixersmon") ? 1 : 0;
|
return id.contains("mixersmon") ? 1 : 0;
|
||||||
case HasBatMeterRange:
|
case HasBatMeterRange:
|
||||||
return (IS_TARANIS(board) ? true : id.contains("battgraph"));
|
return (IS_HORUS_OR_TARANIS(board) ? true : id.contains("battgraph"));
|
||||||
case DangerousFunctions:
|
case DangerousFunctions:
|
||||||
return id.contains("danger") ? 1 : 0;
|
return id.contains("danger") ? 1 : 0;
|
||||||
default:
|
default:
|
||||||
@@ -1046,7 +1048,7 @@ bool OpenTxEepromInterface::checkVariant(unsigned int version, unsigned int vari
|
|||||||
std::cout << " wrong variant (" << variant << ")";
|
std::cout << " wrong variant (" << variant << ")";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (board == BOARD_TARANIS_X9E) {
|
else if (IS_TARANIS_X9E(board)) {
|
||||||
if (variant != TARANIS_X9E_VARIANT) {
|
if (variant != TARANIS_X9E_VARIANT) {
|
||||||
std::cout << " wrong variant (" << variant << ")";
|
std::cout << " wrong variant (" << variant << ")";
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
Reference in New Issue
Block a user