Cleanup.
This commit is contained in:
parent
845aa733b7
commit
f915201a27
@ -85,8 +85,8 @@ void WS2812FX::finalizeInit(void)
|
|||||||
DEBUG_PRINTLN(F("No busses, init default"));
|
DEBUG_PRINTLN(F("No busses, init default"));
|
||||||
const uint8_t defDataPins[] = {DATA_PINS};
|
const uint8_t defDataPins[] = {DATA_PINS};
|
||||||
const uint16_t defCounts[] = {PIXEL_COUNTS};
|
const uint16_t defCounts[] = {PIXEL_COUNTS};
|
||||||
const uint8_t defNumBusses = ((sizeof defDataPins) / (sizeof defDataPins[0])); // min 1
|
const uint8_t defNumBusses = ((sizeof defDataPins) / (sizeof defDataPins[0]));
|
||||||
const uint8_t defNumCounts = ((sizeof defCounts) / (sizeof defCounts[0])); // min 1
|
const uint8_t defNumCounts = ((sizeof defCounts) / (sizeof defCounts[0]));
|
||||||
uint16_t prevLen = 0;
|
uint16_t prevLen = 0;
|
||||||
for (uint8_t i = 0; i < defNumBusses && i < WLED_MAX_BUSSES; i++) {
|
for (uint8_t i = 0; i < defNumBusses && i < WLED_MAX_BUSSES; i++) {
|
||||||
uint8_t defPin[] = {defDataPins[i]};
|
uint8_t defPin[] = {defDataPins[i]};
|
||||||
@ -399,11 +399,7 @@ uint8_t WS2812FX::getPaletteCount()
|
|||||||
{
|
{
|
||||||
return 13 + GRADIENT_PALETTE_COUNT;
|
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
|
//applies to all active and selected segments
|
||||||
void WS2812FX::setColor(uint8_t slot, uint32_t c) {
|
void WS2812FX::setColor(uint8_t slot, uint32_t c) {
|
||||||
if (slot >= NUM_COLORS) return;
|
if (slot >= NUM_COLORS) return;
|
||||||
|
@ -180,13 +180,6 @@ button {
|
|||||||
color: var(--c-d);
|
color: var(--c-d);
|
||||||
}
|
}
|
||||||
|
|
||||||
.edit-icon {
|
|
||||||
/*position: absolute;*/
|
|
||||||
/*right: -26px;*/
|
|
||||||
/*top: 10px;*/
|
|
||||||
display: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.search-icon {
|
.search-icon {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 8px;
|
top: 8px;
|
||||||
@ -194,7 +187,6 @@ button {
|
|||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
width: 24px;
|
width: 24px;
|
||||||
height: 24px;
|
height: 24px;
|
||||||
/*margin-top: -1px;*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.clear-icon {
|
.clear-icon {
|
||||||
@ -203,7 +195,6 @@ button {
|
|||||||
top: 8px;
|
top: 8px;
|
||||||
right: 9px;
|
right: 9px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
/*margin-top: -1px;*/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.flr {
|
.flr {
|
||||||
@ -384,11 +375,7 @@ button {
|
|||||||
border-radius: 15px;
|
border-radius: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
#pql, .edit-icon {
|
||||||
#sliderLabel2, #sliderLabel3, #sliderLabel4,
|
|
||||||
#slider2, #slider3, #slider4,
|
|
||||||
*/
|
|
||||||
#pql {
|
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -863,7 +850,6 @@ textarea {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.ptxt {
|
.ptxt {
|
||||||
/*width: 236px !important;*/
|
|
||||||
margin: 0 4px 4px !important;
|
margin: 0 4px 4px !important;
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
@ -1060,9 +1046,6 @@ textarea {
|
|||||||
|
|
||||||
/* segment & preset wrapper */
|
/* segment & preset wrapper */
|
||||||
.seg, .pres {
|
.seg, .pres {
|
||||||
/*position: relative;*/
|
|
||||||
/*display: block;*/
|
|
||||||
/*margin: 0 0 10px;*/
|
|
||||||
background-color: var(--c-2);
|
background-color: var(--c-2);
|
||||||
color: var(--c-f);
|
color: var(--c-f);
|
||||||
border: 0px solid var(--c-f);
|
border: 0px solid var(--c-f);
|
||||||
@ -1071,7 +1054,6 @@ textarea {
|
|||||||
/*filter: brightness(1);*/
|
/*filter: brightness(1);*/
|
||||||
font-size: 19px;
|
font-size: 19px;
|
||||||
border-radius: 21px;
|
border-radius: 21px;
|
||||||
/*min-height: 40px;*/
|
|
||||||
min-width: 280px;
|
min-width: 280px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1079,7 +1061,6 @@ textarea {
|
|||||||
top: auto !important; /* prevent sticky */
|
top: auto !important; /* prevent sticky */
|
||||||
bottom: auto !important;
|
bottom: auto !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
.seg:last-child {
|
.seg:last-child {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
|
@ -157,7 +157,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<p class="labels h" id="cslLabel"></p>
|
<p class="labels h" id="cslLabel"></p>
|
||||||
<div id="hexw">
|
<div id="hexw">
|
||||||
<i class="icons sel-icon" onclick="tglRgb()"><!----></i>
|
<i class="icons sel-icon" onclick="tglRgb()"></i>
|
||||||
<input id="hexc" type="text" class="noslide" onkeydown="hexEnter()" autocomplete="off" maxlength="8" />
|
<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"></i></button>
|
<button id="hexcnf" class="btn btn-xs" onclick="fromHex();"><i class="icons btn-icon"></i></button>
|
||||||
</div>
|
</div>
|
||||||
|
@ -1762,7 +1762,7 @@ function resetPUtil()
|
|||||||
p.classList.add('staybot');
|
p.classList.add('staybot');
|
||||||
p.classList.remove('pres');
|
p.classList.remove('pres');
|
||||||
p.innerHTML = `<button class="btn btn-s" onclick="makePUtil()" style="float:left;"><i class="icons btn-icon"></i>preset</button>`
|
p.innerHTML = `<button class="btn btn-s" onclick="makePUtil()" style="float:left;"><i class="icons btn-icon"></i>preset</button>`
|
||||||
+ `<button class="btn btn-s" onclick="makePlUtil()" style="float:right;"><i class="icons btn-icon"><!----></i>playlist</button>`;
|
+ `<button class="btn btn-s" onclick="makePlUtil()" style="float:right;"><i class="icons btn-icon"></i>playlist</button>`;
|
||||||
}
|
}
|
||||||
|
|
||||||
function tglCs(i)
|
function tglCs(i)
|
||||||
|
2788
wled00/html_ui.h
2788
wled00/html_ui.h
File diff suppressed because it is too large
Load Diff
@ -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)
|
// deserializes WLED state (fileDoc points to doc object if called from web server)
|
||||||
bool deserializeState(JsonObject root, byte callMode, byte presetId)
|
bool deserializeState(JsonObject root, byte callMode, byte presetId)
|
||||||
{
|
{
|
||||||
DEBUG_PRINTLN(F("Deserializing state"));
|
|
||||||
|
|
||||||
bool stateResponse = root[F("v")] | false;
|
bool stateResponse = root[F("v")] | false;
|
||||||
|
|
||||||
bool onBefore = bri;
|
bool onBefore = bri;
|
||||||
@ -349,12 +347,10 @@ bool deserializeState(JsonObject root, byte callMode, byte presetId)
|
|||||||
|
|
||||||
byte ps = root[F("psave")];
|
byte ps = root[F("psave")];
|
||||||
if (ps > 0) {
|
if (ps > 0) {
|
||||||
DEBUG_PRINTLN(F("Saving preset"));
|
|
||||||
savePreset(ps, nullptr, root);
|
savePreset(ps, nullptr, root);
|
||||||
} else {
|
} else {
|
||||||
ps = root[F("pdel")]; //deletion
|
ps = root[F("pdel")]; //deletion
|
||||||
if (ps > 0) {
|
if (ps > 0) {
|
||||||
DEBUG_PRINTLN(F("Deleting preset"));
|
|
||||||
deletePreset(ps);
|
deletePreset(ps);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -524,7 +520,6 @@ void serializeInfo(JsonObject root)
|
|||||||
root[F("udpport")] = udpPort;
|
root[F("udpport")] = udpPort;
|
||||||
root["live"] = (bool)realtimeMode;
|
root["live"] = (bool)realtimeMode;
|
||||||
root[F("liveseg")] = useMainSegmentOnly ? strip.getMainSegmentId() : -1; // if using main segment only for live
|
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) {
|
switch (realtimeMode) {
|
||||||
case REALTIME_MODE_INACTIVE: root["lm"] = ""; break;
|
case REALTIME_MODE_INACTIVE: root["lm"] = ""; break;
|
||||||
@ -559,7 +554,7 @@ void serializeInfo(JsonObject root)
|
|||||||
char fileName[16];
|
char fileName[16];
|
||||||
strcpy_P(fileName, PSTR("/ledmap"));
|
strcpy_P(fileName, PSTR("/ledmap"));
|
||||||
if (i) sprintf(fileName +7, "%d", i);
|
if (i) sprintf(fileName +7, "%d", i);
|
||||||
strcat(fileName, ".json");
|
strcat_P(fileName, PSTR(".json"));
|
||||||
bool isFile = WLED_FS.exists(fileName);
|
bool isFile = WLED_FS.exists(fileName);
|
||||||
if (isFile || i==0) ledmaps.add(i);
|
if (isFile || i==0) ledmaps.add(i);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user