Merge pull request #748 from projecthorus/testing

v1.6.0 Release

.github/workflows/container.yml

@@ -18,46 +18,42 @@ jobs:
 
       - name: Calculate Container Metadata
         id: meta
-        uses: crazy-max/ghaction-docker-meta@v1
+        uses: docker/metadata-action@v4
         with:
           images: ghcr.io/${{ github.repository }}
-          tag-semver: |
-            {{version}}
 
       - name: Setup QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Setup Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Cache Layers
-        uses: actions/cache@v2
-        with:
-          path: /tmp/buildx-cache
-          key: buildx-cache-${{ github.sha }}
-          restore-keys: |
-            buildx-cache-
+        uses: docker/setup-buildx-action@v2
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        if: github.event_name != 'pull_request'
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Build Images
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64, linux/386, linux/arm64, linux/arm/v6, linux/arm/v7
+          cache-from: type=registry,ref=ghcr.io/${{ github.repository }}:buildcache
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
       - name: Build and Push Images
-        uses: docker/build-push-action@v2
+        if: ${{ github.event_name != 'pull_request' }}
+        uses: docker/build-push-action@v3
         with:
           context: .
           platforms: linux/amd64, linux/386, linux/arm64, linux/arm/v6, linux/arm/v7
-          cache-from: type=local,src=/tmp/buildx-cache
-          cache-to: type=local,dest=/tmp/buildx-cache-new,mode=max
-          push: ${{ github.event_name != 'pull_request' }}
+          cache-from: type=registry,ref=ghcr.io/${{ github.repository }}:buildcache
+          cache-to: type=registry,ref=ghcr.io/${{ github.repository }}:buildcache,mode=max
+          push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-
-      - name: Move Cache
-        run: |
-          rm -rf /tmp/buildx-cache
-          mv /tmp/buildx-cache-new /tmp/buildx-cache

.gitignore

@@ -44,10 +44,14 @@ auto_rx/imet1rs_dft
 auto_rx/lms6Xmod
 auto_rx/lms6mod
 auto_rx/m10mod
+auto_rx/m20mod
+auto_rx/mk2a1680mod
 auto_rx/rs_detect
+auto_rx/imet4iq
 auto_rx/imet54mod
 auto_rx/mXXmod
 auto_rx/mp3h1mod
+auto_rx/mts01mod
 
 m10
 meisei100mod
@@ -60,12 +64,15 @@ demod/mod/meisei100mod
 demod/mod/rs41mod
 demod/mod/rs92mod
 demod/mod/m10mod
+demod/mod/m20mod
 demod/mod/imet54mod
 demod/mod/mXXmod
 demod/mod/mp3h1mod
 imet/imet1rs_dft
+imet/imet4iq
 m10/m10
 mk2a/mk2a_lms1680
+mk2a/mk2a1680mod
 scan/dft_detect
 utils/fsk_demod
 rs41/rs41ecc

.pre-commit-config.yaml

@@ -0,0 +1,10 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+- repo: https://github.com/pre-commit/pre-commit-hooks
+  rev: v4.3.0
+  hooks:
+  - id: trailing-whitespace
+  - id: end-of-file-fixer
+  - id: check-added-large-files
+  - id: check-executables-have-shebangs

Dockerfile

@@ -1,7 +1,7 @@
 # -------------------
 # The build container
 # -------------------
-FROM debian:buster-slim AS build
+FROM debian:bullseye-slim AS build
 
 # Upgrade base packages.
 RUN apt-get update && \
@@ -11,6 +11,7 @@ RUN apt-get update && \
     cmake \
     git \
     libatlas-base-dev \
+    libsamplerate0-dev \
     libusb-1.0-0-dev \
     pkg-config \
     python3 \
