diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2020-07-19 19:38:45 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2020-07-24 21:20:13 +0000 |
commit | 0c4f89370d05056faa789aa9cabcccc4e509fb9f (patch) | |
tree | 6ddf7fff0a47564db41d39927ea1acbdb03e74ee /apps/menus | |
parent | 092c340a2062fa98b7387fc5fd63578ddae7d0b6 (diff) |
[2/4] get rid of HAVE_LCD_CHARCELLS
HAVE_LCD_BITMAP is now redundant.
lcd_bitmap is always-on in features.txt so manual and lang strings
don't have to change
Change-Id: I08eeb20de48099ffc2dc23782711af368c2ec794
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/main_menu.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 7f94571226..5e9b935937 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c @@ -125,11 +125,7 @@ static int show_credits(void) return 0; } -#ifdef HAVE_LCD_CHARCELLS -#define SIZE_FMT "%s%s" -#else #define SIZE_FMT "%s %s" -#endif struct info_data { @@ -500,29 +496,7 @@ MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu, /***********************************/ /* MAIN MENU */ - -#ifdef HAVE_LCD_CHARCELLS -static int mainmenu_callback(int action, - const struct menu_item_ex *this_item, - struct gui_synclist *lists) -{ - (void)this_item; - (void)lists; - switch (action) - { - case ACTION_ENTER_MENUITEM: - status_set_param(true); - break; - case ACTION_EXIT_MENUITEM: - status_set_param(false); - break; - } - return action; -} -#else -#define mainmenu_callback NULL -#endif -MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS), mainmenu_callback, +MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS), NULL, Icon_Submenu_Entered, &sound_settings, &playback_settings, |