diff --git a/CHANGELOG.md b/CHANGELOG.md index 9aed5aa..1a5e3bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ - New devices supported: - HPSDR devices (Hermes Lite 2) - BBRF103 / RX666 / RX888 devices supported by libsddc - - Devices using the EB200 protocol + - R&S devices using the EB200 or Ammos protocols **0.20.3** - Fix a compatibility issue with python versions <= 3.6 diff --git a/config_webrx.py b/config_webrx.py index b5f1702..b5b37a8 100644 --- a/config_webrx.py +++ b/config_webrx.py @@ -117,7 +117,7 @@ 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", "hpsdr", "red_pitaya", "uhd", -# "radioberry", "fcdpp", "rtl_tcp", "sddc", "eb200" +# "radioberry", "fcdpp", "rtl_tcp", "sddc", "runds" # For more details on specific types, please checkout the wiki: # https://github.com/jketterl/openwebrx/wiki/Supported-Hardware#sdr-devices diff --git a/debian/changelog b/debian/changelog index 1a86f2c..0bb4e95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,7 @@ openwebrx (0.21.0) UNRELEASED; urgency=low * New devices supported: - HPSDR devices (Hermes Lite 2) (`"type": "hpsdr"`) - BBRF103 / RX666 / RX888 devices supported by libsddc (`"type": "sddc"`) - - Devices using the EB200 protocol (`"type": "eb200"`) + - R&S devices using the EB200 or Ammos protocols (`"type": "runds"`) -- Jakob Ketterl Sun, 11 Oct 2020 21:12:00 +0000 diff --git a/debian/control b/debian/control index 6654e6a..a6f8eb1 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,6 @@ Vcs-Git: https://github.com/jketterl/openwebrx.git Package: openwebrx Architecture: all 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, eb200-connector, hpsdrconnector, aprs-symbols, m17-demod +Recommends: digiham (>= 0.3), dsd (>= 1.7), sox, direwolf (>= 1.4), wsjtx, runds-connector, hpsdrconnector, aprs-symbols, m17-demod Description: multi-user web sdr Open source, multi-user SDR receiver with a web interface \ No newline at end of file diff --git a/docker.sh b/docker.sh index 1583af6..33d971f 100755 --- a/docker.sh +++ b/docker.sh @@ -2,7 +2,7 @@ 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-redpitaya openwebrx-rtltcp openwebrx-eb200 openwebrx-hpsdr openwebrx-full openwebrx" +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-redpitaya openwebrx-rtltcp openwebrx-runds openwebrx-hpsdr openwebrx-full openwebrx" ALL_ARCHS="x86_64 armv7l aarch64" TAG=${TAG:-"latest"} ARCHTAG="$TAG-$ARCH" diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full index b68d18a..aab4b69 100644 --- a/docker/Dockerfiles/Dockerfile-full +++ b/docker/Dockerfiles/Dockerfile-full @@ -21,7 +21,7 @@ RUN /install-dependencies-rtlsdr.sh &&\ /install-dependencies-redpitaya.sh &&\ /install-dependencies-hpsdr.sh &&\ /install-connectors.sh &&\ - /install-dependencies-eb200.sh &&\ + /install-dependencies-runds.sh &&\ rm /install-dependencies-*.sh &&\ rm /install-lib.*.patch && \ rm /install-connectors.sh diff --git a/docker/Dockerfiles/Dockerfile-eb200 b/docker/Dockerfiles/Dockerfile-runds similarity index 57% rename from docker/Dockerfiles/Dockerfile-eb200 rename to docker/Dockerfiles/Dockerfile-runds index f2f5181..2a087e1 100644 --- a/docker/Dockerfiles/Dockerfile-eb200 +++ b/docker/Dockerfiles/Dockerfile-runds @@ -2,11 +2,11 @@ ARG ARCHTAG FROM openwebrx-base:$ARCHTAG COPY docker/scripts/install-connectors.sh \ - docker/scripts/install-dependencies-eb200.sh / + docker/scripts/install-dependencies-runds.sh / RUN /install-connectors.sh &&\ rm /install-connectors.sh && \ - /install-dependencies-eb200.sh && \ - rm /install-dependencies-eb200.sh + /install-dependencies-runds.sh && \ + rm /install-dependencies-runds.sh COPY . /opt/openwebrx diff --git a/docker/scripts/install-dependencies-eb200.sh b/docker/scripts/install-dependencies-runds.sh similarity index 70% rename from docker/scripts/install-dependencies-eb200.sh rename to docker/scripts/install-dependencies-runds.sh index 2eefdbe..6c5bdc8 100755 --- a/docker/scripts/install-dependencies-eb200.sh +++ b/docker/scripts/install-dependencies-runds.sh @@ -24,9 +24,9 @@ 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/eb200_connector.git -# latest from develop as of 2021-01-31 -cmakebuild eb200_connector bb7f75be6e7fb4b987eea4b81821663ca4b9f19f +git clone https://github.com/jketterl/runds_connector.git +# latest from develop as of 2021-02-03 (first working ammos implementation) +cmakebuild runds_connector 19531c4e3e46107960656b3eed9952adebf1ec65 apt-get -y purge --autoremove $BUILD_PACKAGES apt-get clean diff --git a/owrx/feature.py b/owrx/feature.py index 3a89542..ca72a03 100644 --- a/owrx/feature.py +++ b/owrx/feature.py @@ -70,7 +70,7 @@ class FeatureDetector(object): "fcdpp": ["soapy_connector", "soapy_fcdpp"], "sddc": ["sddc_connector"], "hpsdr": ["hpsdr_connector"], - "eb200": ["eb200_connector"], + "runds": ["runds_connector"], # optional features and their requirements "digital_voice_digiham": ["digiham", "sox"], "digital_voice_dsd": ["dsd", "sox", "digiham"], @@ -547,10 +547,10 @@ class FeatureDetector(object): """ return self.command_is_runnable("hpsdrconnector -h") - def has_eb200_connector(self): + def has_runds_connector(self): """ - To use radios supporting the EB200 radios, you need to install the eb200_connector. + To use radios supporting R&S radios via EB200 or Ammos, you need to install the runds_connector. - You can find more information [here](https://github.com/jketterl/eb200_connector). + You can find more information [here](https://github.com/jketterl/runds_connector). """ - return self._check_connector("eb200_connector") + return self._check_connector("runds_connector") diff --git a/owrx/source/eb200.py b/owrx/source/runds.py similarity index 65% rename from owrx/source/eb200.py rename to owrx/source/runds.py index 50ef622..f12f003 100644 --- a/owrx/source/eb200.py +++ b/owrx/source/runds.py @@ -1,17 +1,18 @@ from owrx.source.connector import ConnectorSource -from owrx.command import Argument, Flag +from owrx.command import Argument, Flag, Option -class Eb200Source(ConnectorSource): +class RundsSource(ConnectorSource): def getCommandMapper(self): return ( super() .getCommandMapper() - .setBase("eb200_connector") + .setBase("runds_connector") .setMappings( { "long": Flag("-l"), "remote": Argument(), + "protocol": Option("-m"), } ) )