joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add antenna switching support for sdrplay

Browse Source
This commit is contained in:
Jakob Ketterl 2019-05-19 13:17:36 +02:00
parent a85a6c694c
commit eb758685a1
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
config_webrx.py
View File

@ -133,7 +133,8 @@ sdrs = {
"rf_gain": 40, "rf_gain": 40,
"samp_rate": 500000, "samp_rate": 500000,
"start_freq": 14070000, "start_freq": 14070000,
"start_mod": "usb" "start_mod": "usb",
"antenna": "Antenna A"
}, },
"40m": { "40m": {
"name":"40m", "name":"40m",
@ -141,7 +142,8 @@ sdrs = {
"rf_gain": 40, "rf_gain": 40,
"samp_rate": 500000, "samp_rate": 500000,
"start_freq": 7070000, "start_freq": 7070000,
"start_mod": "usb" "start_mod": "usb",
"antenna": "Antenna A"
}, },
"80m": { "80m": {
"name":"80m", "name":"80m",
@ -149,7 +151,8 @@ sdrs = {
"rf_gain": 40, "rf_gain": 40,
"samp_rate": 500000, "samp_rate": 500000,
"start_freq": 3570000, "start_freq": 3570000,
"start_mod": "usb" "start_mod": "usb",
"antenna": "Antenna A"
}, },
"49m": { "49m": {
"name": "49m Broadcast", "name": "49m Broadcast",
@ -157,7 +160,8 @@ sdrs = {
"rf_gain": 40, "rf_gain": 40,
"samp_rate": 500000, "samp_rate": 500000,
"start_freq": 6070000, "start_freq": 6070000,
"start_mod": "am" "start_mod": "am",
"antenna": "Antenna A"
} }
} }
}, },

2
owrx/config.py
View File

@ -32,7 +32,7 @@ class PropertyManager(object):
return PropertyManager.sharedInstance return PropertyManager.sharedInstance
def collect(self, *props): def collect(self, *props):
return PropertyManager(dict((name, self.getProperty(name) if self.hasProperty(name) else Property()) for name in props)) return PropertyManager({name: self.getProperty(name) if self.hasProperty(name) else Property() for name in props})
def __init__(self, properties = None): def __init__(self, properties = None):
self.properties = {} self.properties = {}

11
owrx/source.py
View File

@ -76,7 +76,7 @@ class SdrSource(object):
self.props = props self.props = props
self.activateProfile() self.activateProfile()
self.rtlProps = self.props.collect( self.rtlProps = self.props.collect(
"type", "samp_rate", "nmux_memory", "center_freq", "ppm", "rf_gain", "lna_gain", "rf_amp" "samp_rate", "nmux_memory", "center_freq", "ppm", "rf_gain", "lna_gain", "rf_amp", "antenna"
).defaults(PropertyManager.getSharedInstance()) ).defaults(PropertyManager.getSharedInstance())
def restart(name, value): def restart(name, value):
@ -128,12 +128,7 @@ class SdrSource(object):
props = self.rtlProps props = self.rtlProps
start_sdr_command = self.command.format( start_sdr_command = self.command.format(
samp_rate = props["samp_rate"], **props.collect("samp_rate", "center_freq", "ppm", "rf_gain", "lna_gain", "rf_amp", "antenna").__dict__()
center_freq = props["center_freq"],
ppm = props["ppm"],
rf_gain = props["rf_gain"],
lna_gain = props["lna_gain"],
rf_amp = props["rf_amp"]
) )
if self.format_conversion is not None: if self.format_conversion is not None:
@ -243,7 +238,7 @@ class HackrfSource(SdrSource):
class SdrplaySource(SdrSource): class SdrplaySource(SdrSource):
def __init__(self, props, port): def __init__(self, props, port):
super().__init__(props, port) super().__init__(props, port)
self.command = "rx_sdr -F CF32 -s {samp_rate} -f {center_freq} -p {ppm} -g {rf_gain} -" self.command = "rx_sdr -F CF32 -s {samp_rate} -f {center_freq} -p {ppm} -g {rf_gain} -a \"{antenna}\" -"
self.format_conversion = None self.format_conversion = None
def sleepOnRestart(self): def sleepOnRestart(self):