Disable contrast menu on targets without adjustable contrast

replace/2ea247d7347c9369b3fcbefd795b29811d0c01ed
Federico Amedeo Izzo 2021-01-29 22:57:24 +01:00
rodzic c9ee09b1f6
commit 450c965ee0
4 zmienionych plików z 16 dodań i 3 usunięć

Wyświetl plik

@ -123,7 +123,7 @@ extern layout_t layout;
extern settings_t settings; extern settings_t settings;
extern const char *menu_items[6]; extern const char *menu_items[6];
extern const char *settings_items[2]; 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 menu_num;
extern const uint8_t settings_num; extern const uint8_t settings_num;
extern const uint8_t display_num; extern const uint8_t display_num;

Wyświetl plik

@ -117,11 +117,18 @@ const char *settings_items[2] =
"Display" "Display"
}; };
#ifdef SCREEN_CONTRAST
const char *display_items[2] = const char *display_items[2] =
{ {
"Brightness", "Brightness",
"Contrast" "Contrast"
}; };
#else
const char *display_items[1] =
{
"Brightness",
};
#endif
// Calculate number of main menu entries // Calculate number of main menu entries
const uint8_t menu_num = sizeof(menu_items)/sizeof(menu_items[0]); 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) if(ui_state.menu_selected > 0)
ui_state.menu_selected -= 1; ui_state.menu_selected -= 1;
else else
ui_state.menu_selected = settings_num-1; ui_state.menu_selected = display_num-1;
} }
else if(msg.keys & KEY_DOWN) 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; ui_state.menu_selected += 1;
else else
ui_state.menu_selected = 0; ui_state.menu_selected = 0;

Wyświetl plik

@ -40,6 +40,9 @@
/* Screen pixel format */ /* Screen pixel format */
#define PIX_FMT_BW #define PIX_FMT_BW
/* Screen has adjustable contrast */
#define SCREEN_CONTRAST
/* Battery type */ /* Battery type */
#define BAT_LIPO_2S #define BAT_LIPO_2S

Wyświetl plik

@ -21,6 +21,9 @@
/* Device has a working real time clock */ /* Device has a working real time clock */
#define HAS_RTC #define HAS_RTC
/* Screen has adjustable contrast */
#define SCREEN_CONTRAST
/* Supported radio bands */ /* Supported radio bands */
#define BAND_VHF #define BAND_VHF
#define BAND_UHF #define BAND_UHF