Merge branch 'main' into feature/15min_prices

.github/workflows/build.yml

@@ -27,6 +27,7 @@ jobs:
       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: Cache Python dependencies

.github/workflows/localazy.yml

@@ -38,4 +38,4 @@ jobs:
       run: localazy download -k localazy-keys.json
 
     - name: Upload translations to S3
-      run: aws s3 sync ./localazy/language/ s3://amscloud-private/language/
+      run: aws s3 sync ./localazy/language/ s3://${{ secrets.AWS_S3_BUCKET }}/language/

.github/workflows/prerelease.yml

@@ -0,0 +1,84 @@
+name: Release candidate build and upload
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+'
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out code from repo
+      uses: actions/checkout@v4
+    - name: Get release version for filenames
+      id: release_tag
+      env:
+        GITHUB_REF: ${{ github.ref }}
+      run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
+
+    - name: Create release with release notes
+      id: create_release
+      uses: ncipollo/release-action@v1
+      with:
+        name: Release candidate v${{ steps.release_tag.outputs.tag }}
+        prerelease: true
+
+    outputs:
+      version: ${{ steps.release_tag.outputs.tag }}
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+
+  esp32s2:
+    needs: prepare
+    uses: ./.github/workflows/release-deploy-env.yml
+    secrets: inherit
+    with:
+      env: esp32s2
+      version: ${{ needs.prepare.outputs.version }}
+      upload_url: ${{ needs.prepare.outputs.upload_url }}
+      subfolder: /rc
+  esp32s3:
+    needs: prepare
+    uses: ./.github/workflows/release-deploy-env.yml
+    secrets: inherit
+    with:
+      env: esp32s3
+      version: ${{ needs.prepare.outputs.version }}
+      upload_url: ${{ needs.prepare.outputs.upload_url }}
+      subfolder: /rc
+  esp32c3:
+    needs: prepare
+    uses: ./.github/workflows/release-deploy-env.yml
+    secrets: inherit
+    with:
+      env: esp32c3
+      version: ${{ needs.prepare.outputs.version }}
+      upload_url: ${{ needs.prepare.outputs.upload_url }}
+      subfolder: /rc
+  esp32:
+    needs: prepare
+    uses: ./.github/workflows/release-deploy-env.yml
+    secrets: inherit
+    with:
+      env: esp32
+      version: ${{ needs.prepare.outputs.version }}
+      upload_url: ${{ needs.prepare.outputs.upload_url }}
+      subfolder: /rc
+  esp32solo:
+    needs: prepare
+    uses: ./.github/workflows/release-deploy-env.yml
+    secrets: inherit
+    with:
+      env: esp32solo
+      version: ${{ needs.prepare.outputs.version }}
+      upload_url: ${{ needs.prepare.outputs.upload_url }}
+      subfolder: /rc
+  esp8266:
+    needs: prepare
+    uses: ./.github/workflows/release-deploy-env.yml
+    secrets: inherit
+    with:
+      env: esp8266
+      version: ${{ needs.prepare.outputs.version }}
+      upload_url: ${{ needs.prepare.outputs.upload_url }}
+      subfolder: /rc

.github/workflows/release-deploy-env.yml

