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

restructure the code to have the parser sit where all the parsers sit

Browse Source
This commit is contained in:
Jakob Ketterl
2019-08-15 15:45:15 +02:00
parent 7beb773a37
commit 0207374592
7 changed files with 238 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
owrx/source.py
View File

@ -3,6 +3,7 @@ from owrx.config import PropertyManager
from owrx.feature import FeatureDetector, UnknownFeatureException
from owrx.meta import MetaParser
from owrx.wsjt import WsjtParser
from owrx.aprs import AprsParser
import threading
import csdr
import time
@ -406,6 +407,7 @@ class DspManager(csdr.output):
self.sdrSource = sdrSource
self.metaParser = MetaParser(self.handler)
self.wsjtParser = WsjtParser(self.handler)
self.aprsParser = AprsParser(self.handler)
self.localProps = (
self.sdrSource.getProps()
@ -440,7 +442,9 @@ class DspManager(csdr.output):
self.dsp.set_bpf(*bpf)
def set_dial_freq(key, value):
self.wsjtParser.setDialFrequency(self.localProps["center_freq"] + self.localProps["offset_freq"])
freq = self.localProps["center_freq"] + self.localProps["offset_freq"]
self.wsjtParser.setDialFrequency(freq)
self.aprsParser.setDialFrequency(freq)
self.subscriptions = [
self.localProps.getProperty("audio_compression").wire(self.dsp.set_audio_compression),
@ -502,7 +506,7 @@ class DspManager(csdr.output):
"secondary_demod": self.handler.write_secondary_demod,
"meta": self.metaParser.parse,
"wsjt_demod": self.wsjtParser.parse,
"packet_demod": self.handler.write_packet_data,
"packet_demod": self.aprsParser.parse,
}
write = writers[t]