diff --git a/include/MqttHandleDtu.h b/include/MqttHandleDtu.h index 71c47b7..7a65892 100644 --- a/include/MqttHandleDtu.h +++ b/include/MqttHandleDtu.h @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include +#include class MqttHandleDtuClass { public: diff --git a/include/MqttHandleHass.h b/include/MqttHandleHass.h index ee8b551..33d9df8 100644 --- a/include/MqttHandleHass.h +++ b/include/MqttHandleHass.h @@ -1,11 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include "Configuration.h" -#include #include #include -#include // mqtt discovery device classes enum { diff --git a/include/MqttHandleInverter.h b/include/MqttHandleInverter.h index 56c1ef8..a4e49ce 100644 --- a/include/MqttHandleInverter.h +++ b/include/MqttHandleInverter.h @@ -2,10 +2,8 @@ #pragma once #include "Configuration.h" -#include #include #include -#include class MqttHandleInverterClass { public: diff --git a/include/MqttSettings.h b/include/MqttSettings.h index d3279f6..e68c230 100644 --- a/include/MqttSettings.h +++ b/include/MqttSettings.h @@ -2,11 +2,9 @@ #pragma once #include "NetworkSettings.h" -#include #include #include #include -#include class MqttSettingsClass { public: diff --git a/include/NetworkSettings.h b/include/NetworkSettings.h index 1ad3c6a..507167b 100644 --- a/include/NetworkSettings.h +++ b/include/NetworkSettings.h @@ -3,7 +3,6 @@ #include #include -#include #include enum class network_mode { diff --git a/include/NtpSettings.h b/include/NtpSettings.h index 08dc06e..188876e 100644 --- a/include/NtpSettings.h +++ b/include/NtpSettings.h @@ -1,8 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include - class NtpSettingsClass { public: NtpSettingsClass(); diff --git a/include/WebApi_prometheus.h b/include/WebApi_prometheus.h index 87a406e..42d5242 100644 --- a/include/WebApi_prometheus.h +++ b/include/WebApi_prometheus.h @@ -1,7 +1,7 @@ #pragma once -#include "Hoymiles.h" #include +#include class WebApiPrometheusClass { public: diff --git a/include/WebApi_ws_live.h b/include/WebApi_ws_live.h index 7f21f80..5da1864 100644 --- a/include/WebApi_ws_live.h +++ b/include/WebApi_ws_live.h @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #pragma once -#include "ArduinoJson.h" +#include #include #include diff --git a/src/MqttSettings.cpp b/src/MqttSettings.cpp index 02bde75..bcb5928 100644 --- a/src/MqttSettings.cpp +++ b/src/MqttSettings.cpp @@ -4,10 +4,6 @@ */ #include "MqttSettings.h" #include "Configuration.h" -#include "NetworkSettings.h" -#include -#include -#include MqttSettingsClass::MqttSettingsClass() { diff --git a/src/NetworkSettings.cpp b/src/NetworkSettings.cpp index b975043..88b93fb 100644 --- a/src/NetworkSettings.cpp +++ b/src/NetworkSettings.cpp @@ -6,7 +6,6 @@ #include "Configuration.h" #include "Utils.h" #include "defaults.h" -#include #ifdef OPENDTU_ETHERNET #include #endif diff --git a/src/WebApi.cpp b/src/WebApi.cpp index 5076ce4..9cd9715 100644 --- a/src/WebApi.cpp +++ b/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 WebApiClass::WebApiClass() : _server(HTTP_PORT) diff --git a/src/WebApi_config.cpp b/src/WebApi_config.cpp index 84e6af9..c848b36 100644 --- a/src/WebApi_config.cpp +++ b/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 #include void WebApiConfigClass::init(AsyncWebServer* server) diff --git a/src/WebApi_devinfo.cpp b/src/WebApi_devinfo.cpp index 1a29081..d55235d 100644 --- a/src/WebApi_devinfo.cpp +++ b/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 +#include #include void WebApiDevInfoClass::init(AsyncWebServer* server) diff --git a/src/WebApi_dtu.cpp b/src/WebApi_dtu.cpp index bb61b05..0ca2662 100644 --- a/src/WebApi_dtu.cpp +++ b/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 +#include void WebApiDtuClass::init(AsyncWebServer* server) { diff --git a/src/WebApi_eventlog.cpp b/src/WebApi_eventlog.cpp index 6c03fb4..c312739 100644 --- a/src/WebApi_eventlog.cpp +++ b/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 +#include void WebApiEventlogClass::init(AsyncWebServer* server) { diff --git a/src/WebApi_firmware.cpp b/src/WebApi_firmware.cpp index 48984f4..798264a 100644 --- a/src/WebApi_firmware.cpp +++ b/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 void WebApiFirmwareClass::init(AsyncWebServer* server) { diff --git a/src/WebApi_inverter.cpp b/src/WebApi_inverter.cpp index 39ac2e5..edb023f 100644 --- a/src/WebApi_inverter.cpp +++ b/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 +#include void WebApiInverterClass::init(AsyncWebServer* server) { diff --git a/src/WebApi_limit.cpp b/src/WebApi_limit.cpp index 3195d40..f05d04d 100644 --- a/src/WebApi_limit.cpp +++ b/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 +#include 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; diff --git a/src/WebApi_maintenance.cpp b/src/WebApi_maintenance.cpp index 9a17682..effedd6 100644 --- a/src/WebApi_maintenance.cpp +++ b/src/WebApi_maintenance.cpp @@ -4,8 +4,8 @@ */ #include "WebApi_maintenance.h" -#include "AsyncJson.h" #include "WebApi.h" +#include void WebApiMaintenanceClass::init(AsyncWebServer* server) { diff --git a/src/WebApi_mqtt.cpp b/src/WebApi_mqtt.cpp index db4c242..71ab677 100644 --- a/src/WebApi_mqtt.cpp +++ b/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 void WebApiMqttClass::init(AsyncWebServer* server) { diff --git a/src/WebApi_network.cpp b/src/WebApi_network.cpp index c5a3484..b24ce1b 100644 --- a/src/WebApi_network.cpp +++ b/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 void WebApiNetworkClass::init(AsyncWebServer* server) { diff --git a/src/WebApi_ntp.cpp b/src/WebApi_ntp.cpp index 4c37154..14eab9c 100644 --- a/src/WebApi_ntp.cpp +++ b/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 void WebApiNtpClass::init(AsyncWebServer* server) { diff --git a/src/WebApi_power.cpp b/src/WebApi_power.cpp index 22591c0..6426f17 100644 --- a/src/WebApi_power.cpp +++ b/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 +#include void WebApiPowerClass::init(AsyncWebServer* server) { diff --git a/src/WebApi_prometheus.cpp b/src/WebApi_prometheus.cpp index 2896fa1..5e9a579 100644 --- a/src/WebApi_prometheus.cpp +++ b/src/WebApi_prometheus.cpp @@ -1,8 +1,7 @@ #include "WebApi_prometheus.h" - #include "Configuration.h" -#include "Hoymiles.h" #include "NetworkSettings.h" +#include void WebApiPrometheusClass::init(AsyncWebServer* server) { diff --git a/src/WebApi_security.cpp b/src/WebApi_security.cpp index c345d38..e4efdf4 100644 --- a/src/WebApi_security.cpp +++ b/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 void WebApiSecurityClass::init(AsyncWebServer* server) { diff --git a/src/WebApi_sysstatus.cpp b/src/WebApi_sysstatus.cpp index ce7c21a..ca4cebe 100644 --- a/src/WebApi_sysstatus.cpp +++ b/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 #include #include #include diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp index 0027c8f..e396fec 100644 --- a/src/WebApi_ws_live.cpp +++ b/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 WebApiWsLiveClass::WebApiWsLiveClass() : _ws("/livedata") diff --git a/src/main.cpp b/src/main.cpp index 5fc75eb..9db9c72 100644 --- a/src/main.cpp +++ b/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 +#include #include void setup()