Heater -> PWMOutput. Also added type field.

Author: GuLinux

src/commandparser.cpp

@@ -1,5 +1,5 @@
 #include "commandparser.h"
-#include "heater.h"
+#include "pwm_output.h"
 #include <ArduinoLog.h>
 #define LOG_SCOPE "APB::CommandParser "
 

src/history.cpp

@@ -13,7 +13,7 @@ APB::History::History() {
 
 
 #if APB_HEATERS_SIZE > 0
-void APB::History::Entry::Heater::set(const APB::Heater &heater) {
+void APB::History::Entry::PWMOutput::set(const APB::PWMOutput &heater) {
     temperatureHundredth = static_cast<int16_t>(heater.temperature().value_or(-100.0) * 100.0);
     duty = heater.active() ? heater.duty() : 0;
 }

src/history.h

@@ -10,7 +10,7 @@
 
 #include "ambient/ambient.h"
 #include "powermonitor.h"
-#include "heater.h"
+#include "pwm_output.h"
 #include "utils.h"
 
 #define HISTORY_ENTRY_SIZE 256
@@ -22,14 +22,14 @@ class History {
     History();
     struct Entry {
         #if APB_HEATERS_SIZE > 0
-        struct Heater {
+        struct PWMOutput {
             int16_t temperatureHundredth;
             uint8_t duty;
-            void set(const APB::Heater &heater);
+            void set(const APB::PWMOutput &heater);
             float getTemperature() const { return static_cast<float>(temperatureHundredth) / 100.0; }
             float getDuty() const { return static_cast<float>(duty); }
         };
-        std::array<Heater, APB_HEATERS_TEMP_SENSORS> heaters;
+        std::array<PWMOutput, APB_HEATERS_TEMP_SENSORS> heaters;
         #endif
         uint32_t secondsFromBoot;
         #ifndef APB_AMBIENT_TEMPERATURE_SENSOR_NONE

src/influxdb.cpp

@@ -7,7 +7,7 @@ APB::InfluxDb &APB::InfluxDb::Instance = *new APB::InfluxDb{};
 #include "settings.h"
 #include "wifimanager.h"
 #include "powermonitor.h"
-#include "heater.h"
+#include "pwm_output.h"
 #include "ambient/ambient.h"
 #include <StreamString.h>
 #include <ArduinoLog.h>
@@ -76,7 +76,7 @@ void APB::InfluxDb::sendData() {
     }
 #endif
 #if APB_HEATERS_SIZE > 0
-    for(Heater &heater : Heaters::Instance) {
+    for(PWMOutput &heater : Heaters::Instance) {
         heatersSensor.clearFields();
         heatersSensor.addField("index", heater.index());
         if(heater.temperature().has_value()) {

src/main.cpp

@@ -11,7 +11,7 @@
 
 #include "settings.h"
 #include "ambient/ambient.h"
-#include "heater.h"
+#include "pwm_output.h"
 #include "powermonitor.h"
 #include <Wire.h>
 #include <LittleFS.h>
@@ -95,7 +95,7 @@ void setup() {
   Wire.setClock(100000);
   APB::Ambient::Instance.setup(scheduler);
   APB::PowerMonitor::Instance.setup(scheduler);
-  std::for_each(APB::Heaters::Instance.begin(), APB::Heaters::Instance.end(), [i=0](APB::Heater &heater) mutable { heater.setup(i++, scheduler); });
+  std::for_each(APB::Heaters::Instance.begin(), APB::Heaters::Instance.end(), [i=0](APB::PWMOutput &heater) mutable { heater.setup(i++, scheduler); });
 
   webServer.setup();
   ArduinoOTAManager::Instance.setup([](const char*s) { Log.warning(s); }, std::bind(&fs::LittleFSFS::end, &LittleFS));