Implement HwmonTemperatureSensor, add serialization
This commit is contained in:
@@ -5,15 +5,17 @@ project(fantasize)
|
|||||||
set(CMAKE_BUILD_TYPE Debug)
|
set(CMAKE_BUILD_TYPE Debug)
|
||||||
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||||
|
|
||||||
|
find_package(Boost 1.79.0 COMPONENTS json)
|
||||||
|
|
||||||
add_executable(app
|
add_executable(app
|
||||||
src/main.cxx
|
src/main.cxx
|
||||||
src/Nvidia.cxx
|
src/Nvidia.cxx
|
||||||
src/Pwm.cxx
|
src/Pwm.cxx
|
||||||
src/SensorsWrapper.cxx
|
src/SensorsWrapper.cxx
|
||||||
|
src/HwmonTemperatureSensor.cxx
|
||||||
)
|
)
|
||||||
|
|
||||||
set_property(TARGET app PROPERTY CXX_STANDARD 17)
|
set_property(TARGET app PROPERTY CXX_STANDARD 17)
|
||||||
|
|
||||||
target_include_directories(app PUBLIC include /opt/cuda)
|
target_include_directories(app PUBLIC include /opt/cuda)
|
||||||
target_link_libraries(app PUBLIC sensors nvidia-ml)
|
target_link_libraries(app PUBLIC sensors nvidia-ml ${Boost_LIBRARIES})
|
||||||
|
|||||||
@@ -1,11 +1,18 @@
|
|||||||
#ifndef HWMONTEMPERATURESENSOR_H_
|
#ifndef HWMONTEMPERATURESENSOR_H_
|
||||||
#define HWMONTEMPERATURESENSOR_H_
|
#define HWMONTEMPERATURESENSOR_H_
|
||||||
|
|
||||||
|
#include <sensors/sensors.h>
|
||||||
|
|
||||||
#include <TemperatureSensor.h>
|
#include <TemperatureSensor.h>
|
||||||
|
|
||||||
class HwmonTemperatureSensor : public TemperatureSensor {
|
class HwmonTemperatureSensor : public TemperatureSensor {
|
||||||
public:
|
public:
|
||||||
int getTemperature() override;
|
int getTemperature() override;
|
||||||
|
std::string toJson() override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
sensors_chip_name mChipName;
|
||||||
|
sensors_subfeature mSubFeature;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // HWMONTEMPERATURESENSOR_H_
|
#endif // HWMONTEMPERATURESENSOR_H_
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
#ifndef TEMPERATURESENSOR_H_
|
#ifndef TEMPERATURESENSOR_H_
|
||||||
#define TEMPERATURESENSOR_H_
|
#define TEMPERATURESENSOR_H_
|
||||||
|
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
class TemperatureSensor {
|
class TemperatureSensor {
|
||||||
public:
|
public:
|
||||||
virtual int getTemperature() = 0;
|
virtual int getTemperature() = 0;
|
||||||
|
virtual std::string toJson() = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // TEMPERATURESENSOR_H_
|
#endif // TEMPERATURESENSOR_H_
|
||||||
|
|||||||
33
app/src/HwmonTemperatureSensor.cxx
Normal file
33
app/src/HwmonTemperatureSensor.cxx
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
#include <boost/json.hpp>
|
||||||
|
#include <boost/json/parse.hpp>
|
||||||
|
#include <sensors/sensors.h>
|
||||||
|
|
||||||
|
#include <HwmonTemperatureSensor.h>
|
||||||
|
|
||||||
|
using namespace boost::json;
|
||||||
|
|
||||||
|
#define SENSOR_TYPE_STRING "HWMON"
|
||||||
|
|
||||||
|
int HwmonTemperatureSensor::getTemperature() {
|
||||||
|
double *value;
|
||||||
|
sensors_get_value(&mChipName, mSubFeature.number, value);
|
||||||
|
|
||||||
|
return static_cast<int>(*value);
|
||||||
|
}
|
||||||
|
|
||||||
|
void tag_invoke(value_from_tag, value &jv, sensors_bus_id &c) {
|
||||||
|
jv = {{"type", c.type}, {"nr", c.nr}};
|
||||||
|
}
|
||||||
|
|
||||||
|
void tag_invoke(value_from_tag, value &jv, sensors_chip_name &c) {
|
||||||
|
jv = {{"prefix", c.prefix},
|
||||||
|
{"sensors_bus_id", value_from(c.bus)},
|
||||||
|
{"addr", c.addr},
|
||||||
|
{"path", c.path}};
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string HwmonTemperatureSensor::toJson() {
|
||||||
|
value jv = {{SENSOR_TYPE_STRING, {"ChipName", value_from(mChipName)}}};
|
||||||
|
|
||||||
|
return serialize(jv);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user