Merge pull request #705 from hb020/master

Allow overriding of LV_MEM_CUSTOM
HASwitchPlate · Apr 11, 2024 · 577a7e7 · 577a7e7
2 parents 2bbc2c5 + 99d9a06
commit 577a7e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/include/lv_conf_v7.h b/include/lv_conf_v7.h
@@ -80,8 +80,10 @@ typedef int16_t lv_coord_t;
 #define LV_FS_SEEK(x, y) lv_fs_seek(x, y)
 #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` */
 #define LV_MEM_CUSTOM      0
+#endif
 #if LV_MEM_CUSTOM == 0
 /* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/
 

diff --git a/include/lv_conf_v8.h b/include/lv_conf_v8.h
@@ -86,8 +86,10 @@ typedef int16_t lv_coord_t;
 /* LittelvGL's internal memory manager's settings.
  * 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` */
 #define LV_MEM_CUSTOM      0
+#endif
 #if LV_MEM_CUSTOM == 0
 /* Size of the memory used by `lv_mem_alloc` in bytes (>= 2kB)*/
 //#  define LV_MEM_SIZE    (32U * 1024U)