jketterl/openwebrx
1
0
Fork 0
mirror of https://github.com/jketterl/openwebrx.git synced 2026-04-04 14:08:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor event system

Browse source
This commit is contained in:
Jakob Ketterl 2019-11-15 22:13:00 +01:00
parent bcbb911b24
commit 097f8a2b82
2 changed files with 53 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

70
owrx/source.py
View file

@ -100,6 +100,13 @@ class SdrService(object):
class SdrSource(object):
STATE_STOPPED = 0
STATE_STARTING = 1
STATE_RUNNING = 2
STATE_STOPPING = 3
STATE_TUNING = 4
STATE_FAILED = 5
def __init__(self, id, props, port):
self.id = id
self.props = props
@ -118,6 +125,7 @@ class SdrSource(object):
self.process = None
self.modificationLock = threading.Lock()
self.failed = False
self.state = SdrSource.STATE_STOPPED
def getEventNames(self):
return ["samp_rate", "nmux_memory", "center_freq", "ppm", "rf_gain", "lna_gain", "rf_amp", "antenna", "if_gain"]
@ -245,11 +253,7 @@ class SdrSource(object):
self.modificationLock.release()
for c in self.clients:
if self.failed:
c.onSdrFailed()
else:
c.onSdrAvailable()
self.setState(SdrSource.STATE_FAILED if self.failed else SdrSource.STATE_RUNNING)
def postStart(self):
pass
@ -261,8 +265,7 @@ class SdrSource(object):
return self.failed
def stop(self):
for c in self.clients:
c.onSdrUnavailable()
self.setState(SdrSource.STATE_STOPPING)
self.modificationLock.acquire()
@ -277,6 +280,8 @@ class SdrSource(object):
self.sleepOnRestart()
self.modificationLock.release()
self.setState(SdrSource.STATE_STOPPED)
def sleepOnRestart(self):
pass
@ -316,6 +321,13 @@ class SdrSource(object):
for c in self.spectrumClients:
c.write_spectrum_data(data)
def setState(self, state):
if state == self.state:
return
self.state = state
for c in self.clients:
c.onStateChange(state)
class Resampler(SdrSource):
def __init__(self, props, port, sdr):
@ -338,6 +350,8 @@ class Resampler(SdrSource):
self.modificationLock.release()
return
self.setState(SdrSource.STATE_STARTING)
props = self.rtlProps
resampler_command = [
@ -397,11 +411,7 @@ class Resampler(SdrSource):
self.modificationLock.release()
for c in self.clients:
if self.failed:
c.onSdrFailed()
else:
c.onSdrAvailable()
self.setState(SdrSource.STATE_FAILED if self.failed else SdrSource.STATE_RUNNING)
def activateProfile(self, profile_id=None):
pass
@ -568,14 +578,11 @@ class SpectrumThread(csdr.output):
def isActive(self):
return True
def onSdrAvailable(self):
self.dsp.start()
def onSdrUnavailable(self):
self.dsp.stop()
def onSdrFailed(self):
self.dsp.stop()
def onStateChange(self, state):
if state in [SdrSource.STATE_STOPPING, SdrSource.STATE_FAILED]:
self.dsp.stop()
elif state == SdrSource.STATE_RUNNING:
self.dsp.start()
class DspManager(csdr.output):
@ -703,18 +710,17 @@ class DspManager(csdr.output):
def isActive(self):
return True
def onSdrAvailable(self):
logger.debug("received onSdrAvailable, attempting DspSource restart")
self.dsp.start()
def onSdrUnavailable(self):
logger.debug("received onSdrUnavailable, shutting down DspSource")
self.dsp.stop()
def onSdrFailed(self):
logger.debug("received onSdrFailed, shutting down DspSource")
self.dsp.stop()
self.handler.handleSdrFailure("sdr device failed")
def onStateChange(self, state):
if state == SdrSource.STATE_RUNNING:
logger.debug("received STATE_RUNNING, attempting DspSource restart")
self.dsp.start()
elif state == SdrSource.STATE_STOPPING:
logger.debug("received STATE_STOPPING, shutting down DspSource")
self.dsp.stop()
elif state == SdrSource.STATE_FAILED:
logger.debug("received STATE_FAILED, shutting down DspSource")
self.dsp.stop()
self.handler.handleSdrFailure("sdr device failed")
class CpuUsageThread(threading.Thread):