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

Ledmap refactors

Browse Source 
Refactor ledmap in index.js and FX_fcn.cpp (remove physical)

WS2812FX::setPixelColor and gPC: check index after ledmap applied
This commit is contained in:
Ewoud
2023-03-09 15:08:26 +01:00
parent 3a294d0852
commit c16532126a
3 changed files with 1080 additions and 1099 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
wled00/data/index.js
View File

@@ -710,7 +710,8 @@ function populateSegments(s)
let li = lastinfo;
segCount = 0; lowestUnused = 0; lSeg = 0;
ledmapFileNames = [];
ledmapNr = s.ledmap; //WLEDMM
ledmapFileNames = []; //WLEDMM
for (var inst of (s.seg||[])) {
segCount++;
@@ -833,7 +834,7 @@ function populateSegments(s)
resetUtil(noNewSegs);
if (gId('selall')) gId('selall').checked = true;
for (var i = 0; i <= lSeg; i++) {
updateLen(i, false);
updateLen(i, false); //WLEDMM: no draw
updateTrail(gId(`seg${i}bri`));
gId(`segr${i}`).style.display = "none";
if (!gId(`seg${i}sel`).checked && gId('selall')) gId('selall').checked = false; // uncheck if at least one is unselected.
@@ -1322,7 +1323,6 @@ function drawSegmentView() {
//draw the ledmap
if (ledmapNr>=0 && ctx) { //WLEDMM: @Troy#2642 : include ledmap = 0 as default ledmap
// console.log("Before fetch ledmap ", lastinfo.ledmap);
var fileName;
if (ledmapNr==0)
fileName = "ledmap.json"; //0 is ledmap.json, not ledmap0.json
@@ -1331,7 +1331,7 @@ function drawSegmentView() {
else
fileName = ledmapFileNames[ledmapNr-10];
fetchAndExecute((loc?`http://${locip}`:'.') + "/", fileName , function(text) {
fetchAndExecute((loc?`http://${locip}`:'.') + "/", fileName , function(text) {
var ledmapJson = JSON.parse(text);
var counter = 0;
var noMap = [];
@@ -1339,13 +1339,9 @@ function drawSegmentView() {
var colorArray = ["yellow", "green", "magenta", "orange"];
var customMappingTable = [];
if (!ledmapJson["physical"]) {
customMappingTable = ledmapJson["map"];
} else {
for (let i=0;i<maxWidth * maxHeight;i++) customMappingTable.push(-1); //init with noshow
for (let i=0;i<maxWidth * maxHeight;i++)
if (ledmapJson["map"][i]>=0) customMappingTable[ledmapJson["map"][i]] = i;
}
for (let i=0;i<maxWidth * maxHeight;i++) customMappingTable.push(-1); //init with noshow
for (let i=0;i<maxWidth * maxHeight;i++)
if (ledmapJson["map"][i]>=0) customMappingTable[ledmapJson["map"][i]] = i;
for (let i=0;i<customMappingTable.length;i++) {
let mapIndex = customMappingTable[i];
@@ -1576,8 +1572,6 @@ function readState(s,command=false)
tr = s.transition;
gId('tt').value = tr/10;
ledmapNr = s.ledmap; //WLEDMM
populateSegments(s);
var selc=0;
var sellvl=0; // 0: selc is invalid, 1: selc is mainseg, 2: selc is first selected