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

restore MM functionality to not reset segments if 2D settings change!!!

Browse Source 
customeffects.js:
- rename downloadCEFile to downloadGHFile
- downloadGHFile: add GH ledmaps folder

FX_fcn.cpp and set.cpp:
- change makeAutoSegments with resetSegments(true)
This commit is contained in:
Ewoud
2023-03-13 21:35:48 +01:00
parent 2f274399f3
commit a0576ba591
5 changed files with 817 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
usermods/customeffects/customeffects.js
View File

@@ -98,17 +98,18 @@ function populateCEEditor(name, segID)
<textarea class="ceTextarea" id="ceProgramArea">${text}</textarea><br>
<button class="btn infobtn" onclick="toggleCEEditor()">Close</button>
<button class="btn infobtn" onclick="saveCE('${name}.wled', ${segID})">Save and Run</button><br>
<button class="btn infobtn" onclick="downloadCEFile('CE','${name}.wled')">Download ${name}.wled</button>
<button class="btn infobtn" onclick="downloadGHFile('CE','${name}.wled')">Download ${name}.wled</button>
<button class="btn infobtn" onclick="loadCETemplate('${name}')">Load template</button><br>
<button class="btn infobtn" onclick="downloadCEFile('CE','wledv033.json')">Download wled json</button>
<button class="btn infobtn" onclick="downloadCEFile('CE','presets.json')">Download presets.json</button><br>
<button class="btn infobtn" onclick="downloadGHFile('CE','wledv033.json',true,true)">Download wled json</button>
<button class="btn infobtn" onclick="downloadGHFile('CE','presets.json',true,true)">Download presets.json</button><br>
<button class="btn infobtn" onclick="location.href='https://github.com/MoonModules/WLED-Effects/tree/master/CustomEffects/wled'" type="button">Custom Effects Library</button>
<button class="btn infobtn btn-xs" onclick="location.href='https://mm.kno.wled.ge/moonmodules/custom-effects'" type="button">?</button><br>
<br><i>Compile and Run Log</i><br>
<textarea class="ceTextarea" id="ceLogArea"></textarea><br>
<i>Run log > 3 seconds is send to Serial Ouput.</i><br>
<a href="#" onclick="downloadCEFile('HBB','presets.json');return false;" title="Download HBaas Base presets">🥚</a>
<a href="#" onclick="downloadCEFile('HBE','presets.json');return false;" title="Download HBaas Effects presets">🥚</a>`;
<a href="#" onclick="downloadGHFile('HBB','presets.json',true,true);return false;" title="Download HBaas Base presets">🥚</a>
<a href="#" onclick="downloadGHFile('HBE','presets.json',true,true);return false;" title="Download HBaas Effects presets">🥚</a>
<a href="#" onclick="downloadGHFile('LM','presets.json',true,true);return false;" title="Download Ledmap presets">🥚</a>`;
d.getElementById('kceEditor').innerHTML = cn;
@@ -122,14 +123,15 @@ function populateCEEditor(name, segID)
});
}
function downloadCEFile(url, name) {
function downloadGHFile(url, name, save=false, warn=false) { //Githubfile
if (url == "CE") url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/CustomEffects/wled/";
if (url == "HBB") url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/Presets/HB_PresetPack210808_32x32_16seg/Base%20pack/";
if (url == "HBE") url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/Presets/HB_PresetPack210808_32x32_16seg/Effects%20pack/";
if (url == "LM") url = "https://raw.githubusercontent.com/MoonModules/WLED-Effects/master/Ledmaps/";
fetchAndExecute(url, name, function(text) {
if (name == "wledv033.json" || name == "presets.json") {
if (!confirm('Are you sure to download/overwrite ' + name + '?'))
if (save) {
if (warn && !confirm('Are you sure to download/overwrite ' + name + '?'))
return;
uploadFileWithText("/" + name, text);
}
@@ -140,7 +142,7 @@ function downloadCEFile(url, name) {
}
}, function(error){
showToast(error);
console.log(error);
console.log(url + name,error);
});
return;

2
wled00/FX_fcn.cpp
View File

@@ -2097,7 +2097,7 @@ bool WS2812FX::deserializeMap(uint8_t n) {
Segment::maxWidth = p.width;
Segment::maxHeight = p.height;
makeAutoSegments();
resetSegments(true); //WLEDMM not makeAutoSegments() as we only want to change bounds
}
customMappingSize = map.size();

1
wled00/data/index.js
View File

@@ -1377,6 +1377,7 @@ function drawSegmentView() {
post();
}, function(error) { //error handling
console.log(error);
// downloadGHFile("LM", fileName, true, false); WLEDMM: remove as this has too much impact
post();
});
}

1603
wled00/html_ui.h
View File

File diff suppressed because it is too large Load Diff

2
wled00/set.cpp
View File

@@ -726,7 +726,7 @@ void handleSettingsSet(AsyncWebServerRequest *request, byte subPage)
strip.panel.push_back(p);
}
strip.setUpMatrix(); // will check limits
strip.makeAutoSegments(true);
strip.resetSegments(true); //WLEDMM not makeAutoSegments(true) as we only want to change bounds
strip.deserializeMap();
} else {
Segment::maxWidth = strip.getLengthTotal();