From fd4e03c5657f880cae9b29a2b254ff875717f937 Mon Sep 17 00:00:00 2001 From: Kilrah Date: Fri, 27 Apr 2018 12:46:06 +0200 Subject: [PATCH] Correct switch support --- radio/src/gui/128x64/radio_hardware.cpp | 2 +- radio/src/logs.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/128x64/radio_hardware.cpp b/radio/src/gui/128x64/radio_hardware.cpp index a78feb7a7..d261abaa9 100644 --- a/radio/src/gui/128x64/radio_hardware.cpp +++ b/radio/src/gui/128x64/radio_hardware.cpp @@ -141,7 +141,7 @@ enum MenuRadioHardwareItems { #define BLUETOOTH_ROWS #endif #if defined(PCBXLITE) -#define SWITCH_TYPE_MAX(sw) ((MIXSRC_SC-MIXSRC_FIRST_SWITCH == sw || MIXSRC_SD-MIXSRC_FIRST_SWITCH == sw) ? SWITCH_2POS : SWITCH_3POS) +#define SWITCH_TYPE_MAX(sw) (SWITCH_3POS) #else #define SWITCH_TYPE_MAX(sw) ((MIXSRC_SF-MIXSRC_FIRST_SWITCH == sw || MIXSRC_SH-MIXSRC_FIRST_SWITCH == sw) ? SWITCH_2POS : SWITCH_3POS) #endif diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp index cdf7d7532..5a294e5c8 100644 --- a/radio/src/logs.cpp +++ b/radio/src/logs.cpp @@ -351,8 +351,8 @@ void logsWrite() f_printf(&g_oLogFile, "%d,%d,%d,%d,0x%08X%08X,", GET_3POS_STATE(SA), GET_3POS_STATE(SB), - GET_2POS_STATE(SC), - GET_2POS_STATE(SD), + GET_3POS_STATE(SC), + GET_3POS_STATE(SD), getLogicalSwitchesStates(32), getLogicalSwitchesStates(0)); #elif defined(PCBX7)