Added calculated current, adjusted translations and refined verbose debugging

Author: vaterlangen

include/solarcharger/integrated/Provider.h

@@ -19,7 +19,6 @@ class Provider : public ::SolarChargers::Provider {
     void deinit() final { return; };
     void loop() final { return; };
     std::shared_ptr<::SolarChargers::Stats> getStats() const final { return _stats; }
-    //std::shared_ptr<Stats> getStats() { return _stats; }
 
 private:
     Provider(Provider const& other) = delete;

include/solarcharger/integrated/Stats.h

@@ -67,14 +67,6 @@ class DeviceData {
         return true;
     }
 
-    // bool equals(const String& manufacture, const String& device, const String& serial, const size_t numMppts) {
-    //     if (_manufacture != manufacture) { return false; }
-    //     if (_device != device) { return false; }
-    //     if (_serial != serial) { return false; }
-    //     if (_numMppts != numMppts) { return false; }
-
-    //     return true;
-    // }
     inline String getName() {
         return _manufacture + " " + _device;
     }

src/battery/zendure/Provider.cpp

@@ -63,7 +63,7 @@ bool Provider::init()
         }
 
         // setup static device info
-        DTU_LOGI("Device name '%s' - LOG messages are %s supported\r\n",
+        DTU_LOGI("Device name '%s' - LOG messages are %s supported",
                 deviceName.c_str(), (_full_log_supported ? "fully" : "partly"));
         _stats->setDevice(std::move(deviceName));
         _stats->setManufacturer("Zendure");
@@ -124,7 +124,7 @@ bool Provider::init()
     JsonDocument root;
     JsonVariant prop = root[ZENDURE_REPORT_PROPERTIES].to<JsonObject>();
     prop[ZENDURE_REPORT_PV_BRAND] = 1; // means Hoymiles
-    prop[ZENDURE_REPORT_PV_AUTO_MODEL] = 0; // we did static setup
+    //prop[ZENDURE_REPORT_PV_AUTO_MODEL] = 0; // we did static setup
     prop[ZENDURE_REPORT_AUTO_RECOVER] = static_cast<uint8_t>(config.Battery.Zendure.BypassMode == static_cast<uint8_t>(BypassMode::Automatic));
     prop[ZENDURE_REPORT_AUTO_SHUTDOWN] = static_cast<uint8_t>(config.Battery.Zendure.AutoShutdown);
     prop[ZENDURE_REPORT_BUZZER_SWITCH] = static_cast<uint8_t>(config.Battery.Zendure.BuzzerEnable);
@@ -941,7 +941,7 @@ void Provider::publishPersistentSettings(const char* subtopic, const String& pay
 {
     if (!_topicPersistentSettings.isEmpty())
     {
-        DTU_LOGD("Writing Persistent Settings %s = %s\r\n",
+        DTU_LOGD("Writing Persistent Settings %s = %s",
                 String(_topicPersistentSettings + subtopic).c_str(),
                 payload.substring(0, 32).c_str());
         MqttSettings.publishGeneric(_topicPersistentSettings + subtopic, payload, true);

src/solarcharger/Controller.cpp

@@ -76,11 +76,21 @@ std::shared_ptr<Integrated::Stats> Controller::getIntegratedStats()
 
     std::lock_guard<std::mutex> lock(_mutex);
 
+    auto const delay = 20 * 1000U;
+    auto const ms = millis();
+    if (ms < delay) {
+        DTU_LOGV("getIntegratedStats(): Startup Delay running %ld/%" PRId32 " ms", ms, delay);
+        return nullptr;
+    }
+
     if (!_upProvider || config.SolarCharger.Provider != SolarChargerProviderType::Integrated) {
         return nullptr;
     }
 
-    return std::reinterpret_pointer_cast<Integrated::Stats>(_upProvider->getStats());
+    auto stats = std::reinterpret_pointer_cast<Integrated::Stats>(_upProvider->getStats());
+
+    DTU_LOGV("getIntegratedStats(): returning 0x%p", static_cast<void*>(&*stats));
+    return stats;
 }
 
 void Controller::loop()

src/solarcharger/integrated/Provider.cpp

@@ -11,12 +11,10 @@ namespace SolarChargers::Integrated {
 
 bool Provider::init()
 {
-    if (Configuration.get().Battery.Provider != 7) {
-        DTU_LOGE("Init failed - you must use a supported battery integration. Currently supported integrations are: Zendure");
-        return false;
-    }
+    if (Configuration.get().Battery.Provider == 7) { return true; }
 
-    return true;
+    DTU_LOGE("Init failed - you must use a supported battery integration. Currently supported integrations are: Zendure");
+    return false;
 }
 
 } // namespace SolarChargers::Integrated

src/solarcharger/integrated/Stats.cpp

@@ -2,6 +2,12 @@
 #include <CRC.h>
 #include <MqttSettings.h>
 #include <solarcharger/integrated/Stats.h>
+#include <LogHelper.h>
+
+#undef TAG
+static const char* TAG = "solarCharger";
+static const char* SUBTAG = "Integrated";
+
 
 namespace SolarChargers::Integrated {
 
@@ -45,6 +51,8 @@ void Stats::getLiveViewData(JsonVariant& root, const boolean fullUpdate, const u
     if (!fullUpdate && !hasUpdate) { return; }
 
     for (const auto& [hash, device] : _devices) {
+        DTU_LOGV("getLiveViewData(): device=0x%X", hash);
+
         auto devage = millis() - device->getLastUpdate();
 
         const JsonObject instance = root["solarcharger"]["instances"][device->getSerial()].to<JsonObject>();
@@ -54,6 +62,8 @@ void Stats::getLiveViewData(JsonVariant& root, const boolean fullUpdate, const u
         instance["product_id"] = device->getName();
 
         for (const auto& [index, mppt] : device->_mppts) {
+            DTU_LOGV("LIVE -> device=0x%X -> mppt=%d", hash, static_cast<size_t>(index));
+
             auto name = String("mppt" + String(static_cast<size_t>(index)));
             const JsonObject output = instance["values"][name.c_str()].to<JsonObject>();
 
@@ -70,8 +80,21 @@ void Stats::getLiveViewData(JsonVariant& root, const boolean fullUpdate, const u
                 output["Voltage"]["u"] = "V";
                 output["Voltage"]["d"] = 1;
             }
+
+            if (voltage.has_value() && power.has_value()) {
+                if (*voltage == 0) {
+                    output["Current"] = "N/A";
+                } else {
+                    output["Current"]["v"] = *power / *voltage;
+                    output["Current"]["u"] = "A";
+                    output["Current"]["d"] = 1;
+                }
+
+            }
         }
     }
+
+    DTU_LOGV("LIVE EXIT");
 }
 
 DeviceData::DeviceData(const String& manufacture, const String& device, const String& serial, const size_t numMppts /* = 0 */)
@@ -80,6 +103,8 @@ DeviceData::DeviceData(const String& manufacture, const String& device, const St
     , _serial(serial)
     , _numMppts(numMppts)
 {
+    DTU_LOGV("DeviceData(): assert(%d <= 4)", numMppts);
+
     // we currently support up to 4 MPPTs
     assert(numMppts <= 4);
 
@@ -106,12 +131,15 @@ std::optional<std::pair<uint32_t, std::shared_ptr<DeviceData>>> Stats::addDevice
     const uint32_t hash = crc.calc();
 
     auto new_device = std::make_shared<DeviceData>(*manufacture, *device, *serial, numMppts);
+    DTU_LOGV("addDevice(): hash=0x%X, new_device=0x%p", hash, static_cast<void*>(&*new_device));
 
     // check if the device already exits
     try
     {
         auto old_device = _devices.at(hash);
+        DTU_LOGV("addDevice(): old_device=0x%p", static_cast<void*>(&*old_device));
         if (*old_device == *new_device) {
+            DTU_LOGV("addDevice(): returning (0x%X, 0x%p)", hash, static_cast<void*>(&*old_device));
             return std::make_pair(hash, old_device);
         }
 
@@ -120,6 +148,8 @@ std::optional<std::pair<uint32_t, std::shared_ptr<DeviceData>>> Stats::addDevice
     }
     catch(const std::out_of_range& ex) {;}
 
+    DTU_LOGV("addDevice(): returning (0x%X, 0x%p)", hash, static_cast<void*>(&*new_device));
+
     // if no device found for our "hash", add a new one
     _devices[hash] = new_device;
     return std::make_pair(hash, new_device);
@@ -130,7 +160,7 @@ void Stats::mqttPublish() const {
 
     for (const auto& [hash, device] : _devices) {
         for (const auto& [index, mppt] : device->_mppts) {
-            String prefix = "solarchargers/" + device->getSerial() + "/" + static_cast<uint8_t>(index) + "/";
+            String prefix = "solarchargers/" + device->getSerial() + "/mppt" + static_cast<uint8_t>(index) + "/";
 
             auto power = mppt->getPower();
             if (power.has_value()) {
@@ -141,6 +171,10 @@ void Stats::mqttPublish() const {
             if (voltage.has_value()) {
                 MqttSettings.publish(prefix + "voltage", String(*voltage, 1));
             }
+
+            if (voltage.value_or(0) != 0 && power.has_value()) {
+                MqttSettings.publish(prefix + "current", String(*power / *voltage, 1));
+            }
         }
     }
 }

webapp/src/locales/de.json

@@ -229,12 +229,14 @@
         "section_mppt1": "Solareingang 1",
         "section_mppt2": "Solareingang 2",
         "mppt1": {
-            "Power": "Leistung",
-            "Voltage": "Voltage"
+            "Power": "@:solarchargerhome.input.PPV",
+            "Voltage": "@:solarchargerhome.input.VPV",
+            "Current": "@:solarchargerhome.input.IPV"
         },
         "mppt2": {
             "Power": "@:solarchargerhome.mppt1.Power",
-            "Voltage": "@:solarchargerhome.mppt1.Voltage"
+            "Voltage": "@:solarchargerhome.mppt1.Voltage",
+            "Current": "@:solarchargerhome.mppt1.Current"
         }
     },
     "eventlog": {
@@ -624,6 +626,7 @@
         "Provider": "Datenanbieter",
         "ProviderVeDirect": "Victron MPPT(s) per VE.Direct Schnittstelle",
         "ProviderMqtt": "Solarladereglerwerte aus MQTT Broker",
+        "ProviderIntegrated": "MPPT Daten von unterstützten Batteriedatenanbietern (aktuell nur Zendure)",
         "MqttPublishUpdatesOnly": "Werte nur bei Änderung an MQTT broker senden",
         "CalculateOutputPower": "Solarladeregler-Ausgangsleistung berechnen",
         "CalculateOutputPowerDescription": "Wenn aktiviert, wird die Ausgangsleistung des Solarladeregler basierend auf den Strom- und Spannungswerten berechnet. Wenn deaktiviert, wird die Ausgangsleistung direkt vom Solarladeregler übernommen.",

webapp/src/locales/en.json

@@ -225,7 +225,19 @@
             "MaximumPowerToday": "Maximum power today",
             "MaximumPowerYesterday": "Maximum power yesterday"
         },
-        "PowerLimiterState": "Power limiter state [off (charging), solar passthrough, on battery]"
+        "PowerLimiterState": "Power limiter state [off (charging), solar passthrough, on battery]",
+        "section_mppt1": "Solar Input 1",
+        "section_mppt2": "Solar Input 2",
+        "mppt1": {
+            "Power": "@:solarchargerhome.input.PPV",
+            "Voltage": "@:solarchargerhome.input.VPV",
+            "Current": "@:solarchargerhome.input.IPV"
+        },
+        "mppt2": {
+            "Power": "@:solarchargerhome.mppt1.Power",
+            "Voltage": "@:solarchargerhome.mppt1.Voltage",
+            "Current": "@:solarchargerhome.mppt1.Current"
+        }
     },
     "eventlog": {
         "Start": "Start",
@@ -614,7 +626,7 @@
         "Provider": "Data Provider",
         "ProviderVeDirect": "Victron MPPT(s) using VE.Direct interface",
         "ProviderMqtt": "Solar Charger data from MQTT broker",
-        "ProviderIntegrated": "MPPT data from Smart Buffer Batteries",
+        "ProviderIntegrated": "MPPT data from supported battery integrations (currently only zendure)",
         "MqttPublishUpdatesOnly": "Publish values to MQTT only when they change",
         "CalculateOutputPower": "Calculate Solar Charger output power",
         "CalculateOutputPowerDescription": "If enabled, the output power of the Solar Charger will be calculated based on the current and voltage values. If disabled, the output power will be taken from the Solar Charger directly.",