remove mbelib and dependencies

signals

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Installation method**
+How did you install OpenWebRX? (Raspberry Pi SD card image, Debian / Ubuntu packages, Docker image, manually?)
+
+**Versions**
+What version of OpenWebRX are you running? (Check on startup, or see `owrx/version.py`. If a `-dev` version is used, ideally state the commit the issue is appearing on)
+
+**Log messages**
+Are there any relevant messages relating to the bug in the output / log of OpenWebRX? (On most installations, the log should be available using the command `sudo journalctl -u openwebrx`)
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: General support request or other project-relasted question
+    url: https://groups.io/g/openwebrx
+    about: Request help on the community mailing list

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+Before posting a new feature request, please check if a similar idea has already been listed
+* on the issue tracker
+* on the [OpenWebRX github project](https://github.com/users/jketterl/projects/1).
+
+In the latter case, please only proceed if you have additional information about the feature, and please let us know that there's already a card there.
+
+**Feature description**
+Please describe in plain words what functionality you'd like to see in OpenWebRX, and why you think it's useful.
+
+**Target audience**
+Please let us know if you think that this feature is of particular interest for a particular group of users (e.g. hams, SWLs, DXers, ...)

CHANGELOG.md

@@ -1,3 +1,51 @@
+**1.0.0**
+- Introduced `squelch_auto_margin` config option that allows configuring the auto squelch level
+- Removed `port` configuration option; `rtltcp_compat` takes the port number with the new connectors
+- Added support for new WSJT-X modes FST4, FST4W (only available with WSJT-X 2.3) and Q65 (only avilable with
+  WSJT-X 2.4)
+- Added support for demodulating M17 digital voice signals using m17-cxx-demod
+- New reporting infrastructure, allowing WSPR and FST4W spots to be sent to wsprnet.org
+- Add some basic filtering capabilities to the map
+- New arguments to the `openwebrx` command-line to facilitate the administration of users (try `openwebrx admin`)
+- Default bandwidth changes:
+  - "WFM" changed to 150kHz
+  - "Packet" (APRS) changed to 12.5kHz
+- Configuration rework:
+  - New: fully web-based configuration interface
+  - System configuration parameters have been moved to a new, separate `openwebrx.conf` file
+  - Remaining parameters are now editable in the web configuration
+  - Existing `config_webrx.py` files will still be read, but changes made in the web configuration will be written to
+    a new storage system
+  - Added upload of avatar and panorama image via web configuration
+- New devices supported:
+  - HPSDR devices (Hermes Lite 2) thanks to @jancona
+  - BBRF103 / RX666 / RX888 devices supported by libsddc
+  - R&S devices using the EB200 or Ammos protocols
+
+**0.20.3**
+- Fix a compatibility issue with python versions <= 3.6
+
+**0.20.2**
+- Fix a security problem that allowed arbitrary commands to be executed on the receiver
+  ([See github issue #215](https://github.com/jketterl/openwebrx/issues/215))
+
+**0.20.1**
+- Remove broken OSM map fallback
+
+**0.20.0**
+- Added the ability to sign multiple keys in a single request, thus enabling multiple users to claim a single receiver
+  on receiverbook.de
+- Fixed file descriptor leaks to prevent "too many open files" errors
+- Add new demodulator chain for FreeDV
+- Added new HD audio streaming mode along with a new WFM demodulator
+- Reworked AGC code for better results in AM, SSB and digital modes
+- Added support for demodulation of "Digital Radio Mondiale" (DRM) broadcast using the "dream" decoder.
+- New default waterfall color scheme
+- Prototype of a continuous automatic waterfall calibration mode
+- New devices supported:
+  - FunCube Dongle Pro+ (`"type": "fcdpp"`)
+  - Support for connections to rtl_tcp (`"type": "rtl_tcp"`)
+
 **0.19.1**
 - Added ability to authenticate receivers with listing sites using "receiver id" tokens
 

README.md

@@ -11,11 +11,17 @@ It has the following features:
 - filter passband can be set from GUI
 - it extensively uses HTML5 features like WebSocket, Web Audio API, and Canvas
 - it works in Google Chrome, Chromium and Mozilla Firefox
-- currently supports RTL-SDR, HackRF, SDRplay, AirSpy, LimeSDR, PlutoSDR
+- supports a wide range of [SDR hardware](https://github.com/jketterl/openwebrx/wiki/Supported-Hardware#sdr-devices)
 - Multiple SDR devices can be used simultaneously
 - [digiham](https://github.com/jketterl/digiham) based demodularors (DMR, YSF, Pocsag)
 - [dsd](https://github.com/f4exb/dsdcc) based demodulators (D-Star, NXDN)
-- [wsjt-x](https://physics.princeton.edu/pulsar/k1jt/wsjtx.html) based demodulators (FT8, FT4, WSPR, JT65, JT9)
+- [wsjt-x](https://physics.princeton.edu/pulsar/k1jt/wsjtx.html) based demodulators (FT8, FT4, WSPR, JT65, JT9, FST4,
+  FST4W)
+- [direwolf](https://github.com/wb2osz/direwolf) based demodulation of APRS packets
+- [JS8Call](http://js8call.com/) support
+- [DRM](https://github.com/jketterl/openwebrx/wiki/DRM-demodulator-notes) support
+- [FreeDV](https://github.com/jketterl/openwebrx/wiki/FreeDV-demodulator-notes) support
+- M17 support based on [m17-cxx-demod](https://github.com/mobilinkd/m17-cxx-demod)
 
 ## Setup
 
@@ -35,6 +41,9 @@ If you have trouble setting up or configuring your receiver, you have some great
 you just generally want to have some OpenWebRX-related chat, come visit us over on
 [our groups.io group](https://groups.io/g/openwebrx).
 
+If you want to hang out, chat, or get in touch directly with the developers, receiver operators or users, feel free to
+drop by in [our Discord server](https://discord.gg/gnE9hPz).
+
 ## Usage tips
 
 You can zoom the waterfall display by the mouse wheel. You can also drag the waterfall to pan across it.

bands.json

@@ -1,30 +1,54 @@
 [
+  {
+    "name": "2190m",
+    "lower_bound": 135700,
+    "upper_bound": 137800,
+    "frequencies": {
+      "fst4": 136000,
+      "fst4w": 136000
+    },
+    "tags": ["hamradio"]
+  },
+  {
+    "name": "630m",
+    "lower_bound": 472000,
+    "upper_bound": 479000,
+    "frequencies": {
+      "fst4": 474200,
+      "fst4w": 474200
+    },
+    "tags": ["hamradio"]
+  },
   {
     "name": "160m",
     "lower_bound": 1810000,
     "upper_bound": 2000000,
     "frequencies": {
-      "psk31": 1838000,
+      "bpsk31": 1838000,
       "ft8": 1840000,
       "wspr": 1836600,
       "jt65": 1838000,
       "jt9": 1839000,
-      "js8": 1842000
+      "js8": 1842000,
-    }
+      "fst4": 1839000,
+      "fst4w": 1836800
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "80m",
     "lower_bound": 3500000,
     "upper_bound": 3800000,
     "frequencies": {
-      "psk31": 3580000,
+      "bpsk31": 3580000,
       "ft8": 3573000,
       "wspr": 3592600,
       "jt65": 3570000,
       "jt9": 3572000,
       "ft4": [3568000, 3575000],
       "js8": 3578000
-    }
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "60m",
@@ -33,119 +57,129 @@
     "frequencies": {
       "ft8": 5357000,
       "wspr": 5364700
-    }
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "40m",
     "lower_bound": 7000000,
     "upper_bound": 7200000,
     "frequencies": {
-      "psk31": 7040000,
+      "bpsk31": 7040000,
       "ft8": 7074000,
       "wspr": 7038600,
       "jt65": 7076000,
       "jt9": 7078000,
       "ft4": 7047500,
       "js8": 7078000
-    }
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "30m",
     "lower_bound": 10100000,
     "upper_bound": 10150000,
     "frequencies": {
-      "psk31": 10141000,
+      "bpsk31": 10141000,
       "ft8": 10136000,
       "wspr": 10138700,
       "jt65": 10138000,
       "jt9": 10140000,
       "ft4": 10140000,
       "js8": 10130000
-    }
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "20m",
     "lower_bound": 14000000,
     "upper_bound": 14350000,
     "frequencies": {
-      "psk31": 14070000,
+      "bpsk31": 14070000,
       "ft8": 14074000,
       "wspr": 14095600,
       "jt65": 14076000,
       "jt9": 14078000,
       "ft4": 14080000,
       "js8": 14078000
-    }
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "17m",
     "lower_bound": 18068000,
     "upper_bound": 18168000,
     "frequencies": {
-      "psk31": 18098000,
+      "bpsk31": 18098000,
       "ft8": 18100000,
       "wspr": 18104600,
       "jt65": 18102000,
       "jt9": 18104000,
       "ft4": 18104000,
       "js8": 18104000
-    }
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "15m",
     "lower_bound": 21000000,
     "upper_bound": 21450000,
     "frequencies": {
-      "psk31": 21070000,
+      "bpsk31": 21070000,
       "ft8": 21074000,
       "wspr": 21094600,
       "jt65": 21076000,
       "jt9": 21078000,
       "ft4": 21140000,
       "js8": 21078000
-    }
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "12m",
     "lower_bound": 24890000,
     "upper_bound": 24990000,
     "frequencies": {
-      "psk31": 24920000,
+      "bpsk31": 24920000,
       "ft8": 24915000,
       "wspr": 24924600,
       "jt65": 24917000,
       "jt9": 24919000,
       "ft4": 24919000,
       "js8": 24922000
-    }
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "10m",
     "lower_bound": 28000000,
     "upper_bound": 29700000,
     "frequencies": {
-      "psk31": [28070000, 28120000],
+      "bpsk31": [28070000, 28120000],
       "ft8": 28074000,
       "wspr": 28124600,
       "jt65": 28076000,
       "jt9": 28078000,
       "ft4": 28180000,
       "js8": 28078000
-    }
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "6m",
     "lower_bound": 50030000,
     "upper_bound": 51000000,
     "frequencies": {
-      "psk31": 50305000,
+      "bpsk31": 50305000,
       "ft8": 50313000,
       "wspr": 50293000,
       "jt65": 50310000,
       "jt9": 50312000,
       "ft4": 50318000,
-      "js8": 50318000
+      "js8": 50318000,
-    }
+      "q65": [50211000, 50275000]
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "4m",
@@ -153,7 +187,8 @@
     "upper_bound": 70200000,
     "frequencies": {
       "wspr": 70091000
-    }
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "2m",
@@ -164,110 +199,169 @@
       "ft8": 144174000,
       "ft4": 144170000,
       "jt65": 144120000,
-      "packet": 144800000
+      "packet": 144800000,
-    }
+      "q65": 144116000
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "70cm",
     "lower_bound": 430000000,
     "upper_bound": 440000000,
     "frequencies": {
-      "pocsag": 439987500
+      "pocsag": 439987500,
-    }
+      "q65": 432065000
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "23cm",
     "lower_bound": 1240000000,
-    "upper_bound": 1300000000
+    "upper_bound": 1300000000,
+    "frequencies": {
+      "q65": 1296065000
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "13cm",
     "lower_bound": 2320000000,
-    "upper_bound": 2450000000
+    "upper_bound": 2450000000,
+    "frequencies": {
+      "q65": [2301065000, 2304065000, 2320065000]
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "9cm",
     "lower_bound": 3400000000,
-    "upper_bound": 3475000000
+    "upper_bound": 3475000000,
+    "frequencies": {
+      "q65": 3400065000
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "6cm",
     "lower_bound": 5650000000,
-    "upper_bound": 5850000000
+    "upper_bound": 5850000000,
+    "frequencies": {
+      "q65": 5760200000
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "3cm",
     "lower_bound": 10000000000,
-    "upper_bound": 10500000000
+    "upper_bound": 10500000000,
+    "frequencies": {
+      "q65": 10368200000
+    },
+    "tags": ["hamradio"]
   },
   {
     "name": "120m Broadcast",
     "lower_bound": 2300000,
-    "upper_bound": 2495000
+    "upper_bound": 2495000,
+    "tags": ["broadcast"]
   },
   {
     "name": "90m Broadcast",
     "lower_bound": 3200000,
-    "upper_bound": 3400000
+    "upper_bound": 3400000,
+    "tags": ["broadcast"]
   },
   {
     "name": "75m Broadcast",
     "lower_bound": 3900000,
-    "upper_bound": 4000000
+    "upper_bound": 4000000,
+    "tags": ["broadcast"]
   },
   {
     "name": "60m Broadcast",
     "lower_bound": 4750000,
-    "upper_bound": 4995000
+    "upper_bound": 4995000,
+    "tags": ["broadcast"]
   },
   {
     "name": "49m Broadcast",
     "lower_bound": 5900000,
-    "upper_bound": 6200000
+    "upper_bound": 6200000,
+    "tags": ["broadcast"]
   },
   {
     "name": "41m Broadcast",
     "lower_bound": 7200000,
-    "upper_bound": 7450000
+    "upper_bound": 7450000,
+    "tags": ["broadcast"]
   },
   {
     "name": "31m Broadcast",
     "lower_bound": 9400000,
-    "upper_bound": 9900000
+    "upper_bound": 9900000,
+    "tags": ["broadcast"]
   },
   {
     "name": "25m Broadcast",
     "lower_bound": 11600000,
-    "upper_bound": 12100000
+    "upper_bound": 12100000,
+    "tags": ["broadcast"]
   },
   {
     "name": "22m Broadcast",
     "lower_bound": 13570000,
-    "upper_bound": 13870000
+    "upper_bound": 13870000,
+    "tags": ["broadcast"]
   },
   {
     "name": "19m Broadcast",
     "lower_bound": 15100000,
-    "upper_bound": 15830000
+    "upper_bound": 15830000,
+    "tags": ["broadcast"]
   },
   {
     "name": "16m Broadcast",
     "lower_bound": 17480000,
-    "upper_bound": 17900000
+    "upper_bound": 17900000,
+    "tags": ["broadcast"]
   },
   {
     "name": "15m Broadcast",
     "lower_bound": 18900000,
-    "upper_bound": 19020000
+    "upper_bound": 19020000,
+    "tags": ["broadcast"]
   },
   {
     "name": "13m Broadcast",
     "lower_bound": 21450000,
-    "upper_bound": 21850000
+    "upper_bound": 21850000,
+    "tags": ["broadcast"]
   },
   {
     "name": "11m Broadcast",
     "lower_bound": 25670000,
-    "upper_bound": 26100000
+    "upper_bound": 26100000,
+    "tags": ["broadcast"]
+  },
+  {
+    "name": "FM Broadcast",
+    "lower_bound": 87500000,
+    "upper_bound": 108000000,
+    "tags": ["broadcast"]
+  },
+  {
+    "name": "11m CB",
+    "lower_bound": 26965000,
+    "upper_bound": 27405000,
+    "frequencies": {
+      "js8": 27245000
+    },
+    "tags": ["public"]
+  },
+  {
+    "name": "PMR446",
+    "lower_bound": 446000000,
+    "upper_bound": 446200000,
+    "tags": ["public"]
   }
 ]

bookmarks.json

@@ -1,217 +0,0 @@
-[
-  {
-    "name": "DB0ZU",
-    "frequency": 145725000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0ZM",
-    "frequency": 145750000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DM0ULR",
-    "frequency": 145787500,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0EL",
-    "frequency": 439275000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0NJ",
-    "frequency": 438775000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0NJ",
-    "frequency": 439437500,
-    "modulation": "dmr"
-  },
-  {
-    "name": "DB0UFO",
-    "frequency": 438312500,
-    "modulation": "dmr"
-  },
-  {
-    "name": "DB0PV",
-    "frequency": 438525000,
-    "modulation": "ysf"
-  },
-  {
-    "name": "DB0BZA",
-    "frequency": 438412500,
-    "modulation": "ysf"
-  },
-  {
-    "name": "DB0OSH",
-    "frequency": 438250000,
-    "modulation": "ysf"
-  },
-  {
-    "name": "DB0ULR",
-    "frequency": 439325000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0ZU",
-    "frequency": 438850000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0ISW",
-    "frequency": 438650000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "Radio DARC",
-    "frequency": 6070000,
-    "modulation": "am"
-  },
-  {
-    "name": "DB0TVM",
-    "frequency": 439575000,
-    "modulation": "dstar"
-  },
-  {
-    "name": "DB0TVM",
-    "frequency": 439800000,
-    "modulation": "dmr"
-  },
-  {
-    "name": "DB0TR",
-    "frequency": 438700000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0PME",
-    "frequency": 439825000,
-    "modulation": "dmr"
-  },
-  {
-    "name": "DB0HKN",
-    "frequency": 438300000,
-    "modulation": "dmr"
-  },
-  {
-    "name": "OE2XHM",
-    "frequency": 438825000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DM0WW",
-    "frequency": 438962500,
-    "modulation": "dmr"
-  },
-  {
-    "name": "OE7XXR",
-    "frequency": 438200000,
-    "modulation": "dstar"
-  },
-  {
-    "name": "OE2XZR",
-    "frequency": 439000000,
-    "modulation": "dstar"
-  },
-  {
-    "name": "DB0OAL",
-    "frequency": 439912500,
-    "modulation": "dmr"
-  },
-  {
-    "name": "DB0AAT",
-    "frequency": 439550000,
-    "modulation": "dmr"
-  },
-  {
-    "name": "DB0FSG",
-    "frequency": 439937500,
-    "modulation": "dmr"
-  },
-  {
-    "name": "DB0ULR",
-    "frequency": 145575000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0RDH",
-    "frequency": 145737500,
-    "modulation": "dstar"
-  },
-  {
-    "name": "DM0GAP",
-    "frequency": 145612500,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0XF",
-    "frequency": 145600000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0TOL",
-    "frequency": 145712500,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0TTB",
-    "frequency": 439587500,
-    "modulation": "dmr"
-  },
-  {
-    "name": "DB0TRS",
-    "frequency": 439125000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0OAL",
-    "frequency": 438937500,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DM0ULR",
-    "frequency": 439337500,
-    "modulation": "nxdn"
-  },
-  {
-    "name": "DB0MIR",
-    "frequency": 439300000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0PM",
-    "frequency": 439075000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0CP",
-    "frequency": 439025000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "OE7XGR",
-    "frequency": 438925000,
-    "modulation": "dmr"
-  },
-  {
-    "name": "DB0TOL",
-    "frequency": 438725000,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0OAL",
-    "frequency": 438325000,
-    "modulation": "dstar"
-  },
-  {
-    "name": "DB0ROL",
-    "frequency": 439237500,
-    "modulation": "nfm"
-  },
-  {
-    "name": "DB0ABX",
-    "frequency": 439137500,
-    "modulation": "nfm"
-  }
-]

build.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-set -euxo pipefail
-. docker/env
-
-docker build --pull -t openwebrx-base:$ARCHTAG -f docker/Dockerfiles/Dockerfile-base .
-docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-rtlsdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-rtlsdr .
-docker build --build-arg ARCHTAG=$ARCHTAG -t openwebrx-soapysdr-base:$ARCHTAG -f docker/Dockerfiles/Dockerfile-soapysdr .
-docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-sdrplay:$ARCHTAG -f docker/Dockerfiles/Dockerfile-sdrplay .
-docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-hackrf:$ARCHTAG -f docker/Dockerfiles/Dockerfile-hackrf .
-docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-airspy:$ARCHTAG -f docker/Dockerfiles/Dockerfile-airspy .
-docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-rtlsdr-soapy:$ARCHTAG -f docker/Dockerfiles/Dockerfile-rtlsdr-soapy .
-docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-plutosdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-plutosdr .
-docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-limesdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-limesdr .
-docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-soapyremote:$ARCHTAG -f docker/Dockerfiles/Dockerfile-soapyremote .
-docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-perseus:$ARCHTAG -f docker/Dockerfiles/Dockerfile-perseus .
-docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-full:$ARCHTAG -t jketterl/openwebrx:$ARCHTAG -f docker/Dockerfiles/Dockerfile-full .

config_webrx.py

@@ -6,7 +6,7 @@ config_webrx: configuration options for OpenWebRX
     This file is part of OpenWebRX,
     an open-source SDR receiver software with a web UI.
     Copyright (c) 2013-2015 by Andras Retzler <randras@sdr.hu>
-    Copyright (c) 2019-2020 by Jakob Ketterl <dd5jfk@darc.de>
+    Copyright (c) 2019-2021 by Jakob Ketterl <dd5jfk@darc.de>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as
@@ -32,32 +32,45 @@ config_webrx: configuration options for OpenWebRX
     and use them for running your web service with OpenWebRX.)
 """
 
+"""
+DEPRECATION notice
+
+As of OpenWebRX 0.21, the configuration system has been completely overhauled.
+The configuration of OpenWebRX should now be done in the new web-based
+configuration interface exclusively.
+
+Existing configurations can still be used, but their values will be migrated
+to the new storage infrastructure as soon as the web configuration is used to
+edit them.
+
+The new configuration storage is not intended to be edited manually.
+"""
+
 # configuration version. please only modify if you're able to perform the associated migration steps.
-version = 2
+version = 7
 
 # NOTE: you can find additional information about configuring OpenWebRX in the Wiki:
 # https://github.com/jketterl/openwebrx/wiki/Configuration-guide
 
 # ==== Server settings ====
-web_port = 8073
+#max_clients = 20
-max_clients = 20
 
 # ==== Web GUI configuration ====
-receiver_name = "[Callsign]"
+#receiver_name = "[Callsign]"
-receiver_location = "Budapest, Hungary"
+#receiver_location = "Budapest, Hungary"
-receiver_asl = 200
+#receiver_asl = 200
-receiver_admin = "example@example.com"
+#receiver_admin = "example@example.com"
-receiver_gps = {"lat": 47.000000, "lon": 19.000000}
+#receiver_gps = {"lat": 47.000000, "lon": 19.000000}
-photo_title = "Panorama of Budapest from Schönherz Zoltán Dormitory"
+#photo_title = "Panorama of Budapest from Schönherz Zoltán Dormitory"
 # photo_desc allows you to put pretty much any HTML you like into the receiver description.
 # The lines below should give you some examples of what's possible.
-photo_desc = """
+#photo_desc = """
-You can add your own background photo and receiver information.<br />
+#You can add your own background photo and receiver information.<br />
-Receiver is operated by: <a href="mailto:openwebrx@localhost" target="_blank">Receiver Operator</a><br/>
+#Receiver is operated by: <a href="mailto:openwebrx@localhost" target="_blank">Receiver Operator</a><br/>
-Device: Receiver Device<br />
+#Device: Receiver Device<br />
-Antenna: Receiver Antenna<br />
+#Antenna: Receiver Antenna<br />
-Website: <a href="http://localhost" target="_blank">http://localhost</a>
+#Website: <a href="http://localhost" target="_blank">http://localhost</a>
-"""
+#"""
 
 # ==== Public receiver listings ====
 # You can publish your receiver on online receiver directories, like https://www.receiverbook.de
@@ -65,7 +78,7 @@ Website: <a href="http://localhost" target="_blank">http://localhost</a>
 # Please note that you not share your receiver keys publicly since anyone that obtains your receiver key can take over
 # your public listing.
 # Your receiver keys should be placed into this array:
-receiver_keys = []
+#receiver_keys = []
 # If you list your receiver on multiple sites, you can place all your keys into the array above, or you can append
 # keys to the arraylike this:
 # receiver_keys += ["my-receiver-key"]
@@ -73,26 +86,32 @@ receiver_keys = []
 # If you're not sure, simply copy & paste the code you received from your listing site below this line:
 
 # ==== DSP/RX settings ====
-fft_fps = 9
+#fft_fps = 9
-fft_size = 4096  # Should be power of 2
+#fft_size = 4096  # Should be power of 2
-fft_voverlap_factor = (
+#fft_voverlap_factor = (
-    0.3  # If fft_voverlap_factor is above 0, multiple FFTs will be used for creating a line on the diagram.
+#    0.3  # If fft_voverlap_factor is above 0, multiple FFTs will be used for creating a line on the diagram.
-)
+#)
 
-audio_compression = "adpcm"  # valid values: "adpcm", "none"
+#audio_compression = "adpcm"  # valid values: "adpcm", "none"
-fft_compression = "adpcm"  # valid values: "adpcm", "none"
+#fft_compression = "adpcm"  # valid values: "adpcm", "none"
 
-digimodes_enable = True  # Decoding digimodes come with higher CPU usage.
+# Tau setting for WFM (broadcast FM) deemphasis\
-digimodes_fft_size = 1024
+# Quote from wikipedia https://en.wikipedia.org/wiki/FM_broadcasting#Pre-emphasis_and_de-emphasis
+# "In most of the world a 50 µs time constant is used. In the Americas and South Korea, 75 µs is used"
+# Enable one of the following lines, depending on your location:
+# wfm_deemphasis_tau = 75e-6  # for US and South Korea
+#wfm_deemphasis_tau = 50e-6  # for the rest of the world
+
+#digimodes_fft_size = 2048
 
 # determines the quality, and thus the cpu usage, for the ambe codec used by digital voice modes
 # if you're running on a Raspi (up to 3B+) you'll want to leave this on 1
-digital_voice_unvoiced_quality = 1
+#digital_voice_unvoiced_quality = 1
 # enables lookup of DMR ids using the radioid api
-digital_voice_dmr_id_lookup = True
+#digital_voice_dmr_id_lookup = True
 
 """
-Note: if you experience audio underruns while CPU usage is 100%, you can: 
+Note: if you experience audio underruns while CPU usage is 100%, you can:
 - decrease `samp_rate`,
 - set `fft_voverlap_factor` to 0,
 - decrease `fft_fps` and `fft_size`,
@@ -109,227 +128,262 @@ Note: if you experience audio underruns while CPU usage is 100%, you can:
 
 # Currently supported types of sdr receivers:
 # "rtl_sdr", "rtl_sdr_soapy", "sdrplay", "hackrf", "airspy", "airspyhf", "fifi_sdr",
-# "perseussdr", "lime_sdr", "pluto_sdr", "soapy_remote"
+# "perseussdr", "lime_sdr", "pluto_sdr", "soapy_remote", "hpsdr", "uhd",
-#
+# "radioberry", "fcdpp", "rtl_tcp", "sddc", "runds"
-# In order to use rtl_sdr, you will need to install librtlsdr-dev and the connector.
-# In order to use sdrplay, airspy or airspyhf, you will need to install soapysdr, the corresponding driver, and the
-# connector.
-#
-# https://github.com/jketterl/owrx_connector
-#
-# In order to use Perseus HF you need to install the libperseus-sdr
-#
-# https://github.com/Microtelecom/libperseus-sdr
-#
-# and do the proper changes to the sdrs object below
-# (see also Wiki in https://github.com/jketterl/openwebrx/wiki/Sample-configuration-for-Perseus-HF-receiver).
-#
 
-sdrs = {
+# For more details on specific types, please checkout the wiki:
-    "rtlsdr": {
+# https://github.com/jketterl/openwebrx/wiki/Supported-Hardware#sdr-devices
-        "name": "RTL-SDR USB Stick",
+
-        "type": "rtl_sdr",
+#sdrs = {
-        "ppm": 0,
+#    "rtlsdr": {
-        # you can change this if you use an upconverter. formula is:
+#        "name": "RTL-SDR USB Stick",
-        # center_freq + lfo_offset = actual frequency on the sdr
+#        "type": "rtl_sdr",
-        # "lfo_offset": 0,
+#        "ppm": 0,
-        "profiles": {
+#        # you can change this if you use an upconverter. formula is:
-            "70cm": {
+#        # center_freq + lfo_offset = actual frequency on the sdr
-                "name": "70cm Relais",
+#        # "lfo_offset": 0,
-                "center_freq": 438800000,
+#        "profiles": {
-                "rf_gain": 30,
+#            "70cm": {
-                "samp_rate": 2400000,
+#                "name": "70cm Relais",
-                "start_freq": 439275000,
+#                "center_freq": 438800000,
-                "start_mod": "nfm",
+#                "rf_gain": 29,
-            },
+#                "samp_rate": 2400000,
-            "2m": {
+#                "start_freq": 439275000,
-                "name": "2m komplett",
+#                "start_mod": "nfm",
-                "center_freq": 145000000,
+#            },
-                "rf_gain": 30,
+#            "2m": {
-                "samp_rate": 2400000,
+#                "name": "2m komplett",
-                "start_freq": 145725000,
+#                "center_freq": 145000000,
-                "start_mod": "nfm",
+#                "rf_gain": 29,
-            },
+#                "samp_rate": 2048000,
-        },
+#                "start_freq": 145725000,
-    },
+#                "start_mod": "nfm",
-    "airspy": {
+#            },
-        "name": "Airspy HF+",
+#        },
-        "type": "airspyhf",
+#    },
-        "ppm": 0,
+#    "airspy": {
-        "rf_gain": "auto",
+#        "name": "Airspy HF+",
-        "profiles": {
+#        "type": "airspyhf",
-            "20m": {
+#        "ppm": 0,
-                "name": "20m",
+#        "rf_gain": "auto",
-                "center_freq": 14150000,
+#        "profiles": {
-                "samp_rate": 384000,
+#            "20m": {
-                "start_freq": 14070000,
+#                "name": "20m",
-                "start_mod": "usb",
+#                "center_freq": 14150000,
-            },
+#                "samp_rate": 384000,
-            "30m": {
+#                "start_freq": 14070000,
-                "name": "30m",
+#                "start_mod": "usb",
-                "center_freq": 10125000,
+#            },
-                "samp_rate": 192000,
+#            "30m": {
-                "start_freq": 10142000,
+#                "name": "30m",
-                "start_mod": "usb",
+#                "center_freq": 10125000,
-            },
+#                "samp_rate": 192000,
-            "40m": {
+#                "start_freq": 10142000,
-                "name": "40m",
+#                "start_mod": "usb",
-                "center_freq": 7100000,
+#            },
-                "samp_rate": 256000,
+#            "40m": {
-                "start_freq": 7070000,
+#                "name": "40m",
-                "start_mod": "lsb",
+#                "center_freq": 7100000,
-            },
+#                "samp_rate": 256000,
-            "80m": {
+#                "start_freq": 7070000,
-                "name": "80m",
+#                "start_mod": "lsb",
-                "center_freq": 3650000,
+#            },
-                "samp_rate": 384000,
+#            "80m": {
-                "start_freq": 3570000,
+#                "name": "80m",
-                "start_mod": "lsb",
+#                "center_freq": 3650000,
-            },
+#                "samp_rate": 384000,
-            "49m": {
+#                "start_freq": 3570000,
-                "name": "49m Broadcast",
+#                "start_mod": "lsb",
-                "center_freq": 6050000,
+#            },
-                "samp_rate": 384000,
+#            "49m": {
-                "start_freq": 6070000,
+#                "name": "49m Broadcast",
-                "start_mod": "am",
+#                "center_freq": 6050000,
-            },
+#                "samp_rate": 384000,
-        },
+#                "start_freq": 6070000,
-    },
+#                "start_mod": "am",
-    "sdrplay": {
+#            },
-        "name": "SDRPlay RSP2",
+#        },
-        "type": "sdrplay",
+#    },
-        "ppm": 0,
+#    "sdrplay": {
-        "antenna": "Antenna A",
+#        "name": "SDRPlay RSP2",
-        "profiles": {
+#        "type": "sdrplay",
-            "20m": {
+#        "ppm": 0,
-                "name": "20m",
+#        "antenna": "Antenna A",
-                "center_freq": 14150000,
+#        "profiles": {
-                "rf_gain": 0,
+#            "20m": {
-                "samp_rate": 500000,
+#                "name": "20m",
-                "start_freq": 14070000,
+#                "center_freq": 14150000,
-                "start_mod": "usb",
+#                "rf_gain": 0,
-            },
+#                "samp_rate": 500000,
-            "30m": {
+#                "start_freq": 14070000,
-                "name": "30m",
+#                "start_mod": "usb",
-                "center_freq": 10125000,
+#            },
-                "rf_gain": 0,
+#            "30m": {
-                "samp_rate": 250000,
+#                "name": "30m",
-                "start_freq": 10142000,
+#                "center_freq": 10125000,
-                "start_mod": "usb",
+#                "rf_gain": 0,
-            },
+#                "samp_rate": 250000,
-            "40m": {
+#                "start_freq": 10142000,
-                "name": "40m",
+#                "start_mod": "usb",
-                "center_freq": 7100000,
+#            },
-                "rf_gain": 0,
+#            "40m": {
-                "samp_rate": 500000,
+#                "name": "40m",
-                "start_freq": 7070000,
+#                "center_freq": 7100000,
-                "start_mod": "lsb",
+#                "rf_gain": 0,
-            },
+#                "samp_rate": 500000,
-            "80m": {
+#                "start_freq": 7070000,
-                "name": "80m",
+#                "start_mod": "lsb",
-                "center_freq": 3650000,
+#            },
-                "rf_gain": 0,
+#            "80m": {
-                "samp_rate": 500000,
+#                "name": "80m",
-                "start_freq": 3570000,
+#                "center_freq": 3650000,
-                "start_mod": "lsb",
+#                "rf_gain": 0,
-            },
+#                "samp_rate": 500000,
-            "49m": {
+#                "start_freq": 3570000,
-                "name": "49m Broadcast",
+#                "start_mod": "lsb",
-                "center_freq": 6000000,
+#            },
-                "rf_gain": 0,
+#            "49m": {
-                "samp_rate": 500000,
+#                "name": "49m Broadcast",
-                "start_freq": 6070000,
+#                "center_freq": 6000000,
-                "start_mod": "am",
+#                "rf_gain": 0,
-            },
+#                "samp_rate": 500000,
-        },
+#                "start_freq": 6070000,
-    },
+#                "start_mod": "am",
-}
+#            },
+#        },
+#    },
+#}
 
 # ==== Color themes ====
 
-# A guide is available to help you set these values: https://github.com/simonyiszk/openwebrx/wiki/Calibrating-waterfall-display-levels
+### google turbo colormap (see: https://ai.googleblog.com/2019/08/turbo-improved-rainbow-colormap-for.html)
+#waterfall_scheme = "GoogleTurboWaterfall"
+
+### original theme by teejez:
+#waterfall_scheme = "TeejeezWaterfall"
 
-### default theme by teejez:
-waterfall_colors = [0x000000FF, 0x0000FFFF, 0x00FFFFFF, 0x00FF00FF, 0xFFFF00FF, 0xFF0000FF, 0xFF00FFFF, 0xFFFFFFFF]
-waterfall_min_level = -88  # in dB
-waterfall_max_level = -20
-waterfall_auto_level_margin = {"min": 5, "max": 40}
 ### old theme by HA7ILM:
-# waterfall_colors = "[0x000000ff,0x2e6893ff, 0x69a5d0ff, 0x214b69ff, 0x9dc4e0ff,  0xfff775ff, 0xff8a8aff, 0xb20000ff]"
+#waterfall_scheme = "Ha7ilmWaterfall"
-# waterfall_min_level = -115 #in dB
-# waterfall_max_level = 0
-# waterfall_auto_level_margin = {"min": 20, "max": 30}
 ##For the old colors, you might also want to set [fft_voverlap_factor] to 0.
 
+### custom waterfall schemes can be configured like this:
+#waterfall_scheme = "CustomWaterfall"
+#waterfall_colors = [0x0000FF, 0x00FF00, 0xFF0000]
+
+### Waterfall calibration
+#waterfall_levels = {"min": -88, "max": -20}  # in dB
+
+#waterfall_auto_levels = {"min": 3, "max": 10}
+#waterfall_auto_min_range = 50
+
 # Note: When the auto waterfall level button is clicked, the following happens:
-#   [waterfall_min_level] = [current_min_power_level] - [waterfall_auto_level_margin["min"]]
+#   [waterfall_levels.min] = [current_min_power_level] - [waterfall_auto_levels["min"]]
-#   [waterfall_max_level] = [current_max_power_level] + [waterfall_auto_level_margin["max"]]
+#   [waterfall_levels.max] = [current_max_power_level] + [waterfall_auto_levels["max"]]
 #
-#   ___|________________________________________|____________________________________|________________________________________|___> signal power
+#   ___|__________________________________|____________________________________|__________________________________|___> signal power
-#        \_waterfall_auto_level_margin["min"]_/ |__ current_min_power_level          | \_waterfall_auto_level_margin["max"]_/
+#        \_waterfall_auto_levels["min"]_/ |__ current_min_power_level          | \_waterfall_auto_levels["max"]_/
-#                                                          current_max_power_level __|
+#                                                    current_max_power_level __|
 
-# === Experimental settings ===
+# This setting allows you to modify the precision of the frequency displays in OpenWebRX.
-# Warning! The settings below are very experimental.
+# Set this to exponent of 10 to select the most precise digit in Hz you'd like to see
-csdr_dynamic_bufsize = False  # This allows you to change the buffering mode of csdr.
+# examples:
-csdr_print_bufsizes = False  # This prints the buffer sizes used for csdr processes.
+# a value of 2 selects 10^2 = 100Hz tuning precision (default):
-csdr_through = False  # Setting this True will print out how much data is going into the DSP chains.
+#tuning_precision = 2
+# a value of 1 selects 10^1 = 10Hz tuning precision:
+#tuning_precision = 1
 
-nmux_memory = 50  # in megabytes. This sets the approximate size of the circular buffer used by nmux.
+# This setting tells the auto-squelch the offset to add to the current signal level to use as the new squelch level.
+# Lowering this setting will give you a more sensitive squelch, but it may also cause unwanted squelch openings when
+# using the auto squelch.
+#squelch_auto_margin = 10  # in dB
 
-google_maps_api_key = ""
+#google_maps_api_key = ""
 
 # how long should positions be visible on the map?
 # they will start fading out after half of that
 # in seconds; default: 2 hours
-map_position_retention_time = 2 * 60 * 60
+#map_position_retention_time = 2 * 60 * 60
 
 # decoder queue configuration
 # due to the nature of some operating modes (ft8, ft8, jt9, jt65, wspr and js8), the data is recorded for a given amount
 # of time (6 seconds up to 2 minutes) and decoded at the end. this can lead to very high peak loads.
 # to mitigate this, the recordings will be queued and processed in sequence.
 # the number of workers will limit the total amount of work (one worker will losely occupy one cpu / thread)
-decoding_queue_workers = 2
+#decoding_queue_workers = 2
 # the maximum queue length will cause decodes to be dumped if the workers cannot keep up
 # if you are running background services, make sure this number is high enough to accept the task influx during peaks
 # i.e. this should be higher than the number of decoding services running at the same time
-decoding_queue_length = 10
+#decoding_queue_length = 10
 
 # wsjt decoding depth will allow more results, but will also consume more cpu
-wsjt_decoding_depth = 3
+#wsjt_decoding_depth = 3
 # can also be set for each mode separately
 # jt65 seems to be somewhat prone to erroneous decodes, this setting handles that to some extent
-wsjt_decoding_depths = {"jt65": 1}
+#wsjt_decoding_depths = {"jt65": 1}
+
+# FST4 can be transmitted in different intervals. This setting determines which intervals will be decoded.
+# available values (in seconds): 15, 30, 60, 120, 300, 900, 1800
+#fst4_enabled_intervals = [15, 30]
+
+# FST4W can be transmitted in different intervals. This setting determines which intervals will be decoded.
+# available values (in seconds): 120, 300, 900, 1800
+#fst4w_enabled_intervals = [120, 300]
+
+# Q65 allows many combinations of intervals and submodes. This setting determines which combinations will be decoded.
+# Please use the mode letter followed by the decode interval in seconds to specify the combinations. For example:
+#q65_enabled_combinations = ["A30", "E120", "C60"]
 
 # JS8 comes in different speeds: normal, slow, fast, turbo. This setting controls which ones are enabled.
-js8_enabled_profiles = ["normal", "slow"]
+#js8_enabled_profiles = ["normal", "slow"]
 # JS8 decoding depth; higher value will get more results, but will also consume more cpu
-js8_decoding_depth = 3
+#js8_decoding_depth = 3
 
-temporary_directory = "/tmp"
+# Enable background service for decoding digital data. You can find more information at:
-
+# https://github.com/jketterl/openwebrx/wiki/Background-decoding
-services_enabled = False
+#services_enabled = False
-services_decoders = ["ft8", "ft4", "wspr", "packet"]
+#services_decoders = ["ft8", "ft4", "wspr", "packet"]
 
 # === aprs igate settings ===
-# if you want to share your APRS decodes with the aprs network, configure these settings accordingly
+# If you want to share your APRS decodes with the aprs network, configure these settings accordingly.
-aprs_callsign = "N0CALL"
+# Make sure that you have set services_enabled to true and customize services_decoders to your needs.
-aprs_igate_enabled = False
+#aprs_callsign = "N0CALL"
-aprs_igate_server = "euro.aprs2.net"
+#aprs_igate_enabled = False
-aprs_igate_password = ""
+#aprs_igate_server = "euro.aprs2.net"
+#aprs_igate_password = ""
 # beacon uses the receiver_gps setting, so if you enable this, make sure the location is correct there
-aprs_igate_beacon = False
+#aprs_igate_beacon = False
 
-# path to the aprs symbols repository (get it here: https://github.com/hessu/aprs-symbols)
+# Uncomment the following to customize gateway beacon details reported to the aprs network
-aprs_symbols_path = "/opt/aprs-symbols/png"
+#   Plese see Dire Wolf's documentation on PBEACON configuration for complete details:
+#   https://github.com/wb2osz/direwolf/raw/master/doc/User-Guide.pdf 
 
-# === PSK Reporter setting ===
+# Symbol in its two-character form as specified by the APRS spec at http://www.aprs.org/symbols/symbols-new.txt
+#   Default: Receive only IGate (do not send msgs back to RF)  
+# aprs_igate_symbol = "R&"
+
+# Custom comment about igate 
+#   Default: OpenWebRX APRS gateway
+# aprs_igate_comment = "OpenWebRX APRS gateway"
+
+# Antenna Height and Gain details
+#   Unspecified by default
+# Antenna height above average terrain (HAAT) in meters 
+# aprs_igate_height = "5"
+# Antenna gain in dBi
+# aprs_igate_gain = "0"
+# Antenna direction (N, NE, E, SE, S, SW, W, NW).  Omnidirectional by default
+# aprs_igate_dir = "NE"
+
+# === PSK Reporter settings ===
 # enable this if you want to upload all ft8, ft4 etc spots to pskreporter.info
 # this also uses the receiver_gps setting from above, so make sure it contains a correct locator
-pskreporter_enabled = False
+#pskreporter_enabled = False
-pskreporter_callsign = "N0CALL"
+#pskreporter_callsign = "N0CALL"
+# optional antenna information, uncomment to enable
+#pskreporter_antenna_information = "Dipole"
 
-# === Web admin settings ===
+# === WSPRNet reporting settings
-# this feature is experimental at the moment. it should not be enabled on shared receivers since it allows remote
+# enable this if you want to upload WSPR spots to wsprnet.ort
-# changes to the receiver settings. enable for testing in controlled environment only.
+# in addition to these settings also make sure that receiver_gps contains your correct location
-# webadmin_enabled = False
+#wsprnet_enabled = False
+#wsprnet_callsign = "N0CALL"

csdr/__init__.py

@@ -4,7 +4,7 @@ OpenWebRX csdr plugin: do the signal processing with csdr
     This file is part of OpenWebRX,
     an open-source SDR receiver software with a web UI.
     Copyright (c) 2013-2015 by Andras Retzler <randras@sdr.hu>
-    Copyright (c) 2019-2020 by Jakob Ketterl <dd5jfk@darc.de>
+    Copyright (c) 2019-2021 by Jakob Ketterl <dd5jfk@darc.de>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as
@@ -28,140 +28,23 @@ import threading
 import math
 from functools import partial
 
-from owrx.kiss import KissClient, DirewolfConfig
+from csdr.output import Output
-from owrx.wsjt import Ft8Profile, WsprProfile, Jt9Profile, Jt65Profile, Ft4Profile
+
-from owrx.js8 import Js8Profiles
+from owrx.kiss import KissClient, DirewolfConfig, DirewolfConfigSubscriber
-from owrx.audio import AudioChopper
+from owrx.audio.chopper import AudioChopper
+
+from csdr.pipe import Pipe
 
 import logging
 
 logger = logging.getLogger(__name__)
 
 
-class output(object):
+class Dsp(DirewolfConfigSubscriber):
-    def send_output(self, t, read_fn):
+    def __init__(self, output: Output):
-        if not self.supports_type(t):
-            # TODO rewrite the output mechanism in a way that avoids producing unnecessary data
-            logger.warning("dumping output of type %s since it is not supported.", t)
-            threading.Thread(target=self.pump(read_fn, lambda x: None)).start()
-            return
-        self.receive_output(t, read_fn)
-
-    def receive_output(self, t, read_fn):
-        pass
-
-    def pump(self, read, write):
-        def copy():
-            run = True
-            while run:
-                data = read()
-                if data is None or (isinstance(data, bytes) and len(data) == 0):
-                    run = False
-                else:
-                    write(data)
-
-        return copy
-
-    def supports_type(self, t):
-        return True
-
-
-class Pipe(object):
-    READ = "r"
-    WRITE = "w"
-    NONE = None
-
-    @staticmethod
-    def create(path, t, encoding=None):
-        if t == Pipe.READ:
-            return ReadingPipe(path, encoding=encoding)
-        elif t == Pipe.WRITE:
-            return WritingPipe(path, encoding=encoding)
-        elif t == Pipe.NONE:
-            return Pipe(path, None, encoding=encoding)
-
-    def __init__(self, path, direction, encoding=None):
-        self.path = path
-        self.direction = direction
-        self.encoding = encoding
-        self.file = None
-        try:
-            os.unlink(path)
-        except Exception:
-            pass
-        os.mkfifo(path)
-
-    def open(self):
-        self.file = open(self.path, self.direction, encoding=self.encoding)
-
-    def close(self):
-        if self.file is None:
-            return
-        try:
-            self.file.close()
-            os.unlink(self.path)
-        except FileNotFoundError:
-            # it seems like we keep calling this twice. no idea why, but we don't need the resulting error.
-            pass
-        except Exception:
-            logger.exception("Pipe.close()")
-
-    def __str__(self):
-        return self.path
-
-
-class WritingPipe(Pipe):
-    def __init__(self, path, encoding=None):
-        self.queue = []
-        self.queueLock = threading.Lock()
-        super().__init__(path, "w", encoding=encoding)
-        self.open()
-
-    def open_and_dequeue(self):
-        super().open()
-        with self.queueLock:
-            for i in self.queue:
-                self.file.write(i)
-            self.file.flush()
-            self.queue = None
-
-    def open(self):
-        threading.Thread(target=self.open_and_dequeue).start()
-
-    def write(self, data):
-        if self.file is None:
-            with self.queueLock:
-                self.queue.append(data)
-            return
-        r = self.file.write(data)
-        self.file.flush()
-        return r
-
-    def close(self):
-        if self.file is None:
-            logger.warning("queue %s never successfully opened - thread leak!", self.path)
-        super().close()
-
-
-class ReadingPipe(Pipe):
-    def __init__(self, path, encoding=None):
-        super().__init__(path, "r", encoding=encoding)
-
-    def read(self):
-        if self.file is None:
-            self.open()
-        return self.file.read()
-
-    def readline(self):
-        if self.file is None:
-            self.open()
-        return self.file.readline()
-
-
-class dsp(object):
-    def __init__(self, output):
         self.samp_rate = 250000
         self.output_rate = 11025
+        self.hd_output_rate = 44100
         self.fft_size = 1024
         self.fft_fps = 5
         self.center_freq = 0
@@ -180,11 +63,9 @@ class dsp(object):
         self.decimation = None
         self.last_decimation = None
         self.nc_port = None
-        self.csdr_dynamic_bufsize = False
-        self.csdr_print_bufsizes = False
-        self.csdr_through = False
         self.squelch_level = -150
         self.fft_averages = 50
+        self.wfm_deemphasis_tau = 50e-6
         self.iqtee = False
         self.iqtee2 = False
         self.secondary_demodulator = None
@@ -214,7 +95,7 @@ class dsp(object):
 
         self.is_service = False
         self.direwolf_config = None
-        self.direwolf_port = None
+        self.direwolf_config_path = None
         self.process = None
 
     def set_service(self, flag=True):
@@ -222,14 +103,10 @@ class dsp(object):
 
     def set_temporary_directory(self, what):
         self.temporary_directory = what
-        self.pipe_base_path = "{tmp_dir}/openwebrx_pipe_{myid}_".format(tmp_dir=self.temporary_directory, myid=id(self))
+        self.pipe_base_path = "{tmp_dir}/openwebrx_pipe_".format(tmp_dir=self.temporary_directory)
 
     def chain(self, which):
         chain = ["nc -v 127.0.0.1 {nc_port}"]
-        if self.csdr_dynamic_bufsize:
-            chain += ["csdr setbuf {start_bufsize}"]
-        if self.csdr_through:
-            chain += ["csdr through"]
         if which == "fft":
             chain += [
                 "csdr fft_cc {fft_size} {fft_block_size}",
@@ -257,34 +134,60 @@ class dsp(object):
             if not self.output.supports_type("audio"):
                 return chain
         # safe some cpu cycles... no need to decimate if decimation factor is 1
-        last_decimation_block = (
+        last_decimation_block = []
-            ["csdr fractional_decimator_ff {last_decimation}"] if self.last_decimation != 1.0 else []
+        if self.last_decimation >= 2.0:
-        )
+            # activate prefilter if signal has been oversampled, e.g. WFM
+            last_decimation_block = ["csdr fractional_decimator_ff {last_decimation} 12 --prefilter"]
+        elif self.last_decimation != 1.0:
+            last_decimation_block = ["csdr fractional_decimator_ff {last_decimation}"]
         if which == "nfm":
             chain += ["csdr fmdemod_quadri_cf", "csdr limit_ff"]
             chain += last_decimation_block
-            chain += ["csdr deemphasis_nfm_ff {audio_rate}"]
+            chain += [
+                "csdr deemphasis_nfm_ff {audio_rate}",
+                "csdr agc_ff --profile slow --max 3",
+            ]
             if self.get_audio_rate() != self.get_output_rate():
                 chain += [
                     "sox -t raw -r {audio_rate} -e floating-point -b 32 -c 1 --buffer 32 - -t raw -r {output_rate} -e signed-integer -b 16 -c 1 - "
                 ]
             else:
                 chain += ["csdr convert_f_s16"]
+        elif which == "wfm":
+            chain += [
+                "csdr fmdemod_quadri_cf",
+                "csdr limit_ff",
+            ]
+            chain += last_decimation_block
+            chain += ["csdr deemphasis_wfm_ff {audio_rate} {wfm_deemphasis_tau}", "csdr convert_f_s16"]
         elif self.isDigitalVoice(which):
-            chain += ["csdr fmdemod_quadri_cf", "dc_block "]
+            chain += ["csdr fmdemod_quadri_cf"]
             chain += last_decimation_block
             # dsd modes
             if which in ["dstar", "nxdn"]:
-                chain += ["csdr limit_ff", "csdr convert_f_s16"]
+                chain += ["dc_block", "csdr limit_ff", "csdr convert_f_s16"]
                 if which == "dstar":
                     chain += ["dsd -fd -i - -o - -u {unvoiced_quality} -g -1 "]
                 elif which == "nxdn":
                     chain += ["dsd -fi -i - -o - -u {unvoiced_quality} -g -1 "]
-                chain += ["CSDR_FIXED_BUFSIZE=32 csdr convert_s16_f"]
+                chain += [
-                max_gain = 5
+                    "digitalvoice_filter",
+                    "CSDR_FIXED_BUFSIZE=32 csdr agc_s16 --max 30 --initial 3",
+                    "sox -t raw -r 8000 -e signed-integer -b 16 -c 1 --buffer 32 - -t raw -r {output_rate} -e signed-integer -b 16 -c 1 - ",
+                ]
+            # m17
+            elif which == "m17":
+                chain += [
+                    "dc_block",
+                    "csdr limit_ff",
+                    "csdr convert_f_s16",
+                    "m17-demod",
+                    "CSDR_FIXED_BUFSIZE=32 csdr agc_s16 --max 30 --initial 3",
+                    "sox -t raw -r 8000 -e signed-integer -b 16 -c 1 --buffer 32 - -t raw -r {output_rate} -e signed-integer -b 16 -c 1 - ",
+                ]
             # digiham modes
             else:
-                chain += ["rrc_filter", "gfsk_demodulator"]
+                chain += ["dc_block", "rrc_filter", "gfsk_demodulator"]
                 if which == "dmr":
                     chain += [
                         "dmr_decoder --fifo {meta_pipe} --control-fifo {dmr_control_pipe}",
@@ -292,20 +195,42 @@ class dsp(object):
                     ]
                 elif which == "ysf":
                     chain += ["ysf_decoder --fifo {meta_pipe}", "mbe_synthesizer -y -f -u {unvoiced_quality}"]
-                max_gain = 0.0005
+                max_gain = 0.005
-            chain += [
+                chain += [
-                "digitalvoice_filter -f",
+                    "digitalvoice_filter -f",
-                "CSDR_FIXED_BUFSIZE=32 csdr agc_ff 160000 0.8 1 0.0000001 {max_gain}".format(max_gain=max_gain),
+                    "CSDR_FIXED_BUFSIZE=32 csdr agc_ff --max 0.005 --initial 0.0005",
-                "sox -t raw -r 8000 -e floating-point -b 32 -c 1 --buffer 32 - -t raw -r {output_rate} -e signed-integer -b 16 -c 1 - ",
+                    "sox -t raw -r 8000 -e floating-point -b 32 -c 1 --buffer 32 - -t raw -r {output_rate} -e signed-integer -b 16 -c 1 - ",
-            ]
+                ]
         elif which == "am":
             chain += ["csdr amdemod_cf", "csdr fastdcblock_ff"]
             chain += last_decimation_block
-            chain += ["csdr agc_ff", "csdr limit_ff", "csdr convert_f_s16"]
+            chain += [
+                "csdr agc_ff --profile slow --initial 200",
+                "csdr convert_f_s16",
+            ]
+        elif self.isFreeDV(which):
+            chain += ["csdr realpart_cf"]
+            chain += last_decimation_block
+            chain += [
+                "csdr agc_ff",
+                "csdr convert_f_s16",
+                "freedv_rx 1600 - -",
+                "csdr agc_s16 --max 30 --initial 3",
+                "sox -t raw -r 8000 -e signed-integer -b 16 -c 1 --buffer 32 - -t raw -r {output_rate} -e signed-integer -b 16 -c 1 - ",
+            ]
+        elif self.isDrm(which):
+            if self.last_decimation != 1.0:
+                # we are still dealing with complex samples here, so the regular last_decimation_block doesn't fit
+                chain += ["csdr fractional_decimator_cc {last_decimation}"]
+            chain += [
+                "csdr convert_f_s16",
+                "dream -c 6 --sigsrate 48000 --audsrate 48000 -I - -O -",
+                "sox -t raw -r 48000 -e signed-integer -b 16 -c 2 - -t raw -r {output_rate} -e signed-integer -b 16 -c 1 - ",
+            ]
         elif which == "ssb":
             chain += ["csdr realpart_cf"]
             chain += last_decimation_block
-            chain += ["csdr agc_ff", "csdr limit_ff"]
+            chain += ["csdr agc_ff"]
             # fixed sample rate necessary for the wsjt-x tools. fix with sox...
             if self.get_audio_rate() != self.get_output_rate():
                 chain += [
@@ -322,9 +247,11 @@ class dsp(object):
         chain = ["cat {input_pipe}"]
         if which == "fft":
             chain += [
-                "csdr realpart_cf",
+                "csdr fft_cc {secondary_fft_input_size} {secondary_fft_block_size}",
-                "csdr fft_fc {secondary_fft_input_size} {secondary_fft_block_size}",
+                "csdr logpower_cf -70"
-                "csdr logpower_cf -70",
+                if self.fft_averages == 0
+                else "csdr logaveragepower_cf -70 {secondary_fft_size} {fft_averages}",
+                "csdr fft_exchange_sides_ff {secondary_fft_input_size}",
             ]
             if self.fft_compression == "adpcm":
                 chain += ["csdr compress_fft_adpcm_f_u8 {secondary_fft_size}"]
@@ -342,7 +269,7 @@ class dsp(object):
             chain += ["csdr realpart_cf"]
             if self.last_decimation != 1.0:
                 chain += ["csdr fractional_decimator_ff {last_decimation}"]
-            return chain + ["csdr limit_ff", "csdr convert_f_s16"]
+            return chain + ["csdr agc_ff", "csdr convert_f_s16"]
         elif which == "packet":
             chain += ["csdr fmdemod_quadri_cf"]
             if self.last_decimation != 1.0:
@@ -362,9 +289,10 @@ class dsp(object):
         self.restart()
 
     def secondary_fft_block_size(self):
-        return (self.samp_rate / self.decimation) / (
+        base = (self.samp_rate / self.decimation) / (self.fft_fps * 2)
-            self.fft_fps * 2
+        if self.fft_averages == 0:
-        )  # *2 is there because we do FFT on real signal here
+            return base
+        return base / self.fft_averages
 
     def secondary_decimation(self):
         return 1  # currently unused
@@ -414,14 +342,10 @@ class dsp(object):
             if_samp_rate=self.if_samp_rate(),
             last_decimation=self.last_decimation,
             audio_rate=self.get_audio_rate(),
-            direwolf_config=self.direwolf_config,
+            direwolf_config=self.direwolf_config_path,
         )
 
         logger.debug("secondary command (demod) = %s", secondary_command_demod)
-        my_env = os.environ.copy()
-        # if self.csdr_dynamic_bufsize: my_env["CSDR_DYNAMIC_BUFSIZE_ON"]="1";
-        if self.csdr_print_bufsizes:
-            my_env["CSDR_PRINT_BUFSIZES"] = "1"
         if self.output.supports_type("secondary_fft"):
             secondary_command_fft = " | ".join(self.secondary_chain("fft"))
             secondary_command_fft = secondary_command_fft.format(
@@ -429,11 +353,12 @@ class dsp(object):
                 secondary_fft_input_size=self.secondary_fft_size,
                 secondary_fft_size=self.secondary_fft_size,
                 secondary_fft_block_size=self.secondary_fft_block_size(),
+                fft_averages=self.fft_averages,
             )
             logger.debug("secondary command (fft) = %s", secondary_command_fft)
 
             self.secondary_process_fft = subprocess.Popen(
-                secondary_command_fft, stdout=subprocess.PIPE, shell=True, start_new_session=True, env=my_env
+                secondary_command_fft, stdout=subprocess.PIPE, shell=True, start_new_session=True
             )
             self.output.send_output(
                 "secondary_fft",
@@ -445,34 +370,18 @@ class dsp(object):
         # it would block if not read. by piping it to devnull, we avoid a potential pitfall here.
         secondary_output = subprocess.DEVNULL if self.isPacket() else subprocess.PIPE
         self.secondary_process_demod = subprocess.Popen(
-            secondary_command_demod, stdout=secondary_output, shell=True, start_new_session=True, env=my_env
+            secondary_command_demod, stdout=secondary_output, shell=True, start_new_session=True
         )
         self.secondary_processes_running = True
 
-        if self.isWsjtMode():
+        if self.isWsjtMode() or self.isJs8():
-            smd = self.get_secondary_demodulator()
+            chopper = AudioChopper(self, self.get_secondary_demodulator())
-            chopper_profile = None
+            chopper.send_output("audio", self.secondary_process_demod.stdout.read)
-            if smd == "ft8":
+            output_type = "js8_demod" if self.isJs8() else "wsjt_demod"
-                chopper_profile = Ft8Profile()
+            self.output.send_output(output_type, chopper.read)
-            elif smd == "wspr":
-                chopper_profile = WsprProfile()
-            elif smd == "jt65":
-                chopper_profile = Jt65Profile()
-            elif smd == "jt9":
-                chopper_profile = Jt9Profile()
-            elif smd == "ft4":
-                chopper_profile = Ft4Profile()
-            if chopper_profile is not None:
-                chopper = AudioChopper(self, self.secondary_process_demod.stdout, chopper_profile)
-                chopper.start()
-                self.output.send_output("wsjt_demod", chopper.read)
-        elif self.isJs8():
-            chopper = AudioChopper(self, self.secondary_process_demod.stdout, *Js8Profiles.getEnabledProfiles())
-            chopper.start()
-            self.output.send_output("js8_demod", chopper.read)
         elif self.isPacket():
             # we best get the ax25 packets from the kiss socket
-            kiss = KissClient(self.direwolf_port)
+            kiss = KissClient(self.direwolf_config.getPort())
             self.output.send_output("packet_demod", kiss.read)
         elif self.isPocsag():
             self.output.send_output("pocsag_demod", self.secondary_process_demod.stdout.readline)
@@ -486,7 +395,9 @@ class dsp(object):
     def set_secondary_offset_freq(self, value):
         self.secondary_offset_freq = value
         if self.secondary_processes_running and self.has_pipe("secondary_shift_pipe"):
-            self.pipes["secondary_shift_pipe"].write("%g\n" % (-float(self.secondary_offset_freq) / self.if_samp_rate()))
+            self.pipes["secondary_shift_pipe"].write(
+                "%g\n" % (-float(self.secondary_offset_freq) / self.if_samp_rate())
+            )
 
     def stop_secondary_demodulator(self):
         if not self.secondary_processes_running:
@@ -496,12 +407,18 @@ class dsp(object):
         if self.secondary_process_fft:
             try:
                 os.killpg(os.getpgid(self.secondary_process_fft.pid), signal.SIGTERM)
+                # drain any leftover data to free file descriptors
+                self.secondary_process_fft.communicate()
+                self.secondary_process_fft = None
             except ProcessLookupError:
                 # been killed by something else, ignore
                 pass
         if self.secondary_process_demod:
             try:
                 os.killpg(os.getpgid(self.secondary_process_demod.pid), signal.SIGTERM)
+                # drain any leftover data to free file descriptors
+                self.secondary_process_demod.communicate()
+                self.secondary_process_demod = None
             except ProcessLookupError:
                 # been killed by something else, ignore
                 pass
@@ -511,11 +428,16 @@ class dsp(object):
         return self.secondary_demodulator
 
     def set_secondary_fft_size(self, secondary_fft_size):
-        # to change this, restart is required
+        if self.secondary_fft_size == secondary_fft_size:
+            return
         self.secondary_fft_size = secondary_fft_size
+        self.restart()
 
     def set_audio_compression(self, what):
+        if self.audio_compression == what:
+            return
         self.audio_compression = what
+        self.restart()
 
     def get_audio_bytes_to_read(self):
         # desired latency: 5ms
@@ -527,7 +449,10 @@ class dsp(object):
         return int(base)
 
     def set_fft_compression(self, what):
+        if self.fft_compression == what:
+            return
         self.fft_compression = what
+        self.restart()
 
     def get_fft_bytes_to_read(self):
         if self.fft_compression == "none":
@@ -548,15 +473,22 @@ class dsp(object):
             self.restart()
 
     def calculate_decimation(self):
-        (self.decimation, self.last_decimation, _) = self.get_decimation(self.samp_rate, self.get_audio_rate())
+        (self.decimation, self.last_decimation) = self.get_decimation(self.samp_rate, self.get_audio_rate())
 
     def get_decimation(self, input_rate, output_rate):
+        if output_rate <= 0:
+            raise ValueError("invalid output rate: {rate}".format(rate=output_rate))
         decimation = 1
-        while input_rate / (decimation + 1) >= output_rate:
+        target_rate = output_rate
+        # wideband fm has a much higher frequency deviation (75kHz).
+        # we cannot cover this if we immediately decimate to the sample rate the audio will have later on, so we need
+        # to compensate here.
+        if self.get_demodulator() == "wfm" and output_rate < 200000:
+            target_rate = 200000
+        while input_rate / (decimation + 1) >= target_rate:
             decimation += 1
         fraction = float(input_rate / decimation) / output_rate
-        intermediate_rate = input_rate / decimation
+        return decimation, fraction
-        return decimation, fraction, intermediate_rate
 
     def if_samp_rate(self):
         return self.samp_rate / self.decimation
@@ -567,24 +499,31 @@ class dsp(object):
     def get_output_rate(self):
         return self.output_rate
 
+    def get_hd_output_rate(self):
+        return self.hd_output_rate
+
     def get_audio_rate(self):
-        if self.isDigitalVoice() or self.isPacket() or self.isPocsag():
+        if self.isDigitalVoice() or self.isPacket() or self.isPocsag() or self.isDrm():
             return 48000
         elif self.isWsjtMode() or self.isJs8():
             return 12000
+        elif self.isFreeDV():
+            return 8000
+        elif self.isHdAudio():
+            return self.get_hd_output_rate()
         return self.get_output_rate()
 
     def isDigitalVoice(self, demodulator=None):
         if demodulator is None:
             demodulator = self.get_demodulator()
-        return demodulator in ["dmr", "dstar", "nxdn", "ysf"]
+        return demodulator in ["dmr", "dstar", "nxdn", "ysf", "m17"]
 
     def isWsjtMode(self, demodulator=None):
         if demodulator is None:
             demodulator = self.get_secondary_demodulator()
-        return demodulator in ["ft8", "wspr", "jt65", "jt9", "ft4"]
+        return demodulator in ["ft8", "wspr", "jt65", "jt9", "ft4", "fst4", "fst4w", "q65"]
 
-    def isJs8(self, demodulator = None):
+    def isJs8(self, demodulator=None):
         if demodulator is None:
             demodulator = self.get_secondary_demodulator()
         return demodulator == "js8"
@@ -599,6 +538,21 @@ class dsp(object):
             demodulator = self.get_secondary_demodulator()
         return demodulator == "pocsag"
 
+    def isFreeDV(self, demodulator=None):
+        if demodulator is None:
+            demodulator = self.get_demodulator()
+        return demodulator == "freedv"
+
+    def isHdAudio(self, demodulator=None):
+        if demodulator is None:
+            demodulator = self.get_demodulator()
+        return demodulator == "wfm"
+
+    def isDrm(self, demodulator=None):
+        if demodulator is None:
+            demodulator = self.get_demodulator()
+        return demodulator == "drm"
+
     def set_output_rate(self, output_rate):
         if self.output_rate == output_rate:
             return
@@ -606,6 +560,13 @@ class dsp(object):
         self.calculate_decimation()
         self.restart()
 
+    def set_hd_output_rate(self, hd_output_rate):
+        if self.hd_output_rate == hd_output_rate:
+            return
+        self.hd_output_rate = hd_output_rate
+        self.calculate_decimation()
+        self.restart()
+
     def set_demodulator(self, demodulator):
         if demodulator in ["usb", "lsb", "cw"]:
             demodulator = "ssb"
@@ -619,6 +580,8 @@ class dsp(object):
         return self.demodulator
 
     def set_fft_size(self, fft_size):
+        if self.fft_size == fft_size:
+            return
         self.fft_size = fft_size
         self.restart()
 
@@ -637,6 +600,8 @@ class dsp(object):
             return self.samp_rate / self.fft_fps / self.fft_averages
 
     def set_offset_freq(self, offset_freq):
+        if offset_freq is None:
+            return
         self.offset_freq = offset_freq
         if self.running:
             self.pipes["shift_pipe"].write("%g\n" % (-float(self.offset_freq) / self.samp_rate))
@@ -648,6 +613,9 @@ class dsp(object):
     def get_operating_freq(self):
         return self.center_freq + self.offset_freq
 
+    def set_bandpass(self, bandpass):
+        self.set_bpf(bandpass.low_cut, bandpass.high_cut)
+
     def set_bpf(self, low_cut, high_cut):
         self.low_cut = low_cut
         self.high_cut = high_cut
@@ -665,7 +633,11 @@ class dsp(object):
     def set_squelch_level(self, squelch_level):
         self.squelch_level = squelch_level
         # no squelch required on digital voice modes
-        actual_squelch = -150 if self.isDigitalVoice() or self.isPacket() or self.isPocsag() else self.squelch_level
+        actual_squelch = (
+            -150
+            if self.isDigitalVoice() or self.isPacket() or self.isPocsag() or self.isFreeDV()
+            else self.squelch_level
+        )
         if self.running:
             self.pipes["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch)))
 
@@ -680,11 +652,20 @@ class dsp(object):
         if self.has_pipe("dmr_control_pipe"):
             self.pipes["dmr_control_pipe"].write("{0}\n".format(filter))
 
+    def set_wfm_deemphasis_tau(self, tau):
+        if self.wfm_deemphasis_tau == tau:
+            return
+        self.wfm_deemphasis_tau = tau
+        self.restart()
+
     def ddc_transition_bw(self):
         return self.ddc_transition_bw_rate * (self.if_samp_rate() / float(self.samp_rate))
 
     def try_create_pipes(self, pipe_names, command_base):
         for pipe_name, pipe_type in pipe_names.items():
+            if self.has_pipe(pipe_name):
+                logger.warning("{pipe_name} is still in use", pipe_name=pipe_name)
+                self.pipes[pipe_name].close()
             if "{" + pipe_name + "}" in command_base:
                 p = self.pipe_base_path + pipe_name
                 encoding = None
@@ -707,27 +688,34 @@ class dsp(object):
 
     def try_create_configs(self, command):
         if "{direwolf_config}" in command:
-            self.direwolf_config = "{tmp_dir}/openwebrx_direwolf_{myid}.conf".format(
+            self.direwolf_config_path = "{tmp_dir}/openwebrx_direwolf_{myid}.conf".format(
                 tmp_dir=self.temporary_directory, myid=id(self)
             )
-            self.direwolf_port = KissClient.getFreePort()
+            self.direwolf_config = DirewolfConfig()
-            file = open(self.direwolf_config, "w")
+            self.direwolf_config.wire(self)
-            file.write(DirewolfConfig().getConfig(self.direwolf_port, self.is_service))
+            file = open(self.direwolf_config_path, "w")
+            file.write(self.direwolf_config.getConfig(self.is_service))
             file.close()
         else:
             self.direwolf_config = None
-            self.direwolf_port = None
+            self.direwolf_config_path = None
 
     def try_delete_configs(self):
-        if self.direwolf_config:
+        if self.direwolf_config is not None:
+            self.direwolf_config.unwire(self)
+            self.direwolf_config = None
+        if self.direwolf_config_path is not None:
             try:
-                os.unlink(self.direwolf_config)
+                os.unlink(self.direwolf_config_path)
             except FileNotFoundError:
                 # result suits our expectations. fine :)
                 pass
             except Exception:
                 logger.exception("try_delete_configs()")
-            self.direwolf_config = None
+            self.direwolf_config_path = None
+
+    def onConfigChanged(self):
+        self.restart()
 
     def start(self):
         with self.modification_lock:
@@ -774,17 +762,13 @@ class dsp(object):
                 smeter_report_every=int(self.if_samp_rate() / 6000),
                 unvoiced_quality=self.get_unvoiced_quality(),
                 audio_rate=self.get_audio_rate(),
+                wfm_deemphasis_tau=self.wfm_deemphasis_tau,
             )
 
             logger.debug("Command = %s", command)
-            my_env = os.environ.copy()
-            if self.csdr_dynamic_bufsize:
-                my_env["CSDR_DYNAMIC_BUFSIZE_ON"] = "1"
-            if self.csdr_print_bufsizes:
-                my_env["CSDR_PRINT_BUFSIZES"] = "1"
 
             out = subprocess.PIPE if self.output.supports_type("audio") else subprocess.DEVNULL
-            self.process = subprocess.Popen(command, stdout=out, shell=True, start_new_session=True, env=my_env)
+            self.process = subprocess.Popen(command, stdout=out, shell=True, start_new_session=True)
 
             def watch_thread():
                 rc = self.process.wait()
@@ -793,11 +777,12 @@ class dsp(object):
                     logger.debug("restarting since rc = 0, self.running = true, and no modification")
                     self.restart()
 
-            threading.Thread(target=watch_thread).start()
+            threading.Thread(target=watch_thread, name="csdr_watch_thread").start()
 
-            if self.output.supports_type("audio"):
+            audio_type = "hd_audio" if self.isHdAudio() else "audio"
+            if self.output.supports_type(audio_type):
                 self.output.send_output(
-                    "audio",
+                    audio_type,
                     partial(
                         self.process.stdout.read,
                         self.get_fft_bytes_to_read() if self.demodulator == "fft" else self.get_audio_bytes_to_read(),
@@ -807,6 +792,7 @@ class dsp(object):
             self.start_secondary_demodulator()
 
         if self.has_pipe("smeter_pipe"):
+
             def read_smeter():
                 raw = self.pipes["smeter_pipe"].readline()
                 if len(raw) == 0:
@@ -816,6 +802,7 @@ class dsp(object):
 
             self.output.send_output("smeter", read_smeter)
         if self.has_pipe("meta_pipe"):
+
             def read_meta():
                 raw = self.pipes["meta_pipe"].readline()
                 if len(raw) == 0:
@@ -825,16 +812,14 @@ class dsp(object):
 
             self.output.send_output("meta", read_meta)
 
-        if self.csdr_dynamic_bufsize:
-            self.process.stdout.read(8)  # dummy read to skip bufsize & preamble
-            logger.debug("Note: CSDR_DYNAMIC_BUFSIZE_ON = 1")
-
     def stop(self):
         with self.modification_lock:
             self.running = False
             if self.process is not None:
                 try:
                     os.killpg(os.getpgid(self.process.pid), signal.SIGTERM)
+                    # drain any leftover data to free file descriptors
+                    self.process.communicate()
                     self.process = None
                 except ProcessLookupError:
                     # been killed by something else, ignore
@@ -842,12 +827,10 @@ class dsp(object):
             self.stop_secondary_demodulator()
 
             self.try_delete_pipes(self.pipe_names)
+            self.try_delete_configs()
 
     def restart(self):
         if not self.running:
             return
         self.stop()
         self.start()
-
-    def __del__(self):
-        self.stop()

csdr/output.py

@@ -0,0 +1,36 @@
+import threading
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class Output(object):
+    def send_output(self, t, read_fn):
+        if not self.supports_type(t):
+            # TODO rewrite the output mechanism in a way that avoids producing unnecessary data
+            logger.warning("dumping output of type %s since it is not supported.", t)
+            threading.Thread(target=self.pump(read_fn, lambda x: None), name="csdr_pump_thread").start()
+            return
+        self.receive_output(t, read_fn)
+
+    def receive_output(self, t, read_fn):
+        pass
+
+    def pump(self, read, write):
+        def copy():
+            run = True
+            while run:
+                data = None
+                try:
+                    data = read()
+                except ValueError:
+                    pass
+                if data is None or (isinstance(data, bytes) and len(data) == 0):
+                    run = False
+                else:
+                    write(data)
+
+        return copy
+
+    def supports_type(self, t):
+        return True

csdr/pipe.py

@@ -0,0 +1,156 @@
+import os
+import select
+import time
+import threading
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class Pipe(object):
+    READ = "r"
+    WRITE = "w"
+    NONE = None
+
+    @staticmethod
+    def create(path, t, encoding=None):
+        if t == Pipe.READ:
+            return ReadingPipe(path, encoding=encoding)
+        elif t == Pipe.WRITE:
+            return WritingPipe(path, encoding=encoding)
+        elif t == Pipe.NONE:
+            return Pipe(path, None, encoding=encoding)
+
+    def __init__(self, path, direction, encoding=None):
+        self.doOpen = True
+        self.path = "{base}_{myid}".format(base=path, myid=id(self))
+        self.direction = direction
+        self.encoding = encoding
+        self.file = None
+        os.mkfifo(self.path)
+
+    def open(self):
+        """
+        this method opens the file descriptor with an added O_NONBLOCK flag. This gives us a special behaviour for
+        FIFOS, when they are not opened by the opposing side:
+
+         - opening a pipe for writing will throw an OSError with errno = 6 (ENXIO). This is handled specially in the
+           WritingPipe class.
+         - opening a pipe for reading will pass through this method instantly, even if the opposing end has not been
+           opened yet, but the resulting file descriptor will behave as if O_NONBLOCK is set (even if we remove it
+           immediately here), resulting in empty reads until data is available. This is handled specially in the
+           ReadingPipe class.
+        """
+
+        def opener(path, flags):
+            fd = os.open(path, flags | os.O_NONBLOCK)
+            os.set_blocking(fd, True)
+            return fd
+
+        self.file = open(self.path, self.direction, encoding=self.encoding, opener=opener)
+
+    def close(self):
+        self.doOpen = False
+        try:
+            if self.file is not None:
+                self.file.close()
+            os.unlink(self.path)
+        except FileNotFoundError:
+            # it seems like we keep calling this twice. no idea why, but we don't need the resulting error.
+            pass
+        except Exception:
+            logger.exception("Pipe.close()")
+
+    def __str__(self):
+        return self.path
+
+
+class WritingPipe(Pipe):
+    def __init__(self, path, encoding=None):
+        self.queue = []
+        self.queueLock = threading.Lock()
+        super().__init__(path, "w", encoding=encoding)
+        self.open()
+
+    def open_and_dequeue(self):
+        """
+        This method implements a retry loop that can be interrupted in case the Pipe gets shutdown before actually
+        being connected.
+
+        After the pipe is opened successfully, all data that has been queued is sent in the order it was passed into
+        write().
+        """
+        retries = 0
+
+        while self.file is None and self.doOpen and retries < 10:
+            try:
+                super().open()
+            except OSError as error:
+                # ENXIO = FIFO has not been opened for reading
+                if error.errno == 6:
+                    time.sleep(0.1)
+                    retries += 1
+                else:
+                    raise
+
+        # if doOpen is false, opening has been canceled, so no warning in that case.
+        if self.file is None:
+            if self.doOpen:
+                logger.warning("could not open FIFO %s", self.path)
+            return
+
+        with self.queueLock:
+            for i in self.queue:
+                self.file.write(i)
+            self.file.flush()
+            self.queue = None
+
+    def open(self):
+        """
+        This sends the opening operation off to a background thread. If we were to block the thread here, another pipe
+        may be waiting in the queue to be opened on the opposing side, resulting in a deadlock
+        """
+        threading.Thread(target=self.open_and_dequeue, name="csdr_pipe_thread").start()
+
+    def write(self, data):
+        """
+        This method queues all data to be written until the file is actually opened. As soon as a file is available,
+        it becomes a passthrough.
+        """
+        if self.file is None:
+            with self.queueLock:
+                self.queue.append(data)
+            return
+        r = self.file.write(data)
+        self.file.flush()
+        return r
+
+
+class ReadingPipe(Pipe):
+    def __init__(self, path, encoding=None):
+        super().__init__(path, "r", encoding=encoding)
+
+    def open(self):
+        """
+        This method implements an interruptible loop that waits for the file descriptor to be opened and the first
+        batch of data coming in using repeated select() calls.
+        :return:
+        """
+        if not self.doOpen:
+            return
+        super().open()
+        while self.doOpen:
+            (read, _, _) = select.select([self.file], [], [], 1)
+            if self.file in read:
+                break
+
+    def read(self):
+        if self.file is None:
+            self.open()
+        return self.file.read()
+
+    def readline(self):
+        if self.file is None:
+            self.open()
+        return self.file.readline()

debian/changelog

@@ -1,3 +1,75 @@
+openwebrx (1.0.0) buster hirsute; urgency=low
+  * Introduced `squelch_auto_margin` config option that allows configuring the
+    auto squelch level
+  * Removed `port` configuration option; `rtltcp_compat` takes the port number
+    with the new connectors
+  * Added support for new WSJT-X modes FST4, FST4W (only available with WSJT-X
+    2.3) and Q65 (only available with WSJT-X 2.4)
+  * Added support for demodulating M17 digital voice signals using
+    m17-cxx-demod
+  * New reporting infrastructure, allowing WSPR and FST4W spots to be sent to
+    wsprnet.org
+  * Add some basic filtering capabilities to the map
+  * New arguments to the `openwebrx` command-line to facilitate the
+    administration of users (try `openwebrx admin`)
+  * New command-line tool `openwebrx-admin` that facilitates the
+    administration of users
+  * Default bandwidth changes:
+    - "WFM" changed to 150kHz
+    - "Packet" (APRS) changed to 12.5kHz
+  * Configuration rework:
+    - New: fully web-based configuration interface
+    - System configuration parameters have been moved to a new, separate
+      `openwebrx.conf` file
+    - Remaining parameters are now editable in the web configuration
+    - Existing `config_webrx.py` files will still be read, but changes made in
+      the web configuration will be written to a new storage system
+    - Added upload of avatar and panorama image via web configuration
+  * New devices supported:
+    - HPSDR devices (Hermes Lite 2) thanks to @jancona
+    - BBRF103 / RX666 / RX888 devices supported by libsddc
+    - R&S devices using the EB200 or Ammos protocols
+
+ -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 06 May 2021 17:22:00 +0000
+
+openwebrx (0.20.3) buster focal; urgency=low
+
+  * Fix a compatibility issue with python versions <= 3.6
+
+ -- Jakob Ketterl <jakob.ketterl@gmx.de>  Tue, 26 Jan 2021 15:28:00 +0000
+
+openwebrx (0.20.2) buster focal; urgency=high
+
+  * Fix a security problem that allowed arbitrary commands to be executed on
+    the receiver (See github issue #215:
+    https://github.com/jketterl/openwebrx/issues/215)
+
+ -- Jakob Ketterl <jakob.ketterl@gmx.de>  Sun, 24 Jan 2021 22:50:00 +0000
+
+openwebrx (0.20.1) buster focal; urgency=low
+
+  * Remove broken OSM map fallback
+
+ -- Jakob Ketterl <jakob.ketterl@gmx.de>  Mon, 30 Nov 2020 17:29:00 +0000
+
+openwebrx (0.20.0) buster focal; urgency=low
+
+  * Added the ability to sign multiple keys in a single request, thus enabling
+    multiple users to claim a single receiver on receiverbook.de
+  * Fixed file descriptor leaks to prevent "too many open files" errors
+  * Add new demodulator chain for FreeDV
+  * Added new HD audio streaming mode along with a new WFM demodulator
+  * Reworked AGC code for better results in AM, SSB and digital modes
+  * Added support for demodulation of "Digital Radio Mondiale" (DRM) broadcast
+    using the "dream" decoder.
+  * New default waterfall color scheme
+  * Prototype of a continuous automatic waterfall calibration mode
+  * New devices supported:
+    - FunCube Dongle Pro+ (`"type": "fcdpp"`)
+    - Support for connections to rtl_tcp (`"type": "rtl_tcp"`)
+
+ -- Jakob Ketterl <jakob.ketterl@gmx.de>  Sun, 11 Oct 2020 13:02:00 +0000
+
 openwebrx (0.19.1) buster focal; urgency=low
 
   * Added ability to authenticate receivers with listing sites using

debian/control

@@ -10,7 +10,7 @@ Vcs-Git: https://github.com/jketterl/openwebrx.git
 
 Package: openwebrx
 Architecture: all
-Depends: adduser, python3 (>= 3.5), python3-pkg-resources, csdr (>= 0.14), netcat, owrx-connector (>= 0.2), python3-js8py (>= 0.1), ${python3:Depends}, ${misc:Depends}
+Depends: adduser, python3 (>= 3.5), python3-pkg-resources, csdr (>= 0.17), netcat, owrx-connector (>= 0.4), soapysdr-tools, python3-js8py (>= 0.1), ${python3:Depends}, ${misc:Depends}
-Recommends: digiham (>= 0.3), dsd (>= 1.7), sox, direwolf (>= 1.4), wsjtx, soapysdr-tools
+Recommends: digiham (>= 0.4), dsd (>= 1.7), sox, direwolf (>= 1.4), wsjtx, runds-connector, hpsdrconnector, aprs-symbols, m17-demod, js8call
 Description: multi-user web sdr
- Open source, multi-user SDR receiver with a web interface
+ Open source, multi-user SDR receiver with a web interface

debian/openwebrx.config

@@ -0,0 +1,8 @@
+#!/bin/sh -e
+. /usr/share/debconf/confmodule
+
+db_get openwebrx/admin_user_configured
+if [ "${1:-}" = "reconfigure" ] || [ "${RET}" != true ]; then
+    db_input high openwebrx/admin_user_password || true
+    db_go
+fi

debian/openwebrx.dirs

@@ -0,0 +1 @@
+/etc/openwebrx/openwebrx.conf.d

debian/openwebrx.install

@@ -1,5 +1,3 @@
-config_webrx.py etc/openwebrx/
 bands.json etc/openwebrx/
-bookmarks.json etc/openwebrx/
+openwebrx.conf etc/openwebrx/
-users.json etc/openwebrx/
 systemd/openwebrx.service lib/systemd/system/

debian/openwebrx.postinst

@@ -0,0 +1,59 @@
+#!/bin/bash
+. /usr/share/debconf/confmodule
+
+set -euo pipefail
+
+OWRX_USER="openwebrx"
+OWRX_DATADIR="/var/lib/openwebrx"
+OWRX_USERS_FILE="${OWRX_DATADIR}/users.json"
+OWRX_SETTINGS_FILE="${OWRX_DATADIR}/settings.json"
+OWRX_BOOKMARKS_FILE="${OWRX_DATADIR}/bookmarks.json"
+
+case "$1" in
+  configure|reconfigure)
+    adduser --system --group --no-create-home --home /nonexistent --quiet "${OWRX_USER}"
+    usermod -aG plugdev openwebrx
+
+    # create OpenWebRX data directory and set the correct permissions
+    if [ ! -d "${OWRX_DATADIR}" ] && [ ! -L "${OWRX_DATADIR}" ]; then mkdir "${OWRX_DATADIR}"; fi
+    chown "${OWRX_USER}". ${OWRX_DATADIR}
+
+    # create empty config files now to avoid permission problems later
+    if [ ! -e "${OWRX_USERS_FILE}" ]; then
+      echo "[]" > "${OWRX_USERS_FILE}"
+      chown "${OWRX_USER}". "${OWRX_USERS_FILE}"
+      chmod 0600 "${OWRX_USERS_FILE}"
+    fi
+
+    if [ ! -e "${OWRX_SETTINGS_FILE}" ]; then
+      echo "{}" > "${OWRX_SETTINGS_FILE}"
+      chown "${OWRX_USER}". "${OWRX_SETTINGS_FILE}"
+    fi
+
+    if [ ! -e "${OWRX_BOOKMARKS_FILE}" ]; then
+      touch "${OWRX_BOOKMARKS_FILE}"
+      chown "${OWRX_USER}". "${OWRX_BOOKMARKS_FILE}"
+    fi
+
+    db_get openwebrx/admin_user_password
+    if [ ! -z "${RET}" ]; then
+      if ! openwebrx admin --silent hasuser admin; then
+        # create initial openwebrx user
+        OWRX_PASSWORD="${RET}" openwebrx admin --noninteractive adduser admin
+      else
+        # change existing user's password
+        OWRX_PASSWORD="${RET}" openwebrx admin --noninteractive resetpassword admin
+      fi
+    fi
+    # remove password from debconf database
+    db_unregister openwebrx/admin_user_password
+    # set a marker that admin is configured to avoid future questions
+    db_set openwebrx/admin_user_configured true
+  ;;
+  *)
+    echo "postinst called with unknown argument '$1'" 1>&2
+    exit 1
+  ;;
+esac
+
+#DEBHELPER#

debian/openwebrx.postrm

@@ -0,0 +1,8 @@
+#!/bin/sh -e
+
+if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then
+    . /usr/share/debconf/confmodule
+    db_purge
+fi
+
+#DEBHELPER#

debian/openwebrx.templates

@@ -0,0 +1,23 @@
+Template: openwebrx/admin_user_password
+Type: password
+Description: OpenWebRX "admin" user password:
+ The system can create a user for the OpenWebRX web configuration interface for
+ you. Using this user, you will be able to log into the "settings" area of
+ OpenWebRX to configure your receiver conveniently through your browser.
+ .
+ The name of the created user will be "admin".
+ .
+ If you do not wish to create a web admin user right now, you can leave this
+ empty for now. You can return to this prompt at a later time by running the
+ command "sudo dpkg-reconfigure openwebrx".
+ .
+ You can also use the "openwebrx admin" command to create, delete or manage
+ existing users. More information is available in by running the command
+ "openwebrx admin --help".
+
+Template: openwebrx/admin_user_configured
+Type: boolean
+Default: false
+Description: OpenWebRX "admin" user previously configured?
+ Marker used internally by the config scripts to remember if an admin user has
+ been created.

debian/postinst

@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euxo pipefail
-
-adduser --system --group --no-create-home --home /nonexistant openwebrx
-usermod -aG plugdev openwebrx
-
-#DEBHELPER#

debian/rules

@@ -3,3 +3,6 @@ export PYBUILD_NAME=openwebrx
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild --with systemd
+
+override_dh_strip_nondeterminism:
+	dh_strip_nondeterminism -X.png

docker.sh

@@ -0,0 +1,97 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+ARCH=$(uname -m)
+IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-perseus openwebrx-fcdpp openwebrx-radioberry openwebrx-uhd openwebrx-rtltcp openwebrx-runds openwebrx-hpsdr openwebrx-full openwebrx"
+ALL_ARCHS="x86_64 armv7l aarch64"
+TAG=${TAG:-"latest"}
+ARCHTAG="$TAG-$ARCH"
+
+usage () {
+  echo "Usage: ${0} [command]"
+  echo "Available commands:"
+  echo "  help       Show this usage information"
+  echo "  build      Build all docker images"
+  echo "  push       Push built docker images to the docker hub"
+  echo "  manifest   Compile the docker hub manifest (combines arm and x86 tags into one)"
+  echo "  tag        Tag a release"
+}
+
+build () {
+  # build the base images
+  docker build --pull -t openwebrx-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-base .
+  docker build --build-arg ARCHTAG=${ARCHTAG} -t openwebrx-soapysdr-base:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-soapysdr .
+
+  for image in ${IMAGES}; do
+    i=${image:10}
+    # "openwebrx" is a special image that gets tag-aliased later on
+    if [[ ! -z "${i}" ]] ; then
+      docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/${image}:${ARCHTAG} -f docker/Dockerfiles/Dockerfile-${i} .
+    fi
+  done
+
+  # tag openwebrx alias image
+  docker tag jketterl/openwebrx-full:${ARCHTAG} jketterl/openwebrx:${ARCHTAG}
+}
+
+push () {
+  for image in ${IMAGES}; do
+    docker push jketterl/$image:$ARCHTAG
+  done
+}
+
+manifest () {
+  for image in ${IMAGES}; do
+    # there's no docker manifest rm command, and the create --amend does not work, so we have to clean up manually
+    rm -rf "${HOME}/.docker/manifests/docker.io_jketterl_${image}-${TAG}"
+    IMAGE_LIST=""
+    for a in $ALL_ARCHS; do
+      IMAGE_LIST="$IMAGE_LIST jketterl/$image:$TAG-$a"
+    done
+    docker manifest create jketterl/$image:$TAG $IMAGE_LIST
+    docker manifest push --purge jketterl/$image:$TAG
+  done
+}
+
+tag () {
+  if [[ -x ${1:-} || -z ${2:-} ]] ; then
+    echo "Usage: ${0} tag [SRC_TAG] [TARGET_TAG]"
+    return
+  fi
+
+  local SRC_TAG=${1}
+  local TARGET_TAG=${2}
+
+  for image in ${IMAGES}; do
+    # there's no docker manifest rm command, and the create --amend does not work, so we have to clean up manually
+    rm -rf "${HOME}/.docker/manifests/docker.io_jketterl_${image}-${TARGET_TAG}"
+    IMAGE_LIST=""
+    for a in ${ALL_ARCHS}; do
+      docker pull jketterl/${image}:${SRC_TAG}-${a}
+      docker tag jketterl/${image}:${SRC_TAG}-${a} jketterl/${image}:${TARGET_TAG}-${a}
+      docker push jketterl/${image}:${TARGET_TAG}-${a}
+      IMAGE_LIST="${IMAGE_LIST} jketterl/${image}:${TARGET_TAG}-${a}"
+    done
+    docker manifest create jketterl/${image}:${TARGET_TAG} ${IMAGE_LIST}
+    docker manifest push --purge jketterl/${image}:${TARGET_TAG}
+    docker pull jketterl/${image}:${TARGET_TAG}
+  done
+}
+
+case ${1:-} in
+  build)
+    build
+    ;;
+  push)
+    push
+    ;;
+  manifest)
+    manifest
+    ;;
+  tag)
+    tag ${@:2}
+    ;;
+  *)
+    usage
+    ;;
+esac

docker/Dockerfiles/Dockerfile-airspy

@@ -1,7 +1,7 @@
 ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
-ADD docker/scripts/install-dependencies-airspy.sh /
+COPY docker/scripts/install-dependencies-airspy.sh /
 RUN /install-dependencies-airspy.sh &&\
     rm /install-dependencies-airspy.sh
 

docker/Dockerfiles/Dockerfile-base

@@ -1,18 +1,26 @@
 FROM debian:buster-slim
 
-ADD docker/files/js8call/js8call-hamlib.patch /
+COPY docker/files/js8call/js8call-hamlib.patch \
-ADD docker/files/wsjtx/*.patch /
+     docker/files/wsjtx/wsjtx.patch \
-ADD docker/scripts/install-dependencies.sh /
+     docker/files/wsjtx/wsjtx-hamlib.patch \
+     docker/files/dream/dream.patch \
+     docker/files/direwolf/direwolf-hamlib.patch \
+     docker/scripts/install-dependencies.sh /
 RUN /install-dependencies.sh && \
     rm /install-dependencies.sh && \
     rm /*.patch
+COPY docker/scripts/install-owrx-tools.sh /
+RUN /install-owrx-tools.sh && \
+    rm /install-owrx-tools.sh
 
 ENTRYPOINT ["/init"]
 
 WORKDIR /opt/openwebrx
 
 VOLUME /etc/openwebrx
+VOLUME /var/lib/openwebrx
 
-CMD [ "/opt/openwebrx/docker/scripts/run.sh" ]
+ENV S6_CMD_ARG0="/opt/openwebrx/docker/scripts/run.sh"
+CMD []
 
 EXPOSE 8073

docker/Dockerfiles/Dockerfile-fcdpp

@@ -0,0 +1,8 @@
+ARG ARCHTAG
+FROM openwebrx-soapysdr-base:$ARCHTAG
+
+COPY docker/scripts/install-dependencies-fcdpp.sh /
+RUN /install-dependencies-fcdpp.sh &&\
+    rm /install-dependencies-fcdpp.sh
+
+COPY . /opt/openwebrx

docker/Dockerfiles/Dockerfile-full

@@ -1,8 +1,9 @@
 ARG ARCHTAG
 FROM openwebrx-base:$ARCHTAG
 
-ADD docker/scripts/install-dependencies-*.sh /
+COPY docker/scripts/install-dependencies-*.sh \
-ADD docker/files/sdrplay/install-lib.*.patch /
+     docker/files/sdrplay/install-lib.*.patch \
+     docker/scripts/install-connectors.sh /
 
 RUN /install-dependencies-rtlsdr.sh &&\
     /install-dependencies-soapysdr.sh &&\
@@ -14,13 +15,16 @@ RUN /install-dependencies-rtlsdr.sh &&\
     /install-dependencies-limesdr.sh &&\
     /install-dependencies-soapyremote.sh &&\
     /install-dependencies-perseus.sh &&\
+    /install-dependencies-fcdpp.sh &&\
+    /install-dependencies-radioberry.sh &&\
+    /install-dependencies-uhd.sh &&\
+    /install-dependencies-hpsdr.sh &&\
+    /install-connectors.sh &&\
+    /install-dependencies-runds.sh &&\
     rm /install-dependencies-*.sh &&\
-    rm /install-lib.*.patch
+    rm /install-lib.*.patch && \
-
-ADD docker/scripts/install-connectors.sh /
-RUN /install-connectors.sh &&\
     rm /install-connectors.sh
 
-ADD docker/files/services/sdrplay /etc/services.d/sdrplay
+COPY docker/files/services/sdrplay /etc/services.d/sdrplay
 
 ADD . /opt/openwebrx

docker/Dockerfiles/Dockerfile-hackrf

@@ -1,8 +1,8 @@
 ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
-ADD docker/scripts/install-dependencies-hackrf.sh /
+COPY docker/scripts/install-dependencies-hackrf.sh /
 RUN /install-dependencies-hackrf.sh &&\
     rm /install-dependencies-hackrf.sh
 
-ADD . /opt/openwebrx
+COPY . /opt/openwebrx

docker/Dockerfiles/Dockerfile-hpsdr

@@ -0,0 +1,9 @@
+ARG ARCHTAG
+FROM openwebrx-base:$ARCHTAG
+
+COPY docker/scripts/install-dependencies-hpsdr.sh /
+
+RUN /install-dependencies-hpsdr.sh &&\
+    rm /install-dependencies-hpsdr.sh
+
+COPY . /opt/openwebrx

docker/Dockerfiles/Dockerfile-limesdr

@@ -1,8 +1,8 @@
 ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
-ADD docker/scripts/install-dependencies-limesdr.sh /
+COPY docker/scripts/install-dependencies-limesdr.sh /
 RUN /install-dependencies-limesdr.sh &&\
     rm /install-dependencies-limesdr.sh
 
-ADD . /opt/openwebrx
+COPY . /opt/openwebrx

docker/Dockerfiles/Dockerfile-perseus

@@ -1,8 +1,8 @@
 ARG ARCHTAG
 FROM openwebrx-base:$ARCHTAG
 
-ADD docker/scripts/install-dependencies-perseus.sh /
+COPY docker/scripts/install-dependencies-perseus.sh /
 RUN /install-dependencies-perseus.sh &&\
     rm /install-dependencies-perseus.sh
 
-ADD . /opt/openwebrx
+COPY . /opt/openwebrx

docker/Dockerfiles/Dockerfile-plutosdr

@@ -1,8 +1,8 @@
 ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
-ADD docker/scripts/install-dependencies-plutosdr.sh /
+COPY docker/scripts/install-dependencies-plutosdr.sh /
 RUN /install-dependencies-plutosdr.sh &&\
     rm /install-dependencies-plutosdr.sh
 
-ADD . /opt/openwebrx
+COPY . /opt/openwebrx

docker/Dockerfiles/Dockerfile-radioberry

@@ -0,0 +1,8 @@
+ARG ARCHTAG
+FROM openwebrx-soapysdr-base:$ARCHTAG
+
+COPY docker/scripts/install-dependencies-radioberry.sh /
+RUN /install-dependencies-radioberry.sh &&\
+    rm /install-dependencies-radioberry.sh
+
+COPY . /opt/openwebrx

docker/Dockerfiles/Dockerfile-rtlsdr

@@ -1,12 +1,12 @@
 ARG ARCHTAG
 FROM openwebrx-base:$ARCHTAG
 
-ADD docker/scripts/install-dependencies-rtlsdr.sh /
+COPY docker/scripts/install-dependencies-rtlsdr.sh \
-ADD docker/scripts/install-connectors.sh /
+     docker/scripts/install-connectors.sh /
 
 RUN /install-dependencies-rtlsdr.sh &&\
     rm /install-dependencies-rtlsdr.sh &&\
     /install-connectors.sh &&\
     rm /install-connectors.sh
 
-ADD . /opt/openwebrx
+COPY . /opt/openwebrx

docker/Dockerfiles/Dockerfile-rtlsdr-soapy

@@ -1,8 +1,8 @@
 ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
-ADD docker/scripts/install-dependencies-rtlsdr-soapy.sh /
+COPY docker/scripts/install-dependencies-rtlsdr-soapy.sh /
 RUN /install-dependencies-rtlsdr-soapy.sh &&\
     rm /install-dependencies-rtlsdr-soapy.sh
 
-ADD . /opt/openwebrx
+COPY . /opt/openwebrx

docker/Dockerfiles/Dockerfile-rtltcp

@@ -0,0 +1,9 @@
+ARG ARCHTAG
+FROM openwebrx-base:$ARCHTAG
+
+COPY docker/scripts/install-connectors.sh /
+
+RUN /install-connectors.sh &&\
+    rm /install-connectors.sh
+
+COPY . /opt/openwebrx

docker/Dockerfiles/Dockerfile-runds

@@ -0,0 +1,12 @@
+ARG ARCHTAG
+FROM openwebrx-base:$ARCHTAG
+
+COPY docker/scripts/install-connectors.sh \
+     docker/scripts/install-dependencies-runds.sh /
+
+RUN /install-connectors.sh &&\
+    rm /install-connectors.sh && \
+    /install-dependencies-runds.sh && \
+    rm /install-dependencies-runds.sh
+
+COPY . /opt/openwebrx

docker/Dockerfiles/Dockerfile-sdrplay

@@ -1,12 +1,12 @@
 ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
-ADD docker/scripts/install-dependencies-sdrplay.sh /
+COPY docker/scripts/install-dependencies-sdrplay.sh \
-ADD docker/files/sdrplay/install-lib.*.patch /
+     docker/files/sdrplay/install-lib.*.patch /
 RUN /install-dependencies-sdrplay.sh &&\
     rm /install-dependencies-sdrplay.sh &&\
     rm /install-lib.*.patch
 
-ADD docker/files/services/sdrplay /etc/services.d/sdrplay
+COPY docker/files/services/sdrplay /etc/services.d/sdrplay
 
-ADD . /opt/openwebrx
+COPY . /opt/openwebrx

docker/Dockerfiles/Dockerfile-soapyremote

@@ -1,8 +1,8 @@
 ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
-ADD docker/scripts/install-dependencies-soapyremote.sh /
+COPY docker/scripts/install-dependencies-soapyremote.sh /
 RUN /install-dependencies-soapyremote.sh &&\
     rm /install-dependencies-soapyremote.sh
 
-ADD . /opt/openwebrx
+COPY . /opt/openwebrx

docker/Dockerfiles/Dockerfile-soapysdr

@@ -1,8 +1,8 @@
 ARG ARCHTAG
 FROM openwebrx-base:$ARCHTAG
 
-ADD docker/scripts/install-dependencies-soapysdr.sh /
+COPY docker/scripts/install-dependencies-soapysdr.sh \
-ADD docker/scripts/install-connectors.sh /
+     docker/scripts/install-connectors.sh /
 RUN /install-dependencies-soapysdr.sh &&\
     rm /install-dependencies-soapysdr.sh &&\
     /install-connectors.sh &&\

docker/Dockerfiles/Dockerfile-uhd

@@ -0,0 +1,8 @@
+ARG ARCHTAG
+FROM openwebrx-soapysdr-base:$ARCHTAG
+
+COPY docker/scripts/install-dependencies-uhd.sh /
+RUN /install-dependencies-uhd.sh &&\
+    rm /install-dependencies-uhd.sh
+
+COPY . /opt/openwebrx

docker/env

@@ -1,5 +0,0 @@
-ARCH=$(uname -m)
-IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-perseus openwebrx-full openwebrx"
-ALL_ARCHS="x86_64 armv7l aarch64"
-TAG=${TAG:-"latest"}
-ARCHTAG="$TAG-$ARCH"

docker/files/direwolf/direwolf-hamlib.patch

@@ -0,0 +1,20 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9e710f5..da90b43 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -257,13 +257,8 @@ else()
+   set(GPSD_LIBRARIES "")
+ endif()
+ 
+-find_package(hamlib)
+-if(HAMLIB_FOUND)
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_HAMLIB")
+-else()
+-  set(HAMLIB_INCLUDE_DIRS "")
+-  set(HAMLIB_LIBRARIES "")
+-endif()
++set(HAMLIB_INCLUDE_DIRS "")
++set(HAMLIB_LIBRARIES "")
+ 
+ if(LINUX)
+   find_package(ALSA REQUIRED)

docker/files/dream/dream.patch

@@ -0,0 +1,96 @@
+--- dream.pro.org	2020-09-04 22:51:51.579926191 +0200
++++ dream.pro	2020-09-04 22:52:57.609434707 +0200
+@@ -70,9 +70,6 @@
+       exists(/opt/local/include/speex/speex_preprocess.h) {
+         CONFIG += speexdsp
+       }
+-      exists(/opt/local/include/hamlib/rig.h) {
+-        CONFIG += hamlib
+-      }
+       contains(QT_VERSION, ^4\\.7.*) {
+ 	QT += phonon opengl svg
+         DEFINES -= QWT_NO_SVG
+@@ -138,12 +135,6 @@
+       packagesExist(sndfile) {
+         CONFIG += sndfile
+       }
+-      packagesExist(hamlib) {
+-        CONFIG += hamlib
+-      }
+-      packagesExist(gpsd) {
+-        CONFIG += gps
+-      }
+       packagesExist(pcap) {
+         CONFIG += pcap
+       }
+@@ -159,14 +150,6 @@
+       exists(/usr/local/include/sndfile.h) {
+         CONFIG += sndfile
+       }
+-      exists(/usr/include/hamlib/rig.h) | \
+-      exists(/usr/local/include/hamlib/rig.h) {
+-          CONFIG += hamlib
+-      }
+-      exists(/usr/include/gps.h) | \
+-      exists(/usr/local/include/gps.h) {
+-        CONFIG += gps
+-      }
+       exists(/usr/include/pcap.h) | \
+       exists(/usr/local/include/pcap.h) {
+         CONFIG += pcap
+@@ -194,9 +177,6 @@
+     exists($$OUT_PWD/include/speex/speex_preprocess.h) {
+       CONFIG += speexdsp
+     }
+-    exists($$OUT_PWD/include/hamlib/rig.h) {
+-      CONFIG += hamlib
+-    }
+     exists($$OUT_PWD/include/pcap.h) {
+       CONFIG += pcap
+     }
+@@ -225,7 +205,7 @@
+          LIBS += -lz
+     }
+ }
+-exists($$OUT_PWD/include/neaacdec.h) {
++exists(/usr/include/neaacdec.h) {
+      DEFINES += HAVE_LIBFAAD \
+      USE_FAAD2_LIBRARY
+      LIBS += -lfaad_drm
+@@ -257,11 +237,6 @@
+      win32:LIBS += libspeexdsp.lib
+      message("with libspeexdsp")
+ }
+-gps {
+-     DEFINES += HAVE_LIBGPS
+-     unix:LIBS += -lgps
+-     message("with gps")
+-}
+ pcap {
+      DEFINES += HAVE_LIBPCAP
+      unix:LIBS += -lpcap
+@@ -269,24 +244,6 @@
+      win32-g++:LIBS += -lwpcap -lpacket
+      message("with pcap")
+ }
+-hamlib {
+-     DEFINES += HAVE_LIBHAMLIB
+-     macx:LIBS += -framework IOKit
+-     unix:LIBS += -lhamlib
+-     win32:LIBS += libhamlib-2.lib
+-     HEADERS += src/util/Hamlib.h
+-     SOURCES += src/util/Hamlib.cpp
+-     qt {
+-       HEADERS += src/util-QT/Rig.h
+-       SOURCES += src/util-QT/Rig.cpp
+-     }
+-     gui {
+-         HEADERS += src/GUI-QT/RigDlg.h
+-         SOURCES += src/GUI-QT/RigDlg.cpp
+-         FORMS += RigDlg.ui
+-     }
+-     message("with hamlib")
+-}
+ qwt {
+     DEFINES += QWT_NO_SVG
+     macx {

docker/files/js8call/js8call-hamlib.patch

@@ -1,6 +1,6 @@
 diff -ur js8call-orig/CMake/Modules/Findhamlib.cmake js8call/CMake/Modules/Findhamlib.cmake
---- js8call-orig/CMake/Modules/Findhamlib.cmake	2020-05-28 00:10:13.386429366 +0200
+--- js8call-orig/CMake/Modules/Findhamlib.cmake	2020-07-22 18:14:18.014499840 +0200
-+++ js8call/CMake/Modules/Findhamlib.cmake	2020-05-28 00:10:34.339623106 +0200
++++ js8call/CMake/Modules/Findhamlib.cmake	2020-07-22 18:16:07.200375473 +0200
 @@ -78,4 +78,4 @@
  # Handle the  QUIETLY and REQUIRED  arguments and set  HAMLIB_FOUND to
  # TRUE if all listed variables are TRUE
@@ -8,9 +8,9 @@ diff -ur js8call-orig/CMake/Modules/Findhamlib.cmake js8call/CMake/Modules/Findh
 -find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES hamlib_LIBRARY_DIRS)
 +find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES)
 diff -ur js8call-orig/CMakeLists.txt js8call/CMakeLists.txt
---- js8call-orig/CMakeLists.txt	2020-05-28 00:10:13.393095987 +0200
+--- js8call-orig/CMakeLists.txt	2020-07-22 18:14:18.014499840 +0200
-+++ js8call/CMakeLists.txt	2020-05-28 00:12:09.925653037 +0200
++++ js8call/CMakeLists.txt	2020-07-22 18:17:55.629633825 +0200
-@@ -683,7 +683,7 @@
+@@ -558,7 +558,7 @@
  #
  # libhamlib setup
  #
@@ -19,7 +19,7 @@ diff -ur js8call-orig/CMakeLists.txt js8call/CMakeLists.txt
  find_package (hamlib 3 REQUIRED)
  find_program (RIGCTL_EXE rigctl)
  find_program (RIGCTLD_EXE rigctld)
-@@ -1033,55 +1033,6 @@
+@@ -911,56 +911,6 @@
    target_link_libraries (js8 wsjt_fort wsjt_cxx Qt5::Core)
  endif (${OPENMP_FOUND} OR APPLE)
  
@@ -31,6 +31,7 @@ diff -ur js8call-orig/CMakeLists.txt js8call/CMakeLists.txt
 -  wsjtx.rc
 -  ${WSJTX_ICON_FILE}
 -  ${wsjtx_RESOURCES_RCC}
+-  images.qrc
 -  )
 -
 -if (WSJT_CREATE_WINMAIN)
@@ -75,7 +76,7 @@ diff -ur js8call-orig/CMakeLists.txt js8call/CMakeLists.txt
  # if (UNIX)
  #   if (NOT WSJT_SKIP_MANPAGES)
  #     add_subdirectory (manpages)
-@@ -1097,38 +1048,10 @@
+@@ -976,38 +926,10 @@
  #
  # installation
  #
@@ -114,7 +115,7 @@ diff -ur js8call-orig/CMakeLists.txt js8call/CMakeLists.txt
  install (FILES
    contrib/Ephemeris/JPLEPH
    DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
-@@ -1182,32 +1105,6 @@
+@@ -1061,32 +983,6 @@
    "${CMAKE_CURRENT_BINARY_DIR}/wsjtx_config.h"
    )
  

docker/files/wsjtx/wsjtx-hamlib.patch

@@ -1,20 +1,19 @@
---- CMakeLists.txt	2020-05-25 19:26:41.423517236 +0200
+--- CMakeLists.txt.orig	2021-03-30 15:28:36.956587995 +0200
-+++ CMakeLists.txt	2020-05-25 19:11:36.116236231 +0200
++++ CMakeLists.txt	2021-03-30 15:29:45.719326832 +0200
-@@ -79,24 +79,6 @@
+@@ -106,24 +106,6 @@
  
- include (ExternalProject)
  
--
+ #
--#
 -# build and install hamlib locally so it can be referenced by the
 -# WSJT-X build
 -#
 -ExternalProject_Add (hamlib
 -  GIT_REPOSITORY ${hamlib_repo}
 -  GIT_TAG ${hamlib_TAG}
--  URL ${CMAKE_CURRENT_SOURCE_DIR}/src/hamlib.tgz
+-  GIT_SHALLOW False
+-  URL ${CMAKE_CURRENT_SOURCE_DIR}/src/${__hamlib_upstream}.tar.gz
 -  URL_HASH MD5=${hamlib_md5sum}
--  UPDATE_COMMAND ./bootstrap
+-  #UPDATE_COMMAND ${CMAKE_COMMAND} -E env "[ -f ./bootstrap ] && ./bootstrap"
 -  PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 -N < ${CMAKE_CURRENT_SOURCE_DIR}/hamlib.patch
 -  CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-shared --enable-static --without-cxx-binding ${EXTRA_FLAGS} # LIBUSB_LIBS=${USB_LIBRARY}
 -  BUILD_COMMAND $(MAKE) all V=1 # $(MAKE) is ExternalProject_Add() magic to do recursive make
@@ -22,10 +21,11 @@
 -  STEP_TARGETS update install
 -  )
 -
- #
+-#
  # custom target to make a hamlib source tarball
  #
-@@ -128,7 +110,6 @@
+ add_custom_target (hamlib_sources
+@@ -161,7 +143,6 @@
  # build and optionally install WSJT-X using the hamlib package built
  # above
  #
@@ -33,11 +33,18 @@
  ExternalProject_Add (wsjtx
    GIT_REPOSITORY ${wsjtx_repo}
    GIT_TAG ${WSJTX_TAG}
-@@ -152,7 +133,6 @@
+@@ -186,14 +167,8 @@
    DEPENDEES build
    )
  
 -set_target_properties (hamlib PROPERTIES EXCLUDE_FROM_ALL 1)
  set_target_properties (wsjtx PROPERTIES EXCLUDE_FROM_ALL 1)
  
- add_dependencies (wsjtx-configure hamlib-install)
+-add_dependencies (wsjtx-configure hamlib-install)
+-add_dependencies (wsjtx-build hamlib-install)
+-add_dependencies (wsjtx-install hamlib-install)
+-add_dependencies (wsjtx-package hamlib-install)
+-
+ # export traditional targets
+ add_custom_target (build ALL DEPENDS wsjtx-build)
+ add_custom_target (install DEPENDS wsjtx-install)

docker/files/wsjtx/wsjtx.patch

@@ -1,6 +1,6 @@
 diff -ur wsjtx-orig/CMake/Modules/Findhamlib.cmake wsjtx/CMake/Modules/Findhamlib.cmake
---- wsjtx-orig/CMake/Modules/Findhamlib.cmake	2020-05-27 22:41:57.774855748 +0200
+--- wsjtx-orig/CMake/Modules/Findhamlib.cmake	2021-02-01 20:38:00.947536514 +0100
-+++ wsjtx/CMake/Modules/Findhamlib.cmake	2020-05-27 22:42:35.267939882 +0200
++++ wsjtx/CMake/Modules/Findhamlib.cmake	2021-02-01 20:39:06.273680932 +0100
 @@ -85,4 +85,4 @@
  # Handle the  QUIETLY and REQUIRED  arguments and set  HAMLIB_FOUND to
  # TRUE if all listed variables are TRUE
@@ -8,9 +8,18 @@ diff -ur wsjtx-orig/CMake/Modules/Findhamlib.cmake wsjtx/CMake/Modules/Findhamli
 -find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES hamlib_LIBRARY_DIRS)
 +find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES)
 diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
---- wsjtx-orig/CMakeLists.txt	2020-05-27 22:41:57.774855748 +0200
+--- wsjtx-orig/CMakeLists.txt	2021-02-01 20:38:00.947536514 +0100
-+++ wsjtx/CMakeLists.txt	2020-05-27 22:58:18.905001618 +0200
++++ wsjtx/CMakeLists.txt	2021-02-01 23:02:22.503027275 +0100
-@@ -869,7 +869,7 @@
+@@ -122,7 +122,7 @@
+ option (WSJT_QDEBUG_TO_FILE "Redirect Qt debuging messages to a trace file.")
+ option (WSJT_SOFT_KEYING "Apply a ramp to CW keying envelope to reduce transients." ON)
+ option (WSJT_SKIP_MANPAGES "Skip *nix manpage generation.")
+-option (WSJT_GENERATE_DOCS "Generate documentation files." ON)
++option (WSJT_GENERATE_DOCS "Generate documentation files.")
+ option (WSJT_RIG_NONE_CAN_SPLIT "Allow split operation with \"None\" as rig.")
+ option (WSJT_TRACE_UDP "Debugging option that turns on UDP message protocol diagnostics.")
+ option (WSJT_BUILD_UTILS "Build simulators and code demonstrators." ON)
+@@ -856,7 +856,7 @@
  #
  # libhamlib setup
  #
@@ -19,31 +28,37 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
  find_package (hamlib 3 REQUIRED)
  find_program (RIGCTL_EXE rigctl)
  find_program (RIGCTLD_EXE rigctld)
-@@ -1326,54 +1326,10 @@
+@@ -1376,60 +1376,6 @@
- 
+   target_link_libraries (jt9 wsjt_fort wsjt_cxx fort_qt)
- endif(WSJT_BUILD_UTILS)
+ endif (${OPENMP_FOUND} OR APPLE)
  
 -# build the main application
+-generate_version_info (wsjtx_VERSION_RESOURCES
+-  NAME wsjtx
+-  BUNDLE ${PROJECT_BUNDLE_NAME}
+-  ICON ${WSJTX_ICON_FILE}
+-  )
+-
 -add_executable (wsjtx MACOSX_BUNDLE
 -  ${wsjtx_CXXSRCS}
 -  ${wsjtx_GENUISRCS}
--  wsjtx.rc
 -  ${WSJTX_ICON_FILE}
 -  ${wsjtx_RESOURCES_RCC}
+-  ${wsjtx_VERSION_RESOURCES}
 -  )
 -
- if (WSJT_CREATE_WINMAIN)
+-if (WSJT_CREATE_WINMAIN)
-   set_target_properties (wsjtx PROPERTIES WIN32_EXECUTABLE ON)
+-  set_target_properties (wsjtx PROPERTIES WIN32_EXECUTABLE ON)
- endif (WSJT_CREATE_WINMAIN)
+-endif (WSJT_CREATE_WINMAIN)
- 
+-
 -set_target_properties (wsjtx PROPERTIES
 -  MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Darwin/Info.plist.in"
--  MACOSX_BUNDLE_INFO_STRING "${WSJTX_DESCRIPTION_SUMMARY}"
+-  MACOSX_BUNDLE_INFO_STRING "${PROJECT_DESCRIPTION}"
 -  MACOSX_BUNDLE_ICON_FILE "${WSJTX_ICON_FILE}"
--  MACOSX_BUNDLE_BUNDLE_VERSION ${wsjtx_VERSION}
+-  MACOSX_BUNDLE_BUNDLE_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}
--  MACOSX_BUNDLE_SHORT_VERSION_STRING "v${wsjtx_VERSION}"
+-  MACOSX_BUNDLE_SHORT_VERSION_STRING "v${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
--  MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${wsjtx_VERSION}"
+-  MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${SCS_VERSION_STR}"
--  MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"
+-  MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_BUNDLE_NAME}"
 -  MACOSX_BUNDLE_BUNDLE_EXECUTABLE_NAME "${PROJECT_NAME}"
 -  MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT}"
 -  MACOSX_BUNDLE_GUI_IDENTIFIER "org.k1jt.wsjtx"
@@ -51,9 +66,9 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 -
 -target_include_directories (wsjtx PRIVATE ${FFTW3_INCLUDE_DIRS})
 -if (APPLE)
--  target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+-  target_link_libraries (wsjtx wsjt_fort)
 -else ()
--  target_link_libraries (wsjtx wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+-  target_link_libraries (wsjtx wsjt_fort_omp)
 -  if (OpenMP_C_FLAGS)
 -    set_target_properties (wsjtx PROPERTIES
 -      COMPILE_FLAGS "${OpenMP_C_FLAGS}"
@@ -65,16 +80,16 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 -    )
 -  if (WIN32)
 -    set_target_properties (wsjtx PROPERTIES
--      LINK_FLAGS -Wl,--stack,16777216
+-      LINK_FLAGS -Wl,--stack,0x1000000,--heap,0x20000000
 -      )
 -  endif ()
 -endif ()
--qt5_use_modules (wsjtx SerialPort) # not sure why the interface link library syntax above doesn't work
+-target_link_libraries (wsjtx Qt5::SerialPort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES} ${LIBM_LIBRARIES})
 -
  # make a library for WSJT-X UDP servers
  # add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
  add_library (wsjtx_udp-static STATIC ${UDP_library_CXXSRCS})
-@@ -1417,24 +1373,9 @@
+@@ -1492,24 +1438,9 @@
    set_target_properties (message_aggregator PROPERTIES WIN32_EXECUTABLE ON)
  endif (WSJT_CREATE_WINMAIN)
  
@@ -99,21 +114,21 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
  
  # install (TARGETS wsjtx_udp EXPORT udp
  #   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-@@ -1453,12 +1394,7 @@
+@@ -1528,12 +1459,7 @@
  #   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wsjtx
  #   )
  
--install (TARGETS udp_daemon message_aggregator
+-install (TARGETS udp_daemon message_aggregator wsjtx_app_version
 -  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
 -  BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
 -  )
 -
 -install (TARGETS jt9 wsprd fmtave fcal fmeasure
-+install (TARGETS jt9 wsprd
++install (TARGETS wsjtx_app_version jt9 wsprd
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
    BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
    )
-@@ -1471,39 +1407,6 @@
+@@ -1546,38 +1472,6 @@
    )
  endif(WSJT_BUILD_UTILS)  
  
@@ -144,13 +159,25 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 -  AUTHORS
 -  THANKS
 -  NEWS
--  INSTALL
 -  BUGS
 -  DESTINATION ${CMAKE_INSTALL_DOCDIR}
 -  #COMPONENT runtime
 -  )
 -
  install (FILES
-   contrib/Ephemeris/JPLEPH
+   cty.dat
-   DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
+   cty.dat_copyright.txt
-Only in wsjtx: .idea
+@@ -1586,13 +1480,6 @@
+   #COMPONENT runtime
+   )
+ 
+-install (DIRECTORY
+-  example_log_configurations
+-  DESTINATION ${CMAKE_INSTALL_DOCDIR}
+-  FILES_MATCHING REGEX "^.*[^~]$"
+-  #COMPONENT runtime
+-  )
+-
+ #
+ # Mac installer files
+ #

docker/scripts/install-connectors.sh

@@ -24,7 +24,7 @@ apt-get update
 apt-get -y install --no-install-recommends $BUILD_PACKAGES
 
 git clone https://github.com/jketterl/owrx_connector.git
-cmakebuild owrx_connector 45ec227b38bb763b0a923a1856740f4ddf74216c
+cmakebuild owrx_connector 0.4.0
 
 apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean

docker/scripts/install-dependencies-airspy.sh

@@ -25,16 +25,19 @@ apt-get update
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/airspy/airspyone_host.git
-cmakebuild airspyone_host bceca18f9e3a5f89cff78c4d949c71771d92dfd3
+# latest from master as of 2020-09-04
+cmakebuild airspyone_host 652fd7f1a8f85687641e0bd91f739694d7258ecc
 
 git clone https://github.com/pothosware/SoapyAirspy.git
 cmakebuild SoapyAirspy 10d697b209e7f1acc8b2c8d24851d46170ef77e3
 
 git clone https://github.com/airspy/airspyhf.git
-cmakebuild airspyhf 613852a2bb64af42690bf9be2201826af69a9475
+# latest from master as of 2020-09-04
+cmakebuild airspyhf 8891387edddcd185e2949e9814e9ef35f46f0722
 
 git clone https://github.com/pothosware/SoapyAirspyHF.git
-cmakebuild SoapyAirspyHF 81ca737bb044dd930a9de738bced1e4915491f1b
+# latest from master as of 2020-09-04
+cmakebuild SoapyAirspyHF 5488dac5b44f1432ce67b40b915f7e61d3bd4853
 
 apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean

docker/scripts/install-dependencies-fcdpp.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -euxo pipefail
+export MAKEFLAGS="-j4"
+
+function cmakebuild() {
+  cd $1
+  if [[ ! -z "${2:-}" ]]; then
+    git checkout $2
+  fi
+  mkdir build
+  cd build
+  cmake ..
+  make
+  make install
+  cd ../..
+  rm -rf $1
+}
+
+cd /tmp
+
+STATIC_PACKAGES="libhidapi-hidraw0 libhidapi-libusb0 libasound2"
+BUILD_PACKAGES="git cmake make gcc g++ libhidapi-dev libasound2-dev"
+
+apt-get update
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
+
+git clone https://github.com/pothosware/SoapyFCDPP.git
+cmakebuild SoapyFCDPP soapy-fcdpp-0.1.1
+
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*

docker/scripts/install-dependencies-hackrf.sh

@@ -26,13 +26,15 @@ apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/mossmann/hackrf.git
 cd hackrf
-git checkout 43e6f99fe8543094d18ff3a6550ed2066c398862
+# latest from master as of 2020-09-04
+git checkout 6e5cbda2945c3bab0e6e1510eae418eda60c358e
 cmakebuild host
 cd ..
 rm -rf hackrf
 
 git clone https://github.com/pothosware/SoapyHackRF.git
-cmakebuild SoapyHackRF 3c514cecd3dd2fdf4794aebc96c482940c11d7ff
+# latest from master as of 2020-09-04
+cmakebuild SoapyHackRF 7d530872f96c1cbe0ed62617c32c48ce7e103e1d
 
 SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean

docker/scripts/install-dependencies-hpsdr.sh

@@ -0,0 +1,46 @@
+#!/bin/bash
+set -euxo pipefail
+export MAKEFLAGS="-j4"
+
+BUILD_PACKAGES="git wget gcc libc6-dev"
+
+apt-get update
+apt-get -y install --no-install-recommends $BUILD_PACKAGES
+
+pushd /tmp
+
+ARCH=$(uname -m)
+GOVERSION=1.15.5
+
+case ${ARCH} in
+  x86_64)
+    PACKAGE=go${GOVERSION}.linux-amd64.tar.gz
+    ;;
+  armv*)
+    PACKAGE=go${GOVERSION}.linux-armv6l.tar.gz
+    ;;
+  aarch64)
+    PACKAGE=go${GOVERSION}.linux-arm64.tar.gz
+    ;;
+esac
+
+wget https://golang.org/dl/${PACKAGE}
+tar xfz $PACKAGE
+
+git clone https://github.com/jancona/hpsdrconnector.git
+pushd hpsdrconnector
+git checkout v0.4.2
+/tmp/go/bin/go build
+install -m 0755 hpsdrconnector /usr/local/bin
+
+popd
+
+rm -rf hpsdrconnector
+rm -rf go
+rm $PACKAGE
+
+popd
+
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*

docker/scripts/install-dependencies-limesdr.sh

@@ -17,7 +17,8 @@ fi
 
 git clone https://github.com/myriadrf/LimeSuite.git
 cd LimeSuite
-git checkout 0854a51ec06b30b01f19a562149c39461e92f24d
+# latest from master as of 2020-09-04
+git checkout 9526621f8b4c9e2a7f638b5ef50c45560dcad22a
 mkdir builddir
 cd builddir
 cmake .. -DENABLE_EXAMPLES=OFF -DENABLE_DESKTOP=OFF -DENABLE_LIME_UTIL=OFF -DENABLE_QUICKTEST=OFF -DENABLE_OCTAVE=OFF -DENABLE_GUI=OFF -DCMAKE_CXX_STANDARD_LIBRARIES="-latomic" ${SIMD_FLAGS}

docker/scripts/install-dependencies-perseus.sh

@@ -12,7 +12,8 @@ apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/Microtelecom/libperseus-sdr.git
 cd libperseus-sdr
-git checkout 72ac67c5b7936a1991be0ec97c03a59c1a8ac8f3
+# latest from master as of 2020-09-04
+git checkout c2c95daeaa08bf0daed0e8ada970ab17cc264e1b
 ./bootstrap.sh
 ./configure
 make

docker/scripts/install-dependencies-plutosdr.sh

@@ -19,19 +19,20 @@ function cmakebuild() {
 cd /tmp
 
 STATIC_PACKAGES="libusb-1.0-0 libxml2"
-BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++ libxml2-dev flex bison"
+BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++ libxml2-dev flex bison pkg-config"
 
 apt-get update
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/analogdevicesinc/libiio.git
-cmakebuild libiio 5f5af2e417129ad8f4e05fc5c1b730f0694dca12 -DCMAKE_INSTALL_PREFIX=/usr/local
+cmakebuild libiio v0.21 -DCMAKE_INSTALL_PREFIX=/usr/local
 
 git clone https://github.com/analogdevicesinc/libad9361-iio.git
-cmakebuild libad9361-iio 8ac95f3325c18c2e34cd9cfd49c7b63d69a0a9d2
+cmakebuild libad9361-iio v0.2
 
 git clone https://github.com/pothosware/SoapyPlutoSDR.git
-cmakebuild SoapyPlutoSDR c88b7f5bac1e5785f212f9a7c6ce8fef64eb719e
+# latest from master as of 2020-09-04
+cmakebuild SoapyPlutoSDR 93717b32ef052e0dfa717aa2c1a4eb27af16111f
 
 apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean

docker/scripts/install-dependencies-radioberry.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+set -euxo pipefail
+export MAKEFLAGS="-j4"
+
+function cmakebuild() {
+  cd $1
+  if [[ ! -z "${2:-}" ]]; then
+    git checkout $2
+  fi
+  mkdir build
+  cd build
+  cmake .. 
+  make
+  make install
+  cd ../..
+  rm -rf $1
+}
+
+cd /tmp
+
+STATIC_PACKAGES="libusb-1.0-0 libfftw3-3 udev"
+BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev libfftw3-dev pkg-config"
+
+apt-get update
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
+
+git clone https://github.com/pa3gsb/Radioberry-2.x
+cd Radioberry-2.x/SBC/rpi-4
+
+# latest from master as of 2020-09-04
+cmakebuild SoapyRadioberrySDR 8d17de6b4dc076e628900a82f05c7cf0b16cbe24
+cd ../../..
+rm -rf Radioberry-2.x
+
+SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*

docker/scripts/install-dependencies-rtlsdr-soapy.sh

@@ -25,10 +25,11 @@ apt-get update
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/osmocom/rtl-sdr.git
-cmakebuild rtl-sdr d794155ba65796a76cd0a436f9709f4601509320
+# latest from master as of 2020-09-04
+cmakebuild rtl-sdr ed0317e6a58c098874ac58b769cf2e609c18d9a5
 
 git clone https://github.com/pothosware/SoapyRTLSDR.git
-cmakebuild SoapyRTLSDR 8ba18f17d64005e43ff2a4e46611f8c710b05007
+cmakebuild SoapyRTLSDR soapy-rtl-sdr-0.3.1
 
 apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean

docker/scripts/install-dependencies-rtlsdr.sh

@@ -25,7 +25,8 @@ apt-get update
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/osmocom/rtl-sdr.git
-cmakebuild rtl-sdr d794155ba65796a76cd0a436f9709f4601509320
+# latest from master as of 2020-09-04
+cmakebuild rtl-sdr ed0317e6a58c098874ac58b769cf2e609c18d9a5
 
 apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean

docker/scripts/install-dependencies-runds.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -euxo pipefail
+export MAKEFLAGS="-j4"
+
+function cmakebuild() {
+  cd $1
+  if [[ ! -z "${2:-}" ]]; then
+    git checkout $2
+  fi
+  mkdir build
+  cd build
+  cmake ..
+  make
+  make install
+  cd ../..
+  rm -rf $1
+}
+
+cd /tmp
+
+STATIC_PACKAGES=""
+BUILD_PACKAGES="git cmake make gcc g++ pkg-config"
+
+apt-get update
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
+
+git clone https://github.com/jketterl/runds_connector.git
+cmakebuild runds_connector 0.1.0
+
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*

docker/scripts/install-dependencies-sdrplay.sh

@@ -49,7 +49,8 @@ rm -rf sdrplay
 rm $BINARY
 
 git clone https://github.com/SDRplay/SoapySDRPlay.git
-cmakebuild SoapySDRPlay 1c2728a04db5edf8154d02f5cca87e655152d7c1
+# latest from master as of 2020-09-04
+cmakebuild SoapySDRPlay 105f8a6b3d449982d7ef860790c201aa066b8fa9
 
 SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean

docker/scripts/install-dependencies-soapyremote.sh

@@ -25,7 +25,7 @@ apt-get update
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/pothosware/SoapyRemote.git
-cmakebuild SoapyRemote 6d9bd820da470cfe7b27b2e6946af93cfece448f
+cmakebuild SoapyRemote soapy-remote-0.5.2
 
 apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean

docker/scripts/install-dependencies-soapysdr.sh

@@ -25,7 +25,8 @@ apt-get update
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/pothosware/SoapySDR
-cmakebuild SoapySDR f722f9ce5b629c3c44401a9bf628b3f8e67a9695
+# latest from master as of 2020-09-04
+cmakebuild SoapySDR 580b94f3dad46899f34ec0a060dbb4534e844e57
 
 SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean

docker/scripts/install-dependencies-uhd.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+set -euo pipefail
+export MAKEFLAGS="-j4"
+
+function cmakebuild() {
+  cd $1
+  if [[ ! -z "${2:-}" ]]; then
+    git checkout $2
+  fi
+  mkdir build
+  cd build
+  cmake ..
+  make
+  make install
+  cd ../..
+  rm -rf $1
+}
+
+cd /tmp
+
+STATIC_PACKAGES="libusb-1.0.0 libboost-chrono1.67.0 libboost-date-time1.67.0 libboost-filesystem1.67.0 libboost-program-options1.67.0 libboost-regex1.67.0 libboost-test1.67.0 libboost-serialization1.67.0 libboost-thread1.67.0 libboost-system1.67.0 python3-numpy python3-mako"
+BUILD_PACKAGES="git cmake make gcc g++ libusb-1.0-0-dev libboost-dev libboost-chrono-dev libboost-date-time-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev libboost-test-dev libboost-serialization-dev libboost-thread-dev libboost-system-dev"
+
+apt-get update
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
+
+git clone https://github.com/EttusResearch/uhd.git
+# 3.15.0.0 Release
+mkdir -p uhd/host/build
+cd uhd/host/build
+git checkout v3.15.0.0
+# see https://github.com/EttusResearch/uhd/issues/350
+case `uname -m` in
+  arm*)
+    cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_UTILS=OFF -DENABLE_PYTHON_API=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF -DENABLE_OCTOCLOCK=OFF -DENABLE_MAN_PAGES=OFF -DSTRIP_BINARIES=ON \
+          -DCMAKE_CXX_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a8 -Wno-psabi" \
+            -DCMAKE_C_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a8 -Wno-psabi" \
+          -DCMAKE_ASM_FLAGS:STRING="-march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a8 -g" ..
+    ;;
+  aarch64*)
+    cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_UTILS=OFF -DENABLE_PYTHON_API=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF -DENABLE_OCTOCLOCK=OFF -DENABLE_MAN_PAGES=OFF -DSTRIP_BINARIES=ON \
+          -DCMAKE_CXX_FLAGS:STRING="-march=armv8-a -mtune=cortex-a72 -Wno-psabi" \
+            -DCMAKE_C_FLAGS:STRING="-march=armv8-a -mtune=cortex-a72 -Wno-psabi" \
+          -DCMAKE_ASM_FLAGS:STRING="-march=armv8-a -mtune=cortex-a72 -g" ..
+    ;;
+  x86_64)
+    cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_UTILS=OFF -DENABLE_PYTHON_API=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF -DENABLE_OCTOCLOCK=OFF -DENABLE_MAN_PAGES=OFF -DSTRIP_BINARIES=ON ..
+    ;;
+esac
+make
+make install
+cd ../../..
+rm -rf uhd
+
+git clone https://github.com/pothosware/SoapyUHD.git
+cmakebuild SoapyUHD soapy-uhd-0.4.1
+
+SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*

docker/scripts/install-dependencies.sh

@@ -18,9 +18,8 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5core5a libreadline7 libgfortran4 libgomp1 libasound2 libudev1 ca-certificates"
+STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5core5a libreadline7 libgfortran4 libgomp1 libasound2 libudev1 ca-certificates libqt5gui5 libqt5sql5 libqt5printsupport5 libpulse0 libfaad2 libopus0 libboost-program-options1.67.0 libboost-log1.67.0"
-BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev autoconf automake libtool texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev pkg-config libudev-dev libhamlib-dev patch xsltproc"
+BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev libudev-dev libhamlib-dev patch xsltproc qt5-default libfaad-dev libopus-dev libgtest-dev libboost-dev libboost-program-options-dev libboost-log-dev libboost-regex-dev"
-
 apt-get update
 apt-get -y install auto-apt-proxy
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
@@ -37,53 +36,22 @@ case `uname -m` in
         ;;
 esac
 
-pushd /tmp
 wget https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-${PLATFORM}.tar.gz
 tar xzf s6-overlay-${PLATFORM}.tar.gz -C /
 rm s6-overlay-${PLATFORM}.tar.gz
-popd
 
-git clone https://github.com/jketterl/js8py.git
+JS8CALL_VERSION=2.2.0
-pushd js8py
+JS8CALL_DIR=js8call
-git checkout 888e62be375316882ad2b2ac8e396c3bf857b6fc
+JS8CALL_TGZ=js8call-${JS8CALL_VERSION}.tgz
-python3 setup.py install
-popd
-rm -rf js8py
-
-git clone https://git.code.sf.net/p/itpp/git itpp
-cmakebuild itpp bb5c7e95f40e8fdb5c3f3d01a84bcbaf76f3676d
-
-git clone https://github.com/jketterl/csdr.git
-cd csdr
-git checkout c4d8a8a5590898e8c9e94b88b96a2fdc7cd0493a
-autoreconf -i
-./configure
-make
-make install
-cd ..
-rm -rf csdr
-
-git clone https://github.com/szechyjs/mbelib.git
-cmakebuild mbelib 9a04ed5c78176a9965f3d43f7aa1b1f5330e771f
-
-git clone https://github.com/jketterl/digiham.git
-cmakebuild digiham 95206501be89b38d0267bf6c29a6898e7c65656f
-
-git clone https://github.com/f4exb/dsd.git
-cmakebuild dsd f6939f9edbbc6f66261833616391a4e59cb2b3d7
-
-JS8CALL_VERSION=2.1.1
-JS8CALL_DIR=js8call-${JS8CALL_VERSION}
-JS8CALL_TGZ=${JS8CALL_DIR}.tgz
 wget http://files.js8call.com/${JS8CALL_VERSION}/${JS8CALL_TGZ}
 tar xfz ${JS8CALL_TGZ}
 # patch allows us to build against the packaged hamlib
 patch -Np1 -d ${JS8CALL_DIR} < /js8call-hamlib.patch
 rm /js8call-hamlib.patch
-CMAKE_ARGS="-D CMAKE_CXX_FLAGS=-DJS8_USE_LEGACY_HAMLIB" cmakebuild ${JS8CALL_DIR}
+CMAKE_ARGS="-D CMAKE_CXX_FLAGS=-DJS8_USE_HAMLIB_THREE" cmakebuild ${JS8CALL_DIR}
 rm ${JS8CALL_TGZ}
 
-WSJT_DIR=wsjtx-2.1.2
+WSJT_DIR=wsjtx-2.3.1
 WSJT_TGZ=${WSJT_DIR}.tgz
 wget http://physics.princeton.edu/pulsar/k1jt/${WSJT_TGZ}
 tar xfz ${WSJT_TGZ}
@@ -92,16 +60,56 @@ mv /wsjtx.patch ${WSJT_DIR}
 cmakebuild ${WSJT_DIR}
 rm ${WSJT_TGZ}
 
-git clone --depth 1 -b 1.5 https://github.com/wb2osz/direwolf.git
+git clone --depth 1 -b 1.6 https://github.com/wb2osz/direwolf.git
 cd direwolf
+# hamlib is present (necessary for the wsjt-x and js8call builds) and would be used, but there's no real need.
+# this patch prevents direwolf from linking to it, and it can be stripped at the end of the script.
+patch -Np1 < /direwolf-hamlib.patch
+mkdir build
+cd build
+cmake ..
 make
 make install
-cd ..
+cd ../..
 rm -rf direwolf
+# strip lots of generic documentation that will never be read inside a docker container
+rm /usr/local/share/doc/direwolf/*.pdf
+# examples are pointless, too
+rm -rf /usr/local/share/doc/direwolf/examples/
 
-git clone https://github.com/hessu/aprs-symbols /opt/aprs-symbols
+git clone https://github.com/drowe67/codec2.git
-pushd /opt/aprs-symbols
+cd codec2
+# latest commit from master as of 2020-10-04
+git checkout 55d7bb8d1bddf881bdbfcb971a718b83e6344598
+mkdir build
+cd build
+cmake ..
+make
+make install
+install -m 0755 src/freedv_rx /usr/local/bin
+cd ../..
+rm -rf codec2
+
+wget https://downloads.sourceforge.net/project/drm/dream/2.1.1/dream-2.1.1-svn808.tar.gz
+tar xvfz dream-2.1.1-svn808.tar.gz
+pushd dream
+patch -Np0 < /dream.patch
+qmake CONFIG+=console
+make
+make install
+popd
+rm -rf dream
+rm dream-2.1.1-svn808.tar.gz
+
+git clone https://github.com/mobilinkd/m17-cxx-demod.git
+# latest master as of 2021-04-20
+cmakebuild m17-cxx-demod c1d954fd5e5c53d28a2524e99484f832f9dcb826
+
+git clone https://github.com/hessu/aprs-symbols /usr/share/aprs-symbols
+pushd /usr/share/aprs-symbols
 git checkout 5c2abe2658ee4d2563f3c73b90c6f59124839802
+# remove unused files (including git meta information)
+rm -rf .git aprs-symbols.ai aprs-sym-export.js
 popd
 
 apt-get -y purge --autoremove $BUILD_PACKAGES

docker/scripts/install-owrx-tools.sh

@@ -0,0 +1,45 @@
+#!/bin/bash
+set -euxo pipefail
+export MAKEFLAGS="-j4"
+
+function cmakebuild() {
+  cd $1
+  if [[ ! -z "${2:-}" ]]; then
+    git checkout $2
+  fi
+  mkdir build
+  cd build
+  cmake ${CMAKE_ARGS:-} ..
+  make
+  make install
+  cd ../..
+  rm -rf $1
+}
+
+cd /tmp
+
+STATIC_PACKAGES="libfftw3-bin"
+BUILD_PACKAGES="git autoconf automake libtool libfftw3-dev pkg-config cmake make gcc g++"
+apt-get update
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
+
+git clone https://github.com/jketterl/js8py.git
+pushd js8py
+git checkout 0.1.0
+python3 setup.py install
+popd
+rm -rf js8py
+
+git clone https://github.com/jketterl/csdr.git
+cd csdr
+git checkout 0.17.0
+autoreconf -i
+./configure
+make
+make install
+cd ..
+rm -rf csdr
+
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*

docker/scripts/run.sh

@@ -1,19 +1,25 @@
 #!/bin/bash
 set -euo pipefail
 
-mkdir -p /etc/openwebrx/
+mkdir -p /etc/openwebrx/openwebrx.conf.d
+mkdir -p /var/lib/openwebrx
 mkdir -p /tmp/openwebrx/
-if [[ ! -f /etc/openwebrx/config_webrx.py ]] ; then
+if [[ ! -f /etc/openwebrx/openwebrx.conf.d/20-temporary-directory.conf ]] ; then
-  sed 's/temporary_directory = "\/tmp"/temporary_directory = "\/tmp\/openwebrx"/' < "/opt/openwebrx/config_webrx.py" > "/etc/openwebrx/config_webrx.py"
+  cat << EOF > /etc/openwebrx/openwebrx.conf.d/20-temporary-directory.conf
+[core]
+temporary_directory = /tmp/openwebrx
+EOF
 fi
 if [[ ! -f /etc/openwebrx/bands.json ]] ; then
   cp bands.json /etc/openwebrx/
 fi
-if [[ ! -f /etc/openwebrx/bookmarks.json ]] ; then
+if [[ ! -f /etc/openwebrx/openwebrx.conf ]] ; then
-  cp bookmarks.json /etc/openwebrx/
+  cp openwebrx.conf /etc/openwebrx/
 fi
-if [[ ! -f /etc/openwebrx/users.json ]] ; then
+if [[ ! -z "${OPENWEBRX_ADMIN_USER:-}" ]] && [[ ! -z "${OPENWEBRX_ADMIN_PASSWORD:-}" ]] ; then
-  cp users.json /etc/openwebrx/
+  if ! python3 openwebrx.py admin --silent hasuser "${OPENWEBRX_ADMIN_USER}" ; then
+    OWRX_PASSWORD="${OPENWEBRX_ADMIN_PASSWORD}" python3 openwebrx.py admin --noninteractive adduser "${OPENWEBRX_ADMIN_USER}"
+  fi
 fi
 
 

htdocs/css/admin.css

@@ -1,14 +1,162 @@
 @import url("openwebrx-header.css");
 @import url("openwebrx-globals.css");
 
+html, body {
+    height: unset;
+}
+
+body {
+    margin-bottom: 5rem;
+}
+
+hr {
+    background: #444;
+}
+
 .buttons {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    background-color: #222;
+    z-index: 2;
+    padding: 10px;
     text-align: right;
+    border-top: 1px solid #444;
 }
 
 .row .map-input {
     margin: 15px 15px 0;
 }
 
-.device {
+.settings-section h3 {
-    margin-top: 20px;
+    margin-top: 1em;
+    margin-bottom: 1em;
 }
+
+h1 {
+    margin: 1em 0;
+    text-align: center;
+}
+
+.matrix {
+    display: grid;
+}
+
+.q65-matrix {
+    grid-template-columns: repeat(5, auto);
+}
+
+.imageupload .image-container {
+    max-width: 100%;
+    padding: 7px;
+}
+
+.imageupload img.webrx-top-photo {
+    max-height: 350px;
+    max-width: 100%;
+}
+
+.settings-grid > div {
+    padding: 20px;
+}
+
+.settings-grid .btn {
+    width: 100%;
+    height: 100px;
+    padding: 20px;
+    font-size: 1.2rem;
+}
+
+.tab-body {
+    overflow: auto;
+    border: 1px solid #444;
+    border-top: none;
+    border-bottom-left-radius: 0.25rem;
+    border-bottom-right-radius: 0.25rem;
+}
+
+.tab-body .form-group {
+    padding-right: 15px;
+}
+
+.bookmarks table .frequency, .bookmark-list table .frequency {
+    text-align: right;
+}
+
+.bookmarks table input, .bookmarks table select {
+    width: initial;
+    text-align: inherit;
+    display: initial;
+}
+
+.bookmark-list table .form-check-input {
+    margin-left: 0;
+}
+
+.actions {
+    margin: 1rem 0;
+}
+
+.actions .btn {
+    width: 100%;
+}
+
+.wsjt-decoding-depths-table {
+    width: auto;
+    margin: 0;
+}
+
+.wsjt-decoding-depths-table td:first-child {
+    padding-left: 0;
+}
+
+.sdr-device-list .list-group-item,
+.sdr-profile-list .list-group-item {
+    background: initial;
+}
+
+.sdr-device-list .sdr-profile-list {
+    max-height: 20rem;
+    overflow-y: auto;
+}
+
+.removable-group.removable, .add-group {
+    display: flex;
+    flex-direction: row;
+}
+
+.removable-group.removable .removable-item, .add-group .add-group-select {
+    flex: 1 0 auto;
+    margin-right: .25rem;
+}
+
+.removable-group.removable .option-remove-button, .add-group .option-add-button {
+    flex: 0 0 70px;
+}
+
+.option-add-button, .option-remove-button {
+    width: 70px;
+}
+
+.scheduler-static-time-inputs  {
+    display: flex;
+    flex-direction: row;
+}
+
+.scheduler-static-time-inputs > * {
+    flex: 0 0 auto;
+    width: unset;
+}
+
+.scheduler-static-time-inputs > select {
+    flex: 1 0 auto;
+}
+
+.breadcrumb {
+    margin-top: .5rem;
+}
+
+.imageupload.is-invalid ~ .invalid-feedback {
+    display: block;
+}

htdocs/css/features.css

@@ -1,7 +0,0 @@
-@import url("openwebrx-header.css");
-@import url("openwebrx-globals.css");
-
-h1 {
-    text-align: center;
-    margin: 50px 0;
-}

htdocs/css/login.css

@@ -1,6 +1,16 @@
 @import url("openwebrx-header.css");
 @import url("openwebrx-globals.css");
 
+body {
+    display: flex;
+    flex-direction: column;
+}
+
+.login-container {
+    flex: 1;
+    position: relative;
+}
+
 .login {
     position: absolute;
     left: 50%;

htdocs/css/map.css

@@ -6,10 +6,6 @@ body {
     flex-direction: column;
 }
 
-#webrx-top-container {
-    flex: none;
-}
-
 .openwebrx-map {
     flex: 1 1 auto;
 }
@@ -25,10 +21,18 @@ ul {
     padding-inline-start: 25px;
 }
 
+/* don't show the filter in it's initial position */
 .openwebrx-map-legend {
+    display: none;
     background-color: #fff;
     padding: 10px;
     margin: 10px;
+    user-select: none;
+}
+
+/* show it as soon as google maps has moved it to its container */
+.openwebrx-map .openwebrx-map-legend {
+    display: block;
 }
 
 .openwebrx-map-legend ul {
@@ -36,6 +40,15 @@ ul {
     padding: 0;
 }
 
+.openwebrx-map-legend ul li {
+    cursor: pointer;
+}
+
+.openwebrx-map-legend ul li.disabled {
+    opacity: .3;
+    filter: grayscale(70%);
+}
+
 .openwebrx-map-legend li.square .illustration {
     display: inline-block;
     width: 30px;

htdocs/css/openwebrx-globals.css

@@ -6,3 +6,20 @@ html, body
     font-family: "DejaVu Sans", Verdana, Geneva, sans-serif;
 }
 
+.sprite {
+    background-image: url(../gfx/openwebrx-sprites.png);
+    display: inline-block;
+}
+
+.openwebrx-button.highlighted .sprite {
+    background-image: linear-gradient(rgba(255,127,0,0.5), rgba(255,127,0,0.5)), url(../gfx/openwebrx-sprites.png);
+    background-blend-mode: overlay;
+}
+
+@media only screen and (-webkit-min-device-pixel-ratio: 2),
+only screen and (min-device-pixel-ratio: 2) {
+    .sprite {
+        background-image: url(../gfx/openwebrx-sprites-2x.png);
+        background-size: 198px 77px;
+    }
+}

htdocs/css/openwebrx-header.css

@@ -1,32 +1,36 @@
-#webrx-top-container
+.webrx-top-container {
-{
     position: relative;
     z-index:1000;
     background-color: #575757;
-}
 
-#webrx-top-photo
+    background-image: url(../gfx/openwebrx-top-photo.jpg);
-{
+    background-position-x: center;
-    width: 100%;
+    background-position-y: top;
-    display: block;
+    background-repeat: no-repeat;
-}
+    background-size: cover;
 
-#webrx-top-photo-clip
-{
-    min-height: 67px;
-    max-height: 67px;
-    height: 350px;
     overflow: hidden;
-    position: relative;
 }
 
-.webrx-top-bar-parts
+.openwebrx-description-container {
-{
+    transition-property: height, opacity;
+    transition-duration: 1s;
+    transition-timing-function: ease-out;
+    opacity: 0;
+    height: 0;
+    /* originally, top-bar + description was 350px */
+    max-height: 283px;
+    overflow: hidden;
+}
+
+.openwebrx-description-container.expanded {
+    opacity: 1;
+    height: 283px;
+}
+
+.webrx-top-bar {
     height:67px;
-}
 
-#webrx-top-bar
-{
     background: rgba(128, 128, 128, 0.15);
     margin:0;
     padding:0;
@@ -37,35 +41,30 @@
     -moz-user-select: none;
     -ms-user-select: none;
     overflow: hidden;
-    position: absolute;
+
-    left: 0;
+    display: flex;
-    top: 0;
+    flex-direction: row;
-    right: 0;
 }
 
-#webrx-tob-container, #webrx-top-container * {
+.webrx-top-bar > * {
+    flex: 0;
+}
+
+.webrx-top-container, .webrx-top-container * {
     line-height: initial;
     box-sizing: initial;
 }
 
-#webrx-top-container img {
+.webrx-top-logo {
-    vertical-align: initial;
-}
-
-#webrx-top-logo
-{
     padding: 12px;
-    float: left;
+    /* overwritten by media queries */
+    display: none;
 }
 
-#webrx-rx-avatar
+.webrx-rx-avatar {
-{
     background-color: rgba(154, 154, 154, .5);
-    border-radius: 7px;
-    float: left;
     margin: 7px;
 
-    cursor:pointer;
     width: 46px;
     height: 46px;
     padding: 4px;
@@ -73,88 +72,79 @@
     box-sizing: content-box;
 }
 
-#webrx-rx-texts {
+.webrx-rx-texts {
-    float: left;
+    /* minimum layout width */
-    padding: 10px;
+    width: 0;
+    /* will be getting wider with flex */
+    flex: 1;
+    overflow: hidden;
+    margin: auto 0;
 }
 
-#webrx-rx-texts div {
+.webrx-rx-texts div, .webrx-rx-texts h1 {
+    margin: 0 10px;
     padding: 3px;
-}
-
-#webrx-rx-title
-{
     white-space:nowrap;
     overflow: hidden;
-    cursor:pointer;
-    font-family: "DejaVu Sans", Verdana, Geneva, sans-serif;
     color: #909090;
+    text-align: left;
+}
+
+.webrx-rx-title {
+    font-family: "DejaVu Sans", Verdana, Geneva, sans-serif;
     font-size: 11pt;
     font-weight: bold;
 }
 
-#webrx-rx-desc
+.webrx-rx-desc {
-{
-    white-space:nowrap;
-    overflow: hidden;
-    cursor:pointer;
     font-size: 10pt;
-    color: #909090;
 }
 
-#webrx-rx-desc a
+.openwebrx-rx-details-arrow {
-{
-    color: #909090;
-}
-
-#openwebrx-rx-details-arrow
-{
-    cursor:pointer;
     position: absolute;
-    left: 470px;
+    bottom: 0;
-    top: 55px;
+    left: 50%;
-}
+    transform: translate(-50%, 0);
 
-#openwebrx-rx-details-arrow a
-{
     margin: 0;
     padding: 0;
     line-height: 0;
     display: block;
 }
 
-#openwebrx-main-buttons .button {
+.openwebrx-main-buttons .button {
     display: block;
     width: 55px;
     cursor:pointer;
 }
 
-#openwebrx-main-buttons .button img {
+.openwebrx-main-buttons .button[data-toggle-panel] {
+    /* will be enabled by javascript if the panel is present in the DOM */
+    display: none;
+}
+
+.openwebrx-main-buttons .button img {
     height: 38px;
 }
 
-#openwebrx-main-buttons a {
+.openwebrx-main-buttons a {
     color: inherit;
     text-decoration: inherit;
 }
 
-#openwebrx-main-buttons .button:hover
+.openwebrx-main-buttons .button:hover {
-{
     background-color: rgba(255, 255, 255, 0.3);
 }
 
-#openwebrx-main-buttons .button:active
+.openwebrx-main-buttons .button:active {
-{
     background-color: rgba(255, 255, 255, 0.55);
 }
 
 
-#openwebrx-main-buttons
+.openwebrx-main-buttons {
-{
     padding: 5px 15px;
     display: flex;
     list-style: none;
-    float: right;
     margin:0;
     color: white;
     text-shadow: 0px 0px 4px #000000;
@@ -163,23 +153,17 @@
     font-weight: bold;
 }
 
-#webrx-rx-photo-title
+.webrx-rx-photo-title {
-{
+    margin: 10px 15px;
-    position: absolute;
+    color: white;
-    left: 15px;
-    top: 78px;
-    color: White;
     font-size: 16pt;
     text-shadow: 1px 1px 4px #444;
     opacity: 1;
 }
 
-#webrx-rx-photo-desc
+.webrx-rx-photo-desc {
-{
+    margin: 10px 15px;
-    position: absolute;
+    color: white;
-    left: 15px;
-    top: 109px;
-    color: White;
     font-size: 10pt;
     font-weight: bold;
     text-shadow: 0px 0px 6px #444;
@@ -187,9 +171,79 @@
     line-height: 1.5em;
 }
 
-#webrx-rx-photo-desc a
+.webrx-rx-photo-desc a {
-{
     color: #5ca8ff;
     text-shadow: none;
 }
 
+.openwebrx-photo-trigger {
+    cursor: pointer;
+}
+
+/*
+ * Responsive stuff
+ */
+
+@media (min-width: 576px) {
+    .webrx-rx-texts {
+        display: initial;
+    }
+}
+
+@media (min-width: 768px) {
+}
+
+@media (min-width: 992px) {
+    .webrx-top-logo {
+        display: initial;
+    }
+}
+
+@media (min-width: 1200px) {
+}
+
+/*
+ * Sprites (images)
+ */
+
+.sprite-panel-status {
+    background-position: 0 0;
+    width: 44px;
+    height: 38px;
+}
+
+.sprite-panel-log {
+    background-position: -44px 0;
+    width: 38px;
+    height: 38px;
+}
+
+.sprite-panel-receiver {
+    background-position: -82px 0;
+    width: 40px;
+    height: 38px;
+}
+
+.sprite-panel-map {
+    background-position: -122px 0;
+    width: 38px;
+    height: 38px;
+}
+
+.sprite-panel-settings {
+    background-position: -160px 0;
+    width: 38px;
+    height: 38px;
+}
+
+.openwebrx-rx-details-arrow--down .sprite-rx-details-arrow {
+    background-position: 0 -65px;
+    width: 43px;
+    height: 12px;
+}
+
+.openwebrx-rx-details-arrow--up .sprite-rx-details-arrow {
+    background-position: -43px -65px;
+    width: 43px;
+    height: 12px;
+}

htdocs/css/openwebrx.css

@@ -3,7 +3,7 @@
 	This file is part of OpenWebRX,
 	an open-source SDR receiver software with a web UI.
 	Copyright (c) 2013-2015 by Andras Retzler <randras@sdr.hu>
-	Copyright (c) 2019-2020 by Jakob Ketterl <dd5jfk@darc.de>
+	Copyright (c) 2019-2021 by Jakob Ketterl <dd5jfk@darc.de>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as
@@ -36,15 +36,14 @@ input
 	vertical-align:middle;
 }
 
-input[type=range]
+input[type=range] {
-{
 	-webkit-appearance: none;
 	margin: 0 0;
-	background: transparent;
+	background: transparent !important;
 	--track-background: #B6B6B6;
 }
-input[type=range]:focus
+
-{
+input[type=range]:focus {
 	outline: none;
 }
 
@@ -274,6 +273,18 @@ input[type=range]:disabled {
 	flex-direction: column;
 }
 
+@supports(background-image: -webkit-image-set(url('../gfx/openwebrx-background-cool-blue.webp') 1x)) {
+    #webrx-canvas-background {
+        background-image: -webkit-image-set(url('../gfx/openwebrx-background-cool-blue.webp') 1x);
+    }
+}
+
+@supports(background-image: image-set(url('../gfx/openwebrx-background-cool-blue.webp') 1x)) {
+    #webrx-canvas-background {
+        background-image: image-set(url('../gfx/openwebrx-background-cool-blue.webp') 1x);
+    }
+}
+
 #webrx-canvas-container
 {
 	position: relative;
@@ -285,11 +296,13 @@ input[type=range]:disabled {
 #webrx-canvas-container canvas
 {
 	position: absolute;
+	top: 0;
 	border-style: none;
 	image-rendering: crisp-edges;
 	image-rendering: -webkit-optimize-contrast;
     width: 100%;
     height: 200px;
+    will-change: transform;
 }
 
 #openwebrx-log-scroll
@@ -310,7 +323,9 @@ input[type=range]:disabled {
 
 @font-face {
     font-family: 'roboto-mono';
-    src: url('../fonts/RobotoMono-Regular.ttf');
+    src: url('../fonts/RobotoMono-Regular.woff2') format('woff2'),
+         url('../fonts/RobotoMono-Regular.woff') format('woff'),
+         url('../fonts/RobotoMono-Regular.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 }
@@ -322,12 +337,58 @@ input[type=range]:disabled {
 	margin: 0;
 	display: flex;
 	flex-direction: row;
+	cursor: pointer;
 }
 
 .webrx-actual-freq > * {
     flex: 1;
 }
 
+.webrx-actual-freq .input-group {
+    display: flex;
+    flex-direction: row;
+}
+
+.webrx-actual-freq .input-group > * {
+    flex: 0 0 auto;
+}
+
+.webrx-actual-freq .input-group input {
+    flex: 1 0 auto;
+    margin-right: 0;
+    border-right: 1px solid #373737;
+    -moz-appearance: textfield;
+}
+
+.webrx-actual-freq .input-group input::-webkit-outer-spin-button,
+.webrx-actual-freq .input-group input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+}
+
+.input-group > :not(:last-child) {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
+.input-group > :not(:first-child) {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+}
+
+.input-group :first-child {
+    padding-left: 5px;
+}
+
+.input-group :last-child {
+    padding-right: 5px
+}
+
+.webrx-actual-freq .input-group input, .webrx-actual-freq .input-group select {
+    outline: none;
+    font-size: 16pt;
+}
+
 .webrx-actual-freq input {
     font-family: 'roboto-mono';
     width: 0;
@@ -341,7 +402,17 @@ input[type=range]:disabled {
 .webrx-actual-freq, .webrx-actual-freq input {
 	font-size: 16pt;
 	font-family: 'roboto-mono';
-	line-height: 22px;
+}
+
+.webrx-actual-freq .digit {
+    cursor: ns-resize;
+}
+
+.webrx-actual-freq .digit:hover {
+	color: #FFFF50;
+	border-radius: 5px;
+	background: -webkit-gradient( linear, left top, left bottom, color-stop(0.0 , #373737), color-stop(1, #4F4F4F) );
+	background: -moz-linear-gradient( center top, #373737 0%, #4F4F4F 100% );
 }
 
 .webrx-mouse-freq {
@@ -421,7 +492,7 @@ input[type=range]:disabled {
 	display: inline-block;
 }
 
-.openwebrx-button:hover, .openwebrx-demodulator-button.highlighted
+.openwebrx-button:hover, .openwebrx-demodulator-button.highlighted, .openwebrx-button.highlighted
 {
 	/*background:-webkit-gradient( linear, left top, left bottom, color-stop(0.0	, #3F3F3F), color-stop(1, #777777) );
 	background:-moz-linear-gradient( center top, #373737 5%, #4F4F4F 100% );*/
@@ -445,7 +516,6 @@ input[type=range]:disabled {
 
 .openwebrx-demodulator-button
 {
-	width: 38px;
 	height: 19px;
 	font-size: 12pt;
 	text-align: center;
@@ -531,21 +601,35 @@ img.openwebrx-mirror-img
     -khtml-user-select: none;
     -moz-user-select: none;
     -ms-user-select: none;
+    overflow: hidden;
+    z-index: 1
 }
 
-.openwebrx-progressbar-bar
+.openwebrx-progressbar-bar {
-{
+	background-color: #00aba6;
 	border-radius: 5px;
 	height: 100%;
 	width: 100%;
+	transition-property: transform, background-color;
+	transition-duration: 1s;
+	transition-timing-function: ease-in-out;
+	transform: translate(-100%) translateZ(0);
+	will-change: transform, background-color;
+	z-index: 0;
+}
+
+.openwebrx-progressbar--over .openwebrx-progressbar-bar {
+    background-color: #ff6262;
 }
 
 .openwebrx-progressbar-text
 {
 	position: absolute;
-	left:0px;
+	left:50%;
-	top:4px;
+	top:50%;
-	width: inherit;
+	transform: translate(-50%, -50%);
+	white-space: nowrap;
+	z-index: 2;
 }
 
 #openwebrx-panel-status
@@ -570,6 +654,7 @@ img.openwebrx-mirror-img
 #openwebrx-panel-receiver .frequencies-container {
     display: flex;
     flex-direction: row;
+    gap: 5px;
 }
 
 #openwebrx-panel-receiver .frequencies {
@@ -620,8 +705,32 @@ img.openwebrx-mirror-img
     padding-top: 0;
 }
 
-#openwebrx-smeter-outer
+.openwebrx-modes-grid {
-{
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    margin: -5px -5px 0 0;
+}
+
+.openwebrx-modes-grid .openwebrx-demodulator-button {
+    margin: 0;
+    white-space: nowrap;
+    flex: 1 0 38px;
+    margin: 5px 5px 0 0;
+}
+
+@supports(gap: 5px) {
+    .openwebrx-modes-grid {
+        margin: 0;
+        gap: 5px;
+    }
+
+    .openwebrx-modes-grid .openwebrx-demodulator-button {
+        margin: 0;
+    }
+}
+
+#openwebrx-smeter {
 	border-color: #888;
 	border-style: solid;
 	border-width: 0px;
@@ -629,16 +738,20 @@ img.openwebrx-mirror-img
 	height: 7px;
 	background-color: #373737;
 	border-radius: 3px;
-	position: relative;
+	overflow: hidden;
 }
-#openwebrx-smeter-bar
+
-{
+.openwebrx-smeter-bar {
-	transition: all 0.2s linear;
+	transition-property: transform;
-	width: 0px;
+	transition-duration: 0.2s;
-	height: 7px;
+	transition-timing-function: linear;
+	will-change: transform;
+	transform: translate(-100%) translateZ(0);
+	width: 100%;
+	height: 100%;
 	background: linear-gradient(to top, #ff5939 , #961700);
-	position: absolute;
+	margin: 0;
-	margin: 0; padding: 0; left: 0;
+	padding: 0;
 	border-radius: 3px;
 }
 
@@ -708,11 +821,14 @@ img.openwebrx-mirror-img
 #openwebrx-digimode-canvas-container canvas
 {
     position: absolute;
+    top: 0;
     pointer-events: none;
     transition: width 500ms, left 500ms;
+    will-change: transform;
 }
 
 .openwebrx-panel select,
+.openwebrx-panel input,
 .openwebrx-dialog select,
 .openwebrx-dialog input {
 	border-radius: 5px;
@@ -721,11 +837,26 @@ img.openwebrx-mirror-img
 	font-weight: normal;
 	font-size: 13pt;
 	margin-right: 1px;
-	background:-webkit-gradient( linear, left top, left bottom, color-stop(0.0	, #373737), color-stop(1, #4F4F4F) );
+	background:linear-gradient(#373737, #4F4F4F);
-	background:-moz-linear-gradient( center top, #373737 0%, #4F4F4F 100% );
 	border-color: transparent;
 	border-width: 0px;
-	-moz-appearance: none;
+}
+
+@supports(-moz-appearance: none) {
+    .openwebrx-panel select,
+    .openwebrx-dialog select {
+        -moz-appearance: none;
+        background-image: url('data:image/svg+xml;charset=US-ASCII,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22292.4%22%20height%3D%22292.4%22%20%20xmlns%3Av%3D%22https%3A%2F%2Fvecta.io%2Fnano%22%3E%3Cpath%20d%3D%22M287%2069.4a17.6%2017.6%200%200%200-13-5.4H18.4c-5%200-9.3%201.8-12.9%205.4A17.6%2017.6%200%200%200%200%2082.2c0%205%201.8%209.3%205.4%2012.9l128%20127.9c3.6%203.6%207.8%205.4%2012.8%205.4s9.2-1.8%2012.8-5.4L287%2095c3.5-3.5%205.4-7.8%205.4-12.8s-1.9-9.2-5.5-12.8z%22%20fill%3D%22%23fff%22%2F%3E%3C%2Fsvg%3E'),
+            linear-gradient(#373737, #4F4F4F);
+        background-repeat: no-repeat, repeat;
+        background-position: right .3em top 50%, 0 0;
+        background-size: .65em auto, 100%;
+    }
+
+    .openwebrx-panel .input-group select,
+    .openwebrx-dialog .input-group select {
+        padding-right: 1em;
+    }
 }
 
 .openwebrx-panel select option,
@@ -848,20 +979,36 @@ img.openwebrx-mirror-img
     border-color: Red;
 }
 
+.openwebrx-meta-panel {
+    display: flex;
+    flex-direction: row;
+    gap: 10px;
+    /* compatibility with iOS 14.2 */
+    flex: 0 0 auto;
+}
+
 .openwebrx-meta-slot {
+    flex: 1;
     width: 145px;
     height: 196px;
-    float: left;
-    margin-right: 10px;
 
     background-color: #676767;
     padding: 2px 0;
     color: #333;
 
     text-align: center;
+
+    display: flex;
+    flex-direction: column;
     position: relative;
 }
 
+.openwebrx-meta-slot > * {
+    flex: 0;
+    flex-basis: 1.2em;
+    line-height: 1.2em;
+}
+
 .openwebrx-meta-slot, .openwebrx-meta-slot.muted:before {
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
@@ -872,8 +1019,6 @@ img.openwebrx-mirror-img
     display: block;
     content: "";
     background-image: url("../gfx/openwebrx-mute.png");
-    width:100%;
-    height:133px;
     background-position: center;
     background-repeat: no-repeat;
     cursor: pointer;
@@ -901,27 +1046,44 @@ img.openwebrx-mirror-img
     box-shadow: rgba(0, 0, 0, 0.2) 0 -1px 7px 1px, inset #304701 0 -1px 9px, #89FF00 0 2px 12px;
 }
 
-.openwebrx-meta-slot:last-child {
-    margin-right: 0;
-}
-
 .openwebrx-meta-slot .openwebrx-meta-user-image {
-    width:100%;
+    flex: 1;
-    height:133px;
     background-position: center;
     background-repeat: no-repeat;
 }
 
-.openwebrx-meta-slot.active .openwebrx-meta-user-image {
+.openwebrx-meta-slot.active.direct .openwebrx-meta-user-image,
+#openwebrx-panel-metadata-ysf .openwebrx-meta-slot.active .openwebrx-meta-user-image {
     background-image: url("../gfx/openwebrx-directcall.png");
 }
 
-.openwebrx-meta-slot.active .openwebrx-meta-user-image.group {
+.openwebrx-meta-slot.active.group .openwebrx-meta-user-image {
     background-image: url("../gfx/openwebrx-groupcall.png");
 }
 
+.openwebrx-meta-slot.group .openwebrx-dmr-target:not(:empty):before {
+    content: "Talkgroup: ";
+}
+
+.openwebrx-meta-slot.direct .openwebrx-dmr-target:not(:empty):before {
+    content: "Direct: ";
+}
+
 .openwebrx-dmr-timeslot-panel * {
     cursor: pointer;
+    user-select: none;
+}
+
+.openwebrx-ysf-mode:not(:empty):before {
+    content: "Mode: ";
+}
+
+.openwebrx-ysf-up:not(:empty):before {
+    content: "Up: ";
+}
+
+.openwebrx-ysf-down:not(:empty):before {
+    content: "Down: ";
 }
 
 .openwebrx-maps-pin {
@@ -936,6 +1098,7 @@ img.openwebrx-mirror-img
 
 .openwebrx-message-panel {
     height: 180px;
+    position: relative;
 }
 
 .openwebrx-message-panel tbody {
@@ -1101,6 +1264,9 @@ img.openwebrx-mirror-img
 #openwebrx-panel-digimodes[data-mode="packet"] #openwebrx-digimode-content-container,
 #openwebrx-panel-digimodes[data-mode="pocsag"] #openwebrx-digimode-content-container,
 #openwebrx-panel-digimodes[data-mode="js8"]    #openwebrx-digimode-content-container,
+#openwebrx-panel-digimodes[data-mode="fst4"]   #openwebrx-digimode-content-container,
+#openwebrx-panel-digimodes[data-mode="fst4w"]  #openwebrx-digimode-content-container,
+#openwebrx-panel-digimodes[data-mode="q65"]    #openwebrx-digimode-content-container,
 #openwebrx-panel-digimodes[data-mode="ft8"]    #openwebrx-digimode-select-channel,
 #openwebrx-panel-digimodes[data-mode="wspr"]   #openwebrx-digimode-select-channel,
 #openwebrx-panel-digimodes[data-mode="jt65"]   #openwebrx-digimode-select-channel,
@@ -1108,7 +1274,10 @@ img.openwebrx-mirror-img
 #openwebrx-panel-digimodes[data-mode="ft4"]    #openwebrx-digimode-select-channel,
 #openwebrx-panel-digimodes[data-mode="packet"] #openwebrx-digimode-select-channel,
 #openwebrx-panel-digimodes[data-mode="pocsag"] #openwebrx-digimode-select-channel,
-#openwebrx-panel-digimodes[data-mode="js8"]    #openwebrx-digimode-select-channel
+#openwebrx-panel-digimodes[data-mode="js8"]    #openwebrx-digimode-select-channel,
+#openwebrx-panel-digimodes[data-mode="fst4"]   #openwebrx-digimode-select-channel,
+#openwebrx-panel-digimodes[data-mode="fst4w"]  #openwebrx-digimode-select-channel,
+#openwebrx-panel-digimodes[data-mode="q65"]    #openwebrx-digimode-select-channel
 {
     display: none;
 }
@@ -1120,9 +1289,84 @@ img.openwebrx-mirror-img
 #openwebrx-panel-digimodes[data-mode="ft4"]    #openwebrx-digimode-canvas-container,
 #openwebrx-panel-digimodes[data-mode="packet"] #openwebrx-digimode-canvas-container,
 #openwebrx-panel-digimodes[data-mode="pocsag"] #openwebrx-digimode-canvas-container,
-#openwebrx-panel-digimodes[data-mode="js8"]    #openwebrx-digimode-canvas-container
+#openwebrx-panel-digimodes[data-mode="js8"]    #openwebrx-digimode-canvas-container,
+#openwebrx-panel-digimodes[data-mode="fst4"]   #openwebrx-digimode-canvas-container,
+#openwebrx-panel-digimodes[data-mode="fst4w"]  #openwebrx-digimode-canvas-container,
+#openwebrx-panel-digimodes[data-mode="q65"]    #openwebrx-digimode-canvas-container
 {
     height: 200px;
     margin: -10px;
 }
 
+.sprite-zoom-in {
+    background-position: 0 -38px;
+    width: 27px;
+    height: 27px;
+}
+
+.sprite-zoom-out {
+    background-position: -27px -38px;
+    width: 27px;
+    height: 27px;
+}
+
+.sprite-zoom-in-total {
+    background-position: -54px -38px;
+    width: 24px;
+    height: 27px;
+}
+
+.sprite-zoom-out-total {
+    background-position: -78px -38px;
+    width: 25px;
+    height: 27px;
+}
+
+.sprite-edit {
+    background-position: -131px -51px;
+    width: 14px;
+    height: 14px;
+}
+
+.sprite-trashcan {
+    background-position: -145px -38px;
+    width: 14px;
+    height: 14px;
+}
+
+.sprite-speaker {
+    width: 14px;
+    height: 15px;
+}
+
+.openwebrx-mute-button .sprite-speaker {
+    background-position: -103px -38px;
+}
+
+.openwebrx-mute-button.muted .sprite-speaker {
+    background-position: -117px -38px;
+}
+
+.sprite-squelch {
+    background-position: -131px -38px;
+    width: 14px;
+    height: 13px;
+}
+
+.sprite-waterfall-auto {
+    background-position: -103px -53px;
+    width: 14px;
+    height: 11px;
+}
+
+.sprite-waterfall-default {
+    background-position: -117px -53px;
+    width: 14px;
+    height: 12px;
+}
+
+.sprite-bookmark {
+    background-position: -159px -38px;
+    width: 21px;
+    height: 27px;
+}

htdocs/features.html

@@ -3,7 +3,6 @@
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
     <link rel="stylesheet" href="static/css/bootstrap.min.css" />
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
-    <link rel="stylesheet" href="static/css/features.css">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/1.9.0/showdown.min.js"></script>
     <script src="static/lib/jquery-3.2.1.min.js"></script>
     <script src="static/lib/Header.js"></script>
@@ -11,6 +10,7 @@
 </HEAD><BODY>
     ${header}
     <div class="container">
+        ${breadcrumb}
         <h1>OpenWebRX Feature Report</h1>
         <table class="features table">
             <tr>
@@ -20,5 +20,6 @@
                 <th>Available</th>
             </tr>
         </table>
+        ${breadcrumb}
     </div>
 </BODY></HTML>

htdocs/features.js

@@ -13,8 +13,7 @@ $(function(){
             });
             $table.append(
                 '<tr>' +
-                    '<td colspan=2>' + name + '</td>' +
+                    '<td colspan=3>' + name + '</td>' +
-                    '<td>' + converter.makeHtml(details.description) + '</td>' +
                     '<td>' + (details.available ? 'YES' : 'NO') + '</td>' +
                 '</tr>' +
                 requirements.join("")

htdocs/generalsettings.html

@@ -1,20 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-    <title>OpenWebRX Settings</title>
-    <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
-    <link rel="stylesheet" href="static/css/bootstrap.min.css" />
-    <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
-    <script src="https://unpkg.com/location-picker/dist/location-picker.min.js"></script>
-    <script src="compiled/settings.js"></script>
-    <meta charset="utf-8">
-</head>
-<body>
-${header}
-<div class="container">
-    <div class="col-12">
-        <h1>General settings</h1>
-    </div>
-    ${sections}
-</div>
-</body>

htdocs/gfx/openwebrx-play-button.svg

@@ -0,0 +1 @@
+<svg width="700" height="700" xmlns="http://www.w3.org/2000/svg"><g class="layer"><circle cx="350" cy="350" r="330" stroke="#fff" stroke-width="36" fill="none"/><path d="M195 211v278l366-139-366-139z" fill="#fff"/></g></svg>

htdocs/include/header.include.html

@@ -1,26 +1,22 @@
-<div id="webrx-top-container">
+<div class="webrx-top-container">
-    <div id="webrx-top-photo-clip">
+    <div class="webrx-top-bar">
-        <img src="static/gfx/openwebrx-top-photo.jpg" id="webrx-top-photo" alt="Receiver panorama"/>
+        <a href="https://www.openwebrx.de/" target="_blank"><img src="${document_root}static/gfx/openwebrx-top-logo.png" class="webrx-top-logo" alt="OpenWebRX Logo"/></a>
-        <div id="webrx-top-bar" class="webrx-top-bar-parts">
+        <img class="webrx-rx-avatar openwebrx-photo-trigger" src="${document_root}static/gfx/openwebrx-avatar.png" alt="Receiver avatar"/>
-            <a href="https://www.openwebrx.de/" target="_blank"><img src="static/gfx/openwebrx-top-logo.png" id="webrx-top-logo" alt="OpenWebRX Logo"/></a>
+        <div class="webrx-rx-texts openwebrx-photo-trigger">
-            <img id="webrx-rx-avatar" class="openwebrx-photo-trigger" src="static/gfx/openwebrx-avatar.png" alt="Receiver avatar"/>
+            <h1 class="webrx-rx-title">${receiver_name}</h1>
-            <div id="webrx-rx-texts">
+            <div class="webrx-rx-desc">${receiver_location} | Loc: ${locator}, ASL: ${receiver_asl} m</div>
-                <div id="webrx-rx-title" class="openwebrx-photo-trigger"></div>
-                <div id="webrx-rx-desc" class="openwebrx-photo-trigger"></div>
-            </div>
-            <div id="openwebrx-rx-details-arrow">
-                <a id="openwebrx-rx-details-arrow-up" class="openwebrx-photo-trigger" style="display: none;"><img src="static/gfx/openwebrx-rx-details-arrow-up.png" /></a>
-                <a id="openwebrx-rx-details-arrow-down" class="openwebrx-photo-trigger"><img src="static/gfx/openwebrx-rx-details-arrow.png" /></a>
-            </div>
-            <section id="openwebrx-main-buttons">
-                <div class="button" data-toggle-panel="openwebrx-panel-status"><img src="static/gfx/openwebrx-panel-status.png" alt="Status"/><br/>Status</div>
-                <div class="button" data-toggle-panel="openwebrx-panel-log"><img  src="static/gfx/openwebrx-panel-log.png" alt="Log"/><br/>Log</div>
-                <div class="button" data-toggle-panel="openwebrx-panel-receiver"><img src="static/gfx/openwebrx-panel-receiver.png" alt="Receiver"/><br/>Receiver</div>
-                <a class="button" href="map" target="openwebrx-map"><img src="static/gfx/openwebrx-panel-map.png" alt="Map"/><br/>Map</a>
-                ${settingslink}
-            </section>
         </div>
-        <div id="webrx-rx-photo-title"></div>
+        <section class="openwebrx-main-buttons">
-        <div id="webrx-rx-photo-desc"></div>
+            <div class="button" data-toggle-panel="openwebrx-panel-status"><span class="sprite sprite-panel-status"></span><br/>Status</div>
+            <div class="button" data-toggle-panel="openwebrx-panel-log"><span class="sprite sprite-panel-log"></span><br/>Log</div>
+            <div class="button" data-toggle-panel="openwebrx-panel-receiver"><span class="sprite sprite-panel-receiver"></span><br/>Receiver</div>
+            <a class="button" href="${document_root}map" target="openwebrx-map"><span class="sprite sprite-panel-map"></span><br/>Map</a>
+            <a class="button" href="${document_root}settings" target="openwebrx-settings"><span class="sprite sprite-panel-settings"></span><br/>Settings</a>
+        </section>
     </div>
+    <div class="openwebrx-description-container">
+        <div class="webrx-rx-photo-title">${photo_title}</div>
+        <div class="webrx-rx-photo-desc">${photo_desc}</div>
+    </div>
+    <a class="openwebrx-rx-details-arrow openwebrx-rx-details-arrow--down openwebrx-photo-trigger"><span class="sprite sprite-rx-details-arrow"></span></a>
 </div>

htdocs/index.html

@@ -4,7 +4,7 @@
     This file is part of OpenWebRX,
     an open-source SDR receiver software with a web UI.
     Copyright (c) 2013-2015 by Andras Retzler <randras@sdr.hu>
-    Copyright (c) 2019-2020 by Jakob Ketterl <dd5jfk@darc.de>
+    Copyright (c) 2019-2021 by Jakob Ketterl <dd5jfk@darc.de>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as
@@ -28,6 +28,8 @@
         <link rel="stylesheet" type="text/css" href="static/lib/nanoscroller.css" />
         <link rel="stylesheet" type="text/css" href="static/css/openwebrx.css" />
         <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+        <meta name="theme-color" content="#222" />
     </head>
     <body onload="openwebrx_init();">
 <div id="webrx-page-container">
@@ -56,67 +58,33 @@
                     </div>
                 </div>
             </div>
-            <table class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-wsjt-message" style="display: none; width: 619px;" data-panel-name="wsjt-message">
+            <div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-wsjt-message" style="display: none; width: 619px;" data-panel-name="wsjt-message"></div>
-                <thead><tr>
+            <div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-js8-message" style="display:none; width: 619px;" data-panel-name="js8-message"></div>
-                    <th>UTC</th>
+            <div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-packet-message" style="display: none; width: 619px;" data-panel-name="aprs-message"></div>
-                    <th class="decimal">dB</th>
+            <div class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-pocsag-message" style="display: none; width: 619px;" data-panel-name="pocsag-message"></div>
-                    <th class="decimal">DT</th>
-                    <th class="decimal freq">Freq</th>
-                    <th class="message">Message</th>
-                </tr></thead>
-                <tbody></tbody>
-            </table>
-            <table class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-js8-message" style="display:none; width: 619px;" data-panel-name="js8-message">
-                <thead><tr>
-                    <th>UTC</th>
-                    <th class="decimal freq">Freq</th>
-                    <th class="message">Message</th>
-                </tr></thead>
-                <tbody></tbody>
-            </table>
-            <table class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-packet-message" style="display: none; width: 619px;" data-panel-name="aprs-message">
-                <thead><tr>
-                    <th>UTC</th>
-                    <th class="callsign">Callsign</th>
-                    <th class="coord">Coord</th>
-                    <th class="message">Comment</th>
-                </tr></thead>
-                <tbody></tbody>
-            </table>
-            <table class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-pocsag-message" style="display: none; width: 619px;" data-panel-name="pocsag-message">
-                <thead><tr>
-                    <th class="address">Address</th>
-                    <th class="message">Message</th>
-                </tr></thead>
-                <tbody></tbody>
-            </table>
             <div class="openwebrx-panel openwebrx-meta-panel" id="openwebrx-panel-metadata-ysf" style="display: none;" data-panel-name="metadata-ysf">
-                <div class="openwebrx-meta-frame">
+                <div class="openwebrx-meta-slot">
-                    <div class="openwebrx-meta-slot">
+                    <div class="openwebrx-ysf-mode"></div>
-                        <div class="openwebrx-ysf-mode openwebrx-meta-autoclear"></div>
+                    <div class="openwebrx-meta-user-image"></div>
-                        <div class="openwebrx-meta-user-image"></div>
+                    <div class="openwebrx-ysf-source"><span class="location"></span><span class="callsign"></span></div>
-                        <div class="openwebrx-ysf-source openwebrx-meta-autoclear"></div>
+                    <div class="openwebrx-ysf-up"></div>
-                        <div class="openwebrx-ysf-up openwebrx-meta-autoclear"></div>
+                    <div class="openwebrx-ysf-down"></div>
-                        <div class="openwebrx-ysf-down openwebrx-meta-autoclear"></div>
-                    </div>
                 </div>
             </div>
             <div class="openwebrx-panel openwebrx-meta-panel" id="openwebrx-panel-metadata-dmr" style="display: none;" data-panel-name="metadata-dmr">
-                <div class="openwebrx-meta-frame">
+                <div class="openwebrx-meta-slot openwebrx-dmr-timeslot-panel">
-                    <div class="openwebrx-meta-slot openwebrx-dmr-timeslot-panel">
+                    <div class="openwebrx-dmr-slot">Timeslot 1</div>
-                        <div class="openwebrx-dmr-slot">Timeslot 1</div>
+                    <div class="openwebrx-meta-user-image"></div>
-                        <div class="openwebrx-meta-user-image"></div>
+                    <div class="openwebrx-dmr-id"></div>
-                        <div class="openwebrx-dmr-id openwebrx-meta-autoclear"></div>
+                    <div class="openwebrx-dmr-name"></div>
-                        <div class="openwebrx-dmr-name openwebrx-meta-autoclear"></div>
+                    <div class="openwebrx-dmr-target"></div>
-                        <div class="openwebrx-dmr-target openwebrx-meta-autoclear"></div>
+                </div>
-                    </div>
+                <div class="openwebrx-meta-slot openwebrx-dmr-timeslot-panel">
-                    <div class="openwebrx-meta-slot openwebrx-dmr-timeslot-panel">
+                    <div class="openwebrx-dmr-slot">Timeslot 2</div>
-                        <div class="openwebrx-dmr-slot">Timeslot 2</div>
+                    <div class="openwebrx-meta-user-image"></div>
-                        <div class="openwebrx-meta-user-image"></div>
+                    <div class="openwebrx-dmr-id"></div>
-                        <div class="openwebrx-dmr-id openwebrx-meta-autoclear"></div>
+                    <div class="openwebrx-dmr-name"></div>
-                        <div class="openwebrx-dmr-name openwebrx-meta-autoclear"></div>
+                    <div class="openwebrx-dmr-target"></div>
-                        <div class="openwebrx-dmr-target openwebrx-meta-autoclear"></div>
-                    </div>
                 </div>
             </div>
             <div class="openwebrx-panel" id="openwebrx-panel-log" data-panel-name="debug" style="width: 619px;">
@@ -149,7 +117,7 @@
                         <div class="webrx-mouse-freq"></div>
                     </div>
                     <div class="openwebrx-button openwebrx-square-button openwebrx-bookmark-button" style="display:none;" title="Add bookmark...">
-                        <img src="static/gfx/openwebrx-bookmark.png">
+                        <span class="sprite sprite-bookmark"></span>
                     </div>
                 </div>
                 <div class="openwebrx-panel-line">
@@ -158,39 +126,33 @@
                 </div>
                 <div class="openwebrx-modes openwebrx-panel-line"></div>
                 <div class="openwebrx-panel-line">
-                    <div title="Mute on/off" id="openwebrx-mute-off" class="openwebrx-button" onclick="toggleMute();"><img src="static/gfx/openwebrx-speaker.png" class="openwebrx-sliderbtn-img" id="openwebrx-mute-img"></div>
+                    <div title="Mute on/off" class="openwebrx-button openwebrx-mute-button" onclick="toggleMute();"><span class="sprite sprite-speaker openwebrx-sliderbtn-img"></span></div>
                     <input title="Volume" id="openwebrx-panel-volume" class="openwebrx-panel-slider" type="range" min="0" max="150" value="50" step="1" onchange="updateVolume()" oninput="updateVolume()">
-                    <div title="Auto-adjust waterfall colors" id="openwebrx-waterfall-colors-auto" class="openwebrx-button" onclick="waterfall_measure_minmax_now=true;"><img src="static/gfx/openwebrx-waterfall-auto.png" class="openwebrx-sliderbtn-img"></div>
+                    <div title="Auto-adjust waterfall colors (right-click for continuous)" id="openwebrx-waterfall-colors-auto" class="openwebrx-button"><span class="sprite sprite-waterfall-auto openwebrx-sliderbtn-img"></span></div>
                     <input title="Waterfall minimum level" id="openwebrx-waterfall-color-min" class="openwebrx-panel-slider" type="range" min="-200" max="100" value="50" step="1" onchange="updateWaterfallColors(0);" oninput="updateVolume()">
                 </div>
                 <div class="openwebrx-panel-line">
-                    <div title="Auto-set squelch level" class="openwebrx-squelch-default openwebrx-button"><img src="static/gfx/openwebrx-squelch-button.png" class="openwebrx-sliderbtn-img"></div>
+                    <div title="Auto-set squelch level" class="openwebrx-squelch-auto openwebrx-button"><span class="sprite sprite-squelch openwebrx-sliderbtn-img"></span></div>
                     <input title="Squelch" class="openwebrx-squelch-slider openwebrx-panel-slider" type="range" min="-150" max="0" value="-150" step="1">
-                    <div title="Set waterfall colors to default" id="openwebrx-waterfall-colors-default" class="openwebrx-button" onclick="waterfallColorsDefault()"><img src="static/gfx/openwebrx-waterfall-default.png" class="openwebrx-sliderbtn-img"></div>
+                    <div title="Set waterfall colors to default" id="openwebrx-waterfall-colors-default" class="openwebrx-button" onclick="waterfallColorsDefault()"><span class="sprite sprite-waterfall-default openwebrx-sliderbtn-img"></span></div>
                     <input title="Waterfall maximum level" id="openwebrx-waterfall-color-max" class="openwebrx-panel-slider" type="range" min="-200" max="100" value="50" step="1" onchange="updateWaterfallColors(1);" oninput="updateVolume()">
                 </div>
                 <div class="openwebrx-panel-line">
-                    <div class="openwebrx-button openwebrx-square-button" onclick="zoomInOneStep();"  title="Zoom in one step">  <img src="static/gfx/openwebrx-zoom-in.png" /></div>
+                    <div class="openwebrx-button openwebrx-square-button" onclick="zoomInOneStep();"  title="Zoom in one step"><span class="sprite sprite-zoom-in"></span></div>
-                    <div class="openwebrx-button openwebrx-square-button" onclick="zoomOutOneStep();" title="Zoom out one step"> <img src="static/gfx/openwebrx-zoom-out.png" /></div>
+                    <div class="openwebrx-button openwebrx-square-button" onclick="zoomOutOneStep();" title="Zoom out one step"><span class="sprite sprite-zoom-out"></span></div>
-                    <div class="openwebrx-button openwebrx-square-button" onclick="zoomInTotal();"  title="Zoom in totally"><img src="static/gfx/openwebrx-zoom-in-total.png" /></div>
+                    <div class="openwebrx-button openwebrx-square-button" onclick="zoomInTotal();"  title="Zoom in totally"><span class="sprite sprite-zoom-in-total"></span></div>
-                    <div class="openwebrx-button openwebrx-square-button" onclick="zoomOutTotal();" title="Zoom out totally"><img src="static/gfx/openwebrx-zoom-out-total.png" /></div>
+                    <div class="openwebrx-button openwebrx-square-button" onclick="zoomOutTotal();" title="Zoom out totally"><span class="sprite sprite-zoom-out-total"></span></div>
                     <div id="openwebrx-smeter-db">0 dB</div>
                 </div>
                 <div class="openwebrx-panel-line">
-                    <div id="openwebrx-smeter-outer">
+                    <div id="openwebrx-smeter">
-                        <div id="openwebrx-smeter-bar"></div>
+                        <div class="openwebrx-smeter-bar"></div>
                     </div>
                 </div>
             </div>
         </div>
     </div>
 </div>
-    <div id="openwebrx-autoplay-overlay" class="openwebrx-overlay" style="display:none;">
-        <div class="overlay-content">
-            <img id="openwebrx-play-button" src="static/gfx/openwebrx-play-button.png" />
-            <div>Start OpenWebRX</div>
-        </div>
-    </div>
     <div id="openwebrx-error-overlay" class="openwebrx-overlay" style="display:none;">
         <div class="overlay-content">
             <div>This receiver is currently unavailable due to technical issues.</div>

htdocs/lib/AudioEngine.js

@@ -6,129 +6,189 @@ function AudioEngine(maxBufferLength, audioReporter) {
     this.audioReporter = audioReporter;
     this.initStats();
     this.resetStats();
-    var ctx = window.AudioContext || window.webkitAudioContext;
+
-    if (!ctx) {
+    this.onStartCallbacks = [];
+
+    this.started = false;
+    this.audioContext = this.buildAudioContext();
+    if (!this.audioContext) {
         return;
     }
-    this.audioContext = new ctx();
+
-    this.allowed = this.audioContext.state === 'running';
+    var me = this;
-    this.started = false;
+    this.audioContext.onstatechange = function() {
+        if (me.audioContext.state !== 'running') return;
+        me._start();
+    }
 
     this.audioCodec = new ImaAdpcmCodec();
     this.compression = 'none';
 
     this.setupResampling();
     this.resampler = new Interpolator(this.resamplingFactor);
+    this.hdResampler = new Interpolator(this.hdResamplingFactor);
 
     this.maxBufferSize = maxBufferLength * this.getSampleRate();
 }
 
-AudioEngine.prototype.start = function(callback) {
+AudioEngine.prototype.buildAudioContext = function() {
-    var me = this;
+    var ctxClass = window.AudioContext || window.webkitAudioContext;
-    if (me.resamplingFactor === 0) return; //if failed to find a valid resampling factor...
+    if (!ctxClass) {
-    if (me.started) {
-        if (callback) callback(false);
         return;
     }
 
-    me.audioContext.resume().then(function(){
+    // known good sample rates
-        me.allowed = me.audioContext.state === 'running';
+    var goodRates = [48000, 44100, 96000]
-        if (!me.allowed) {
+
-            if (callback) callback(false);
+    // let the browser chose the sample rate, if it is good, use it
-            return;
+    var ctx = new ctxClass({latencyHint: 'playback'});
+    if (goodRates.indexOf(ctx.sampleRate) >= 0) {
+        return ctx;
+    }
+
+    // if that didn't work, try if any of the good rates work
+    if (goodRates.some(function(sr) {
+        try {
+            ctx = new ctxClass({sampleRate: sr, latencyHint: 'playback'});
+            return true;
+        } catch (e) {
+            return false;
         }
-        me.started = true;
+    }, this)) {
+        return ctx;
+    }
 
-        me.gainNode = me.audioContext.createGain();
+    // fallback: let the browser decide
-        me.gainNode.connect(me.audioContext.destination);
+    // this may cause playback problems down the line
+    return new ctxClass({latencyHint: 'playback'});
+}
 
-        if (useAudioWorklets && me.audioContext.audioWorklet) {
+AudioEngine.prototype.resume = function(){
-            me.audioContext.audioWorklet.addModule('static/lib/AudioProcessor.js').then(function(){
+    this.audioContext.resume();
-                me.audioNode = new AudioWorkletNode(me.audioContext, 'openwebrx-audio-processor', {
+}
-                    numberOfInputs: 0,
+
-                    numberOfOutputs: 1,
+AudioEngine.prototype._start = function() {
-                    outputChannelCount: [1],
+    var me = this;
-                    processorOptions: {
+
-                        maxBufferSize: me.maxBufferSize
+    // if failed to find a valid resampling factor...
-                    }
+    if (me.resamplingFactor === 0) {
-                });
+         return;
-                me.audioNode.connect(me.gainNode);
+    }
-                me.audioNode.port.addEventListener('message', function(m){
+
-                    var json = JSON.parse(m.data);
+    // been started before?
-                    if (typeof(json.buffersize) !== 'undefined') {
+    if (me.started) {
-                        me.audioReporter({
+        return;
-                            buffersize: json.buffersize
+    }
-                        });
+
-                    }
+    // are we allowed to play audio?
-                    if (typeof(json.samplesProcessed) !== 'undefined') {
+    if (!me.isAllowed()) {
-                        me.audioSamples.add(json.samplesProcessed);
+        return;
-                    }
+    }
-                });
+    me.started = true;
-                me.audioNode.port.start();
+
-                if (callback) callback(true, 'AudioWorklet');
+    var runCallbacks = function(workletType) {
+        var callbacks = me.onStartCallbacks;
+        me.onStartCallbacks = false;
+        callbacks.forEach(function(c) { c(workletType); });
+    };
+
+    me.gainNode = me.audioContext.createGain();
+    me.gainNode.connect(me.audioContext.destination);
+
+    if (useAudioWorklets && me.audioContext.audioWorklet) {
+        me.audioContext.audioWorklet.addModule('static/lib/AudioProcessor.js').then(function(){
+            me.audioNode = new AudioWorkletNode(me.audioContext, 'openwebrx-audio-processor', {
+                numberOfInputs: 0,
+                numberOfOutputs: 1,
+                outputChannelCount: [1],
+                processorOptions: {
+                    maxBufferSize: me.maxBufferSize
+                }
             });
-        } else {
-            me.audioBuffers = [];
-
-            if (!AudioBuffer.prototype.copyToChannel) { //Chrome 36 does not have it, Firefox does
-                AudioBuffer.prototype.copyToChannel = function (input, channel) //input is Float32Array
-                {
-                    var cd = this.getChannelData(channel);
-                    for (var i = 0; i < input.length; i++) cd[i] = input[i];
-                }
-            }
-
-            var bufferSize;
-            if (me.audioContext.sampleRate < 44100 * 2)
-                bufferSize = 4096;
-            else if (me.audioContext.sampleRate >= 44100 * 2 && me.audioContext.sampleRate < 44100 * 4)
-                bufferSize = 4096 * 2;
-            else if (me.audioContext.sampleRate > 44100 * 4)
-                bufferSize = 4096 * 4;
-
-
-            function audio_onprocess(e) {
-                var total = 0;
-                var out = new Float32Array(bufferSize);
-                while (me.audioBuffers.length) {
-                    var b = me.audioBuffers.shift();
-                    // not enough space to fit all data, so splice and put back in the queue
-                    if (total + b.length > bufferSize) {
-                        var spaceLeft  = bufferSize - total;
-                        var tokeep = b.subarray(0, spaceLeft);
-                        out.set(tokeep, total);
-                        var tobuffer = b.subarray(spaceLeft, b.length);
-                        me.audioBuffers.unshift(tobuffer);
-                        total += spaceLeft;
-                        break;
-                    } else {
-                        out.set(b, total);
-                        total += b.length;
-                    }
-                }
-
-                e.outputBuffer.copyToChannel(out, 0);
-                me.audioSamples.add(total);
-
-            }
-
-            //on Chrome v36, createJavaScriptNode has been replaced by createScriptProcessor
-            var method = 'createScriptProcessor';
-            if (me.audioContext.createJavaScriptNode) {
-                method = 'createJavaScriptNode';
-            }
-            me.audioNode = me.audioContext[method](bufferSize, 0, 1);
-            me.audioNode.onaudioprocess = audio_onprocess;
             me.audioNode.connect(me.gainNode);
-            if (callback) callback(true, 'ScriptProcessorNode');
+            me.audioNode.port.addEventListener('message', function(m){
+                var json = JSON.parse(m.data);
+                if (typeof(json.buffersize) !== 'undefined') {
+                    me.audioReporter({
+                        buffersize: json.buffersize
+                    });
+                }
+                if (typeof(json.samplesProcessed) !== 'undefined') {
+                    me.audioSamples.add(json.samplesProcessed);
+                }
+            });
+            me.audioNode.port.start();
+            runCallbacks('AudioWorklet');
+        });
+    } else {
+        me.audioBuffers = [];
+
+        if (!AudioBuffer.prototype.copyToChannel) { //Chrome 36 does not have it, Firefox does
+            AudioBuffer.prototype.copyToChannel = function (input, channel) //input is Float32Array
+            {
+                var cd = this.getChannelData(channel);
+                for (var i = 0; i < input.length; i++) cd[i] = input[i];
+            }
         }
 
-        setInterval(me.reportStats.bind(me), 1000);
+        var bufferSize;
-    });
+        if (me.audioContext.sampleRate < 44100 * 2)
+            bufferSize = 4096;
+        else if (me.audioContext.sampleRate >= 44100 * 2 && me.audioContext.sampleRate < 44100 * 4)
+            bufferSize = 4096 * 2;
+        else if (me.audioContext.sampleRate > 44100 * 4)
+            bufferSize = 4096 * 4;
+
+
+        function audio_onprocess(e) {
+            var total = 0;
+            var out = new Float32Array(bufferSize);
+            while (me.audioBuffers.length) {
+                var b = me.audioBuffers.shift();
+                // not enough space to fit all data, so splice and put back in the queue
+                if (total + b.length > bufferSize) {
+                    var spaceLeft  = bufferSize - total;
+                    var tokeep = b.subarray(0, spaceLeft);
+                    out.set(tokeep, total);
+                    var tobuffer = b.subarray(spaceLeft, b.length);
+                    me.audioBuffers.unshift(tobuffer);
+                    total += spaceLeft;
+                    break;
+                } else {
+                    out.set(b, total);
+                    total += b.length;
+                }
+            }
+
+            e.outputBuffer.copyToChannel(out, 0);
+            me.audioSamples.add(total);
+
+        }
+
+        //on Chrome v36, createJavaScriptNode has been replaced by createScriptProcessor
+        var method = 'createScriptProcessor';
+        if (me.audioContext.createJavaScriptNode) {
+            method = 'createJavaScriptNode';
+        }
+        me.audioNode = me.audioContext[method](bufferSize, 0, 1);
+        me.audioNode.onaudioprocess = audio_onprocess;
+        me.audioNode.connect(me.gainNode);
+        runCallbacks('ScriptProcessorNode')
+    }
+
+    setInterval(me.reportStats.bind(me), 1000);
+};
+
+AudioEngine.prototype.onStart = function(callback) {
+    if (this.onStartCallbacks) {
+        this.onStartCallbacks.push(callback);
+    } else {
+        callback();
+    }
 };
 
 AudioEngine.prototype.isAllowed = function() {
-    return this.allowed;
+    return this.audioContext.state === 'running';
 };
 
 AudioEngine.prototype.reportStats = function() {
@@ -165,35 +225,58 @@ AudioEngine.prototype.resetStats = function() {
 };
 
 AudioEngine.prototype.setupResampling = function() { //both at the server and the client
-    var output_range_max = 12000;
+    var targetRate = this.audioContext.sampleRate;
-    var output_range_min = 8000;
+    var audio_params = this.findRate(8000, 12000);
+    if (!audio_params) {
+        this.resamplingFactor = 0;
+        this.outputRate = 0;
+        divlog('Your audio card sampling rate (' + targetRate + ') is not supported.<br />Please change your operating system default settings in order to fix this.', 1);
+    } else {
+        this.resamplingFactor = audio_params.resamplingFactor;
+        this.outputRate = audio_params.outputRate;
+    }
+
+    var hd_audio_params = this.findRate(36000, 48000);
+    if (!hd_audio_params) {
+        this.hdResamplingFactor = 0;
+        this.hdOutputRate = 0;
+        divlog('Your audio card sampling rate (' + targetRate + ') is not supported for HD audio<br />Please change your operating system default settings in order to fix this.', 1);
+    } else {
+        this.hdResamplingFactor = hd_audio_params.resamplingFactor;
+        this.hdOutputRate = hd_audio_params.outputRate;
+    }
+};
+
+AudioEngine.prototype.findRate = function(low, high) {
     var targetRate = this.audioContext.sampleRate;
     var i = 1;
     while (true) {
         var audio_server_output_rate = Math.floor(targetRate / i);
-        if (audio_server_output_rate < output_range_min) {
+        if (audio_server_output_rate < low) {
-            this.resamplingFactor = 0;
+            return;
-            this.outputRate = 0;
+        } else if (audio_server_output_rate >= low && audio_server_output_rate <= high) {
-            divlog('Your audio card sampling rate (' + targetRate + ') is not supported.<br />Please change your operating system default settings in order to fix this.', 1);
+            return {
-            break;
+                resamplingFactor: i,
-        } else if (audio_server_output_rate >= output_range_min && audio_server_output_rate <= output_range_max) {
+                outputRate: audio_server_output_rate
-            this.resamplingFactor = i;
+            }
-            this.outputRate = audio_server_output_rate;
-            break; //okay, we're done
         }
         i++;
-    }
+    };
-};
+}
 
 AudioEngine.prototype.getOutputRate = function() {
     return this.outputRate;
 };
 
+AudioEngine.prototype.getHdOutputRate = function() {
+    return this.hdOutputRate;
+}
+
 AudioEngine.prototype.getSampleRate = function() {
     return this.audioContext.sampleRate;
 };
 
-AudioEngine.prototype.pushAudio = function(data) {
+AudioEngine.prototype.processAudio = function(data, resampler) {
     if (!this.audioNode) return;
     this.audioBytes.add(data.byteLength);
     var buffer;
@@ -203,7 +286,7 @@ AudioEngine.prototype.pushAudio = function(data) {
     } else {
         buffer = new Int16Array(data);
     }
-    buffer = this.resampler.process(buffer);
+    buffer = resampler.process(buffer);
     if (this.audioNode.port) {
         // AudioWorklets supported
         this.audioNode.port.postMessage(buffer);
@@ -213,8 +296,16 @@ AudioEngine.prototype.pushAudio = function(data) {
             this.audioBuffers.push(buffer);
         }
     }
+}
+
+AudioEngine.prototype.pushAudio = function(data) {
+    this.processAudio(data, this.resampler);
 };
 
+AudioEngine.prototype.pushHdAudio = function(data) {
+    this.processAudio(data, this.hdResampler);
+}
+
 AudioEngine.prototype.setCompression = function(compression) {
     this.compression = compression;
 };

htdocs/lib/AudioProcessor.js

@@ -33,7 +33,10 @@ class OwrxAudioProcessor extends AudioWorkletProcessor {
         this.port.start();
     }
     process(inputs, outputs) {
-        if (this.remaining() < 128) return true;
+        if (this.remaining() < 128) {
+            outputs[0].forEach(output => output.fill(0));
+            return true;
+        }
         outputs[0].forEach((output) => {
             output.set(this.audioBuffer.subarray(this.outPos, this.outPos + 128));
         });

htdocs/lib/BookmarkBar.js

@@ -87,8 +87,8 @@ BookmarkBar.prototype.render = function(){
         var $bookmark = $(
             '<div class="bookmark" data-source="' + b.source + '"' + (b.editable?' editable="editable"':'') + '>' +
                 '<div class="bookmark-actions">' +
-                    '<div class="openwebrx-button action" data-action="edit"><img src="static/gfx/openwebrx-edit.png"></div>' +
+                    '<div class="openwebrx-button action" data-action="edit"><span class="sprite sprite-edit"></span></div>' +
-                    '<div class="openwebrx-button action" data-action="delete"><img src="static/gfx/openwebrx-trashcan.png"></div>' +
+                    '<div class="openwebrx-button action" data-action="delete"><span class="sprite sprite-trashcan"><span></div>' +
                 '</div>' +
                 '<div class="bookmark-content">' + b.name + '</div>' +
             '</div>'
@@ -145,21 +145,3 @@ BookmarkBar.prototype.getDemodulatorPanel = function() {
 BookmarkBar.prototype.getDemodulator = function() {
     return this.getDemodulatorPanel().getDemodulator();
 };
-
-BookmarkLocalStorage = function(){
-};
-
-BookmarkLocalStorage.prototype.getBookmarks = function(){
-    return JSON.parse(window.localStorage.getItem("bookmarks")) || [];
-};
-
-BookmarkLocalStorage.prototype.setBookmarks = function(bookmarks){
-    window.localStorage.setItem("bookmarks", JSON.stringify(bookmarks));
-};
-
-BookmarkLocalStorage.prototype.deleteBookmark = function(data) {
-    if (data.id) data = data.id;
-    var bookmarks = this.getBookmarks();
-    bookmarks = bookmarks.filter(function(b) { return b.id !== data; });
-    this.setBookmarks(bookmarks);
-};

htdocs/lib/BookmarkLocalStorage.js

@@ -0,0 +1,17 @@
+BookmarkLocalStorage = function(){
+};
+
+BookmarkLocalStorage.prototype.getBookmarks = function(){
+    return JSON.parse(window.localStorage.getItem("bookmarks")) || [];
+};
+
+BookmarkLocalStorage.prototype.setBookmarks = function(bookmarks){
+    window.localStorage.setItem("bookmarks", JSON.stringify(bookmarks));
+};
+
+BookmarkLocalStorage.prototype.deleteBookmark = function(data) {
+    if (data.id) data = data.id;
+    var bookmarks = this.getBookmarks();
+    bookmarks = bookmarks.filter(function(b) { return b.id !== data; });
+    this.setBookmarks(bookmarks);
+};

htdocs/lib/Demodulator.js

@@ -5,8 +5,14 @@ function Filter(demodulator) {
 
 Filter.prototype.getLimits = function() {
     var max_bw;
-    if (this.demodulator.get_secondary_demod() === 'pocsag') {
+    if (['pocsag', 'packet'].indexOf(this.demodulator.get_secondary_demod()) >= 0) {
         max_bw = 12500;
+    } else if (['dmr', 'dstar', 'nxdn', 'ysf', 'm17'].indexOf(this.demodulator.get_modulation()) >= 0) {
+        max_bw = 6250;
+    } else if (this.demodulator.get_modulation() === 'wfm') {
+        max_bw = 100000;
+    } else if (this.demodulator.get_modulation() === 'drm') {
+        max_bw = 50000;
     } else {
         max_bw = (audioEngine.getOutputRate() / 2) - 1;
     }
@@ -230,7 +236,7 @@ Demodulator.prototype.emit = function(event, params) {
 };
 
 Demodulator.prototype.set_offset_frequency = function(to_what) {
-    if (to_what > bandwidth / 2 || to_what < -bandwidth / 2) return;
+    if (typeof(to_what) == 'undefined' || to_what > bandwidth / 2 || to_what < -bandwidth / 2) return;
     to_what = Math.round(to_what);
     if (this.offset_frequency === to_what) {
         return;

htdocs/lib/DemodulatorPanel.js

@@ -3,6 +3,8 @@ function DemodulatorPanel(el) {
     self.el = el;
     self.demodulator = null;
     self.mode = null;
+    self.squelchMargin = 10;
+    self.initialParams = {};
 
     var displayEl = el.find('.webrx-actual-freq')
     this.tuneableFrequencyDisplay = displayEl.tuneableFrequencyDisplay();
@@ -10,6 +12,8 @@ function DemodulatorPanel(el) {
         self.getDemodulator().set_offset_frequency(freq - self.center_freq);
     });
 
+    this.mouseFrequencyDisplay = el.find('.webrx-mouse-freq').frequencyDisplay();
+
     Modes.registerModePanel(this);
     el.on('click', '.openwebrx-demodulator-button', function() {
         var modulation = $(this).data('modulation');
@@ -27,9 +31,9 @@ function DemodulatorPanel(el) {
             self.setMode(value);
         }
     });
-    el.on('click', '.openwebrx-squelch-default', function() {
+    el.on('click', '.openwebrx-squelch-auto', function() {
         if (!self.squelchAvailable()) return;
-        el.find('.openwebrx-squelch-slider').val(getLogSmeterValue(smeter_level) + 10);
+        el.find('.openwebrx-squelch-slider').val(getLogSmeterValue(smeter_level) + self.getSquelchMargin());
         self.updateSquelch();
     });
     el.on('change', '.openwebrx-squelch-slider', function() {
@@ -57,19 +61,9 @@ DemodulatorPanel.prototype.render = function() {
         );
     });
 
-    var index = 0;
+    var $modegrid = $('<div class="openwebrx-modes-grid"></div>');
-    var arrayLength = buttons.length;
+    $modegrid.append.apply($modegrid, buttons);
-    var chunks = [];
+    html.push($modegrid);
-
-    for (index = 0; index < arrayLength; index += 5) {
-        chunks.push(buttons.slice(index, index + 5));
-    }
-
-    html.push.apply(html, chunks.map(function(chunk){
-        $line = $('<div class="openwebrx-panel-line openwebrx-panel-flex-line"></div>');
-        $line.append.apply($line, chunk);
-        return $line
-    }));
 
     html.push($(
         '<div class="openwebrx-panel-line openwebrx-panel-flex-line">' +
@@ -129,7 +123,9 @@ DemodulatorPanel.prototype.setMode = function(requestedModulation) {
     this.demodulator.on("frequencychange", updateFrequency);
     updateFrequency(this.demodulator.get_offset_frequency());
     var updateSquelch = function(squelch) {
-        self.el.find('.openwebrx-squelch-slider').val(squelch);
+        self.el.find('.openwebrx-squelch-slider')
+            .val(squelch)
+            .attr('title', 'Squelch (' + squelch + ' dB)');
         self.updateHash();
     };
     this.demodulator.on('squelchchange', updateSquelch);
@@ -162,17 +158,20 @@ DemodulatorPanel.prototype.updatePanels = function() {
     var modulation = this.getDemodulator().get_secondary_demod();
     $('#openwebrx-panel-digimodes').attr('data-mode', modulation);
     toggle_panel("openwebrx-panel-digimodes", !!modulation);
-    toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4'].indexOf(modulation) >= 0);
+    toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4', 'fst4', 'fst4w', "q65"].indexOf(modulation) >= 0);
     toggle_panel("openwebrx-panel-js8-message", modulation == "js8");
     toggle_panel("openwebrx-panel-packet-message", modulation === "packet");
     toggle_panel("openwebrx-panel-pocsag-message", modulation === "pocsag");
 
     modulation = this.getDemodulator().get_modulation();
     var showing = 'openwebrx-panel-metadata-' + modulation;
-    $(".openwebrx-meta-panel").each(function (_, p) {
+    var metaPanels = $(".openwebrx-meta-panel");
+    metaPanels.each(function (_, p) {
         toggle_panel(p.id, p.id === showing);
     });
-    clear_metadata();
+    metaPanels.metaPanel().each(function() {
+        this.clear();
+    });
 };
 
 DemodulatorPanel.prototype.getDemodulator = function() {
@@ -185,11 +184,11 @@ DemodulatorPanel.prototype.collectParams = function() {
         squelch_level: -150,
         mod: 'nfm'
     }
-    return $.extend(new Object(), defaults, this.initialParams || {}, this.transformHashParams(this.parseHash()));
+    return $.extend(new Object(), defaults, this.validateInitialParams(this.initialParams), this.transformHashParams(this.parseHash()));
 };
 
 DemodulatorPanel.prototype.startDemodulator = function() {
-    if (!Modes.initComplete()) return;
+    if (!Modes.initComplete() || !this.center_freq) return;
     var params = this.collectParams();
     this._apply(params);
 };
@@ -211,7 +210,11 @@ DemodulatorPanel.prototype._apply = function(params) {
 };
 
 DemodulatorPanel.prototype.setInitialParams = function(params) {
-    this.initialParams = params;
+    $.extend(this.initialParams, params);
+};
+
+DemodulatorPanel.prototype.resetInitialParams = function() {
+    this.initialParams = {};
 };
 
 DemodulatorPanel.prototype.onHashChange = function() {
@@ -255,16 +258,21 @@ DemodulatorPanel.prototype.updateButtons = function() {
     }
     var squelch_disabled = !this.squelchAvailable();
     this.el.find('.openwebrx-squelch-slider').prop('disabled', squelch_disabled);
-    this.el.find('.openwebrx-squelch-default')[squelch_disabled ? 'addClass' : 'removeClass']('disabled');
+    this.el.find('.openwebrx-squelch-auto')[squelch_disabled ? 'addClass' : 'removeClass']('disabled');
 }
 
 DemodulatorPanel.prototype.setCenterFrequency = function(center_freq) {
-    if (this.center_freq === center_freq) {
+    var me = this;
-        return;
+    if (me.centerFreqTimeout) {
+        clearTimeout(me.centerFreqTimeout);
+        me.centerFreqTimeout = false;
     }
-    this.stopDemodulator();
+    this.centerFreqTimeout = setTimeout(function() {
-    this.center_freq = center_freq;
+        me.stopDemodulator();
-    this.startDemodulator();
+        me.center_freq = center_freq;
+        me.startDemodulator();
+        me.centerFreqTimeout = false;
+    }, 50);
 };
 
 DemodulatorPanel.prototype.parseHash = function() {
@@ -286,7 +294,7 @@ DemodulatorPanel.prototype.validateHash = function(params) {
     var self = this;
     params = Object.keys(params).filter(function(key) {
         if (key == 'freq' || key == 'mod' || key == 'secondary_mod' || key == 'sql') {
-            return params.freq && Math.abs(params.freq - self.center_freq) < bandwidth;
+            return params.freq && Math.abs(params.freq - self.center_freq) <= bandwidth / 2;
         }
         return true;
     }).reduce(function(p, key) {
@@ -302,6 +310,17 @@ DemodulatorPanel.prototype.validateHash = function(params) {
     return params;
 };
 
+DemodulatorPanel.prototype.validateInitialParams = function(params) {
+    return Object.fromEntries(
+        Object.entries(params).filter(function(a) {
+            if (a[0] == "offset_frequency") {
+                return Math.abs(a[1]) <= bandwidth / 2;
+            }
+            return true;
+        })
+    );
+};
+
 DemodulatorPanel.prototype.updateHash = function() {
     var demod = this.getDemodulator();
     if (!demod) return;
@@ -325,6 +344,24 @@ DemodulatorPanel.prototype.updateSquelch = function() {
     if (demod) demod.setSquelch(sliderValue);
 };
 
+DemodulatorPanel.prototype.setSquelchMargin = function(margin) {
+    if (typeof(margin) === 'undefined' || this.squelchMargin == margin) return;
+    this.squelchMargin = margin;
+};
+
+DemodulatorPanel.prototype.getSquelchMargin = function() {
+    return this.squelchMargin;
+};
+
+DemodulatorPanel.prototype.setMouseFrequency = function(freq) {
+    this.mouseFrequencyDisplay.setFrequency(freq);
+};
+
+DemodulatorPanel.prototype.setTuningPrecision = function(precision) {
+    this.tuneableFrequencyDisplay.setTuningPrecision(precision);
+    this.mouseFrequencyDisplay.setTuningPrecision(precision);
+};
+
 $.fn.demodulatorPanel = function(){
     if (!this.data('panel')) {
         this.data('panel', new DemodulatorPanel(this));

htdocs/lib/FrequencyDisplay.js

@@ -1,6 +1,14 @@
 function FrequencyDisplay(element) {
+    this.suffixes = {
+        '': 0,
+        'k': 3,
+        'M': 6,
+        'G': 9,
+        'T': 12
+    };
     this.element = $(element);
     this.digits = [];
+    this.precision = 2;
     this.setupElements();
     this.setFrequency(0);
 }
@@ -8,13 +16,31 @@ function FrequencyDisplay(element) {
 FrequencyDisplay.prototype.setupElements = function() {
     this.displayContainer = $('<div>');
     this.digitContainer = $('<span>');
-    this.displayContainer.html([this.digitContainer, $('<span> MHz</span>')]);
+    this.unitContainer = $('<span> Hz</span>');
+    this.displayContainer.html([this.digitContainer, this.unitContainer]);
     this.element.html(this.displayContainer);
 };
 
+FrequencyDisplay.prototype.getSuffix = function() {
+    var me = this;
+    return Object.keys(me.suffixes).filter(function(key){
+        return me.suffixes[key] == me.exponent;
+    })[0] || "";
+};
+
 FrequencyDisplay.prototype.setFrequency = function(freq) {
     this.frequency = freq;
-    var formatted = (freq / 1e6).toLocaleString(undefined, {maximumFractionDigits: 4, minimumFractionDigits: 4});
+    if (this.frequency === 0 || Number.isNaN(this.frequency)) {
+        this.exponent = 0
+    } else {
+        this.exponent = Math.floor(Math.log10(this.frequency) / 3) * 3;
+    }
+
+    var digits = Math.max(0, this.exponent - this.precision);
+    var formatted = (freq / 10 ** this.exponent).toLocaleString(
+        undefined,
+        {maximumFractionDigits: digits, minimumFractionDigits: digits}
+    );
     var children = this.digitContainer.children();
     for (var i = 0; i < formatted.length; i++) {
         if (!this.digits[i]) {
@@ -32,6 +58,13 @@ FrequencyDisplay.prototype.setFrequency = function(freq) {
     while (this.digits.length > formatted.length) {
         this.digits.pop().remove();
     }
+    this.unitContainer.text(' ' + this.getSuffix() + 'Hz');
+};
+
+FrequencyDisplay.prototype.setTuningPrecision = function(precision) {
+    if (typeof(precision) == 'undefined') return;
+    this.precision = precision;
+    this.setFrequency(this.frequency);
 };
 
 function TuneableFrequencyDisplay(element) {
@@ -43,22 +76,28 @@ TuneableFrequencyDisplay.prototype = new FrequencyDisplay();
 
 TuneableFrequencyDisplay.prototype.setupElements = function() {
     FrequencyDisplay.prototype.setupElements.call(this);
-    this.input = $('<input>');
+    this.input = $('<input type="number" step="any">');
-    this.input.hide();
+    this.suffixInput = $('<select tabindex="-1">');
-    this.element.append(this.input);
+    this.suffixInput.append($.map(this.suffixes, function(e, p) {
+        return $('<option value="' + e + '">' + p + 'Hz</option>');
+    }));
+    this.inputGroup = $('<div class="input-group">');
+    this.inputGroup.append([this.input, this.suffixInput]);
+    this.inputGroup.hide();
+    this.element.append(this.inputGroup);
 };
 
 TuneableFrequencyDisplay.prototype.setupEvents = function() {
     var me = this;
 
-    me.element.on('wheel', function(e){
+    me.displayContainer.on('wheel', function(e){
         e.preventDefault();
         e.stopPropagation();
 
         var index = me.digitContainer.find('.digit').index(e.target);
         if (index < 0) return;
 
-        var delta = 10 ** (Math.floor(Math.log10(me.frequency)) - index);
+        var delta = 10 ** (Math.floor(Math.max(me.exponent, Math.log10(me.frequency))) - index);
         if (e.originalEvent.deltaY > 0) delta *= -1;
         var newFrequency = me.frequency + delta;
 
@@ -66,26 +105,64 @@ TuneableFrequencyDisplay.prototype.setupEvents = function() {
     });
 
     var submit = function(){
-        var freq = parseInt(me.input.val());
+        var exponent = parseInt(me.suffixInput.val());
+        var freq = parseFloat(me.input.val()) * 10 ** exponent;
         if (!isNaN(freq)) {
             me.element.trigger('frequencychange', freq);
         }
-        me.input.hide();
+        me.inputGroup.hide();
         me.displayContainer.show();
     };
-    me.input.on('blur', submit).on('keyup', function(e){
+    $inputs = $.merge($(), me.input);
+    $inputs = $.merge($inputs, me.suffixInput);
+    $('body').on('click', function(e) {
+        if (!me.input.is(':visible')) return;
+        if ($.contains(me.element[0], e.target)) return;
+        submit();
+    });
+    $inputs.on('blur', function(e){
+        if ($inputs.toArray().indexOf(e.relatedTarget) >= 0) {
+            return;
+        }
+        submit();
+    });
+    me.input.on('keydown', function(e){
         if (e.keyCode == 13) return submit();
         if (e.keyCode == 27) {
-            me.input.hide();
+            me.inputGroup.hide();
             me.displayContainer.show();
+            return;
         }
+        var c = String.fromCharCode(e.which);
+        Object.entries(me.suffixes).forEach(function(e) {
+            if (e[0].toUpperCase() == c) {
+                me.suffixInput.val(e[1]);
+                return submit();
+            }
+        })
     });
-    me.input.on('click', function(e){
+    var currentExponent;
+    me.suffixInput.on('change', function() {
+        var newExponent = me.suffixInput.val();
+        delta = currentExponent - newExponent;
+        if (delta >= 0) {
+            me.input.val(parseFloat(me.input.val()) * 10 ** delta);
+        } else {
+            // should not be necessary to handle this separately, but floating point precision in javascript
+            // does not handle this well otherwise
+            me.input.val(parseFloat(me.input.val()) / 10 ** -delta);
+        }
+        currentExponent = newExponent;
+        me.input.focus();
+    });
+    $inputs.on('click', function(e){
         e.stopPropagation();
     });
     me.element.on('click', function(){
-        me.input.val(me.frequency);
+        currentExponent = me.exponent;
-        me.input.show();
+        me.input.val(me.frequency / 10 ** me.exponent);
+        me.suffixInput.val(me.exponent);
+        me.inputGroup.show();
         me.displayContainer.hide();
         me.input.focus();
     });

htdocs/lib/Header.js

@@ -1,20 +1,23 @@
 function Header(el) {
     this.el = el;
 
-    this.el.find('#openwebrx-main-buttons').find('[data-toggle-panel]').click(function () {
+    var $buttons = this.el.find('.openwebrx-main-buttons').find('[data-toggle-panel]').filter(function(){
+        // ignore buttons when the corresponding panel is not in the DOM
+        return $('#' + $(this).data('toggle-panel'))[0];
+    });
+
+    $buttons.css({display: 'block'}).click(function () {
         toggle_panel($(this).data('toggle-panel'));
     });
 
     this.init_rx_photo();
-    this.download_details();
 };
 
 Header.prototype.setDetails = function(details) {
-    this.el.find('#webrx-rx-title').html(details['receiver_name']);
+    this.el.find('.webrx-rx-title').html(details['receiver_name']);
-    var query = encodeURIComponent(details['receiver_gps']['lat'] + ',' + details['receiver_gps']['lon']);
+    this.el.find('.webrx-rx-desc').html(details['receiver_location'] + ' | Loc: ' + details['locator'] + ', ASL: ' + details['receiver_asl'] + ' m');
-    this.el.find('#webrx-rx-desc').html(details['receiver_location'] + ' | Loc: ' + details['locator'] + ', ASL: ' + details['receiver_asl'] + ' m, <a href="https://www.google.com/maps/search/?api=1&query=' + query + '" target="_blank">[maps]</a>');
+    this.el.find('.webrx-rx-photo-title').html(details['photo_title']);
-    this.el.find('#webrx-rx-photo-title').html(details['photo_title']);
+    this.el.find('.webrx-rx-photo-desc').html(details['photo_desc']);
-    this.el.find('#webrx-rx-photo-desc').html(details['photo_desc']);
 };
 
 Header.prototype.init_rx_photo = function() {
@@ -26,25 +29,19 @@ Header.prototype.init_rx_photo = function() {
         }
     });
 
-    $('#webrx-top-container').find('.openwebrx-photo-trigger').click(this.toggle_rx_photo.bind(this));
+    $('.webrx-top-container').find('.openwebrx-photo-trigger').click(this.toggle_rx_photo.bind(this));
 };
 
 Header.prototype.close_rx_photo = function() {
     this.rx_photo_state = 0;
-    this.el.find("#webrx-rx-photo-desc").animate({opacity: 0});
+    this.el.find('.openwebrx-description-container').removeClass('expanded');
-    this.el.find("#webrx-rx-photo-title").animate({opacity: 0});
+    this.el.find(".openwebrx-rx-details-arrow").removeClass('openwebrx-rx-details-arrow--up').addClass('openwebrx-rx-details-arrow--down');
-    this.el.find('#webrx-top-photo-clip').animate({maxHeight: 67}, {duration: 1000, easing: 'easeOutCubic'});
-    this.el.find("#openwebrx-rx-details-arrow-down").show();
-    this.el.find("#openwebrx-rx-details-arrow-up").hide();
 }
 
 Header.prototype.open_rx_photo = function() {
     this.rx_photo_state = 1;
-    this.el.find("#webrx-rx-photo-desc").animate({opacity: 1});
+    this.el.find('.openwebrx-description-container').addClass('expanded');
-    this.el.find("#webrx-rx-photo-title").animate({opacity: 1});
+    this.el.find(".openwebrx-rx-details-arrow").removeClass('openwebrx-rx-details-arrow--down').addClass('openwebrx-rx-details-arrow--up');
-    this.el.find('#webrx-top-photo-clip').animate({maxHeight: 350}, {duration: 1000, easing: 'easeOutCubic'});
-    this.el.find("#openwebrx-rx-details-arrow-down").hide();
-    this.el.find("#openwebrx-rx-details-arrow-up").show();
 }
 
 Header.prototype.toggle_rx_photo = function(ev) {
@@ -58,13 +55,6 @@ Header.prototype.toggle_rx_photo = function(ev) {
     }
 };
 
-Header.prototype.download_details = function() {
-    var self = this;
-    $.ajax('api/receiverdetails').done(function(data){
-        self.setDetails(data);
-    });
-};
-
 $.fn.header = function() {
     if (!this.data('header')) {
         this.data('header', new Header(this));
@@ -73,5 +63,5 @@ $.fn.header = function() {
 };
 
 $(function(){
-    $('#webrx-top-container').header();
+    $('.webrx-top-container').header();
 });

htdocs/lib/Js8Threads.js

@@ -100,7 +100,13 @@ Js8Thread.prototype.purgeOldMessages = function() {
     return this.messages.length;
 };
 
+Js8Thread.prototype.purge = function() {
+    this.message = [];
+    this.el.remove();
+};
+
 Js8Threader = function(el){
+    MessagePanel.call(this, el);
     this.threads = [];
     this.tbody = $(el).find('tbody');
     var me = this;
@@ -109,6 +115,28 @@ Js8Threader = function(el){
     }, 15000);
 };
 
+Js8Threader.prototype = new MessagePanel();
+
+Js8Threader.prototype.render = function() {
+    $(this.el).append($(
+        '<table>' +
+            '<thead><tr>' +
+                '<th>UTC</th>' +
+                '<th class="decimal freq">Freq</th>' +
+                '<th class="message">Message</th>' +
+            '</tr></thead>' +
+            '<tbody></tbody>' +
+        '</table>'
+    ));
+};
+
+Js8Threader.prototype.clearMessages = function() {
+    this.threads.forEach(function(t) {
+        t.purge();
+    });
+    this.threads = [];
+};
+
 Js8Threader.prototype.purgeOldMessages = function() {
     this.threads = this.threads.filter(function(t) {
         return t.purgeOldMessages();