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

psram-aware malloc functions (backport of upstream #4895) (#342)

Browse Source 
Introduces new memory allocation functions, based on wled#4895 by @DedeHai

* keep a minimum of 15KB RAM available to UI - improves stability
* S3/S2/C3 automatically use "fast RTC Ram" for small data (reduces fragmentation)
* auto-detects PSRAM (or no PSRAM) when firmware was built with -D BOARD_HAS_PSRAM
* d_malloc() and d_calloc() prefer DRAM if possible (faster), but fall back to PSRAM when free RAM gets low.
This commit is contained in:
Frank Möhle
2026-02-18 17:57:47 +01:00
committed by GitHub
parent 50bb4d2910
commit cce3c0b5d3
19 changed files with 696 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wled00/src/dependencies/json/AsyncJson-v6.h
View File

@@ -15,6 +15,20 @@
#include "ArduinoJson-v6.h"
#include <Print.h>
// global WLED memory functions (util.cpp)
extern "C" {
// prefer DRAM in d_xalloc functions, PSRAM as fallback
void *d_malloc(size_t);
void *d_calloc(size_t, size_t);
void *d_realloc_malloc(void *ptr, size_t size);
void d_free(void *ptr);
// prefer PSRAM in p_xalloc functions, DRAM as fallback
void *p_malloc(size_t);
void *p_calloc(size_t, size_t);
void *p_realloc_malloc(void *ptr, size_t size);
void p_free(void *ptr);
}
#ifdef ESP8266
#define DYNAMIC_JSON_DOCUMENT_SIZE 8192
#else
@@ -154,6 +168,7 @@ public:
if (_onRequest) {
_contentLength = total;
if (total > 0 && request->_tempObject == NULL && (int)total < _maxContentLength) {
//request->_tempObject = d_malloc(total); // seems to cause instabilities on classic esp32 with PSRAM
request->_tempObject = malloc(total);
}
if (request->_tempObject != NULL) {

54
wled00/src/dependencies/time/DateStrings.cpp
View File

@@ -12,6 +12,9 @@
#if defined(__AVR__)
#include <avr/pgmspace.h>
#else
#if defined(ARDUINO_ARCH_ESP32)
#include <pgmspace.h>
#else
// for compatiblity with Arduino Due and Teensy 3.0 and maybe others?
#define PROGMEM
#define PGM_P const char *
@@ -19,6 +22,7 @@
#define pgm_read_word(addr) (*(const unsigned char **)(addr))
#define strcpy_P(dest, src) strcpy((dest), (src))
#endif
#endif
#include <string.h> // for strcpy_P or strcpy
#include "TimeLib.h"
@@ -27,43 +31,43 @@
static char buffer[dt_MAX_STRING_LEN+1]; // must be big enough for longest string and the terminating null
const char monthStr0[] PROGMEM = "";
const char monthStr1[] PROGMEM = "January";
const char monthStr2[] PROGMEM = "February";
const char monthStr3[] PROGMEM = "March";
const char monthStr4[] PROGMEM = "April";
const char monthStr5[] PROGMEM = "May";
const char monthStr6[] PROGMEM = "June";
const char monthStr7[] PROGMEM = "July";
const char monthStr8[] PROGMEM = "August";
const char monthStr9[] PROGMEM = "September";
const char monthStr10[] PROGMEM = "October";
const char monthStr11[] PROGMEM = "November";
const char monthStr12[] PROGMEM = "December";
static const char monthStr0[] PROGMEM = "";
static const char monthStr1[] PROGMEM = "January";
static const char monthStr2[] PROGMEM = "February";
static const char monthStr3[] PROGMEM = "March";
static const char monthStr4[] PROGMEM = "April";
static const char monthStr5[] PROGMEM = "May";
static const char monthStr6[] PROGMEM = "June";
static const char monthStr7[] PROGMEM = "July";
static const char monthStr8[] PROGMEM = "August";
static const char monthStr9[] PROGMEM = "September";
static const char monthStr10[] PROGMEM = "October";
static const char monthStr11[] PROGMEM = "November";
static const char monthStr12[] PROGMEM = "December";
const PROGMEM char * const PROGMEM monthNames_P[] =
static const PROGMEM char * const PROGMEM monthNames_P[] =
{
monthStr0,monthStr1,monthStr2,monthStr3,monthStr4,monthStr5,monthStr6,
monthStr7,monthStr8,monthStr9,monthStr10,monthStr11,monthStr12
};
const char monthShortNames_P[] PROGMEM = "ErrJanFebMarAprMayJunJulAugSepOctNovDec";
static const char monthShortNames_P[] PROGMEM = "ErrJanFebMarAprMayJunJulAugSepOctNovDec";
const char dayStr0[] PROGMEM = "Err";
const char dayStr1[] PROGMEM = "Sunday";
const char dayStr2[] PROGMEM = "Monday";
const char dayStr3[] PROGMEM = "Tuesday";
const char dayStr4[] PROGMEM = "Wednesday";
const char dayStr5[] PROGMEM = "Thursday";
const char dayStr6[] PROGMEM = "Friday";
const char dayStr7[] PROGMEM = "Saturday";
static const char dayStr0[] PROGMEM = "Err";
static const char dayStr1[] PROGMEM = "Sunday";
static const char dayStr2[] PROGMEM = "Monday";
static const char dayStr3[] PROGMEM = "Tuesday";
static const char dayStr4[] PROGMEM = "Wednesday";
static const char dayStr5[] PROGMEM = "Thursday";
static const char dayStr6[] PROGMEM = "Friday";
static const char dayStr7[] PROGMEM = "Saturday";
const PROGMEM char * const PROGMEM dayNames_P[] =
static const PROGMEM char * const PROGMEM dayNames_P[] =
{
dayStr0,dayStr1,dayStr2,dayStr3,dayStr4,dayStr5,dayStr6,dayStr7
};
const char dayShortNames_P[] PROGMEM = "ErrSunMonTueWedThuFriSat";
static const char dayShortNames_P[] PROGMEM = "ErrSunMonTueWedThuFriSat";
/* functions to return date strings */