Feature: OneMoreThing Step II

Robert-Schimanek · Sep 23, 2024 · a18c29b · a18c29b
1 parent 65ff4be
commit a18c29b
Show file tree

Hide file tree

Showing 45 changed files with 296 additions and 1,438 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ logs/device-monitor*.log
 platformio_override.ini
 .DS_Store
 platformio_override.ini
+/webapp/src/Hoywei-Turbo-WebApp
diff --git a/Hoywei-Turbo b/Hoywei-Turbo
diff --git a/include/WebApi.h b/include/WebApi.h
@@ -34,7 +34,12 @@
 #include <ESPAsyncWebServer.h>
 #include <TaskSchedulerDeclarations.h>
 
+#include "WebApi_PriceProvider.h"
+
 class WebApiClass {
+
+    friend class HoyweiWebApiClass;
+
 public:
     WebApiClass();
     void init(Scheduler& scheduler);
@@ -69,9 +74,6 @@ class WebApiClass {
     WebApiNtpClass _webApiNtp;
     WebApiPowerClass _webApiPower;
     WebApiPowerMeterClass _webApiPowerMeter;
-    WebApiPowerMeterClass _webApiPowerMeterInverter;
-    WebApiPowerMeterClass _webApiPowerMeterCharger;
-    WebApiPowerMeterClass _webApiPowerMeterSolar;
     WebApiPowerLimiterClass _webApiPowerLimiter;
     WebApiPrometheusClass _webApiPrometheus;
     WebApiSecurityClass _webApiSecurity;
@@ -84,6 +86,11 @@ class WebApiClass {
     WebApiHuaweiClass _webApiHuaweiClass;
     WebApiWsHuaweiLiveClass _webApiWsHuaweiLive;
     WebApiWsBatteryLiveClass _webApiWsBatteryLive;
+
+    //WebApiPowerMeterClass _webApiPowerMeterInverter;
+    //WebApiPowerMeterClass _webApiPowerMeterCharger;
+    //WebApiPowerMeterClass _webApiPowerMeterSolar;
+    //WebApiPriceProviderClass _webApiPriceProvider;
 };
 
-extern WebApiClass WebApi;
+// extern WebApiClass WebApi;
diff --git a/src/WebApi.cpp b/src/WebApi.cpp
@@ -10,10 +10,7 @@
 
 WebApiClass::WebApiClass()
     : _server(HTTP_PORT),
-    _webApiPowerMeter(PowerMeterSource::HOME,"/api/powermeter"),
-    _webApiPowerMeterInverter(PowerMeterSource::INVERTER_BATTERY,"/api/powermeterinverter"),
-    _webApiPowerMeterCharger(PowerMeterSource::CHARGER,"/api/powermetercharger"),
-    _webApiPowerMeterSolar(PowerMeterSource::INVERTER_PV,"/api/powermetersolar")
+    _webApiPowerMeter(PowerMeterSource::HOME,"/api/powermeter")
 {
 }
 
@@ -41,9 +38,6 @@ void WebApiClass::init(Scheduler& scheduler)
     _webApiWsLive.init(_server, scheduler);
     _webApiBattery.init(_server, scheduler);
     _webApiPowerMeter.init(_server, scheduler);
-    _webApiPowerMeterInverter.init(_server, scheduler);
-    _webApiPowerMeterCharger.init(_server, scheduler);
-    _webApiPowerMeterSolar.init(_server, scheduler);
     _webApiPowerLimiter.init(_server, scheduler);
     _webApiWsVedirectLive.init(_server, scheduler);
     _webApiVedirect.init(_server, scheduler);
@@ -109,7 +103,7 @@ bool WebApiClass::parseRequestData(AsyncWebServerRequest* request, AsyncJsonResp
     if (!request->hasParam("data", true)) {
         retMsg["message"] = "No values found!";
         retMsg["code"] = WebApiError::GenericNoValueFound;
-        WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
+        sendJsonResponse(request, response, __FUNCTION__, __LINE__);
         return false;
     }
 
@@ -118,7 +112,7 @@ bool WebApiClass::parseRequestData(AsyncWebServerRequest* request, AsyncJsonResp
     if (error) {
         retMsg["message"] = "Failed to parse data!";
         retMsg["code"] = WebApiError::GenericParseError;
-        WebApi.sendJsonResponse(request, response, __FUNCTION__, __LINE__);
+        sendJsonResponse(request, response, __FUNCTION__, __LINE__);
         return false;
     }
 
@@ -155,4 +149,4 @@ bool WebApiClass::sendJsonResponse(AsyncWebServerRequest* request, AsyncJsonResp
     return ret_val;
 }
 
-WebApiClass WebApi;
+//WebApiClass WebApi;
diff --git a/src/WebApi_Huawei.cpp b/src/WebApi_Huawei.cpp
@@ -7,7 +7,7 @@
 #include <HoyweiConfiguration.h>
 #include "MessageOutput.h"
 #include "HoyweiPinMapping.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include <AsyncJson.h>
 #include <Hoymiles.h>

diff --git a/src/WebApi_battery.cpp b/src/WebApi_battery.cpp
@@ -9,7 +9,7 @@
 #include <HoyweiConfiguration.h>
 #include <HoyweiMqttHandleBatteryHass.h>
 #include <HoyweiMqttHandlePowerLimiterHass.h>
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_battery.h"
 #include "WebApi_errors.h"
 #include "helper.h"

diff --git a/src/WebApi_config.cpp b/src/WebApi_config.cpp
@@ -5,7 +5,7 @@
 #include "WebApi_config.h"
 #include <HoyweiConfiguration.h>
 #include "Utils.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include <AsyncJson.h>
 #include <LittleFS.h>

diff --git a/src/WebApi_device.cpp b/src/WebApi_device.cpp
@@ -7,7 +7,7 @@
 #include "Display_Graphic.h"
 #include "HoyweiPinMapping.h"
 #include "Utils.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include "helper.h"
 #include <AsyncJson.h>

diff --git a/src/WebApi_devinfo.cpp b/src/WebApi_devinfo.cpp
@@ -3,7 +3,7 @@
  * Copyright (C) 2022-2024 Thomas Basler and others
  */
 #include "WebApi_devinfo.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include <AsyncJson.h>
 #include <Hoymiles.h>
 #include <ctime>

diff --git a/src/WebApi_dtu.cpp b/src/WebApi_dtu.cpp
@@ -4,7 +4,7 @@
  */
 #include "WebApi_dtu.h"
 #include <HoyweiConfiguration.h>
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include <AsyncJson.h>
 #include <Hoymiles.h>

diff --git a/src/WebApi_eventlog.cpp b/src/WebApi_eventlog.cpp
@@ -3,7 +3,7 @@
  * Copyright (C) 2022-2024 Thomas Basler and others
  */
 #include "WebApi_eventlog.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include <AsyncJson.h>
 #include <Hoymiles.h>
 

diff --git a/src/WebApi_firmware.cpp b/src/WebApi_firmware.cpp
@@ -6,7 +6,7 @@
 #include <HoyweiConfiguration.h>
 #include "Update.h"
 #include "Utils.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "helper.h"
 #include <AsyncJson.h>
 #include "esp_partition.h"

diff --git a/src/WebApi_gridprofile.cpp b/src/WebApi_gridprofile.cpp
@@ -3,7 +3,7 @@
  * Copyright (C) 2022-2024 Thomas Basler and others
  */
 #include "WebApi_gridprofile.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include <AsyncJson.h>
 #include <Hoymiles.h>
 

diff --git a/src/WebApi_inverter.cpp b/src/WebApi_inverter.cpp
@@ -5,7 +5,7 @@
 #include "WebApi_inverter.h"
 #include <HoyweiConfiguration.h>
 #include "MqttHandleHass.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include "defaults.h"
 #include "helper.h"

diff --git a/src/WebApi_limit.cpp b/src/WebApi_limit.cpp
@@ -3,7 +3,7 @@
  * Copyright (C) 2022-2024 Thomas Basler and others
  */
 #include "WebApi_limit.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include "defaults.h"
 #include "helper.h"

diff --git a/src/WebApi_maintenance.cpp b/src/WebApi_maintenance.cpp
@@ -5,7 +5,7 @@
 
 #include "WebApi_maintenance.h"
 #include "Utils.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include <AsyncJson.h>
 

diff --git a/src/WebApi_mqtt.cpp b/src/WebApi_mqtt.cpp
@@ -13,7 +13,7 @@
 #include "MqttHandleVedirectHass.h"
 #include "MqttHandleVedirect.h"
 #include "MqttSettings.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include "helper.h"
 #include "PowerLimiter.h"

diff --git a/src/WebApi_network.cpp b/src/WebApi_network.cpp
@@ -5,7 +5,7 @@
 #include "WebApi_network.h"
 #include <HoyweiConfiguration.h>
 #include "NetworkSettings.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include "helper.h"
 #include <AsyncJson.h>

diff --git a/src/WebApi_ntp.cpp b/src/WebApi_ntp.cpp
@@ -6,7 +6,7 @@
 #include <HoyweiConfiguration.h>
 #include "NtpSettings.h"
 #include "SunPosition.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include "helper.h"
 #include <AsyncJson.h>

diff --git a/src/WebApi_power.cpp b/src/WebApi_power.cpp
@@ -3,7 +3,7 @@
  * Copyright (C) 2022-2024 Thomas Basler and others
  */
 #include "WebApi_power.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include <AsyncJson.h>
 #include <Hoymiles.h>

diff --git a/src/WebApi_powerlimiter.cpp b/src/WebApi_powerlimiter.cpp
@@ -9,7 +9,7 @@
 #include <HoyweiConfiguration.h>
 #include <HoyweiMqttHandlePowerLimiterHass.h>
 #include <PowerLimiters.h>
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "helper.h"
 #include "WebApi_errors.h"
 

diff --git a/src/WebApi_powermeter.cpp b/src/WebApi_powermeter.cpp
@@ -14,7 +14,7 @@
 #include <PowerMeters.h>
 #include "PowerMeterHttpJson.h"
 #include "PowerMeterHttpSml.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "helper.h"
 
 

diff --git a/src/WebApi_prometheus.cpp b/src/WebApi_prometheus.cpp
@@ -7,7 +7,7 @@
 #include <HoyweiConfiguration.h>
 #include "MessageOutput.h"
 #include "NetworkSettings.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include <Hoymiles.h>
 #include "__compiled_constants.h"
 

diff --git a/src/WebApi_security.cpp b/src/WebApi_security.cpp
@@ -4,7 +4,7 @@
  */
 #include "WebApi_security.h"
 #include <HoyweiConfiguration.h>
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include "helper.h"
 #include <AsyncJson.h>

diff --git a/src/WebApi_sysstatus.cpp b/src/WebApi_sysstatus.cpp
@@ -6,7 +6,7 @@
 #include <HoyweiConfiguration.h>
 #include "NetworkSettings.h"
 #include "HoyweiPinMapping.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "__compiled_constants.h"
 #include <AsyncJson.h>
 #include <CpuTemperature.h>

diff --git a/src/WebApi_vedirect.cpp b/src/WebApi_vedirect.cpp
@@ -7,7 +7,7 @@
 #include "ArduinoJson.h"
 #include "AsyncJson.h"
 #include <HoyweiConfiguration.h>
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "WebApi_errors.h"
 #include "helper.h"
 #include <HoyweiMqttHandlePowerLimiterHass.h>

diff --git a/src/WebApi_ws_Huawei.cpp b/src/WebApi_ws_Huawei.cpp
@@ -8,7 +8,7 @@
 #include <HoyweiHuaweiCan.h>
 #include "MessageOutput.h"
 #include "Utils.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "defaults.h"
 
 WebApiWsHuaweiLiveClass::WebApiWsHuaweiLiveClass()

diff --git a/src/WebApi_ws_battery.cpp b/src/WebApi_ws_battery.cpp
@@ -7,7 +7,7 @@
 #include <HoyweiConfiguration.h>
 #include <HoyweiBattery.h>
 #include "MessageOutput.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "defaults.h"
 #include "Utils.h"
 

diff --git a/src/WebApi_ws_console.cpp b/src/WebApi_ws_console.cpp
@@ -5,7 +5,7 @@
 #include "WebApi_ws_console.h"
 #include <HoyweiConfiguration.h>
 #include "MessageOutput.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "defaults.h"
 
 WebApiWsConsoleClass::WebApiWsConsoleClass()

diff --git a/src/WebApi_ws_live.cpp b/src/WebApi_ws_live.cpp
@@ -6,7 +6,7 @@
 #include "Datastore.h"
 #include "MessageOutput.h"
 #include "Utils.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include <HoyweiBattery.h>
 #include <HoyweiHuaweiCan.h>
 #include <PowerMeters.h>

diff --git a/src/WebApi_ws_vedirect_live.cpp b/src/WebApi_ws_vedirect_live.cpp
@@ -7,7 +7,7 @@
 #include <HoyweiConfiguration.h>
 #include "MessageOutput.h"
 #include "Utils.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "defaults.h"
 #include <PowerLimiters.h>
 #include "VictronMppt.h"

diff --git a/src/main.cpp b/src/main.cpp
@@ -30,7 +30,7 @@
 #include "Scheduler.h"
 #include "SunPosition.h"
 #include "Utils.h"
-#include "WebApi.h"
+#include "HoyweiWebApi.h"
 #include "PowerMeter.h"
 #include <PowerMeters.h>
 #include <PowerLimiters.h>
@@ -207,7 +207,7 @@ void setup()
 
     Battery.init(scheduler);
 
-    //OneMoreThing.init(scheduler); If you want to test one more thing you must uncomment this
+    OneMoreThing.init(scheduler); // If you want to test one more thing you must uncomment this
 }
 
 void loop()

diff --git a/webapp/index.html b/webapp/index.html
@@ -7,7 +7,7 @@
     <link rel="apple-touch-icon" href="/favicon.png">
     <link rel="manifest" href='/site.webmanifest' />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>OpenDTU-OnBattery</title>
+    <title>Hoywei-Turbo</title>
   </head>
   <body>
     <noscript>