diff --git a/CHANGELOG.md b/CHANGELOG.md index fd3f1a8..83b7a22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ **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 -- Changed D-Star integration to use new decoder in digiham -- Added D-Star metadata display +- Changed D-Star and NXDN integrations to use new decoders from digiham +- Added D-Star and NXDN metadata display **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 6a534e4..1f4325f 100644 --- a/csdr/__init__.py +++ b/csdr/__init__.py @@ -173,7 +173,7 @@ class Dsp(DirewolfConfigSubscriber): "m17-demod", ] else: - # dsd modes + # digiham modes if which == "dstar": chain += [ "fsk_demodulator -s 10", @@ -181,8 +181,12 @@ class Dsp(DirewolfConfigSubscriber): "mbe_synthesizer -d {codecserver_arg}", ] elif which == "nxdn": - chain += ["csdr limit_ff", "csdr convert_f_s16", "dsd -fi -i - -o - -u {unvoiced_quality} -g -1 "] - # digiham modes + chain += [ + "rrc_filter --narrow", + "gfsk_demodulator --samples 20", + "nxdn_decoder --fifo {meta_pipe}", + "mbe_synthesizer {codecserver_arg}", + ] else: chain += ["rrc_filter", "gfsk_demodulator"] if which == "dmr": diff --git a/debian/changelog b/debian/changelog index ccbfeac..f5684bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,8 @@ 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 - * Changed D-Star integration to use new decoder in digiham - * Added D-Star metadata display + * Changed D-Star and NXDN integrations to use new decoder from digiham + * Added D-Star and NXDN metadata display -- Jakob Ketterl Sun, 09 May 2021 14:05:00 +0000 diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css index e0a3cd4..cacd4a1 100644 --- a/htdocs/css/openwebrx.css +++ b/htdocs/css/openwebrx.css @@ -1051,12 +1051,14 @@ img.openwebrx-mirror-img } .openwebrx-meta-slot.active.direct .openwebrx-meta-user-image .directcall, +.openwebrx-meta-slot.active.individual .openwebrx-meta-user-image .directcall, #openwebrx-panel-metadata-ysf .openwebrx-meta-slot.active .openwebrx-meta-user-image .directcall, #openwebrx-panel-metadata-dstar .openwebrx-meta-slot.active .openwebrx-meta-user-image .directcall { display: initial; } -.openwebrx-meta-slot.active.group .openwebrx-meta-user-image .groupcall { +.openwebrx-meta-slot.active.group .openwebrx-meta-user-image .groupcall, +.openwebrx-meta-slot.active.conference .openwebrx-meta-user-image .groupcall { display: initial; } @@ -1097,6 +1099,14 @@ img.openwebrx-mirror-img content: "RPT2: "; } +.openwebrx-meta-slot.individual .openwebrx-nxdn-destination:not(:empty):before { + content: "Direct: "; +} + +.openwebrx-meta-slot.conference .openwebrx-nxdn-destination:not(:empty):before { + content: "Conference: "; +} + .openwebrx-maps-pin svg { width: 15px; height: 15px; diff --git a/htdocs/index.html b/htdocs/index.html index ad7c7f7..300a777 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -97,6 +97,17 @@
+