diff --git a/config_webrx.py b/config_webrx.py index 25053eb..e97ed63 100644 --- a/config_webrx.py +++ b/config_webrx.py @@ -131,17 +131,23 @@ sdrs = { "name":"20m", "center_freq": 14150000, "rf_gain": 4, - "if_gain": 40, "samp_rate": 500000, "start_freq": 14070000, "start_mod": "usb", "antenna": "Antenna A" }, + "30m": { + "name":"30m", + "center_freq": 10125000, + "rf_gain": 4, + "samp_rate": 250000, + "start_freq": 10142000, + "start_mod": "usb" + }, "40m": { "name":"40m", "center_freq": 7100000, "rf_gain": 4, - "if_gain": 40, "samp_rate": 500000, "start_freq": 7070000, "start_mod": "usb", @@ -151,7 +157,6 @@ sdrs = { "name":"80m", "center_freq": 3650000, "rf_gain": 4, - "if_gain": 40, "samp_rate": 500000, "start_freq": 3570000, "start_mod": "usb", @@ -161,7 +166,6 @@ sdrs = { "name": "49m Broadcast", "center_freq": 6000000, "rf_gain": 4, - "if_gain": 40, "samp_rate": 500000, "start_freq": 6070000, "start_mod": "am", diff --git a/owrx/source.py b/owrx/source.py index 2820abc..eeed1a7 100644 --- a/owrx/source.py +++ b/owrx/source.py @@ -246,7 +246,7 @@ class SdrplaySource(SdrSource): def getCommand(self): command = "rx_sdr -F CF32 -s {samp_rate} -f {center_freq} -p {ppm}" gainMap = { "rf_gain" : "RFGR", "if_gain" : "IFGR"} - gains = [ "{0}={{{1}}}".format(gainMap[name], name) for name in self.rtlProps.collect("rf_gain", "if_gain").__dict__() ] + gains = [ "{0}={{{1}}}".format(gainMap[name], name) for (name, value) in self.rtlProps.collect("rf_gain", "if_gain").__dict__().items() if value is not None ] if gains: command += " -g {gains}".format(gains = ",".join(gains)) if self.rtlProps["antenna"] is not None: