From defdf733966ed5f7ab109e3810a91e9ddda19e3d Mon Sep 17 00:00:00 2001 From: Marat Fayzullin Date: Sat, 27 May 2023 00:01:24 -0400 Subject: [PATCH] Modifying the chain. --- csdr/chain/multimon.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/csdr/chain/multimon.py b/csdr/chain/multimon.py index 6f1008af..be97a90f 100644 --- a/csdr/chain/multimon.py +++ b/csdr/chain/multimon.py @@ -2,7 +2,7 @@ from csdr.chain.demodulator import ServiceDemodulator, DialFrequencyReceiver from csdr.module.multimon import MultimonModule from pycsdr.modules import FmDemod, AudioResampler, Convert from pycsdr.types import Format -from owrx.multimon import MultimonParser, FlexParser, SelCallParser +from owrx.multimon import MultimonParser, PageParser, SelCallParser class MultimonDemodulator(ServiceDemodulator, DialFrequencyReceiver): @@ -28,16 +28,11 @@ class MultimonDemodulator(ServiceDemodulator, DialFrequencyReceiver): self.parser.setDialFrequency(frequency) -class FlexDemodulator(MultimonDemodulator): - def __init__(self, service: bool = False): - super().__init__(["FLEX"], FlexParser(service=service)) - - -class PocsageDemodulator(MultimonDemodulator): +class PageDemodulator(MultimonDemodulator): def __init__(self, service: bool = False): super().__init__( - ["POCSAG512", "POCSAG1200", "POCSAG2400"], - MultimonParser(service=service) + ["FLEX", "POCSAG512", "POCSAG1200", "POCSAG2400"], + PageParser(service=service) )