From e6188b8e72aa09f0855a689360cef2e7d2ed0220 Mon Sep 17 00:00:00 2001
From: Simon <info@simonwil.de>
Date: Sun, 11 Sep 2022 19:41:45 +0200
Subject: [PATCH] Organize the files

---
 app/CMakeLists.txt                                 | 6 +++---
 app/include/{ => fan}/Fan.h                        | 2 +-
 app/include/{ => fan}/HwmonFan.h                   | 4 ++--
 app/include/{ => fan}/Pwm.h                        | 0
 app/include/{ => sensor}/HwmonTemperatureSensor.h  | 2 +-
 app/include/{ => sensor}/NvidiaTemperatureSensor.h | 2 +-
 app/include/{ => sensor}/TemperatureSensor.h       | 0
 app/src/{ => fan}/Pwm.cxx                          | 2 +-
 app/src/main.cxx                                   | 6 +++---
 app/src/{ => sensor}/HwmonTemperatureSensor.cxx    | 2 +-
 app/src/{ => sensor}/NvidiaTemperatureSensor.cxx   | 2 +-
 11 files changed, 14 insertions(+), 14 deletions(-)
 rename app/include/{ => fan}/Fan.h (72%)
 rename app/include/{ => fan}/HwmonFan.h (69%)
 rename app/include/{ => fan}/Pwm.h (100%)
 rename app/include/{ => sensor}/HwmonTemperatureSensor.h (93%)
 rename app/include/{ => sensor}/NvidiaTemperatureSensor.h (86%)
 rename app/include/{ => sensor}/TemperatureSensor.h (100%)
 rename app/src/{ => fan}/Pwm.cxx (99%)
 rename app/src/{ => sensor}/HwmonTemperatureSensor.cxx (92%)
 rename app/src/{ => sensor}/NvidiaTemperatureSensor.cxx (91%)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 55a2ca0..a4d4b5e 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -9,10 +9,10 @@ find_package(Boost 1.79.0 COMPONENTS json)
 
 add_executable(app
   src/main.cxx
-  src/NvidiaTemperatureSensor.cxx
-  src/Pwm.cxx
+  src/sensor/NvidiaTemperatureSensor.cxx
+  src/fan/Pwm.cxx
   src/SensorsWrapper.cxx
-  src/HwmonTemperatureSensor.cxx
+  src/sensor/HwmonTemperatureSensor.cxx
 )
 
 set_property(TARGET app PROPERTY CXX_STANDARD 17)
diff --git a/app/include/Fan.h b/app/include/fan/Fan.h
similarity index 72%
rename from app/include/Fan.h
rename to app/include/fan/Fan.h
index d9b8d13..71d3e8a 100644
--- a/app/include/Fan.h
+++ b/app/include/fan/Fan.h
@@ -3,7 +3,7 @@
 
 class Fan {
 public:
-  virtual void PWM(int value) = 0;
+  virtual void PWM(int percent) = 0;
   virtual int RPM() = 0;
 };
 
diff --git a/app/include/HwmonFan.h b/app/include/fan/HwmonFan.h
similarity index 69%
rename from app/include/HwmonFan.h
rename to app/include/fan/HwmonFan.h
index 08df5ce..39c4cb3 100644
--- a/app/include/HwmonFan.h
+++ b/app/include/fan/HwmonFan.h
@@ -1,11 +1,11 @@
 #ifndef HWMONFAN_H_
 #define HWMONFAN_H_
 
-#include <Fan.h>
+#include <fan/Fan.h>
 
 class HwmonFan : public Fan {
 public:
-  void PWM(int value) override;
+  void PWM(int percent) override;
   int RPM() override;
 };
 
diff --git a/app/include/Pwm.h b/app/include/fan/Pwm.h
similarity index 100%
rename from app/include/Pwm.h
rename to app/include/fan/Pwm.h
diff --git a/app/include/HwmonTemperatureSensor.h b/app/include/sensor/HwmonTemperatureSensor.h
similarity index 93%
rename from app/include/HwmonTemperatureSensor.h
rename to app/include/sensor/HwmonTemperatureSensor.h
index 8dbfdaf..de7ecdf 100644
--- a/app/include/HwmonTemperatureSensor.h
+++ b/app/include/sensor/HwmonTemperatureSensor.h
@@ -3,7 +3,7 @@
 
 #include <sensors/sensors.h>
 
