From d3d370b3cf217ea9fe0b99a7cdc8a3aa5eb15e82 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 26 Dec 2018 23:12:56 +0100 Subject: [PATCH] simplify some more USE_STB_HAL defines Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/60dd3288124510150a611174ad4f7fdc97cca444 Author: vanhofen Date: 2018-12-26 (Wed, 26 Dec 2018) Origin message was: ------------------ - simplify some more USE_STB_HAL defines --- src/neutrino.cpp | 2 +- src/system/settings.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/neutrino.cpp b/src/neutrino.cpp index 3eb8e961d..a23db8987 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -306,7 +306,7 @@ const lcd_setting_struct_t lcd_setting[SNeutrinoSettings::LCD_SETTING_COUNT] = {"lcd_show_volume" , DEFAULT_LCD_SHOW_VOLUME }, {"lcd_autodimm" , DEFAULT_LCD_AUTODIMM }, {"lcd_deepbrightness" , DEFAULT_VFD_STANDBYBRIGHTNESS } -#if HAVE_TRIPLEDRAGON || USE_STB_HAL +#if USE_STB_HAL ,{ "lcd_epgmode" , 0 /*DEFAULT_LCD_EPGMODE*/ } #endif }; diff --git a/src/system/settings.h b/src/system/settings.h index c3a47886a..6dcee2ad9 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -780,7 +780,7 @@ struct SNeutrinoSettings LCD_SHOW_VOLUME , LCD_AUTODIMM , LCD_DEEPSTANDBY_BRIGHTNESS, -#if HAVE_TRIPLEDRAGON || USE_STB_HAL +#if USE_STB_HAL LCD_EPGMODE , #endif LCD_SETTING_COUNT