Merge remote-tracking branch 'origin/master' into fb_add_itron_ultramaxx

.github/workflows/dockerhub-description.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/checkout@v4
     - name: Docker Hub Description
-      uses: peter-evans/dockerhub-description@v3
+      uses: peter-evans/dockerhub-description@v4
       env:
         DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
         DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PAT }}

.github/workflows/trigger_ha_addon.yml

@@ -28,7 +28,7 @@ jobs:
 
       - name: Trigger build for edge release
         if: ${{ github.ref_name == 'master' }}
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.HA_PAT }}
           repository: wmbusmeters/wmbusmeters-ha-addon
@@ -37,7 +37,7 @@ jobs:
 
       - name: Trigger build for stable release
         if: ${{ github.ref_name != 'master' }}
-        uses: peter-evans/repository-dispatch@v2
+        uses: peter-evans/repository-dispatch@v3
         with:
           token: ${{ secrets.HA_PAT }}
           repository: wmbusmeters/wmbusmeters-ha-addon

docker/Dockerfile

@@ -1,18 +1,22 @@
 FROM asymworks/multiarch-alpine:${TARGETARCH}${TARGETVARIANT}-latest-stable AS build
 RUN apk add --no-cache alpine-sdk gcc linux-headers librtlsdr-dev libxml2-dev cmake libusb-dev bash
 RUN git clone https://github.com/wmbusmeters/wmbusmeters.git && \
-    git clone https://github.com/weetmuts/rtl-wmbus.git
+    git clone https://github.com/weetmuts/rtl-wmbus.git && \
+    git clone https://github.com/merbanan/rtl_433.git
 WORKDIR /wmbusmeters
 RUN make
 WORKDIR /rtl-wmbus
 RUN make release && chmod 755 build/rtl_wmbus
+WORKDIR /rtl_433
+RUN mkdir build && cd build && cmake ../ && make
 
 FROM asymworks/multiarch-alpine:${TARGETARCH}${TARGETVARIANT}-latest-stable as scratch
 ENV QEMU_EXECVE=1
-RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr libxml2 netcat-openbsd rtl_433
+RUN apk add --no-cache mosquitto-clients libstdc++ curl libusb rtl-sdr libxml2 netcat-openbsd
 WORKDIR /wmbusmeters
 COPY --from=build /wmbusmeters/build/wmbusmeters /wmbusmeters/wmbusmeters
 COPY --from=build /rtl-wmbus/build/rtl_wmbus /usr/bin/rtl_wmbus
+COPY --from=build /rtl_433/build/src/rtl_433 /usr/bin/rtl_433
 COPY --from=build /wmbusmeters/docker/docker-entrypoint.sh /wmbusmeters/docker-entrypoint.sh
 VOLUME /wmbusmeters_data/
 CMD ["sh", "/wmbusmeters/docker-entrypoint.sh"]

src/dvparser.h

@@ -23,7 +23,7 @@
 
 #include<map>
 #include<set>
-#include<stdint.h>
+#include<cstdint>
 #include<time.h>
 #include<functional>
 #include<vector>

src/translatebits.h

@@ -18,7 +18,7 @@
 #ifndef TRANSLATEBITS_H
 #define TRANSLATEBITS_H
 
-#include<stdint.h>
+#include<cstdint>
 #include<string>
 #include<vector>
 

src/units.h

@@ -20,6 +20,7 @@
 
 #include<string>
 #include<vector>
+#include<cstdint>
 
 // A named quantity has a preferred unit,
 // ie Volume has m3 (cubic meters) Energy has kwh, Power has kw.

src/util.h

@@ -19,7 +19,7 @@
 #define UTIL_H
 
 #include<signal.h>
-#include<stdint.h>
+#include<cstdint>
 #include<string>
 #include<functional>
 #include<map>

src/wmbus_rtlwmbus.cc

@@ -180,11 +180,11 @@ shared_ptr<BusDevice> openRTLWMBUS(Detected detected,
 
             if (!force_freq)
             {
-                command = "ERRFILE=$(mktemp --suffix=_wmbusmeters_rtlsdr) ; echo ERRFILE=$ERRFILE ;  date -Iseconds > $ERRFILE ; tail -f $ERRFILE & "+rtl_sdr+" "+ppm+" -d "+to_string(id)+" -f "+freq+" -s 1.6e6 - 2>>$ERRFILE | "+rtl_wmbus+" -s"+add_f;
+                command = "ERRFILE=$(mktemp -t wmbusmeters_rtlsdr.XXXXXXXXXXXX) ; echo ERRFILE=$ERRFILE ;  date -Iseconds > $ERRFILE ; tail -f $ERRFILE & "+rtl_sdr+" "+ppm+" -d "+to_string(id)+" -f "+freq+" -s 1.6e6 - 2>>$ERRFILE | "+rtl_wmbus+" -s"+add_f;
             }
             else
             {
-                command = "ERRFILE=$(mktemp --suffix=_wmbusmeters_rtlsdr) ; echo ERRFILE=$ERRFILE ; date -Iseconds > $ERRFILE ; tail -f $ERRFILE & "+rtl_sdr+" "+ppm+" -d "+to_string(id)+" -f "+freq+" -s 1.6e6 - 2>>$ERRFILE | "+rtl_wmbus+" "+add_f;
+                command = "ERRFILE=$(mktemp -t wmbusmeters_rtlsdr.XXXXXXXXXXXX) ; echo ERRFILE=$ERRFILE ; date -Iseconds > $ERRFILE ; tail -f $ERRFILE & "+rtl_sdr+" "+ppm+" -d "+to_string(id)+" -f "+freq+" -s 1.6e6 - 2>>$ERRFILE | "+rtl_wmbus+" "+add_f;
             }
         }
         verbose("(rtlwmbus) using command: %s\n", command.c_str());