Merge branch 'mpepping:main' into main

.github/workflows/auto-assign.yml

@@ -8,4 +8,4 @@ jobs:
   add-reviews:
     runs-on: ubuntu-latest
     steps:
-      - uses: kentaro-m/auto-assign-action@v1.2.5
+      - uses: kentaro-m/auto-assign-action@v2.0.0

.github/workflows/codeql-analysis.yml

@@ -42,7 +42,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/container-publish.yml

@@ -23,7 +23,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Install dependencies
@@ -51,7 +51,7 @@ jobs:
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
+        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -60,7 +60,7 @@ jobs:
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934
+        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -72,7 +72,7 @@ jobs:
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09
+        uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75
         with:
           context: .
           push: ${{ github.event_name != 'pull_request' }}

.github/workflows/pylint.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Set up Python 3.9
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         python-version: 3.9
     - name: Install dependencies

Dockerfile

@@ -1,11 +1,11 @@
 FROM python:3.10-slim-bullseye
 
-LABEL maintainer "Martijn Pepping <martijn.pepping@automiq.nl>"
-LABEL org.opencontainers.image.authors "Martijn Pepping <martijn.pepping@automiq.nl>"
-LABEL org.opencontainers.image.description "Solarman MQTT published API data of supported PV systems to MQTT."
-LABEL org.opencontainers.image.source "https://github.com/mpepping/solarman-mqtt"
-LABEL org.opencontainers.image.title "Solarman MQTT"
-LABEL org.opencontainers.image.url "https://github.com/mpepping/solarman-mqtt/pkgs/container/solarman-mqtt"
+LABEL maintainer="Martijn Pepping <martijn.pepping@automiq.nl>"
+LABEL org.opencontainers.image.authors="Martijn Pepping <martijn.pepping@automiq.nl>"
+LABEL org.opencontainers.image.description="Solarman MQTT published API data of supported PV systems to MQTT."
+LABEL org.opencontainers.image.source="https://github.com/mpepping/solarman-mqtt"
+LABEL org.opencontainers.image.title="Solarman MQTT"
+LABEL org.opencontainers.image.url="https://github.com/mpepping/solarman-mqtt/pkgs/container/solarman-mqtt"
 
 ADD . /opt/app-root/src/
 WORKDIR /opt/app-root/src

solarman/solarmanpv.py

@@ -88,6 +88,7 @@ def single_run(self, config):
         _t = time.strftime("%Y-%m-%d %H:%M:%S")
         inverter_device_state = inverter_data.get("deviceState", 128)
 
+        meter_state = None
         if meter_data:
             meter_state = meter_data.get("deviceState", 128)