Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

[V10] Fixes

Browse source
This commit is contained in:
Bertrand Songis 2025-02-28 17:29:23 +01:00
parent fe18f5a17f
commit 9cccae08d4
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
35 changed files with 608 additions and 275 deletions
Download patch file Download diff file Expand all files Collapse all files

15
radio/src/strhelpers.cpp
View file

@ -297,7 +297,7 @@ char * getSwitchName(char * dest, swsrc_t idx)
}
else
*dest++ = 'A' + swinfo.quot;
#elif defined(PCBX7) && !defined(RADIO_TX12) && !defined(RADIO_ZORRO) && !defined(RADIO_FAMILY_TBS) && !defined(RADIO_V10)
#elif defined(PCBX7) && !defined(RADIO_TX12) && !defined(RADIO_ZORRO) && !defined(RADIO_FAMILY_TBS)
if (swinfo.quot >= 5)
*dest++ = 'H' + swinfo.quot - 5;
else if (swinfo.quot == 4)
@ -348,6 +348,19 @@ char * getSwitchPositionName(char * dest, swsrc_t idx)
}
#endif // PCBSKY9X
#if FUNCTION_SWITCHES > 0
else if (idx <= SWSRC_LAST_FUNCTION_SWITCH) {
idx -= SWSRC_FIRST_FUNCTION_SWITCH;
if (ZEXIST(g_model.switchNames[idx])) {
zchar2str(dest, g_model.switchNames[idx], LEN_SWITCH_NAME);
dest[LEN_SWITCH_NAME] = '\0';
}
else {
getStringAtIndex(dest, STR_VSRCRAW, idx + MIXSRC_FIRST_FS_SWITCH - MIXSRC_Rud + 1);
}
}
#endif
#if NUM_XPOTS > 0
else if (idx <= SWSRC_LAST_MULTIPOS_SWITCH) {
div_t swinfo = div(int(idx - SWSRC_FIRST_MULTIPOS_SWITCH), XPOTS_MULTIPOS_COUNT);