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

remove digimodes_enable setting since it no longer works

Browse Source
This commit is contained in:
Jakob Ketterl 2021-04-18 00:50:13 +02:00
parent 11b0d2d90a
commit 5ec0005f81
4 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config_webrx.py
View File

@ -102,7 +102,6 @@ version = 7
# wfm_deemphasis_tau = 75e-6 # for US and South Korea # wfm_deemphasis_tau = 75e-6 # for US and South Korea
#wfm_deemphasis_tau = 50e-6 # for the rest of the world #wfm_deemphasis_tau = 50e-6 # for the rest of the world
#digimodes_enable = True # Decoding digimodes come with higher CPU usage.
#digimodes_fft_size = 2048 #digimodes_fft_size = 2048
# determines the quality, and thus the cpu usage, for the ambe codec used by digital voice modes # determines the quality, and thus the cpu usage, for the ambe codec used by digital voice modes

1
owrx/config/defaults.py
View File

@ -17,7 +17,6 @@ defaultConfig = PropertyLayer(
audio_compression="adpcm", audio_compression="adpcm",
fft_compression="adpcm", fft_compression="adpcm",
wfm_deemphasis_tau=50e-6, wfm_deemphasis_tau=50e-6,
digimodes_enable=True,
digimodes_fft_size=2048, digimodes_fft_size=2048,
digital_voice_unvoiced_quality=1, digital_voice_unvoiced_quality=1,
digital_voice_dmr_id_lookup=True, digital_voice_dmr_id_lookup=True,

1
owrx/controllers/settings/decoding.py
View File

@ -43,7 +43,6 @@ class DecodingSettingsController(SettingsFormController):
), ),
Section( Section(
"Digimodes", "Digimodes",
CheckboxInput("digimodes_enable", "Enable Digimodes"),
NumberInput("digimodes_fft_size", "Digimodes FFT size", append="bins"), NumberInput("digimodes_fft_size", "Digimodes FFT size", append="bins"),
), ),
Section( Section(

41
owrx/dsp.py
View File

@ -66,7 +66,6 @@ class DspManager(Output, SdrSourceEventClient):
"audio_compression", "audio_compression",
"fft_compression", "fft_compression",
"digimodes_fft_size", "digimodes_fft_size",
"digimodes_enable",
"samp_rate", "samp_rate",
"digital_voice_unvoiced_quality", "digital_voice_unvoiced_quality",
"center_freq", "center_freq",
@ -136,29 +135,27 @@ class DspManager(Output, SdrSourceEventClient):
self.dsp.set_temporary_directory(CoreConfig().get_temporary_directory()) self.dsp.set_temporary_directory(CoreConfig().get_temporary_directory())
if self.props["digimodes_enable"]: def send_secondary_config(*args):
self.handler.write_secondary_dsp_config(
{
"secondary_fft_size": self.props["digimodes_fft_size"],
"if_samp_rate": self.dsp.if_samp_rate(),
"secondary_bw": self.dsp.secondary_bw(),
}
)
def send_secondary_config(*args): def set_secondary_mod(mod):
self.handler.write_secondary_dsp_config( if mod == False:
{ mod = None
"secondary_fft_size": self.props["digimodes_fft_size"], self.dsp.set_secondary_demodulator(mod)
"if_samp_rate": self.dsp.if_samp_rate(), if mod is not None:
"secondary_bw": self.dsp.secondary_bw(), send_secondary_config()
}
)
def set_secondary_mod(mod): self.subscriptions += [
if mod == False: self.props.wireProperty("secondary_mod", set_secondary_mod),
mod = None self.props.wireProperty("digimodes_fft_size", send_secondary_config),
self.dsp.set_secondary_demodulator(mod) self.props.wireProperty("secondary_offset_freq", self.dsp.set_secondary_offset_freq),
if mod is not None: ]
send_secondary_config()
self.subscriptions += [
self.props.wireProperty("secondary_mod", set_secondary_mod),
self.props.wireProperty("digimodes_fft_size", send_secondary_config),
self.props.wireProperty("secondary_offset_freq", self.dsp.set_secondary_offset_freq),
]
self.startOnAvailable = False self.startOnAvailable = False