diff --git a/wled00/bus_manager.h b/wled00/bus_manager.h index 9268a2198..b737ccd3e 100644 --- a/wled00/bus_manager.h +++ b/wled00/bus_manager.h @@ -116,7 +116,6 @@ class BusDigital : public Bus { _busPtr = PolyBus::create(_iType, _pins, _len); _valid = (_busPtr != nullptr); _colorOrder = bc.colorOrder; - //Serial.printf("Successfully inited strip %u (len %u) with type %u and pins %u,%u (itype %u)\n",nr, len, type, pins[0],pins[1],_iType); }; inline void show() { @@ -178,7 +177,6 @@ class BusDigital : public Bus { } void cleanup() { - //Serial.println("Digital Cleanup"); PolyBus::cleanup(_busPtr, _iType); _iType = I_NONE; _valid = false; @@ -204,9 +202,9 @@ class BusDigital : public Bus { class BusPwm : public Bus { public: - BusPwm(BusConfig &bc) : Bus(bc.type, bc.start) { - if (!IS_PWM(bc.type)) return; - uint8_t numPins = NUM_PWM_PINS(bc.type); + BusPwm(BusConfig &bc) : Bus(bc.type&0x7F, bc.start) { // bit 7 is hacked to include RGBW info + if (!IS_PWM(bc.type&0x7F)) return; // bit 7 is hacked to include RGBW info + uint8_t numPins = NUM_PWM_PINS(bc.type&0x7F); // bit 7 is hacked to include RGBW info #ifdef ESP8266 analogWriteRange(255); //same range as one RGB channel @@ -321,7 +319,7 @@ class BusManager { int add(BusConfig &bc) { if (numBusses >= WLED_MAX_BUSSES) return -1; - if (IS_DIGITAL(bc.type)) { + if (IS_DIGITAL(bc.type&0x7F)) { busses[numBusses] = new BusDigital(bc, numBusses); } else { busses[numBusses] = new BusPwm(bc); diff --git a/wled00/const.h b/wled00/const.h index 75ae5e1c0..de1fe41bd 100644 --- a/wled00/const.h +++ b/wled00/const.h @@ -115,10 +115,10 @@ #define TYPE_LPD8806 52 #define TYPE_P9813 53 -#define IS_DIGITAL(t) (t & 0x10) //digital are 16-31 and 48-63 -#define IS_PWM(t) (t > 40 && t < 46) -#define NUM_PWM_PINS(t) (t - 40) //for analog PWM 41-45 only -#define IS_2PIN(t) (t > 47) +#define IS_DIGITAL(t) ((t) & 0x10) //digital are 16-31 and 48-63 +#define IS_PWM(t) ((t) > 40 && (t) < 46) +#define NUM_PWM_PINS(t) ((t) - 40) //for analog PWM 41-45 only +#define IS_2PIN(t) ((t) > 47) //Color orders #define COL_ORDER_GRB 0 //GRB(w),defaut diff --git a/wled00/data/index.css b/wled00/data/index.css index 69c4d19b5..0a5a8a758 100644 --- a/wled00/data/index.css +++ b/wled00/data/index.css @@ -290,12 +290,15 @@ button { display: block; position: -webkit-sticky; position: sticky; - background: var(--c-1); top: -1px; z-index: 1; margin: 1px auto auto; } - +/* +#staytop, #staytop1 { + background: var(--c-1); +} +*/ #staytop1 { top: 28px; } @@ -940,8 +943,17 @@ input[type="text"].fnd { margin: 0 auto 10px; text-align: left; border-radius: 0; - background: var(--c-1); border-bottom: 1px solid var(--c-3); + position: relative; +} +input[type="text"].fnd::before { + opacity: 0.33; + background: var(--c-1); + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; } input[type="text"].fnd:focus { diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm index 403866187..2358644e8 100644 --- a/wled00/data/settings_leds.htm +++ b/wled00/data/settings_leds.htm @@ -152,12 +152,12 @@ } if (nm=="L0" || nm=="L1" || nm=="L2" || nm=="L3" || nm=="L4" || nm=="RL" || nm=="BT" || nm=="IR" || nm=="AX") if (LCs[i].value!="" && LCs[i].value!="-1") { - if (d.um_p && d.um_p.some((e)=>e==parseInt(LCs[i].value,10))) {alert("Usermod/reserved pin clash!");LCs[i].value="";LCs[i].focus();continue;} + if (d.um_p && d.um_p.some((e)=>e==parseInt(LCs[i].value,10))) {alert("Usermod/reserved pin conflict!");LCs[i].value="";LCs[i].focus();continue;} for (j=0; j0?'
':''+ - i+1 + ':'+ - ` '+ - 'Color Order:'+ - ` '+ - `RGBW:
`+ - `Pin: `+ - `Clock: `+ - ``+ - ``+ - ``+ - '
'+ - `Start:  `+ - `
`+ - `Count:
`+ - `Reverse:

`+ - ''; +// npm run build has trouble minimizing spaces inside string + var cn = `
+${i>0?'
':''} +${i+1}: +  +Color Order: +
+Pin: +Clock: + + + +
+Start:   +
+Count:
+Reverse (rotated 180°): +
+ RGBW:
+
`; f.insertAdjacentHTML("beforeend", cn); } if (n==-1) { @@ -278,7 +279,7 @@

LED & Hardware setup

- Total LED count:
+ Total LED count:
Recommended power supply for brightest white:
?

 diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 7a5a2fd16..14d97699f 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -72,15 +72,15 @@ Do not enable if WiFi is working correctly, increases power consumption.
LED Settings