Cleanup includes

include/MqttHandleDtu.h

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include <Arduino.h>
+#include <cstdint>
 
 class MqttHandleDtuClass {
 public:

include/MqttHandleHass.h

@@ -1,11 +1,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "Configuration.h"
-#include <Arduino.h>
 #include <ArduinoJson.h>
 #include <Hoymiles.h>
-#include <memory>
 
 // mqtt discovery device classes
 enum {

include/MqttHandleInverter.h

@@ -2,10 +2,8 @@
 #pragma once
 
 #include "Configuration.h"
-#include <Arduino.h>
 #include <Hoymiles.h>
 #include <espMqttClient.h>
-#include <memory>
 
 class MqttHandleInverterClass {
 public:

include/MqttSettings.h

@@ -2,11 +2,9 @@
 #pragma once
 
 #include "NetworkSettings.h"
-#include <Arduino.h>
 #include <MqttSubscribeParser.h>
 #include <Ticker.h>
 #include <espMqttClient.h>
-#include <memory>
 
 class MqttSettingsClass {
 public:

include/NetworkSettings.h

@@ -3,7 +3,6 @@
 
 #include <DNSServer.h>
 #include <WiFi.h>
-#include <memory>
 #include <vector>
 
 enum class network_mode {

include/NtpSettings.h

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include <Arduino.h>
-
 class NtpSettingsClass {
 public:
     NtpSettingsClass();

include/WebApi_prometheus.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Hoymiles.h"
 #include <ESPAsyncWebServer.h>
+#include <Hoymiles.h>
 
 class WebApiPrometheusClass {
 public:

include/WebApi_ws_live.h

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "ArduinoJson.h"
+#include <ArduinoJson.h>
 #include <ESPAsyncWebServer.h>
 #include <Hoymiles.h>
 

src/MqttSettings.cpp

@@ -4,10 +4,6 @@
  */
 #include "MqttSettings.h"
 #include "Configuration.h"
-#include "NetworkSettings.h"
-#include <MqttClientSetup.h>
-#include <Ticker.h>
-#include <espMqttClient.h>
 
 MqttSettingsClass::MqttSettingsClass()
 {

src/NetworkSettings.cpp

@@ -6,7 +6,6 @@
 #include "Configuration.h"
 #include "Utils.h"
 #include "defaults.h"
-#include <WiFi.h>
 #ifdef OPENDTU_ETHERNET
 #include <ETH.h>
 #endif

src/WebApi.cpp

@@ -3,10 +3,9 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "defaults.h"
+#include <AsyncJson.h>
 
 WebApiClass::WebApiClass()
     : _server(HTTP_PORT)

src/WebApi_config.cpp

@@ -3,10 +3,9 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_config.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
 #include <LittleFS.h>
 
 void WebApiConfigClass::init(AsyncWebServer* server)

src/WebApi_devinfo.cpp

@@ -3,10 +3,9 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_devinfo.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
-#include "Hoymiles.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
+#include <Hoymiles.h>
 #include <ctime>
 
 void WebApiDevInfoClass::init(AsyncWebServer* server)

src/WebApi_dtu.cpp

@@ -3,11 +3,10 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_dtu.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
-#include "Hoymiles.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
+#include <Hoymiles.h>
 
 void WebApiDtuClass::init(AsyncWebServer* server)
 {

src/WebApi_eventlog.cpp

@@ -3,10 +3,9 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_eventlog.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
-#include "Hoymiles.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
+#include <Hoymiles.h>
 
 void WebApiEventlogClass::init(AsyncWebServer* server)
 {

src/WebApi_firmware.cpp

@@ -3,12 +3,11 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_firmware.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "Update.h"
 #include "WebApi.h"
 #include "helper.h"
+#include <AsyncJson.h>
 
 void WebApiFirmwareClass::init(AsyncWebServer* server)
 {

src/WebApi_inverter.cpp

@@ -3,13 +3,12 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_inverter.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
-#include "Hoymiles.h"
 #include "MqttHandleHass.h"
 #include "WebApi.h"
 #include "helper.h"
+#include <AsyncJson.h>
+#include <Hoymiles.h>
 
 void WebApiInverterClass::init(AsyncWebServer* server)
 {

src/WebApi_limit.cpp

@@ -3,10 +3,9 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_limit.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
-#include "Hoymiles.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
+#include <Hoymiles.h>
 
 void WebApiLimitClass::init(AsyncWebServer* server)
 {
@@ -43,11 +42,9 @@ void WebApiLimitClass::onLimitStatus(AsyncWebServerRequest* request)
         String limitStatus = "Unknown";
         if (status == LastCommandSuccess::CMD_OK) {
             limitStatus = "Ok";
-        }
+        } else if (status == LastCommandSuccess::CMD_NOK) {
-        else if (status == LastCommandSuccess::CMD_NOK) {
             limitStatus = "Failure";
-        }
+        } else if (status == LastCommandSuccess::CMD_PENDING) {
-        else if (status == LastCommandSuccess::CMD_PENDING) {
             limitStatus = "Pending";
         }
         root[serial]["limit_set_status"] = limitStatus;

src/WebApi_maintenance.cpp

@@ -4,8 +4,8 @@
  */
 
 #include "WebApi_maintenance.h"
-#include "AsyncJson.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
 
 void WebApiMaintenanceClass::init(AsyncWebServer* server)
 {

src/WebApi_mqtt.cpp

@@ -3,13 +3,12 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_mqtt.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "MqttHandleHass.h"
 #include "MqttSettings.h"
 #include "WebApi.h"
 #include "helper.h"
+#include <AsyncJson.h>
 
 void WebApiMqttClass::init(AsyncWebServer* server)
 {

src/WebApi_network.cpp

@@ -3,12 +3,11 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_network.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "NetworkSettings.h"
 #include "WebApi.h"
 #include "helper.h"
+#include <AsyncJson.h>
 
 void WebApiNetworkClass::init(AsyncWebServer* server)
 {

src/WebApi_ntp.cpp

@@ -3,12 +3,11 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_ntp.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "NtpSettings.h"
 #include "WebApi.h"
 #include "helper.h"
+#include <AsyncJson.h>
 
 void WebApiNtpClass::init(AsyncWebServer* server)
 {

src/WebApi_power.cpp

@@ -3,10 +3,9 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_power.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
-#include "Hoymiles.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
+#include <Hoymiles.h>
 
 void WebApiPowerClass::init(AsyncWebServer* server)
 {

src/WebApi_prometheus.cpp

@@ -1,8 +1,7 @@
 #include "WebApi_prometheus.h"
-
 #include "Configuration.h"
-#include "Hoymiles.h"
 #include "NetworkSettings.h"
+#include <Hoymiles.h>
 
 void WebApiPrometheusClass::init(AsyncWebServer* server)
 {

src/WebApi_security.cpp

@@ -3,11 +3,10 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_security.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "WebApi.h"
 #include "helper.h"
+#include <AsyncJson.h>
 
 void WebApiSecurityClass::init(AsyncWebServer* server)
 {

src/WebApi_sysstatus.cpp

@@ -3,11 +3,10 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_sysstatus.h"
-#include "ArduinoJson.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "NetworkSettings.h"
 #include "WebApi.h"
+#include <AsyncJson.h>
 #include <Hoymiles.h>
 #include <LittleFS.h>
 #include <ResetReason.h>

src/WebApi_ws_live.cpp

@@ -3,10 +3,10 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "WebApi_ws_live.h"
-#include "AsyncJson.h"
 #include "Configuration.h"
 #include "WebApi.h"
 #include "defaults.h"
+#include <AsyncJson.h>
 
 WebApiWsLiveClass::WebApiWsLiveClass()
     : _ws("/livedata")

src/main.cpp

@@ -3,7 +3,6 @@
  * Copyright (C) 2022 Thomas Basler and others
  */
 #include "Configuration.h"
-#include "Hoymiles.h"
 #include "MqttHandleDtu.h"
 #include "MqttHandleHass.h"
 #include "MqttHandleInverter.h"
@@ -14,6 +13,7 @@
 #include "WebApi.h"
 #include "defaults.h"
 #include <Arduino.h>
+#include <Hoymiles.h>
 #include <LittleFS.h>
 
 void setup()