Restructure solarcharger classes

include/WebApi_ws_solarcharger_live.h

@@ -16,18 +16,15 @@ class WebApiWsSolarChargerLiveClass {
 
 private:
     void generateCommonJsonResponse(JsonVariant& root, bool fullUpdate);
-    static void populateJson(const JsonObject &root, const VeDirectMpptController::data_t &mpptData);
     void onLivedataStatus(AsyncWebServerRequest* request);
     void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);
-    bool hasUpdate(size_t idx);
 
     AsyncWebServer* _server;
     AsyncWebSocket _ws;
     AuthenticationMiddleware _simpleDigestAuth;
 
     uint32_t _lastFullPublish = 0;
     uint32_t _lastPublish = 0;
-    uint16_t responseSize() const;
 
     std::mutex _mutex;
 

include/solarcharger/Controller.h

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <memory>
+#include <mutex>
+#include <TaskSchedulerDeclarations.h>
+#include <solarcharger/Provider.h>
+#include <solarcharger/Stats.h>
+#include <VeDirectMpptController.h>
+
+namespace SolarChargers {
+
+class Controller {
+public:
+    void init(Scheduler&);
+    void updateSettings();
+
+    std::shared_ptr<Stats const> getStats() const;
+
+private:
+    void loop();
+
+    Task _loopTask;
+    mutable std::mutex _mutex;
+    std::unique_ptr<Provider> _upProvider = nullptr;
+    bool _publishSensors = false;
+};
+
+} // namespace SolarChargers
+
+extern SolarChargers::Controller SolarCharger;

include/solarcharger/DummyStats.h

@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <solarcharger/Stats.h>
+
+namespace SolarChargers {
+
+class DummyStats : public Stats {
+public:
+    uint32_t getAgeMillis() const override { return 0; }
+    std::optional<int32_t> getOutputPowerWatts() const override { return std::nullopt; }
+    std::optional<float> getOutputVoltage() const override { return std::nullopt; }
+    int32_t getPanelPowerWatts() const override { return 0; }
+    float getYieldTotal() const override { return 0; }
+    float getYieldDay() const override { return 0; }
+    void getLiveViewData(JsonVariant& root, boolean fullUpdate, uint32_t lastPublish) const override {}
+    void mqttPublish() const override {}
+};
+
+} // namespace SolarChargers

include/solarcharger/HassIntegration.h

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <Arduino.h>
+#include <ArduinoJson.h>
+
+namespace SolarChargers {
+
+class HassIntegration {
+public:
+    virtual void publishSensors() const;
+
+protected:
+    void publish(const String& subtopic, const String& payload) const;
+};
+
+} // namespace SolarChargers

include/solarcharger/Provider.h

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <VeDirectMpptController.h>
+
+namespace SolarChargers {
+
+class Stats;
+class HassIntegration;
+
+class Provider {
+public:
+    // returns true if the provider is ready for use, false otherwise
+    virtual bool init(bool verboseLogging) = 0;
+    virtual void deinit() = 0;
+    virtual void loop() = 0;
+    virtual std::shared_ptr<Stats> getStats() const = 0;
+    virtual HassIntegration const& getHassIntegration() const = 0;
+};
+
+} // namespace SolarChargers

include/solarcharger/Stats.h

@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <Arduino.h>
+#include <AsyncJson.h>
+
+namespace SolarChargers {
+
+class Stats {
+public:
+    // the last time *any* data was updated
+    virtual uint32_t getAgeMillis() const;
+
+    // total output of all MPPT charge controllers in Watts
+    virtual std::optional<int32_t> getOutputPowerWatts() const;
+
+    // minimum of all MPPT charge controllers' output voltages in V
+    virtual std::optional<float> getOutputVoltage() const;
+
+    // total panel input power of all MPPT charge controllers in Watts
+    virtual int32_t getPanelPowerWatts() const;
+
+    // sum of total yield of all MPPT charge controllers in kWh
+    virtual float getYieldTotal() const;
+
+    // sum of today's yield of all MPPT charge controllers in Wh
+    virtual float getYieldDay() const;
+
+    // convert stats to JSON for web application live view
+    virtual void getLiveViewData(JsonVariant& root, boolean fullUpdate, uint32_t lastPublish) const;
+
+    void mqttLoop();
+
+    // the interval at which all data will be re-published, even
+    // if they did not change. used to calculate Home Assistent expiration.
+    uint32_t getMqttFullPublishIntervalMs() const;
+
+protected:
+    virtual void mqttPublish() const;
+
+private:
+    uint32_t _lastMqttPublish = 0;
+};
+
+} // namespace SolarChargers

include/MqttHandleVedirectHass.h → include/solarcharger/victron/HassIntegration.h

@@ -2,32 +2,26 @@
 #pragma once
 
 #include <ArduinoJson.h>
+#include <solarcharger/HassIntegration.h>
 #include "VeDirectMpptController.h"
-#include <TaskSchedulerDeclarations.h>
 
-class MqttHandleVedirectHassClass {
+namespace SolarChargers::Victron {
+
+class HassIntegration : public ::SolarChargers::HassIntegration {
 public:
-    void init(Scheduler& scheduler);
-    void forceUpdate();
+    void publishSensors() const final;
 
 private:
-    void loop();
-    void publishConfig();
-    void publish(const String& subtopic, const String& payload);
     void publishBinarySensor(const char *caption, const char *icon, const char *subTopic,
                              const char *payload_on, const char *payload_off,
-                             const VeDirectMpptController::data_t &mpptData);
+                             const VeDirectMpptController::data_t &mpptData) const;
     void publishSensor(const char *caption, const char *icon, const char *subTopic,
                        const char *deviceClass, const char *stateClass,
                        const char *unitOfMeasurement,
-                       const VeDirectMpptController::data_t &mpptData);
+                       const VeDirectMpptController::data_t &mpptData) const;
     void createDeviceInfo(JsonObject &object,
-                          const VeDirectMpptController::data_t &mpptData);
-
-    Task _loopTask;
+                          const VeDirectMpptController::data_t &mpptData) const;
 
-    bool _wasConnected = false;
-    bool _updateForced = false;
 };
 
-extern MqttHandleVedirectHassClass MqttHandleVedirectHass;
+} // namespace SolarChargers::Victron