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

import frequencies; fix band errors

Browse Source
This commit is contained in:
Jakob Ketterl 2019-07-19 23:15:10 +02:00
parent a1856482ff
commit 6e08a428d6
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bands.json
View File

@ -26,7 +26,7 @@
{ {
"name": "60m", "name": "60m",
"lower_bound": 5351500, "lower_bound": 5351500,
"upper_bound": 3566500, "upper_bound": 5366500,
"frequencies": { "frequencies": {
"ft8": 5357000, "ft8": 5357000,
"wspr": 5287200 "wspr": 5287200

13
owrx/bands.py
View File

@ -1,11 +1,24 @@
import json import json
import logging
logger = logging.getLogger(__name__)
class Band(object): class Band(object):
def __init__(self, dict): def __init__(self, dict):
self.name = dict["name"] self.name = dict["name"]
self.lower_bound = dict["lower_bound"] self.lower_bound = dict["lower_bound"]
self.upper_bound = dict["upper_bound"] self.upper_bound = dict["upper_bound"]
self.frequencies = []
if "frequencies" in dict:
for (mode, freqs) in dict["frequencies"].items():
if not isinstance(freqs, list):
freqs = [freqs]
for f in freqs:
if not self.inBand(f):
logger.warning("Frequency for {mode} on {band} is not within band limits: {frequency}".format(mode = mode, frequency = f, band = self.name))
else:
self.frequencies.append([{"mode": mode, "frequency": f}])
def inBand(self, freq): def inBand(self, freq):
return self.lower_bound <= freq <= self.upper_bound return self.lower_bound <= freq <= self.upper_bound