Allow for different types of PWM outputs.

 - Heater: classic dew heater with temperature sensor
 - Output: more generic PWM output

Also removed InfluxDB push support, as the pull metrics endpoint is far
simple and more reliable.

Author: GuLinux

platformio.ini

@@ -36,7 +36,6 @@ lib_deps =
 	robtillaart/INA219@^0.3.1
 	sensirion/Sensirion I2C SHT4x@^1.1.0
 	mathertel/OneButton@^2.6.1
-	tobiasschuerg/ESP8266 Influxdb @ ^3.13.2
 	arkhipenko/TaskScheduler@^3.8.5
 build_flags = 
 	-DELEGANTOTA_USE_ASYNC_WEBSERVER=1

src/commandparser.cpp

@@ -10,7 +10,7 @@ CommandParser &CommandParser::Instance = *new CommandParser();
 CommandParser::CommandParser() {
 }
 
-void CommandParser::getHeaters(JsonArray response) {
-    Log.infoln(LOG_SCOPE "onGetHeaters: %d", Heaters::Instance.size());
-    Heaters::toJson(response);
+void CommandParser::getPWMOutputs(JsonArray response) {
+    Log.infoln(LOG_SCOPE "onGetPWMOutputs: %d", PWMOutputs::Instance.size());
+    PWMOutputs::toJson(response);
 }

src/commandparser.h

@@ -6,7 +6,7 @@ class CommandParser {
 public:
     CommandParser();
     static CommandParser &Instance;
-    void getHeaters(JsonArray response);
-    void setHeaters(JsonVariant request);
+    void getPWMOutputs(JsonArray response);
+    void setPWMOutputs(JsonVariant request);
 };
 }

src/configuration.h

@@ -14,22 +14,21 @@
 #define WIFIMANAGER_MAX_STATIONS 5
 #define APB_NETWORK_LOGGER_BACKLOG 20
 #define APB_AMBIENT_UPDATE_INTERVAL_SECONDS 5
-#define APB_HEATER_UPDATE_INTERVAL_SECONDS 5
+#define APB_PWM_OUTPUT_UPDATE_INTERVAL_SECONDS 5
 #define APB_AMBIENT_TEMPERATURE_SENSOR_I2C_ADDRESS 0x44
-#define APB_HEATER_TEMPERATURE_AVERAGE_COUNT 10
-#define APB_HEATER_TEMPERATURE_SENSOR_THERMISTOR_REFERENCE 10'000
-#define APB_HEATER_TEMPERATURE_SENSOR_THERMISTOR_NOMINAL 10'000
-#define APB_HEATER_TEMPERATURE_SENSOR_THERMISTOR_NOMINAL_TEMP 25
-#define APB_HEATER_TEMPERATURE_SENSOR_THERMISTOR_B_VALUE 3950
+#define APB_PWM_OUTPUT_TEMPERATURE_AVERAGE_COUNT 10
+#define APB_PWM_OUTPUT_TEMPERATURE_SENSOR_THERMISTOR_REFERENCE 10'000
+#define APB_PWM_OUTPUT_TEMPERATURE_SENSOR_THERMISTOR_NOMINAL 10'000
+#define APB_PWM_OUTPUT_TEMPERATURE_SENSOR_THERMISTOR_NOMINAL_TEMP 25
+#define APB_PWM_OUTPUT_TEMPERATURE_SENSOR_THERMISTOR_B_VALUE 3950
 #define APB_POWER_MAX_CURRENT_AMPS 8
 #define APB_POWER_SHUNT_OHMS 0.040
 #define APB_POWER_INA219_GAIN 8
 #define APB_POWER_INA219_VOLTAGE_RANGE 16
 #define APB_HISTORY_TASK_SECONDS 10'000
-#define APB_INFLUXDB_TASK_SECONDS 2'000
 
 #define APB_AMBIENT_TEMPERATURE_SENSOR_SHT4x
-#define APB_HEATER_TEMPERATURE_SENSOR_THERMISTOR
+#define APB_PWM_OUTPUT_TEMPERATURE_SENSOR_THERMISTOR
 
 #define APB_INA1219_ADDRESS 0x40
 

src/configuration_lolin_c3_mini.h

@@ -6,7 +6,7 @@
 // Thermistor PWM pinout. First number in a pair is the PWM pin (output), second thermistor PIN (analog input)
 // Setting -1 for the thermistor indicates there's no thermistor available.
 // IMPORTANT: there is no compiler check for pinout size, so be careful.
-#define APB_HEATERS_PWM_PINOUT Pinout{3,1},{4,0},{20,-1}
-#define APB_HEATERS_SIZE 3
-#define APB_HEATERS_TEMP_SENSORS 2
+#define APB_PWM_OUTPUTS_PWM_PINOUT {3,1,Heater},{4,0,Heater},{20,-1,Heater}
+#define APB_PWM_OUTPUTS_SIZE 3
+#define APB_PWM_OUTPUTS_TEMP_SENSORS 2
 #define ONEBUTTON_USER_BUTTON_1 21

