diff --git a/radio/src/gui/128x64/view_main.cpp b/radio/src/gui/128x64/view_main.cpp index aef164a63..d068df563 100644 --- a/radio/src/gui/128x64/view_main.cpp +++ b/radio/src/gui/128x64/view_main.cpp @@ -30,7 +30,10 @@ struct { #endif #define BIGSIZE DBLSIZE -#if defined (PCBTARANIS) +#if defined (RADIO_V10) + #define LBOX_CENTERX (LCD_W/4 + 5) + #define RBOX_CENTERX (3*LCD_W/4 - 4) +#elif defined (PCBTARANIS) #define LBOX_CENTERX (LCD_W/4 + 14) #define RBOX_CENTERX (3*LCD_W/4 - 13) #else @@ -83,7 +86,7 @@ void drawExternalAntennaAndRSSI() void drawPotsBars() { #if defined(RADIO_V10) - #define NUM_POT_BARS 2 + #define NUM_POT_BARS 6 #else #define NUM_POT_BARS (NUM_POTS + NUM_SLIDERS) #endif diff --git a/radio/src/opentx.h b/radio/src/opentx.h index 85b5bbef8..c097e14d8 100644 --- a/radio/src/opentx.h +++ b/radio/src/opentx.h @@ -280,7 +280,12 @@ void memswap(void * a, void * b, uint8_t size); #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) +#if defined(RADIO_V10) + #define IS_SLIDER_AVAILABLE(x) ((x) == SLIDER1 || (x) == SLIDER2 || (IS_SLIDER(x) && (g_eeGeneral.slidersConfig & (0x01 << ((x)-SLIDER1))))) + #define IS_POT_SLIDER_AVAILABLE(x) (IS_POT_AVAILABLE(x) || IS_SLIDER_AVAILABLE(x)) +#else #define IS_POT_SLIDER_AVAILABLE(x) (IS_POT_AVAILABLE(x)) +#endif #define IS_MULTIPOS_CALIBRATED(cal) (cal->count>0 && cal->count