@@ -0,0 +1,128 @@
+name: Build with env and deploy
+
+on:
+  workflow_call:
+    inputs:
+      env:
+        description: 'The environment to build for'
+        required: true
+        type: string
+      upload_url:
+        description: 'The upload URL for the release assets'
+        required: true
+        type: string
+      version:
+        description: 'The version tag for the release assets'
+        required: true
+        type: string
+      subfolder:
+        description: 'The subfolder in S3 to upload the binary to'
+        required: false
+        type: string
+        default: ''
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out code from repo
+      uses: actions/checkout@v4
+
+    - name: Configure AWS credentials
+      uses: aws-actions/configure-aws-credentials@v2
+      with:
+        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        aws-region: eu-north-1
+
+    - 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
+      env:
+        GITHUB_TAG: v${{ inputs.version }}
+      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 binary to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ inputs.upload_url }}
+        asset_path: .pio/build/${{ inputs.env }}/firmware.bin
+        asset_name: ams2mqtt-${{ inputs.env }}-${{ inputs.version }}.bin
+        asset_content_type: application/octet-stream
+
+    - name: Upload zip to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ inputs.upload_url }}
+        asset_path: ${{ inputs.env }}.zip
+        asset_name: ams2mqtt-${{ inputs.env }}-${{ inputs.version }}.zip
+        asset_content_type: application/zip
+    
+    - name: Create MD5 checksum file
+      run: md5sum .pio/build/${{ inputs.env }}/firmware.bin | cut -z -d ' ' -f 1 > firmware.md5
+
+    - name: Upload binary to S3
+      run: aws s3 cp .pio/build/${{ inputs.env }}/firmware.bin s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}.bin
+
+    - name: Upload MD5 checksum to S3
+      run: aws s3 cp firmware.md5 s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}.md5
+
+    - name: Upload bootloader to S3
+      run: aws s3 cp .pio/build/${{ inputs.env }}/bootloader.bin s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}-bootloader.bin
+    
+    - name: Upload partition table to S3
+      run: aws s3 cp .pio/build/${{ inputs.env }}/partitions.bin s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}-partitions.bin
+
+    - name: Upload app0 to S3
+      run: aws s3 cp ~/.platformio/packages/framework-arduinoespressif32/tools/partitions/boot_app0.bin s3://${{ secrets.AWS_S3_BUCKET }}/firmware${{ inputs.subfolder }}/ams2mqtt-${{ inputs.env }}-${{ inputs.version }}-app0.bin

.github/workflows/release.yml

@@ -1,213 +1,78 @@
-name: Release
+name: Release build and upload
 
 on:
   push:
     tags:
-      - 'v*.*.*'
+      - 'v[0-9]+.[0-9]+.[0-9]+'
-
 
 jobs:
-  build:
+  prepare:
-
     runs-on: ubuntu-latest
-
     steps:
-    - name: Check out code from repo
+      - name: Check out code from repo
-      uses: actions/checkout@v4
+        uses: actions/checkout@v4
-    - name: Get release version for filenames
+      - name: Get release version for filenames
-      id: release_tag
+        id: release_tag
-      env:
+        env:
-        GITHUB_REF: ${{ github.ref }}
+          GITHUB_REF: ${{ github.ref }}
-      run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
+        run: echo ::set-output name=tag::$(echo ${GITHUB_REF:11})
-    - name: Get release version for code
-      env:
-        GITHUB_REF: ${{ github.ref }}
-      run: echo "GITHUB_TAG=$(echo ${GITHUB_REF##*/})" >> $GITHUB_ENV
 
-    - name: Inject secrets into ini file
+      - name: Create release with release notes
-      run: |
+        id: create_release
-        sed -i 's/NO_AMS2MQTT_PRICE_KEY/AMS2MQTT_PRICE_KEY="${{secrets.AMS2MQTT_PRICE_KEY}}"/g' platformio.ini
+        uses: ncipollo/release-action@v1
-        sed -i 's/NO_AMS2MQTT_PRICE_AUTHENTICATION/AMS2MQTT_PRICE_AUTHENTICATION="${{secrets.AMS2MQTT_PRICE_AUTHENTICATION}}"/g' platformio.ini
+        with:
-        sed -i 's/NO_AMS2MQTT_SC_KEY/AMS2MQTT_SC_KEY=\\"${{secrets.AMS2MQTT_SC_KEY}}\\"/g' platformio.ini
+          name: Release v${{ steps.release_tag.outputs.tag }}
-        sed -i 's/NO_ENERGY_SPEEDOMETER_USER/ENERGY_SPEEDOMETER_USER=\\"${{secrets.ENERGY_SPEEDOMETER_USER}}\\"/g' platformio.ini
+          generateReleaseNotes: true
-        sed -i 's/NO_ENERGY_SPEEDOMETER_PASS/ENERGY_SPEEDOMETER_PASS=\\"${{secrets.ENERGY_SPEEDOMETER_PASS}}\\"/g' platformio.ini
 
