diff --git a/openrtx/include/ui.h b/openrtx/include/ui.h index f74a8912..5b1a973a 100644 --- a/openrtx/include/ui.h +++ b/openrtx/include/ui.h @@ -123,7 +123,7 @@ extern layout_t layout; extern settings_t settings; extern const char *menu_items[6]; extern const char *settings_items[2]; -extern const char *display_items[2]; +extern const char *display_items[]; extern const uint8_t menu_num; extern const uint8_t settings_num; extern const uint8_t display_num; diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c index c4ce14aa..9536d5a7 100644 --- a/openrtx/src/ui/ui.c +++ b/openrtx/src/ui/ui.c @@ -117,11 +117,18 @@ const char *settings_items[2] = "Display" }; +#ifdef SCREEN_CONTRAST const char *display_items[2] = { "Brightness", "Contrast" }; +#else +const char *display_items[1] = +{ + "Brightness", +}; +#endif // Calculate number of main menu entries const uint8_t menu_num = sizeof(menu_items)/sizeof(menu_items[0]); @@ -946,11 +953,11 @@ void ui_updateFSM(event_t event, bool *sync_rtx) if(ui_state.menu_selected > 0) ui_state.menu_selected -= 1; else - ui_state.menu_selected = settings_num-1; + ui_state.menu_selected = display_num-1; } else if(msg.keys & KEY_DOWN) { - if(ui_state.menu_selected < settings_num-1) + if(ui_state.menu_selected < display_num-1) ui_state.menu_selected += 1; else ui_state.menu_selected = 0; diff --git a/platform/targets/GD77/hwconfig.h b/platform/targets/GD77/hwconfig.h index 22bc5e1b..86b54446 100644 --- a/platform/targets/GD77/hwconfig.h +++ b/platform/targets/GD77/hwconfig.h @@ -40,6 +40,9 @@ /* Screen pixel format */ #define PIX_FMT_BW +/* Screen has adjustable contrast */ +#define SCREEN_CONTRAST + /* Battery type */ #define BAT_LIPO_2S diff --git a/platform/targets/linux/hwconfig.h b/platform/targets/linux/hwconfig.h index ffd5e5bd..94f6e03d 100644 --- a/platform/targets/linux/hwconfig.h +++ b/platform/targets/linux/hwconfig.h @@ -21,6 +21,9 @@ /* Device has a working real time clock */ #define HAS_RTC +/* Screen has adjustable contrast */ +#define SCREEN_CONTRAST + /* Supported radio bands */ #define BAND_VHF #define BAND_UHF