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

Ledmaps bugfix

Browse Source
This commit is contained in:
Ewoud
2023-02-10 16:57:07 +01:00
parent 40e82166bc
commit d42f24207d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wled00/FX_2Dfcn.cpp
View File

@@ -95,8 +95,10 @@ void WS2812FX::setUpMatrix(bool reset) {
x = p.serpentine && j%2 ? h-x-1 : x; x = p.serpentine && j%2 ? h-x-1 : x;
uint16_t index = (p.yOffset + (p.vertical?x:y)) * Segment::maxWidth + p.xOffset + (p.vertical?y:x); uint16_t index = (p.yOffset + (p.vertical?x:y)) * Segment::maxWidth + p.xOffset + (p.vertical?y:x);
if (loadedLedmap > 0) { if (loadedLedmap > 0) {
if (index < customMappingSizeLedmap) if (index < customMappingSizeLedmap) {
customMappingTableCombi[customMappingTable[index]] = pix; //WLEDMM: allow for 2 transitions if reset = false (ledmap and logical to physical) if (customMappingTable[index] < customMappingSize)
customMappingTableCombi[customMappingTable[index]] = pix; //WLEDMM: allow for 2 transitions if reset = false (ledmap and logical to physical)
}
else else
customMappingTableCombi[index] = pix; customMappingTableCombi[index] = pix;
} }

5
wled00/FX_fcn.cpp
View File

@@ -1971,14 +1971,15 @@ void WS2812FX::deserializeMap(uint8_t n) {
customMappingTable[i] = (uint16_t) 0xFFFFU; //fill the map entirely customMappingTable[i] = (uint16_t) 0xFFFFU; //fill the map entirely
} }
loadedLedmap = n; loadedLedmap = n;
#ifdef WLED_DEBUG
#ifdef WLED_DEBUG
DEBUG_PRINTF("Custom ledmap: %d\n", loadedLedmap); DEBUG_PRINTF("Custom ledmap: %d\n", loadedLedmap);
for (uint16_t i=0; i<customMappingSize; i++) { for (uint16_t i=0; i<customMappingSize; i++) {
if (!(i%Segment::maxWidth)) DEBUG_PRINTLN(); if (!(i%Segment::maxWidth)) DEBUG_PRINTLN();
DEBUG_PRINTF("%4d,", customMappingTable[i]); DEBUG_PRINTF("%4d,", customMappingTable[i]);
} }
DEBUG_PRINTLN(); DEBUG_PRINTLN();
#endif #endif
setUpMatrix(false); //WLEDMM: apply logical to physical mapping after the ledmap setUpMatrix(false); //WLEDMM: apply logical to physical mapping after the ledmap
} }