-#include <TemperatureSensor.h>
+#include <sensor/TemperatureSensor.h>
 
 class HwmonTemperatureSensor : public TemperatureSensor {
 public:
diff --git a/app/include/NvidiaTemperatureSensor.h b/app/include/sensor/NvidiaTemperatureSensor.h
similarity index 86%
rename from app/include/NvidiaTemperatureSensor.h
rename to app/include/sensor/NvidiaTemperatureSensor.h
index c7425fb..b408ce4 100644
--- a/app/include/NvidiaTemperatureSensor.h
+++ b/app/include/sensor/NvidiaTemperatureSensor.h
@@ -1,7 +1,7 @@
 #ifndef NVIDIA_H_
 #define NVIDIA_H_
 
-#include <TemperatureSensor.h>
+#include <sensor/TemperatureSensor.h>
 
 class NvidiaTemperatureSensor : public TemperatureSensor {
 public:
diff --git a/app/include/TemperatureSensor.h b/app/include/sensor/TemperatureSensor.h
similarity index 100%
rename from app/include/TemperatureSensor.h
rename to app/include/sensor/TemperatureSensor.h
diff --git a/app/src/Pwm.cxx b/app/src/fan/Pwm.cxx
similarity index 99%
rename from app/src/Pwm.cxx
rename to app/src/fan/Pwm.cxx
index 4916b05..fdc54b7 100644
--- a/app/src/Pwm.cxx
+++ b/app/src/fan/Pwm.cxx
@@ -5,7 +5,7 @@
 #include <regex>
 #include <string>
 
-#include <Pwm.h>
+#include <fan/Pwm.h>
 
 namespace fs = std::filesystem;
 using namespace std;
diff --git a/app/src/main.cxx b/app/src/main.cxx
index 6c42694..ad1ab0c 100644
--- a/app/src/main.cxx
+++ b/app/src/main.cxx
@@ -5,9 +5,9 @@
 
 #include <sensors/sensors.h>
 
-#include <HwmonTemperatureSensor.h>
-#include <NvidiaTemperatureSensor.h>
-#include <Pwm.h>
+#include <fan/Pwm.h>
+#include <sensor/HwmonTemperatureSensor.h>
+#include <sensor/NvidiaTemperatureSensor.h>
 
 #define CONFIG_FILE "/etc/conf.d/sensors"
 
diff --git a/app/src/HwmonTemperatureSensor.cxx b/app/src/sensor/HwmonTemperatureSensor.cxx
similarity index 92%
rename from app/src/HwmonTemperatureSensor.cxx
rename to app/src/sensor/HwmonTemperatureSensor.cxx
index ca28515..3fd1ab6 100644
--- a/app/src/HwmonTemperatureSensor.cxx
+++ b/app/src/sensor/HwmonTemperatureSensor.cxx
@@ -1,6 +1,6 @@
 #include <sensors/sensors.h>
 
-#include <HwmonTemperatureSensor.h>
+#include <sensor/HwmonTemperatureSensor.h>
 
 using namespace std;
 
diff --git a/app/src/NvidiaTemperatureSensor.cxx b/app/src/sensor/NvidiaTemperatureSensor.cxx
similarity index 91%
rename from app/src/NvidiaTemperatureSensor.cxx
rename to app/src/sensor/NvidiaTemperatureSensor.cxx
index 6b9a73b..cf5dfab 100644
--- a/app/src/NvidiaTemperatureSensor.cxx
+++ b/app/src/sensor/NvidiaTemperatureSensor.cxx
@@ -1,6 +1,6 @@
 #include <include/nvml.h>
 
-#include <NvidiaTemperatureSensor.h>
+#include <sensor/NvidiaTemperatureSensor.h>
 
 using namespace std;