Merge branch 'main' of github.com:geoffwhittington/meshtastic-bridge into main

Author: berticus2016

.github/workflows/main.yaml

@@ -4,21 +4,16 @@ on:
       - "*"
 
 jobs:
-  build:
-    name: Build, push
+  docker-buildx:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout main
         uses: actions/checkout@main
 
-      - name: Build container
-        run: docker build --tag gwhittington/meshtastic-bridge:latest .
-
-      - name: Log in to Container Registry with short-lived credentials
-        run: docker login --username=gwhittington --password "${{secrets.DOCKER_HUB}}"
-
-      - name: Push image to Container Registry
-        run: docker push gwhittington/meshtastic-bridge:latest
-
-      - name: Logout from Container Registry
-        run: docker logout
+      - name: Build and publish image
+        uses: zmingxie/docker_buildx@master
+        with:
+          publish: true
+          imageName: gwhittington/meshtastic-bridge
+          dockerHubUser: gwhittington
+          dockerHubPassword: ${{secrets.DOCKER_HUB}}

Dockerfile

@@ -7,7 +7,11 @@ WORKDIR /code
 # copy the dependencies file to the working directory
 COPY requirements.txt .
 
+RUN apt-get update && apt-get install -y cargo
+
 # install dependencies
+RUN pip install -U pip
+RUN pip install setuptools_rust wheel
 RUN pip install -r requirements.txt
 
 # copy the content of the local src directory to the working directory

README.md

@@ -66,7 +66,7 @@ mqtt_servers:
        mqtt-to-radio:
          - decrypt_filter:
             key: '/home/user/keys/key.pem'
-         - send_plugin:
+         - radio_message_plugin:
             device: remote
 pipelines:
  radio-to-mqtt:
@@ -110,7 +110,7 @@ The following plugins can be used in the `pipelines` section of `config.yaml`:
 | `mqtt_plugin`     | Send packets to a MQTT server                                        |
 | `encrypt_filter`  | Encrypt a packet for a desired MQTT recipient                        |
 | `decrypt_filter`  | Decrypt a packet originating from MQTT                               |
-| `send_plugin`     | Send a packet to a specified `device`                                |
+| `radio_message_plugin`     | Send a packet to a specified `device`                       |
 
 ### debugger - Output the contents of a packet
 
@@ -153,8 +153,8 @@ message_filter:
 - **log_level** `debug` or `info`. Default `info`
 - **max_distance_km** Filter packets more than a certain distance
 - **comparison** `within` or `outside`. Default `within`
-- **compare_latitude** Set the latitude to compare against
-- **compare_longitude** Set the longitude to compare against
+- **compare_latitude** latitude to compare against
+- **compare_longitude** longitude to compare against
 - **latitude** Set the latitude
 - **longitude** Set the longitude