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

Add logic to adjust minPWM on fan stop

Browse Source
This commit is contained in:
Simon
2022-10-04 09:41:04 +02:00
parent d65934a278
commit e567ede3ef
4 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/include/App.h
View File

@@ -27,6 +27,8 @@ private:
FanGenerator mFanGenerator; FanGenerator mFanGenerator;
std::unique_ptr<Controller> mController; std::unique_ptr<Controller> mController;
std::vector<std::shared_ptr<Fan>> mFans;
}; };
#endif // APP_H_ #endif // APP_H_

11
app/src/App.cxx
View File

@@ -5,10 +5,10 @@
using namespace std; using namespace std;
void App::Init() { void App::Init() {
auto fans = mSerializer.DeserializeFans(mSensorManager.RPMSensors()); mFans = mSerializer.DeserializeFans(mSensorManager.RPMSensors());
auto fanCurves = mSerializer.DeserializeFanCurves( auto fanCurves = mSerializer.DeserializeFanCurves(
mSensorManager.TemperatureSensors(), fans); mSensorManager.TemperatureSensors(), mFans);
mController = make_unique<Controller>(fanCurves); mController = make_unique<Controller>(fanCurves);
} }
@@ -23,6 +23,8 @@ void App::InitialSetup() {
mFanLabeler.RunFanLabelInteraction(fans); mFanLabeler.RunFanLabelInteraction(fans);
mSerializer.SerializeFans(fans); mSerializer.SerializeFans(fans);
mFans = fans;
} }
void App::NormalOperation() { void App::NormalOperation() {
@@ -30,4 +32,7 @@ void App::NormalOperation() {
mController->StartFanControlLoop(); mController->StartFanControlLoop();
} }
void App::Shutdown() { mController.reset(); } void App::Shutdown() {
mController.reset();
mSerializer.SerializeFans(mFans);
}

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

@@ -16,6 +16,7 @@ FanCurve::FanCurve(std::vector<FanStep> steps,
void FanCurve::DoFanControl() { void FanCurve::DoFanControl() {
BOOST_LOG_FUNCTION(); BOOST_LOG_FUNCTION();
int temp = AggregateTemperature(); int temp = AggregateTemperature();
int t0, t1, p0, p1; int t0, t1, p0, p1;
@@ -43,9 +44,13 @@ void FanCurve::DoFanControl() {
if (f->RPM() <= 0) { if (f->RPM() <= 0) {
BOOST_LOG_TRIVIAL(warning) << "Fan stopped completely!"; BOOST_LOG_TRIVIAL(warning) << "Fan stopped completely!";
f->PWM(f->StartPWM()); f->PWM(f->StartPWM());
}
BOOST_LOG_TRIVIAL(info) << "Adjusting minPWM of fan " << f->toString();
f->MinPWM(f->MinPWM() + 2);
} else {
f->PWM(targetFanPower); f->PWM(targetFanPower);
} }
}
} }
// Dummy Implementation using AVG // Dummy Implementation using AVG

8
app/src/fan/HwmonFan.cxx
View File

@@ -47,9 +47,7 @@ void HwmonFan::FindPWMLimits() {
PWM(curPWM); PWM(curPWM);
this_thread::sleep_for(chrono::seconds(TIMEOUT)); this_thread::sleep_for(chrono::seconds(TIMEOUT));
int curRPM = RPM(); if (RPM() <= 0) {
if (curRPM <= 0) {
minPWM = curPWM + 5; minPWM = curPWM + 5;
break; break;
} }
@@ -68,9 +66,7 @@ void HwmonFan::FindPWMLimits() {
PWM(curPWM); PWM(curPWM);
this_thread::sleep_for(chrono::seconds(TIMEOUT)); this_thread::sleep_for(chrono::seconds(TIMEOUT));
int curRPM = RPM(); if (RPM() > 0) {
if (curRPM > 0) {
cout << "Setting start PWM: " << startPWM << endl; cout << "Setting start PWM: " << startPWM << endl;
startPWM = curPWM; startPWM = curPWM;
break; break;