From a9990f1f412873e59ec68f035371a3c1a5c4016e Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Mon, 5 Apr 2021 15:48:03 +0200 Subject: [PATCH] remove redpitaya source (working with hpsdr_connector) --- config_webrx.py | 2 +- docker.sh | 2 +- docker/Dockerfiles/Dockerfile-full | 1 - docker/Dockerfiles/Dockerfile-redpitaya | 8 ----- docker/env | 5 --- .../scripts/install-dependencies-redpitaya.sh | 32 ------------------- owrx/feature.py | 9 ------ owrx/source/red_pitaya.py | 10 ------ 8 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 docker/Dockerfiles/Dockerfile-redpitaya delete mode 100644 docker/env delete mode 100755 docker/scripts/install-dependencies-redpitaya.sh delete mode 100644 owrx/source/red_pitaya.py diff --git a/config_webrx.py b/config_webrx.py index 4c57408..7d8ffbb 100644 --- a/config_webrx.py +++ b/config_webrx.py @@ -115,7 +115,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", +# "perseussdr", "lime_sdr", "pluto_sdr", "soapy_remote", "hpsdr", "uhd", # "radioberry", "fcdpp", "rtl_tcp", "sddc", "runds" # For more details on specific types, please checkout the wiki: diff --git a/docker.sh b/docker.sh index 33d971f..f23c6c1 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-runds 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-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 aab4b69..cecf45a 100644 --- a/docker/Dockerfiles/Dockerfile-full +++ b/docker/Dockerfiles/Dockerfile-full @@ -18,7 +18,6 @@ RUN /install-dependencies-rtlsdr.sh &&\ /install-dependencies-fcdpp.sh &&\ /install-dependencies-radioberry.sh &&\ /install-dependencies-uhd.sh &&\ - /install-dependencies-redpitaya.sh &&\ /install-dependencies-hpsdr.sh &&\ /install-connectors.sh &&\ /install-dependencies-runds.sh &&\ diff --git a/docker/Dockerfiles/Dockerfile-redpitaya b/docker/Dockerfiles/Dockerfile-redpitaya deleted file mode 100644 index 7d389aa..0000000 --- a/docker/Dockerfiles/Dockerfile-redpitaya +++ /dev/null @@ -1,8 +0,0 @@ -ARG ARCHTAG -FROM openwebrx-soapysdr-base:$ARCHTAG - -COPY docker/scripts/install-dependencies-redpitaya.sh / -RUN /install-dependencies-redpitaya.sh &&\ - rm /install-dependencies-redpitaya.sh - -COPY . /opt/openwebrx diff --git a/docker/env b/docker/env deleted file mode 100644 index f38dacd..0000000 --- a/docker/env +++ /dev/null @@ -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-fcdpp openwebrx-radioberry openwebrx-uhd openwebrx-redpitaya openwebrx-rtltcp openwebrx-full openwebrx" -ALL_ARCHS="x86_64 armv7l aarch64" -TAG=${TAG:-"latest"} -ARCHTAG="$TAG-$ARCH" diff --git a/docker/scripts/install-dependencies-redpitaya.sh b/docker/scripts/install-dependencies-redpitaya.sh deleted file mode 100755 index e88b5c8..0000000 --- a/docker/scripts/install-dependencies-redpitaya.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/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="" -BUILD_PACKAGES="git cmake make gcc g++" - -apt-get update -apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES - -git clone https://github.com/pothosware/SoapyRedPitaya.git -cmakebuild SoapyRedPitaya soapy-redpitaya-0.1.1 - -SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES -apt-get clean -rm -rf /var/lib/apt/lists/* diff --git a/owrx/feature.py b/owrx/feature.py index 70b4c0a..37396e9 100644 --- a/owrx/feature.py +++ b/owrx/feature.py @@ -65,7 +65,6 @@ class FeatureDetector(object): "pluto_sdr": ["soapy_connector", "soapy_pluto_sdr"], "soapy_remote": ["soapy_connector", "soapy_remote"], "uhd": ["soapy_connector", "soapy_uhd"], - "red_pitaya": ["soapy_connector", "soapy_red_pitaya"], "radioberry": ["soapy_connector", "soapy_radioberry"], "fcdpp": ["soapy_connector", "soapy_fcdpp"], "sddc": ["sddc_connector"], @@ -389,14 +388,6 @@ class FeatureDetector(object): """ return self._has_soapy_driver("uhd") - def has_soapy_red_pitaya(self): - """ - The SoapyRedPitaya allows Red Pitaya deviced to be used with SoapySDR. - - You can get it [here](https://github.com/pothosware/SoapyRedPitaya/wiki). - """ - return self._has_soapy_driver("redpitaya") - def has_soapy_radioberry(self): """ The Radioberry is a SDR hat for the Raspberry Pi. diff --git a/owrx/source/red_pitaya.py b/owrx/source/red_pitaya.py deleted file mode 100644 index 00a484a..0000000 --- a/owrx/source/red_pitaya.py +++ /dev/null @@ -1,10 +0,0 @@ -from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription - - -class RedPitayaSource(SoapyConnectorSource): - def getDriver(self): - return "redpitaya" - - -class RedPitayaDeviceDescription(SoapyConnectorDeviceDescription): - pass