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

Merge branch 'server_rework' into server_rework_dsd

Browse Source
This commit is contained in:
Jakob Ketterl 2019-05-19 22:25:37 +02:00
commit 224c895718
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config_webrx.py
View File

@ -135,7 +135,6 @@ sdrs = {
"name":"20m", "name":"20m",
"center_freq": 14150000, "center_freq": 14150000,
"rf_gain": 4, "rf_gain": 4,
"if_gain": 40,
"samp_rate": 500000, "samp_rate": 500000,
"start_freq": 14070000, "start_freq": 14070000,
"start_mod": "usb", "start_mod": "usb",
@ -145,7 +144,6 @@ sdrs = {
"name":"30m", "name":"30m",
"center_freq": 10125000, "center_freq": 10125000,
"rf_gain": 4, "rf_gain": 4,
"if_gain": 40,
"samp_rate": 250000, "samp_rate": 250000,
"start_freq": 10142000, "start_freq": 10142000,
"start_mod": "usb" "start_mod": "usb"
@ -154,7 +152,6 @@ sdrs = {
"name":"40m", "name":"40m",
"center_freq": 7100000, "center_freq": 7100000,
"rf_gain": 4, "rf_gain": 4,
"if_gain": 40,
"samp_rate": 500000, "samp_rate": 500000,
"start_freq": 7070000, "start_freq": 7070000,
"start_mod": "usb", "start_mod": "usb",
@ -164,7 +161,6 @@ sdrs = {
"name":"80m", "name":"80m",
"center_freq": 3650000, "center_freq": 3650000,
"rf_gain": 4, "rf_gain": 4,
"if_gain": 40,
"samp_rate": 500000, "samp_rate": 500000,
"start_freq": 3570000, "start_freq": 3570000,
"start_mod": "usb", "start_mod": "usb",
@ -174,7 +170,6 @@ sdrs = {
"name": "49m Broadcast", "name": "49m Broadcast",
"center_freq": 6000000, "center_freq": 6000000,
"rf_gain": 4, "rf_gain": 4,
"if_gain": 40,
"samp_rate": 500000, "samp_rate": 500000,
"start_freq": 6070000, "start_freq": 6070000,
"start_mod": "am", "start_mod": "am",

2
owrx/source.py
View File

@ -245,7 +245,7 @@ class SdrplaySource(SdrSource):
def getCommand(self): def getCommand(self):
command = "rx_sdr -F CF32 -s {samp_rate} -f {center_freq} -p {ppm}" command = "rx_sdr -F CF32 -s {samp_rate} -f {center_freq} -p {ppm}"
gainMap = { "rf_gain" : "RFGR", "if_gain" : "IFGR"} 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: if gains:
command += " -g {gains}".format(gains = ",".join(gains)) command += " -g {gains}".format(gains = ",".join(gains))
if self.rtlProps["antenna"] is not None: if self.rtlProps["antenna"] is not None: