jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add virtual backlight dimming

Browse Source
This commit is contained in:
fvanroie 2021-02-19 01:58:20 +01:00
parent e8850d99fe
commit 1ccbbf16ea
5 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
lib/lv_drivers/display/monitor.c
View File

@ -10,7 +10,7 @@
#if USE_MONITOR #if USE_MONITOR
#ifndef MONITOR_SDL_INCLUDE_PATH #ifndef MONITOR_SDL_INCLUDE_PATH
# define MONITOR_SDL_INCLUDE_PATH <SDL2/SDL.h> #define MONITOR_SDL_INCLUDE_PATH <SDL2/SDL.h>
#endif #endif
#include <stdlib.h> #include <stdlib.h>
@ -24,51 +24,52 @@
/********************* /*********************
* DEFINES * DEFINES
*********************/ *********************/
#define SDL_REFR_PERIOD 50 /*ms*/ #define SDL_REFR_PERIOD 50 /*ms*/
#ifndef MONITOR_ZOOM #ifndef MONITOR_ZOOM
#define MONITOR_ZOOM 1 #define MONITOR_ZOOM 1
#endif #endif
#ifndef MONITOR_HOR_RES #ifndef MONITOR_HOR_RES
#define MONITOR_HOR_RES LV_HOR_RES #define MONITOR_HOR_RES LV_HOR_RES
#endif #endif
#ifndef MONITOR_VER_RES #ifndef MONITOR_VER_RES
#define MONITOR_VER_RES LV_VER_RES #define MONITOR_VER_RES LV_VER_RES
#endif #endif
#if defined(__APPLE__) && defined(TARGET_OS_MAC) #if defined(__APPLE__) && defined(TARGET_OS_MAC)
# if __APPLE__ && TARGET_OS_MAC #if __APPLE__ && TARGET_OS_MAC
#define MONITOR_APPLE #define MONITOR_APPLE
# endif #endif
#endif #endif
#if defined(__EMSCRIPTEN__) #if defined(__EMSCRIPTEN__)
# define MONITOR_EMSCRIPTEN #define MONITOR_EMSCRIPTEN
#endif #endif
/********************** /**********************
* TYPEDEFS * TYPEDEFS
**********************/ **********************/
typedef struct { typedef struct
SDL_Window * window; {
SDL_Renderer * renderer; SDL_Window* window;
SDL_Texture * texture; SDL_Renderer* renderer;
SDL_Texture* texture;
volatile bool sdl_refr_qry; volatile bool sdl_refr_qry;
#if MONITOR_DOUBLE_BUFFERED #if MONITOR_DOUBLE_BUFFERED
uint32_t * tft_fb_act; uint32_t* tft_fb_act;
#else #else
uint32_t tft_fb[LV_HOR_RES_MAX * LV_VER_RES_MAX]; uint32_t tft_fb[LV_HOR_RES_MAX * LV_VER_RES_MAX];
#endif #endif
}monitor_t; } monitor_t;
/********************** /**********************
* STATIC PROTOTYPES * STATIC PROTOTYPES
**********************/ **********************/
static int monitor_sdl_refr_thread(void * param); static int monitor_sdl_refr_thread(void* param);
static void window_create(monitor_t * m); static void window_create(monitor_t* m);
static void window_update(monitor_t * m); static void window_update(monitor_t* m);
/*********************** /***********************
* GLOBAL PROTOTYPES * GLOBAL PROTOTYPES
@ -83,10 +84,10 @@ monitor_t monitor;
monitor_t monitor2; monitor_t monitor2;
#endif #endif
static volatile bool sdl_inited = false; static volatile bool sdl_inited = false;
static volatile bool sdl_quit_qry = false; static volatile bool sdl_quit_qry = false;
int quit_filter(void * userdata, SDL_Event * event); int quit_filter(void* userdata, SDL_Event* event);
static void monitor_sdl_clean_up(void); static void monitor_sdl_clean_up(void);
static void monitor_sdl_init(void); static void monitor_sdl_init(void);
#ifdef MONITOR_EMSCRIPTEN #ifdef MONITOR_EMSCRIPTEN
@ -115,7 +116,8 @@ void monitor_init(void)
#ifndef MONITOR_EMSCRIPTEN #ifndef MONITOR_EMSCRIPTEN
SDL_CreateThread(monitor_sdl_refr_thread, "sdl_refr", NULL); SDL_CreateThread(monitor_sdl_refr_thread, "sdl_refr", NULL);
while(sdl_inited == false); /*Wait until 'sdl_refr' initializes the SDL*/ while(sdl_inited == false)
; /*Wait until 'sdl_refr' initializes the SDL*/
#endif #endif
} }
@ -125,12 +127,12 @@ void monitor_init(void)
* @param area an area where to copy `color_p` * @param area an area where to copy `color_p`
* @param color_p an array of pixel to copy to the `area` part of the screen * @param color_p an array of pixel to copy to the `area` part of the screen
*/ */
void monitor_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p) void monitor_flush(lv_disp_drv_t* disp_drv, const lv_area_t* area, lv_color_t* color_p)
{ {
lv_coord_t hres = disp_drv->rotated == 0 ? disp_drv->hor_res : disp_drv->ver_res; lv_coord_t hres = disp_drv->rotated == 0 ? disp_drv->hor_res : disp_drv->ver_res;
lv_coord_t vres = disp_drv->rotated == 0 ? disp_drv->ver_res : disp_drv->hor_res; lv_coord_t vres = disp_drv->rotated == 0 ? disp_drv->ver_res : disp_drv->hor_res;
// printf("x1:%d,y1:%d,x2:%d,y2:%d\n", area->x1, area->y1, area->x2, area->y2); // printf("x1:%d,y1:%d,x2:%d,y2:%d\n", area->x1, area->y1, area->x2, area->y2);
/*Return if the area is out the screen*/ /*Return if the area is out the screen*/
if(area->x2 < 0 || area->y2 < 0 || area->x1 > hres - 1 || area->y1 > vres - 1) { if(area->x2 < 0 || area->y2 < 0 || area->x1 > hres - 1 || area->y1 > vres - 1) {
@ -140,7 +142,7 @@ void monitor_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t
} }
#if MONITOR_DOUBLE_BUFFERED #if MONITOR_DOUBLE_BUFFERED
monitor.tft_fb_act = (uint32_t *)color_p; monitor.tft_fb_act = (uint32_t*)color_p;
monitor.sdl_refr_qry = true; monitor.sdl_refr_qry = true;
@ -149,14 +151,13 @@ void monitor_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t
#else #else
int32_t y; int32_t y;
#if LV_COLOR_DEPTH != 24 && LV_COLOR_DEPTH != 32 /*32 is valid but support 24 for backward compatibility too*/ #if LV_COLOR_DEPTH != 24 && LV_COLOR_DEPTH != 32 /*32 is valid but support 24 for backward compatibility too*/
int32_t x; int32_t x;
for(y = area->y1; y <= area->y2 && y < disp_drv->ver_res; y++) { for(y = area->y1; y <= area->y2 && y < disp_drv->ver_res; y++) {
for(x = area->x1; x <= area->x2; x++) { for(x = area->x1; x <= area->x2; x++) {
monitor.tft_fb[y * disp_drv->hor_res + x] = lv_color_to32(*color_p); monitor.tft_fb[y * disp_drv->hor_res + x] = lv_color_to32(*color_p);
color_p++; color_p++;
} }
} }
#else #else
uint32_t w = lv_area_get_width(area); uint32_t w = lv_area_get_width(area);
@ -173,7 +174,6 @@ void monitor_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t
#endif #endif
} }
#if MONITOR_DUAL #if MONITOR_DUAL
/** /**
@ -182,7 +182,7 @@ void monitor_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t
* @param area an area where to copy `color_p` * @param area an area where to copy `color_p`
* @param color_p an array of pixel to copy to the `area` part of the screen * @param color_p an array of pixel to copy to the `area` part of the screen
*/ */
void monitor_flush2(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p) void monitor_flush2(lv_disp_drv_t* disp_drv, const lv_area_t* area, lv_color_t* color_p)
{ {
lv_coord_t hres = disp_drv->rotated == 0 ? disp_drv->hor_res : disp_drv->ver_res; lv_coord_t hres = disp_drv->rotated == 0 ? disp_drv->hor_res : disp_drv->ver_res;
lv_coord_t vres = disp_drv->rotated == 0 ? disp_drv->ver_res : disp_drv->hor_res; lv_coord_t vres = disp_drv->rotated == 0 ? disp_drv->ver_res : disp_drv->hor_res;
@ -194,7 +194,7 @@ void monitor_flush2(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t
} }
#if MONITOR_DOUBLE_BUFFERED #if MONITOR_DOUBLE_BUFFERED
monitor2.tft_fb_act = (uint32_t *)color_p; monitor2.tft_fb_act = (uint32_t*)color_p;
monitor2.sdl_refr_qry = true; monitor2.sdl_refr_qry = true;
@ -203,14 +203,13 @@ void monitor_flush2(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t
#else #else
int32_t y; int32_t y;
#if LV_COLOR_DEPTH != 24 && LV_COLOR_DEPTH != 32 /*32 is valid but support 24 for backward compatibility too*/ #if LV_COLOR_DEPTH != 24 && LV_COLOR_DEPTH != 32 /*32 is valid but support 24 for backward compatibility too*/
int32_t x; int32_t x;
for(y = area->y1; y <= area->y2 && y < disp_drv->ver_res; y++) { for(y = area->y1; y <= area->y2 && y < disp_drv->ver_res; y++) {
for(x = area->x1; x <= area->x2; x++) { for(x = area->x1; x <= area->x2; x++) {
monitor2.tft_fb[y * disp_drv->hor_res + x] = lv_color_to32(*color_p); monitor2.tft_fb[y * disp_drv->hor_res + x] = lv_color_to32(*color_p);
color_p++; color_p++;
} }
} }
#else #else
uint32_t w = lv_area_get_width(area); uint32_t w = lv_area_get_width(area);
@ -237,7 +236,7 @@ void monitor_flush2(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t
* It initializes SDL, handles drawing and the mouse. * It initializes SDL, handles drawing and the mouse.
*/ */
static int monitor_sdl_refr_thread(void * param) static int monitor_sdl_refr_thread(void* param)
{ {
(void)param; (void)param;
@ -257,7 +256,7 @@ static int monitor_sdl_refr_thread(void * param)
return 0; return 0;
} }
int quit_filter(void * userdata, SDL_Event * event) int quit_filter(void* userdata, SDL_Event* event)
{ {
(void)userdata; (void)userdata;
@ -265,13 +264,10 @@ int quit_filter(void * userdata, SDL_Event * event)
if(event->window.event == SDL_WINDOWEVENT_CLOSE) { if(event->window.event == SDL_WINDOWEVENT_CLOSE) {
sdl_quit_qry = true; sdl_quit_qry = true;
} }
} } else if(event->type == SDL_QUIT) {
else if(event->type == SDL_QUIT) {
sdl_quit_qry = true; sdl_quit_qry = true;
} }
return 1; return 1;
} }
@ -291,6 +287,12 @@ static void monitor_sdl_clean_up(void)
SDL_Quit(); SDL_Quit();
} }
void monitor_backlight(uint8_t level)
{
SDL_SetTextureColorMod(monitor.texture, level, level, level);
window_update(&monitor);
}
static void monitor_sdl_init(void) static void monitor_sdl_init(void)
{ {
/*Initialize the SDL*/ /*Initialize the SDL*/
@ -363,22 +365,21 @@ static void monitor_sdl_refr_core(void)
/*Sleep some time*/ /*Sleep some time*/
SDL_Delay(SDL_REFR_PERIOD); SDL_Delay(SDL_REFR_PERIOD);
} }
static void window_create(monitor_t * m) static void window_create(monitor_t* m)
{ {
m->window = SDL_CreateWindow("TFT Simulator", m->window = SDL_CreateWindow("TFT Simulator", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, MONITOR_HOR_RES * MONITOR_ZOOM, MONITOR_VER_RES * MONITOR_ZOOM,
MONITOR_HOR_RES * MONITOR_ZOOM, MONITOR_VER_RES * MONITOR_ZOOM, 0); /*last param. SDL_WINDOW_BORDERLESS to hide borders*/ 0); /*last param. SDL_WINDOW_BORDERLESS to hide borders*/
#if MONITOR_VIRTUAL_MACHINE || defined(MONITOR_EMSCRIPTEN) #if MONITOR_VIRTUAL_MACHINE || defined(MONITOR_EMSCRIPTEN)
m->renderer = SDL_CreateRenderer(m->window, -1, SDL_RENDERER_SOFTWARE); m->renderer = SDL_CreateRenderer(m->window, -1, SDL_RENDERER_SOFTWARE);
#else #else
m->renderer = SDL_CreateRenderer(m->window, -1, 0); m->renderer = SDL_CreateRenderer(m->window, -1, 0);
#endif #endif
m->texture = SDL_CreateTexture(m->renderer, m->texture = SDL_CreateTexture(m->renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STATIC, MONITOR_HOR_RES,
SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STATIC, MONITOR_HOR_RES, MONITOR_VER_RES); MONITOR_VER_RES);
SDL_SetTextureBlendMode(m->texture, SDL_BLENDMODE_BLEND); SDL_SetTextureBlendMode(m->texture, SDL_BLENDMODE_BLEND);
/*Initialize the frame buffer to gray (77 is an empirical value) */ /*Initialize the frame buffer to gray (77 is an empirical value) */
@ -389,10 +390,9 @@ static void window_create(monitor_t * m)
#endif #endif
m->sdl_refr_qry = true; m->sdl_refr_qry = true;
} }
static void window_update(monitor_t * m) static void window_update(monitor_t* m)
{ {
#if MONITOR_DOUBLE_BUFFERED == 0 #if MONITOR_DOUBLE_BUFFERED == 0
SDL_UpdateTexture(m->texture, NULL, m->tft_fb, MONITOR_HOR_RES * sizeof(uint32_t)); SDL_UpdateTexture(m->texture, NULL, m->tft_fb, MONITOR_HOR_RES * sizeof(uint32_t));

5
lib/lv_drivers/display/monitor.h
View File

@ -41,8 +41,9 @@ extern "C" {
* GLOBAL PROTOTYPES * GLOBAL PROTOTYPES
**********************/ **********************/
void monitor_init(void); void monitor_init(void);
void monitor_flush(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p); void monitor_flush(lv_disp_drv_t* disp_drv, const lv_area_t* area, lv_color_t* color_p);
void monitor_flush2(lv_disp_drv_t * disp_drv, const lv_area_t * area, lv_color_t * color_p); void monitor_flush2(lv_disp_drv_t* disp_drv, const lv_area_t* area, lv_color_t* color_p);
void monitor_backlight(uint8_t level);
/********************** /**********************
* MACROS * MACROS

10
src/dev/esp32/esp32.cpp
View File

@ -45,7 +45,7 @@ void Esp32Device::set_backlight_pin(uint8_t pin)
Esp32Device::_backlight_pin = pin; Esp32Device::_backlight_pin = pin;
/* Setup Backlight Control Pin */ /* Setup Backlight Control Pin */
if(pin != (uint8_t)-1) { if(pin < GPIO_NUM_MAX) {
LOG_VERBOSE(TAG_GUI, F("Backlight : Pin %d"), pin); LOG_VERBOSE(TAG_GUI, F("Backlight : Pin %d"), pin);
ledcSetup(BACKLIGHT_CHANNEL, 20000, 12); ledcSetup(BACKLIGHT_CHANNEL, 20000, 12);
ledcAttachPin(pin, BACKLIGHT_CHANNEL); ledcAttachPin(pin, BACKLIGHT_CHANNEL);
@ -81,10 +81,10 @@ bool Esp32Device::get_backlight_power()
void Esp32Device::update_backlight() void Esp32Device::update_backlight()
{ {
if(_backlight_pin == (uint8_t)-1) return; if(pin < GPIO_NUM_MAX) {
uint32_t duty = _backlight_power ? map(_backlight_level, 0, 100, 0, 4095) : 0;
uint32_t duty = _backlight_power ? map(_backlight_level, 0, 100, 0, 4095) : 0; ledcWrite(BACKLIGHT_CHANNEL, duty); // ledChannel and value
ledcWrite(BACKLIGHT_CHANNEL, duty); // ledChannel and value }
} }
size_t Esp32Device::get_free_max_block() size_t Esp32Device::get_free_max_block()

7
src/dev/win32/hasp_win32.cpp
View File

@ -7,6 +7,9 @@
#include "hasp_conf.h" #include "hasp_conf.h"
#include "hasp_debug.h" #include "hasp_debug.h"
#include "hasp/hasp_utilities.h"
#include "display/monitor.h"
namespace dev { namespace dev {
@ -32,7 +35,7 @@ const char* Win32Device::get_display_driver()
void Win32Device::set_backlight_pin(uint8_t pin) void Win32Device::set_backlight_pin(uint8_t pin)
{ {
Win32Device::_backlight_pin = pin; // Win32Device::_backlight_pin = pin;
} }
void Win32Device::set_backlight_level(uint8_t level) void Win32Device::set_backlight_level(uint8_t level)
@ -60,7 +63,7 @@ bool Win32Device::get_backlight_power()
void Win32Device::update_backlight() void Win32Device::update_backlight()
{ {
if(_backlight_pin == -1) return; monitor_backlight(_backlight_power ? map(_backlight_level, 0, 100, 0, 255) : 0);
} }
size_t Win32Device::get_free_max_block() size_t Win32Device::get_free_max_block()

4
src/dev/win32/hasp_win32.h
View File

@ -20,8 +20,8 @@ class Win32Device : public BaseDevice {
public: public:
Win32Device() Win32Device()
{ {
_hostname = "winplate"; _hostname = "winplate";
_backlight_pin = -1; // _backlight_pin = -1;
_backlight_power = 1; _backlight_power = 1;
_backlight_level = 100; _backlight_level = 100;
} }