diff --git a/csdr/chain/drm.py b/csdr/chain/drm.py index 7aa58ebb..78b90f0d 100644 --- a/csdr/chain/drm.py +++ b/csdr/chain/drm.py @@ -6,7 +6,11 @@ from csdr.module.drm import DrmModule class Drm(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain): def __init__(self): - workers = [Convert(Format.COMPLEX_FLOAT, Format.COMPLEX_SHORT), DrmModule(), Downmix()] + workers = [ + Convert(Format.COMPLEX_FLOAT, Format.COMPLEX_SHORT), + DrmModule(), + Downmix(Format.SHORT), + ] super().__init__(workers) def supportsSquelch(self) -> bool: diff --git a/docker/scripts/install-owrx-tools.sh b/docker/scripts/install-owrx-tools.sh index 0c9db6d9..231f5919 100755 --- a/docker/scripts/install-owrx-tools.sh +++ b/docker/scripts/install-owrx-tools.sh @@ -32,13 +32,13 @@ popd rm -rf js8py git clone https://github.com/jketterl/csdr.git -# latest develop as of 2023-09-08 (execmodule improvements) -cmakebuild csdr 764767933ed2b242190285f8ff56b11d80c7d530 +# latest develop as of 2024-01-22 (downmix format) +cmakebuild csdr e6ae546a6a1d3fd052fe962eb5a04fd33e794214 git clone https://github.com/jketterl/pycsdr.git cd pycsdr -# latest develop as of 2023-08-21 (death of CallbackWriter)) -git checkout 77b3709c545f510b52c7cea2e300e2e1613038e2 +# latest develop as of 2024-01-22 (downmix format) +git checkout c7dafe83d08b74012e233502dff0bc6e6f17c01c ./setup.py install install_headers cd .. rm -rf pycsdr