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

This commit is contained in:
Frank
2023-05-22 02:03:56 +02:00

View File

@@ -1470,13 +1470,14 @@ void WS2812FX::finalizeInit(void)
} }
if (useLedsArray) { if (useLedsArray) {
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
memset(Segment::_globalLeds, 0, arrSize); 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();