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

Merge pull request #8142 from opentx/dgatf/del_rea_switch

Browse source 
Delete REa switch from SKY9X
This commit is contained in:
Bertrand Songis 2020-12-09 18:17:18 +01:00 • committed by GitHub
commit b51b9ae02b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/dataconstants.h
View file

@ -543,10 +543,6 @@ enum SwitchSources {
SWSRC_TrimT6Up,
#endif
#if defined(PCBSKY9X)
SWSRC_REa,
#endif
SWSRC_FIRST_LOGICAL_SWITCH,
SWSRC_SW1 = SWSRC_FIRST_LOGICAL_SWITCH,
SWSRC_SW2,

6
radio/src/gui/gui_common.cpp
View file

@ -342,12 +342,6 @@ bool isSwitchAvailable(int swtch, SwitchContext context)
}
#endif
#if defined(PCBSKY9X) && defined(REVX)
if (swtch == SWSRC_REa) {
return false;
}
#endif
if (swtch >= SWSRC_FIRST_LOGICAL_SWITCH && swtch <= SWSRC_LAST_LOGICAL_SWITCH) {
if (context == GeneralCustomFunctionsContext) {
return false;

7
radio/src/strhelpers.cpp
View file

@ -351,16 +351,9 @@ char * getSwitchPositionName(char * dest, swsrc_t idx)
}
#endif
#if defined(PCBSKY9X)
else if (idx <= SWSRC_REa) {
getStringAtIndex(s, STR_VSWITCHES, IDX_TRIMS_IN_STR_VSWITCHES+idx-SWSRC_FIRST_TRIM);
}
#else
else if (idx <= SWSRC_LAST_TRIM) {
getStringAtIndex(s, STR_VSWITCHES, IDX_TRIMS_IN_STR_VSWITCHES+idx-SWSRC_FIRST_TRIM);
}
#endif
else if (idx <= SWSRC_LAST_LOGICAL_SWITCH) {
*s++ = 'L';
strAppendUnsigned(s, idx-SWSRC_FIRST_LOGICAL_SWITCH+1, 2);