From 3b5e5ebfa30edd0cd3736029c7974a858c0b14f4 Mon Sep 17 00:00:00 2001 From: 3djc Date: Sat, 10 Sep 2016 19:31:18 +0200 Subject: [PATCH] The 4 sliders are now treated equally :) WARNING : -you WILL need to go in hardware menu to add the 2 missing sliders . definition - you also NEED to go to calibration (where you will now see the 4 sliders) --- radio/src/gui/212x64/radio_hardware.cpp | 14 +++++++------- radio/src/opentx.h | 7 ++----- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/radio/src/gui/212x64/radio_hardware.cpp b/radio/src/gui/212x64/radio_hardware.cpp index f6dd41b0a..cab76d3d0 100644 --- a/radio/src/gui/212x64/radio_hardware.cpp +++ b/radio/src/gui/212x64/radio_hardware.cpp @@ -2,7 +2,7 @@ * Copyright (C) OpenTX * * Based on code named - * th9x - http://code.google.com/p/th9x + * th9x - http://code.google.com/p/th9x * er9x - http://code.google.com/p/er9x * gruvin9x - http://code.google.com/p/gruvin9x * @@ -103,8 +103,6 @@ void menuRadioHardware(event_t event) case ITEM_RADIO_HARDWARE_STICK2: case ITEM_RADIO_HARDWARE_STICK3: case ITEM_RADIO_HARDWARE_STICK4: - case ITEM_RADIO_HARDWARE_LS: - case ITEM_RADIO_HARDWARE_RS: { int idx = (k<=ITEM_RADIO_HARDWARE_STICK4 ? k-ITEM_RADIO_HARDWARE_STICK1 : k-ITEM_RADIO_HARDWARE_LS+MIXSRC_SLIDER1-MIXSRC_Rud); lcdDrawTextAtIndex(INDENT_WIDTH, y, STR_VSRCRAW, idx+1, 0); @@ -115,14 +113,16 @@ void menuRadioHardware(event_t event) break; } #if defined(PCBX9E) + case ITEM_RADIO_HARDWARE_LS: + case ITEM_RADIO_HARDWARE_RS: case ITEM_RADIO_HARDWARE_LS2: case ITEM_RADIO_HARDWARE_RS2: { - int idx = k - ITEM_RADIO_HARDWARE_LS2; + int idx = k - ITEM_RADIO_HARDWARE_LS; uint8_t mask = (0x01 << idx); - lcdDrawTextAtIndex(INDENT_WIDTH, y, STR_VSRCRAW, NUM_STICKS+NUM_XPOTS+2+idx+1, menuHorizontalPosition < 0 ? attr : 0); - if (ZEXIST(g_eeGeneral.anaNames[NUM_STICKS+NUM_XPOTS+2+idx]) || (attr && menuHorizontalPosition == 0)) - editName(HW_SETTINGS_COLUMN, y, g_eeGeneral.anaNames[NUM_STICKS+NUM_XPOTS+2+idx], LEN_ANA_NAME, event, attr && menuHorizontalPosition == 0); + lcdDrawTextAtIndex(INDENT_WIDTH, y, STR_VSRCRAW, NUM_STICKS+NUM_XPOTS+idx+1, menuHorizontalPosition < 0 ? attr : 0); + if (ZEXIST(g_eeGeneral.anaNames[NUM_STICKS+NUM_XPOTS+idx]) || (attr && menuHorizontalPosition == 0)) + editName(HW_SETTINGS_COLUMN, y, g_eeGeneral.anaNames[NUM_STICKS+NUM_XPOTS+idx], LEN_ANA_NAME, event, attr && menuHorizontalPosition == 0); else lcdDrawTextAtIndex(HW_SETTINGS_COLUMN, y, STR_MMMINV, 0, 0); uint8_t potType = (g_eeGeneral.slidersConfig & mask) >> idx; diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 545a89be1..4be887528 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -297,16 +297,13 @@ #endif void memswap(void * a, void * b, uint8_t size); -#if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBHORUS) - #define IS_SLIDER_AVAILABLE(x) ((x) == SLIDER1 || (x) == SLIDER2 || (IS_SLIDER(x) && (g_eeGeneral.slidersConfig & (0x01 << ((x)-SLIDER1))))) -#elif defined(PCBX9E) - #define IS_SLIDER_AVAILABLE(x) ((x) == SLIDER1 || (x) == SLIDER2 || (IS_SLIDER(x) && (g_eeGeneral.slidersConfig & (0x01 << ((x)-SLIDER3))))) -#endif + #if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBHORUS) #define POT_CONFIG(x) ((g_eeGeneral.potsConfig >> (2*((x)-POT1)))&0x03) #define IS_POT_MULTIPOS(x) (IS_POT(x) && POT_CONFIG(x)==POT_MULTIPOS_SWITCH) #define IS_POT_WITHOUT_DETENT(x) (IS_POT(x) && POT_CONFIG(x)==POT_WITHOUT_DETENT) #define IS_POT_AVAILABLE(x) (IS_POT(x) && POT_CONFIG(x)!=POT_NONE) + #define IS_SLIDER_AVAILABLE(x) ((x) == SLIDER1 || (x) == SLIDER2 || (IS_SLIDER(x) && (g_eeGeneral.slidersConfig & (0x01 << ((x)-SLIDER3))))) #define IS_POT_OR_SLIDER_AVAILABLE(x) (IS_POT_AVAILABLE(x) || IS_SLIDER_AVAILABLE(x)) #define IS_MULTIPOS_CALIBRATED(cal) (cal->count>0 && cal->count