Cleanup, rename

app/include/CorrelatePwmRpm.h

@@ -1,16 +0,0 @@
-#ifndef CORRELATEPWMRPM_H_
-#define CORRELATEPWMRPM_H_
-
-/*
-** What I need:
-** - All system RPM sensors
-** - All system PWM controls
-**
-** ToDo: Find which PWM controller affects which RPM sensor
-**
-*/
-class CorrelatePwmRpm {
-public:
-};
-
-#endif // CORRELATEPWMRPM_H_

app/include/HwmonTemperatureSensor.h

@@ -8,12 +8,15 @@
 class HwmonTemperatureSensor : public TemperatureSensor {
 public:
   HwmonTemperatureSensor(const sensors_chip_name *chipName,
+                         const sensors_feature *feature,
                          const sensors_subfeature *subfeature);
 
-  int getTemperature() override;
+  int temperature() override;
+  std::string name() override;
 
 private:
   const sensors_chip_name *mChipName;
+  const sensors_feature *mFeature;
   const sensors_subfeature *mSubFeature;
 };
 

app/include/Nvidia.h

@@ -1,11 +0,0 @@
-#ifndef NVIDIA_H_
-#define NVIDIA_H_
-
-class Nvidia {
-public:
-  Nvidia();
-  ~Nvidia();
-  double get_gpu_temperature();
-};
-
-#endif // NVIDIA_H_

app/include/NvidiaTemperatureSensor.h

@@ -0,0 +1,15 @@
+#ifndef NVIDIA_H_
+#define NVIDIA_H_
+
+#include <TemperatureSensor.h>
+
+class NvidiaTemperatureSensor : public TemperatureSensor {
+public:
+  NvidiaTemperatureSensor();
+  ~NvidiaTemperatureSensor();
+
+  int temperature() override;
+  std::string name() override;
+};
+
+#endif // NVIDIA_H_

app/include/TemperatureSensor.h

@@ -5,7 +5,8 @@
 
 class TemperatureSensor {
 public:
-  virtual int getTemperature() = 0;
+  virtual int temperature() = 0;
+  virtual std::string name() = 0;
 };
 
 #endif // TEMPERATURESENSOR_H_