Allow up to 8 cycles to charge capacitor

.github/workflows/pr-build-env.yml

@@ -1,82 +0,0 @@
-name: PR build with env
-
-on:
-  workflow_call:
-    inputs:
-      env:
-        description: 'The environment to build for'
-        required: true
-        type: string
-      is_esp32:
-        description: 'Whether the build is for ESP32 based firmware'
-        required: false
-        type: boolean
-        default: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code from repo
-        uses: actions/checkout@v4
-
-      - name: Cache Python dependencies
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/pip
-          key: ${{ runner.os }}-pip-${{ hashFiles('platformio.ini') }}
-
-      - name: Cache PlatformIO dependencies
-        uses: actions/cache@v4
-        with:
-          path: ~/.pio/libdeps
-          key: ${{ runner.os }}-pio-${{ hashFiles('platformio.ini') }}
-
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.9
-
-      - name: Inject secrets into ini file
-        run: |
-          sed -i 's/NO_AMS2MQTT_PRICE_KEY/AMS2MQTT_PRICE_KEY="${{secrets.AMS2MQTT_PRICE_KEY}}"/g' platformio.ini
-          sed -i 's/NO_AMS2MQTT_PRICE_AUTHENTICATION/AMS2MQTT_PRICE_AUTHENTICATION="${{secrets.AMS2MQTT_PRICE_AUTHENTICATION}}"/g' platformio.ini
-          sed -i 's/NO_AMS2MQTT_SC_KEY/AMS2MQTT_SC_KEY=\\"${{secrets.AMS2MQTT_SC_KEY}}\\"/g' platformio.ini
-          sed -i 's/NO_ENERGY_SPEEDOMETER_USER/ENERGY_SPEEDOMETER_USER=\\"${{secrets.ENERGY_SPEEDOMETER_USER}}\\"/g' platformio.ini
-          sed -i 's/NO_ENERGY_SPEEDOMETER_PASS/ENERGY_SPEEDOMETER_PASS=\\"${{secrets.ENERGY_SPEEDOMETER_PASS}}\\"/g' platformio.ini
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -U platformio css_html_js_minify
-
-      - name: Set up node
-        uses: actions/setup-node@v4
-        with:
-          node-version: '19.x'
-
-      - name: Build with node
-        run: |
-          cd lib/SvelteUi/app
-          npm ci
-          npm run build
-          cd -
-        env:
-          CI: false
-
-      - name: PlatformIO lib install
-        run: pio lib install
-
-      - name: Build firmware
-        run: pio run -e ${{ inputs.env }}
-
-      - name: Create zip file
-        run: /bin/sh scripts/${{ inputs.env }}/mkzip.sh
-
-      - name: Upload zip as artifact
-        uses: actions/upload-artifact@v7
-        with:
-          name: ${{ inputs.env }}.zip
-          path: ${{ inputs.env }}.zip
-          archive: false
-          retention-days: 7

.github/workflows/pull-request.yml

