Merge branch '2.3.0' into 2.3

This commit is contained in:
Kilrah
2019-09-24 09:39:33 +02:00
34 changed files with 135 additions and 87 deletions
+2 -2
View File
@@ -341,8 +341,8 @@ getvalue_t getValue(mixsrc_t i)
}
#if defined(PCBTARANIS) || defined(PCBHORUS)
else if ((i >= MIXSRC_FIRST_SWITCH) && (i <= MIXSRC_LAST_SWITCH)) {
mixsrc_t sw = i-MIXSRC_FIRST_SWITCH;
else if (i >= MIXSRC_FIRST_SWITCH && i <= MIXSRC_LAST_SWITCH) {
mixsrc_t sw = i - MIXSRC_FIRST_SWITCH;
if (SWITCH_EXISTS(sw)) {
return (switchState(3*sw) ? -1024 : (IS_CONFIG_3POS(sw) && switchState(3*sw+1) ? 0 : 1024));
}