Sternenlabor/WLED
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'audioreactive-prototype' of https://github.com/blazoncek/WLED into merge-audio

Browse Source
This commit is contained in:
Blaž Kristan
2022-08-22 10:34:10 +02:00
parent 844bef9fda be7e7ac274
commit cf0f0d77be
7 changed files with 735 additions and 670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
usermods/PWM_fan/usermod_PWM_fan.h
View File

@@ -275,12 +275,12 @@ class PWMFanUsermod : public Usermod {
enabled = usermod[FPSTR(_enabled)].as<bool>();
if (!enabled) updateFanSpeed(0);
}
if (!usermod[FPSTR(_speed)].isNull() && usermod[FPSTR(_speed)].is<int>()) {
if (enabled && !usermod[FPSTR(_speed)].isNull() && usermod[FPSTR(_speed)].is<int>()) {
pwmValuePct = usermod[FPSTR(_speed)].as<int>();
updateFanSpeed((MAX(0,MIN(100,pwmValuePct)) * 255) / 100);
updateFanSpeed((constrain(pwmValuePct,0,100) * 255) / 100);
if (pwmValuePct) lockFan = true;
}
if (!usermod[FPSTR(_lock)].isNull() && usermod[FPSTR(_lock)].is<bool>()) {
if (enabled && !usermod[FPSTR(_lock)].isNull() && usermod[FPSTR(_lock)].is<bool>()) {
lockFan = usermod[FPSTR(_lock)].as<bool>();
}
}