lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Blaz Kristan 2022-04-12 16:08:17 +02:00
parent 845aa733b7
commit f915201a27
6 changed files with 1401 additions and 1431 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
wled00/FX_fcn.cpp
View File

@ -85,8 +85,8 @@ void WS2812FX::finalizeInit(void)
DEBUG_PRINTLN(F("No busses, init default"));
const uint8_t defDataPins[] = {DATA_PINS};
const uint16_t defCounts[] = {PIXEL_COUNTS};
const uint8_t defNumBusses = ((sizeof defDataPins) / (sizeof defDataPins[0])); // min 1
const uint8_t defNumCounts = ((sizeof defCounts) / (sizeof defCounts[0])); // min 1
const uint8_t defNumBusses = ((sizeof defDataPins) / (sizeof defDataPins[0]));
const uint8_t defNumCounts = ((sizeof defCounts) / (sizeof defCounts[0]));
uint16_t prevLen = 0;
for (uint8_t i = 0; i < defNumBusses && i < WLED_MAX_BUSSES; i++) {
uint8_t defPin[] = {defDataPins[i]};
@ -399,11 +399,7 @@ uint8_t WS2812FX::getPaletteCount()
{
return 13 + GRADIENT_PALETTE_COUNT;
}
/*
void WS2812FX::setColor(uint8_t slot, uint8_t r, uint8_t g, uint8_t b, uint8_t w) {
setColor(slot, RGBW32(r, g, b, w));
}
*/
//applies to all active and selected segments
void WS2812FX::setColor(uint8_t slot, uint32_t c) {
if (slot >= NUM_COLORS) return;

21
wled00/data/index.css
View File

@ -180,13 +180,6 @@ button {
color: var(--c-d);
}
.edit-icon {
/*position: absolute;*/
/*right: -26px;*/
/*top: 10px;*/
display: none;
}
.search-icon {
position: absolute;
top: 8px;
@ -194,7 +187,6 @@ button {
pointer-events: none;
width: 24px;
height: 24px;
/*margin-top: -1px;*/
}
.clear-icon {
@ -203,7 +195,6 @@ button {
top: 8px;
right: 9px;
cursor: pointer;
/*margin-top: -1px;*/
}
.flr {
@ -384,11 +375,7 @@ button {
border-radius: 15px;
}
/*
#sliderLabel2, #sliderLabel3, #sliderLabel4,
#slider2, #slider3, #slider4,
*/
#pql {
#pql, .edit-icon {
display: none;
}
@ -863,7 +850,6 @@ textarea {
}
.ptxt {
/*width: 236px !important;*/
margin: 0 4px 4px !important;
display: none;
}
@ -1060,9 +1046,6 @@ textarea {
/* segment & preset wrapper */
.seg, .pres {
/*position: relative;*/
/*display: block;*/
/*margin: 0 0 10px;*/
background-color: var(--c-2);
color: var(--c-f);
border: 0px solid var(--c-f);
@ -1071,7 +1054,6 @@ textarea {
/*filter: brightness(1);*/
font-size: 19px;
border-radius: 21px;
/*min-height: 40px;*/
min-width: 280px;
}
@ -1079,7 +1061,6 @@ textarea {
top: auto !important; /* prevent sticky */
bottom: auto !important;
}
/*
.seg:last-child {
margin: 0;

2
wled00/data/index.htm
View File

@ -157,7 +157,7 @@
</div>
<p class="labels h" id="cslLabel"></p>
<div id="hexw">
<i class="icons sel-icon" onclick="tglRgb()">&#xe22d;<!--&#xe2b3;--></i>
<i class="icons sel-icon" onclick="tglRgb()">&#xe22d;</i>
<input id="hexc" type="text" class="noslide" onkeydown="hexEnter()" autocomplete="off" maxlength="8" />
<button id="hexcnf" class="btn btn-xs" onclick="fromHex();"><i class="icons btn-icon">&#xe390;</i></button>
</div>

2
wled00/data/index.js
View File

@ -1762,7 +1762,7 @@ function resetPUtil()
p.classList.add('staybot');
p.classList.remove('pres');
p.innerHTML = `<button class="btn btn-s" onclick="makePUtil()" style="float:left;"><i class="icons btn-icon">&#xe18a;</i>preset</button>`
+ `<button class="btn btn-s" onclick="makePlUtil()" style="float:right;"><i class="icons btn-icon">&#xe18a;<!--&#xe139;--></i>playlist</button>`;
+ `<button class="btn btn-s" onclick="makePlUtil()" style="float:right;"><i class="icons btn-icon">&#xe18a;</i>playlist</button>`;
}
function tglCs(i)

2788
wled00/html_ui.h
View File

File diff suppressed because it is too large Load Diff

7
wled00/json.cpp
View File

@ -229,8 +229,6 @@ void deserializeSegment(JsonObject elem, byte it, byte presetId)
// deserializes WLED state (fileDoc points to doc object if called from web server)
bool deserializeState(JsonObject root, byte callMode, byte presetId)
{
DEBUG_PRINTLN(F("Deserializing state"));
bool stateResponse = root[F("v")] | false;
bool onBefore = bri;
@ -349,12 +347,10 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
byte ps = root[F("psave")];
if (ps > 0) {
DEBUG_PRINTLN(F("Saving preset"));
savePreset(ps, nullptr, root);
} else {
ps = root[F("pdel")]; //deletion
if (ps > 0) {
DEBUG_PRINTLN(F("Deleting preset"));
deletePreset(ps);
}
@ -524,7 +520,6 @@ void serializeInfo(JsonObject root)
root[F("udpport")] = udpPort;
root["live"] = (bool)realtimeMode;
root[F("liveseg")] = useMainSegmentOnly ? strip.getMainSegmentId() : -1; // if using main segment only for live
//root[F("mso")] = useMainSegmentOnly; // using main segment only for live
switch (realtimeMode) {
case REALTIME_MODE_INACTIVE: root["lm"] = ""; break;
@ -559,7 +554,7 @@ void serializeInfo(JsonObject root)
char fileName[16];
strcpy_P(fileName, PSTR("/ledmap"));
if (i) sprintf(fileName +7, "%d", i);
strcat(fileName, ".json");
strcat_P(fileName, PSTR(".json"));
bool isFile = WLED_FS.exists(fileName);
if (isFile || i==0) ledmaps.add(i);
}