Provide proper memory caps total size

me-no-dev · me-no-dev · commit 49fbff4c532b · 2023-06-05T12:12:11.000+03:00
diff --git a/cores/esp32/Esp.cpp b/cores/esp32/Esp.cpp
@@ -134,9 +134,7 @@ void EspClass::restart(void)
 
 uint32_t EspClass::getHeapSize(void)
 {
-    multi_heap_info_t info;
-    heap_caps_get_info(&info, MALLOC_CAP_INTERNAL);
-    return info.total_free_bytes + info.total_allocated_bytes;
+    return heap_caps_get_total_size(MALLOC_CAP_INTERNAL);
 }
 
 uint32_t EspClass::getFreeHeap(void)
@@ -157,9 +155,7 @@ uint32_t EspClass::getMaxAllocHeap(void)
 uint32_t EspClass::getPsramSize(void)
 {
 	if(psramFound()){
-	    multi_heap_info_t info;
-	    heap_caps_get_info(&info, MALLOC_CAP_SPIRAM);
-	    return info.total_free_bytes + info.total_allocated_bytes;
+	    return heap_caps_get_total_size(MALLOC_CAP_SPIRAM)
 	}
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,7 @@ void EspClass::restart(void)`
`134`	`134`
`135`	`135`	`uint32_t EspClass::getHeapSize(void)`
`136`	`136`	`{`
`137`		`- multi_heap_info_t info;`
`138`		`- heap_caps_get_info(&info, MALLOC_CAP_INTERNAL);`
`139`		`- return info.total_free_bytes + info.total_allocated_bytes;`
	`137`	`+ return heap_caps_get_total_size(MALLOC_CAP_INTERNAL);`
`140`	`138`	`}`
`141`	`139`
`142`	`140`	`uint32_t EspClass::getFreeHeap(void)`
`@@ -157,9 +155,7 @@ uint32_t EspClass::getMaxAllocHeap(void)`
`157`	`155`	`uint32_t EspClass::getPsramSize(void)`
`158`	`156`	`{`
`159`	`157`	`if(psramFound()){`
`160`		`- multi_heap_info_t info;`
`161`		`- heap_caps_get_info(&info, MALLOC_CAP_SPIRAM);`
`162`		`- return info.total_free_bytes + info.total_allocated_bytes;`
	`158`	`+ return heap_caps_get_total_size(MALLOC_CAP_SPIRAM)`
`163`	`159`	`}`
`164`	`160`	`return 0;`
`165`	`161`	`}`