From 4e576efdd74cd8cdcab924ed91c94f6966cfe9c6 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 31 Aug 2016 19:48:17 +0200 Subject: [PATCH] =?UTF-8?q?[Horus]=C2=A0Pots=20/=20Sliders=20default=20con?= =?UTF-8?q?fig=20was=20wrong.=20Is=20it=20better=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- radio/src/datastructs.h | 4 ++-- radio/src/gui/480x272/radio_hardware.cpp | 4 ++++ radio/src/opentx.cpp | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/radio/src/datastructs.h b/radio/src/datastructs.h index 0f11b3637..627a495ed 100644 --- a/radio/src/datastructs.h +++ b/radio/src/datastructs.h @@ -876,8 +876,8 @@ PACK(struct TrainerData { #if defined(PCBHORUS) #define EXTRA_GENERAL_FIELDS \ EXTRA_GENERAL_FIELDS_ARM \ - NOBACKUP(uint8_t serial2Mode:6); \ - uint8_t slidersConfig:2; \ + NOBACKUP(uint8_t serial2Mode:4); \ + uint8_t slidersConfig:4; \ uint32_t switchConfig; \ uint8_t potsConfig; /* two bits per pot */ \ NOBACKUP(char switchNames[NUM_SWITCHES][LEN_SWITCH_NAME]); \ diff --git a/radio/src/gui/480x272/radio_hardware.cpp b/radio/src/gui/480x272/radio_hardware.cpp index 5f808c593..1b4a2808d 100644 --- a/radio/src/gui/480x272/radio_hardware.cpp +++ b/radio/src/gui/480x272/radio_hardware.cpp @@ -83,6 +83,7 @@ bool menuRadioHardware(event_t event) case ITEM_RADIO_HARDWARE_LABEL_STICKS: lcdDrawText(MENUS_MARGIN_LEFT, y, STR_STICKS); break; + case ITEM_RADIO_HARDWARE_STICK1: case ITEM_RADIO_HARDWARE_STICK2: case ITEM_RADIO_HARDWARE_STICK3: @@ -96,6 +97,7 @@ bool menuRadioHardware(event_t event) lcdDrawTextAtIndex(HW_SETTINGS_COLUMN, y, STR_MMMINV, 0, 0); break; } + case ITEM_RADIO_HARDWARE_LS: case ITEM_RADIO_HARDWARE_RS: case ITEM_RADIO_HARDWARE_LS2: @@ -114,9 +116,11 @@ bool menuRadioHardware(event_t event) g_eeGeneral.slidersConfig |= (potType << idx); break; } + case ITEM_RADIO_HARDWARE_LABEL_POTS: lcdDrawText(MENUS_MARGIN_LEFT, y, STR_POTS); break; + case ITEM_RADIO_HARDWARE_POT1: case ITEM_RADIO_HARDWARE_POT2: case ITEM_RADIO_HARDWARE_POT3: diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index bf8c9ca00..6d70ff2d8 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -239,8 +239,8 @@ void generalDefault() g_eeGeneral.vBatMin = -60; // 0 is 9.0V g_eeGeneral.vBatMax = -78; // 0 is 12.0V #elif defined(PCBHORUS) - g_eeGeneral.potsConfig = 0x05; // S1 and S2 = pots with detent - g_eeGeneral.slidersConfig = 0x03; // LS and RS = sliders with detent + g_eeGeneral.potsConfig = 0x19; // S1 and S2 = pots with detent + g_eeGeneral.slidersConfig = 0x0f; // 4 sliders g_eeGeneral.blOffBright = 20; #elif defined(PCBTARANIS) g_eeGeneral.potsConfig = 0x05; // S1 and S2 = pots with detent