diff --git a/debian/control b/debian/control index 0375e026..fe391cc4 100644 --- a/debian/control +++ b/debian/control @@ -17,9 +17,8 @@ Architecture: all Depends: adduser, python3 (>= 3.5), python3-pkg-resources, - owrx-connector (>= 0.6), - python3-csdr (>= 0.18.17), - soapysdr-tools, + owrx-connector (>= 0.6.5), + python3-csdr (>= 0.18.18), ${python3:Depends}, ${misc:Depends} Recommends: python3-digiham (>= 0.6), diff --git a/owrx/feature.py b/owrx/feature.py index a807de13..78fefd77 100644 --- a/owrx/feature.py +++ b/owrx/feature.py @@ -308,14 +308,10 @@ class FeatureDetector(object): def _has_soapy_driver(self, driver): try: - process = subprocess.Popen(["SoapySDRUtil", "--info"], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) - factory_regex = re.compile(r"^Available factories\\.\\.\\. ?(.*)$") + process = subprocess.Popen(["soapy_connector", "--listdrivers"], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL) - drivers = [] - for line in process.stdout: - matches = factory_regex.match(line.decode()) - if matches: - drivers = [s.strip() for s in matches.group(1).split(", ")] + drivers = [line.decode().strip() for line in process.stdout] + process.wait(1) return driver in drivers except FileNotFoundError: