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

Merge branch 'dev' of github.com:blazoncek/WLED into dev

Browse Source
This commit is contained in:
Blaz Kristan 2021-06-04 18:25:36 +02:00
commit b6bbbeb9d3
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wled00/button.cpp
View File

@ -96,7 +96,7 @@ void handleAnalog(uint8_t b)
if (buttonType[b] == BTN_TYPE_ANALOG_INVERTED) aRead = 255 - aRead; if (buttonType[b] == BTN_TYPE_ANALOG_INVERTED) aRead = 255 - aRead;
// remove noise & reduce frequency of UI updates // remove noise & reduce frequency of UI updates (3*13mV)
aRead &= 0xFC; aRead &= 0xFC;
if (oldRead[b] == aRead) return; // no change in reading if (oldRead[b] == aRead) return; // no change in reading

7
wled00/wled.cpp
View File

@ -442,14 +442,15 @@ void WLED::beginStrip()
strip.setBrightness(0); strip.setBrightness(0);
strip.setShowCallback(handleOverlayDraw); strip.setShowCallback(handleOverlayDraw);
if (bootPreset > 0) { if (turnOnAtBoot) {
applyPreset(bootPreset);
} else if (turnOnAtBoot) {
if (briS > 0) bri = briS; if (briS > 0) bri = briS;
else if (bri == 0) bri = 128; else if (bri == 0) bri = 128;
} else { } else {
briLast = briS; bri = 0; briLast = briS; bri = 0;
} }
if (bootPreset > 0) {
applyPreset(bootPreset);
}
colorUpdated(NOTIFIER_CALL_MODE_INIT); colorUpdated(NOTIFIER_CALL_MODE_INIT);
// init relay pin // init relay pin