Fix T12 companion import (#6764)

Fix switches
This commit is contained in:
3djc
2019-09-13 13:59:10 +02:00
committed by Bertrand Songis
parent 206cbd9ec1
commit 0d722f0b3e
+23 -24
View File
@@ -33,17 +33,34 @@ using namespace Board;
inline int MAX_SWITCHES(Board::Type board, int version) inline int MAX_SWITCHES(Board::Type board, int version)
{ {
if (version <= 218 && IS_TARANIS_X7(board)) if (version <= 218) {
return 6; if (IS_TARANIS_X7(board))
if (version <= 218 && (IS_TARANIS_X9D(board) || IS_HORUS(board))) return 6;
return 8; if (IS_TARANIS_X9D(board) || IS_HORUS(board))
if (version <= 218 && (IS_TARANIS_XLITE(board))) return 8;
return 4; if (IS_TARANIS_XLITE(board))
return 4;
}
if (IS_TARANIS_X9D(board)) if (IS_TARANIS_X9D(board))
return 9; return 9;
if (IS_JUMPER_T12(board))
return 8;
return Boards::getCapability(board, Board::Switches); return Boards::getCapability(board, Board::Switches);
} }
inline int MAX_SWITCHES_POSITION(Board::Type board, int version)
{
if (IS_HORUS_OR_TARANIS(board)) {
return MAX_SWITCHES(board, version) * 3;
}
else {
return Boards::getCapability(board, Board::SwitchPositions);
}
}
inline int POTS_CONFIG_SIZE(Board::Type board, int version) inline int POTS_CONFIG_SIZE(Board::Type board, int version)
{ {
if (version >= 219 && IS_HORUS(board)) if (version >= 219 && IS_HORUS(board))
@@ -111,24 +128,6 @@ inline int SWITCHES_CONFIG_SIZE(Board::Type board, int version)
return 16; return 16;
} }
inline int MAX_SWITCHES_POSITION(Board::Type board, int version)
{
if (version < 219) {
if (IS_TARANIS_X7(board) || IS_HORUS(board))
return Boards::getCapability(board, Board::SwitchPositions) - 2 * 3;
if (IS_TARANIS_X9D(board))
return 8 * 3;
if (IS_TARANIS_XLITE(board))
return 4 * 3;
}
if (IS_TARANIS_X9D(board)) {
return 9 * 3; // all X9D have storage for 9 switches (X9D+ 2019)
}
return Boards::getCapability(board, Board::SwitchPositions);
}
#define MAX_ROTARY_ENCODERS(board) (IS_SKY9X(board) ? 1 : 0) #define MAX_ROTARY_ENCODERS(board) (IS_SKY9X(board) ? 1 : 0)
#define MAX_FLIGHT_MODES(board, version) 9 #define MAX_FLIGHT_MODES(board, version) 9
#define MAX_TIMERS(board, version) 3 #define MAX_TIMERS(board, version) 3