From f083a77001033d4bbc766b237bb396b2fff4394c Mon Sep 17 00:00:00 2001 From: Federico Amedeo Izzo Date: Fri, 29 Jan 2021 23:07:39 +0100 Subject: [PATCH] UI: Fixed (null) menu entry on targets without RTC --- openrtx/include/ui.h | 4 ++-- openrtx/src/ui/ui.c | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/openrtx/include/ui.h b/openrtx/include/ui.h index 5b1a973a..229e8e6d 100644 --- a/openrtx/include/ui.h +++ b/openrtx/include/ui.h @@ -121,8 +121,8 @@ typedef struct ui_state_t extern layout_t layout; extern settings_t settings; -extern const char *menu_items[6]; -extern const char *settings_items[2]; +extern const char *menu_items[]; +extern const char *settings_items[]; extern const char *display_items[]; extern const uint8_t menu_num; extern const uint8_t settings_num; diff --git a/openrtx/src/ui/ui.c b/openrtx/src/ui/ui.c index a0ec1e17..ce66e4d0 100644 --- a/openrtx/src/ui/ui.c +++ b/openrtx/src/ui/ui.c @@ -109,13 +109,18 @@ const char *menu_items[6] = "Settings" }; +#ifdef HAS_RTC const char *settings_items[2] = { -#ifdef HAS_RTC "Time & Date", -#endif "Display" }; +#else +const char *settings_items[1] = +{ + "Display" +}; +#endif #ifdef SCREEN_CONTRAST const char *display_items[2] =