From db46110eea759174cc26f5cd6feaf7f66db4a96e Mon Sep 17 00:00:00 2001 From: Marat Fayzullin Date: Tue, 29 Aug 2023 18:28:54 -0400 Subject: [PATCH] Adding package dependencies, changing instructions. --- csdr/module/toolbox.py | 2 +- debian/control | 2 +- owrx/feature.py | 15 ++++++++------- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/csdr/module/toolbox.py b/csdr/module/toolbox.py index 2ce04763..b388bfe5 100644 --- a/csdr/module/toolbox.py +++ b/csdr/module/toolbox.py @@ -90,7 +90,7 @@ class Dump1090Module(ExecModule): lat = pm["receiver_gps"]["lat"] lon = pm["receiver_gps"]["lon"] cmd = [ - "dump1090-mutability", "--ifile", "-", "--iformat", "SC16", + "dump1090", "--ifile", "-", "--iformat", "SC16", "--lat", str(lat), "--lon", str(lon), "--metric" ] diff --git a/debian/control b/debian/control index c986a116..5bbd95c1 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,6 @@ Vcs-Git: https://github.com/luarvique/openwebrx.git Package: openwebrx Architecture: all Depends: adduser, python3 (>= 3.5), python3-pkg-resources, owrx-connector (>= 0.6), soapysdr-tools, python3-csdr (>= 0.18.11), ${python3:Depends}, ${misc:Depends} -Recommends: python3-digiham (>= 0.6), direwolf (>= 1.4), wsjtx, js8call, runds-connector (>= 0.2), hpsdrconnector, aprs-symbols, m17-demod, js8call, python3-js8py (>= 0.1), nmux (>= 0.18), codecserver (>= 0.1), msk144decoder, multimon-ng, rtl-433, imagemagick +Recommends: python3-digiham (>= 0.6), direwolf (>= 1.4), wsjtx, js8call, runds-connector (>= 0.2), hpsdrconnector, aprs-symbols, m17-demod, js8call, python3-js8py (>= 0.1), nmux (>= 0.18), codecserver (>= 0.1), msk144decoder, multimon-ng, rtl-433, dumphfdl, dumpvdl2, dump1090-fa-minimal, imagemagick Description: multi-user web sdr Open source, multi-user SDR receiver with a web interface diff --git a/owrx/feature.py b/owrx/feature.py index ad11a484..ad330c3a 100644 --- a/owrx/feature.py +++ b/owrx/feature.py @@ -602,23 +602,24 @@ class FeatureDetector(object): def has_dumphfdl(self): """ OpenWebRX uses the [DumpHFDL](https://github.com/szpajder/dumphfdl) tool to decode HFDL - aircraft communications. DumpHFDL is not yet available as a package and thus you will have - to compile it from source. + aircraft communications. The latest DumpHFDL package is available from the OpenWebRX + repository as "dumphfdl", or you can compile it from source. """ return self.command_is_runnable("dumphfdl --help") def has_dumpvdl2(self): """ OpenWebRX uses the [DumpVDL2](https://github.com/szpajder/dumpvdl2) tool to decode VDL2 - aircraft communications. DumpVDL2 is not yet available as a package and thus you will have - to compile it from source. + aircraft communications. The latest DumpVDL2 package is available from the OpenWebRX + repository as "dumpvdl2", or you can compile it from source. """ return self.command_is_runnable("dumpvdl2 --help") def has_dump1090(self): """ - OpenWebRX uses the [dump1090](https://github.com/antirez/dump1090) to decode ADSB traffic. - Dump1090 is from the package manager on many distributions, or you can compile it from source. + OpenWebRX uses the [dump1090](https://github.com/antirez/dump1090) tool to decode ADSB + traffic. The latest Dump1090 package is available from the OpenWebRX repository as + "dump1090-fa-minimal", or you can compile it from source. """ - return self.command_is_runnable("dump1090-mutability --help") + return self.command_is_runnable("dump1090 --help")