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

Companion import / export issue for switches from X9D+ 2019

Browse source
This commit is contained in:
Bertrand Songis 2019-08-29 17:11:53 +02:00
parent 52624710cd
commit a5d62805c3
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
3 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
companion/src/firmwares/opentx/opentxeeprom.cpp
View file

@ -89,13 +89,18 @@ inline int MAX_SWITCHES_POSITION(Board::Type board, int version)
{ {
if (version < 219) { if (version < 219) {
if (IS_TARANIS_X7(board) || IS_HORUS(board)) if (IS_TARANIS_X7(board) || IS_HORUS(board))
return Boards::getCapability(board, Board::SwitchPositions) - 2*3; return Boards::getCapability(board, Board::SwitchPositions) - 2 * 3;
if (IS_TARANIS_X9D(board))
return 8 * 3;
}
if (IS_TARANIS_X9D(board)) {
return 9 * 3; // all X9D have storage for 9 switches (X9D+ 2019)
} }
return Boards::getCapability(board, Board::SwitchPositions); return Boards::getCapability(board, Board::SwitchPositions);
} }
//#define MAX_SWITCHES_POSITION(board, version) (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

3
radio/src/dataconstants.h
View file

@ -482,7 +482,6 @@ enum SwitchSources {
SWSRC_SR2, SWSRC_SR2,
#endif #endif
#if defined(PCBSKY9X) #if defined(PCBSKY9X)
SWSRC_ID0 = SWSRC_FIRST_SWITCH, SWSRC_ID0 = SWSRC_FIRST_SWITCH,
SWSRC_ID1, SWSRC_ID1,
@ -501,7 +500,7 @@ enum SwitchSources {
#if NUM_XPOTS > 0 #if NUM_XPOTS > 0
SWSRC_FIRST_MULTIPOS_SWITCH, SWSRC_FIRST_MULTIPOS_SWITCH,
SWSRC_LAST_MULTIPOS_SWITCH = SWSRC_FIRST_MULTIPOS_SWITCH + (NUM_POTS * XPOTS_MULTIPOS_COUNT) - 1, SWSRC_LAST_MULTIPOS_SWITCH = SWSRC_FIRST_MULTIPOS_SWITCH + (NUM_XPOTS * XPOTS_MULTIPOS_COUNT) - 1,
#endif #endif
SWSRC_FIRST_TRIM, SWSRC_FIRST_TRIM,

2
radio/src/strhelpers.cpp
View file

@ -293,7 +293,7 @@ char * getSwitchPositionName(char * dest, swsrc_t idx)
} }
#else #else
#define IDX_TRIMS_IN_STR_VSWITCHES (1) #define IDX_TRIMS_IN_STR_VSWITCHES (1)
#define IDX_ON_IN_STR_VSWITCHES (IDX_TRIMS_IN_STR_VSWITCHES+SWSRC_LAST_TRIM-SWSRC_FIRST_TRIM+1) #define IDX_ON_IN_STR_VSWITCHES (IDX_TRIMS_IN_STR_VSWITCHES + SWSRC_LAST_TRIM - SWSRC_FIRST_TRIM + 1)
if (idx <= SWSRC_LAST_SWITCH) { if (idx <= SWSRC_LAST_SWITCH) {
div_t swinfo = switchInfo(idx); div_t swinfo = switchInfo(idx);
s = getSwitchName(s, idx); s = getSwitchName(s, idx);