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

Merge branch 'develop' into release-1.0

Browse Source
This commit is contained in:
Jakob Ketterl 2021-05-08 21:10:58 +02:00
commit 0c9d37e381
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
owrx/service/__init__.py
View File

@ -193,21 +193,25 @@ class ServiceHandler(SdrSourceEventClient):
self.services.append(self.setupService(dial["mode"], dial["frequency"], self.source)) self.services.append(self.setupService(dial["mode"], dial["frequency"], self.source))
else: else:
for group in groups: for group in groups:
cf = self.get_center_frequency(group) if len(group) > 1:
bw = self.get_bandwidth(group) cf = self.get_center_frequency(group)
logger.debug("group center frequency: {0}, bandwidth: {1}".format(cf, bw)) bw = self.get_bandwidth(group)
resampler_props = PropertyLayer() logger.debug("group center frequency: {0}, bandwidth: {1}".format(cf, bw))
resampler_props["center_freq"] = cf resampler_props = PropertyLayer()
resampler_props["samp_rate"] = bw resampler_props["center_freq"] = cf
resampler = Resampler(resampler_props, self.source) resampler_props["samp_rate"] = bw
resampler.start() resampler = Resampler(resampler_props, self.source)
resampler.start()
for dial in group: for dial in group:
self.services.append(self.setupService(dial["mode"], dial["frequency"], resampler)) self.services.append(self.setupService(dial["mode"], dial["frequency"], resampler))
# resampler goes in after the services since it must not be shutdown as long as the services are # resampler goes in after the services since it must not be shutdown as long as the services are
# still running # still running
self.services.append(resampler) self.services.append(resampler)
else:
dial = group[0]
self.services.append(self.setupService(dial["mode"], dial["frequency"], self.source))
def get_min_max(self, group): def get_min_max(self, group):
frequencies = sorted(group, key=lambda f: f["frequency"]) frequencies = sorted(group, key=lambda f: f["frequency"])
@ -224,7 +228,7 @@ class ServiceHandler(SdrSourceEventClient):
def get_bandwidth(self, group): def get_bandwidth(self, group):
minFreq, maxFreq = self.get_min_max(group) minFreq, maxFreq = self.get_min_max(group)
# minimum bandwidth for a resampler: 25kHz # minimum bandwidth for a resampler: 25kHz
return max(maxFreq - minFreq, 25000) return max((maxFreq - minFreq) * 1.15, 25000)
def optimizeResampling(self, freqs, bandwidth): def optimizeResampling(self, freqs, bandwidth):
freqs = sorted(freqs, key=lambda f: f["frequency"]) freqs = sorted(freqs, key=lambda f: f["frequency"])
@ -250,7 +254,10 @@ class ServiceHandler(SdrSourceEventClient):
groups.append([f for f in freqs if previous < f["frequency"]]) groups.append([f for f in freqs if previous < f["frequency"]])
def get_total_bandwidth(group): def get_total_bandwidth(group):
return bandwidth + len(group) * self.get_bandwidth(group) if len(group) > 1:
return bandwidth + len(group) * self.get_bandwidth(group)
else:
return bandwidth
total_bandwidth = sum([get_total_bandwidth(group) for group in groups]) total_bandwidth = sum([get_total_bandwidth(group) for group in groups])
return { return {