Merge branch 'develop' into pycsdr

This commit is contained in:
Jakob Ketterl 2021-07-20 13:33:52 +02:00
commit b242f09d5d
5 changed files with 0 additions and 21 deletions

View File

@ -104,9 +104,6 @@ version = 7
#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
# if you're running on a Raspi (up to 3B+) you'll want to leave this on 1
#digital_voice_unvoiced_quality = 1
# enables lookup of DMR ids using the radioid api # enables lookup of DMR ids using the radioid api
#digital_voice_dmr_id_lookup = True #digital_voice_dmr_id_lookup = True

View File

@ -93,7 +93,6 @@ class Dsp(DirewolfConfigSubscriber):
self.pipes = {} self.pipes = {}
self.secondary_pipe_names = {"secondary_shift_pipe": Pipe.WRITE} self.secondary_pipe_names = {"secondary_shift_pipe": Pipe.WRITE}
self.secondary_offset_freq = 1000 self.secondary_offset_freq = 1000
self.unvoiced_quality = 1
self.codecserver = None self.codecserver = None
self.modification_lock = threading.Lock() self.modification_lock = threading.Lock()
self.output = output self.output = output
@ -640,13 +639,6 @@ class Dsp(DirewolfConfigSubscriber):
else: else:
self.pipes["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch))) self.pipes["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch)))
def set_unvoiced_quality(self, q):
self.unvoiced_quality = q
self.restart()
def get_unvoiced_quality(self):
return self.unvoiced_quality
def set_codecserver(self, s): def set_codecserver(self, s):
if self.codecserver == s: if self.codecserver == s:
return return
@ -774,7 +766,6 @@ class Dsp(DirewolfConfigSubscriber):
nc_port=self.nc_port, nc_port=self.nc_port,
output_rate=self.get_output_rate(), output_rate=self.get_output_rate(),
smeter_report_every=int(self.if_samp_rate() / 6000), smeter_report_every=int(self.if_samp_rate() / 6000),
unvoiced_quality=self.get_unvoiced_quality(),
codecserver_arg=self.get_codecserver_arg(), codecserver_arg=self.get_codecserver_arg(),
audio_rate=self.get_audio_rate(), audio_rate=self.get_audio_rate(),
wfm_deemphasis_tau=self.wfm_deemphasis_tau, wfm_deemphasis_tau=self.wfm_deemphasis_tau,

View File

@ -18,7 +18,6 @@ defaultConfig = PropertyLayer(
fft_compression="adpcm", fft_compression="adpcm",
wfm_deemphasis_tau=50e-6, wfm_deemphasis_tau=50e-6,
digimodes_fft_size=2048, digimodes_fft_size=2048,
digital_voice_unvoiced_quality=1,
digital_voice_dmr_id_lookup=True, digital_voice_dmr_id_lookup=True,
digital_voice_nxdn_id_lookup=True, digital_voice_nxdn_id_lookup=True,
sdrs=PropertyLayer( sdrs=PropertyLayer(

View File

@ -35,12 +35,6 @@ class DecodingSettingsController(SettingsFormController):
), ),
Section( Section(
"Digital voice", "Digital voice",
NumberInput(
"digital_voice_unvoiced_quality",
"Quality of unvoiced sounds in synthesized voice",
infotext="Determines the quality, and thus the cpu usage, for the ambe codec used by digital voice"
+ " modes.<br />If you're running on a Raspberry Pi (up to 3B+) you should leave this set at 1",
),
TextInput( TextInput(
"digital_voice_codecserver", "digital_voice_codecserver",
"Codecserver address", "Codecserver address",

View File

@ -67,7 +67,6 @@ class DspManager(Output, SdrSourceEventClient):
"fft_compression", "fft_compression",
"digimodes_fft_size", "digimodes_fft_size",
"samp_rate", "samp_rate",
"digital_voice_unvoiced_quality",
"center_freq", "center_freq",
"start_mod", "start_mod",
"start_freq", "start_freq",
@ -128,7 +127,6 @@ class DspManager(Output, SdrSourceEventClient):
self.props.wireProperty("low_cut", set_low_cut), self.props.wireProperty("low_cut", set_low_cut),
self.props.wireProperty("high_cut", set_high_cut), self.props.wireProperty("high_cut", set_high_cut),
self.props.wireProperty("mod", self.dsp.set_demodulator), self.props.wireProperty("mod", self.dsp.set_demodulator),
self.props.wireProperty("digital_voice_unvoiced_quality", self.dsp.set_unvoiced_quality),
self.props.wireProperty("dmr_filter", self.dsp.set_dmr_filter), self.props.wireProperty("dmr_filter", self.dsp.set_dmr_filter),
self.props.wireProperty("wfm_deemphasis_tau", self.dsp.set_wfm_deemphasis_tau), self.props.wireProperty("wfm_deemphasis_tau", self.dsp.set_wfm_deemphasis_tau),
self.props.wireProperty("digital_voice_codecserver", self.dsp.set_codecserver), self.props.wireProperty("digital_voice_codecserver", self.dsp.set_codecserver),