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

Various fixes

Browse Source 
- Change unit path
- Rename method
- Make CurrentPWM method return its value in PWM instead of percent
This commit is contained in:
Simon
2023-10-08 13:50:33 +02:00
parent 0a6bab36be
commit e2509cea8b
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/include/pwm/PWMControl.h
View File

@@ -15,8 +15,8 @@ public:
PWMControl(std::string controlPath); PWMControl(std::string controlPath);
~PWMControl(); ~PWMControl();
void Power(int percent); void SetPower(int percent);
int Power(); int CurrentPWM();
void EnableManualControl(); void EnableManualControl();
void Reset(); void Reset();

2
app/meson.build
View File

@@ -34,4 +34,4 @@ exe = executable('fantasize',
install: true, install: true,
include_directories: inc) include_directories: inc)
install_data('unit/fantasize.service', install_dir : 'usr/lib/systemd/system') install_data('unit/fantasize.service', install_dir : '/usr/lib/systemd/system')

6
app/src/FanGenerator.cxx
View File

@@ -22,7 +22,7 @@ FanGenerator::FindFans(vector<shared_ptr<Sensor>> rpmSensors,
cout << "Setting all fans to maximum speed" << endl; cout << "Setting all fans to maximum speed" << endl;
for (auto c : pwmControls) { for (auto c : pwmControls) {
c->EnableManualControl(); c->EnableManualControl();
c->Power(100); c->SetPower(100);
} }
// Wait for fans to settle // Wait for fans to settle
@@ -41,7 +41,7 @@ FanGenerator::FindFans(vector<shared_ptr<Sensor>> rpmSensors,
for (auto c : pwmControls) { for (auto c : pwmControls) {
cout << "Setting " << c->toString() cout << "Setting " << c->toString()
<< " to 50% and wait for it to settle..." << endl; << " to 50% and wait for it to settle..." << endl;
c->Power(50); c->SetPower(50);
this_thread::sleep_for(chrono::seconds(SETTLE_TIMEOUT)); this_thread::sleep_for(chrono::seconds(SETTLE_TIMEOUT));
@@ -53,7 +53,7 @@ FanGenerator::FindFans(vector<shared_ptr<Sensor>> rpmSensors,
} }
cout << "Setting fan back to 100%" << endl; cout << "Setting fan back to 100%" << endl;
c->Power(100); c->SetPower(100);
} }
return mapping; return mapping;

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

@@ -53,7 +53,7 @@ bool HwmonFan::InhibitStopPeriodExpired() {
} }
void HwmonFan::SetPower(int percent) { void HwmonFan::SetPower(int percent) {
mPWMControl->Power(percent); mPWMControl->SetPower(percent);
mSetValue = percent; mSetValue = percent;
} }
@@ -129,7 +129,7 @@ void HwmonFan::AdjustPWMLimits() {
} }
} }
void HwmonFan::EnforceSetValue() { mPWMControl->Power(mSetValue); } void HwmonFan::EnforceSetValue() { mPWMControl->SetPower(mSetValue); }
json HwmonFan::toJson() const { json HwmonFan::toJson() const {
json obj; json obj;

8
app/src/pwm/PWMControl.cxx
View File

@@ -40,12 +40,12 @@ PWMControl::~PWMControl() {
Reset(); Reset();
} }
void PWMControl::Power(int percent) { void PWMControl::SetPower(int percent) {
BOOST_LOG_FUNCTION(); BOOST_LOG_FUNCTION();
int pwmValue = (PWM_MAX_VALUE * percent) / 100; int pwmValue = (PWM_MAX_VALUE * percent) / 100;
if (percent != Power()) { if (pwmValue != CurrentPWM()) {
BOOST_LOG_TRIVIAL(trace) << "Updating control value of " << toString() BOOST_LOG_TRIVIAL(trace) << "Updating control value of " << toString()
<< " to " << percent << "% (" << pwmValue << ")"; << " to " << percent << "% (" << pwmValue << ")";
ofstream ostrm(mControlPath, ios::trunc); ofstream ostrm(mControlPath, ios::trunc);
@@ -54,14 +54,14 @@ void PWMControl::Power(int percent) {
} }
} }
int PWMControl::Power() { int PWMControl::CurrentPWM() {
int value; int value;
ifstream istrm; ifstream istrm;
istrm.open(mControlPath); istrm.open(mControlPath);
istrm >> value; istrm >> value;
return (value * 100) / PWM_MAX_VALUE; return value;
} }
void PWMControl::EnableManualControl() { void PWMControl::EnableManualControl() {