diff --git a/src/general_menus.cpp b/src/general_menus.cpp index f8c7dacb4..2032bacc7 100644 --- a/src/general_menus.cpp +++ b/src/general_menus.cpp @@ -75,6 +75,8 @@ enum menuProcSetupItems { ITEM_SETUP_BASE=18, #ifdef PCBARM ITEM_SETUP_OPTREX, + ITEM_SETUP_BACKLIGHT_BRIGHT, + ITEM_SETUP_VOLUME, #endif #ifdef AUDIO ITEM_SETUP_SPEAKER, @@ -120,12 +122,12 @@ void menuProcSetup(uint8_t event) #define FRSKY_ZEROS #endif #ifdef PCBARM -#define OPTREX_ZEROS 0, +#define ARM_ZEROS 0, 0, 0, #else -#define OPTREX_ZEROS +#define ARM_ZEROS #endif - MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+1, {0, 0, 0, AUDIO_ZEROS HAPTIC_ZEROS OPTREX_ZEROS 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, SPLASH_ZEROS 0, 0, 0, 0, FRSKY_ZEROS 0, (uint8_t)-1, 1}); + MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+1, {0, 0, 0, AUDIO_ZEROS HAPTIC_ZEROS ARM_ZEROS 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, SPLASH_ZEROS 0, 0, 0, 0, FRSKY_ZEROS 0, (uint8_t)-1, 1}); int8_t sub = m_posVert; uint8_t y = 1*FH; @@ -143,6 +145,21 @@ void menuProcSetup(uint8_t event) if((y+=FH)>7*FH) return; }subN++; +#if defined(PCBARM) + if(s_pgOfs7*FH) return; + }subN++; +#endif + if(s_pgOfs7*FH) return; }subN++; + + if(s_pgOfsPWM_CH_NUM[0].PWM_CDTYUPD = g_eeGeneral.backlightBright ; + } + if((y+=FH)>7*FH) return; + } subN++; #endif if(s_pgOfsPWM_CH_NUM[0].PWM_CDTYUPD = g_eeGeneral.backlightBright; +#endif + #if defined(PCBV4) if (MCUSR != (1 << PORF)) #elif defined(PCBSTD)