Merge branch 'develop' into csdr++
This commit is contained in:
@@ -18,7 +18,6 @@ defaultConfig = PropertyLayer(
|
||||
fft_compression="adpcm",
|
||||
wfm_deemphasis_tau=50e-6,
|
||||
digimodes_fft_size=2048,
|
||||
digital_voice_unvoiced_quality=1,
|
||||
digital_voice_dmr_id_lookup=True,
|
||||
digital_voice_nxdn_id_lookup=True,
|
||||
sdrs=PropertyLayer(
|
||||
|
||||
@@ -31,7 +31,9 @@ class Controller(object):
|
||||
self.handler.end_headers()
|
||||
if type(content) == str:
|
||||
content = content.encode()
|
||||
self.handler.wfile.write(content)
|
||||
while len(content):
|
||||
w = self.handler.wfile.write(content)
|
||||
content = content[w:]
|
||||
|
||||
def send_redirect(self, location, code=303):
|
||||
self.handler.send_response(code)
|
||||
|
||||
@@ -35,12 +35,6 @@ class DecodingSettingsController(SettingsFormController):
|
||||
),
|
||||
Section(
|
||||
"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(
|
||||
"digital_voice_codecserver",
|
||||
"Codecserver address",
|
||||
|
||||
@@ -67,7 +67,6 @@ class DspManager(Output, SdrSourceEventClient):
|
||||
"fft_compression",
|
||||
"digimodes_fft_size",
|
||||
"samp_rate",
|
||||
"digital_voice_unvoiced_quality",
|
||||
"center_freq",
|
||||
"start_mod",
|
||||
"start_freq",
|
||||
@@ -128,7 +127,6 @@ class DspManager(Output, SdrSourceEventClient):
|
||||
self.props.wireProperty("low_cut", set_low_cut),
|
||||
self.props.wireProperty("high_cut", set_high_cut),
|
||||
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("wfm_deemphasis_tau", self.dsp.set_wfm_deemphasis_tau),
|
||||
self.props.wireProperty("digital_voice_codecserver", self.dsp.set_codecserver),
|
||||
|
||||
@@ -259,6 +259,8 @@ class FeatureDetector(object):
|
||||
"fsk_demodulator",
|
||||
"pocsag_decoder",
|
||||
"dstar_decoder",
|
||||
"nxdn_decoder",
|
||||
"dc_block",
|
||||
],
|
||||
),
|
||||
True,
|
||||
@@ -279,7 +281,7 @@ class FeatureDetector(object):
|
||||
return False
|
||||
|
||||
def _check_owrx_connector(self, command):
|
||||
return self._check_connector(command, LooseVersion("0.4"))
|
||||
return self._check_connector(command, LooseVersion("0.5"))
|
||||
|
||||
def has_rtl_connector(self):
|
||||
"""
|
||||
@@ -548,6 +550,11 @@ class FeatureDetector(object):
|
||||
return self._check_connector("runds_connector", LooseVersion("0.2"))
|
||||
|
||||
def has_codecserver_ambe(self):
|
||||
"""
|
||||
Codecserver is used to decode audio data from digital voice modes using the AMBE codec.
|
||||
|
||||
You can find more information [here](https://github.com/jketterl/codecserver).
|
||||
"""
|
||||
tmp_dir = CoreConfig().get_temporary_directory()
|
||||
cmd = ["mbe_synthesizer", "--test"]
|
||||
config = Config.get()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from distutils.version import LooseVersion
|
||||
|
||||
_versionstring = "1.1.0-dev"
|
||||
_versionstring = "1.2.0-dev"
|
||||
looseversion = LooseVersion(_versionstring)
|
||||
openwebrx_version = "v{0}".format(looseversion)
|
||||
|
||||
Reference in New Issue
Block a user