mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-11-02 02:41:57 +00:00
JakubandClaude Sonnet 5
19b8d96ffe
DeviceDiag::getHeapStats()/getStackFreeBytes() only had an implementation for NRF52_PLATFORM; every other platform fell through to the 0/0 stub, so Diagnostics > Live showed "N/A" for Heap free and Stack free on ESP32 boards (Heltec v3/v4) -- exactly the boards where that number is most useful to see. Added an ESP32 branch using heap_caps_get_free_size()/ heap_caps_get_total_size() (MALLOC_CAP_8BIT, matching the general-purpose heap `new`/malloc() actually draw from) and the same uxTaskGetStackHighWaterMark() call nRF52 already uses, since Arduino-ESP32 runs on FreeRTOS too. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
54 lines
1.9 KiB
C++
54 lines
1.9 KiB
C++
#include "DeviceDiag.h"
|
|
|
|
#if defined(NRF52_PLATFORM)
|
|
#include "FreeRTOS.h"
|
|
#include "task.h"
|
|
#include <malloc.h>
|
|
|
|
// Heap region size from the linker symbols the core's new.cpp uses for sbrk
|
|
// (framework-arduinoadafruitnrf52/cores/nRF5/new.cpp). "Used" comes from
|
|
// newlib's mallinfo().uordblks (bytes actually outstanding) rather than
|
|
// sbrk(0) - __HeapBase: sbrk only ever grows, so a high-water mark there
|
|
// counts freed-and-recycled blocks as permanently "used" and free heap looks
|
|
// far lower than it really is.
|
|
extern unsigned char __HeapBase[];
|
|
extern unsigned char __HeapLimit[];
|
|
|
|
void DeviceDiag::getHeapStats(uint32_t& free_bytes, uint32_t& total_bytes) {
|
|
total_bytes = (uint32_t)(__HeapLimit - __HeapBase);
|
|
uint32_t used = (uint32_t)mallinfo().uordblks;
|
|
free_bytes = (used < total_bytes) ? (total_bytes - used) : 0;
|
|
}
|
|
|
|
uint32_t DeviceDiag::getStackFreeBytes() {
|
|
return (uint32_t)uxTaskGetStackHighWaterMark(NULL) * sizeof(StackType_t);
|
|
}
|
|
|
|
#elif defined(ESP32)
|
|
#include <freertos/FreeRTOS.h>
|
|
#include <freertos/task.h>
|
|
#include <esp_heap_caps.h>
|
|
|
|
// MALLOC_CAP_8BIT: the general-purpose byte-addressable heap (what `new`/
|
|
// malloc() actually draw from) -- excludes DMA-only/IRAM regions a plain
|
|
// allocation could never land in, so this matches what's really available to
|
|
// the rest of the firmware rather than overstating it with capability pools
|
|
// nothing here can use.
|
|
void DeviceDiag::getHeapStats(uint32_t& free_bytes, uint32_t& total_bytes) {
|
|
free_bytes = (uint32_t)heap_caps_get_free_size(MALLOC_CAP_8BIT);
|
|
total_bytes = (uint32_t)heap_caps_get_total_size(MALLOC_CAP_8BIT);
|
|
}
|
|
|
|
uint32_t DeviceDiag::getStackFreeBytes() {
|
|
return (uint32_t)uxTaskGetStackHighWaterMark(NULL) * sizeof(StackType_t);
|
|
}
|
|
|
|
#else
|
|
|
|
void DeviceDiag::getHeapStats(uint32_t& free_bytes, uint32_t& total_bytes) {
|
|
free_bytes = 0; total_bytes = 0;
|
|
}
|
|
uint32_t DeviceDiag::getStackFreeBytes() { return 0; }
|
|
|
|
#endif
|