@@ -20,6 +21,15 @@ RUN apt-get update && \
     python3-wheel && \
   rm -rf /var/lib/apt/lists/*
 
+# Copy in requirements.txt.
+COPY auto_rx/requirements.txt \
+  /root/radiosonde_auto_rx/auto_rx/requirements.txt
+
+# Install Python packages.
+RUN --mount=type=cache,target=/root/.cache/pip pip3 install \
+  --user --no-warn-script-location --ignore-installed --no-binary numpy \
+  -r /root/radiosonde_auto_rx/auto_rx/requirements.txt
+
 # Compile rtl-sdr from source.
 RUN git clone https://github.com/steve-m/librtlsdr.git /root/librtlsdr && \
   mkdir -p /root/librtlsdr/build && \
@@ -29,26 +39,22 @@ RUN git clone https://github.com/steve-m/librtlsdr.git /root/librtlsdr && \
   make install && \
   rm -rf /root/librtlsdr
 
-# Copy in requirements.txt.
-COPY auto_rx/requirements.txt \
-  /root/radiosonde_auto_rx/auto_rx/requirements.txt
-
-# Install Python packages.
-RUN --mount=type=cache,target=/root/.cache/pip pip3 install \
-  --user --no-warn-script-location --ignore-installed --no-binary numpy \
-  -r /root/radiosonde_auto_rx/auto_rx/requirements.txt
+# Compile spyserver_client from source.
+RUN git clone https://github.com/miweber67/spyserver_client.git /root/spyserver_client && \
+  cd /root/spyserver_client && \
+  make
 
 # Copy in radiosonde_auto_rx.
 COPY . /root/radiosonde_auto_rx
 
-# Build the binaries.
+# Build the radiosonde_auto_rx binaries.
 WORKDIR /root/radiosonde_auto_rx/auto_rx
 RUN /bin/sh build.sh
 
 # -------------------------
 # The application container
 # -------------------------
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 
 EXPOSE 5000/tcp
 
@@ -58,6 +64,7 @@ RUN apt-get update && \
   apt-get install -y --no-install-recommends \
   libatlas3-base \
   libatomic1 \
+  libsamplerate0 \
   python3 \
   rng-tools \
   sox \
@@ -76,6 +83,11 @@ COPY --from=build /root/.local /root/.local
 COPY --from=build /root/radiosonde_auto_rx/LICENSE /opt/auto_rx/
 COPY --from=build /root/radiosonde_auto_rx/auto_rx/ /opt/auto_rx/
 
+# Copy ss_client from the build container and create links
+COPY --from=build /root/spyserver_client/ss_client /opt/auto_rx/
+RUN ln -s ss_client /opt/auto_rx/ss_iq && \
+  ln -s ss_client /opt/auto_rx/ss_power
+
 # Set the working directory.
 WORKDIR /opt/auto_rx
 

Makefile

@@ -1,19 +1,24 @@
-# Toplevel makefile to build all software
+AUTO_RX_VERSION := $(shell PYTHONPATH=./auto_rx python3 -m autorx.version 2>/dev/null || python -m autorx.version)
 
-PROGRAMS := scan/dft_detect demod/mod/rs41mod demod/mod/dfm09mod demod/mod/rs92mod demod/mod/lms6mod demod/mod/lms6Xmod demod/mod/meisei100mod demod/mod/m10mod demod/mod/mXXmod demod/mod/imet54mod mk2a/mk2a_lms1680 imet/imet1rs_dft utils/fsk_demod
+# Uncomment to use clang as a compiler.
+#CC = clang
+#export CC
 
-all:
-	$(MAKE) -C demod/mod
-	$(MAKE) -C imet
-	$(MAKE) -C utils
-	$(MAKE) -C scan
-	$(MAKE) -C mk2a
-	cp $(PROGRAMS) auto_rx/
+CFLAGS = -O3 -w -Wno-unused-variable -DVER_JSN_STR=\"$(AUTO_RX_VERSION)\"
+export CFLAGS
 
-.PHONY:
-clean:
-	$(MAKE) -C demod/mod clean
-	$(MAKE) -C imet clean
-	$(MAKE) -C utils clean
-	$(MAKE) -C scan clean
-	$(MAKE) -C mk2a clean
+SUBDIRS := \
+	demod/mod \
+	imet \
+	mk2a \
+	scan \
+	utils \
+
+all: $(SUBDIRS)
+
+clean: $(SUBDIRS)
+
+$(SUBDIRS):
+	make -C $@ $(MAKECMDGOALS)
+
+.PHONY: all clean $(SUBDIRS)

README.md

@@ -3,10 +3,10 @@
 
 **Please refer to the [auto_rx wiki](https://github.com/projecthorus/radiosonde_auto_rx/wiki) for the latest information.**
 
-This fork of [rs1279's RS](https://github.com/rs1729/RS) codebase provides a set of utilities ('auto_rx') to allow automatic reception and uploading of [Radiosonde](https://en.wikipedia.org/wiki/Radiosonde) positions to multiple services, including:
+This project is built around [rs1279's RS](https://github.com/rs1729/RS) demodulators, and provides a set of utilities ('auto_rx') to allow automatic reception and uploading of [Radiosonde](https://en.wikipedia.org/wiki/Radiosonde) positions to multiple services, including:
 
 * The [SondeHub Radiosonde Tracker](https://tracker.sondehub.org) - a tracking website specifically designed for tracking radiosondes!
-* APRS-IS (for display on sites such as [radiosondy.info](https://radiosondy.info) and [aprs.fi](https://aprs.fi)
+* APRS-IS, for display on sites such as [radiosondy.info](https://radiosondy.info). (Note that aprs.fi now blocks radiosonde traffic.)
 * [ChaseMapper](https://github.com/projecthorus/chasemapper) for mobile
   radiosonde chasing.
 
@@ -18,15 +18,16 @@ Manufacturer | Model | Position | Temperature | Humidity | Pressure | XDATA
 -------------|-------|----------|-------------|----------|----------|------
 Vaisala | RS92-SGP/NGP | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
 Vaisala | RS41-SG/SGP/SGM | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: (for -SGP) | :heavy_check_mark:
-Graw | DFM06/09/17 | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: | :x:
+Graw | DFM06/09/17 | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: | :heavy_check_mark:
 Meteomodem | M10 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Not Sent | :x:
 Meteomodem | M20 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: (For some models) | :x:
-Intermet Systems | iMet-1 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Not Sent | :heavy_check_mark:
-Intermet Systems | iMet-4 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Not Sent | :heavy_check_mark:
+Intermet Systems | iMet-4 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
 Intermet Systems | iMet-54 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Not Sent | :x:
 Lockheed Martin | LMS6-400/1680 | :heavy_check_mark: | :x: | :x: | :x: | Not Sent
-Meisei | iMS-100 | :heavy_check_mark: | :x: | :x: | :x: | Not Sent
+Meisei | iMS-100 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | Not Sent
+Meisei | RS11G | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | Not Sent
 Meteo-Radiy | MRZ-H1 (400 MHz) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | Not Sent
+Meteosis | MTS01 | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: | Not Sent
 
 Support for other radiosondes may be added as required - please send us sondes to test with! If you have any information about telemetry formats, we'd love to hear from you (see our contact details below).
 
@@ -47,11 +48,10 @@ https://groups.google.com/forum/#!forum/radiosonde_auto_rx
 * [Mark Jessop](https://github.com/darksidelemm) - vk5qi@rfhead.net
 * [Michaela Wheeler](https://github.com/TheSkorm) - radiosonde@michaela.lgbt
 
-
 ## Licensing Information
 All software within this repository is licensed under the GNU General Public License v3. Refer this repositories LICENSE file for the full license text.
 
 Radiosonde telemetry data captured via this software and uploaded into the [Sondehub](https://sondehub.org/) Database system is licensed under [Creative Commons BY-SA v2.0](https://creativecommons.org/licenses/by-sa/2.0/). 
 Telemetry data uploaded into the APRS-IS network is generally considered to be released into the public domain. 
 
-By uploading data into these systems (by enabling the relevant uploaders within the `station.cfg` file) you as the user agree for your data to be made available under these licenses. Note that uploading to Sondehub is enabled by default. 
+By uploading data into these systems (by enabling the relevant uploaders within the `station.cfg` file) you as the user agree for your data to be made available under these licenses. Note that uploading to Sondehub is enabled by default.