Simon/fantasize
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects 1 Releases 13 Wiki Activity

Fix severe bug, improve logging, handle fan stops

Browse Source 
Conversion from power percentage to PWM value didn't take into floating
point arithmetic into account
Make log messages more helpful, add handling for fan stopping completely
This commit is contained in:
Simon
2022-10-04 00:26:57 +02:00
parent 1c2067286e
commit 46a06214a2
7 changed files with 63 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/fan/FanCurve.cxx
View File

@@ -15,15 +15,16 @@ FanCurve::FanCurve(std::vector<FanStep> steps,
}
void FanCurve::DoFanControl() {
BOOST_LOG_FUNCTION();
int temp = AggregateTemperature();
int t0, t1, p0, p1;
int targetFanSpeed;
int targetFanPower;
if (temp <= mSteps[0].Temp) {
targetFanSpeed = mSteps[0].Percent;
targetFanPower = mSteps[0].Percent;
} else if (temp > mSteps[mSteps.size() - 1].Temp) {
targetFanSpeed = mSteps[mSteps.size() - 1].Percent;
targetFanPower = mSteps[mSteps.size() - 1].Percent;
} else {
for (int i = 0; i < mSteps.size(); i++) {
if (temp > mSteps[i].Temp) {
@@ -35,11 +36,15 @@ void FanCurve::DoFanControl() {
}
}
targetFanSpeed = p0 + ((p1 - p0) / (t1 - t0)) * (temp - t0);
targetFanPower = p0 + ((p1 - p0) / (t1 - t0)) * (temp - t0);
}
for (auto f : mFans) {
f->PWM(targetFanSpeed);
if (f->RPM() <= 0) {
BOOST_LOG_TRIVIAL(warning) << "Fan stopped completely!";
f->PWM(f->StartPWM());
}
f->PWM(targetFanPower);
}
}