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

change digiham / ambe integration

Browse Source
This commit is contained in:
Jakob Ketterl 2021-05-27 21:35:55 +02:00
parent 3f7a93acfc
commit a16ad952c4
4 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -1,5 +1,6 @@
**1.1.x - unreleased** **1.1.x - unreleased**
- Reworked most graphical elements as SVGs for faster loadtimes and crispier display on hi-dpi displays - 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** **1.0.0**
- Introduced `squelch_auto_margin` config option that allows configuring the auto squelch level - Introduced `squelch_auto_margin` config option that allows configuring the auto squelch level

55
csdr/__init__.py
View File

@ -163,44 +163,37 @@ class Dsp(DirewolfConfigSubscriber):
elif self.isDigitalVoice(which): elif self.isDigitalVoice(which):
chain += ["csdr fmdemod_quadri_cf"] chain += ["csdr fmdemod_quadri_cf"]
chain += last_decimation_block chain += last_decimation_block
# dsd modes chain += ["dc_block"]
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 - ",
]
# m17 # m17
elif which == "m17": if which == "m17":
chain += [ chain += [
"dc_block",
"csdr limit_ff", "csdr limit_ff",
"csdr convert_f_s16", "csdr convert_f_s16",
"m17-demod", "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: else:
chain += ["dc_block", "rrc_filter", "gfsk_demodulator"] # dsd modes
if which == "dmr": if which in ["dstar", "nxdn"]:
chain += [ chain += ["csdr limit_ff", "csdr convert_f_s16"]
"dmr_decoder --fifo {meta_pipe} --control-fifo {dmr_control_pipe}", if which == "dstar":
"mbe_synthesizer -f -u {unvoiced_quality}", chain += ["dsd -fd -i - -o - -u {unvoiced_quality} -g -1 "]
] elif which == "nxdn":
elif which == "ysf": chain += ["dsd -fi -i - -o - -u {unvoiced_quality} -g -1 "]
chain += ["ysf_decoder --fifo {meta_pipe}", "mbe_synthesizer -y -f -u {unvoiced_quality}"] # digiham modes
max_gain = 0.005 else:
chain += [ chain += ["rrc_filter", "gfsk_demodulator"]
"digitalvoice_filter -f", if which == "dmr":
"CSDR_FIXED_BUFSIZE=32 csdr agc_ff --max 0.005 --initial 0.0005", chain += [
"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 - ", "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": elif which == "am":
chain += ["csdr amdemod_cf", "csdr fastdcblock_ff"] chain += ["csdr amdemod_cf", "csdr fastdcblock_ff"]
chain += last_decimation_block chain += last_decimation_block

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ openwebrx (1.1.0) UNRELEASED; urgency=low
* Reworked most graphical elements as SVGs for faster loadtimes and crispier * Reworked most graphical elements as SVGs for faster loadtimes and crispier
display on hi-dpi displays display on hi-dpi displays
* Updated pipelines to match changes in digiham
-- Jakob Ketterl <jakob.ketterl@gmx.de> Sun, 09 May 2021 14:05:00 +0000 -- Jakob Ketterl <jakob.ketterl@gmx.de> Sun, 09 May 2021 14:05:00 +0000

2
debian/control vendored
View File

@ -11,6 +11,6 @@ Vcs-Git: https://github.com/jketterl/openwebrx.git
Package: openwebrx Package: openwebrx
Architecture: all 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} 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 Description: multi-user web sdr
Open source, multi-user SDR receiver with a web interface Open source, multi-user SDR receiver with a web interface