0.8.970004-zero

src/app.cpp

@@ -93,6 +93,11 @@ void app::setup() {
         mZeroExport.resetWaitRebootAck(iv);
     });
     #endif /*PLUGIN_ZEROEXPORT*/
+    #if defined(PLUGIN_ZEROEXPORT)
+    mCommunication.addNewDataListener([this] (Inverter<> *iv) {
+        mZeroExport.newDataAvailable(iv);
+    });
+    #endif /*PLUGIN_ZEROEXPORT*/
 
     mSys.setup(&mTimestamp, &mConfig->inst, this);
     for (uint8_t i = 0; i < MAX_NUM_INVERTERS; i++) {

src/defines.h

@@ -13,7 +13,7 @@
 //-------------------------------------
 #define VERSION_MAJOR       0
 #define VERSION_MINOR       8
-#define VERSION_PATCH       970003
+#define VERSION_PATCH       970004
 
 //-------------------------------------
 typedef struct {

src/hm/Communication.h

@@ -19,6 +19,7 @@ typedef std::function<void(uint8_t, Inverter<> *)> payloadListenerType;
 typedef std::function<void(Inverter<> *)> powerLimitAckListenerType;
 typedef std::function<void(Inverter<> *)> powerPowerAckListenerType;
 typedef std::function<void(Inverter<> *)> powerRebootAckListenerType;
+typedef std::function<void(Inverter<> *)> newDataListenerType;
 typedef std::function<void(Inverter<> *)> alarmListenerType;
 
 class Communication : public CommQueue<> {
@@ -51,6 +52,10 @@ class Communication : public CommQueue<> {
             mCbPwrRebootAck = cb;
         }
 
+        void addNewDataListener(newDataListenerType cb) {
+            mCbNewData = cb;
+        }
+
         void addAlarmListener(alarmListenerType cb) {
             mCbAlarm = cb;
         }
@@ -601,6 +606,7 @@ class Communication : public CommQueue<> {
             for (uint8_t i = 0; i < rec->length; i++) {
                 q->iv->addValue(i, mPayload.data(), rec);
             }
+(mCbNewData)(q->iv);
             rec->mqttSentStatus = MqttSentStatus::NEW_DATA;
 
             q->iv->rssi = rssi;
@@ -1057,6 +1063,7 @@ class Communication : public CommQueue<> {
         powerLimitAckListenerType mCbPwrAck = NULL;
         powerPowerAckListenerType mCbPwrPowerAck = NULL;
         powerRebootAckListenerType mCbPwrRebootAck = NULL;
+        newDataListenerType mCbNewData = NULL;
         alarmListenerType mCbAlarm = NULL;
         Heuristic mHeu;
         uint32_t mLastEmptyQueueMillis = 0;

src/web/html/setup.html

@@ -1363,7 +1363,8 @@
                         divRow("{#ZE_GROUP_TAB_POWERMETER_TYPE}",
                             ml("select", {name: "pm_type", class: "text", id: "pm_type"}, null),
                         ),
-                        divRow("{#ZE_GROUP_TAB_POWERMETER_URL}", [
+// TODO: URL -> IP
+                        divRow("{#ZE_GROUP_TAB_POWERMETER_IP}", [
                             ml("input", {name: "pm_url", class: "text", type: "text", value: obj.pm_url, maxlength: "100"}, null),
                         ]),
                         divRow("{#ZE_GROUP_TAB_POWERMETER_JSONPATH}", [

src/web/lang.json

@@ -854,9 +854,9 @@
                     "de": "Typ:"
                 },
                 {
-                    "token": "ZE_GROUP_TAB_POWERMETER_URL",
-                    "en": "Url:",
-                    "de": "Url:"
+                    "token": "ZE_GROUP_TAB_POWERMETER_IP",
+                    "en": "IP:",
+                    "de": "IP:"
                 },
                 {
                     "token": "ZE_GROUP_TAB_POWERMETER_JSONPATH",