Merge branch 'development'

hoylabs · Sep 28, 2023 · f0a55ea · f0a55ea
2 parents ae39232 + 4ee49a6
commit f0a55ea
Show file tree

Hide file tree

Showing 28 changed files with 759 additions and 378 deletions.
diff --git a/include/BatteryStats.h b/include/BatteryStats.h
@@ -6,6 +6,7 @@
 #include "AsyncJson.h"
 #include "Arduino.h"
 #include "JkBmsDataPoints.h"
+#include "VeDirectShuntController.h"
 
 // mandatory interface for all kinds of batteries
 class BatteryStats {
@@ -98,3 +99,27 @@ class JkBmsBatteryStats : public BatteryStats {
         mutable uint32_t _lastMqttPublish = 0;
         mutable uint32_t _lastFullMqttPublish = 0;
 };
+
+class VictronSmartShuntStats : public BatteryStats {
+    public:
+        void getLiveViewData(JsonVariant& root) const final;
+        void mqttPublish() const final;
+
+        void updateFrom(VeDirectShuntController::veShuntStruct const& shuntData);
+
+    private:    
+        float _voltage; 
+        float _current;
+        float _temperature;
+        uint8_t _chargeCycles;
+        uint32_t _timeToGo;
+        float _chargedEnergy;
+        float _dischargedEnergy;
+        String _modelName;
+
+        bool _alarmLowVoltage;
+        bool _alarmHighVoltage;
+        bool _alarmLowSOC;
+        bool _alarmLowTemperature;
+        bool _alarmHighTemperature;
+};
diff --git a/include/MqttHandleVedirect.h b/include/MqttHandleVedirect.h
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "VeDirectFrameHandler.h"
+#include "VeDirectMpptController.h"
 #include "Configuration.h"
 #include <Arduino.h>
 
@@ -18,7 +18,8 @@ class MqttHandleVedirectClass {
     void init();
     void loop();
 private:
-    veStruct _kvFrame{};
+
+    VeDirectMpptController::veMpptStruct _kvFrame{};
 
     // point of time in millis() when updated values will be published
     uint32_t _nextPublishUpdatesOnly = 0;

diff --git a/include/MqttHandleVedirectHass.h b/include/MqttHandleVedirectHass.h
@@ -2,7 +2,7 @@
 #pragma once
 
 #include <ArduinoJson.h>
-#include "VeDirectFrameHandler.h"
+#include "VeDirectMpptController.h"
 
 class MqttHandleVedirectHassClass {
 public:

diff --git a/include/VictronSmartShunt.h b/include/VictronSmartShunt.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "Battery.h"
+
+class VictronSmartShunt : public BatteryProvider {
+public:
+    bool init(bool verboseLogging) final;
+    void deinit() final { }
+    void loop() final;
+    std::shared_ptr<BatteryStats> getStats() const final { return _stats; }
+
+private:
+    std::shared_ptr<VictronSmartShuntStats> _stats =
+        std::make_shared<VictronSmartShuntStats>();
+};
diff --git a/include/WebApi_ws_vedirect_live.h b/include/WebApi_ws_vedirect_live.h
@@ -3,7 +3,7 @@
 
 #include "ArduinoJson.h"
 #include <ESPAsyncWebServer.h>
-#include <VeDirectFrameHandler.h>
+#include <VeDirectMpptController.h>
 
 class WebApiWsVedirectLiveClass {
 public: