diff --git a/firmware/export/config/hifimanhm60x.h b/firmware/export/config/hifimanhm60x.h index 2fdea5ec17..860cc967d9 100644 --- a/firmware/export/config/hifimanhm60x.h +++ b/firmware/export/config/hifimanhm60x.h @@ -75,7 +75,7 @@ /* #define HAVE_LCD_SHUTDOWN */ /* Define this if your LCD can be enabled/disabled */ -/* #define HAVE_LCD_ENABLE */ +#define HAVE_LCD_ENABLE /* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE should be defined as well. */ diff --git a/firmware/export/config/hifimanhm801.h b/firmware/export/config/hifimanhm801.h index 1c504b2ff0..06154eeb00 100644 --- a/firmware/export/config/hifimanhm801.h +++ b/firmware/export/config/hifimanhm801.h @@ -72,7 +72,7 @@ /* #define HAVE_LCD_SHUTDOWN */ /* Define this if your LCD can be enabled/disabled */ -/* #define HAVE_LCD_ENABLE */ +#define HAVE_LCD_ENABLE /* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE should be defined as well. */ diff --git a/firmware/target/arm/rk27xx/backlight-rk27xx.c b/firmware/target/arm/rk27xx/backlight-rk27xx.c index cb669aecff..06c9cc394d 100644 --- a/firmware/target/arm/rk27xx/backlight-rk27xx.c +++ b/firmware/target/arm/rk27xx/backlight-rk27xx.c @@ -24,6 +24,7 @@ #include "backlight.h" #include "backlight-target.h" #include "system.h" +#include "lcd.h" static int brightness = DEFAULT_BRIGHTNESS_SETTING; @@ -76,6 +77,9 @@ bool _backlight_init(void) void _backlight_on(void) { +#ifdef HAVE_LCD_ENABLE + lcd_enable(true); +#endif /* enable PWM clock */ SCU_CLKCFG &= ~(1<<29); @@ -96,6 +100,9 @@ void _backlight_off(void) /* disable PWM clock */ SCU_CLKCFG |= (1<<29); +#ifdef HAVE_LCD_ENABLE + lcd_enable(false); +#endif } void _backlight_set_brightness(int val) diff --git a/firmware/target/arm/rk27xx/lcd-hifiman.c b/firmware/target/arm/rk27xx/lcd-hifiman.c index 932154da8d..91e55894e5 100644 --- a/firmware/target/arm/rk27xx/lcd-hifiman.c +++ b/firmware/target/arm/rk27xx/lcd-hifiman.c @@ -27,12 +27,7 @@ #include "cpu.h" #include "lcdif-rk27xx.h" - -/* TODO */ -static void lcd_sleep(unsigned int sleep) -{ - (void)sleep; -} +static bool display_on = false; void lcd_display_init() { @@ -110,9 +105,47 @@ void lcd_display_init() for(y=0; y