remove digimodes_enable setting since it no longer works
This commit is contained in:
parent
11b0d2d90a
commit
5ec0005f81
@ -102,7 +102,6 @@ version = 7
|
||||
# wfm_deemphasis_tau = 75e-6 # for US and South Korea
|
||||
#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
|
||||
|
||||
# determines the quality, and thus the cpu usage, for the ambe codec used by digital voice modes
|
||||
|
@ -17,7 +17,6 @@ defaultConfig = PropertyLayer(
|
||||
audio_compression="adpcm",
|
||||
fft_compression="adpcm",
|
||||
wfm_deemphasis_tau=50e-6,
|
||||
digimodes_enable=True,
|
||||
digimodes_fft_size=2048,
|
||||
digital_voice_unvoiced_quality=1,
|
||||
digital_voice_dmr_id_lookup=True,
|
||||
|
@ -43,7 +43,6 @@ class DecodingSettingsController(SettingsFormController):
|
||||
),
|
||||
Section(
|
||||
"Digimodes",
|
||||
CheckboxInput("digimodes_enable", "Enable Digimodes"),
|
||||
NumberInput("digimodes_fft_size", "Digimodes FFT size", append="bins"),
|
||||
),
|
||||
Section(
|
||||
|
41
owrx/dsp.py
41
owrx/dsp.py
@ -66,7 +66,6 @@ class DspManager(Output, SdrSourceEventClient):
|
||||
"audio_compression",
|
||||
"fft_compression",
|
||||
"digimodes_fft_size",
|
||||
"digimodes_enable",
|
||||
"samp_rate",
|
||||
"digital_voice_unvoiced_quality",
|
||||
"center_freq",
|
||||
@ -136,29 +135,27 @@ class DspManager(Output, SdrSourceEventClient):
|
||||
|
||||
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):
|
||||
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 set_secondary_mod(mod):
|
||||
if mod == False:
|
||||
mod = None
|
||||
self.dsp.set_secondary_demodulator(mod)
|
||||
if mod is not None:
|
||||
send_secondary_config()
|
||||
|
||||
def set_secondary_mod(mod):
|
||||
if mod == False:
|
||||
mod = None
|
||||
self.dsp.set_secondary_demodulator(mod)
|
||||
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.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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user