piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6623 from opentx/raphaelcoeffic/fix-x10-inputs

Browse Source 
X10: fixed optional inputs
This commit is contained in:
Bertrand Songis
2019-08-16 10:27:08 +02:00
committed by GitHub
parent b211b70136 6373daa319
commit 6f37caa8d4
8 changed files with 75 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/gui_common.cpp
+7 -2
View File
@@ -180,7 +180,7 @@ bool isSourceAvailable(int source)
}
#if defined(PCBX10)
if ((source>=MIXSRC_S3 && source<=MIXSRC_S4) || (source>=MIXSRC_MOUSE1 && source<=MIXSRC_MOUSE2))
if (source>=MIXSRC_MOUSE1 && source<=MIXSRC_MOUSE2)
return false;
#endif
@@ -253,7 +253,12 @@ bool isInputSourceAvailable(int source)
return true;
#endif
if (source >= MIXSRC_Rud && source <= MIXSRC_MAX)
#if defined(PCBX10)
if (source >= MIXSRC_MOUSE1 && source <= MIXSRC_MOUSE2)
return false;
#endif
if (source >= MIXSRC_Rud && source < MIXSRC_MAX)
return true;
if (source >= MIXSRC_FIRST_TRIM && source <= MIXSRC_LAST_TRIM)