@@ -1,110 +0,0 @@
-name: Pull Request build
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened]
-
-jobs:
-  build-esp32s2:
-    uses: ./.github/workflows/pr-build-env.yml
-    secrets: inherit
-    with:
-      env: esp32s2
-      is_esp32: true
-
-  build-esp32s3:
-    uses: ./.github/workflows/pr-build-env.yml
-    secrets: inherit
-    with:
-      env: esp32s3
-      is_esp32: true
-
-  build-esp32c3:
-    uses: ./.github/workflows/pr-build-env.yml
-    secrets: inherit
-    with:
-      env: esp32c3
-      is_esp32: true
-
-  build-esp32:
-    uses: ./.github/workflows/pr-build-env.yml
-    secrets: inherit
-    with:
-      env: esp32
-      is_esp32: true
-
-  build-esp32solo:
-    uses: ./.github/workflows/pr-build-env.yml
-    secrets: inherit
-    with:
-      env: esp32solo
-      is_esp32: true
-
-  build-esp8266:
-    uses: ./.github/workflows/pr-build-env.yml
-    secrets: inherit
-    with:
-      env: esp8266
-      is_esp32: false
-
-  comment:
-    needs:
-      - build-esp32s2
-      - build-esp32s3
-      - build-esp32c3
-      - build-esp32
-      - build-esp32solo
-      - build-esp8266
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-    steps:
-      - name: Post PR comment with download links
-        uses: actions/github-script@v7
-        with:
-          script: |
-            const { owner, repo } = context.repo;
-            const prNumber = context.payload.pull_request.number;
-            const runId = context.runId;
-            const runUrl = `https://github.com/${owner}/${repo}/actions/runs/${runId}`;
-            
-            // Get the commit SHA (short version)
-            const sha = context.payload.pull_request.head.sha;
-            const shortSha = sha.substring(0, 7);
-
-            // Fetch the list of artifacts for this run via the API
-            const artifactsResp = await github.rest.actions.listWorkflowRunArtifacts({ owner, repo, run_id: runId });
-            const artifacts = artifactsResp.data.artifacts;
-
-            const envs = ['esp32s2', 'esp32s3', 'esp32c3', 'esp32', 'esp32solo', 'esp8266'];
-            const lines = envs.map(env => {
-              const artifact = artifacts.find(a => a.name === `${env}.zip`);
-              if (artifact) {
-                // The artifact download page URL - directly navigable in the browser
-                const artifactUrl = `${runUrl}#artifacts-${env}`;
-                return `- **${env}**: [Download ${env}.zip](https://github.com/${owner}/${repo}/actions/runs/${runId}/artifacts/${artifact.id})`;
-              }
-              return `- **${env}**: ⚠️ artifact not found`;
-            });
-
-            const body = [
-              '## 🔧 PR Build Artifacts',
-              '',
-              `**Version**: \`${shortSha}\``,
-              '',
-              'All environments built successfully. Download the zip files:',
-              '',
-              ...lines,
-              '',
-              `> Artifacts expire after 7 days. [View workflow run](${runUrl})`,
-            ].join('\n');
-
-            // Find and delete any previous bot comment to keep the PR clean
-            const comments = await github.rest.issues.listComments({ owner, repo, issue_number: prNumber });
-            for (const comment of comments.data) {
-              if (comment.user.type === 'Bot' && comment.body.includes('PR Build Artifacts')) {
-                await github.rest.issues.deleteComment({ owner, repo, comment_id: comment.id });
-              }
-            }
-
-            await github.rest.issues.createComment({ owner, repo, issue_number: prNumber, body });

lib/AmsData/include/AmsData.h

@@ -7,7 +7,8 @@
 #ifndef _AMSDATA_H
 #define _AMSDATA_H
 
-#include <WString.h>
+#include "Arduino.h"
+#include <Timezone.h>
 #include "OBIScodes.h"
 
 enum AmsType {
@@ -27,7 +28,7 @@ public:
     AmsData();
 
     void apply(AmsData& other);
-    void apply(const OBIS_code_t obis, double value, uint64_t millis64);
+    void apply(const OBIS_code_t obis, double value);
 
     uint64_t getLastUpdateMillis();
 

lib/AmsData/src/AmsData.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "AmsData.h"
-#include <algorithm>
 
 AmsData::AmsData() {}
 
@@ -18,6 +17,7 @@ void AmsData::apply(AmsData& other) {
                 uint32_t power = (activeImportPower + other.getActiveImportPower()) / 2;
                 float add = power * (((float) ms) / 3600000.0);
                 activeImportCounter += add / 1000.0;
+                //Serial.printf("%dW, %dms, %.6fkWh added\n", other.getActiveImportPower(), ms, add);
             }
 
             if(other.getListType() > 1) {
@@ -112,7 +112,7 @@ void AmsData::apply(AmsData& other) {
         this->activeExportPower = other.getActiveExportPower();
 }
 
-void AmsData::apply(OBIS_code_t obis, double value, uint64_t millis64) {
+void AmsData::apply(OBIS_code_t obis, double value) {
     if(obis.sensor == 0 && obis.gr == 0 && obis.tariff == 0) {
         meterType = value;
     }
@@ -127,137 +127,138 @@ void AmsData::apply(OBIS_code_t obis, double value, uint64_t millis64) {
         }
     }
     if(obis.tariff != 0) {
+        Serial.println("Tariff not implemented");
         return;
     }
     if(obis.gr == 7) { // Instant values
         switch(obis.sensor) {
             case 1:
                 activeImportPower = value;
-                listType = std::max(listType, (uint8_t) 2);
+                listType = max(listType, (uint8_t) 2);
                 break;
             case 2:
                 activeExportPower = value;
-                listType = std::max(listType, (uint8_t) 2);
+                listType = max(listType, (uint8_t) 2);
                 break;
             case 3:
                 reactiveImportPower = value;
-                listType = std::max(listType, (uint8_t) 2);
+                listType = max(listType, (uint8_t) 2);
                 break;
             case 4:
                 reactiveExportPower = value;
-                listType = std::max(listType, (uint8_t) 2);
+                listType = max(listType, (uint8_t) 2);
                 break;
             case 13:
                 powerFactor = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 21:
                 l1activeImportPower = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 22:
                 l1activeExportPower = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 31:
                 l1current = value;
-                listType = std::max(listType, (uint8_t) 2);
+                listType = max(listType, (uint8_t) 2);
                 break;
             case 32:
                 l1voltage = value;
-                listType = std::max(listType, (uint8_t) 2);
+                listType = max(listType, (uint8_t) 2);
                 break;
             case 33:
                 l1PowerFactor = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 41:
                 l2activeImportPower = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 42:
                 l2activeExportPower = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 51:
                 l2current = value;
-                listType = std::max(listType, (uint8_t) 2);
+                listType = max(listType, (uint8_t) 2);
                 break;
             case 52:
                 l2voltage = value;
-                listType = std::max(listType, (uint8_t) 2);
+                listType = max(listType, (uint8_t) 2);
                 break;
             case 53:
                 l2PowerFactor = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 61:
                 l3activeImportPower = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 62:
                 l3activeExportPower = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 71:
                 l3current = value;
-                listType = std::max(listType, (uint8_t) 2);
+                listType = max(listType, (uint8_t) 2);
                 break;
             case 72:
                 l3voltage = value;
-                listType = std::max(listType, (uint8_t) 2);
+                listType = max(listType, (uint8_t) 2);
                 break;
             case 73:
                 l3PowerFactor = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
         }
     } else if(obis.gr == 8) { // Accumulated values
         switch(obis.sensor) {
             case 1:
                 activeImportCounter = value;
-                listType = std::max(listType, (uint8_t) 3);
+                listType = max(listType, (uint8_t) 3);
                 break;
             case 2:
                 activeExportCounter = value;
-                listType = std::max(listType, (uint8_t) 3);
+                listType = max(listType, (uint8_t) 3);
                 break;
             case 3:
                 reactiveImportCounter = value;
-                listType = std::max(listType, (uint8_t) 3);
+                listType = max(listType, (uint8_t) 3);
                 break;
             case 4:
                 reactiveExportCounter = value;
-                listType = std::max(listType, (uint8_t) 3);
+                listType = max(listType, (uint8_t) 3);
                 break;
             case 21:
                 l1activeImportCounter = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 22:
                 l1activeExportCounter = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 41:
                 l2activeImportCounter = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 42:
                 l2activeExportCounter = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 61:
                 l3activeImportCounter = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
             case 62:
                 l3activeExportCounter = value;
-                listType = std::max(listType, (uint8_t) 4);
+                listType = max(listType, (uint8_t) 4);
                 break;
         }
     }
     if(listType > 0)
-        lastUpdateMillis = millis64;
+        lastUpdateMillis = millis();
 
     threePhase = l1voltage > 0 && l2voltage > 0 && l3voltage > 0;
     if(!threePhase)

lib/AmsDataStorage/src/AmsDataStorage.cpp

@@ -639,22 +639,25 @@ bool AmsDataStorage::isDayHappy(time_t now) {
         return false;
     }
 
-    // If the timestamp is before the firware was built, there is something seriously wrong..
-    if(now < FirmwareVersion::BuildEpoch) {
+    if(now < FirmwareVersion::BuildEpoch) return false;
+
+    if(now < day.lastMeterReadTime) {
         return false;
     }
-
-    // If the timestamp is before the last time we updated, there is also something wrong..
-    if(now < day.lastMeterReadTime) {
+    // There are cases where the meter reports before the hour. The update method will then receive the meter timestamp as reference, thus there will not be 3600s between. 
+    // Leaving a 100s buffer for these cases
+    if(now-day.lastMeterReadTime > 3500) {
         return false;
     }
 
     tmElements_t tm, last;
     breakTime(tz->toLocal(now), tm);
     breakTime(tz->toLocal(day.lastMeterReadTime), last);
+    if(tm.Hour != last.Hour) {
+        return false;
+    }
 
-    // If the timestamp is at the same day and hour as last update, we are happy
-    return tm.Day == last.Day && tm.Hour == last.Hour;
+    return true;
 }
 
 bool AmsDataStorage::isMonthHappy(time_t now) {

lib/EnergyAccounting/include/EnergyAccounting.h

@@ -7,6 +7,8 @@
 #ifndef _ENERGYACCOUNTING_H
 #define _ENERGYACCOUNTING_H
 
+#include "Arduino.h"
+#include "AmsData.h"
 #include "AmsDataStorage.h"
 #include "PriceService.h"
 
@@ -81,7 +83,7 @@ public:
     void setPriceService(PriceService *ps);
     void setTimezone(Timezone*);
     EnergyAccountingConfig* getConfig();
-    bool update(time_t now, uint64_t lastUpdatedMillis, uint8_t listType, uint32_t activeImportPower, uint32_t activeExportPower);
+    bool update(AmsData* amsData);
     bool load();
     bool save();
     bool isInitialized();

lib/EnergyAccounting/src/EnergyAccounting.cpp

@@ -54,8 +54,9 @@ bool EnergyAccounting::isInitialized() {
     return this->init;
 }
 
-bool EnergyAccounting::update(time_t now, uint64_t lastUpdatedMillis, uint8_t listType, uint32_t activeImportPower, uint32_t activeExportPower) {
+bool EnergyAccounting::update(AmsData* amsData) {
     if(config == NULL) return false;
+    time_t now = time(nullptr);
     if(now < FirmwareVersion::BuildEpoch) return false;
     if(tz == NULL) {
         return false;
@@ -89,7 +90,7 @@ bool EnergyAccounting::update(time_t now, uint64_t lastUpdatedMillis, uint8_t li
         calcDayCost();
     }
 
-    if(local.Hour != realtimeData->currentHour && (listType >= 3 || local.Minute == 1)) {
+    if(local.Hour != realtimeData->currentHour && (amsData->getListType() >= 3 || local.Minute == 1)) {
         tmElements_t oneHrAgo, oneHrAgoLocal;
         breakTime(now-3600, oneHrAgo);
         uint16_t val = round(ds->getHourImport(oneHrAgo.Hour) / 10.0);
@@ -155,9 +156,9 @@ bool EnergyAccounting::update(time_t now, uint64_t lastUpdatedMillis, uint8_t li
         }
     }
 
-    if(realtimeData->lastImportUpdateMillis < lastUpdatedMillis) {
-        unsigned long ms = lastUpdatedMillis - realtimeData->lastImportUpdateMillis;
-        float kwhi = (activeImportPower * (((float) ms) / 3600000.0)) / 1000.0;
+    if(realtimeData->lastImportUpdateMillis < amsData->getLastUpdateMillis()) {
+        unsigned long ms = amsData->getLastUpdateMillis() - realtimeData->lastImportUpdateMillis;
+        float kwhi = (amsData->getActiveImportPower() * (((float) ms) / 3600000.0)) / 1000.0;
         if(kwhi > 0) {
             realtimeData->use += kwhi;
             float importPrice = ps == NULL ? PRICE_NO_VALUE : ps->getCurrentPrice(PRICE_DIRECTION_IMPORT);
@@ -167,12 +168,12 @@ bool EnergyAccounting::update(time_t now, uint64_t lastUpdatedMillis, uint8_t li
                 realtimeData->costDay += cost;
             }
         }
-        realtimeData->lastImportUpdateMillis = lastUpdatedMillis;
+        realtimeData->lastImportUpdateMillis = amsData->getLastUpdateMillis();
     }
 
-    if(listType > 1 && realtimeData->lastExportUpdateMillis < lastUpdatedMillis) {
-        unsigned long ms = lastUpdatedMillis - realtimeData->lastExportUpdateMillis;
-        float kwhe = (activeExportPower * (((float) ms) / 3600000.0)) / 1000.0;
+    if(amsData->getListType() > 1 && realtimeData->lastExportUpdateMillis < amsData->getLastUpdateMillis()) {
+        unsigned long ms = amsData->getLastUpdateMillis() - realtimeData->lastExportUpdateMillis;
+        float kwhe = (amsData->getActiveExportPower() * (((float) ms) / 3600000.0)) / 1000.0;
         if(kwhe > 0) {
             realtimeData->produce += kwhe;
             float exportPrice = ps == NULL ? PRICE_NO_VALUE : ps->getCurrentPrice(PRICE_DIRECTION_EXPORT);
@@ -182,7 +183,7 @@ bool EnergyAccounting::update(time_t now, uint64_t lastUpdatedMillis, uint8_t li
                 realtimeData->incomeDay += income;
             }
         }
-        realtimeData->lastExportUpdateMillis = lastUpdatedMillis;
+        realtimeData->lastExportUpdateMillis = amsData->getLastUpdateMillis();
     }
 
     if(config != NULL) {

lib/MeterCommunicators/include/IEC6205675.h

@@ -11,7 +11,6 @@
 #include "AmsConfiguration.h"
 #include "DataParser.h"
 #include "Cosem.h"
-#include "Timezone.h"
 #if defined(AMS_REMOTE_DEBUG)
 #include "RemoteDebug.h"
 #endif

lib/MeterCommunicators/src/KmpCommunicator.cpp

@@ -24,6 +24,8 @@ void KmpCommunicator::configure(MeterConfig& meterConfig) {
 }
 
 bool KmpCommunicator::loop() {
+	uint64_t now = millis64();
+
     bool ret = talker->loop();
     int lastError = getLastError();
     if(ret) {
@@ -56,36 +58,35 @@ AmsData* KmpCommunicator::getData(AmsData& meterState) {
     if(talker == NULL) return NULL;
     KmpDataHolder kmpData;
     talker->getData(kmpData);
-	uint64_t now = millis64();
     AmsData* data = new AmsData();
-    data->apply(OBIS_ACTIVE_IMPORT_COUNT, kmpData.activeImportCounter, now);
-    data->apply(OBIS_ACTIVE_EXPORT_COUNT, kmpData.activeExportCounter, now);
-    data->apply(OBIS_REACTIVE_IMPORT_COUNT, kmpData.reactiveImportCounter, now);
-    data->apply(OBIS_REACTIVE_EXPORT_COUNT, kmpData.reactiveExportCounter, now);
-    data->apply(OBIS_ACTIVE_IMPORT, kmpData.activeImportPower, now);
-    data->apply(OBIS_ACTIVE_EXPORT, kmpData.activeExportPower, now);
-    data->apply(OBIS_REACTIVE_IMPORT, kmpData.reactiveImportPower, now);
-    data->apply(OBIS_REACTIVE_EXPORT, kmpData.reactiveExportPower, now);
-    data->apply(OBIS_VOLTAGE_L1, kmpData.l1voltage, now);
-    data->apply(OBIS_VOLTAGE_L2, kmpData.l2voltage, now);
-    data->apply(OBIS_VOLTAGE_L3, kmpData.l3voltage, now);
-    data->apply(OBIS_CURRENT_L1, kmpData.l1current, now);
-    data->apply(OBIS_CURRENT_L2, kmpData.l2current, now);
-    data->apply(OBIS_CURRENT_L3, kmpData.l3current, now);
-    data->apply(OBIS_POWER_FACTOR_L1, kmpData.l1PowerFactor, now);
-    data->apply(OBIS_POWER_FACTOR_L2, kmpData.l2PowerFactor, now);
-    data->apply(OBIS_POWER_FACTOR_L3, kmpData.l3PowerFactor, now);
-    data->apply(OBIS_POWER_FACTOR, kmpData.powerFactor, now);
-    data->apply(OBIS_ACTIVE_IMPORT_L1, kmpData.l1activeImportPower, now);
-    data->apply(OBIS_ACTIVE_IMPORT_L2, kmpData.l2activeImportPower, now);
-    data->apply(OBIS_ACTIVE_IMPORT_L3, kmpData.l3activeImportPower, now);
-    data->apply(OBIS_ACTIVE_EXPORT_L1, kmpData.l1activeExportPower, now);
-    data->apply(OBIS_ACTIVE_EXPORT_L2, kmpData.l2activeExportPower, now);
-    data->apply(OBIS_ACTIVE_EXPORT_L3, kmpData.l3activeExportPower, now);
-    data->apply(OBIS_ACTIVE_IMPORT_COUNT_L1, kmpData.l1activeImportCounter, now);
-    data->apply(OBIS_ACTIVE_IMPORT_COUNT_L2, kmpData.l2activeImportCounter, now);
-    data->apply(OBIS_ACTIVE_IMPORT_COUNT_L3, kmpData.l3activeImportCounter, now);
-    data->apply(OBIS_METER_ID, kmpData.meterId, now);
-    data->apply(OBIS_NULL, AmsTypeKamstrup, now);
+    data->apply(OBIS_ACTIVE_IMPORT_COUNT, kmpData.activeImportCounter);
+    data->apply(OBIS_ACTIVE_EXPORT_COUNT, kmpData.activeExportCounter);
+    data->apply(OBIS_REACTIVE_IMPORT_COUNT, kmpData.reactiveImportCounter);
+    data->apply(OBIS_REACTIVE_EXPORT_COUNT, kmpData.reactiveExportCounter);
+    data->apply(OBIS_ACTIVE_IMPORT, kmpData.activeImportPower);
+    data->apply(OBIS_ACTIVE_EXPORT, kmpData.activeExportPower);
+    data->apply(OBIS_REACTIVE_IMPORT, kmpData.reactiveImportPower);
+    data->apply(OBIS_REACTIVE_EXPORT, kmpData.reactiveExportPower);
+    data->apply(OBIS_VOLTAGE_L1, kmpData.l1voltage);
+    data->apply(OBIS_VOLTAGE_L2, kmpData.l2voltage);
+    data->apply(OBIS_VOLTAGE_L3, kmpData.l3voltage);
+    data->apply(OBIS_CURRENT_L1, kmpData.l1current);
+    data->apply(OBIS_CURRENT_L2, kmpData.l2current);
+    data->apply(OBIS_CURRENT_L3, kmpData.l3current);
+    data->apply(OBIS_POWER_FACTOR_L1, kmpData.l1PowerFactor);
+    data->apply(OBIS_POWER_FACTOR_L2, kmpData.l2PowerFactor);
+    data->apply(OBIS_POWER_FACTOR_L3, kmpData.l3PowerFactor);
+    data->apply(OBIS_POWER_FACTOR, kmpData.powerFactor);
+    data->apply(OBIS_ACTIVE_IMPORT_L1, kmpData.l1activeImportPower);
+    data->apply(OBIS_ACTIVE_IMPORT_L2, kmpData.l2activeImportPower);
+    data->apply(OBIS_ACTIVE_IMPORT_L3, kmpData.l3activeImportPower);
+    data->apply(OBIS_ACTIVE_EXPORT_L1, kmpData.l1activeExportPower);
+    data->apply(OBIS_ACTIVE_EXPORT_L2, kmpData.l2activeExportPower);
+    data->apply(OBIS_ACTIVE_EXPORT_L3, kmpData.l3activeExportPower);
+    data->apply(OBIS_ACTIVE_IMPORT_COUNT_L1, kmpData.l1activeImportCounter);
+    data->apply(OBIS_ACTIVE_IMPORT_COUNT_L2, kmpData.l2activeImportCounter);
+    data->apply(OBIS_ACTIVE_IMPORT_COUNT_L3, kmpData.l3activeImportCounter);
+    data->apply(OBIS_METER_ID, kmpData.meterId);
+    data->apply(OBIS_NULL, AmsTypeKamstrup);
     return data;
 }

lib/RealtimePlot/include/RealtimePlot.h

@@ -7,6 +7,7 @@
 #ifndef _REALTIMEPLOT_H
 #define _REALTIMEPLOT_H
 
+#include <stdint.h>
 #include "AmsData.h"
 
 #define REALTIME_SAMPLE 10000

lib/RealtimePlot/src/RealtimePlot.cpp

@@ -4,7 +4,6 @@
  * 
  */
 
-#include "Arduino.h"
 #include "RealtimePlot.h"
 #include <stdlib.h>
 

lib/SvelteUi/app/package-lock.json

@@ -613,6 +613,14 @@
         "tailwindcss": ">=3.0.0 || >= 3.0.0-alpha.1 || >= 4.0.0-alpha.20 || >= 4.0.0-beta.1"
       }
     },
+    "node_modules/@trysound/sax": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
+      "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/@types/estree": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
@@ -1812,11 +1820,10 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "3.1.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
-      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -2711,11 +2718,10 @@
       }
     },
     "node_modules/rollup": {
-      "version": "3.30.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.30.0.tgz",
-      "integrity": "sha512-kQvGasUgN+AlWGliFn2POSajRQEsULVYFGTvOZmK06d7vCD+YhZztt70kGk3qaeAXeWYL5eO7zx+rAubBc55eA==",
+      "version": "3.29.5",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz",
+      "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -2762,15 +2768,6 @@
         "rimraf": "^2.5.2"
       }
     },
-    "node_modules/sax": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/sax/-/sax-1.5.0.tgz",
-      "integrity": "sha512-21IYA3Q5cQf089Z6tgaUTr7lDAyzoTPx5HRtbhsME8Udispad8dC/+sziTNugOEx54ilvatQ9YCzl4KQLPcRHA==",
-      "license": "BlueOak-1.0.0",
-      "engines": {
-        "node": ">=11.0.0"
-      }
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -2987,11 +2984,10 @@
       }
     },
     "node_modules/sucrase/node_modules/brace-expansion": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
@@ -3026,13 +3022,12 @@
       }
     },
     "node_modules/sucrase/node_modules/minimatch": {
-      "version": "9.0.9",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^2.0.2"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
         "node": ">=16 || 14 >=14.17"
@@ -3189,17 +3184,16 @@
       }
     },
     "node_modules/svgo": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.2.tgz",
-      "integrity": "sha512-TyzE4NVGLUFy+H/Uy4N6c3G0HEeprsVfge6Lmq+0FdQQ/zqoVYB62IsBZORsiL+o96s6ff/V6/3UQo/C0cgCAA==",
-      "license": "MIT",
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
+      "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
       "dependencies": {
+        "@trysound/sax": "0.2.0",
         "commander": "^7.2.0",
         "css-select": "^4.1.3",
         "css-tree": "^1.1.3",
         "csso": "^4.2.0",
         "picocolors": "^1.0.0",
-        "sax": "^1.5.0",
         "stable": "^0.1.8"
       },
       "bin": {

lib/SvelteUi/src/AmsWebServer.cpp

@@ -61,14 +61,6 @@ AmsWebServer::AmsWebServer(uint8_t* buf, Stream* Debug, HwTools* hw, ResetDataCo
 	this->hw = hw;
 	this->buf = (char*) buf;
 	this->rdc = rdc;
-	if(rdc->magic != 0x4a) {
-		rdc->last_cause = 0;
-		rdc->cause = 0;
-		rdc->magic = 0x4a;
-	} else {
-		rdc->last_cause = rdc->cause;
-		rdc->cause = 0;
-	}
 }
 
 void AmsWebServer::setup(AmsConfiguration* config, GpioConfig* gpioConfig, AmsData* meterState, AmsDataStorage* ds, EnergyAccounting* ea, RealtimePlot* rtp, AmsFirmwareUpdater* updater) {

src/AmsToMqttBridge.cpp

@@ -30,6 +30,7 @@ ADC_MODE(ADC_VCC);
 #include "ZmartChargeCloudConnector.h"
 #endif
 
+#define MAX_BOOT_CYCLES 8
 #define WDT_TIMEOUT 120
 #if defined(SLOW_PROC_TRIGGER_MS)
 	#warning "Using predefined slow process trigger"
@@ -191,8 +192,6 @@ CloudConnector *cloud = NULL;
 ZmartChargeCloudConnector *zcloud = NULL;
 #endif
 
-#define MAX_BOOT_CYCLES 6
-
 #if defined(ESP32)
 __NOINIT_ATTR EnergyAccountingRealtimeData rtd;
 RTC_DATA_ATTR uint8_t bootcount = 0;
@@ -378,10 +377,6 @@ void setup() {
 
 	delay(1);
 	hw.setup(&sysConfig, &gpioConfig);
-	hw.ledOff(LED_INTERNAL);
-	hw.ledOff(LED_RED);
-	hw.ledOff(LED_GREEN);
-	hw.ledOff(LED_BLUE);
 
 	if(gpioConfig.apPin >= 0) {
 		pinMode(gpioConfig.apPin, INPUT_PULLUP);
@@ -470,7 +465,7 @@ void setup() {
 	float vcc = hw.getVcc();
 	debugI_P(PSTR("Voltage: %.2fV"), vcc);
 
-	bool deepSleep = true;
+	bool deepSleep = false; // Disable for now, as it makes it difficult to debug why devices rebooted
 	#if defined(ESP32)
 	float allowedDrift = bootcount * 0.01;
 	#else
@@ -504,6 +499,16 @@ void setup() {
 	#if defined(ESP8266)
 	resetBootCycleCounter(deepSleep);
 	#endif
+
+	if(rdc.magic != 0x4a) {
+		rdc.last_cause = 0;
+		rdc.cause = 0;
+		rdc.magic = 0x4a;
+	} else {
+		rdc.last_cause = rdc.cause;
+		rdc.cause = 0;
+	}
+
 	hw.ledOff(LED_YELLOW);
 	hw.ledOff(LED_INTERNAL);
 
@@ -1577,7 +1582,6 @@ void handleDataSuccess(AmsData* data) {
 
 	time_t dataUpdateTime = now;
 	if(abs(now - meterTime) < 300) {
-		// If the meter timestamp is close to our internal clock, use meter timestamp, because that is best for data tracking
 		dataUpdateTime = meterTime;
 	}
 
@@ -1590,14 +1594,14 @@ void handleDataSuccess(AmsData* data) {
 		debugD_P(PSTR("READY to update (internal clock %02d:%02d:%02d UTC, meter clock: %02d:%02d:%02d, list type %d, est: %d, using clock: %d)"), tm.Hour, tm.Minute, tm.Second, mtm.Hour, mtm.Minute, mtm.Second, data->getListType(), wasCounterEstimated, dataUpdateTime == now);
 		tmElements_t dtm;
 		breakTime(dataUpdateTime, dtm);
-		if(dtm.Minute < 1 && data->getListType() >= 3) {
+		if(dtm.Minute < 2 && data->getListType() >= 3) {
 			debugD_P(PSTR("Updating data storage using actual data"));
 			saveData = ds.update(data, dataUpdateTime);
 
 			#if defined(_CLOUDCONNECTOR_H)
 			if(saveData && cloud != NULL) cloud->forceUpdate();
 			#endif
-		} else if(dtm.Minute == 1) {
+		} else if(dtm.Minute == 2) {
 			debugW_P(PSTR("Did not receive necessary data for previous hour, clearing"));
 			AmsData nullData;
 			saveData = ds.update(&nullData, dataUpdateTime);
@@ -1612,7 +1616,7 @@ void handleDataSuccess(AmsData* data) {
 		debugD_P(PSTR("NOT Ready to update (internal clock %02d:%02d:%02d UTC, meter clock: %02d:%02d:%02d, list type %d, est: %d)"), tm.Hour, tm.Minute, tm.Second, mtm.Hour, mtm.Minute, mtm.Second, data->getListType(), wasCounterEstimated);
 	}
 
-	if(ea.update(dataUpdateTime, data->getLastUpdateMillis(), data->getListType(), data->getActiveImportPower(), data->getActiveExportPower())) {
+	if(ea.update(data)) {
 		debugI_P(PSTR("Saving energy accounting"));
 		if(!ea.save()) {
 			debugW_P(PSTR("Unable to save energy accounting"));