diff --git a/CHANGELOG.md b/CHANGELOG.md index f82197e1..0610cb3d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ **1.1.x - unreleased** - Reworked most graphical elements as SVGs for faster loadtimes and crispier display on hi-dpi displays +- Updated pipelines to match changes in digiham **1.0.0** - Introduced `squelch_auto_margin` config option that allows configuring the auto squelch level diff --git a/csdr/__init__.py b/csdr/__init__.py index 2947f97a..ec51eca5 100644 --- a/csdr/__init__.py +++ b/csdr/__init__.py @@ -163,44 +163,37 @@ class Dsp(DirewolfConfigSubscriber): elif self.isDigitalVoice(which): chain += ["csdr fmdemod_quadri_cf"] chain += last_decimation_block - # dsd modes - if which in ["dstar", "nxdn"]: - chain += ["dc_block", "csdr limit_ff", "csdr convert_f_s16"] - if which == "dstar": - chain += ["dsd -fd -i - -o - -u {unvoiced_quality} -g -1 "] - elif which == "nxdn": - chain += ["dsd -fi -i - -o - -u {unvoiced_quality} -g -1 "] - chain += [ - "digitalvoice_filter", - "CSDR_FIXED_BUFSIZE=32 csdr agc_s16 --max 30 --initial 3", - "sox -t raw -r 8000 -e signed-integer -b 16 -c 1 --buffer 32 - -t raw -r {output_rate} -e signed-integer -b 16 -c 1 - ", - ] + chain += ["dc_block"] # m17 - elif which == "m17": + if which == "m17": chain += [ - "dc_block", "csdr limit_ff", "csdr convert_f_s16", "m17-demod", - "CSDR_FIXED_BUFSIZE=32 csdr agc_s16 --max 30 --initial 3", - "sox -t raw -r 8000 -e signed-integer -b 16 -c 1 --buffer 32 - -t raw -r {output_rate} -e signed-integer -b 16 -c 1 - ", ] - # digiham modes else: - chain += ["dc_block", "rrc_filter", "gfsk_demodulator"] - if which == "dmr": - chain += [ - "dmr_decoder --fifo {meta_pipe} --control-fifo {dmr_control_pipe}", - "mbe_synthesizer -f -u {unvoiced_quality}", - ] - elif which == "ysf": - chain += ["ysf_decoder --fifo {meta_pipe}", "mbe_synthesizer -y -f -u {unvoiced_quality}"] - max_gain = 0.005 - chain += [ - "digitalvoice_filter -f", - "CSDR_FIXED_BUFSIZE=32 csdr agc_ff --max 0.005 --initial 0.0005", - "sox -t raw -r 8000 -e floating-point -b 32 -c 1 --buffer 32 - -t raw -r {output_rate} -e signed-integer -b 16 -c 1 - ", - ] + # dsd modes + if which in ["dstar", "nxdn"]: + chain += ["csdr limit_ff", "csdr convert_f_s16"] + if which == "dstar": + chain += ["dsd -fd -i - -o - -u {unvoiced_quality} -g -1 "] + elif which == "nxdn": + chain += ["dsd -fi -i - -o - -u {unvoiced_quality} -g -1 "] + # digiham modes + else: + chain += ["rrc_filter", "gfsk_demodulator"] + if which == "dmr": + chain += [ + "dmr_decoder --fifo {meta_pipe} --control-fifo {dmr_control_pipe}", + "mbe_synthesizer", + ] + elif which == "ysf": + chain += ["ysf_decoder --fifo {meta_pipe}", "mbe_synthesizer -y"] + chain += ["digitalvoice_filter"] + chain += [ + "CSDR_FIXED_BUFSIZE=32 csdr agc_s16 --max 30 --initial 3", + "sox -t raw -r 8000 -e signed-integer -b 16 -c 1 --buffer 32 - -t raw -r {output_rate} -e signed-integer -b 16 -c 1 - ", + ] elif which == "am": chain += ["csdr amdemod_cf", "csdr fastdcblock_ff"] chain += last_decimation_block diff --git a/debian/changelog b/debian/changelog index abdfe95d..25ecdf7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ openwebrx (1.1.0) UNRELEASED; urgency=low * Reworked most graphical elements as SVGs for faster loadtimes and crispier display on hi-dpi displays + * Updated pipelines to match changes in digiham -- Jakob Ketterl Sun, 09 May 2021 14:05:00 +0000 diff --git a/debian/control b/debian/control index 07b34b07..73615c13 100644 --- a/debian/control +++ b/debian/control @@ -11,6 +11,6 @@ Vcs-Git: https://github.com/jketterl/openwebrx.git Package: openwebrx Architecture: all Depends: adduser, python3 (>= 3.5), python3-pkg-resources, csdr (>= 0.17), netcat, owrx-connector (>= 0.5), soapysdr-tools, python3-js8py (>= 0.1), ${python3:Depends}, ${misc:Depends} -Recommends: digiham (>= 0.4), dsd (>= 1.7), sox, direwolf (>= 1.4), wsjtx, runds-connector (>= 0.2), hpsdrconnector, aprs-symbols, m17-demod, js8call +Recommends: digiham (>= 0.5), dsd (>= 1.7), sox, direwolf (>= 1.4), wsjtx, runds-connector (>= 0.2), hpsdrconnector, aprs-symbols, m17-demod, js8call Description: multi-user web sdr Open source, multi-user SDR receiver with a web interface