diff --git a/wled00/FX_2Dfcn.cpp b/wled00/FX_2Dfcn.cpp
index c97b5afc..6c31db11 100644
--- a/wled00/FX_2Dfcn.cpp
+++ b/wled00/FX_2Dfcn.cpp
@@ -65,10 +65,11 @@ void WS2812FX::setUpMatrix() {
//WLEDMM recreate customMappingTable if more space needed
if (Segment::maxWidth * Segment::maxHeight > customMappingTableSize) {
- USER_PRINTF("setupmatrix customMappingTable alloc %d from %d\n", Segment::maxWidth * Segment::maxHeight, customMappingTableSize);
+ uint32_t size = MAX(ledmapMaxSize, Segment::maxWidth * Segment::maxHeight);//TroyHack
+ USER_PRINTF("setupmatrix customMappingTable alloc %d from %d\n", size, customMappingTableSize);
if (customMappingTable != nullptr) delete[] customMappingTable;
- customMappingTable = new uint16_t[Segment::maxWidth * Segment::maxHeight];
- if (customMappingTable != nullptr) customMappingTableSize = Segment::maxWidth * Segment::maxHeight;
+ customMappingTable = new uint16_t[size];
+ if (customMappingTable != nullptr) customMappingTableSize = size;
}
if (customMappingTable != nullptr) {
diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp
index 2733ee62..92e1c111 100644
--- a/wled00/FX_fcn.cpp
+++ b/wled00/FX_fcn.cpp
@@ -110,13 +110,14 @@ Segment::Segment(const Segment &orig) {
//WLEDMM: recreate ledsrgb if more space needed (will not free ledsrgb!)
void Segment::allocLeds() {
- if (!ledsrgb || sizeof(CRGB)*length() > ledsrgbSize) {
- USER_PRINTF("allocLeds %d from %d\n", sizeof(CRGB)*length(), ledsrgb?ledsrgbSize:0);
- ledsrgb = (CRGB*)malloc(sizeof(CRGB)*length());
- ledsrgbSize = ledsrgb?sizeof(CRGB)*length():0;
+ uint16_t size = sizeof(CRGB)*MAX(length(), ledmapMaxSize); //TroyHack
+ if (!ledsrgb || size > ledsrgbSize) {
+ USER_PRINTF("allocLeds %d from %d\n", size, ledsrgb?ledsrgbSize:0);
+ ledsrgb = (CRGB*)malloc(size);
+ ledsrgbSize = ledsrgb?size:0;
}
else {
- USER_PRINTF("reuse Leds %d from %d\n", sizeof(CRGB)*length(), ledsrgb?ledsrgbSize:0);
+ USER_PRINTF("reuse Leds %d from %d\n", size, ledsrgb?ledsrgbSize:0);
}
}
@@ -1367,6 +1368,7 @@ uint8_t * Segment::getAudioPalette(int pal) {
//WLEDMM from util.cpp
// enumerate all ledmapX.json files on FS and extract ledmap names if existing
void WS2812FX::enumerateLedmaps() {
+ ledmapMaxSize = 0;
ledMaps = 1;
for (int i=1; i<10; i++) {
char fileName[33];
@@ -1392,7 +1394,6 @@ void WS2812FX::enumerateLedmaps() {
f.find("\"n\":");
char name[33];
f.readBytesUntil('\n', name, sizeof(name));
- USER_PRINTF("enumerateLedmaps %s %s\n", fileName, name);
size_t len = 0;
if (name != nullptr) {
@@ -1409,6 +1410,18 @@ void WS2812FX::enumerateLedmaps() {
ledmapNames[i-1] = new char[len+1];
if (ledmapNames[i-1]) strlcpy(ledmapNames[i-1], tmp, 33);
}
+
+ //WLEDMM calc ledmapMaxSize (TroyHack)
+ char dim[33];
+ f.find("\"width\":");
+ f.readBytesUntil('\n', dim, sizeof(dim)); //hack: use fileName as we have this allocated already
+ uint16_t maxWidth = atoi(dim);
+ f.find("\"height\":");
+ f.readBytesUntil('\n', dim, sizeof(dim));
+ uint16_t maxHeight = atoi(dim);
+ ledmapMaxSize = MAX(ledmapMaxSize, maxWidth * maxHeight);
+
+ USER_PRINTF("enumerateLedmaps %s %s (%dx%d -> %d)\n", fileName, name, maxWidth, maxHeight, ledmapMaxSize);
}
f.close();
releaseJSONBufferLock();
@@ -2196,7 +2209,6 @@ bool WS2812FX::deserializeMap(uint8_t n) {
f.readBytesUntil('\n', fileName, sizeof(fileName)); //hack: use fileName as we have this allocated already
uint16_t maxWidth = atoi(fileName);
-
f.find("\"height\":");
f.readBytesUntil('\n', fileName, sizeof(fileName));
uint16_t maxHeight = atoi(fileName);
@@ -2214,10 +2226,11 @@ bool WS2812FX::deserializeMap(uint8_t n) {
//WLEDMM recreate customMappingTable if more space needed
if (Segment::maxWidth * Segment::maxHeight > customMappingTableSize) {
- USER_PRINTF("deserializemap customMappingTable alloc %d from %d\n", Segment::maxWidth * Segment::maxHeight, customMappingTableSize);
+ uint32_t size = MAX(ledmapMaxSize, Segment::maxWidth * Segment::maxHeight);//TroyHack
+ USER_PRINTF("deserializemap customMappingTable alloc %d from %d\n", size, customMappingTableSize);
if (customMappingTable != nullptr) delete[] customMappingTable;
- customMappingTable = new uint16_t[Segment::maxWidth * Segment::maxHeight];
- if (customMappingTable != nullptr) customMappingTableSize = Segment::maxWidth * Segment::maxHeight;
+ customMappingTable = new uint16_t[size];
+ if (customMappingTable != nullptr) customMappingTableSize = size;
}
if (customMappingTable != nullptr) {
diff --git a/wled00/data/index.js b/wled00/data/index.js
index 6b5600e6..2b30c567 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -802,6 +802,7 @@ function populateSegments(s)
``+
(cfg.comp.segpwr ? segp : '') +
``+
+ `
` + //
`
`+
`
`+
``+
@@ -835,7 +836,7 @@ function populateSegments(s)
(!isMSeg ? rvXck : '') +
(isMSeg&&stoY-staY>1&&stoX-staX>1 ? map2D : '') +
(s.AudioReactive && s.AudioReactive.on ? "" : sndSim) +
- (s.ARTIFX && s.ARTIFX.on && fxName.includes("ARTI-FX") ? cusEff : "") +
+ (s.ARTIFX && s.ARTIFX.on && fxName.includes("ARTI-FX") ? cusEff : "") + //
`