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

Merge pull request #705 from hb020/master

Browse Source 
Allow overriding of LV_MEM_CUSTOM
This commit is contained in:
fvanroie 2024-04-11 14:07:47 +02:00 committed by GitHub
commit 577a7e7fb4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/lv_conf_v7.h
View File

@ -80,8 +80,10 @@ typedef int16_t lv_coord_t;
#define LV_FS_SEEK(x, y) lv_fs_seek(x, y) #define LV_FS_SEEK(x, y) lv_fs_seek(x, y)
#define _lv_img_decoder_t _lv_img_decoder #define _lv_img_decoder_t _lv_img_decoder
#ifndef LV_MEM_CUSTOM
/* 1: use custom malloc/free, 0: use the built-in `lv_mem_alloc` and `lv_mem_free` */ /* 1: use custom malloc/free, 0: use the built-in `lv_mem_alloc` and `lv_mem_free` */
#define LV_MEM_CUSTOM 0 #define LV_MEM_CUSTOM 0
#endif
#if LV_MEM_CUSTOM == 0 #if LV_MEM_CUSTOM == 0
/* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/ /* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/

2
include/lv_conf_v8.h
View File

@ -86,8 +86,10 @@ typedef int16_t lv_coord_t;
/* LittelvGL's internal memory manager's settings. /* LittelvGL's internal memory manager's settings.
* The graphical objects and other related data are stored here. */ * The graphical objects and other related data are stored here. */
#ifndef LV_MEM_CUSTOM
/* 1: use custom malloc/free, 0: use the built-in `lv_mem_alloc` and `lv_mem_free` */ /* 1: use custom malloc/free, 0: use the built-in `lv_mem_alloc` and `lv_mem_free` */
#define LV_MEM_CUSTOM 0 #define LV_MEM_CUSTOM 0
#endif
#if LV_MEM_CUSTOM == 0 #if LV_MEM_CUSTOM == 0
/* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/ /* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/
//# define LV_MEM_SIZE (32U * 1024U) //# define LV_MEM_SIZE (32U * 1024U)