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

only specify device strings when configured

Browse Source
This commit is contained in:
Jakob Ketterl 2019-11-24 20:34:51 +01:00
parent fa097bf57e
commit 53de54120e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
owrx/source.py
View File

@ -512,8 +512,10 @@ class RtlSdrConnectorSource(ConnectorSource):
def getCommand(self): def getCommand(self):
cmd = ( cmd = (
"rtl_connector -p {port} -c {controlPort}".format(port=self.port, controlPort=self.controlPort) "rtl_connector -p {port} -c {controlPort}".format(port=self.port, controlPort=self.controlPort)
+ " -s {samp_rate} -f {tuner_freq} -g {rf_gain} -P {ppm} -d {device}" + " -s {samp_rate} -f {tuner_freq} -g {rf_gain} -P {ppm}"
) )
if "device" in self.rtlProps and self.rtlProps["device"] is not None:
cmd += ' -d "{device}"'
if self.rtlProps["iqswap"]: if self.rtlProps["iqswap"]:
cmd += " -i" cmd += " -i"
return cmd return cmd
@ -535,8 +537,10 @@ class SdrplayConnectorSource(ConnectorSource):
def getCommand(self): def getCommand(self):
cmd = ( cmd = (
"soapy_connector -p {port} -c {controlPort}".format(port=self.port, controlPort=self.controlPort) "soapy_connector -p {port} -c {controlPort}".format(port=self.port, controlPort=self.controlPort)
+ ' -s {samp_rate} -f {tuner_freq} -g "{rf_gain}" -P {ppm} -a "{antenna}" -d "{device}"' + ' -s {samp_rate} -f {tuner_freq} -g "{rf_gain}" -P {ppm} -a "{antenna}"'
) )
if "device" in self.rtlProps and self.rtlProps["device"] is not None:
cmd += ' -d "{device}"'
if self.rtlProps["iqswap"]: if self.rtlProps["iqswap"]:
cmd += " -i" cmd += " -i"
return cmd return cmd
@ -558,8 +562,10 @@ class AirspyConnectorSource(ConnectorSource):
def getCommand(self): def getCommand(self):
cmd = ( cmd = (
"soapy_connector -p {port} -c {controlPort}".format(port=self.port, controlPort=self.controlPort) "soapy_connector -p {port} -c {controlPort}".format(port=self.port, controlPort=self.controlPort)
+ ' -s {samp_rate} -f {tuner_freq} -g "{rf_gain}" -P {ppm} -d "{device}"' + ' -s {samp_rate} -f {tuner_freq} -g "{rf_gain}" -P {ppm}'
) )
if "device" in self.rtlProps and self.rtlProps["device"] is not None:
cmd += ' -d "{device}"'
if self.rtlProps["iqswap"]: if self.rtlProps["iqswap"]:
cmd += " -i" cmd += " -i"
if self.rtlProps["bias_tee"]: if self.rtlProps["bias_tee"]: