Compare commits
13 Commits
0f91960ef9
...
v0.2.1
| Author | SHA1 | Date | |
|---|---|---|---|
| d1649b7de1 | |||
| ff72f8d2ea | |||
| ad12f7a981 | |||
| 33a760489e | |||
| 10fbcdb0f6 | |||
| f383eb1b79 | |||
| 7b0b419a22 | |||
| ec480f5a17 | |||
| 0109f66be3 | |||
| 75d6af4c8b | |||
| 815b78aa67 | |||
| f718f82ad1 | |||
| 596a30b76a |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -3,6 +3,6 @@ compile_commands.json
|
||||
.cache/
|
||||
pkg/
|
||||
rel_oot/
|
||||
src/
|
||||
./src
|
||||
*.pkg.tar.zst
|
||||
*.tar.gz
|
||||
|
||||
12
PKGBUILD
12
PKGBUILD
@@ -1,19 +1,21 @@
|
||||
pkgname=fantasize
|
||||
pkgver=0.1.5
|
||||
pkgver=0.2.0
|
||||
pkgrel=1
|
||||
pkgdesc='C++ fan control for Linux'
|
||||
url='https://github.com/Tabascl/fantasize.git'
|
||||
source=("$pkgname-$pkgver.tar.gz::https://github.com/Tabascl/fantasize/archive/refs/tags/v$pkgver.tar.gz")
|
||||
arch=('x86_64')
|
||||
license=('GPL3')
|
||||
makedepends=('git' 'cmake' 'nlohmann-json' 'boost' 'cuda')
|
||||
makedepends=('git' 'meson' 'nlohmann-json' 'boost')
|
||||
sha256sums=('SKIP')
|
||||
|
||||
build() {
|
||||
cmake -S "$pkgname-$pkgver/app" -B build -DCMAKE_BUILD_TYPE=Release
|
||||
cmake --build build
|
||||
meson setup build "$pkgname-$pkgver/app" -Dbuildtype=Release
|
||||
cd build
|
||||
meson compile
|
||||
}
|
||||
|
||||
package() {
|
||||
cmake --install build --prefix "$pkgdir/" --verbose
|
||||
cd build
|
||||
meson install
|
||||
}
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
cmake_minimum_required(VERSION 3.0)
|
||||
|
||||
project(fantasize VERSION 0.1.5)
|
||||
|
||||
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||
|
||||
find_package(nlohmann_json 3.11.2 REQUIRED)
|
||||
find_package(Boost 1.80 COMPONENTS program_options log log_setup date_time REQUIRED)
|
||||
|
||||
add_executable(${PROJECT_NAME}
|
||||
src/main.cxx
|
||||
src/sensor/LMSensorsFacade.cxx
|
||||
src/sensor/GPUSensorsFacade.cxx
|
||||
src/sensor/Sensor.cxx
|
||||
src/sensor/NvidiaSensor.cxx
|
||||
src/sensor/LMSensor.cxx
|
||||
src/pwm/PWMControl.cxx
|
||||
src/pwm/PWMControlFacade.cxx
|
||||
src/fan/HwmonFan.cxx
|
||||
src/fan/FanCurve.cxx
|
||||
src/fan/FanLabeler.cxx
|
||||
src/FanGenerator.cxx
|
||||
src/Serializer.cxx
|
||||
src/sensor/SensorManager.cxx
|
||||
src/Controller.cxx
|
||||
src/App.cxx
|
||||
)
|
||||
|
||||
set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 20)
|
||||
|
||||
target_include_directories(${PROJECT_NAME} PUBLIC include /opt/cuda)
|
||||
target_link_libraries(${PROJECT_NAME} PUBLIC sensors nvidia-ml nlohmann_json::nlohmann_json tbb ${Boost_LIBRARIES})
|
||||
|
||||
install(TARGETS ${PROJECT_NAME} DESTINATION usr/local/bin)
|
||||
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/unit/fantasize.service DESTINATION usr/lib/systemd/system)
|
||||
@@ -26,6 +26,8 @@ private:
|
||||
FanLabeler mFanLabeler;
|
||||
FanGenerator mFanGenerator;
|
||||
|
||||
std::shared_ptr<Settings> mSettings;
|
||||
|
||||
std::unique_ptr<Controller> mController;
|
||||
|
||||
std::vector<std::shared_ptr<Fan>> mFans;
|
||||
|
||||
@@ -5,11 +5,13 @@
|
||||
#include <thread>
|
||||
#include <vector>
|
||||
|
||||
#include <Settings.h>
|
||||
#include <fan/FanCurve.h>
|
||||
|
||||
class Controller {
|
||||
public:
|
||||
Controller(std::vector<std::shared_ptr<FanCurve>> curves);
|
||||
Controller(std::shared_ptr<Settings> settings,
|
||||
std::vector<std::shared_ptr<FanCurve>> curves);
|
||||
~Controller();
|
||||
|
||||
void StartFanControlLoop();
|
||||
@@ -18,6 +20,8 @@ public:
|
||||
private:
|
||||
void Loop();
|
||||
|
||||
int mTimeout;
|
||||
|
||||
std::vector<std::shared_ptr<FanCurve>> mFanCurves;
|
||||
std::atomic<bool> mRun;
|
||||
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
#ifndef SERIALIZER_H_
|
||||
#define SERIALIZER_H_
|
||||
|
||||
#include "fan/HwmonFan.h"
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
#include <Settings.h>
|
||||
#include <fan/Aggregators.h>
|
||||
#include <fan/Fan.h>
|
||||
#include <fan/FanCurve.h>
|
||||
#include <sensor/Sensor.h>
|
||||
@@ -16,19 +17,22 @@
|
||||
|
||||
using json = nlohmann::json;
|
||||
|
||||
class Serializer {
|
||||
class Serializer
|
||||
{
|
||||
public:
|
||||
Serializer();
|
||||
void SerializeFans(std::vector<std::shared_ptr<Fan>> fans);
|
||||
std::vector<std::shared_ptr<Fan>>
|
||||
DeserializeFans(std::vector<std::shared_ptr<Sensor>> availableSensors);
|
||||
std::vector<std::shared_ptr<FanCurve>>
|
||||
DeserializeFanCurves(std::vector<std::shared_ptr<Sensor>> availableSensors,
|
||||
std::vector<std::shared_ptr<Fan>> DeserializeFans(
|
||||
std::vector<std::shared_ptr<Sensor>> availableSensors);
|
||||
std::vector<std::shared_ptr<FanCurve>> DeserializeFanCurves(
|
||||
std::vector<std::shared_ptr<Sensor>> availableSensors,
|
||||
std::vector<std::shared_ptr<Fan>> availableFans);
|
||||
std::shared_ptr<Settings> DeserializeSettings();
|
||||
|
||||
private:
|
||||
void WriteJson(json o);
|
||||
json ReadJson();
|
||||
std::unique_ptr<Aggregator> aggregatorFromString(std::string str) const;
|
||||
};
|
||||
|
||||
#endif // SERIALIZER_H_
|
||||
|
||||
17
app/include/Settings.h
Normal file
17
app/include/Settings.h
Normal file
@@ -0,0 +1,17 @@
|
||||
#ifndef SETTINGS_H_
|
||||
#define SETTINGS_H_
|
||||
|
||||
#define FREQUENCY_DEFAULT 1
|
||||
|
||||
class Settings {
|
||||
public:
|
||||
Settings(int frequency);
|
||||
|
||||
int Frequency() const;
|
||||
|
||||
private:
|
||||
void LogSettings();
|
||||
int mFrequency;
|
||||
};
|
||||
|
||||
#endif // SETTINGS_H_
|
||||
27
app/include/fan/Aggregators.h
Normal file
27
app/include/fan/Aggregators.h
Normal file
@@ -0,0 +1,27 @@
|
||||
#ifndef AGGREGATORS_H_
|
||||
#define AGGREGATORS_H_
|
||||
|
||||
#include <sensor/Sensor.h>
|
||||
|
||||
class Aggregator
|
||||
{
|
||||
public:
|
||||
virtual int aggregate(std::vector<std::shared_ptr<Sensor>> sensors) const = 0;
|
||||
virtual const std::string toString() const = 0;
|
||||
};
|
||||
|
||||
class AverageAggregator : public Aggregator
|
||||
{
|
||||
public:
|
||||
int aggregate(std::vector<std::shared_ptr<Sensor>> sensors) const override;
|
||||
const std::string toString() const override;
|
||||
};
|
||||
|
||||
class MaxAggregator : public Aggregator
|
||||
{
|
||||
public:
|
||||
int aggregate(std::vector<std::shared_ptr<Sensor>> sensors) const override;
|
||||
const std::string toString() const override;
|
||||
};
|
||||
|
||||
#endif // AGGERGATORS_H_
|
||||
@@ -17,7 +17,11 @@ public:
|
||||
virtual void StartPWM(int value) = 0;
|
||||
virtual int StartPWM() = 0;
|
||||
|
||||
virtual void ZeroFanModeSupported(bool value) = 0;
|
||||
virtual bool ZeroFanModeSupported() = 0;
|
||||
|
||||
virtual void FindPWMLimits() = 0;
|
||||
virtual void AdjustPWMLimits() = 0;
|
||||
};
|
||||
|
||||
#endif // FAN_H_
|
||||
|
||||
@@ -4,19 +4,23 @@
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <fan/Aggregators.h>
|
||||
#include <fan/HwmonFan.h>
|
||||
#include <sensor/Sensor.h>
|
||||
|
||||
struct FanStep {
|
||||
struct FanStep
|
||||
{
|
||||
int Temp;
|
||||
int Percent;
|
||||
};
|
||||
|
||||
class FanCurve {
|
||||
class FanCurve
|
||||
{
|
||||
public:
|
||||
FanCurve(std::vector<FanStep> steps,
|
||||
std::vector<std::shared_ptr<Sensor>> sensors,
|
||||
std::vector<std::shared_ptr<Fan>> fans);
|
||||
std::vector<std::shared_ptr<Fan>> fans,
|
||||
std::unique_ptr<Aggregator> aggregator);
|
||||
|
||||
void DoFanControl();
|
||||
|
||||
@@ -27,6 +31,7 @@ private:
|
||||
std::vector<FanStep> mSteps;
|
||||
std::vector<std::shared_ptr<Sensor>> mTempSensors;
|
||||
std::vector<std::shared_ptr<Fan>> mFans;
|
||||
std::unique_ptr<Aggregator> mAggregator;
|
||||
};
|
||||
|
||||
#endif // FANCURVE_H_
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef HWMONFAN_H_
|
||||
#define HWMONFAN_H_
|
||||
|
||||
#include <boost/json/object.hpp>
|
||||
#include <chrono>
|
||||
#include <memory>
|
||||
|
||||
#include <fan/Fan.h>
|
||||
@@ -24,7 +24,11 @@ public:
|
||||
void StartPWM(int value) override;
|
||||
int StartPWM() override;
|
||||
|
||||
void ZeroFanModeSupported(bool value) override;
|
||||
bool ZeroFanModeSupported() override;
|
||||
|
||||
void FindPWMLimits() override;
|
||||
void AdjustPWMLimits() override;
|
||||
|
||||
json toJson() const override;
|
||||
|
||||
@@ -35,8 +39,10 @@ private:
|
||||
std::shared_ptr<Sensor> mRpmSensor;
|
||||
std::string mLabel;
|
||||
|
||||
int mMinPWM;
|
||||
int mStartPWM;
|
||||
int mMinPWM = 0;
|
||||
int mStartPWM = 0;
|
||||
bool mZeroFanModeSupported = false;
|
||||
std::chrono::time_point<std::chrono::steady_clock> mLastAdjustmentTime;
|
||||
};
|
||||
|
||||
#endif // HWMONFAN_H_
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#ifndef PWMCONTROL_H_
|
||||
#define PWMCONTROL_H_
|
||||
|
||||
#include <boost/json/object.hpp>
|
||||
#include <string>
|
||||
|
||||
#include <Printable.h>
|
||||
|
||||
37
app/meson.build
Normal file
37
app/meson.build
Normal file
@@ -0,0 +1,37 @@
|
||||
project('fantasize', 'cpp', version : '0.2.1', default_options : ['cpp_std=c++20'])
|
||||
|
||||
src = [
|
||||
'src/main.cxx',
|
||||
'src/sensor/LMSensorsFacade.cxx',
|
||||
'src/sensor/Sensor.cxx',
|
||||
'src/sensor/LMSensor.cxx',
|
||||
'src/pwm/PWMControl.cxx',
|
||||
'src/pwm/PWMControlFacade.cxx',
|
||||
'src/fan/HwmonFan.cxx',
|
||||
'src/fan/FanCurve.cxx',
|
||||
'src/fan/FanLabeler.cxx',
|
||||
'src/fan/Aggregators.cxx',
|
||||
'src/FanGenerator.cxx',
|
||||
'src/Serializer.cxx',
|
||||
'src/sensor/SensorManager.cxx',
|
||||
'src/Controller.cxx',
|
||||
'src/Settings.cxx',
|
||||
'src/App.cxx'
|
||||
]
|
||||
|
||||
deps = [
|
||||
dependency('nlohmann_json'),
|
||||
dependency('boost', modules : ['program_options', 'log', 'log_setup', 'date_time', 'thread']),
|
||||
dependency('tbb'),
|
||||
meson.get_compiler('cpp').find_library('sensors')
|
||||
]
|
||||
|
||||
inc = include_directories('include')
|
||||
|
||||
exe = executable('fantasize',
|
||||
src,
|
||||
dependencies: deps,
|
||||
install: true,
|
||||
include_directories: inc)
|
||||
|
||||
install_data('unit/fantasize.service', install_dir : 'usr/lib/systemd/system')
|
||||
@@ -10,7 +10,9 @@ void App::Init() {
|
||||
auto fanCurves = mSerializer.DeserializeFanCurves(
|
||||
mSensorManager.TemperatureSensors(), mFans);
|
||||
|
||||
mController = make_unique<Controller>(fanCurves);
|
||||
mSettings = mSerializer.DeserializeSettings();
|
||||
|
||||
mController = make_unique<Controller>(mSettings, fanCurves);
|
||||
}
|
||||
|
||||
void App::InitialSetup() {
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
#define TIMEOUT 500
|
||||
|
||||
Controller::Controller(vector<shared_ptr<FanCurve>> curves)
|
||||
: mFanCurves(curves), mRun(false) {}
|
||||
Controller::Controller(shared_ptr<Settings> settings,
|
||||
vector<shared_ptr<FanCurve>> curves)
|
||||
: mTimeout((1 / settings->Frequency()) * 1000), mFanCurves(curves),
|
||||
mRun(false) {}
|
||||
|
||||
Controller::~Controller() { StopFanControlLoop(); }
|
||||
|
||||
@@ -32,6 +32,6 @@ void Controller::Loop() {
|
||||
c->DoFanControl();
|
||||
}
|
||||
|
||||
this_thread::sleep_for(chrono::milliseconds(TIMEOUT));
|
||||
this_thread::sleep_for(chrono::milliseconds(mTimeout));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
#include "fan/FanCurve.h"
|
||||
#include "sensor/Sensor.h"
|
||||
#include <filesystem>
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
@@ -10,6 +8,7 @@
|
||||
#include <fan/HwmonFan.h>
|
||||
#include <pwm/PWMControl.h>
|
||||
#include <sensor/LMSensor.h>
|
||||
#include <string>
|
||||
|
||||
using namespace std;
|
||||
namespace fs = filesystem;
|
||||
@@ -49,11 +48,13 @@ Serializer::DeserializeFans(vector<shared_ptr<Sensor>> availableSensors) {
|
||||
int minPWM = el.value()["MinPWM"];
|
||||
int startPWM = el.value()["StartPWM"];
|
||||
string label = el.value()["Label"];
|
||||
bool zeroFan = el.value()["ZeroFan"];
|
||||
|
||||
auto fan = make_shared<HwmonFan>(pwmControl, rpmSensor);
|
||||
fan->MinPWM(minPWM);
|
||||
fan->StartPWM(startPWM);
|
||||
fan->Label(label);
|
||||
fan->ZeroFanModeSupported(zeroFan);
|
||||
|
||||
fans.push_back(fan);
|
||||
}
|
||||
@@ -119,8 +120,35 @@ vector<shared_ptr<FanCurve>> Serializer::DeserializeFanCurves(
|
||||
fans.push_back(fanMap[fan.value()]);
|
||||
}
|
||||
|
||||
curves.push_back(make_shared<FanCurve>(steps, sensors, fans));
|
||||
std::unique_ptr<Aggregator> aggregator =
|
||||
aggregatorFromString(el.value()["AggregateFunction"]);
|
||||
|
||||
curves.push_back(
|
||||
make_shared<FanCurve>(steps, sensors, fans, std::move(aggregator)));
|
||||
}
|
||||
|
||||
return curves;
|
||||
}
|
||||
|
||||
std::unique_ptr<Aggregator>
|
||||
Serializer::aggregatorFromString(std::string str) const {
|
||||
if (str == "max")
|
||||
return std::make_unique<MaxAggregator>();
|
||||
else
|
||||
return std::make_unique<AverageAggregator>();
|
||||
}
|
||||
|
||||
shared_ptr<Settings> Serializer::DeserializeSettings() {
|
||||
int frequency = FREQUENCY_DEFAULT;
|
||||
|
||||
auto data = ReadJson();
|
||||
|
||||
if (data.contains("settings")) {
|
||||
auto items = data["settings"];
|
||||
|
||||
if (items.contains("frequency"))
|
||||
frequency = items["frequency"];
|
||||
}
|
||||
|
||||
return make_shared<Settings>(frequency);
|
||||
}
|
||||
|
||||
17
app/src/Settings.cxx
Normal file
17
app/src/Settings.cxx
Normal file
@@ -0,0 +1,17 @@
|
||||
#include <iostream>
|
||||
|
||||
#include <boost/log/attributes/named_scope.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
|
||||
#include <Settings.h>
|
||||
|
||||
Settings::Settings(int frequency) : mFrequency(frequency) { LogSettings(); }
|
||||
|
||||
int Settings::Frequency() const { return mFrequency; }
|
||||
|
||||
void Settings::LogSettings() {
|
||||
BOOST_LOG_FUNCTION();
|
||||
|
||||
BOOST_LOG_TRIVIAL(info) << "### Settings";
|
||||
BOOST_LOG_TRIVIAL(info) << "Frequency: " << mFrequency << "Hz";
|
||||
}
|
||||
39
app/src/fan/Aggregators.cxx
Normal file
39
app/src/fan/Aggregators.cxx
Normal file
@@ -0,0 +1,39 @@
|
||||
#include <climits>
|
||||
#include <fan/Aggregators.h>
|
||||
|
||||
int
|
||||
AverageAggregator::aggregate(std::vector<std::shared_ptr<Sensor>> sensors) const
|
||||
{
|
||||
int sum = 0;
|
||||
|
||||
for (auto sensor : sensors) {
|
||||
sum += sensor->value();
|
||||
}
|
||||
|
||||
return sum / sensors.size();
|
||||
}
|
||||
|
||||
const std::string
|
||||
AverageAggregator::toString() const
|
||||
{
|
||||
return "Average";
|
||||
}
|
||||
|
||||
int
|
||||
MaxAggregator::aggregate(std::vector<std::shared_ptr<Sensor>> sensors) const
|
||||
{
|
||||
int max = INT_MIN;
|
||||
|
||||
for (auto sensor : sensors) {
|
||||
if (sensor->value() > max)
|
||||
max = sensor->value();
|
||||
}
|
||||
|
||||
return max;
|
||||
}
|
||||
|
||||
const std::string
|
||||
MaxAggregator::toString() const
|
||||
{
|
||||
return "Max";
|
||||
}
|
||||
@@ -4,13 +4,16 @@
|
||||
#include <boost/log/trivial.hpp>
|
||||
|
||||
#include <fan/FanCurve.h>
|
||||
#include <memory>
|
||||
|
||||
using namespace std;
|
||||
|
||||
FanCurve::FanCurve(std::vector<FanStep> steps,
|
||||
std::vector<std::shared_ptr<Sensor>> sensors,
|
||||
std::vector<std::shared_ptr<Fan>> fans)
|
||||
: mSteps(steps), mTempSensors(sensors), mFans(fans) {
|
||||
std::vector<std::shared_ptr<Fan>> fans,
|
||||
std::unique_ptr<Aggregator> aggregator)
|
||||
: mSteps(steps), mTempSensors(sensors), mFans(fans),
|
||||
mAggregator(std::move(aggregator)) {
|
||||
PrintInfo();
|
||||
}
|
||||
|
||||
@@ -19,7 +22,7 @@ void FanCurve::DoFanControl() {
|
||||
|
||||
int temp = AggregateTemperature();
|
||||
|
||||
int t0, t1, p0, p1;
|
||||
int t0 = 0, t1 = 0, p0 = 0, p1 = 0;
|
||||
int targetFanPower;
|
||||
|
||||
if (temp <= mSteps[0].Temp) {
|
||||
@@ -27,7 +30,7 @@ void FanCurve::DoFanControl() {
|
||||
} else if (temp > mSteps[mSteps.size() - 1].Temp) {
|
||||
targetFanPower = mSteps[mSteps.size() - 1].Percent;
|
||||
} else {
|
||||
for (int i = 0; i < mSteps.size(); i++) {
|
||||
for (int i = 0; i < (int)mSteps.size(); i++) {
|
||||
if (temp > mSteps[i].Temp) {
|
||||
t0 = mSteps[i].Temp;
|
||||
p0 = mSteps[i].Percent;
|
||||
@@ -41,26 +44,18 @@ void FanCurve::DoFanControl() {
|
||||
}
|
||||
|
||||
for (auto f : mFans) {
|
||||
if (f->RPM() <= 0) {
|
||||
if (!f->ZeroFanModeSupported() && f->RPM() <= 0) {
|
||||
BOOST_LOG_TRIVIAL(warning) << "Fan stopped completely!";
|
||||
f->PWM(f->StartPWM());
|
||||
|
||||
BOOST_LOG_TRIVIAL(info) << "Adjusting minPWM of fan " << f->toString();
|
||||
f->MinPWM(f->MinPWM() + 2);
|
||||
f->AdjustPWMLimits();
|
||||
} else {
|
||||
f->PWM(targetFanPower);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Dummy Implementation using AVG
|
||||
int FanCurve::AggregateTemperature() {
|
||||
int sum = 0;
|
||||
for (auto s : mTempSensors) {
|
||||
sum += s->value();
|
||||
}
|
||||
|
||||
return sum / mTempSensors.size();
|
||||
return mAggregator->aggregate(mTempSensors);
|
||||
}
|
||||
|
||||
void FanCurve::PrintInfo() {
|
||||
@@ -92,4 +87,10 @@ void FanCurve::PrintInfo() {
|
||||
}
|
||||
|
||||
BOOST_LOG_TRIVIAL(info) << sStream.str();
|
||||
|
||||
sStream.str(string());
|
||||
|
||||
sStream << "Aggregate function: " << mAggregator->toString();
|
||||
|
||||
BOOST_LOG_TRIVIAL(info) << sStream.str();
|
||||
}
|
||||
|
||||
@@ -1,11 +1,12 @@
|
||||
#include <chrono>
|
||||
#include <iostream>
|
||||
#include <ostream>
|
||||
#include <thread>
|
||||
|
||||
#include "pwm/PWMControl.h"
|
||||
#include <boost/json/object.hpp>
|
||||
#include <boost/log/attributes/named_scope.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
|
||||
#include <fan/HwmonFan.h>
|
||||
#include <pwm/PWMControl.h>
|
||||
|
||||
#define TIMEOUT 10
|
||||
#define STEP 2
|
||||
@@ -34,9 +35,15 @@ void HwmonFan::MinPWM(int value) { mMinPWM = value; }
|
||||
|
||||
int HwmonFan::MinPWM() { return mMinPWM; }
|
||||
|
||||
void HwmonFan::StartPWM(int value) { mStartPWM = value; }
|
||||
|
||||
int HwmonFan::StartPWM() { return mStartPWM; }
|
||||
|
||||
void HwmonFan::StartPWM(int value) { mStartPWM = value; }
|
||||
void HwmonFan::ZeroFanModeSupported(bool value) {
|
||||
mZeroFanModeSupported = value;
|
||||
}
|
||||
|
||||
bool HwmonFan::ZeroFanModeSupported() { return mZeroFanModeSupported; }
|
||||
|
||||
void HwmonFan::FindPWMLimits() {
|
||||
cout << "Looking for minimal PWM" << endl;
|
||||
@@ -78,13 +85,25 @@ void HwmonFan::FindPWMLimits() {
|
||||
}
|
||||
}
|
||||
|
||||
void HwmonFan::AdjustPWMLimits() {
|
||||
BOOST_LOG_FUNCTION()
|
||||
|
||||
chrono::time_point now = chrono::steady_clock::now();
|
||||
|
||||
if ((now - mLastAdjustmentTime) >
|
||||
chrono::duration(chrono::seconds(TIMEOUT))) {
|
||||
BOOST_LOG_TRIVIAL(info) << "Increasing minimal fan speed";
|
||||
|
||||
mLastAdjustmentTime = now;
|
||||
mMinPWM += 2;
|
||||
}
|
||||
}
|
||||
|
||||
json HwmonFan::toJson() const {
|
||||
json obj;
|
||||
obj = {mPWMControl->toJson(),
|
||||
mRpmSensor->toJson(),
|
||||
{"Label", mLabel},
|
||||
{"MinPWM", mMinPWM},
|
||||
{"StartPWM", mStartPWM}};
|
||||
obj = {mPWMControl->toJson(), mRpmSensor->toJson(),
|
||||
{"Label", mLabel}, {"MinPWM", mMinPWM},
|
||||
{"StartPWM", mStartPWM}, {"ZeroFan", mZeroFanModeSupported}};
|
||||
return obj;
|
||||
}
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
#include <App.h>
|
||||
|
||||
#define PROJECT_VERSION "v0.1.5"
|
||||
#define PROJECT_VERSION "v0.2.1"
|
||||
|
||||
namespace po = boost::program_options;
|
||||
namespace logging = boost::log;
|
||||
|
||||
@@ -15,7 +15,9 @@
|
||||
using namespace std;
|
||||
namespace fs = filesystem;
|
||||
|
||||
PWMControl::PWMControl(string controlPath) : mControlPath(controlPath) {
|
||||
PWMControl::PWMControl(string controlPath)
|
||||
: mControlPath(controlPath)
|
||||
{
|
||||
fs::path pathEnable(mControlPath + PWM_POSTFIX_ENABLE);
|
||||
fs::path pathMode(mControlPath + PWM_POSTFIX_MODE);
|
||||
|
||||
@@ -35,21 +37,24 @@ PWMControl::PWMControl(string controlPath) : mControlPath(controlPath) {
|
||||
istrm.close();
|
||||
}
|
||||
|
||||
PWMControl::~PWMControl() {
|
||||
PWMControl::~PWMControl()
|
||||
{
|
||||
BOOST_LOG_FUNCTION();
|
||||
|
||||
BOOST_LOG_TRIVIAL(trace) << "Cleanup";
|
||||
Reset();
|
||||
}
|
||||
|
||||
void PWMControl::Power(int percent) {
|
||||
void
|
||||
PWMControl::Power(int percent)
|
||||
{
|
||||
BOOST_LOG_FUNCTION();
|
||||
|
||||
int pwmValue = (PWM_MAX_VALUE * percent) / 100;
|
||||
|
||||
if (percent != mCurrentValue) {
|
||||
BOOST_LOG_TRIVIAL(trace)
|
||||
<< "Updating control value to " << percent << "% (" << pwmValue << ")";
|
||||
BOOST_LOG_TRIVIAL(trace) << "Updating control value of " << toString()
|
||||
<< " to " << percent << "% (" << pwmValue << ")";
|
||||
ofstream ostrm(mControlPath, ios::trunc);
|
||||
ostrm << pwmValue;
|
||||
ostrm.close();
|
||||
@@ -58,7 +63,9 @@ void PWMControl::Power(int percent) {
|
||||
}
|
||||
}
|
||||
|
||||
int PWMControl::Power() {
|
||||
int
|
||||
PWMControl::Power()
|
||||
{
|
||||
int value;
|
||||
ifstream istrm;
|
||||
|
||||
@@ -68,13 +75,17 @@ int PWMControl::Power() {
|
||||
return (value * 100) / PWM_MAX_VALUE;
|
||||
}
|
||||
|
||||
void PWMControl::EnableManualControl() {
|
||||
void
|
||||
PWMControl::EnableManualControl()
|
||||
{
|
||||
ofstream ostrm(mEnablePath, ios::trunc);
|
||||
ostrm << static_cast<int>(PWM_ENABLE::MANUAL_CONTROL);
|
||||
ostrm.close();
|
||||
}
|
||||
|
||||
void PWMControl::Reset() {
|
||||
void
|
||||
PWMControl::Reset()
|
||||
{
|
||||
ofstream ostrm(mEnablePath, ios::trunc);
|
||||
|
||||
ostrm << mInitialEnable;
|
||||
@@ -86,11 +97,15 @@ void PWMControl::Reset() {
|
||||
ostrm.close();
|
||||
}
|
||||
|
||||
const string PWMControl::toString() const {
|
||||
const string
|
||||
PWMControl::toString() const
|
||||
{
|
||||
return fs::path(mControlPath).filename();
|
||||
}
|
||||
|
||||
json PWMControl::toJson() const {
|
||||
json obj = {"PWMControl", mControlPath};
|
||||
json
|
||||
PWMControl::toJson() const
|
||||
{
|
||||
json obj = { "PWMControl", mControlPath };
|
||||
return obj;
|
||||
}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
#include <iostream>
|
||||
|
||||
#include <boost/json/kind.hpp>
|
||||
#include <sensor/LMSensor.h>
|
||||
#include <sensors/sensors.h>
|
||||
@@ -17,7 +19,9 @@ int LMSensor::value() {
|
||||
}
|
||||
|
||||
const string LMSensor::toString() const {
|
||||
return sensors_get_label(mChipName, mFeature);
|
||||
ostringstream os;
|
||||
os << mChipName->prefix << "." << sensors_get_label(mChipName, mFeature);
|
||||
return os.str();
|
||||
}
|
||||
|
||||
json LMSensor::toJson() const {
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
#include <boost/json/object.hpp>
|
||||
#include <include/nvml.h>
|
||||
|
||||
#include <sensor/NvidiaSensor.h>
|
||||
|
||||
@@ -11,8 +11,9 @@ vector<shared_ptr<Sensor>> SensorManager::TemperatureSensors() {
|
||||
|
||||
tempSensors = mLMSensorsFacade->TemperatureSensors();
|
||||
|
||||
auto gpuSensors = mGPUSensorsFacade->TemperatureSensors();
|
||||
tempSensors.insert(tempSensors.end(), gpuSensors.begin(), gpuSensors.end());
|
||||
// auto gpuSensors = mGPUSensorsFacade->TemperatureSensors();
|
||||
// tempSensors.insert(tempSensors.end(), gpuSensors.begin(),
|
||||
// gpuSensors.end());
|
||||
|
||||
return tempSensors;
|
||||
}
|
||||
|
||||
@@ -7,4 +7,4 @@ ExecStart=/usr/local/bin/fantasize
|
||||
Restart=always
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
WantedBy=graphical.target
|
||||
|
||||
Reference in New Issue
Block a user