From 1c370e382292e5c4b3b6049808cfa7859a7a4119 Mon Sep 17 00:00:00 2001 From: Marat Fayzullin Date: Tue, 6 Feb 2024 12:53:35 -0500 Subject: [PATCH] Moving DablinModule to csdr/module/toolbox.py. --- csdr/chain/dablin.py | 2 +- owrx/dab/dablin.py | 20 -------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 owrx/dab/dablin.py diff --git a/csdr/chain/dablin.py b/csdr/chain/dablin.py index 6b6c4e48..2195d257 100644 --- a/csdr/chain/dablin.py +++ b/csdr/chain/dablin.py @@ -2,7 +2,7 @@ from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, MetaProvider, DabServiceSelector, DialFrequencyReceiver from csdr.module import PickleModule from csdreti.modules import EtiDecoder -from owrx.dab.dablin import DablinModule +from csdr.module.toolbox import DablinModule from pycsdr.modules import Downmix, Buffer, Shift, Writer from pycsdr.types import Format from typing import Optional diff --git a/owrx/dab/dablin.py b/owrx/dab/dablin.py deleted file mode 100644 index ad7d2641..00000000 --- a/owrx/dab/dablin.py +++ /dev/null @@ -1,20 +0,0 @@ -from pycsdr.modules import ExecModule -from pycsdr.types import Format - - -class DablinModule(ExecModule): - def __init__(self): - self.serviceId = 0 - super().__init__( - Format.CHAR, - Format.FLOAT, - self._buildArgs() - ) - - def _buildArgs(self): - return ["dablin", "-p", "-s", "{:#06x}".format(self.serviceId)] - - def setDabServiceId(self, serviceId: int) -> None: - self.serviceId = serviceId - self.setArgs(self._buildArgs()) - self.restart()