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

Merge remote-tracking branch 'upstream/main' into mdev

Browse Source
This commit is contained in:
Frank
2023-05-22 02:03:56 +02:00
parent 63e63ad156
commit d8726293bf
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
wled00/FX_fcn.cpp
View File

@@ -1480,13 +1480,14 @@ void WS2812FX::finalizeInit(void)
} }
if (useLedsArray && getLengthTotal()>0) { // WLEDMM avoid malloc(0) if (useLedsArray && getLengthTotal()>0) { // WLEDMM avoid malloc(0)
size_t arrSize = sizeof(CRGB) * getLengthTotal(); size_t arrSize = sizeof(CRGB) * getLengthTotal();
#if defined(ARDUINO_ARCH_ESP32) && defined(BOARD_HAS_PSRAM) && defined(WLED_USE_PSRAM) // softhack007 disabled; putting leds into psram leads to horrible slowdown on WROVER boards (see setUpLeds())
if (psramFound()) //#if defined(ARDUINO_ARCH_ESP32) && defined(BOARD_HAS_PSRAM) && defined(WLED_USE_PSRAM)
Segment::_globalLeds = (CRGB*) ps_malloc(arrSize); //if (psramFound())
else // Segment::_globalLeds = (CRGB*) ps_malloc(arrSize);
#endif //else
Segment::_globalLeds = (CRGB*) malloc(arrSize); //#endif
if (Segment::_globalLeds != nullptr) memset(Segment::_globalLeds, 0, arrSize); // WLEDMM avoid dereferencing null pointer if (arrSize > 0) Segment::_globalLeds = (CRGB*) malloc(arrSize); // WLEDMM avoid malloc(0)
if (Segment::_globalLeds != nullptr) memset(Segment::_globalLeds, 0, arrSize); // WLEDMM avoid dereferencing nullptr
} }
//segments are created in makeAutoSegments(); //segments are created in makeAutoSegments();