From 97a82ee3eca1be69bd2d08e8fd9db09c0807ae5d Mon Sep 17 00:00:00 2001 From: William Wilgus Date: Wed, 23 Nov 2022 23:00:29 -0500 Subject: plugins HAVE_BACKLIGHT helper remove ifdefs in favor of dummy functions lessen the ifdef hell Change-Id: I52f830284e4599f3fc3a75c27dda27058b8de1a3 --- apps/plugins/rockboy/menu.c | 6 ++---- apps/plugins/rockboy/rockboy.c | 5 +---- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'apps/plugins/rockboy') diff --git a/apps/plugins/rockboy/menu.c b/apps/plugins/rockboy/menu.c index 6fafdc11a6..caa8d499cb 100644 --- a/apps/plugins/rockboy/menu.c +++ b/apps/plugins/rockboy/menu.c @@ -83,9 +83,8 @@ int do_user_menu(void) { rb->lcd_set_mode(LCD_MODE_RGB565); #endif -#ifdef HAVE_BACKLIGHT backlight_use_settings(); -#endif + /* Clean out the button Queue */ while (rb->button_get(false) != BUTTON_NONE) rb->yield(); @@ -139,10 +138,9 @@ int do_user_menu(void) { rb->lcd_set_mode(LCD_MODE_PAL256); #endif -#ifdef HAVE_BACKLIGHT /* ignore backlight time out */ backlight_ignore_timeout(); -#endif + return ret; } diff --git a/apps/plugins/rockboy/rockboy.c b/apps/plugins/rockboy/rockboy.c index 2c5c6e4dbf..2d0c349507 100644 --- a/apps/plugins/rockboy/rockboy.c +++ b/apps/plugins/rockboy/rockboy.c @@ -602,10 +602,9 @@ enum plugin_status plugin_start(const void* parameter) rb->lcd_set_mode(LCD_MODE_PAL256); #endif -#ifdef HAVE_BACKLIGHT /* ignore backlight time out */ backlight_ignore_timeout(); -#endif + gnuboy_main(parameter); #ifdef HAVE_WHEEL_POSITION @@ -616,9 +615,7 @@ enum plugin_status plugin_start(const void* parameter) rb->lcd_set_mode(LCD_MODE_RGB565); #endif -#ifdef HAVE_BACKLIGHT backlight_use_settings(); -#endif if(!rb->audio_status()) rockboy_pcm_close(); -- cgit v1.2.3