Add option to set frequency in json
This commit is contained in:
@@ -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,12 @@
|
||||
#ifndef SERIALIZER_H_
|
||||
#define SERIALIZER_H_
|
||||
|
||||
#include "fan/HwmonFan.h"
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
#include <Settings.h>
|
||||
#include <fan/Fan.h>
|
||||
#include <fan/FanCurve.h>
|
||||
#include <sensor/Sensor.h>
|
||||
@@ -25,6 +25,7 @@ public:
|
||||
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);
|
||||
|
||||
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_
|
||||
Reference in New Issue
Block a user