Merge branch 'main' into seg-groups

This commit is contained in:
Blaz Kristan 2023-04-02 18:17:47 +02:00
commit bcac978810
4 changed files with 530 additions and 527 deletions

View File

@ -273,7 +273,7 @@ function getPixelRGBValues(base64Image) {
//Aggregated Strings That should be returned to the user //Aggregated Strings That should be returned to the user
if (i > 0){ if (i > 0){
JSONledString = JSONledString + '\n'; JSONledString = JSONledString + '\n<NEXT COMMAND (multiple commands not supported in API/preset setup)>\n';
curlString = curlString + ' && '; curlString = curlString + ' && ';
} }
JSONledString += thisJSONledString; JSONledString += thisJSONledString;

View File

@ -60,7 +60,7 @@
</td> </td>
<td class="adaptiveTD"> <td class="adaptiveTD">
<select id="colorFormatSelector" class="mainSelector"> <select id="colorFormatSelector" class="mainSelector">
<option value="hex" selected>HEX (#f4f4f4)</option> <option value="hex" selected>HEX (&quot;f4f4f4&quot;)</option>
<option value="dec">DEC (244,244,244)</option> <option value="dec">DEC (244,244,244)</option>
</select> </select>
</td> </td>
@ -71,9 +71,9 @@
</td> </td>
<td class="adaptiveTD"> <td class="adaptiveTD">
<select id="addressingSelector" class="mainSelector"> <select id="addressingSelector" class="mainSelector">
<option value="hybrid" selected>Hybrid (#f0f0f0,10, 17, #f4f4f4)</option> <option value="hybrid" selected>Hybrid (&quot;f0f0f0&quot;,10, 17, &quot;f4f4f4&quot;)</option>
<option value="range">Range (10, 17, #f4f4f4)</option> <option value="range">Range (10, 17, &quot;f4f4f4&quot;)</option>
<option value="single">Single (#f4f4f4)</option> <option value="single">Single (&quot;f4f4f4&quot;)</option>
</select> </select>
</td> </td>
</tr> </tr>
@ -196,7 +196,7 @@
<button id="sendJSONledbutton" class="buttonclass"></button> <button id="sendJSONledbutton" class="buttonclass"></button>
</div> </div>
<div> <div>
<h3><div id="version">Version 1.0.7</div>&nbsp;-&nbsp; <a href="https://github.com/werkstrom/WLED-PixelArtConverter/blob/main/README.md" target="_blank">Help/About</a></h3> <h3><div id="version">Version 1.0.8</div>&nbsp;-&nbsp; <a href="https://github.com/werkstrom/WLED-PixelArtConverter/blob/main/README.md" target="_blank">Help/About</a></h3>
</div> </div>
</div> </div>
<div id=bottom-part style="display: none" class=bottom-part></div> <div id=bottom-part style="display: none" class=bottom-part></div>

View File

@ -69,7 +69,6 @@ cjb.addEventListener('click', async () => {
lSS.addEventListener("change", gen); lSS.addEventListener("change", gen);
szY.addEventListener("change", gen); szY.addEventListener("change", gen);
szX.addEventListener("change", gen); szX.addEventListener("change", gen);
//frm.addEventListener("change", gen);
cFS.addEventListener("change", gen); cFS.addEventListener("change", gen);
aS.addEventListener("change", gen); aS.addEventListener("change", gen);
brgh.addEventListener("change", gen); brgh.addEventListener("change", gen);
@ -115,6 +114,7 @@ cLN.oninput = () => {
frm.addEventListener("change", () => { frm.addEventListener("change", () => {
for (var i = 0; i < hideableRows.length; i++) { for (var i = 0; i < hideableRows.length; i++) {
hideableRows[i].classList.toggle("hide", frm.value !== "ha"); hideableRows[i].classList.toggle("hide", frm.value !== "ha");
gen();
} }
}); });

File diff suppressed because it is too large Load Diff