Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reduce RAM needs for -S2, user message on heap emergency actions

Browse Source
This commit is contained in:
Frank
2023-12-18 15:39:12 +01:00
parent c8cee6cb51
commit 36eb520592
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wled00/const.h
View File

@@ -448,7 +448,7 @@
#if defined(ARDUINO_ARCH_ESP32C3) #if defined(ARDUINO_ARCH_ESP32C3)
#define JSON_BUFFER_SIZE 44000 // WLEDMM - max 44KB on -C3 with PSRAM (chip has 400kb RAM) #define JSON_BUFFER_SIZE 44000 // WLEDMM - max 44KB on -C3 with PSRAM (chip has 400kb RAM)
#else #else
#define JSON_BUFFER_SIZE 32000 // WLEDMM - max 32KB on -S2 with PSRAM (chip has 320kb RAM) #define JSON_BUFFER_SIZE 28000 // WLEDMM - max 28KB on -S2 with PSRAM (chip has 320kb RAM)
#endif #endif
#else #else
#define JSON_BUFFER_SIZE 54000 // WLEDMM (was 60000) slightly reduced to avoid build error "region dram0_0_seg overflowed" #define JSON_BUFFER_SIZE 54000 // WLEDMM (was 60000) slightly reduced to avoid build error "region dram0_0_seg overflowed"

13
wled00/wled.cpp
View File

@@ -1180,16 +1180,19 @@ void WLED::handleConnection()
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
// reconnect WiFi to clear stale allocations if heap gets too low // reconnect WiFi to clear stale allocations if heap gets too low
if (now - heapTime > 5000) { // WLEDMM: updated with better logic for small heap available by block, not total. if (now - heapTime > 5000) { // WLEDMM: updated with better logic for small heap available by block, not total.
// uint32_t heap = ESP.getFreeHeap(); #if defined(ARDUINO_ARCH_ESP32S2)
uint32_t heap = ESP.getFreeHeap(); // WLEDMM works better on -S2
#else
uint32_t heap = heap_caps_get_largest_free_block(0x1800); // WLEDMM: This is a better metric for free heap. uint32_t heap = heap_caps_get_largest_free_block(0x1800); // WLEDMM: This is a better metric for free heap.
#endif
if (heap < MIN_HEAP_SIZE && lastHeap < MIN_HEAP_SIZE) { if (heap < MIN_HEAP_SIZE && lastHeap < MIN_HEAP_SIZE) {
DEBUG_PRINT(F("Heap too low! (step 2, force reconnect): ")); USER_PRINT(F("Heap too low! (step 2, force reconnect): "));
DEBUG_PRINTLN(heap); USER_PRINTLN(heap);
forceReconnect = true; forceReconnect = true;
strip.purgeSegments(true); // remove all but one segments from memory strip.purgeSegments(true); // remove all but one segments from memory
} else if (heap < MIN_HEAP_SIZE) { } else if (heap < MIN_HEAP_SIZE) {
DEBUG_PRINT(F("Heap too low! (step 1, flush unread UDP): ")); USER_PRINT(F("Heap too low! (step 1, flush unread UDP): "));
DEBUG_PRINTLN(heap); USER_PRINTLN(heap);
strip.purgeSegments(); strip.purgeSegments();
notifierUdp.flush(); notifierUdp.flush();
rgbUdp.flush(); rgbUdp.flush();