-    - name: Cache Python dependencies
+    outputs:
-      uses: actions/cache@v4
+      version: ${{ steps.release_tag.outputs.tag }}
-      with:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
-        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: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -U platformio css_html_js_minify
 
-    - name: Set up node
+  esp32s2:
-      uses: actions/setup-node@v4
+    needs: prepare
-      with:
+    uses: ./.github/workflows/release-deploy-env.yml
-        node-version: '19.x'
+    secrets: inherit
-    - name: Build with node
+    with:
-      run: |
+      env: esp32s2
-        cd lib/SvelteUi/app
+      version: ${{ needs.prepare.outputs.version }}
-        npm ci
+      upload_url: ${{ needs.prepare.outputs.upload_url }}
-        npm run build
+  esp32s3:
-        cd -
+    needs: prepare
-      env:
+    uses: ./.github/workflows/release-deploy-env.yml
-        CI: false
+    secrets: inherit
-
+    with:
-    - name: PlatformIO lib install
+      env: esp32s3
-      run: pio lib install
+      version: ${{ needs.prepare.outputs.version }}
-
+      upload_url: ${{ needs.prepare.outputs.upload_url }}
-    - name: Create release with release notes
+  esp32c3:
-      id: create_release
+    needs: prepare
-      uses: ncipollo/release-action@v1
+    uses: ./.github/workflows/release-deploy-env.yml
-      with:
+    secrets: inherit
-        name: Release v${{ steps.release_tag.outputs.tag }}
+    with:
-        generateReleaseNotes: true
+      env: esp32c3
-
+      version: ${{ needs.prepare.outputs.version }}
-    - name: Build esp8266 firmware
+      upload_url: ${{ needs.prepare.outputs.upload_url }}
-      run: pio run -e esp8266
+  esp32:
-    - name: Create esp8266 zip file
+    needs: prepare
-      run: /bin/sh scripts/esp8266/mkzip.sh
+    uses: ./.github/workflows/release-deploy-env.yml
-    - name: Upload esp8266 binary to release
+    secrets: inherit
-      uses: actions/upload-release-asset@v1
+    with:
-      env:
+      env: esp32
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      version: ${{ needs.prepare.outputs.version }}
-      with:
+      upload_url: ${{ needs.prepare.outputs.upload_url }}
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
+  esp32solo:
-        asset_path: .pio/build/esp8266/firmware.bin
+    needs: prepare
-        asset_name: ams2mqtt-esp8266-${{ steps.release_tag.outputs.tag }}.bin
+    uses: ./.github/workflows/release-deploy-env.yml
-        asset_content_type: application/octet-stream
+    secrets: inherit
-    - name: Upload esp8266 zip to release
+    with:
-      uses: actions/upload-release-asset@v1
+      env: esp32solo
-      env:
+      version: ${{ needs.prepare.outputs.version }}
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      upload_url: ${{ needs.prepare.outputs.upload_url }}
-      with:
+  esp8266:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
+    needs: prepare
-        asset_path: esp8266.zip
+    uses: ./.github/workflows/release-deploy-env.yml
-        asset_name: ams2mqtt-esp8266-${{ steps.release_tag.outputs.tag }}.zip
+    secrets: inherit
-        asset_content_type: application/zip
+    with:
-
+      env: esp8266
-    - name: Build esp32 firmware
+      version: ${{ needs.prepare.outputs.version }}
-      run: pio run -e esp32
+      upload_url: ${{ needs.prepare.outputs.upload_url }}
-    - name: Create esp32 zip file
-      run: /bin/sh scripts/esp32/mkzip.sh
-    - name: Upload esp32 binary to release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: .pio/build/esp32/firmware.bin
-        asset_name: ams2mqtt-esp32-${{ steps.release_tag.outputs.tag }}.bin
-        asset_content_type: application/octet-stream
-    - name: Upload esp32 zip to release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: esp32.zip
-        asset_name: ams2mqtt-esp32-${{ steps.release_tag.outputs.tag }}.zip
-        asset_content_type: application/zip
-
-    - name: Build esp32s2 firmware
-      run: pio run -e esp32s2
-    - name: Create esp32s2 zip file
-      run: /bin/sh scripts/esp32s2/mkzip.sh
-    - name: Upload esp32s2 binary to release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: .pio/build/esp32s2/firmware.bin
-        asset_name: ams2mqtt-esp32s2-${{ steps.release_tag.outputs.tag }}.bin
-        asset_content_type: application/octet-stream
-    - name: Upload esp32s2 zip to release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: esp32s2.zip
-        asset_name: ams2mqtt-esp32s2-${{ steps.release_tag.outputs.tag }}.zip
-        asset_content_type: application/zip
-
-    - name: Build esp32s3 firmware
-      run: pio run -e esp32s3
-    - name: Create esp32s3 zip file
-      run: /bin/sh scripts/esp32s3/mkzip.sh
-    - name: Upload esp32s3 binary to release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: .pio/build/esp32s3/firmware.bin
-        asset_name: ams2mqtt-esp32s3-${{ steps.release_tag.outputs.tag }}.bin
-        asset_content_type: application/octet-stream
-    - name: Upload esp32s3 zip to release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: esp32s3.zip
-        asset_name: ams2mqtt-esp32s3-${{ steps.release_tag.outputs.tag }}.zip
-        asset_content_type: application/zip
-
-    - name: Build esp32solo firmware
-      run: pio run -e esp32solo
-    - name: Create esp32solo zip file
-      run: /bin/sh scripts/esp32solo/mkzip.sh
-    - name: Upload esp32solo binary to release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: .pio/build/esp32solo/firmware.bin
-        asset_name: ams2mqtt-esp32solo-${{ steps.release_tag.outputs.tag }}.bin
-        asset_content_type: application/octet-stream
-    - name: Upload esp32solo zip to release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: esp32solo.zip
-        asset_name: ams2mqtt-esp32solo-${{ steps.release_tag.outputs.tag }}.zip
-        asset_content_type: application/zip
-
-    - name: Build esp32c3 firmware
-      run: pio run -e esp32c3
-    - name: Create esp32c3 zip file
-      run: /bin/sh scripts/esp32c3/mkzip.sh
-    - name: Upload esp32c3 binary to release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: .pio/build/esp32c3/firmware.bin
-        asset_name: ams2mqtt-esp32c3-${{ steps.release_tag.outputs.tag }}.bin
-        asset_content_type: application/octet-stream
-    - name: Upload esp32c3 zip to release
-      uses: actions/upload-release-asset@v1
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: esp32c3.zip
-        asset_name: ams2mqtt-esp32c3-${{ steps.release_tag.outputs.tag }}.zip
-        asset_content_type: application/zip

lib/AmsFirmwareUpdater/src/AmsFirmwareUpdater.cpp

@@ -230,6 +230,16 @@ bool AmsFirmwareUpdater::fetchNextVersion() {
         http.setUserAgent("AMS-Firmware-Updater");
         http.addHeader(F("Cache-Control"), "no-cache");
         http.addHeader(F("x-AMS-version"), FirmwareVersion::VersionString);
+        http.addHeader(F("x-AMS-STA-MAC"), WiFi.macAddress());
+        http.addHeader(F("x-AMS-AP-MAC"), WiFi.softAPmacAddress());
+        http.addHeader(F("x-AMS-chip-size"), String(ESP.getFlashChipSize()));
+		http.addHeader(F("x-AMS-board-type"), String(hw->getBoardType(), 10));
+		if(meterState->getMeterType() != AmsTypeAutodetect) {
+			http.addHeader(F("x-AMS-meter-mfg"), String(meterState->getMeterType(), 10));
+		}
+		if(!meterState->getMeterModel().isEmpty()) {
+			http.addHeader(F("x-AMS-meter-model"), meterState->getMeterModel());
+		}
         int status = http.GET();
         if(status == 204) {
             String nextVersion = http.header("x-version");