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

refactor

Browse Source
This commit is contained in:
Jakob Ketterl 2021-09-20 15:32:26 +02:00
parent c10fdd2a53
commit b2e15c559e
8 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csdr/chain/drm.py
View File

@ -1,7 +1,7 @@
from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain
from pycsdr.modules import Convert, Downmix from pycsdr.modules import Convert, Downmix
from pycsdr.types import Format from pycsdr.types import Format
from owrx.drm import DrmModule from csdr.module.drm import DrmModule
class Drm(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain): class Drm(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain):

2
csdr/chain/freedv.py
View File

@ -1,5 +1,5 @@
from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain
from owrx.freedv import FreeDVModule from csdr.module.freedv import FreeDVModule
from pycsdr.modules import RealPart, Agc, Convert from pycsdr.modules import RealPart, Agc, Convert
from pycsdr.types import Format from pycsdr.types import Format

4
csdr/chain/m17.py
View File

@ -1,11 +1,11 @@
from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain from csdr.chain.demodulator import BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain
from owrx.m17 import M17Module from csdr.module.m17 import M17Module
from pycsdr.modules import FmDemod, Limit, Convert from pycsdr.modules import FmDemod, Limit, Convert
from pycsdr.types import Format from pycsdr.types import Format
from digiham.modules import DcBlock from digiham.modules import DcBlock
class M17Chain(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain): class M17(BaseDemodulatorChain, FixedIfSampleRateChain, FixedAudioRateChain):
def __init__(self): def __init__(self):
workers = [ workers = [
FmDemod(), FmDemod(),

0
owrx/drm.py → csdr/module/drm.py
View File

0
owrx/freedv.py → csdr/module/freedv.py
View File

0
owrx/m17.py → csdr/module/m17.py
View File

2
owrx/aprs/direwolf.py
View File

@ -16,7 +16,7 @@ class DirewolfConfigSubscriber(ABC):
pass pass
class DirewolfConfig(object): class DirewolfConfig:
config_keys = [ config_keys = [
"aprs_callsign", "aprs_callsign",
"aprs_igate_enabled", "aprs_igate_enabled",

4
owrx/dsp.py
View File

@ -10,7 +10,7 @@ from csdr.chain.selector import Selector
from csdr.chain.clientaudio import ClientAudioChain from csdr.chain.clientaudio import ClientAudioChain
from csdr.chain.analog import NFm, WFm, Am, Ssb from csdr.chain.analog import NFm, WFm, Am, Ssb
from csdr.chain.digiham import DigihamChain, Dmr, Dstar, Nxdn, Ysf from csdr.chain.digiham import DigihamChain, Dmr, Dstar, Nxdn, Ysf
from csdr.chain.m17 import M17Chain from csdr.chain.m17 import M17
from csdr.chain.freedv import FreeDV from csdr.chain.freedv import FreeDV
from csdr.chain.drm import Drm from csdr.chain.drm import Drm
from csdr.chain.fft import FftChain from csdr.chain.fft import FftChain
@ -449,7 +449,7 @@ class DspManager(SdrSourceEventClient):
elif demod == "nxdn": elif demod == "nxdn":
return Nxdn(self.props["digital_voice_codecserver"]) return Nxdn(self.props["digital_voice_codecserver"])
elif demod == "m17": elif demod == "m17":
return M17Chain() return M17()
elif demod == "drm": elif demod == "drm":
return Drm() return Drm()
elif demod == "freedv": elif demod == "freedv":