1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-14 11:59:50 +03:00

Merge against latest 2.3

This commit is contained in:
Bertrand Songis 2019-09-17 13:28:42 +02:00
commit 9e83c5d10f
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
247 changed files with 35085 additions and 42445 deletions

View file

@ -328,7 +328,7 @@ char * getSwitchPositionName(char * dest, swsrc_t idx)
}
#else
#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) {
div_t swinfo = switchInfo(idx);
s = getSwitchName(s, idx);