djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

esp32/main: Use heap_caps_get_info on IDF <4.1 to compute total heap.

Browse Source 
heap_caps_get_total_size() is only available in IDF 4.1 and above.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2022-01-22 10:45:17 +11:00
parent ac39960aa1
commit bb9d688454
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/esp32/main.c
View File

@ -128,10 +128,14 @@ void mp_task(void *pvParameter) {
if (mp_task_heap == NULL) { if (mp_task_heap == NULL) {
// Allocate the uPy heap using malloc and get the largest available region, // Allocate the uPy heap using malloc and get the largest available region,
// limiting to 1/2 total available memory to leave memory for the OS. // limiting to 1/2 total available memory to leave memory for the OS.
mp_task_heap_size = MIN( #if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 1, 0)
heap_caps_get_largest_free_block(MALLOC_CAP_8BIT), size_t heap_total = heap_caps_get_total_size(MALLOC_CAP_8BIT);
heap_caps_get_total_size(MALLOC_CAP_8BIT) / 2 #else
); multi_heap_info_t info;
heap_caps_get_info(&info, MALLOC_CAP_8BIT);
size_t heap_total = info.total_free_bytes + info.total_allocated_bytes;
#endif
mp_task_heap_size = MIN(heap_caps_get_largest_free_block(MALLOC_CAP_8BIT), heap_total / 2);
mp_task_heap = malloc(mp_task_heap_size); mp_task_heap = malloc(mp_task_heap_size);
} }