X10: fixed optional inputs

fixed X10 conversion (MOUSE1 & 2 removed)

renamed GMBL & GMBR to SI and SJ
This commit is contained in:
Raphael Coeffic
2019-08-13 11:10:39 +02:00
parent d014ba424f
commit 6373daa319
8 changed files with 75 additions and 68 deletions
@@ -54,7 +54,7 @@ int convertSource_218_to_219(int source)
#endif
#if defined(PCBHORUS)
if (source >= MIXSRC_GMBL)
if (source >= MIXSRC_SI)
source += 2;
#endif
@@ -88,7 +88,7 @@ int convertSwitch_218_to_219(int swtch)
#endif
#if defined(PCBHORUS)
if (swtch >= SWSRC_GMBL0)
if (swtch >= SWSRC_SI0)
swtch += 2 * 3;
if (swtch >= SWSRC_FIRST_MULTIPOS_SWITCH + 3 * XPOTS_MULTIPOS_COUNT)
swtch += 2 * XPOTS_MULTIPOS_COUNT;