github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-03-17 10:27:36 +01:00
parent 87c4a0ffef 438ba35076
commit 6363d53fbe
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/hal/lv_hal_disp.c
View File

@@ -182,6 +182,8 @@ void lv_disp_drv_update(lv_disp_t * disp, lv_disp_drv_t * new_drv)
lv_memset_00(disp->inv_area_joined, sizeof(disp->inv_area_joined)); lv_memset_00(disp->inv_area_joined, sizeof(disp->inv_area_joined));
disp->inv_p = 0; disp->inv_p = 0;
if(disp->act_scr != NULL) lv_obj_invalidate(disp->act_scr); if(disp->act_scr != NULL) lv_obj_invalidate(disp->act_scr);
if(disp->driver.drv_update_cb) disp->driver.drv_update_cb(&disp->driver);
} }
/** /**

3
src/hal/lv_hal_disp.h
View File

@@ -126,6 +126,9 @@ typedef struct _lv_disp_drv_t {
/** OPTIONAL: called to wait while the gpu is working */ /** OPTIONAL: called to wait while the gpu is working */
void (*gpu_wait_cb)(struct _lv_disp_drv_t * disp_drv); void (*gpu_wait_cb)(struct _lv_disp_drv_t * disp_drv);
/** OPTIONAL: called when driver parameters are updated */
void (*drv_update_cb)(struct _lv_disp_drv_t * disp_drv);
/** OPTIONAL: Fill a memory with a color (GPU only)*/ /** OPTIONAL: Fill a memory with a color (GPU only)*/
void (*gpu_fill_cb)(struct _lv_disp_drv_t * disp_drv, lv_color_t * dest_buf, lv_coord_t dest_width, void (*gpu_fill_cb)(struct _lv_disp_drv_t * disp_drv, lv_color_t * dest_buf, lv_coord_t dest_width,
const lv_area_t * fill_area, lv_color_t color); const lv_area_t * fill_area, lv_color_t color);