From 0ab6729fcc6f2872fda2f4715c0e4e9b3756fb2a Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Sat, 20 Feb 2021 18:09:24 +0100 Subject: [PATCH] create device descriptions for all --- owrx/source/airspy.py | 7 +++++-- owrx/source/airspyhf.py | 6 +++++- owrx/source/direct.py | 6 +++++- owrx/source/fcdpp.py | 6 +++++- owrx/source/fifi_sdr.py | 6 +++++- owrx/source/hackrf.py | 6 +++++- owrx/source/hpsdr.py | 8 ++++++-- owrx/source/lime_sdr.py | 6 +++++- owrx/source/perseussdr.py | 8 ++++++-- owrx/source/pluto_sdr.py | 6 +++++- owrx/source/radioberry.py | 6 +++++- owrx/source/red_pitaya.py | 6 +++++- owrx/source/rtl_sdr_soapy.py | 6 +++++- owrx/source/rtl_tcp.py | 6 +++++- owrx/source/runds.py | 6 +++++- owrx/source/sddc.py | 6 +++++- owrx/source/soapy_remote.py | 6 +++++- owrx/source/uhd.py | 6 +++++- 18 files changed, 92 insertions(+), 21 deletions(-) diff --git a/owrx/source/airspy.py b/owrx/source/airspy.py index 97221a3..d909d96 100644 --- a/owrx/source/airspy.py +++ b/owrx/source/airspy.py @@ -1,5 +1,4 @@ -from owrx.command import Flag -from .soapy import SoapyConnectorSource +from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription class AirspySource(SoapyConnectorSource): @@ -15,3 +14,7 @@ class AirspySource(SoapyConnectorSource): def getDriver(self): return "airspy" + + +class AirspyDeviceDescription(SoapyConnectorDeviceDescription): + pass diff --git a/owrx/source/airspyhf.py b/owrx/source/airspyhf.py index 33b00df..5995b4b 100644 --- a/owrx/source/airspyhf.py +++ b/owrx/source/airspyhf.py @@ -1,6 +1,10 @@ -from .soapy import SoapyConnectorSource +from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription class AirspyhfSource(SoapyConnectorSource): def getDriver(self): return "airspyhf" + + +class AirspyhfDeviceDescription(SoapyConnectorDeviceDescription): + pass diff --git a/owrx/source/direct.py b/owrx/source/direct.py index e5d0024..e51f0b8 100644 --- a/owrx/source/direct.py +++ b/owrx/source/direct.py @@ -1,5 +1,5 @@ from abc import ABCMeta -from . import SdrSource +from owrx.source import SdrSource, SdrDeviceDescription import logging @@ -51,3 +51,7 @@ class DirectSource(SdrSource, metaclass=ABCMeta): # override this in subclasses, if necessary def sleepOnRestart(self): pass + + +class DirectSourceDeviceDescription(SdrDeviceDescription): + pass diff --git a/owrx/source/fcdpp.py b/owrx/source/fcdpp.py index bb121ee..342ad73 100644 --- a/owrx/source/fcdpp.py +++ b/owrx/source/fcdpp.py @@ -1,6 +1,10 @@ -from owrx.source.soapy import SoapyConnectorSource +from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription class FcdppSource(SoapyConnectorSource): def getDriver(self): return "fcdpp" + + +class FcdppDeviceDescription(SoapyConnectorDeviceDescription): + pass diff --git a/owrx/source/fifi_sdr.py b/owrx/source/fifi_sdr.py index 5b51558..700cb53 100644 --- a/owrx/source/fifi_sdr.py +++ b/owrx/source/fifi_sdr.py @@ -1,5 +1,5 @@ from owrx.command import Option -from .direct import DirectSource +from owrx.source.direct import DirectSource, DirectSourceDeviceDescription from subprocess import Popen import logging @@ -37,3 +37,7 @@ class FifiSdrSource(DirectSource): def onPropertyChange(self, changes): if "center_freq" in changes: self.sendRockProgFrequency(changes["center_freq"]) + + +class FifiSdrDeviceDescription(DirectSourceDeviceDescription): + pass diff --git a/owrx/source/hackrf.py b/owrx/source/hackrf.py index 9ced99e..85bf368 100644 --- a/owrx/source/hackrf.py +++ b/owrx/source/hackrf.py @@ -1,4 +1,4 @@ -from .soapy import SoapyConnectorSource +from .soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription class HackrfSource(SoapyConnectorSource): @@ -9,3 +9,7 @@ class HackrfSource(SoapyConnectorSource): def getDriver(self): return "hackrf" + + +class HackrfDeviceDescription(SoapyConnectorDeviceDescription): + pass diff --git a/owrx/source/hpsdr.py b/owrx/source/hpsdr.py index 6d88c67..63571d0 100644 --- a/owrx/source/hpsdr.py +++ b/owrx/source/hpsdr.py @@ -1,5 +1,5 @@ -from .connector import ConnectorSource -from owrx.command import Flag, Option +from owrx.source.connector import ConnectorSource, ConnectorDeviceDescription +from owrx.command import Option # In order to use an HPSDR radio, you must install hpsdrconnector from https://github.com/jancona/hpsdrconnector # These are the command line options available: @@ -33,3 +33,7 @@ class HpsdrSource(ConnectorSource): } ) ) + + +class HpsdrDeviceDescription(ConnectorDeviceDescription): + pass diff --git a/owrx/source/lime_sdr.py b/owrx/source/lime_sdr.py index 6220b68..dedfacf 100644 --- a/owrx/source/lime_sdr.py +++ b/owrx/source/lime_sdr.py @@ -1,6 +1,10 @@ -from .soapy import SoapyConnectorSource +from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription class LimeSdrSource(SoapyConnectorSource): def getDriver(self): return "lime" + + +class LimeSdrDeviceDescription(SoapyConnectorDeviceDescription): + pass diff --git a/owrx/source/perseussdr.py b/owrx/source/perseussdr.py index 1e2b8ec..88b6319 100644 --- a/owrx/source/perseussdr.py +++ b/owrx/source/perseussdr.py @@ -1,5 +1,5 @@ -from .direct import DirectSource -from owrx.command import Flag, Option +from owrx.source.direct import DirectSource, DirectSourceDeviceDescription +from owrx.command import Option # @@ -35,3 +35,7 @@ class PerseussdrSource(DirectSource): } ) ) + + +class PerseussdrDeviceDescription(DirectSourceDeviceDescription): + pass diff --git a/owrx/source/pluto_sdr.py b/owrx/source/pluto_sdr.py index 19fdeab..1f6dad1 100644 --- a/owrx/source/pluto_sdr.py +++ b/owrx/source/pluto_sdr.py @@ -1,6 +1,10 @@ -from .soapy import SoapyConnectorSource +from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription class PlutoSdrSource(SoapyConnectorSource): def getDriver(self): return "plutosdr" + + +class PlutoSdrDeviceDescription(SoapyConnectorDeviceDescription): + pass diff --git a/owrx/source/radioberry.py b/owrx/source/radioberry.py index 5bb95c7..2ec0e09 100644 --- a/owrx/source/radioberry.py +++ b/owrx/source/radioberry.py @@ -1,6 +1,10 @@ -from .soapy import SoapyConnectorSource +from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription class RadioberrySource(SoapyConnectorSource): def getDriver(self): return "radioberry" + + +class RadioberryDeviceDescription(SoapyConnectorDeviceDescription): + pass diff --git a/owrx/source/red_pitaya.py b/owrx/source/red_pitaya.py index 06431f0..00a484a 100644 --- a/owrx/source/red_pitaya.py +++ b/owrx/source/red_pitaya.py @@ -1,6 +1,10 @@ -from .soapy import SoapyConnectorSource +from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription class RedPitayaSource(SoapyConnectorSource): def getDriver(self): return "redpitaya" + + +class RedPitayaDeviceDescription(SoapyConnectorDeviceDescription): + pass diff --git a/owrx/source/rtl_sdr_soapy.py b/owrx/source/rtl_sdr_soapy.py index 55744d5..c6d3565 100644 --- a/owrx/source/rtl_sdr_soapy.py +++ b/owrx/source/rtl_sdr_soapy.py @@ -1,4 +1,4 @@ -from .soapy import SoapyConnectorSource +from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription class RtlSdrSoapySource(SoapyConnectorSource): @@ -9,3 +9,7 @@ class RtlSdrSoapySource(SoapyConnectorSource): def getDriver(self): return "rtlsdr" + + +class RtlSdrSoapyDeviceDescription(SoapyConnectorDeviceDescription): + pass diff --git a/owrx/source/rtl_tcp.py b/owrx/source/rtl_tcp.py index ba6ac1f..8e606d5 100644 --- a/owrx/source/rtl_tcp.py +++ b/owrx/source/rtl_tcp.py @@ -1,4 +1,4 @@ -from .connector import ConnectorSource +from owrx.source.connector import ConnectorSource, ConnectorDeviceDescription from owrx.command import Flag, Option, Argument @@ -16,3 +16,7 @@ class RtlTcpSource(ConnectorSource): } ) ) + + +class RtlTcpDeviceDescription(ConnectorDeviceDescription): + pass diff --git a/owrx/source/runds.py b/owrx/source/runds.py index f12f003..ba7bd99 100644 --- a/owrx/source/runds.py +++ b/owrx/source/runds.py @@ -1,4 +1,4 @@ -from owrx.source.connector import ConnectorSource +from owrx.source.connector import ConnectorSource, ConnectorDeviceDescription from owrx.command import Argument, Flag, Option @@ -16,3 +16,7 @@ class RundsSource(ConnectorSource): } ) ) + + +class RundsDeviceDescription(ConnectorDeviceDescription): + pass diff --git a/owrx/source/sddc.py b/owrx/source/sddc.py index 58e7380..e729116 100644 --- a/owrx/source/sddc.py +++ b/owrx/source/sddc.py @@ -1,6 +1,10 @@ -from owrx.source.connector import ConnectorSource +from owrx.source.connector import ConnectorSource, ConnectorDeviceDescription class SddcSource(ConnectorSource): def getCommandMapper(self): return super().getCommandMapper().setBase("sddc_connector") + + +class SddcDeviceDescription(ConnectorDeviceDescription): + pass diff --git a/owrx/source/soapy_remote.py b/owrx/source/soapy_remote.py index 53a3196..5f49653 100644 --- a/owrx/source/soapy_remote.py +++ b/owrx/source/soapy_remote.py @@ -1,4 +1,4 @@ -from .soapy import SoapyConnectorSource +from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription class SoapyRemoteSource(SoapyConnectorSource): @@ -15,3 +15,7 @@ class SoapyRemoteSource(SoapyConnectorSource): if "remote_driver" in values and values["remote_driver"] is not None: params += [{"remote:driver": values["remote_driver"]}] return params + + +class SoapyRemoteDeviceDescription(SoapyConnectorDeviceDescription): + pass diff --git a/owrx/source/uhd.py b/owrx/source/uhd.py index 29e2909..97418d8 100644 --- a/owrx/source/uhd.py +++ b/owrx/source/uhd.py @@ -1,6 +1,10 @@ -from .soapy import SoapyConnectorSource +from owrx.source.soapy import SoapyConnectorSource, SoapyConnectorDeviceDescription class UhdSource(SoapyConnectorSource): def getDriver(self): return "uhd" + + +class UhdDeviceDescription(SoapyConnectorDeviceDescription): + pass