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/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",
+      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+      "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",
+      "version": "3.29.5",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.30.0.tgz",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz",
-      "integrity": "sha512-kQvGasUgN+AlWGliFn2POSajRQEsULVYFGTvOZmK06d7vCD+YhZztt70kGk3qaeAXeWYL5eO7zx+rAubBc55eA==",
+      "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",
+      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "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",
+      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==",
+      "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",
+      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.2.tgz",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
-      "integrity": "sha512-TyzE4NVGLUFy+H/Uy4N6c3G0HEeprsVfge6Lmq+0FdQQ/zqoVYB62IsBZORsiL+o96s6ff/V6/3UQo/C0cgCAA==",
+      "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
-      "license": "MIT",
       "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);