src/configuration_lolin_s2_mini.h

@@ -6,6 +6,6 @@
 
 // Thermistor PWM pinout. First number in a pair is the PWM pin (output), second thermistor PIN (analog input)
 // IMPORTANT: there is no compiler check for pinout size, so be careful.
-#define APB_HEATERS_PWM_PINOUT Pinout{5,1}, Pinout{2,4}, {3,7}
-#define APB_HEATERS_SIZE 3
-#define APB_HEATERS_TEMP_SENSORS 3
+#define APB_PWM_OUTPUTS_PWM_PINOUT {5,1, Heater}, {2,4, Heater}, {3,7, Heater}
+#define APB_PWM_OUTPUTS_SIZE 3
+#define APB_PWM_OUTPUTS_TEMP_SENSORS 3

src/history.cpp

@@ -12,10 +12,10 @@ APB::History::History() {
 }
 
 
-#if APB_HEATERS_SIZE > 0
-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;
+#if APB_PWM_OUTPUTS_SIZE > 0
+void APB::History::Entry::PWMOutput::set(const APB::PWMOutput &pwmOutput) {
+    temperatureHundredth = static_cast<int16_t>(pwmOutput.temperature().value_or(-100.0) * 100.0);
+    duty = pwmOutput.active() ? pwmOutput.duty() : 0;
 }
 #endif
 
@@ -45,14 +45,14 @@ void APB::History::Entry::populate(JsonObject object) {
     object["ambientDewpoint"] = static_cast<char*>(0);
 #endif
 
-#if APB_HEATERS_SIZE > 0
-    for(uint8_t i=0; i<heaters.size(); i++) {
-        JsonObject heaterObject = object["heaters"][i].to<JsonObject>();;
-        heaterObject["duty"] = heaters[i].getDuty();
-        setNullableFloat(heaterObject, "temperature", heaters[i].getTemperature());
+#if APB_PWM_OUTPUTS_SIZE > 0
+    for(uint8_t i=0; i<pwmOutputs.size(); i++) {
+        JsonObject pwmOutput = object["pwmOutputs"][i].to<JsonObject>();;
+        pwmOutput["duty"] = pwmOutputs[i].getDuty();
+        setNullableFloat(pwmOutput, "temperature", pwmOutputs[i].getTemperature());
     }
 #else
-    object["heaters"].to<JsonArray>();
+    object["pwmOutputs"].to<JsonArray>();
 #endif
     object["busVoltage"] = getBusVoltage();
     object["power"] = getPower();
@@ -75,16 +75,16 @@ void APB::History::add() {
   }
 
   APB::History::Entry entry {
-    esp_timer_get_time() / 1000'000
+    static_cast<uint32_t>(esp_timer_get_time() / 1000'000)
   };
 
 #ifndef APB_AMBIENT_TEMPERATURE_SENSOR_NONE
   entry.setAmbient(APB::Ambient::Instance.reading());
 #endif
 
-#if APB_HEATERS_SIZE > 0
-  for(uint8_t i=0; i<APB_HEATERS_TEMP_SENSORS; i++) {
-    entry.heaters[i].set(APB::Heaters::Instance[i]);
+#if APB_PWM_OUTPUTS_SIZE > 0
+  for(uint8_t i=0; i<APB_PWM_OUTPUTS_TEMP_SENSORS; i++) {
+    entry.pwmOutputs[i].set(APB::PWMOutputs::Instance[i]);
   }
 #endif
   entry.setPower(PowerMonitor::Instance.status());

src/history.h

@@ -21,17 +21,18 @@ class History {
 public:
     History();
     struct Entry {
-        #if APB_HEATERS_SIZE > 0
+        uint32_t secondsFromBoot;
+        #if APB_PWM_OUTPUTS_SIZE > 0
         struct PWMOutput {
             int16_t temperatureHundredth;
             uint8_t duty;
-            void set(const APB::PWMOutput &heater);
+            void set(const APB::PWMOutput &pwmOutput);
             float getTemperature() const { return static_cast<float>(temperatureHundredth) / 100.0; }
             float getDuty() const { return static_cast<float>(duty); }
         };
-        std::array<PWMOutput, APB_HEATERS_TEMP_SENSORS> heaters;
+        std::array<PWMOutput, APB_PWM_OUTPUTS_TEMP_SENSORS> pwmOutputs;
         #endif
-        uint32_t secondsFromBoot;
+        
         #ifndef APB_AMBIENT_TEMPERATURE_SENSOR_NONE
         void setAmbient(const std::optional<Ambient::Reading> &reading);
         float getAmbientTemperature() const { return static_cast<float>(ambientTemperatureHundredth) / 100.0; }