From 12be0825232fbe4c57095a65b9317326ba6583be Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 17 Jan 2020 22:46:01 +0100
Subject: [PATCH 001/475] refactor service / schedule code in preparation for
 alternate schedulers

---
 owrx/{service.py => service/__init__.py} | 148 +------------------
 owrx/service/schedule.py                 | 174 +++++++++++++++++++++++
 setup.py                                 |   2 +-
 3 files changed, 182 insertions(+), 142 deletions(-)
 rename owrx/{service.py => service/__init__.py} (67%)
 create mode 100644 owrx/service/schedule.py

diff --git a/owrx/service.py b/owrx/service/__init__.py
similarity index 67%
rename from owrx/service.py
rename to owrx/service/__init__.py
index 5936f8f..3e1a337 100644
--- a/owrx/service.py
+++ b/owrx/service/__init__.py
@@ -1,5 +1,4 @@
 import threading
-from datetime import datetime, timezone, timedelta
 from owrx.source import SdrSource
 from owrx.sdr import SdrService
 from owrx.bands import Bandplan
@@ -9,16 +8,19 @@ from owrx.aprs import AprsParser
 from owrx.config import PropertyManager
 from owrx.source.resampler import Resampler
 from owrx.feature import FeatureDetector
+from abc import ABCMeta, abstractmethod
+from .schedule import ServiceScheduler
 
 import logging
 
 logger = logging.getLogger(__name__)
 
 
-class ServiceOutput(output):
+class ServiceOutput(output, metaclass=ABCMeta):
     def __init__(self, frequency):
         self.frequency = frequency
 
+    @abstractmethod
     def getParser(self):
         # abstract method; implement in subclasses
         pass
@@ -46,134 +48,6 @@ class AprsServiceOutput(ServiceOutput):
         return t == "packet_demod"
 
 
-class ScheduleEntry(object):
-    def __init__(self, startTime, endTime, profile):
-        self.startTime = startTime
-        self.endTime = endTime
-        self.profile = profile
-
-    def isCurrent(self, time):
-        if self.startTime < self.endTime:
-            return self.startTime <= time < self.endTime
-        else:
-            return self.startTime <= time or time < self.endTime
-
-    def getProfile(self):
-        return self.profile
-
-    def getScheduledEnd(self):
-        now = datetime.utcnow()
-        end = now.combine(date=now.date(), time=self.endTime)
-        while end < now:
-            end += timedelta(days=1)
-        return end
-
-    def getNextActivation(self):
-        now = datetime.utcnow()
-        start = now.combine(date=now.date(), time=self.startTime)
-        while start < now:
-            start += timedelta(days=1)
-        return start
-
-
-class Schedule(object):
-    @staticmethod
-    def parse(scheduleDict):
-        entries = []
-        for time, profile in scheduleDict.items():
-            if len(time) != 9:
-                logger.warning("invalid schedule spec: %s", time)
-                continue
-
-            startTime = datetime.strptime(time[0:4], "%H%M").replace(tzinfo=timezone.utc).time()
-            endTime = datetime.strptime(time[5:9], "%H%M").replace(tzinfo=timezone.utc).time()
-            entries.append(ScheduleEntry(startTime, endTime, profile))
-        return Schedule(entries)
-
-    def __init__(self, entries):
-        self.entries = entries
-
-    def getCurrentEntry(self):
-        current = [p for p in self.entries if p.isCurrent(datetime.utcnow().time())]
-        if current:
-            return current[0]
-        return None
-
-    def getNextEntry(self):
-        s = sorted(self.entries, key=lambda e: e.getNextActivation())
-        if s:
-            return s[0]
-        return None
-
-
-class ServiceScheduler(object):
-    def __init__(self, source, schedule):
-        self.source = source
-        self.selectionTimer = None
-        self.schedule = Schedule.parse(schedule)
-        self.source.addClient(self)
-        self.source.getProps().collect("center_freq", "samp_rate").wire(self.onFrequencyChange)
-        self.scheduleSelection()
-
-    def shutdown(self):
-        self.cancelTimer()
-        self.source.removeClient(self)
-
-    def scheduleSelection(self, time=None):
-        if self.source.getState() == SdrSource.STATE_FAILED:
-            return
-        seconds = 10
-        if time is not None:
-            delta = time - datetime.utcnow()
-            seconds = delta.total_seconds()
-        self.cancelTimer()
-        self.selectionTimer = threading.Timer(seconds, self.selectProfile)
-        self.selectionTimer.start()
-
-    def cancelTimer(self):
-        if self.selectionTimer:
-            self.selectionTimer.cancel()
-
-    def getClientClass(self):
-        return SdrSource.CLIENT_BACKGROUND
-
-    def onStateChange(self, state):
-        if state == SdrSource.STATE_STOPPING:
-            self.scheduleSelection()
-        elif state == SdrSource.STATE_FAILED:
-            self.cancelTimer()
-
-    def onBusyStateChange(self, state):
-        if state == SdrSource.BUSYSTATE_IDLE:
-            self.scheduleSelection()
-
-    def onFrequencyChange(self, name, value):
-        self.scheduleSelection()
-
-    def selectProfile(self):
-        if self.source.hasClients(SdrSource.CLIENT_USER):
-            logger.debug("source has active users; not touching")
-            return
-        logger.debug("source seems to be idle, selecting profile for background services")
-        entry = self.schedule.getCurrentEntry()
-
-        if entry is None:
-            logger.debug("schedule did not return a profile. checking next entry...")
-            nextEntry = self.schedule.getNextEntry()
-            if nextEntry is not None:
-                self.scheduleSelection(nextEntry.getNextActivation())
-            return
-
-        logger.debug("scheduling end for current profile: %s", entry.getScheduledEnd())
-        self.scheduleSelection(entry.getScheduledEnd())
-
-        try:
-            self.source.activateProfile(entry.getProfile())
-            self.source.start()
-        except KeyError:
-            pass
-
-
 class ServiceHandler(object):
     def __init__(self, source):
         self.lock = threading.Lock()
@@ -186,8 +60,8 @@ class ServiceHandler(object):
         if self.source.isAvailable():
             self.scheduleServiceStartup()
         self.scheduler = None
-        if "schedule" in props:
-            self.scheduler = ServiceScheduler(self.source, props["schedule"])
+        if "schedule" in props or "scheduler" in props:
+            self.scheduler = ServiceScheduler(self.source)
 
     def getClientClass(self):
         return SdrSource.CLIENT_INACTIVE
@@ -390,7 +264,7 @@ class Services(object):
             return
         for source in SdrService.getSources().values():
             props = source.getProps()
-            if "services" not in props or props["services"] != False:
+            if "services" not in props or props["services"] is not False:
                 Services.handlers.append(ServiceHandler(source))
 
     @staticmethod
@@ -398,11 +272,3 @@ class Services(object):
         for handler in Services.handlers:
             handler.shutdown()
         Services.handlers = []
-
-
-class Service(object):
-    pass
-
-
-class WsjtService(Service):
-    pass
diff --git a/owrx/service/schedule.py b/owrx/service/schedule.py
new file mode 100644
index 0000000..282133c
--- /dev/null
+++ b/owrx/service/schedule.py
@@ -0,0 +1,174 @@
+from datetime import datetime, timezone, timedelta
+from owrx.source import SdrSource
+import threading
+from abc import ABC, ABCMeta, abstractmethod
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class ScheduleEntry(object):
+    def __init__(self, startTime, endTime, profile):
+        self.startTime = startTime
+        self.endTime = endTime
+        self.profile = profile
+
+    def isCurrent(self, time):
+        if self.startTime < self.endTime:
+            return self.startTime <= time < self.endTime
+        else:
+            return self.startTime <= time or time < self.endTime
+
+    def getProfile(self):
+        return self.profile
+
+    def getScheduledEnd(self):
+        now = datetime.utcnow()
+        end = now.combine(date=now.date(), time=self.endTime)
+        while end < now:
+            end += timedelta(days=1)
+        return end
+
+    def getNextActivation(self):
+        now = datetime.utcnow()
+        start = now.combine(date=now.date(), time=self.startTime)
+        while start < now:
+            start += timedelta(days=1)
+        return start
+
+
+class Schedule(ABC):
+    @staticmethod
+    def parse(props):
+        # downwards compatibility
+        if "schedule" in props:
+            return StaticSchedule(props["schedule"])
+        elif "scheduler" in props:
+            sc = props["scheduler"]
+            t = sc["type"] if "type" in sc else "static"
+            if t == "static":
+                return StaticSchedule(sc["schedule"])
+            elif t == "sunlight":
+                return SunlightSchedule(sc["schedule"])
+            else:
+                logger.warning("Invalid scheduler type: %s", t)
+
+    @abstractmethod
+    def getCurrentEntry(self):
+        pass
+
+    @abstractmethod
+    def getNextEntry(self):
+        pass
+
+
+class TimerangeSchedule(Schedule, metaclass=ABCMeta):
+    @abstractmethod
+    def getEntries(self):
+        pass
+
+    def getCurrentEntry(self):
+        current = [p for p in self.getEntries() if p.isCurrent(datetime.utcnow().time())]
+        if current:
+            return current[0]
+        return None
+
+    def getNextEntry(self):
+        s = sorted(self.getEntries(), key=lambda e: e.getNextActivation())
+        if s:
+            return s[0]
+        return None
+
+
+class StaticSchedule(TimerangeSchedule):
+    def __init__(self, scheduleDict):
+        self.entries = []
+        for time, profile in scheduleDict.items():
+            if len(time) != 9:
+                logger.warning("invalid schedule spec: %s", time)
+                continue
+
+            startTime = datetime.strptime(time[0:4], "%H%M").replace(tzinfo=timezone.utc).time()
+            endTime = datetime.strptime(time[5:9], "%H%M").replace(tzinfo=timezone.utc).time()
+            self.entries.append(ScheduleEntry(startTime, endTime, profile))
+
+    def getEntries(self):
+        return self.entries
+
+
+class SunlightSchedule(TimerangeSchedule):
+    def __init__(self, scheduleDict):
+        self.schedule = scheduleDict
+
+    def getEntries(self):
+        return []
+
+
+class ServiceScheduler(object):
+    def __init__(self, source):
+        self.source = source
+        self.selectionTimer = None
+        self.source.addClient(self)
+        props = self.source.getProps()
+        self.schedule = Schedule.parse(props)
+        props.collect("center_freq", "samp_rate").wire(self.onFrequencyChange)
+        self.scheduleSelection()
+
+    def shutdown(self):
+        self.cancelTimer()
+        self.source.removeClient(self)
+
+    def scheduleSelection(self, time=None):
+        if self.source.getState() == SdrSource.STATE_FAILED:
+            return
+        seconds = 10
+        if time is not None:
+            delta = time - datetime.utcnow()
+            seconds = delta.total_seconds()
+        self.cancelTimer()
+        self.selectionTimer = threading.Timer(seconds, self.selectProfile)
+        self.selectionTimer.start()
+
+    def cancelTimer(self):
+        if self.selectionTimer:
+            self.selectionTimer.cancel()
+
+    def getClientClass(self):
+        return SdrSource.CLIENT_BACKGROUND
+
+    def onStateChange(self, state):
+        if state == SdrSource.STATE_STOPPING:
+            self.scheduleSelection()
+        elif state == SdrSource.STATE_FAILED:
+            self.cancelTimer()
+
+    def onBusyStateChange(self, state):
+        if state == SdrSource.BUSYSTATE_IDLE:
+            self.scheduleSelection()
+
+    def onFrequencyChange(self, name, value):
+        self.scheduleSelection()
+
+    def selectProfile(self):
+        if self.source.hasClients(SdrSource.CLIENT_USER):
+            logger.debug("source has active users; not touching")
+            return
+        logger.debug("source seems to be idle, selecting profile for background services")
+        entry = self.schedule.getCurrentEntry()
+
+        if entry is None:
+            logger.debug("schedule did not return a profile. checking next entry...")
+            nextEntry = self.schedule.getNextEntry()
+            if nextEntry is not None:
+                self.scheduleSelection(nextEntry.getNextActivation())
+            return
+
+        logger.debug("scheduling end for current profile: %s", entry.getScheduledEnd())
+        self.scheduleSelection(entry.getScheduledEnd())
+
+        try:
+            self.source.activateProfile(entry.getProfile())
+            self.source.start()
+        except KeyError:
+            pass
diff --git a/setup.py b/setup.py
index 03c0a30..dd4fe70 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ except ImportError:
 setup(
     name="OpenWebRX",
     version=str(strictversion),
-    packages=find_namespace_packages(include=["owrx", "owrx.source", "csdr", "htdocs"]),
+    packages=find_namespace_packages(include=["owrx", "owrx.source", "owrx.service", "csdr", "htdocs"]),
     package_data={"htdocs": [f[len("htdocs/") :] for f in glob("htdocs/**/*", recursive=True)]},
     entry_points={"console_scripts": ["openwebrx=owrx.__main__:main"]},
     # use the github page for now

From f826002ea82a0e3e9fe024730f57b246524b02ec Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 18 Jan 2020 00:43:37 +0100
Subject: [PATCH 002/475] enable solar calculations

---
 owrx/service/schedule.py | 52 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

diff --git a/owrx/service/schedule.py b/owrx/service/schedule.py
index 282133c..1abb2b4 100644
--- a/owrx/service/schedule.py
+++ b/owrx/service/schedule.py
@@ -1,6 +1,8 @@
 from datetime import datetime, timezone, timedelta
 from owrx.source import SdrSource
+from owrx.config import PropertyManager
 import threading
+import math
 from abc import ABC, ABCMeta, abstractmethod
 
 import logging
@@ -101,8 +103,55 @@ class SunlightSchedule(TimerangeSchedule):
     def __init__(self, scheduleDict):
         self.schedule = scheduleDict
 
+    def getSunTimes(self, date):
+        pm = PropertyManager.getSharedInstance()
+        lat, lng = pm["receiver_gps"]
+        degtorad = math.pi / 180
+        radtodeg = 180 / math.pi
+
+        nDays = date.timetuple().tm_yday #Number of days since 01/01
+
+        # Longitudinal correction
+        longCorr = 4 * lng
+
+        B = 2 * math.pi * (nDays - 81) / 365 # I have no idea
+
+        # Equation of Time Correction
+        EoTCorr = 9.87 * math.sin(2 * B) - 7.53 * math.cos(B) - 1.5 * math.sin(B)
+
+        # Solar correction
+        solarCorr = longCorr + EoTCorr
+
+        # Solar declination
+        delta = math.asin(math.sin(23.45 * degtorad) * math.sin(B)) * radtodeg
+
+        sunrise = 12 - math.acos(-math.tan(lat * degtorad) * math.tan(delta * degtorad)) * radtodeg / 15 - solarCorr / 60
+        sunset = 12 + math.acos(-math.tan(lat * degtorad) * math.tan(delta * degtorad)) * radtodeg / 15 - solarCorr / 60
+
+        midnight = datetime.combine(date, datetime.min.time())
+        sunrise = midnight + timedelta(hours=sunrise)
+        sunset = midnight + timedelta(hours=sunset)
+
+        return sunrise, sunset
+
+    def getEntry(self, t, profile):
+        now = datetime.utcnow()
+        date = now.date()
+        if t == "day":
+            sunrise, sunset = self.getSunTimes(date)
+            if sunset < now:
+                sunrise, sunset = self.getSunTimes(date + timedelta(days=1))
+            return ScheduleEntry(sunrise.time(), sunset.time(), profile)
+        elif t == "night":
+            sunrise, _ = self.getSunTimes(date)
+            _, sunset = self.getSunTimes(date - timedelta(days=1))
+            if sunrise < now:
+                sunrise, _ = self.getSunTimes(date + timedelta(days=1))
+                _, sunset = self.getSunTimes(date)
+            return ScheduleEntry(sunset.time(), sunrise.time(), profile)
+
     def getEntries(self):
-        return []
+        return [self.getEntry(t, profile) for t, profile in self.schedule.items()]
 
 
 class ServiceScheduler(object):
@@ -168,6 +217,7 @@ class ServiceScheduler(object):
         self.scheduleSelection(entry.getScheduledEnd())
 
         try:
+            logger.debug("scheduler is activating profile %s", entry.getProfile())
             self.source.activateProfile(entry.getProfile())
             self.source.start()
         except KeyError:

From b142180f94e03e09b14b45710f3dad89b75577f1 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 18 Jan 2020 17:35:33 +0100
Subject: [PATCH 003/475] optimize

---
 owrx/service/schedule.py | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/owrx/service/schedule.py b/owrx/service/schedule.py
index 1abb2b4..0061d04 100644
--- a/owrx/service/schedule.py
+++ b/owrx/service/schedule.py
@@ -114,23 +114,25 @@ class SunlightSchedule(TimerangeSchedule):
         # Longitudinal correction
         longCorr = 4 * lng
 
-        B = 2 * math.pi * (nDays - 81) / 365 # I have no idea
+        # calibrate for solstice
+        b = 2 * math.pi * (nDays - 81) / 365
 
         # Equation of Time Correction
-        EoTCorr = 9.87 * math.sin(2 * B) - 7.53 * math.cos(B) - 1.5 * math.sin(B)
+        eoTCorr = 9.87 * math.sin(2 * b) - 7.53 * math.cos(b) - 1.5 * math.sin(b)
 
         # Solar correction
-        solarCorr = longCorr + EoTCorr
+        solarCorr = longCorr + eoTCorr
 
         # Solar declination
-        delta = math.asin(math.sin(23.45 * degtorad) * math.sin(B)) * radtodeg
+        delta = math.asin(math.sin(23.45 * degtorad) * math.sin(b))
 
-        sunrise = 12 - math.acos(-math.tan(lat * degtorad) * math.tan(delta * degtorad)) * radtodeg / 15 - solarCorr / 60
-        sunset = 12 + math.acos(-math.tan(lat * degtorad) * math.tan(delta * degtorad)) * radtodeg / 15 - solarCorr / 60
+        sunrise = 12 - math.acos(-math.tan(lat * degtorad) * math.tan(delta)) * radtodeg / 15 - solarCorr / 60
+        sunset = 12 + math.acos(-math.tan(lat * degtorad) * math.tan(delta)) * radtodeg / 15 - solarCorr / 60
 
         midnight = datetime.combine(date, datetime.min.time())
         sunrise = midnight + timedelta(hours=sunrise)
         sunset = midnight + timedelta(hours=sunset)
+        logger.debug("for {date} sunrise: {sunrise} sunset {sunset}".format(date=date, sunrise=sunrise, sunset=sunset))
 
         return sunrise, sunset
 

From 877f0e4c28647e06793d581483eaf5e7a164b951 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 19 Jan 2020 17:04:14 +0100
Subject: [PATCH 004/475] allow schedule entries with datetime

---
 owrx/service/schedule.py | 55 ++++++++++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 14 deletions(-)

diff --git a/owrx/service/schedule.py b/owrx/service/schedule.py
index 0061d04..cbcf975 100644
--- a/owrx/service/schedule.py
+++ b/owrx/service/schedule.py
@@ -10,21 +10,39 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-class ScheduleEntry(object):
+class ScheduleEntry(ABC):
     def __init__(self, startTime, endTime, profile):
         self.startTime = startTime
         self.endTime = endTime
         self.profile = profile
 
-    def isCurrent(self, time):
+    def getProfile(self):
+        return self.profile
+
+    def __str__(self):
+        return "{0} - {1}: {2}".format(self.startTime, self.endTime, self.profile)
+
+    @abstractmethod
+    def isCurrent(self, dt):
+        pass
+
+    @abstractmethod
+    def getScheduledEnd(self):
+        pass
+
+    @abstractmethod
+    def getNextActivation(self):
+        pass
+
+
+class TimeScheduleEntry(ScheduleEntry):
+    def isCurrent(self, dt):
+        time = dt.time()
         if self.startTime < self.endTime:
             return self.startTime <= time < self.endTime
         else:
             return self.startTime <= time or time < self.endTime
 
-    def getProfile(self):
-        return self.profile
-
     def getScheduledEnd(self):
         now = datetime.utcnow()
         end = now.combine(date=now.date(), time=self.endTime)
@@ -40,6 +58,16 @@ class ScheduleEntry(object):
         return start
 
 
+class DatetimeScheduleEntry(ScheduleEntry):
+    def isCurrent(self, dt):
+        return self.startTime <= dt < self.endTime
+
+    def getScheduledEnd(self):
+        return self.endTime
+
+    def getNextActivation(self):
+        return self.startTime
+
 class Schedule(ABC):
     @staticmethod
     def parse(props):
@@ -51,8 +79,8 @@ class Schedule(ABC):
             t = sc["type"] if "type" in sc else "static"
             if t == "static":
                 return StaticSchedule(sc["schedule"])
-            elif t == "sunlight":
-                return SunlightSchedule(sc["schedule"])
+            elif t == "daylight":
+                return DaylightSchedule(sc["schedule"])
             else:
                 logger.warning("Invalid scheduler type: %s", t)
 
@@ -71,7 +99,7 @@ class TimerangeSchedule(Schedule, metaclass=ABCMeta):
         pass
 
     def getCurrentEntry(self):
-        current = [p for p in self.getEntries() if p.isCurrent(datetime.utcnow().time())]
+        current = [p for p in self.getEntries() if p.isCurrent(datetime.utcnow())]
         if current:
             return current[0]
         return None
@@ -93,13 +121,13 @@ class StaticSchedule(TimerangeSchedule):
 
             startTime = datetime.strptime(time[0:4], "%H%M").replace(tzinfo=timezone.utc).time()
             endTime = datetime.strptime(time[5:9], "%H%M").replace(tzinfo=timezone.utc).time()
-            self.entries.append(ScheduleEntry(startTime, endTime, profile))
+            self.entries.append(TimeScheduleEntry(startTime, endTime, profile))
 
     def getEntries(self):
         return self.entries
 
 
-class SunlightSchedule(TimerangeSchedule):
+class DaylightSchedule(TimerangeSchedule):
     def __init__(self, scheduleDict):
         self.schedule = scheduleDict
 
@@ -143,14 +171,14 @@ class SunlightSchedule(TimerangeSchedule):
             sunrise, sunset = self.getSunTimes(date)
             if sunset < now:
                 sunrise, sunset = self.getSunTimes(date + timedelta(days=1))
-            return ScheduleEntry(sunrise.time(), sunset.time(), profile)
+            return DatetimeScheduleEntry(sunrise, sunset, profile)
         elif t == "night":
             sunrise, _ = self.getSunTimes(date)
             _, sunset = self.getSunTimes(date - timedelta(days=1))
             if sunrise < now:
                 sunrise, _ = self.getSunTimes(date + timedelta(days=1))
                 _, sunset = self.getSunTimes(date)
-            return ScheduleEntry(sunset.time(), sunrise.time(), profile)
+            return DatetimeScheduleEntry(sunset, sunrise, profile)
 
     def getEntries(self):
         return [self.getEntry(t, profile) for t, profile in self.schedule.items()]
@@ -215,11 +243,10 @@ class ServiceScheduler(object):
                 self.scheduleSelection(nextEntry.getNextActivation())
             return
 
-        logger.debug("scheduling end for current profile: %s", entry.getScheduledEnd())
+        logger.debug("selected profile %s until %s", entry.getProfile(), entry.getScheduledEnd())
         self.scheduleSelection(entry.getScheduledEnd())
 
         try:
-            logger.debug("scheduler is activating profile %s", entry.getProfile())
             self.source.activateProfile(entry.getProfile())
             self.source.start()
         except KeyError:

From 1f68ecd9f4ef19ef0779d51802273d800ea99600 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 19 Jan 2020 18:34:37 +0100
Subject: [PATCH 005/475] add greyline calculation

---
 owrx/service/schedule.py | 45 ++++++++++++++++++++++++++++++++--------
 1 file changed, 36 insertions(+), 9 deletions(-)

diff --git a/owrx/service/schedule.py b/owrx/service/schedule.py
index cbcf975..d5d7388 100644
--- a/owrx/service/schedule.py
+++ b/owrx/service/schedule.py
@@ -128,6 +128,8 @@ class StaticSchedule(TimerangeSchedule):
 
 
 class DaylightSchedule(TimerangeSchedule):
+    greyLineTime = timedelta(hours=1)
+
     def __init__(self, scheduleDict):
         self.schedule = scheduleDict
 
@@ -137,13 +139,14 @@ class DaylightSchedule(TimerangeSchedule):
         degtorad = math.pi / 180
         radtodeg = 180 / math.pi
 
-        nDays = date.timetuple().tm_yday #Number of days since 01/01
+        #Number of days since 01/01
+        days = date.timetuple().tm_yday
 
         # Longitudinal correction
         longCorr = 4 * lng
 
         # calibrate for solstice
-        b = 2 * math.pi * (nDays - 81) / 365
+        b = 2 * math.pi * (days - 81) / 365
 
         # Equation of Time Correction
         eoTCorr = 9.87 * math.sin(2 * b) - 7.53 * math.cos(b) - 1.5 * math.sin(b)
@@ -152,10 +155,10 @@ class DaylightSchedule(TimerangeSchedule):
         solarCorr = longCorr + eoTCorr
 
         # Solar declination
-        delta = math.asin(math.sin(23.45 * degtorad) * math.sin(b))
+        declination = math.asin(math.sin(23.45 * degtorad) * math.sin(b))
 
-        sunrise = 12 - math.acos(-math.tan(lat * degtorad) * math.tan(delta)) * radtodeg / 15 - solarCorr / 60
-        sunset = 12 + math.acos(-math.tan(lat * degtorad) * math.tan(delta)) * radtodeg / 15 - solarCorr / 60
+        sunrise = 12 - math.acos(-math.tan(lat * degtorad) * math.tan(declination)) * radtodeg / 15 - solarCorr / 60
+        sunset = 12 + math.acos(-math.tan(lat * degtorad) * math.tan(declination)) * radtodeg / 15 - solarCorr / 60
 
         midnight = datetime.combine(date, datetime.min.time())
         sunrise = midnight + timedelta(hours=sunrise)
@@ -164,24 +167,48 @@ class DaylightSchedule(TimerangeSchedule):
 
         return sunrise, sunset
 
-    def getEntry(self, t, profile):
+    def getEntry(self, t, profile, useGreyline):
         now = datetime.utcnow()
         date = now.date()
         if t == "day":
             sunrise, sunset = self.getSunTimes(date)
             if sunset < now:
                 sunrise, sunset = self.getSunTimes(date + timedelta(days=1))
-            return DatetimeScheduleEntry(sunrise, sunset, profile)
+            if useGreyline:
+                sunrise += DaylightSchedule.greyLineTime
+                sunset -= DaylightSchedule.greyLineTime
+            return [ DatetimeScheduleEntry(sunrise, sunset, profile) ]
         elif t == "night":
             sunrise, _ = self.getSunTimes(date)
             _, sunset = self.getSunTimes(date - timedelta(days=1))
             if sunrise < now:
                 sunrise, _ = self.getSunTimes(date + timedelta(days=1))
                 _, sunset = self.getSunTimes(date)
-            return DatetimeScheduleEntry(sunset, sunrise, profile)
+            if useGreyline:
+                sunrise -= DaylightSchedule.greyLineTime
+                sunset += DaylightSchedule.greyLineTime
+            return [ DatetimeScheduleEntry(sunset, sunrise, profile) ]
+        elif t == "greyline":
+            sunrise, sunset = self.getSunTimes(date)
+            if sunrise < now + DaylightSchedule.greyLineTime:
+                sunrise, _ = self.getSunTimes(date + timedelta(days=1))
+            if sunset < now + DaylightSchedule.greyLineTime:
+                _, sunset = self.getSunTimes(date + timedelta(days=1))
+            return [
+                DatetimeScheduleEntry(
+                    sunrise - DaylightSchedule.greyLineTime, sunrise + DaylightSchedule.greyLineTime, profile
+                ),
+                DatetimeScheduleEntry(
+                    sunset - DaylightSchedule.greyLineTime, sunset + DaylightSchedule.greyLineTime, profile
+                ),
+            ]
 
     def getEntries(self):
-        return [self.getEntry(t, profile) for t, profile in self.schedule.items()]
+        # greyline is optional, it its set it will shorten the other profiles
+        useGreyline = "greyline" in self.schedule
+        entries = [e for t, profile in self.schedule.items() for e in self.getEntry(t, profile, useGreyline)]
+        logger.debug([str(e) for e in entries])
+        return entries
 
 
 class ServiceScheduler(object):

From f06f1265d8548240293c999dd549c39300c21560 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 19 Jan 2020 18:54:53 +0100
Subject: [PATCH 006/475] just calculate today's schedule, makes things much
 easiear

---
 owrx/service/schedule.py | 54 +++++++++++++---------------------------
 1 file changed, 17 insertions(+), 37 deletions(-)

diff --git a/owrx/service/schedule.py b/owrx/service/schedule.py
index d5d7388..0397890 100644
--- a/owrx/service/schedule.py
+++ b/owrx/service/schedule.py
@@ -167,46 +167,26 @@ class DaylightSchedule(TimerangeSchedule):
 
         return sunrise, sunset
 
-    def getEntry(self, t, profile, useGreyline):
-        now = datetime.utcnow()
-        date = now.date()
-        if t == "day":
-            sunrise, sunset = self.getSunTimes(date)
-            if sunset < now:
-                sunrise, sunset = self.getSunTimes(date + timedelta(days=1))
-            if useGreyline:
-                sunrise += DaylightSchedule.greyLineTime
-                sunset -= DaylightSchedule.greyLineTime
-            return [ DatetimeScheduleEntry(sunrise, sunset, profile) ]
-        elif t == "night":
-            sunrise, _ = self.getSunTimes(date)
-            _, sunset = self.getSunTimes(date - timedelta(days=1))
-            if sunrise < now:
-                sunrise, _ = self.getSunTimes(date + timedelta(days=1))
-                _, sunset = self.getSunTimes(date)
-            if useGreyline:
-                sunrise -= DaylightSchedule.greyLineTime
-                sunset += DaylightSchedule.greyLineTime
-            return [ DatetimeScheduleEntry(sunset, sunrise, profile) ]
-        elif t == "greyline":
-            sunrise, sunset = self.getSunTimes(date)
-            if sunrise < now + DaylightSchedule.greyLineTime:
-                sunrise, _ = self.getSunTimes(date + timedelta(days=1))
-            if sunset < now + DaylightSchedule.greyLineTime:
-                _, sunset = self.getSunTimes(date + timedelta(days=1))
-            return [
-                DatetimeScheduleEntry(
-                    sunrise - DaylightSchedule.greyLineTime, sunrise + DaylightSchedule.greyLineTime, profile
-                ),
-                DatetimeScheduleEntry(
-                    sunset - DaylightSchedule.greyLineTime, sunset + DaylightSchedule.greyLineTime, profile
-                ),
-            ]
-
     def getEntries(self):
+        date = datetime.utcnow().date()
         # greyline is optional, it its set it will shorten the other profiles
         useGreyline = "greyline" in self.schedule
-        entries = [e for t, profile in self.schedule.items() for e in self.getEntry(t, profile, useGreyline)]
+        entries = []
+
+        sunrise, sunset = self.getSunTimes(date)
+        delta = DaylightSchedule.greyLineTime if useGreyline else timedelta()
+
+        entries += [
+            DatetimeScheduleEntry(datetime.combine(date, datetime.min.time()), sunrise - delta, self.schedule["night"]),
+            DatetimeScheduleEntry(sunrise + delta, sunset - delta, self.schedule["day"]),
+            DatetimeScheduleEntry(sunset + delta, datetime.combine(date, datetime.max.time()), self.schedule["night"]),
+        ]
+        if useGreyline:
+            entries += [
+                DatetimeScheduleEntry(sunrise - delta, sunrise + delta, self.schedule["greyline"]),
+                DatetimeScheduleEntry(sunset - delta, sunrise + delta, self.schedule["greyline"]),
+            ]
+
         logger.debug([str(e) for e in entries])
         return entries
 

From 5b9344dee9fc36b3d2a84350effa3870bffd8f09 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 20 Jan 2020 17:29:32 +0100
Subject: [PATCH 007/475] fix evening greyline

---
 owrx/service/schedule.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/service/schedule.py b/owrx/service/schedule.py
index 0397890..f16d9ab 100644
--- a/owrx/service/schedule.py
+++ b/owrx/service/schedule.py
@@ -184,7 +184,7 @@ class DaylightSchedule(TimerangeSchedule):
         if useGreyline:
             entries += [
                 DatetimeScheduleEntry(sunrise - delta, sunrise + delta, self.schedule["greyline"]),
-                DatetimeScheduleEntry(sunset - delta, sunrise + delta, self.schedule["greyline"]),
+                DatetimeScheduleEntry(sunset - delta, sunset + delta, self.schedule["greyline"]),
             ]
 
         logger.debug([str(e) for e in entries])

From b63a991008830785857a6b9ae68d326cfb72e850 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 24 Jan 2020 23:29:25 +0100
Subject: [PATCH 008/475] redo the scheduling so it works close to the
 dateline, too

---
 owrx/service/schedule.py | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/owrx/service/schedule.py b/owrx/service/schedule.py
index f16d9ab..509a26f 100644
--- a/owrx/service/schedule.py
+++ b/owrx/service/schedule.py
@@ -168,24 +168,36 @@ class DaylightSchedule(TimerangeSchedule):
         return sunrise, sunset
 
     def getEntries(self):
-        date = datetime.utcnow().date()
+        now = datetime.utcnow()
+        date = now.date()
         # greyline is optional, it its set it will shorten the other profiles
         useGreyline = "greyline" in self.schedule
         entries = []
 
-        sunrise, sunset = self.getSunTimes(date)
         delta = DaylightSchedule.greyLineTime if useGreyline else timedelta()
+        events = []
+        # we need to start yesterday for longitudes close to the date line
+        offset = -1
+        while len(events) < 1:
+            sunrise, sunset = self.getSunTimes(date + timedelta(days=offset))
+            offset += 1
+            events += [{"type": "sunrise", "time": sunrise}, {"type": "sunset", "time": sunset}]
+            # keep only events in the future
+            events = [v for v in events if v["time"] + delta > now]
+        events.sort(key=lambda e: e["time"])
 
-        entries += [
-            DatetimeScheduleEntry(datetime.combine(date, datetime.min.time()), sunrise - delta, self.schedule["night"]),
-            DatetimeScheduleEntry(sunrise + delta, sunset - delta, self.schedule["day"]),
-            DatetimeScheduleEntry(sunset + delta, datetime.combine(date, datetime.max.time()), self.schedule["night"]),
-        ]
-        if useGreyline:
-            entries += [
-                DatetimeScheduleEntry(sunrise - delta, sunrise + delta, self.schedule["greyline"]),
-                DatetimeScheduleEntry(sunset - delta, sunset + delta, self.schedule["greyline"]),
-            ]
+        previousEvent = None
+        for event in events:
+            # night profile _until_ sunrise, day profile _until_ sunset
+            stype = "night" if event["type"] == "sunrise" else "day"
+            if previousEvent is not None or event["time"] - delta > now:
+                start = now if previousEvent is None else previousEvent
+                entries.append(DatetimeScheduleEntry(start, event["time"] - delta, self.schedule[stype]))
+            if useGreyline:
+                entries.append(
+                    DatetimeScheduleEntry(event["time"] - delta, event["time"] + delta, self.schedule["greyline"])
+                )
+            previousEvent = event["time"] + delta
 
         logger.debug([str(e) for e in entries])
         return entries

From 34312dd402e5b602fe10c38fe505ecc97ef54312 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Jan 2020 20:53:55 +0100
Subject: [PATCH 009/475] fix url hash parsing

---
 htdocs/openwebrx.js | 75 ++++++++++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 32 deletions(-)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 50cfdec..4546b9a 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1050,8 +1050,11 @@ function on_ws_recv(evt) {
                         waterfall_auto_level_margin = config['waterfall_auto_level_margin'];
                         waterfallColorsDefault();
 
-                        starting_mod = config['start_mod'];
-                        starting_offset_frequency = config['start_offset_freq'];
+                        var initial_demodulator_params = {
+                            mod: config['start_mod'],
+                            offset_frequency: config['start_offset_freq']
+                        };
+
                         bandwidth = config['samp_rate'];
                         center_freq = config['center_freq'];
                         fft_size = config['fft_size'];
@@ -1067,7 +1070,7 @@ function on_ws_recv(evt) {
                         updateSquelch();
 
                         waterfall_init();
-                        initialize_demodulator();
+                        initialize_demodulator(initial_demodulator_params);
                         bookmarks.loadLocalBookmarks();
 
                         waterfall_clear();
@@ -1489,28 +1492,37 @@ function webrx_set_param(what, value) {
     ws.send(JSON.stringify({"type": "dspcontrol", "params": params}));
 }
 
-var starting_offset_frequency;
-var starting_mod;
-
 function parseHash() {
-    var h;
-    if (h = window.location.hash) {
-        h.substring(1).split(",").forEach(function (x) {
-            var harr = x.split("=");
-            if (harr[0] === "mute") toggleMute();
-            else if (harr[0] === "mod") starting_mod = harr[1];
-            else if (harr[0] === "sql") {
-                e("openwebrx-panel-squelch").value = harr[1];
-                updateSquelch();
-            }
-            else if (harr[0] === "freq") {
-                console.log(parseInt(harr[1]));
-                console.log(center_freq);
-                starting_offset_frequency = parseInt(harr[1]) - center_freq;
-            }
-        });
-
+    if (!window.location.hash) {
+        return {};
     }
+    return window.location.hash.substring(1).split(",").map(function(x) {
+        var harr = x.split('=');
+        return [harr[0], harr.slice(1).join('=')];
+    }).reduce(function(params, p){
+        params[p[0]] = p[1];
+        return params;
+    }, {});
+}
+
+function validateHash() {
+    var params = parseHash();
+    params = Object.keys(params).filter(function(key) {
+        if (key == 'freq') {
+            return Math.abs(params[key] - center_freq) < bandwidth;
+        }
+        return true;
+    }).reduce(function(p, key) {
+        p[key] = params[key];
+        return p;
+    }, {});
+
+    if (params['freq']) {
+        params['offset_frequency'] = params['freq'] - center_freq;
+        delete params['freq'];
+    }
+
+    return params;
 }
 
 function onAudioStart(success, apiType){
@@ -1528,14 +1540,14 @@ function onAudioStart(success, apiType){
     updateVolume();
 }
 
-function initialize_demodulator() {
-    demodulator_analog_replace(starting_mod);
-    if (starting_offset_frequency) {
-        demodulators[0].offset_frequency = starting_offset_frequency;
-        tunedFrequencyDisplay.setFrequency(center_freq + starting_offset_frequency);
-        demodulators[0].set();
-        mkscale();
-    }
+function initialize_demodulator(initialParams) {
+    mkscale();
+    var params = $.extend(initialParams || {}, validateHash());
+    console.info(params);
+    if (!params.mod) return;
+    demodulator_analog_replace(params.mod);
+    if (!params.offset_frequency) return;
+    demodulators[0].set_offset_frequency(params.offset_frequency);
 }
 
 var reconnect_timeout = false;
@@ -1794,7 +1806,6 @@ function openwebrx_init() {
     check_top_bar_congestion();
     init_header();
     bookmarks = new BookmarkBar();
-    parseHash();
     initSliders();
 }
 

From 92254c8c4d0c87275e5d03695d378444089d31ab Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Jan 2020 21:15:05 +0100
Subject: [PATCH 010/475] update hash when demodulator params change

---
 htdocs/openwebrx.js | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 4546b9a..1065346 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -558,6 +558,7 @@ function demodulator_analog_replace(subtype, for_digital) { //this function shou
     demodulator_add(new Demodulator_default_analog(temp_offset, subtype));
     demodulator_buttons_update();
     update_digitalvoice_panels("openwebrx-panel-metadata-" + subtype);
+    updateHash();
 }
 
 Demodulator.prototype.set_offset_frequency = function(to_what) {
@@ -566,6 +567,11 @@ Demodulator.prototype.set_offset_frequency = function(to_what) {
     this.set();
     mkenvelopes(get_visible_freq_range());
     tunedFrequencyDisplay.setFrequency(center_freq + to_what);
+    updateHash();
+}
+
+Demodulator.prototype.get_offset_frequency = function() {
+    return this.offset_frequency;
 }
 
 function waterfallWidth() {
@@ -1525,6 +1531,16 @@ function validateHash() {
     return params;
 }
 
+function updateHash() {
+    var demod = demodulators[0];
+    window.location.hash = $.map({
+        freq: demod.get_offset_frequency() + center_freq,
+        mod: demod.subtype
+    }, function(value, key){
+        return key + '=' + value;
+    }).join(',');
+}
+
 function onAudioStart(success, apiType){
     divlog('Web Audio API succesfully initialized, using ' + apiType  + ' API, sample rate: ' + audioEngine.getSampleRate() + " Hz");
 
@@ -1543,11 +1559,12 @@ function onAudioStart(success, apiType){
 function initialize_demodulator(initialParams) {
     mkscale();
     var params = $.extend(initialParams || {}, validateHash());
-    console.info(params);
-    if (!params.mod) return;
-    demodulator_analog_replace(params.mod);
-    if (!params.offset_frequency) return;
-    demodulators[0].set_offset_frequency(params.offset_frequency);
+    if (params.mod) {
+        demodulator_analog_replace(params.mod);
+    }
+    if (params.offset_frequency) {
+        demodulators[0].set_offset_frequency(params.offset_frequency);
+    }
 }
 
 var reconnect_timeout = false;
@@ -1807,6 +1824,9 @@ function openwebrx_init() {
     init_header();
     bookmarks = new BookmarkBar();
     initSliders();
+    window.addEventListener('hashchange', function() {
+        initialize_demodulator();
+    });
 }
 
 function initSliders() {

From 4b60b7e0463d5461458c358ce458ee6ffcc4203d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Jan 2020 22:35:44 +0100
Subject: [PATCH 011/475] frequency editor on click

---
 htdocs/css/openwebrx.css       | 19 ++++++++++++++-----
 htdocs/lib/FrequencyDisplay.js | 31 ++++++++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index 556558f..349ea4d 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -311,16 +311,25 @@ input[type=range]:focus::-ms-fill-upper
     font-style: normal;
 }
 
-#webrx-actual-freq
-{
+#webrx-actual-freq {
 	width: 100%;
 	text-align: left;
-	font-size: 16pt;
-	font-family: 'roboto-mono';
 	padding: 0;
 	margin: 0;
-	line-height:22px;
+}
 
+#webrx-actual-freq input {
+    font-family: 'roboto-mono';
+    width: 98%;
+    box-sizing: border-box;
+    border: 0;
+    padding: 0;
+}
+
+#webrx-actual-freq, #webrx-actual-freq input {
+	font-size: 16pt;
+	font-family: 'roboto-mono';
+	line-height: 22px;
 }
 
 #webrx-mouse-freq
diff --git a/htdocs/lib/FrequencyDisplay.js b/htdocs/lib/FrequencyDisplay.js
index 0353fd8..8c749ca 100644
--- a/htdocs/lib/FrequencyDisplay.js
+++ b/htdocs/lib/FrequencyDisplay.js
@@ -1,8 +1,10 @@
 function FrequencyDisplay(element) {
     this.element = $(element);
     this.digits = [];
+    this.displayContainer = $('<div>');
     this.digitContainer = $('<span>');
-    this.element.html([this.digitContainer, $('<span> MHz</span>')]);
+    this.displayContainer.html([this.digitContainer, $('<span> MHz</span>')]);
+    this.element.html(this.displayContainer);
     this.decimalSeparator = (0.1).toLocaleString().substring(1, 2);
     this.setFrequency(0);
 }
@@ -38,7 +40,7 @@ TuneableFrequencyDisplay.prototype = new FrequencyDisplay();
 
 TuneableFrequencyDisplay.prototype.setupEvents = function() {
     var me = this;
-    this.element.on('wheel', function(e){
+    me.element.on('wheel', function(e){
         e.preventDefault();
         e.stopPropagation();
 
@@ -53,7 +55,30 @@ TuneableFrequencyDisplay.prototype.setupEvents = function() {
             l(newFrequency);
         });
     });
-    this.listeners = [];
+    me.listeners = [];
+    me.element.on('click', function(){
+        var input = $('<input>');
+        var submit = function(){
+            var freq = parseInt(input.val());
+            if (!isNaN(freq)) {
+                me.listeners.forEach(function(l) {
+                    l(freq);
+                });
+            }
+            input.remove();
+            me.displayContainer.show();
+        };
+        input.on('blur', submit).on('keyup', function(e){
+            if (e.keyCode == 13) return submit();
+        });
+        input.on('click', function(e){
+            e.stopPropagation();
+        });
+        input.val(me.frequency);
+        me.displayContainer.hide();
+        me.element.append(input);
+        input.focus();
+    });
 };
 
 TuneableFrequencyDisplay.prototype.onFrequencyChange = function(listener){

From 8fc981c8a07f49f03fb5242dc05b92ca51be66eb Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Jan 2020 22:47:47 +0100
Subject: [PATCH 012/475] use static elements

---
 htdocs/index.html              |  4 +--
 htdocs/lib/FrequencyDisplay.js | 61 ++++++++++++++++++++--------------
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index d9296c9..3fabf73 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -144,8 +144,8 @@
             <div class="openwebrx-panel" id="openwebrx-panel-receiver" data-panel-name="client-params" style="width: 259px;">
                 <div class="openwebrx-panel-line frequencies-container">
                     <div class="frequencies">
-                        <div id="webrx-actual-freq">---.--- MHz</div>
-                        <div id="webrx-mouse-freq">---.--- MHz</div>
+                        <div id="webrx-actual-freq"></div>
+                        <div id="webrx-mouse-freq"></div>
                     </div>
                     <div class="openwebrx-button openwebrx-square-button openwebrx-bookmark-button" style="display:none;" title="Add bookmark...">
                         <img src="static/gfx/openwebrx-bookmark.png">
diff --git a/htdocs/lib/FrequencyDisplay.js b/htdocs/lib/FrequencyDisplay.js
index 8c749ca..fb810c2 100644
--- a/htdocs/lib/FrequencyDisplay.js
+++ b/htdocs/lib/FrequencyDisplay.js
@@ -1,13 +1,16 @@
 function FrequencyDisplay(element) {
     this.element = $(element);
     this.digits = [];
+    this.setupElements();
+    this.setFrequency(0);
+}
+
+FrequencyDisplay.prototype.setupElements = function() {
     this.displayContainer = $('<div>');
     this.digitContainer = $('<span>');
     this.displayContainer.html([this.digitContainer, $('<span> MHz</span>')]);
     this.element.html(this.displayContainer);
-    this.decimalSeparator = (0.1).toLocaleString().substring(1, 2);
-    this.setFrequency(0);
-}
+};
 
 FrequencyDisplay.prototype.setFrequency = function(freq) {
     this.frequency = freq;
@@ -38,8 +41,17 @@ function TuneableFrequencyDisplay(element) {
 
 TuneableFrequencyDisplay.prototype = new FrequencyDisplay();
 
+TuneableFrequencyDisplay.prototype.setupElements = function() {
+    FrequencyDisplay.prototype.setupElements.call(this);
+    this.input = $('<input>');
+    this.input.hide();
+    this.element.append(this.input);
+};
+
 TuneableFrequencyDisplay.prototype.setupEvents = function() {
     var me = this;
+    me.listeners = [];
+
     me.element.on('wheel', function(e){
         e.preventDefault();
         e.stopPropagation();
@@ -55,32 +67,31 @@ TuneableFrequencyDisplay.prototype.setupEvents = function() {
             l(newFrequency);
         });
     });
-    me.listeners = [];
+
+    var submit = function(){
+        var freq = parseInt(me.input.val());
+        if (!isNaN(freq)) {
+            me.listeners.forEach(function(l) {
+                l(freq);
+            });
+        }
+        me.input.hide();
+        me.displayContainer.show();
+    };
+    me.input.on('blur', submit).on('keyup', function(e){
+        if (e.keyCode == 13) return submit();
+    });
+    me.input.on('click', function(e){
+        e.stopPropagation();
+    });
     me.element.on('click', function(){
-        var input = $('<input>');
-        var submit = function(){
-            var freq = parseInt(input.val());
-            if (!isNaN(freq)) {
-                me.listeners.forEach(function(l) {
-                    l(freq);
-                });
-            }
-            input.remove();
-            me.displayContainer.show();
-        };
-        input.on('blur', submit).on('keyup', function(e){
-            if (e.keyCode == 13) return submit();
-        });
-        input.on('click', function(e){
-            e.stopPropagation();
-        });
-        input.val(me.frequency);
+        me.input.val(me.frequency);
+        me.input.show();
         me.displayContainer.hide();
-        me.element.append(input);
-        input.focus();
+        me.input.focus();
     });
 };
 
 TuneableFrequencyDisplay.prototype.onFrequencyChange = function(listener){
     this.listeners.push(listener);
-};
\ No newline at end of file
+};

From 49c333b88a1ea6b8ee4197fb4aa1314cef426dcb Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Jan 2020 23:47:32 +0100
Subject: [PATCH 013/475] include digital demods in hash

---
 htdocs/openwebrx.js | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 1065346..00bd21f 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -549,13 +549,15 @@ function demodulator_analog_replace(subtype, for_digital) { //this function shou
         secondary_demod_close_window();
         secondary_demod_listbox_update();
     }
-    last_analog_demodulator_subtype = subtype;
-    var temp_offset = 0;
-    if (demodulators.length) {
-        temp_offset = demodulators[0].offset_frequency;
-        demodulator_remove(0);
+    if (!demodulators || !demodulators[0] || demodulators[0].subtype !== subtype) {
+        last_analog_demodulator_subtype = subtype;
+        var temp_offset = 0;
+        if (demodulators.length) {
+            temp_offset = demodulators[0].offset_frequency;
+            demodulator_remove(0);
+        }
+        demodulator_add(new Demodulator_default_analog(temp_offset, subtype));
     }
-    demodulator_add(new Demodulator_default_analog(temp_offset, subtype));
     demodulator_buttons_update();
     update_digitalvoice_panels("openwebrx-panel-metadata-" + subtype);
     updateHash();
@@ -1533,11 +1535,16 @@ function validateHash() {
 
 function updateHash() {
     var demod = demodulators[0];
+    if (!demod) return;
     window.location.hash = $.map({
         freq: demod.get_offset_frequency() + center_freq,
-        mod: demod.subtype
+        mod: demod.subtype,
+        secondary_mod: secondary_demod
     }, function(value, key){
+        if (!value) return undefined;
         return key + '=' + value;
+    }).filter(function(v) {
+        return !!v;
     }).join(',');
 }
 
@@ -1559,7 +1566,9 @@ function onAudioStart(success, apiType){
 function initialize_demodulator(initialParams) {
     mkscale();
     var params = $.extend(initialParams || {}, validateHash());
-    if (params.mod) {
+    if (params.secondary_mod) {
+        demodulator_digital_replace(params.secondary_mod);
+    } else if (params.mod) {
         demodulator_analog_replace(params.mod);
     }
     if (params.offset_frequency) {
@@ -1951,6 +1960,7 @@ function initPanels() {
 
 function demodulator_buttons_update() {
     $(".openwebrx-demodulator-button").removeClass("highlighted");
+    if (!demodulators.length) return;
     if (secondary_demod) {
         $("#openwebrx-button-dig").addClass("highlighted");
         $('#openwebrx-secondary-demod-listbox').val(secondary_demod);
@@ -2013,6 +2023,7 @@ function demodulator_digital_replace_last() {
 }
 
 function demodulator_digital_replace(subtype) {
+    if (secondary_demod === subtype) return;
     switch (subtype) {
         case "bpsk31":
         case "bpsk63":
@@ -2050,6 +2061,7 @@ function demodulator_digital_replace(subtype) {
     toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4'].indexOf(subtype) >= 0);
     toggle_panel("openwebrx-panel-packet-message", subtype === "packet");
     toggle_panel("openwebrx-panel-pocsag-message", subtype === "pocsag");
+    updateHash();
 }
 
 function secondary_demod_create_canvas() {

From cd1f8a7cb104b62f18e9d919fd5018de161dca57 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Jan 2020 23:52:20 +0100
Subject: [PATCH 014/475] update dependencies in docker

---
 docker/scripts/install-connectors.sh            | 2 +-
 docker/scripts/install-dependencies-soapysdr.sh | 2 +-
 docker/scripts/install-dependencies.sh          | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh
index a3f4af1..a613db5 100755
--- a/docker/scripts/install-connectors.sh
+++ b/docker/scripts/install-connectors.sh
@@ -23,6 +23,6 @@ apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 
 git clone https://github.com/jketterl/owrx_connector.git
-cmakebuild owrx_connector 84909c53cde78cbf4be408037e31209fbc702ad3
+cmakebuild owrx_connector df35e33e42c2e4527853ca18bf04981848860317
 
 apk del .build-deps
diff --git a/docker/scripts/install-dependencies-soapysdr.sh b/docker/scripts/install-dependencies-soapysdr.sh
index 8c5bf98..594c0dd 100755
--- a/docker/scripts/install-dependencies-soapysdr.sh
+++ b/docker/scripts/install-dependencies-soapysdr.sh
@@ -24,6 +24,6 @@ apk add --no-cache $STATIC_PACKAGES
 apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 git clone https://github.com/pothosware/SoapySDR
-cmakebuild SoapySDR a489f3dca9d3ccd9b276b95a608ac3ef0299f635
+cmakebuild SoapySDR f722f9ce5b629c3c44401a9bf628b3f8e67a9695
 
 apk del .build-deps
diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index c212c11..1407988 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -38,7 +38,7 @@ git clone https://github.com/szechyjs/mbelib.git
 cmakebuild mbelib 9a04ed5c78176a9965f3d43f7aa1b1f5330e771f
 
 git clone https://github.com/jketterl/digiham.git
-cmakebuild digiham b229990927922e977cecaa9369740790cff5c31e
+cmakebuild digiham e5e11ce9611e3d8f5f9dce7dee97f86a31af107c
 
 git clone https://github.com/f4exb/dsd.git
 cmakebuild dsd f6939f9edbbc6f66261833616391a4e59cb2b3d7

From 152737e8f67c50940086110758fdb4eb53671af5 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 29 Jan 2020 19:19:57 +0100
Subject: [PATCH 015/475] split out the changelog into a separate file

---
 CHANGELOG.md | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md    | 67 ---------------------------------------------
 2 files changed, 77 insertions(+), 67 deletions(-)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..a2946d6
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,77 @@
+**2019-11-24**
+- There is now a new way to interface with SDR hardware, [owrx_connectors](https://github.com/jketterl/owrx_connector).
+  They talk directly to the hardware (no rtl_sdr / rx_sdr necessary) and offer I/Q data on a socket, just like nmux
+  did before. They additionally offer a control socket that allows openwebrx to control the SDR parameters directly,
+  without the need for repeated restarts. This allows for quicker profile changes, and also reduces the risk of your
+  SDR hardware from failing during the switchover. See `config_webrx.py` for further information and instructions.
+- Offset tuning using the `lfo_offset` has been reworked in a way that `center_freq` has to be set to the frequency you
+  actually want to listen to. If you're using an `lfo_offset` already, you will probably need to change its sign.
+- `initial_squelch_level` can now be set on each profile.
+- As usual, plenty of fixes and improvements.
+
+**2019-10-27**
+- Part of the frontend code has been reworked
+  - Audio buffer minimums have been completely stripped. As a result, you should get better latency. Unfortunately,
+    this also means there will be some skipping when audio starts.
+  - Now also supports AudioWorklets (for those browser that have it). The Raspberry Pi image has been updated to include
+    https due to the SecureContext requirement.
+  - Mousewheel controls for the receiver sliders
+- Error handling for failed SDR devices
+
+**2019-09-29**
+- One of the most-requested features is finally coming to OpenWebRX: Bookmarks (sometimes also referred to as labels).
+  There's two kinds of bookmarks available:
+  - Serverside bookmarks that are set up by the receiver administrator. Check the file `bookmarks.json` for examples!
+  - Clientside bookmarks which every user can store for themselves. They are stored in the browser's localStorage.
+- Some more bugs in the websocket handling have been fixed.
+
+**2019-09-25**
+- Automatic reporting of spots to [pskreporter](https://pskreporter.info/) is now possible. Please have a look at the
+  configuration on how to set it up.
+- Websocket communication has been overhauled in large parts. It should now be more reliable, and failing connections
+  should now have no impact on other users.
+- Profile scheduling allows to set up band-hopping if you are running background services.
+- APRS now has the ability to show symbols on the map, if a corresponding symbol set has been installed. Check the
+  config!
+- Debug logging has been disabled in a handful of modules, expect vastly reduced output on the shell.
+
+**2019-09-13**
+- New set of APRS-related features
+  - Decode Packet transmissions using [direwolf](https://github.com/wb2osz/direwolf) (1k2 only for now)
+  - APRS packets are mostly decoded and shown both in a new panel and on the map
+  - APRS is also available as a background service
+  - direwolfs I-gate functionality can be enabled, which allows your receiver to work as a receive-only I-gate for the
+    APRS network in the background
+- Demodulation for background services has been optimized to use less total bandwidth, saving CPU
+- More metrics have been added; they can be used together with collectd and its curl_json plugin for now, with some
+  limitations.
+
+**2019-07-21**
+- Latest Features:
+  - More WSJT-X modes have been added, including the new FT4 mode
+  - I started adding a bandplan feature, the first thing visible is the "dial" indicator that brings you right to the
+    dial frequency for digital modes
+  - fixed some bugs in the websocket communication which broke the map
+
+**2019-07-13**
+- Latest Features:
+  - FT8 Integration (using wsjt-x demodulators)
+  - New Map Feature that shows both decoded grid squares from FT8 and Locations decoded from YSF digital voice
+  - New Feature report that will show what functionality is available
+- There's a new Raspbian SD Card image available (see below)
+
+**2019-06-30**
+- I have done some major rework on the openwebrx core, and I am planning to continue adding more features in the near
+  future. Please check this place for updates.
+- My work has not been accepted into the upstream repository, so you will need to chose between my fork and the official
+  version.
+- I have enabled the issue tracker on this project, so feel free to file bugs or suggest enhancements there!
+- This version sports the following new and amazing features:
+  - Support of multiple SDR devices simultaneously
+  - Support for multiple profiles per SDR that allow the user to listen to different frequencies
+  - Support for digital voice decoding
+  - Feature detection that will disable functionality when dependencies are not available (if you're missing the digital
+    buttons, this is probably why)
+- Raspbian SD Card Images and Docker builds available (see below)
+- I am currently working on the feature set for a stable release, but you are more than welcome to test development
+  versions!
diff --git a/README.md b/README.md
index 4bd148a..92f3b9b 100644
--- a/README.md
+++ b/README.md
@@ -19,73 +19,6 @@ It has the following features:
 - [dsd](https://github.com/f4exb/dsdcc) based demodulators (D-Star, NXDN)
 - [wsjt-x](https://physics.princeton.edu/pulsar/k1jt/wsjtx.html) based demodulators (FT8, FT4, WSPR, JT65, JT9)
 
-**News (2019-11-24 by DD5JFK)**
-- There is now a new way to interface with SDR hardware, [owrx_connectors](https://github.com/jketterl/owrx_connector).
-  They talk directly to the hardware (no rtl_sdr / rx_sdr necessary) and offer I/Q data on a socket, just like nmux
-  did before. They additionally offer a control socket that allows openwebrx to control the SDR parameters directly,
-  without the need for repeated restarts. This allows for quicker profile changes, and also reduces the risk of your
-  SDR hardware from failing during the switchover. See `config_webrx.py` for further information and instructions.
-- Offset tuning using the `lfo_offset` has been reworked in a way that `center_freq` has to be set to the frequency you
-  actually want to listen to. If you're using an `lfo_offset` already, you will probably need to change its sign.
-- `initial_squelch_level` can now be set on each profile.
-- As usual, plenty of fixes and improvements.
-
-**News (2019-10-27 by DD5JFK)**
-- Part of the frontend code has been reworked
-  - Audio buffer minimums have been completely stripped. As a result, you should get better latency. Unfortunately, this also means there will be some skipping when audio starts.
-  - Now also supports AudioWorklets (for those browser that have it). The Raspberry Pi image has been updated to include https due to the SecureContext requirement.
-  - Mousewheel controls for the receiver sliders
-- Error handling for failed SDR devices
-
-**News (2019-09-29 by DD5FJK)**
-- One of the most-requested features is finally coming to OpenWebRX: Bookmarks (sometimes also referred to as labels). There's two kinds of bookmarks available:
-  - Serverside bookmarks that are set up by the receiver administrator. Check the file `bookmarks.json` for examples!
-  - Clientside bookmarks which every user can store for themselves. They are stored in the browser's localStorage.
-- Some more bugs in the websocket handling have been fixed.
-
-**News (2019-09-25 by DD5JFK)**
-- Automatic reporting of spots to [pskreporter](https://pskreporter.info/) is now possible. Please have a look at the configuration on how to set it up.
-- Websocket communication has been overhauled in large parts. It should now be more reliable, and failing connections should now have no impact on other users.
-- Profile scheduling allows to set up band-hopping if you are running background services.
-- APRS now has the ability to show symbols on the map, if a corresponding symbol set has been installed. Check the config!
-- Debug logging has been disabled in a handful of modules, expect vastly reduced output on the shell.
-
-**News (2019-09-13 by DD5JFK)**
-- New set of APRS-related features
-  - Decode Packet transmissions using [direwolf](https://github.com/wb2osz/direwolf) (1k2 only for now)
-  - APRS packets are mostly decoded and shown both in a new panel and on the map
-  - APRS is also available as a background service
-  - direwolfs I-gate functionality can be enabled, which allows your receiver to work as a receive-only I-gate for the APRS network in the background
-- Demodulation for background services has been optimized to use less total bandwidth, saving CPU
-- More metrics have been added; they can be used together with collectd and its curl_json plugin for now, with some limitations.
-
-**News (2019-07-21 by DD5JFK)**
-- Latest Features:
-  - More WSJT-X modes have been added, including the new FT4 mode
-  - I started adding a bandplan feature, the first thing visible is the "dial" indicator that brings you right to the dial frequency for digital modes
-  - fixed some bugs in the websocket communication which broke the map
-
-**News (2019-07-13 by DD5JFK)**
-- Latest Features:
-  - FT8 Integration (using wsjt-x demodulators)
-  - New Map Feature that shows both decoded grid squares from FT8 and Locations decoded from YSF digital voice
-  - New Feature report that will show what functionality is available
-- There's a new Raspbian SD Card image available (see below)
-
-**News (2019-06-30 by DD5JFK)**
-- I have done some major rework on the openwebrx core, and I am planning to continue adding more features in the near future. Please check this place for updates.
-- My work has not been accepted into the upstream repository, so you will need to chose between my fork and the official version.
-- I have enabled the issue tracker on this project, so feel free to file bugs or suggest enhancements there!
-- This version sports the following new and amazing features:
-  - Support of multiple SDR devices simultaneously
-  - Support for multiple profiles per SDR that allow the user to listen to different frequencies
-  - Support for digital voice decoding
-  - Feature detection that will disable functionality when dependencies are not available (if you're missing the digital buttons, this is probably why)
-- Raspbian SD Card Images and Docker builds available (see below)
-- I am currently working on the feature set for a stable release, but you are more than welcome to test development versions!
-
-> When upgrading OpenWebRX, please make sure that you also upgrade *csdr* and *digiham*!
-
 ## OpenWebRX servers on SDR.hu
 
 [SDR.hu](http://sdr.hu) is a site which lists the active, public OpenWebRX servers. Your receiver [can also be part of it](http://sdr.hu/openwebrx), if you want.

From b35958c6eb0456dca0c36db081aff7202cba269c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 29 Jan 2020 19:58:36 +0100
Subject: [PATCH 016/475] update changelog, closes #47

---
 CHANGELOG.md | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2946d6..a852ee2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,42 @@
+**unreleased**
+- Compression, resampling and filtering in the frontend have been rewritten in javascript, sdr.js has been removed
+- Decoding of Pocsag modulation is now possible
+- Removed the 3D waterfall since it had no real application and required ~1MB of javascript code to be downloaded
+- Improved the frontend handling of the "too many users" scenario
+- PSK63 digimode is now available (same decoding pipeline as PSK31, but with adopted parameters)
+- The frequency can now be manipulated with the mousewheel, which should allow the user to tune more precise. The tuning
+  step size is determined by the digit the mouse cursor is hovering over.
+- Clicking on the frequency now opens an input for direct frequency selection
+- URL hashes have been fixed and improved: They are now updated automatically, so a shared URL will include frequency
+  and demodulator, which allows for improved sharing and linking.
+- New devices supported:
+  - LimeSDR (`"type": "lime_sdr"`)
+  - PlutoSDR (`"type": "pluto_sdr"`)
+  - RTL_SDR via Soapy (`"type": "rtl_sdr_soapy"`) on special request to allow use of the direct sampling mode
+
+**2019-01-04**
+- The [owrx_connector](https://github.com/jketterl/owrx_connector) is now the default way of communicating with sdr
+  devices. The old sdr types have been replaced, all `_connector` suffixes on the type must be removed!
+- The sources have been refactored, making it a lot easier to add support for other devices
+- SDR device failure handling has been improved, including user feedback
+- New devices supported:
+  - FiFiSDR (`"type": "fifi_sdr"`)
+
+**2019-12-15**
+- wsjt-x updated to 2.1.2
+- The rtl_tcp compatibility mode of the owrx_connector is now configurable using the `rtltcp_compat` flag
+
+**2019-12-10**
+- added support for airspyhf devices (Airspy HF+ / Discovery)
+
+**2019-12-05**
+- explicit device filter for soapy devices for multi-device setups
+
+**2019-12-03**
+- compatibility fixes for safari browsers (ios and mac)
+
 **2019-11-24**
-- There is now a new way to interface with SDR hardware, [owrx_connectors](https://github.com/jketterl/owrx_connector).
+- There is now a new way to interface with SDR hardware, .
   They talk directly to the hardware (no rtl_sdr / rx_sdr necessary) and offer I/Q data on a socket, just like nmux
   did before. They additionally offer a control socket that allows openwebrx to control the SDR parameters directly,
   without the need for repeated restarts. This allows for quicker profile changes, and also reduces the risk of your

From 1258180805c8331fcb6848d9918818606d82a66a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 29 Jan 2020 20:05:06 +0100
Subject: [PATCH 017/475] update the readme

---
 README.md | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 92f3b9b..df747e3 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,22 @@
 OpenWebRX
 =========
 
-[:floppy_disk: Setup guide for Ubuntu](http://blog.sdr.hu/2015/06/30/quick-setup-openwebrx.html)  |  [:blue_book: Knowledge base on the Wiki](https://github.com/simonyiszk/openwebrx/wiki/)  |  [:earth_americas: Receivers on SDR.hu](http://sdr.hu/) 
-
 OpenWebRX is a multi-user SDR receiver software with a web interface.
 
 ![OpenWebRX](http://blog.sdr.hu/images/openwebrx/screenshot.png)
 
 It has the following features:
 
-- [csdr](https://github.com/jketterl/csdr) based demodulators (AM/FM/SSB/CW/BPSK31),
-- filter passband can be set from GUI,
+- [csdr](https://github.com/jketterl/csdr) based demodulators (AM/FM/SSB/CW/BPSK31/BPSK63)
+- filter passband can be set from GUI
 - it extensively uses HTML5 features like WebSocket, Web Audio API, and Canvas
 - it works in Google Chrome, Chromium and Mozilla Firefox
-- currently supports RTL-SDR, HackRF, SDRplay, AirSpy
+- currently supports RTL-SDR, HackRF, SDRplay, AirSpy, LimeSDR, PlutoSDR
 - Multiple SDR devices can be used simultaneously
-- [digiham](https://github.com/jketterl/digiham) based demodularors (DMR, YSF)
+- [digiham](https://github.com/jketterl/digiham) based demodularors (DMR, YSF, Pocsag)
 - [dsd](https://github.com/f4exb/dsdcc) based demodulators (D-Star, NXDN)
 - [wsjt-x](https://physics.princeton.edu/pulsar/k1jt/wsjtx.html) based demodulators (FT8, FT4, WSPR, JT65, JT9)
 
-## OpenWebRX servers on SDR.hu
-
-[SDR.hu](http://sdr.hu) is a site which lists the active, public OpenWebRX servers. Your receiver [can also be part of it](http://sdr.hu/openwebrx), if you want.
-
-![sdr.hu](http://blog.sdr.hu/images/openwebrx/screenshot-sdrhu.png)
-
 ## Setup
 
 ### Raspberry Pi SD Card Images
@@ -51,9 +43,6 @@ First you will need to install the dependencies:
 
 - [csdr](https://github.com/jketterl/csdr)
 - [rtl-sdr](http://sdr.osmocom.org/trac/wiki/rtl-sdr)
-
-Optional dependency for improved hardware access (to become mandatory at some point):
-
 - [owrx_connector](https://github.com/jketterl/owrx_connector)
 
 Optional dependencies if you want to be able to listen do digital voice:
@@ -65,16 +54,14 @@ Optional dependency if you want to decode WSJT-X modes:
 
 - [wsjt-x](https://physics.princeton.edu/pulsar/k1jt/wsjtx.html)
 
+[Detailed installation instructions in the Wiki](https://github.com/jketterl/openwebrx/wiki/Manual-Package-installation-(including-digital-voice))
+
 After cloning this repository and connecting an RTL-SDR dongle to your computer, you can run the server:
 
 	./openwebrx.py
 	
 You can now open the GUI at <a href="http://localhost:8073">http://localhost:8073</a>.
 
-Please note that the server is also listening on the following ports (on localhost only):
-
-- ports 4950 to 4960 for the multi-user I/Q servers.
-
 Now the next step is to customize the parameters of your server in `config_webrx.py`.
 
 Actually, if you do something cool with OpenWebRX, please drop me a mail:  

From dc1fb3b607d2712403664016f1d94314e3c65124 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 29 Jan 2020 20:11:26 +0100
Subject: [PATCH 018/475] more readme updates

---
 README.md | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index df747e3..25a70ea 100644
--- a/README.md
+++ b/README.md
@@ -21,19 +21,24 @@ It has the following features:
 
 ### Raspberry Pi SD Card Images
 
-Probably the quickest way to get started is to download the [latest Raspberry Pi SD Card Image](https://s3.eu-central-1.amazonaws.com/de.dd5jfk.openwebrx/2019-11-24-OpenWebRX-full.zip). It contains all the depencencies out of the box, and should work on all Raspberries up to the 3B+.
+Probably the quickest way to get started is to download the latest Raspberry Pi SD Card Image. It contains all the
+depencencies out of the box, and should work on all Raspberry Pis. It is based off the Raspbian Lite distribution,
+so [their installation instructions](https://www.raspberrypi.org/documentation/installation/installing-images/) apply.
 
-This is based off the Raspbian Lite distribution, so [their installation instructions](https://www.raspberrypi.org/documentation/installation/installing-images/) apply.
+You can find the latest images [here](https://s3.eu-central-1.amazonaws.com/de.dd5jfk.openwebrx/index.html). You can
+also checkout the `nightly` folder, which has the most recent builds, albeit untested.
 
-Please note: I have not updated this to include the Raspberry Pi 4 yet. (It seems to be impossible to build Rasbpian Buster images on x86 hardware right now. Stay tuned!)
+Once you have booted a Raspberry with the SD Card, it will appear in your network with the hostname "openwebrx", which
+should make it available as https://openwebrx/ on most networks. This may vary depending on your specific setup.
 
-Once you have booted a Raspberry with the SD Card, it will appear in your network with the hostname "openwebrx", which should make it available as https://openwebrx/ on most networks. This may vary depending on your specific setup.
-
-For Digital voice, the minimum requirement right now seems to be a Rasbperry Pi 3B+. I would like to work on optimizing this for lower specs, but at this point I am not sure how much can be done. 
+For Digital voice, the minimum requirement right now seems to be a Rasbperry Pi 3B+. I would like to work on optimizing
+this for lower specs, but at this point I am not sure how much can be done. 
 
 ### Docker Images
 
-For those familiar with docker, I am providing [recent builds and Releases for both x86 and arm processors on the Docker hub](https://hub.docker.com/r/jketterl/openwebrx). You can find a short introduction there.
+For those familiar with docker, I am providing
+[recent builds and Releases for both x86 and arm processors on the Docker hub](https://hub.docker.com/r/jketterl/openwebrx).
+You can find a short introduction there.
 
 ### Manual Installation
 
@@ -75,14 +80,10 @@ The filter envelope can be dragged at its ends and moved around to set the passb
 
 However, if you hold down the shift key, you can drag the center line (BFO) or the whole passband (PBS).
 
-## Setup tips
-
-If you have any problems installing OpenWebRX, you should check out the <a href="https://github.com/simonyiszk/openwebrx/wiki">Wiki</a> about it, which has a page on the <a href="https://github.com/simonyiszk/openwebrx/wiki/Common-problems-and-their-solutions">common problems and their solutions</a>.
-
-Sometimes the actual error message is not at the end of the terminal output, you may have to look at the whole output to find it.
-
 ## Licensing
 
-OpenWebRX is available under Affero GPL v3 license (<a href="https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)">summary</a>).
+OpenWebRX is available under Affero GPL v3 license
+([summary](https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)).
 
-OpenWebRX is also available under a commercial license on request. Please contact me at the address *&lt;randras@sdr.hu&gt;* for licensing options. 
+OpenWebRX is also available under a commercial license on request. Please contact me at the address
+*&lt;randras@sdr.hu&gt;* for licensing options. 

From fcc907d4885d57b1039493125f2d211a70a1bec2 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 29 Jan 2020 20:14:03 +0100
Subject: [PATCH 019/475] add to changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a852ee2..2723fb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 - Clicking on the frequency now opens an input for direct frequency selection
 - URL hashes have been fixed and improved: They are now updated automatically, so a shared URL will include frequency
   and demodulator, which allows for improved sharing and linking.
+- New daylight scheduler for background decoding, allows profiles to be selected by local sunrise / sunset times
 - New devices supported:
   - LimeSDR (`"type": "lime_sdr"`)
   - PlutoSDR (`"type": "pluto_sdr"`)

From 14ea326f43d0cee3b4377c34aeca8db3a64f9aaf Mon Sep 17 00:00:00 2001
From: Adam <adam@ofadam.com>
Date: Wed, 29 Jan 2020 14:35:52 -0600
Subject: [PATCH 020/475] Fixed typo

2019 reference should have been 2020.
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2723fb4..8f6797f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@
   - PlutoSDR (`"type": "pluto_sdr"`)
   - RTL_SDR via Soapy (`"type": "rtl_sdr_soapy"`) on special request to allow use of the direct sampling mode
 
-**2019-01-04**
+**2020-01-04**
 - The [owrx_connector](https://github.com/jketterl/owrx_connector) is now the default way of communicating with sdr
   devices. The old sdr types have been replaced, all `_connector` suffixes on the type must be removed!
 - The sources have been refactored, making it a lot easier to add support for other devices

From 8036758857dc67d126676e79a10024fe98209c94 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 1 Feb 2020 21:37:43 +0100
Subject: [PATCH 021/475] improve error handling on band and bookmark loading

---
 owrx/bands.py     | 5 ++++-
 owrx/bookmarks.py | 5 ++++-
 owrx/config.py    | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/owrx/bands.py b/owrx/bands.py
index cf2bd7c..fbb7ae6 100644
--- a/owrx/bands.py
+++ b/owrx/bands.py
@@ -58,7 +58,10 @@ class Bandplan(object):
             except FileNotFoundError:
                 pass
             except json.JSONDecodeError:
-                logger.exception("error while parsing bandplan from %s", file)
+                logger.exception("error while parsing bandplan file %s", file)
+                return []
+            except Exception:
+                logger.exception("error while processing bandplan from %s", file)
                 return []
         return []
 
diff --git a/owrx/bookmarks.py b/owrx/bookmarks.py
index 1456c8f..d5a38d8 100644
--- a/owrx/bookmarks.py
+++ b/owrx/bookmarks.py
@@ -50,7 +50,10 @@ class Bookmarks(object):
             except FileNotFoundError:
                 pass
             except json.JSONDecodeError:
-                logger.exception("error while parsing bookmarks from %s", file)
+                logger.exception("error while parsing bookmarks file %s", file)
+                return []
+            except Exception:
+                logger.exception("error while processing bookmarks from %s", file)
                 return []
         return []
 
diff --git a/owrx/config.py b/owrx/config.py
index 820fee8..09bbd8f 100644
--- a/owrx/config.py
+++ b/owrx/config.py
@@ -145,5 +145,5 @@ class PropertyManager(object):
                     self[name] = value
                 return self
             except FileNotFoundError:
-                logger.debug("not found: %s", file)
+                pass
         raise ConfigNotFoundException("no usable config found! please make sure you have a valid configuration file!")

From 0191ed7ad6b6aca289d11c4d97c9b7146dbecb6a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 1 Feb 2020 21:48:46 +0100
Subject: [PATCH 022/475] abort frequency input on ESC key

---
 htdocs/lib/FrequencyDisplay.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/lib/FrequencyDisplay.js b/htdocs/lib/FrequencyDisplay.js
index fb810c2..5aab3ee 100644
--- a/htdocs/lib/FrequencyDisplay.js
+++ b/htdocs/lib/FrequencyDisplay.js
@@ -80,6 +80,10 @@ TuneableFrequencyDisplay.prototype.setupEvents = function() {
     };
     me.input.on('blur', submit).on('keyup', function(e){
         if (e.keyCode == 13) return submit();
+        if (e.keyCode == 27) {
+            me.input.hide();
+            me.displayContainer.show();
+        }
     });
     me.input.on('click', function(e){
         e.stopPropagation();

From 216ede189cacd248f45395f45fba65d07af6b4d6 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 1 Feb 2020 22:25:16 +0100
Subject: [PATCH 023/475] style the input

---
 htdocs/css/openwebrx.css | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index 349ea4d..719b47d 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -316,14 +316,22 @@ input[type=range]:focus::-ms-fill-upper
 	text-align: left;
 	padding: 0;
 	margin: 0;
+	display: flex;
+	flex-direction: row;
+}
+
+#webrx-actual-freq > * {
+    flex: 1;
 }
 
 #webrx-actual-freq input {
     font-family: 'roboto-mono';
-    width: 98%;
+    width: 0;
     box-sizing: border-box;
     border: 0;
     padding: 0;
+    background-color: inherit;
+    color: inherit;
 }
 
 #webrx-actual-freq, #webrx-actual-freq input {

From d94914629f66991cbfda479e0555c6b91ca4c204 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Feb 2020 17:55:59 +0100
Subject: [PATCH 024/475] update changelog to reflect new image

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f6797f..cdc47ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-**unreleased**
+**2020-02-08**
 - Compression, resampling and filtering in the frontend have been rewritten in javascript, sdr.js has been removed
 - Decoding of Pocsag modulation is now possible
 - Removed the 3D waterfall since it had no real application and required ~1MB of javascript code to be downloaded

From 9a5aba73135a6b930992ca7b335acf6ac57e1e7d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Feb 2020 18:29:48 +0100
Subject: [PATCH 025/475] disable config interface unless explicitly enables in
 the config

---
 owrx/connection.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index 7aa6fc6..6884f69 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -247,10 +247,14 @@ class OpenWebRxReceiverClient(Client):
             self.sdr.removeSpectrumClient(self)
 
     def setParams(self, params):
+        # allow direct configuration only if enabled in the config
+        keys = PropertyManager.getSharedInstance()["configurable_keys"]
+        if not keys:
+            return
         # only the keys in the protected property manager can be overridden from the web
         protected = (
             self.sdr.getProps()
-            .collect("samp_rate", "center_freq", "rf_gain", "type")
+            .collect(*keys)
             .defaults(PropertyManager.getSharedInstance())
         )
         for key, value in params.items():

From 5951d2a8746183d2c71d3ce7fd0d892ad713e8f7 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Feb 2020 19:01:50 +0100
Subject: [PATCH 026/475] add docker build for pluto

---
 build.sh                                      |  1 +
 docker/Dockerfiles/Dockerfile-full            |  1 +
 docker/Dockerfiles/Dockerfile-plutosdr        | 10 ++++++
 .../scripts/install-dependencies-plutosdr.sh  | 35 +++++++++++++++++++
 push.sh                                       |  2 +-
 5 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 docker/Dockerfiles/Dockerfile-plutosdr
 create mode 100755 docker/scripts/install-dependencies-plutosdr.sh

diff --git a/build.sh b/build.sh
index 5a991a7..1997bbc 100755
--- a/build.sh
+++ b/build.sh
@@ -13,4 +13,5 @@ docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-sdrplay:$ARCHTAG
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-hackrf:$ARCHTAG -f docker/Dockerfiles/Dockerfile-hackrf .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-airspy:$ARCHTAG -f docker/Dockerfiles/Dockerfile-airspy .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-rtlsdr-soapy:$ARCHTAG -f docker/Dockerfiles/Dockerfile-rtlsdr-soapy .
+docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-plutosdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-plutosdr .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-full:$ARCHTAG -t jketterl/openwebrx:$ARCHTAG -f docker/Dockerfiles/Dockerfile-full .
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index 5d59e6a..c538b2d 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -10,6 +10,7 @@ RUN /install-dependencies-soapysdr.sh
 RUN /install-dependencies-sdrplay.sh
 RUN /install-dependencies-airspy.sh
 RUN /install-dependencies-rtlsdr-soapy.sh
+RUN /install-dependencies-plutosdr.sh
 RUN rm /install-dependencies-*.sh
 
 ADD docker/scripts/install-connectors.sh /
diff --git a/docker/Dockerfiles/Dockerfile-plutosdr b/docker/Dockerfiles/Dockerfile-plutosdr
new file mode 100644
index 0000000..d9edda5
--- /dev/null
+++ b/docker/Dockerfiles/Dockerfile-plutosdr
@@ -0,0 +1,10 @@
+ARG ARCHTAG
+FROM openwebrx-soapysdr-base:$ARCHTAG
+
+ADD docker/scripts/install-dependencies-plutosdr.sh /
+RUN /install-dependencies-plutosdr.sh
+RUN rm /install-dependencies-plutosdr.sh
+
+ADD docker/scripts/install-connectors.sh /
+RUN /install-connectors.sh
+RUN rm /install-connectors.sh
diff --git a/docker/scripts/install-dependencies-plutosdr.sh b/docker/scripts/install-dependencies-plutosdr.sh
new file mode 100755
index 0000000..06bef53
--- /dev/null
+++ b/docker/scripts/install-dependencies-plutosdr.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+function cmakebuild() {
+  cd $1
+  if [[ ! -z "${2:-}" ]]; then
+    git checkout $2
+  fi
+  mkdir build
+  cd build
+  cmake ..
+  make
+  make install
+  cd ../..
+  rm -rf $1
+}
+
+cd /tmp
+
+STATIC_PACKAGES="libusb"
+BUILD_PACKAGES="git libusb-dev cmake make gcc musl-dev g++ linux-headers"
+
+apk add --no-cache $STATIC_PACKAGES
+apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+
+git clone https://github.com/analogdevicesinc/libiio.git
+cmakebuild libiio 4e22517c60f3c5e691320871956edede15459ae3
+
+git clone https://github.com/analogdevicesinc/libad9361-iio.git
+cmakebuild libad9361-iio 8ac95f3325c18c2e34cd9cfd49c7b63d69a0a9d2
+
+git clone https://github.com/pothosware/SoapyPlutoSDR.git
+cmakebuild SoapyPlutoSDR e28e4f5c68c16a38c0b50b9606035f3267a135c8
+
+apk del .build-deps
diff --git a/push.sh b/push.sh
index 1bb5fde..93e3954 100755
--- a/push.sh
+++ b/push.sh
@@ -7,7 +7,7 @@ ALL_ARCHS="x86_64 armv7l aarch64"
 TAG="latest"
 ARCHTAG="$TAG-$ARCH"
 
-IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-full openwebrx"
+IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-full openwebrx"
 
 for image in ${IMAGES}; do
   docker push jketterl/$image:$ARCHTAG

From 42eeb00a0f5904cd6c1c5abd4931e3c92ccb1623 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Feb 2020 19:47:16 +0100
Subject: [PATCH 027/475] add limesdr build

---
 build.sh                                      |  1 +
 docker/Dockerfiles/Dockerfile-full            |  1 +
 docker/Dockerfiles/Dockerfile-limesdr         | 10 +++++
 .../scripts/install-dependencies-limesdr.sh   | 37 +++++++++++++++++++
 push.sh                                       |  2 +-
 5 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 docker/Dockerfiles/Dockerfile-limesdr
 create mode 100755 docker/scripts/install-dependencies-limesdr.sh

diff --git a/build.sh b/build.sh
index 1997bbc..69576c1 100755
--- a/build.sh
+++ b/build.sh
@@ -14,4 +14,5 @@ docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-hackrf:$ARCHTAG
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-airspy:$ARCHTAG -f docker/Dockerfiles/Dockerfile-airspy .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-rtlsdr-soapy:$ARCHTAG -f docker/Dockerfiles/Dockerfile-rtlsdr-soapy .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-plutosdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-plutosdr .
+docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-limesdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-limesdr .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-full:$ARCHTAG -t jketterl/openwebrx:$ARCHTAG -f docker/Dockerfiles/Dockerfile-full .
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index c538b2d..e0a72f8 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -11,6 +11,7 @@ RUN /install-dependencies-sdrplay.sh
 RUN /install-dependencies-airspy.sh
 RUN /install-dependencies-rtlsdr-soapy.sh
 RUN /install-dependencies-plutosdr.sh
+RUN /install-dependencies-limesdr.sh
 RUN rm /install-dependencies-*.sh
 
 ADD docker/scripts/install-connectors.sh /
diff --git a/docker/Dockerfiles/Dockerfile-limesdr b/docker/Dockerfiles/Dockerfile-limesdr
new file mode 100644
index 0000000..dabb9c5
--- /dev/null
+++ b/docker/Dockerfiles/Dockerfile-limesdr
@@ -0,0 +1,10 @@
+ARG ARCHTAG
+FROM openwebrx-soapysdr-base:$ARCHTAG
+
+ADD docker/scripts/install-dependencies-limesdr.sh /
+RUN /install-dependencies-limesdr.sh
+RUN rm /install-dependencies-limesdr.sh
+
+ADD docker/scripts/install-connectors.sh /
+RUN /install-connectors.sh
+RUN rm /install-connectors.sh
diff --git a/docker/scripts/install-dependencies-limesdr.sh b/docker/scripts/install-dependencies-limesdr.sh
new file mode 100755
index 0000000..6d3a093
--- /dev/null
+++ b/docker/scripts/install-dependencies-limesdr.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+function cmakebuild() {
+  cd $1
+  if [[ ! -z "${2:-}" ]]; then
+    git checkout $2
+  fi
+  mkdir build
+  cd build
+  cmake ..
+  make
+  make install
+  cd ../..
+  rm -rf $1
+}
+
+cd /tmp
+
+STATIC_PACKAGES="libusb"
+BUILD_PACKAGES="git libusb-dev cmake make gcc musl-dev g++ linux-headers"
+
+apk add --no-cache $STATIC_PACKAGES
+apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+
+git clone https://github.com/myriadrf/LimeSuite.git
+cd LimeSuite
+git checkout 1c1c202f9a6ae4bb34068b6f3f576f7f8e74c7f1
+mkdir builddir
+cd builddir
+cmake .. -DENABLE_EXAMPLES=OFF -DENABLE_DESKTOP=OFF -DENABLE_LIME_UTIL=OFF -DENABLE_QUICKTEST=OFF -DENABLE_OCTAVE=OFF -DENABLE_GUI=OFF -DCMAKE_CXX_STANDARD_LIBRARIES="-latomic"
+make
+make install
+cd ../..
+rm -rf LimeSuite
+
+apk del .build-deps
diff --git a/push.sh b/push.sh
index 93e3954..915c38a 100755
--- a/push.sh
+++ b/push.sh
@@ -7,7 +7,7 @@ ALL_ARCHS="x86_64 armv7l aarch64"
 TAG="latest"
 ARCHTAG="$TAG-$ARCH"
 
-IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-full openwebrx"
+IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-full openwebrx"
 
 for image in ${IMAGES}; do
   docker push jketterl/$image:$ARCHTAG

From bdc43455a52746abba05126d45051cf3433b3455 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Feb 2020 19:53:23 +0100
Subject: [PATCH 028/475] add dependencies

---
 docker/scripts/install-dependencies-plutosdr.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/scripts/install-dependencies-plutosdr.sh b/docker/scripts/install-dependencies-plutosdr.sh
index 06bef53..2013fbe 100755
--- a/docker/scripts/install-dependencies-plutosdr.sh
+++ b/docker/scripts/install-dependencies-plutosdr.sh
@@ -17,8 +17,8 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="libusb"
-BUILD_PACKAGES="git libusb-dev cmake make gcc musl-dev g++ linux-headers"
+STATIC_PACKAGES="libusb libxml2"
+BUILD_PACKAGES="git libusb-dev cmake make gcc musl-dev g++ linux-headers libxml2-dev flex bison"
 
 apk add --no-cache $STATIC_PACKAGES
 apk add --no-cache --virtual .build-deps $BUILD_PACKAGES

From dc12c54ae6afd99cc23d531af27e210c0af95ea8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Feb 2020 21:05:12 +0100
Subject: [PATCH 029/475] fix libiio installation

---
 docker/scripts/install-dependencies-plutosdr.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/scripts/install-dependencies-plutosdr.sh b/docker/scripts/install-dependencies-plutosdr.sh
index 2013fbe..fd78e44 100755
--- a/docker/scripts/install-dependencies-plutosdr.sh
+++ b/docker/scripts/install-dependencies-plutosdr.sh
@@ -8,7 +8,7 @@ function cmakebuild() {
   fi
   mkdir build
   cd build
-  cmake ..
+  cmake .. ${3:-}
   make
   make install
   cd ../..
@@ -24,7 +24,7 @@ apk add --no-cache $STATIC_PACKAGES
 apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 git clone https://github.com/analogdevicesinc/libiio.git
-cmakebuild libiio 4e22517c60f3c5e691320871956edede15459ae3
+cmakebuild libiio 4e22517c60f3c5e691320871956edede15459ae3 -DCMAKE_INSTALL_PREFIX=/usr/local
 
 git clone https://github.com/analogdevicesinc/libad9361-iio.git
 cmakebuild libad9361-iio 8ac95f3325c18c2e34cd9cfd49c7b63d69a0a9d2

From 46c3e5077de665fa0216c283efa2572d5b34e6a1 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Feb 2020 21:43:47 +0100
Subject: [PATCH 030/475] fix typo

---
 owrx/sdr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/sdr.py b/owrx/sdr.py
index 878b24d..52a2bbf 100644
--- a/owrx/sdr.py
+++ b/owrx/sdr.py
@@ -44,7 +44,7 @@ class SdrService(object):
                 name: loadIntoPropertyManager(value) for (name, value) in pm["sdrs"].items() if sdrTypeAvailable(value)
             }
             logger.info(
-                "SDR sources loaded. Availables SDRs: {0}".format(
+                "SDR sources loaded. Available SDRs: {0}".format(
                     ", ".join(map(lambda x: x["name"], SdrService.sdrProps.values()))
                 )
             )

From c92929a32dfbefa0c5b7757e9a4806039cff42f9 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 9 Feb 2020 13:59:37 +0100
Subject: [PATCH 031/475] add soapyremote source

---
 CHANGELOG.md                |  3 +++
 owrx/feature.py             |  9 +++++++++
 owrx/source/soapy.py        | 19 +++++++++++--------
 owrx/source/soapy_remote.py | 17 +++++++++++++++++
 4 files changed, 40 insertions(+), 8 deletions(-)
 create mode 100644 owrx/source/soapy_remote.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdc47ca..78ea99b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+**unreleased**
+- Support for SoapyRemote
+
 **2020-02-08**
 - Compression, resampling and filtering in the frontend have been rewritten in javascript, sdr.js has been removed
 - Decoding of Pocsag modulation is now possible
diff --git a/owrx/feature.py b/owrx/feature.py
index 2798a87..ee49bc1 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -30,6 +30,7 @@ class FeatureDetector(object):
         "lime_sdr": ["soapy_connector", "soapy_lime_sdr"],
         "fifi_sdr": ["alsa"],
         "pluto_sdr": ["soapy_connector", "soapy_pluto_sdr"],
+        "soapy_remote": ["soapy_connector", "soapy_remote"],
         # optional features and their requirements
         "digital_voice_digiham": ["digiham", "sox"],
         "digital_voice_dsd": ["dsd", "sox", "digiham"],
@@ -290,6 +291,14 @@ class FeatureDetector(object):
         """
         return self._has_soapy_driver("PlutoSDR")
 
+    def has_soapy_remote(self):
+        """
+        The SoapyRemote allows the usage of remote SDR devices using the SoapySDRServer.
+
+        You can get the code and find additional information [here](https://github.com/pothosware/SoapyRemote/wiki).
+        """
+        return self._has_soapy_driver("remote")
+
     def has_dsd(self):
         """
         The digital voice modes NXDN and D-Star can be decoded by the dsd project. Please note that you need the version
diff --git a/owrx/source/soapy.py b/owrx/source/soapy.py
index 0810884..76ce625 100644
--- a/owrx/source/soapy.py
+++ b/owrx/source/soapy.py
@@ -41,18 +41,21 @@ class SoapyConnectorSource(ConnectorSource, metaclass=ABCMeta):
 
         return ",".join([encodeComponent(c) for c in dobj])
 
-    """
-    this method always attempts to inject a driver= part into the soapysdr query, depending on what connector was used.
-    this prevents the soapy_connector from using the wrong device in scenarios where there's no same-type sdrs.
-    """
+    def buildSoapyDeviceParameters(self, parsed, values):
+        """
+        this method always attempts to inject a driver= part into the soapysdr query, depending on what connector was used.
+        this prevents the soapy_connector from using the wrong device in scenarios where there's no same-type sdrs.
+        """
+        parsed = [v for v in parsed if "driver" not in v]
+        parsed += [{"driver": self.getDriver()}]
+        return parsed
 
     def getCommandValues(self):
         values = super().getCommandValues()
         if "device" in values and values["device"] is not None:
             parsed = self.parseDeviceString(values["device"])
-            parsed = [v for v in parsed if "driver" not in v]
-            parsed += [{"driver": self.getDriver()}]
-            values["device"] = self.encodeDeviceString(parsed)
         else:
-            values["device"] = "driver={0}".format(self.getDriver())
+            parsed = []
+        modified = self.buildSoapyDeviceParameters(parsed, values)
+        values["device"] = self.encodeDeviceString(modified)
         return values
diff --git a/owrx/source/soapy_remote.py b/owrx/source/soapy_remote.py
new file mode 100644
index 0000000..53a3196
--- /dev/null
+++ b/owrx/source/soapy_remote.py
@@ -0,0 +1,17 @@
+from .soapy import SoapyConnectorSource
+
+
+class SoapyRemoteSource(SoapyConnectorSource):
+    def getEventNames(self):
+        return super().getEventNames() + ["remote", "remote_driver"]
+
+    def getDriver(self):
+        return "remote"
+
+    def buildSoapyDeviceParameters(self, parsed, values):
+        params = super().buildSoapyDeviceParameters(parsed, values)
+        params = [v for v in params if not "remote" in params]
+        params += [{"remote": values["remote"]}]
+        if "remote_driver" in values and values["remote_driver"] is not None:
+            params += [{"remote:driver": values["remote_driver"]}]
+        return params

From 16b3c11678ba9482c925dd29bedc81475afc56fe Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 9 Feb 2020 15:23:17 +0100
Subject: [PATCH 032/475] add soapy remote to docker build, too

---
 build.sh                                      |  1 +
 docker/Dockerfiles/Dockerfile-full            |  1 +
 docker/Dockerfiles/Dockerfile-sdrplay         |  1 +
 docker/Dockerfiles/Dockerfile-soapyremote     | 10 +++++++
 .../scripts/install-dependencies-limesdr.sh   | 14 ---------
 .../install-dependencies-soapyremote.sh       | 29 +++++++++++++++++++
 push.sh                                       |  2 +-
 7 files changed, 43 insertions(+), 15 deletions(-)
 create mode 100644 docker/Dockerfiles/Dockerfile-soapyremote
 create mode 100755 docker/scripts/install-dependencies-soapyremote.sh

diff --git a/build.sh b/build.sh
index 69576c1..cccb5df 100755
--- a/build.sh
+++ b/build.sh
@@ -15,4 +15,5 @@ docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-airspy:$ARCHTAG
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-rtlsdr-soapy:$ARCHTAG -f docker/Dockerfiles/Dockerfile-rtlsdr-soapy .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-plutosdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-plutosdr .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-limesdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-limesdr .
+docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-soapyremote:$ARCHTAG -f docker/Dockerfiles/Dockerfile-soapyremote .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-full:$ARCHTAG -t jketterl/openwebrx:$ARCHTAG -f docker/Dockerfiles/Dockerfile-full .
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index e0a72f8..992fa8e 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -12,6 +12,7 @@ RUN /install-dependencies-airspy.sh
 RUN /install-dependencies-rtlsdr-soapy.sh
 RUN /install-dependencies-plutosdr.sh
 RUN /install-dependencies-limesdr.sh
+RUN /install-dependencies-soapyremote.sh
 RUN rm /install-dependencies-*.sh
 
 ADD docker/scripts/install-connectors.sh /
diff --git a/docker/Dockerfiles/Dockerfile-sdrplay b/docker/Dockerfiles/Dockerfile-sdrplay
index f44f53b..0013135 100644
--- a/docker/Dockerfiles/Dockerfile-sdrplay
+++ b/docker/Dockerfiles/Dockerfile-sdrplay
@@ -5,6 +5,7 @@ ADD docker/scripts/install-dependencies-sdrplay.sh /
 ADD docker/scripts/install-lib.*.patch /
 RUN /install-dependencies-sdrplay.sh
 RUN rm /install-dependencies-sdrplay.sh
+RUN rm /install-lib.*.patch
 
 ADD docker/scripts/install-connectors.sh /
 RUN /install-connectors.sh
diff --git a/docker/Dockerfiles/Dockerfile-soapyremote b/docker/Dockerfiles/Dockerfile-soapyremote
new file mode 100644
index 0000000..c6e4b49
--- /dev/null
+++ b/docker/Dockerfiles/Dockerfile-soapyremote
@@ -0,0 +1,10 @@
+ARG ARCHTAG
+FROM openwebrx-soapysdr-base:$ARCHTAG
+
+ADD docker/scripts/install-dependencies-soapyremote.sh /
+RUN /install-dependencies-soapyremote.sh
+RUN rm /install-dependencies-soapyremote.sh
+
+ADD docker/scripts/install-connectors.sh /
+RUN /install-connectors.sh
+RUN rm /install-connectors.sh
diff --git a/docker/scripts/install-dependencies-limesdr.sh b/docker/scripts/install-dependencies-limesdr.sh
index 6d3a093..ac92002 100755
--- a/docker/scripts/install-dependencies-limesdr.sh
+++ b/docker/scripts/install-dependencies-limesdr.sh
@@ -1,20 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-function cmakebuild() {
-  cd $1
-  if [[ ! -z "${2:-}" ]]; then
-    git checkout $2
-  fi
-  mkdir build
-  cd build
-  cmake ..
-  make
-  make install
-  cd ../..
-  rm -rf $1
-}
-
 cd /tmp
 
 STATIC_PACKAGES="libusb"
diff --git a/docker/scripts/install-dependencies-soapyremote.sh b/docker/scripts/install-dependencies-soapyremote.sh
new file mode 100755
index 0000000..9cfa2a8
--- /dev/null
+++ b/docker/scripts/install-dependencies-soapyremote.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+function cmakebuild() {
+  cd $1
+  if [[ ! -z "${2:-}" ]]; then
+    git checkout $2
+  fi
+  mkdir build
+  cd build
+  cmake ..
+  make
+  make install
+  cd ../..
+  rm -rf $1
+}
+
+cd /tmp
+
+STATIC_PACKAGES="avahi"
+BUILD_PACKAGES="git cmake make gcc musl-dev g++ linux-headers avahi-dev"
+
+apk add --no-cache $STATIC_PACKAGES
+apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+
+git clone https://github.com/pothosware/SoapyRemote.git
+cmakebuild SoapyRemote 6d9bd820da470cfe7b27b2e6946af93cfece448f
+
+apk del .build-deps
diff --git a/push.sh b/push.sh
index 915c38a..c6147e0 100755
--- a/push.sh
+++ b/push.sh
@@ -7,7 +7,7 @@ ALL_ARCHS="x86_64 armv7l aarch64"
 TAG="latest"
 ARCHTAG="$TAG-$ARCH"
 
-IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-full openwebrx"
+IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-full openwebrx"
 
 for image in ${IMAGES}; do
   docker push jketterl/$image:$ARCHTAG

From eaa98b0d641bd5ff81658d016364d3d19d2a5a18 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 9 Feb 2020 21:46:03 +0100
Subject: [PATCH 033/475] new status controller as json

---
 owrx/controllers.py | 44 +++++++++++++++++++++++++++++++++++++++++++-
 owrx/http.py        |  2 ++
 2 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/owrx/controllers.py b/owrx/controllers.py
index a26ebc3..e3aa664 100644
--- a/owrx/controllers.py
+++ b/owrx/controllers.py
@@ -11,13 +11,15 @@ from owrx.connection import WebSocketMessageHandler
 from owrx.version import openwebrx_version
 from owrx.feature import FeatureDetector
 from owrx.metrics import Metrics
+from owrx.sdr import SdrService
+from abc import ABC, abstractmethod
 
 import logging
 
 logger = logging.getLogger(__name__)
 
 
-class Controller(object):
+class Controller(ABC):
     def __init__(self, handler, request):
         self.handler = handler
         self.request = request
@@ -35,6 +37,10 @@ class Controller(object):
             content = content.encode()
         self.handler.wfile.write(content)
 
+    @abstractmethod
+    def handle_request(self):
+        pass
+
 
 class StatusController(Controller):
     def handle_request(self):
@@ -55,6 +61,42 @@ class StatusController(Controller):
         self.send_response("\n".join(["{key}={value}".format(key=key, value=value) for key, value in vars.items()]))
 
 
+class StatusJsonController(Controller):
+    def getProfileStats(self, profile):
+        return {
+            "name": profile["name"],
+            "center_freq": profile["center_freq"],
+            "sample_rate": profile["samp_rate"],
+        }
+
+    def getReceiverStats(self, receiver):
+        stats = {
+            "name": receiver.getName(),
+            # TODO would be better to have types from the config here
+            "type": type(receiver).__name__,
+            "profiles": [self.getProfileStats(p) for p in receiver.getProfiles().values()]
+        }
+        return stats
+
+    def handle_request(self):
+        pm = PropertyManager.getSharedInstance()
+
+        gps = pm["receiver_gps"]
+        status = {
+            "receiver": {
+                "name": pm["receiver_name"],
+                "admin": pm["receiver_admin"],
+                "gps": {"lat": gps[0], "lon": gps[1]},
+                "asl": pm["receiver_asl"],
+                "location": pm["receiver_location"],
+            },
+            "max_clients": pm["max_clients"],
+            "version": openwebrx_version,
+            "sdrs": [self.getReceiverStats(r) for r in SdrService.getSources().values()]
+        }
+        self.send_response(json.dumps(status), content_type="application/json")
+
+
 class AssetsController(Controller):
     def getModified(self, file):
         return None
diff --git a/owrx/http.py b/owrx/http.py
index 196c6c4..4783a27 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -1,5 +1,6 @@
 from owrx.controllers import (
     StatusController,
+    StatusJsonController,
     IndexController,
     OwrxAssetsController,
     WebSocketController,
@@ -41,6 +42,7 @@ class Router(object):
     mappings = [
         {"route": "/", "controller": IndexController},
         {"route": "/status", "controller": StatusController},
+        {"route": "/status.json", "controller": StatusJsonController},
         {"regex": "/static/(.+)", "controller": OwrxAssetsController},
         {"regex": "/aprs-symbols/(.+)", "controller": AprsSymbolsController},
         {"route": "/ws/", "controller": WebSocketController},

From b948e06a4fe677a5d92874b3bdcb5288f1c57344 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 15 Feb 2020 00:16:04 +0100
Subject: [PATCH 034/475] use urllib to update sdr.hu, no wget dependency

ref: #52
---
 owrx/meta.py  |  1 -
 owrx/sdrhu.py | 40 ++++++++++++++++++++++------------------
 sdrhu.py      | 12 ++++++++++--
 3 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/owrx/meta.py b/owrx/meta.py
index 3d1b3d9..d69127d 100644
--- a/owrx/meta.py
+++ b/owrx/meta.py
@@ -5,7 +5,6 @@ from datetime import datetime, timedelta
 import logging
 import threading
 from owrx.map import Map, LatLngLocation
-from owrx.bands import Bandplan
 from owrx.parser import Parser
 
 logger = logging.getLogger(__name__)
diff --git a/owrx/sdrhu.py b/owrx/sdrhu.py
index c84a2f5..f9b5207 100644
--- a/owrx/sdrhu.py
+++ b/owrx/sdrhu.py
@@ -1,7 +1,7 @@
 import threading
-import subprocess
 import time
 from owrx.config import PropertyManager
+from urllib import request, parse
 
 import logging
 
@@ -14,24 +14,28 @@ class SdrHuUpdater(threading.Thread):
         super().__init__(daemon=True)
 
     def update(self):
-        pm = PropertyManager.getSharedInstance()
-        cmd = 'wget --timeout=15 -4qO- https://sdr.hu/update --post-data "url=http://{server_hostname}:{web_port}&apikey={sdrhu_key}" 2>&1'.format(
-            **pm.__dict__()
-        )
-        logger.debug(cmd)
-        returned = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE).communicate()
-        returned = returned[0].decode("utf-8")
-        if "UPDATE:" in returned:
-            retrytime_mins = 20
-            value = returned.split("UPDATE:")[1].split("\n", 1)[0]
-            if value.startswith("SUCCESS"):
-                logger.info("Update succeeded!")
-            else:
-                logger.warning("Update failed, your receiver cannot be listed on sdr.hu! Reason: %s", value)
+        pm = PropertyManager.getSharedInstance().collect("server_hostname", "web_port", "sdrhu_key")
+        data = parse.urlencode({
+            "url": "http://{server_hostname}:{web_port}".format(**pm.__dict__()),
+            "apikey": pm["sdrhu_key"]
+        }).encode()
+
+        res = request.urlopen("https://sdr.hu/update", data=data)
+        if res.getcode() < 200 or res.getcode() >= 300:
+            logger.warning('sdr.hu update failed with error code %i', res.getcode())
+            return 2
+
+        returned = res.read().decode("utf-8")
+        if "UPDATE:" not in returned:
+            logger.warning("Update failed, your receiver cannot be listed on sdr.hu!")
+            return 2
+
+        value = returned.split("UPDATE:")[1].split("\n", 1)[0]
+        if value.startswith("SUCCESS"):
+            logger.info("Update succeeded!")
         else:
-            retrytime_mins = 2
-            logger.warning("wget failed while updating, your receiver cannot be listed on sdr.hu!")
-        return retrytime_mins
+            logger.warning("Update failed, your receiver cannot be listed on sdr.hu! Reason: %s", value)
+        return 20
 
     def run(self):
         while self.doRun:
diff --git a/sdrhu.py b/sdrhu.py
index d74d166..6dd9daa 100755
--- a/sdrhu.py
+++ b/sdrhu.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
 """
 
     This file is part of OpenWebRX, 
@@ -24,9 +24,17 @@
 from owrx.sdrhu import SdrHuUpdater
 from owrx.config import PropertyManager
 
+import logging
+logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+logger = logging.getLogger(__name__)
+
 if __name__ == "__main__":
     pm = PropertyManager.getSharedInstance().loadConfig()
 
-    if not "sdrhu_key" in pm:
+    if "sdrhu_public_listing" not in pm or not pm["sdrhu_public_listing"]:
+        logger.error('Public listing on sdr.hu is not activated. Please check "sdrhu_public_listing" in your config.')
+        exit(1)
+    if "sdrhu_key" not in pm or pm["sdrhu_key"] is None or pm["sdrhu_key"] == "":
+        logger.error('Missing "sdrhu_key" in your config. Aborting')
         exit(1)
     SdrHuUpdater().update()

From 0b7b5d985f5eb5aab129a437a81171cf9482fb1d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 16 Feb 2020 11:49:20 +0100
Subject: [PATCH 035/475] update copyright date

---
 sdrhu.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdrhu.py b/sdrhu.py
index 6dd9daa..53c5c6d 100755
--- a/sdrhu.py
+++ b/sdrhu.py
@@ -4,7 +4,7 @@
     This file is part of OpenWebRX, 
     an open-source SDR receiver software with a web UI.
     Copyright (c) 2013-2015 by Andras Retzler <randras@sdr.hu>
-    Copyright (c) 2019 by Jakob Ketterl <dd5jfk@darc.de>
+    Copyright (c) 2019-2020 by Jakob Ketterl <dd5jfk@darc.de>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License as

From ebba6e1ada1fd71f7c66c566eb59c7adca4a55c1 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 16 Feb 2020 12:19:49 +0100
Subject: [PATCH 036/475] use more cpu cores

---
 docker/scripts/install-connectors.sh                | 1 +
 docker/scripts/install-dependencies-airspy.sh       | 1 +
 docker/scripts/install-dependencies-hackrf.sh       | 1 +
 docker/scripts/install-dependencies-limesdr.sh      | 1 +
 docker/scripts/install-dependencies-plutosdr.sh     | 1 +
 docker/scripts/install-dependencies-rtlsdr-soapy.sh | 1 +
 docker/scripts/install-dependencies-rtlsdr.sh       | 1 +
 docker/scripts/install-dependencies-sdrplay.sh      | 1 +
 docker/scripts/install-dependencies-soapyremote.sh  | 1 +
 docker/scripts/install-dependencies-soapysdr.sh     | 1 +
 docker/scripts/install-dependencies.sh              | 1 +
 11 files changed, 11 insertions(+)

diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh
index a613db5..2e27279 100755
--- a/docker/scripts/install-connectors.sh
+++ b/docker/scripts/install-connectors.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -euxo pipefail
+export MAKEFLAGS="-j4"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-dependencies-airspy.sh b/docker/scripts/install-dependencies-airspy.sh
index b6cc2f3..dd13d22 100755
--- a/docker/scripts/install-dependencies-airspy.sh
+++ b/docker/scripts/install-dependencies-airspy.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -euxo pipefail
+export MAKEFLAGS="-j4"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-dependencies-hackrf.sh b/docker/scripts/install-dependencies-hackrf.sh
index b9c4ec4..274c1cc 100755
--- a/docker/scripts/install-dependencies-hackrf.sh
+++ b/docker/scripts/install-dependencies-hackrf.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -euxo pipefail
+export MAKEFLAGS="-j4"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-dependencies-limesdr.sh b/docker/scripts/install-dependencies-limesdr.sh
index ac92002..7a5341a 100755
--- a/docker/scripts/install-dependencies-limesdr.sh
+++ b/docker/scripts/install-dependencies-limesdr.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
+export MAKEFLAGS="-j4"
 
 cd /tmp
 
diff --git a/docker/scripts/install-dependencies-plutosdr.sh b/docker/scripts/install-dependencies-plutosdr.sh
index fd78e44..76ff3bf 100755
--- a/docker/scripts/install-dependencies-plutosdr.sh
+++ b/docker/scripts/install-dependencies-plutosdr.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
+export MAKEFLAGS="-j4"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-dependencies-rtlsdr-soapy.sh b/docker/scripts/install-dependencies-rtlsdr-soapy.sh
index 11a0cd1..31d2675 100755
--- a/docker/scripts/install-dependencies-rtlsdr-soapy.sh
+++ b/docker/scripts/install-dependencies-rtlsdr-soapy.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
+export MAKEFLAGS="-j4"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-dependencies-rtlsdr.sh b/docker/scripts/install-dependencies-rtlsdr.sh
index fdf0f22..c612f91 100755
--- a/docker/scripts/install-dependencies-rtlsdr.sh
+++ b/docker/scripts/install-dependencies-rtlsdr.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -euxo pipefail
+export MAKEFLAGS="-j4"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-dependencies-sdrplay.sh b/docker/scripts/install-dependencies-sdrplay.sh
index 79ca0f4..d127602 100755
--- a/docker/scripts/install-dependencies-sdrplay.sh
+++ b/docker/scripts/install-dependencies-sdrplay.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -euxo pipefail
+export MAKEFLAGS="-j4"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-dependencies-soapyremote.sh b/docker/scripts/install-dependencies-soapyremote.sh
index 9cfa2a8..9b95f09 100755
--- a/docker/scripts/install-dependencies-soapyremote.sh
+++ b/docker/scripts/install-dependencies-soapyremote.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 set -euo pipefail
+export MAKEFLAGS="-j4"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-dependencies-soapysdr.sh b/docker/scripts/install-dependencies-soapysdr.sh
index 594c0dd..bfbcd66 100755
--- a/docker/scripts/install-dependencies-soapysdr.sh
+++ b/docker/scripts/install-dependencies-soapysdr.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -euxo pipefail
+export MAKEFLAGS="-j4"
 
 function cmakebuild() {
   cd $1
diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index 1407988..e2096c3 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -euxo pipefail
+export MAKEFLAGS="-j4"
 
 function cmakebuild() {
   cd $1

From ad565c5a2b654b5728e53af0aae1bcc57d781d1c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 17 Feb 2020 12:06:13 +0100
Subject: [PATCH 037/475] re-wire the audio output to "null" - thanks to
 @dl9rdz

---
 csdr/csdr.py | 2 +-
 owrx/kiss.py | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index b2f2129..5aac982 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -243,7 +243,7 @@ class dsp(object):
             chain += ["csdr fmdemod_quadri_cf"]
             if self.last_decimation != 1.0:
                 chain += ["csdr fractional_decimator_ff {last_decimation}"]
-            return chain + ["csdr convert_f_s16", "direwolf -c {direwolf_config} -r {audio_rate} -t 0 -q d -q h - 1>&2"]
+            return chain + ["csdr convert_f_s16", "direwolf -c {direwolf_config} -r {audio_rate} -t 0 -q d -q h 1>&2"]
         elif which == "pocsag":
             chain += ["csdr fmdemod_quadri_cf"]
             if self.last_decimation != 1.0:
diff --git a/owrx/kiss.py b/owrx/kiss.py
index 1ea9408..d47fa4d 100644
--- a/owrx/kiss.py
+++ b/owrx/kiss.py
@@ -18,6 +18,7 @@ class DirewolfConfig(object):
 
         config = """
 ACHANNELS 1
+ADEVICE stdin null
 
 CHANNEL 0
 MYCALL {callsign}

From 521755b9f2df62adf9adf8b69562f39ae7af92aa Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 17 Feb 2020 15:03:20 +0100
Subject: [PATCH 038/475] create and use custom user on debian install

---
 debian/control            | 2 +-
 debian/postinst           | 4 ++++
 systemd/openwebrx.service | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100755 debian/postinst

diff --git a/debian/control b/debian/control
index 4903848..5c37fb8 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 10), dh-python, python3 (>= 3.5), dh-systemd (>= 1.
 
 Package: openwebrx
 Architecture: all
-Depends: python3 (>= 3.5), python3-pkg-resources, csdr (>= 0.14), netcat, owrx-connector (>= 0.1), ${python3:Depends}
+Depends: adduser, python3 (>= 3.5), python3-pkg-resources, csdr (>= 0.14), netcat, owrx-connector (>= 0.1), ${python3:Depends}
 Recommends: digiham (>= 0.3), dsd (>= 1.7), sox, direwolf (>= 1.4), wsjtx
 Description: multi-user web sdr
  Open source, multi-user SDR receiver with a web interface
\ No newline at end of file
diff --git a/debian/postinst b/debian/postinst
new file mode 100755
index 0000000..0cd9fc0
--- /dev/null
+++ b/debian/postinst
@@ -0,0 +1,4 @@
+#!/bin/bash
+set -euxo pipefail
+
+adduser --system --group --no-create-home --home /nonexistant openwebrx
\ No newline at end of file
diff --git a/systemd/openwebrx.service b/systemd/openwebrx.service
index 5865022..ab4ad9f 100644
--- a/systemd/openwebrx.service
+++ b/systemd/openwebrx.service
@@ -4,10 +4,10 @@ After=multi-user.target
 
 [Service]
 Type=simple
-User=root
-Group=root
+User=openwebrx
+Group=openwebrx
 ExecStart=/usr/bin/openwebrx
-Restart=on-failure
+Restart=always
 
 [Install]
 WantedBy=multi-user.target

From d1dc14d9e5beee4e8539bfe644638b1ecc144077 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 17 Feb 2020 15:03:39 +0100
Subject: [PATCH 039/475] don't put debian files in docker builds

---
 .dockerignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.dockerignore b/.dockerignore
index 6c2ce7c..8c815de 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -4,3 +4,4 @@
 **/*.pyc
 **/*.swp
 black-env
+debian
\ No newline at end of file

From 7bc78425cde3ab4bb29cdff428abc44bf97e6571 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 17 Feb 2020 17:05:31 +0100
Subject: [PATCH 040/475] add user to plugdev group, fix some lintian issues

---
 debian/control  | 4 ++--
 debian/postinst | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 5c37fb8..1cdf780 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ Maintainer: Jakob Ketterl <jakob.ketterl@gmx.de>
 Section: hamradio
 Priority: optional
 Standards-Version: 4.2.0
-Build-Depends: debhelper (>= 10), dh-python, python3 (>= 3.5), dh-systemd (>= 1.5)
+Build-Depends: debhelper (>= 10), dh-python, python3 (>= 3.5)
 
 Package: openwebrx
 Architecture: all
-Depends: adduser, python3 (>= 3.5), python3-pkg-resources, csdr (>= 0.14), netcat, owrx-connector (>= 0.1), ${python3:Depends}
+Depends: adduser, python3 (>= 3.5), python3-pkg-resources, csdr (>= 0.14), netcat, owrx-connector (>= 0.1), ${python3:Depends}, ${misc:Depends}
 Recommends: digiham (>= 0.3), dsd (>= 1.7), sox, direwolf (>= 1.4), wsjtx
 Description: multi-user web sdr
  Open source, multi-user SDR receiver with a web interface
\ No newline at end of file
diff --git a/debian/postinst b/debian/postinst
index 0cd9fc0..9a4b5e7 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,4 +1,7 @@
 #!/bin/bash
 set -euxo pipefail
 
-adduser --system --group --no-create-home --home /nonexistant openwebrx
\ No newline at end of file
+adduser --system --group --no-create-home --home /nonexistant openwebrx
+usermod -aG plugdev openwebrx
+
+#DEBHELPER#
\ No newline at end of file

From f0f9455c6e8fe281da8df3f9ad466f8b6b6b33d4 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 18 Feb 2020 20:53:53 +0100
Subject: [PATCH 041/475] add the changelog to the debian package

---
 debian/changelog | 70 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 69 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3c19b4b..6c18207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,73 @@
 openwebrx (0.18) UNRELEASED; urgency=low
 
-  * Initial release.
+  * Compression, resampling and filtering in the frontend have been rewritten in javascript, sdr.js has been removed
+  * Decoding of Pocsag modulation is now possible
+  * Removed the 3D waterfall since it had no real application and required ~1MB of javascript code to be downloaded
+  * Improved the frontend handling of the "too many users" scenario
+  * PSK63 digimode is now available (same decoding pipeline as PSK31, but with adopted parameters)
+  * The frequency can now be manipulated with the mousewheel, which should allow the user to tune more precise. The
+    tuning step size is determined by the digit the mouse cursor is hovering over.
+  * Clicking on the frequency now opens an input for direct frequency selection
+  * URL hashes have been fixed and improved: They are now updated automatically, so a shared URL will include frequency
+    and demodulator, which allows for improved sharing and linking.
+  * New daylight scheduler for background decoding, allows profiles to be selected by local sunrise / sunset times
+  * The owrx_connector is now the default way of communicating with sdr devices. The old sdr types have been replaced,
+    all `_connector` suffixes on the type must be removed!
+  * The sources have been refactored, making it a lot easier to add support for other devices
+  * SDR device failure handling has been improved, including user feedback
+  * New devices supported:
+  * wsjt-x updated to 2.1.2
+  * The rtl_tcp compatibility mode of the owrx_connector is now configurable using the `rtltcp_compat` flag
+  * explicit device filter for soapy devices for multi-device setups
+  * compatibility fixes for safari browsers (ios and mac)
+  * Offset tuning using the `lfo_offset` has been reworked in a way that `center_freq` has to be set to the frequency
+    you actually want to listen to. If you're using an `lfo_offset` already, you will probably need to change its sign.
+  * `initial_squelch_level` can now be set on each profile.
+  * Part of the frontend code has been reworked
+    - Audio buffer minimums have been completely stripped. As a result, you should get better latency. Unfortunately,
+      this also means there will be some skipping when audio starts.
+    - Now also supports AudioWorklets (for those browser that have it).
+    - Mousewheel controls for the receiver sliders
+  * Error handling for failed SDR devices
+  * One of the most-requested features is finally coming to OpenWebRX: Bookmarks (sometimes also referred to as labels).
+    There's two kinds of bookmarks available:
+    - Serverside bookmarks that are set up by the receiver administrator. Check the file `bookmarks.json` for examples!
+    - Clientside bookmarks which every user can store for themselves. They are stored in the browser's localStorage.
+  * Automatic reporting of spots to [pskreporter](https://pskreporter.info/) is now possible. Please have a look at the
+    configuration on how to set it up.
+  * Websocket communication has been overhauled in large parts. It should now be more reliable, and failing connections
+    should now have no impact on other users.
+  * Profile scheduling allows to set up band-hopping if you are running background services.
+  * APRS now has the ability to show symbols on the map, if a corresponding symbol set has been installed. Check the
+    config!
+  * Debug logging has been disabled in a handful of modules, expect vastly reduced output on the shell.
+  * New set of APRS-related features
+    - Decode Packet transmissions using [direwolf](https://github.com/wb2osz/direwolf) (1k2 only for now)
+    - APRS packets are mostly decoded and shown both in a new panel and on the map
+    - APRS is also available as a background service
+    - direwolfs I-gate functionality can be enabled, which allows your receiver to work as a receive-only I-gate for the
+      APRS network in the background
+  * Demodulation for background services has been optimized to use less total bandwidth, saving CPU
+  * More metrics have been added; they can be used together with collectd and its curl_json plugin for now, with some
+    limitations.
+  * New bandplan feature, the first thing visible is the "dial" indicator that brings you right to the
+    dial frequency for digital modes
+  * fixed some bugs in the websocket communication which broke the map
+  * WSJT-X integration (FT8, FT4, WSPR, JT65, JT9 using wsjt-x demodulators)
+  * New Map Feature that shows both decoded grid squares from FT8 and Locations decoded from YSF digital voice
+  * New Feature report that will show what functionality is available
+  * major rework on the openwebrx core
+  * Support of multiple SDR devices simultaneously
+  * Support for multiple profiles per SDR that allow the user to listen to different frequencies
+  * Support for digital voice decoding
+  * Feature detection that will disable functionality when dependencies are not available (if you're missing the digital
+    buttons, this is probably why)
+  * Support added for the following SDR sources:
+    - LimeSDR (`"type": "lime_sdr"`)
+    - PlutoSDR (`"type": "pluto_sdr"`)
+    - RTL_SDR via Soapy (`"type": "rtl_sdr_soapy"`) on special request to allow use of the direct sampling mode
+    - SoapyRemote (`"type": "soapy_remote"`)
+    - FiFiSDR (`"type": "fifi_sdr"`)
+    - airspyhf devices (Airspy HF+ / Discovery) (`"type": "airspyhf"`)
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Sun, 08 Dec 2019 12:35:48 +0000

From c4166997be3d1647224885290a48bf56c5ea9902 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 18 Feb 2020 20:55:24 +0100
Subject: [PATCH 042/475] release version 0.18

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6c18207..87514c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openwebrx (0.18) UNRELEASED; urgency=low
+openwebrx (0.18.0) buster; urgency=low
 
   * Compression, resampling and filtering in the frontend have been rewritten in javascript, sdr.js has been removed
   * Decoding of Pocsag modulation is now possible

From c53ac1aa4fc6d5c3f0b964d53c99620afd22b0c2 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 18 Feb 2020 20:58:01 +0100
Subject: [PATCH 043/475] pin the dependency release commits

---
 docker/scripts/install-connectors.sh   | 2 +-
 docker/scripts/install-dependencies.sh | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh
index 2e27279..5025081 100755
--- a/docker/scripts/install-connectors.sh
+++ b/docker/scripts/install-connectors.sh
@@ -24,6 +24,6 @@ apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 
 git clone https://github.com/jketterl/owrx_connector.git
-cmakebuild owrx_connector df35e33e42c2e4527853ca18bf04981848860317
+cmakebuild owrx_connector 22a34fe649a0121a79262f54e99e9aa864b1536f
 
 apk del .build-deps
diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index e2096c3..cbe8bcd 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -29,7 +29,7 @@ cmakebuild itpp bb5c7e95f40e8fdb5c3f3d01a84bcbaf76f3676d
 
 git clone https://github.com/jketterl/csdr.git
 cd csdr
-git checkout 43c36df5dcd92d3bdb322f9d53f99ca0c7c816a4
+git checkout fe0b042d9cdc2605a817ca7fdd3a23c48bf07563
 make
 make install
 cd ..
@@ -39,7 +39,7 @@ git clone https://github.com/szechyjs/mbelib.git
 cmakebuild mbelib 9a04ed5c78176a9965f3d43f7aa1b1f5330e771f
 
 git clone https://github.com/jketterl/digiham.git
-cmakebuild digiham e5e11ce9611e3d8f5f9dce7dee97f86a31af107c
+cmakebuild digiham 95206501be89b38d0267bf6c29a6898e7c65656f
 
 git clone https://github.com/f4exb/dsd.git
 cmakebuild dsd f6939f9edbbc6f66261833616391a4e59cb2b3d7

From 91b3713dadfdedb347dc3dbd854d6ba71050d5cd Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 18 Feb 2020 21:09:22 +0100
Subject: [PATCH 044/475] fix date

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 87514c2..6af5947 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -70,4 +70,4 @@ openwebrx (0.18.0) buster; urgency=low
     - FiFiSDR (`"type": "fifi_sdr"`)
     - airspyhf devices (Airspy HF+ / Discovery) (`"type": "airspyhf"`)
 
- -- Jakob Ketterl <jakob.ketterl@gmx.de>  Sun, 08 Dec 2019 12:35:48 +0000
+ -- Jakob Ketterl <jakob.ketterl@gmx.de>  Tue, 18 Feb 2020 20:09:00 +0000

From 37ffb2a02c1f74f69b370a2d6ada392fb60f9841 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 18 Feb 2020 21:19:00 +0100
Subject: [PATCH 045/475] break lines at 80 chars

---
 debian/changelog | 104 +++++++++++++++++++++++++++++------------------
 1 file changed, 64 insertions(+), 40 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6af5947..3ec0626 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,71 +1,95 @@
 openwebrx (0.18.0) buster; urgency=low
 
-  * Compression, resampling and filtering in the frontend have been rewritten in javascript, sdr.js has been removed
+  * Compression, resampling and filtering in the frontend have been rewritten
+    in javascript, sdr.js has been removed
   * Decoding of Pocsag modulation is now possible
-  * Removed the 3D waterfall since it had no real application and required ~1MB of javascript code to be downloaded
+  * Removed the 3D waterfall since it had no real application and required ~1MB
+    of javascript code to be downloaded
   * Improved the frontend handling of the "too many users" scenario
-  * PSK63 digimode is now available (same decoding pipeline as PSK31, but with adopted parameters)
-  * The frequency can now be manipulated with the mousewheel, which should allow the user to tune more precise. The
-    tuning step size is determined by the digit the mouse cursor is hovering over.
+  * PSK63 digimode is now available (same decoding pipeline as PSK31, but with
+    adopted parameters)
+  * The frequency can now be manipulated with the mousewheel, which should
+    allow the user to tune more precise. The tuning step size is determined by
+    the digit the mouse cursor is hovering over.
   * Clicking on the frequency now opens an input for direct frequency selection
-  * URL hashes have been fixed and improved: They are now updated automatically, so a shared URL will include frequency
-    and demodulator, which allows for improved sharing and linking.
-  * New daylight scheduler for background decoding, allows profiles to be selected by local sunrise / sunset times
-  * The owrx_connector is now the default way of communicating with sdr devices. The old sdr types have been replaced,
-    all `_connector` suffixes on the type must be removed!
-  * The sources have been refactored, making it a lot easier to add support for other devices
+  * URL hashes have been fixed and improved: They are now updated
+    automatically, so a shared URL will include frequency and demodulator,
+    which allows for improved sharing and linking.
+  * New daylight scheduler for background decoding, allows profiles to be
+    selected by local sunrise / sunset times
+  * The owrx_connector is now the default way of communicating with sdr
+    devices. The old sdr types have been replaced, all `_connector` suffixes on
+    the type must be removed!
+  * The sources have been refactored, making it a lot easier to add support for
+    other devices
   * SDR device failure handling has been improved, including user feedback
   * New devices supported:
   * wsjt-x updated to 2.1.2
-  * The rtl_tcp compatibility mode of the owrx_connector is now configurable using the `rtltcp_compat` flag
+  * The rtl_tcp compatibility mode of the owrx_connector is now configurable
+    using the `rtltcp_compat` flag
   * explicit device filter for soapy devices for multi-device setups
   * compatibility fixes for safari browsers (ios and mac)
-  * Offset tuning using the `lfo_offset` has been reworked in a way that `center_freq` has to be set to the frequency
-    you actually want to listen to. If you're using an `lfo_offset` already, you will probably need to change its sign.
+  * Offset tuning using the `lfo_offset` has been reworked in a way that
+    `center_freq` has to be set to the frequency you actually want to listen
+    to. If you're using an `lfo_offset` already, you will probably need to
+    change its sign.
   * `initial_squelch_level` can now be set on each profile.
   * Part of the frontend code has been reworked
-    - Audio buffer minimums have been completely stripped. As a result, you should get better latency. Unfortunately,
-      this also means there will be some skipping when audio starts.
+    - Audio buffer minimums have been completely stripped. As a result, you
+      should get better latency. Unfortunately, this also means there will be
+      some skipping when audio starts.
     - Now also supports AudioWorklets (for those browser that have it).
     - Mousewheel controls for the receiver sliders
   * Error handling for failed SDR devices
-  * One of the most-requested features is finally coming to OpenWebRX: Bookmarks (sometimes also referred to as labels).
+  * One of the most-requested features is finally coming to OpenWebRX:
+    Bookmarks (sometimes also referred to as labels).
     There's two kinds of bookmarks available:
-    - Serverside bookmarks that are set up by the receiver administrator. Check the file `bookmarks.json` for examples!
-    - Clientside bookmarks which every user can store for themselves. They are stored in the browser's localStorage.
-  * Automatic reporting of spots to [pskreporter](https://pskreporter.info/) is now possible. Please have a look at the
-    configuration on how to set it up.
-  * Websocket communication has been overhauled in large parts. It should now be more reliable, and failing connections
-    should now have no impact on other users.
-  * Profile scheduling allows to set up band-hopping if you are running background services.
-  * APRS now has the ability to show symbols on the map, if a corresponding symbol set has been installed. Check the
-    config!
-  * Debug logging has been disabled in a handful of modules, expect vastly reduced output on the shell.
+    - Serverside bookmarks that are set up by the receiver administrator.
+      Check the file `bookmarks.json` for examples!
+    - Clientside bookmarks which every user can store for themselves. They are
+      stored in the browser's localStorage.
+  * Automatic reporting of spots to [pskreporter](https://pskreporter.info/) is
+    now possible. Please have a look at the configuration on how to set it up.
+  * Websocket communication has been overhauled in large parts. It should now
+    be more reliable, and failing connections should now have no impact on
+    other users.
+  * Profile scheduling allows to set up band-hopping if you are running
+    background services.
+  * APRS now has the ability to show symbols on the map, if a corresponding
+    symbol set has been installed. Check the config!
+  * Debug logging has been disabled in a handful of modules, expect vastly
+    reduced output on the shell.
   * New set of APRS-related features
-    - Decode Packet transmissions using [direwolf](https://github.com/wb2osz/direwolf) (1k2 only for now)
-    - APRS packets are mostly decoded and shown both in a new panel and on the map
+    - Decode Packet transmissions using direwolf (1k2 only for now)
+    - APRS packets are mostly decoded and shown both in a new panel and on the
+      map
     - APRS is also available as a background service
-    - direwolfs I-gate functionality can be enabled, which allows your receiver to work as a receive-only I-gate for the
-      APRS network in the background
-  * Demodulation for background services has been optimized to use less total bandwidth, saving CPU
-  * More metrics have been added; they can be used together with collectd and its curl_json plugin for now, with some
-    limitations.
-  * New bandplan feature, the first thing visible is the "dial" indicator that brings you right to the
-    dial frequency for digital modes
+    - direwolfs I-gate functionality can be enabled, which allows your receiver
+      to work as a receive-only I-gate for the APRS network in the background
+  * Demodulation for background services has been optimized to use less total
+    bandwidth, saving CPU
+  * More metrics have been added; they can be used together with collectd and
+    its curl_json plugin for now, with some limitations.
+  * New bandplan feature, the first thing visible is the "dial" indicator that
+    brings you right to the dial frequency for digital modes
   * fixed some bugs in the websocket communication which broke the map
   * WSJT-X integration (FT8, FT4, WSPR, JT65, JT9 using wsjt-x demodulators)
-  * New Map Feature that shows both decoded grid squares from FT8 and Locations decoded from YSF digital voice
+  * New Map Feature that shows both decoded grid squares from FT8 and Locations
+    decoded from YSF digital voice
   * New Feature report that will show what functionality is available
   * major rework on the openwebrx core
   * Support of multiple SDR devices simultaneously
-  * Support for multiple profiles per SDR that allow the user to listen to different frequencies
+  * Support for multiple profiles per SDR that allow the user to listen to
+    different frequencies
   * Support for digital voice decoding
-  * Feature detection that will disable functionality when dependencies are not available (if you're missing the digital
+  * Feature detection that will disable functionality when dependencies are not
+    available (if you're missing the digital
     buttons, this is probably why)
   * Support added for the following SDR sources:
     - LimeSDR (`"type": "lime_sdr"`)
     - PlutoSDR (`"type": "pluto_sdr"`)
-    - RTL_SDR via Soapy (`"type": "rtl_sdr_soapy"`) on special request to allow use of the direct sampling mode
+    - RTL_SDR via Soapy (`"type": "rtl_sdr_soapy"`) on special request to allow
+      use of the direct sampling mode
     - SoapyRemote (`"type": "soapy_remote"`)
     - FiFiSDR (`"type": "fifi_sdr"`)
     - airspyhf devices (Airspy HF+ / Discovery) (`"type": "airspyhf"`)

From 52e517dfc3b21349be775ba95fa68ea0b8072416 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 18 Feb 2020 21:52:52 +0100
Subject: [PATCH 046/475] make tags overridable from the outside

---
 build.sh | 2 +-
 push.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index cccb5df..208d49a 100755
--- a/build.sh
+++ b/build.sh
@@ -3,7 +3,7 @@ set -euxo pipefail
 
 ARCH=$(uname -m)
 
-TAG="latest"
+TAG=${TAG:-"latest"}
 ARCHTAG="$TAG-$ARCH"
 
 docker build --pull -t openwebrx-base:$ARCHTAG -f docker/Dockerfiles/Dockerfile-base .
diff --git a/push.sh b/push.sh
index c6147e0..fdc31c8 100755
--- a/push.sh
+++ b/push.sh
@@ -4,7 +4,7 @@ set -euxo pipefail
 ARCH=$(uname -m)
 
 ALL_ARCHS="x86_64 armv7l aarch64"
-TAG="latest"
+TAG=${TAG:-"latest"}
 ARCHTAG="$TAG-$ARCH"
 
 IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-full openwebrx"

From dbb7c0cde381cfa8023b12b4ef30577dea22ea8e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 18 Feb 2020 22:26:44 +0100
Subject: [PATCH 047/475] remove the "under construction" banner

---
 htdocs/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 3fabf73..18b60d1 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -52,10 +52,6 @@
     </div>
     <div id="openwebrx-panels-container">
         <div id="openwebrx-panels-container-left">
-            <div class="openwebrx-panel" data-panel-name="client-under-devel" style="width: 245px; background-color: Red;">
-                <span style="font-size: 15pt; font-weight: bold;">Under construction</span>
-                <br />We're working on the code right now, so the application might fail.
-            </div>
             <div class="openwebrx-panel" id="openwebrx-panel-digimodes" style="display: none; width: 619px;" data-panel-name="digimodes">
                 <div id="openwebrx-digimode-canvas-container">
                     <div id="openwebrx-digimode-select-channel"></div>

From 9bc161c1404cecabe9191bd5d7373ca2b21be0e0 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 18 Feb 2020 22:47:51 +0100
Subject: [PATCH 048/475] split the manifest step into a separate skript

---
 build.sh    |  6 +-----
 docker/env  |  5 +++++
 manifest.sh | 15 +++++++++++++++
 push.sh     | 23 ++---------------------
 4 files changed, 23 insertions(+), 26 deletions(-)
 create mode 100644 docker/env
 create mode 100755 manifest.sh

diff --git a/build.sh b/build.sh
index 208d49a..cbeff6f 100755
--- a/build.sh
+++ b/build.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 set -euxo pipefail
-
-ARCH=$(uname -m)
-
-TAG=${TAG:-"latest"}
-ARCHTAG="$TAG-$ARCH"
+. docker/env
 
 docker build --pull -t openwebrx-base:$ARCHTAG -f docker/Dockerfiles/Dockerfile-base .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-rtlsdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-rtlsdr .
diff --git a/docker/env b/docker/env
new file mode 100644
index 0000000..af1b7f6
--- /dev/null
+++ b/docker/env
@@ -0,0 +1,5 @@
+ARCH=$(uname -m)
+IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-full openwebrx"
+ALL_ARCHS="x86_64 armv7l aarch64"
+TAG=${TAG:-"latest"}
+ARCHTAG="$TAG-$ARCH"
diff --git a/manifest.sh b/manifest.sh
new file mode 100755
index 0000000..5d5160b
--- /dev/null
+++ b/manifest.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -euxo pipefail
+. docker/env
+
+for image in ${IMAGES}; do
+  # there's no docker manifest rm command, and the create --amend does not work, so we have to clean up manually
+  rm -rf "${HOME}/.docker/manifests/docker.io_jketterl_${image}-${TAG}"
+  IMAGE_LIST=""
+  for a in $ALL_ARCHS; do
+    IMAGE_LIST="$IMAGE_LIST jketterl/$image:$TAG-$a"
+  done
+  docker manifest create jketterl/$image:$TAG $IMAGE_LIST
+  docker manifest push --purge jketterl/$image:$TAG
+  docker pull jketterl/$image:$TAG
+done
diff --git a/push.sh b/push.sh
index fdc31c8..bca5cca 100755
--- a/push.sh
+++ b/push.sh
@@ -1,26 +1,7 @@
 #!/bin/bash
 set -euxo pipefail
-
-ARCH=$(uname -m)
-
-ALL_ARCHS="x86_64 armv7l aarch64"
-TAG=${TAG:-"latest"}
-ARCHTAG="$TAG-$ARCH"
-
-IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-full openwebrx"
+. docker/env
 
 for image in ${IMAGES}; do
   docker push jketterl/$image:$ARCHTAG
-done
-
-for image in ${IMAGES}; do
-  # there's no docker manifest rm command, and the create --amend does not work, so we have to clean up manually
-  rm -rf "${HOME}/.docker/manifests/docker.io_jketterl_${image}-${TAG}"
-  IMAGE_LIST=""
-  for a in $ALL_ARCHS; do
-    IMAGE_LIST="$IMAGE_LIST jketterl/$image:$TAG-$a"
-  done
-  docker manifest create jketterl/$image:$TAG $IMAGE_LIST
-  docker manifest push --purge jketterl/$image:$TAG
-  docker pull jketterl/$image:$TAG
-done
+done
\ No newline at end of file

From 5f388fd38dc29c6ad605cfd5036d52776c3fa344 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 19 Feb 2020 20:06:27 +0100
Subject: [PATCH 049/475] add dependency to soapysdr-tool to make SoapySDRUtil
 available

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 1cdf780..cb02c37 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,6 @@ Build-Depends: debhelper (>= 10), dh-python, python3 (>= 3.5)
 Package: openwebrx
 Architecture: all
 Depends: adduser, python3 (>= 3.5), python3-pkg-resources, csdr (>= 0.14), netcat, owrx-connector (>= 0.1), ${python3:Depends}, ${misc:Depends}
-Recommends: digiham (>= 0.3), dsd (>= 1.7), sox, direwolf (>= 1.4), wsjtx
+Recommends: digiham (>= 0.3), dsd (>= 1.7), sox, direwolf (>= 1.4), wsjtx, soapysdr-tools
 Description: multi-user web sdr
  Open source, multi-user SDR receiver with a web interface
\ No newline at end of file

From c3b13b224c3e8af59e6e610a5e931335f0c7b40f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 20 Feb 2020 21:58:08 +0100
Subject: [PATCH 050/475] add back under construction panel

---
 htdocs/index.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/index.html b/htdocs/index.html
index 18b60d1..3fabf73 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -52,6 +52,10 @@
     </div>
     <div id="openwebrx-panels-container">
         <div id="openwebrx-panels-container-left">
+            <div class="openwebrx-panel" data-panel-name="client-under-devel" style="width: 245px; background-color: Red;">
+                <span style="font-size: 15pt; font-weight: bold;">Under construction</span>
+                <br />We're working on the code right now, so the application might fail.
+            </div>
             <div class="openwebrx-panel" id="openwebrx-panel-digimodes" style="display: none; width: 619px;" data-panel-name="digimodes">
                 <div id="openwebrx-digimode-canvas-container">
                     <div id="openwebrx-digimode-select-channel"></div>

From 4e98bbc1c98d3e0072e0a02ca896f49c3087b74d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 20 Feb 2020 22:01:21 +0100
Subject: [PATCH 051/475] continue development as version 0.19

---
 debian/changelog | 4 ++++
 owrx/version.py  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 3ec0626..ab77981 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,7 @@
+openwebrx (0.19.0) UNRELEASE; urgency=low
+
+ -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
+
 openwebrx (0.18.0) buster; urgency=low
 
   * Compression, resampling and filtering in the frontend have been rewritten
diff --git a/owrx/version.py b/owrx/version.py
index a040f27..285f9f2 100644
--- a/owrx/version.py
+++ b/owrx/version.py
@@ -1,5 +1,5 @@
 from distutils.version import StrictVersion
 
-_versionstring = "0.18.0"
+_versionstring = "0.19.0"
 strictversion = StrictVersion(_versionstring)
 openwebrx_version = "v{0}".format(strictversion)

From 36e94d4e3c5099f4520835154751eb61921c5528 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 20 Feb 2020 22:30:56 +0100
Subject: [PATCH 052/475] fix typo

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index ab77981..fdd831c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openwebrx (0.19.0) UNRELEASE; urgency=low
+openwebrx (0.19.0) UNRELEASED; urgency=low
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From b110705f459bbf626e114def28749db2b2bdad1f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 21 Feb 2020 22:37:10 +0100
Subject: [PATCH 053/475] fix this in develop, at least

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78ea99b..aeb0549 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-**unreleased**
+**0.18.0**
 - Support for SoapyRemote
 
 **2020-02-08**

From 451eb99f8a2c811a4f021b68d45f14f1144d2deb Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Feb 2020 17:22:13 +0100
Subject: [PATCH 054/475] split the controllers into separate files

---
 owrx/controllers.py           | 210 ----------------------------------
 owrx/controllers/__init__.py  |  25 ++++
 owrx/controllers/api.py       |   9 ++
 owrx/controllers/assets.py    |  64 +++++++++++
 owrx/controllers/metrics.py   |   9 ++
 owrx/controllers/status.py    |  62 ++++++++++
 owrx/controllers/template.py  |  40 +++++++
 owrx/controllers/websocket.py |  10 ++
 owrx/http.py                  |  24 ++--
 setup.py                      |   2 +-
 10 files changed, 234 insertions(+), 221 deletions(-)
 delete mode 100644 owrx/controllers.py
 create mode 100644 owrx/controllers/__init__.py
 create mode 100644 owrx/controllers/api.py
 create mode 100644 owrx/controllers/assets.py
 create mode 100644 owrx/controllers/metrics.py
 create mode 100644 owrx/controllers/status.py
 create mode 100644 owrx/controllers/template.py
 create mode 100644 owrx/controllers/websocket.py

diff --git a/owrx/controllers.py b/owrx/controllers.py
deleted file mode 100644
index e3aa664..0000000
--- a/owrx/controllers.py
+++ /dev/null
@@ -1,210 +0,0 @@
-import os
-import mimetypes
-import json
-import pkg_resources
-from datetime import datetime
-from string import Template
-from owrx.websocket import WebSocketConnection
-from owrx.config import PropertyManager
-from owrx.client import ClientRegistry
-from owrx.connection import WebSocketMessageHandler
-from owrx.version import openwebrx_version
-from owrx.feature import FeatureDetector
-from owrx.metrics import Metrics
-from owrx.sdr import SdrService
-from abc import ABC, abstractmethod
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class Controller(ABC):
-    def __init__(self, handler, request):
-        self.handler = handler
-        self.request = request
-
-    def send_response(self, content, code=200, content_type="text/html", last_modified: datetime = None, max_age=None):
-        self.handler.send_response(code)
-        if content_type is not None:
-            self.handler.send_header("Content-Type", content_type)
-        if last_modified is not None:
-            self.handler.send_header("Last-Modified", last_modified.strftime("%a, %d %b %Y %H:%M:%S GMT"))
-        if max_age is not None:
-            self.handler.send_header("Cache-Control", "max-age: {0}".format(max_age))
-        self.handler.end_headers()
-        if type(content) == str:
-            content = content.encode()
-        self.handler.wfile.write(content)
-
-    @abstractmethod
-    def handle_request(self):
-        pass
-
-
-class StatusController(Controller):
-    def handle_request(self):
-        pm = PropertyManager.getSharedInstance()
-        # TODO keys that have been left out since they are no longer simple strings: sdr_hw, bands, antenna
-        vars = {
-            "status": "active",
-            "name": pm["receiver_name"],
-            "op_email": pm["receiver_admin"],
-            "users": ClientRegistry.getSharedInstance().clientCount(),
-            "users_max": pm["max_clients"],
-            "gps": pm["receiver_gps"],
-            "asl": pm["receiver_asl"],
-            "loc": pm["receiver_location"],
-            "sw_version": openwebrx_version,
-            "avatar_ctime": os.path.getctime("htdocs/gfx/openwebrx-avatar.png"),
-        }
-        self.send_response("\n".join(["{key}={value}".format(key=key, value=value) for key, value in vars.items()]))
-
-
-class StatusJsonController(Controller):
-    def getProfileStats(self, profile):
-        return {
-            "name": profile["name"],
-            "center_freq": profile["center_freq"],
-            "sample_rate": profile["samp_rate"],
-        }
-
-    def getReceiverStats(self, receiver):
-        stats = {
-            "name": receiver.getName(),
-            # TODO would be better to have types from the config here
-            "type": type(receiver).__name__,
-            "profiles": [self.getProfileStats(p) for p in receiver.getProfiles().values()]
-        }
-        return stats
-
-    def handle_request(self):
-        pm = PropertyManager.getSharedInstance()
-
-        gps = pm["receiver_gps"]
-        status = {
-            "receiver": {
-                "name": pm["receiver_name"],
-                "admin": pm["receiver_admin"],
-                "gps": {"lat": gps[0], "lon": gps[1]},
-                "asl": pm["receiver_asl"],
-                "location": pm["receiver_location"],
-            },
-            "max_clients": pm["max_clients"],
-            "version": openwebrx_version,
-            "sdrs": [self.getReceiverStats(r) for r in SdrService.getSources().values()]
-        }
-        self.send_response(json.dumps(status), content_type="application/json")
-
-
-class AssetsController(Controller):
-    def getModified(self, file):
-        return None
-
-    def openFile(self, file):
-        pass
-
-    def serve_file(self, file, content_type=None):
-        try:
-            modified = self.getModified(file)
-
-            if modified is not None and "If-Modified-Since" in self.handler.headers:
-                client_modified = datetime.strptime(
-                    self.handler.headers["If-Modified-Since"], "%a, %d %b %Y %H:%M:%S %Z"
-                )
-                if modified <= client_modified:
-                    self.send_response("", code=304)
-                    return
-
-            f = self.openFile(file)
-            data = f.read()
-            f.close()
-
-            if content_type is None:
-                (content_type, encoding) = mimetypes.MimeTypes().guess_type(file)
-            self.send_response(data, content_type=content_type, last_modified=modified, max_age=3600)
-        except FileNotFoundError:
-            self.send_response("file not found", code=404)
-
-    def handle_request(self):
-        filename = self.request.matches.group(1)
-        self.serve_file(filename)
-
-
-class OwrxAssetsController(AssetsController):
-    def openFile(self, file):
-        return pkg_resources.resource_stream("htdocs", file)
-
-
-class AprsSymbolsController(AssetsController):
-    def __init__(self, handler, request):
-        pm = PropertyManager.getSharedInstance()
-        path = pm["aprs_symbols_path"]
-        if not path.endswith("/"):
-            path += "/"
-        self.path = path
-        super().__init__(handler, request)
-
-    def getFilePath(self, file):
-        return self.path + file
-
-    def getModified(self, file):
-        return datetime.fromtimestamp(os.path.getmtime(self.getFilePath(file)))
-
-    def openFile(self, file):
-        return open(self.getFilePath(file), "rb")
-
-
-class TemplateController(Controller):
-    def render_template(self, file, **vars):
-        file_content = pkg_resources.resource_string("htdocs", file).decode("utf-8")
-        template = Template(file_content)
-
-        return template.safe_substitute(**vars)
-
-    def serve_template(self, file, **vars):
-        self.send_response(self.render_template(file, **vars), content_type="text/html")
-
-    def default_variables(self):
-        return {}
-
-
-class WebpageController(TemplateController):
-    def template_variables(self):
-        header = self.render_template("include/header.include.html")
-        return {"header": header}
-
-
-class IndexController(WebpageController):
-    def handle_request(self):
-        self.serve_template("index.html", **self.template_variables())
-
-
-class MapController(WebpageController):
-    def handle_request(self):
-        # TODO check if we have a google maps api key first?
-        self.serve_template("map.html", **self.template_variables())
-
-
-class FeatureController(WebpageController):
-    def handle_request(self):
-        self.serve_template("features.html", **self.template_variables())
-
-
-class ApiController(Controller):
-    def handle_request(self):
-        data = json.dumps(FeatureDetector().feature_report())
-        self.send_response(data, content_type="application/json")
-
-
-class MetricsController(Controller):
-    def handle_request(self):
-        data = json.dumps(Metrics.getSharedInstance().getMetrics())
-        self.send_response(data, content_type="application/json")
-
-
-class WebSocketController(Controller):
-    def handle_request(self):
-        conn = WebSocketConnection(self.handler, WebSocketMessageHandler())
-        # enter read loop
-        conn.handle()
diff --git a/owrx/controllers/__init__.py b/owrx/controllers/__init__.py
new file mode 100644
index 0000000..04f7954
--- /dev/null
+++ b/owrx/controllers/__init__.py
@@ -0,0 +1,25 @@
+from abc import ABC, abstractmethod
+from datetime import datetime
+
+
+class Controller(ABC):
+    def __init__(self, handler, request):
+        self.handler = handler
+        self.request = request
+
+    def send_response(self, content, code=200, content_type="text/html", last_modified: datetime = None, max_age=None):
+        self.handler.send_response(code)
+        if content_type is not None:
+            self.handler.send_header("Content-Type", content_type)
+        if last_modified is not None:
+            self.handler.send_header("Last-Modified", last_modified.strftime("%a, %d %b %Y %H:%M:%S GMT"))
+        if max_age is not None:
+            self.handler.send_header("Cache-Control", "max-age: {0}".format(max_age))
+        self.handler.end_headers()
+        if type(content) == str:
+            content = content.encode()
+        self.handler.wfile.write(content)
+
+    @abstractmethod
+    def handle_request(self):
+        pass
diff --git a/owrx/controllers/api.py b/owrx/controllers/api.py
new file mode 100644
index 0000000..122363a
--- /dev/null
+++ b/owrx/controllers/api.py
@@ -0,0 +1,9 @@
+from . import Controller
+from owrx.feature import FeatureDetector
+import json
+
+
+class ApiController(Controller):
+    def handle_request(self):
+        data = json.dumps(FeatureDetector().feature_report())
+        self.send_response(data, content_type="application/json")
diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
new file mode 100644
index 0000000..a3b093d
--- /dev/null
+++ b/owrx/controllers/assets.py
@@ -0,0 +1,64 @@
+from . import Controller
+from owrx.config import PropertyManager
+from datetime import datetime
+import mimetypes
+import os
+import pkg_resources
+
+
+class AssetsController(Controller):
+    def getModified(self, file):
+        return None
+
+    def openFile(self, file):
+        pass
+
+    def serve_file(self, file, content_type=None):
+        try:
+            modified = self.getModified(file)
+
+            if modified is not None and "If-Modified-Since" in self.handler.headers:
+                client_modified = datetime.strptime(
+                    self.handler.headers["If-Modified-Since"], "%a, %d %b %Y %H:%M:%S %Z"
+                )
+                if modified <= client_modified:
+                    self.send_response("", code=304)
+                    return
+
+            f = self.openFile(file)
+            data = f.read()
+            f.close()
+
+            if content_type is None:
+                (content_type, encoding) = mimetypes.MimeTypes().guess_type(file)
+            self.send_response(data, content_type=content_type, last_modified=modified, max_age=3600)
+        except FileNotFoundError:
+            self.send_response("file not found", code=404)
+
+    def handle_request(self):
+        filename = self.request.matches.group(1)
+        self.serve_file(filename)
+
+
+class OwrxAssetsController(AssetsController):
+    def openFile(self, file):
+        return pkg_resources.resource_stream("htdocs", file)
+
+
+class AprsSymbolsController(AssetsController):
+    def __init__(self, handler, request):
+        pm = PropertyManager.getSharedInstance()
+        path = pm["aprs_symbols_path"]
+        if not path.endswith("/"):
+            path += "/"
+        self.path = path
+        super().__init__(handler, request)
+
+    def getFilePath(self, file):
+        return self.path + file
+
+    def getModified(self, file):
+        return datetime.fromtimestamp(os.path.getmtime(self.getFilePath(file)))
+
+    def openFile(self, file):
+        return open(self.getFilePath(file), "rb")
diff --git a/owrx/controllers/metrics.py b/owrx/controllers/metrics.py
new file mode 100644
index 0000000..33f05b1
--- /dev/null
+++ b/owrx/controllers/metrics.py
@@ -0,0 +1,9 @@
+from . import Controller
+from owrx.metrics import Metrics
+import json
+
+
+class MetricsController(Controller):
+    def handle_request(self):
+        data = json.dumps(Metrics.getSharedInstance().getMetrics())
+        self.send_response(data, content_type="application/json")
diff --git a/owrx/controllers/status.py b/owrx/controllers/status.py
new file mode 100644
index 0000000..3b7f9ac
--- /dev/null
+++ b/owrx/controllers/status.py
@@ -0,0 +1,62 @@
+from . import Controller
+from owrx.client import ClientRegistry
+from owrx.version import openwebrx_version
+from owrx.sdr import SdrService
+from owrx.config import PropertyManager
+import os
+import json
+
+
+class StatusController(Controller):
+    def handle_request(self):
+        pm = PropertyManager.getSharedInstance()
+        # TODO keys that have been left out since they are no longer simple strings: sdr_hw, bands, antenna
+        vars = {
+            "status": "active",
+            "name": pm["receiver_name"],
+            "op_email": pm["receiver_admin"],
+            "users": ClientRegistry.getSharedInstance().clientCount(),
+            "users_max": pm["max_clients"],
+            "gps": pm["receiver_gps"],
+            "asl": pm["receiver_asl"],
+            "loc": pm["receiver_location"],
+            "sw_version": openwebrx_version,
+            "avatar_ctime": os.path.getctime("htdocs/gfx/openwebrx-avatar.png"),
+        }
+        self.send_response("\n".join(["{key}={value}".format(key=key, value=value) for key, value in vars.items()]))
+
+
+class StatusJsonController(Controller):
+    def getProfileStats(self, profile):
+        return {
+            "name": profile["name"],
+            "center_freq": profile["center_freq"],
+            "sample_rate": profile["samp_rate"],
+        }
+
+    def getReceiverStats(self, receiver):
+        stats = {
+            "name": receiver.getName(),
+            # TODO would be better to have types from the config here
+            "type": type(receiver).__name__,
+            "profiles": [self.getProfileStats(p) for p in receiver.getProfiles().values()]
+        }
+        return stats
+
+    def handle_request(self):
+        pm = PropertyManager.getSharedInstance()
+
+        gps = pm["receiver_gps"]
+        status = {
+            "receiver": {
+                "name": pm["receiver_name"],
+                "admin": pm["receiver_admin"],
+                "gps": {"lat": gps[0], "lon": gps[1]},
+                "asl": pm["receiver_asl"],
+                "location": pm["receiver_location"],
+            },
+            "max_clients": pm["max_clients"],
+            "version": openwebrx_version,
+            "sdrs": [self.getReceiverStats(r) for r in SdrService.getSources().values()]
+        }
+        self.send_response(json.dumps(status), content_type="application/json")
diff --git a/owrx/controllers/template.py b/owrx/controllers/template.py
new file mode 100644
index 0000000..cbcf116
--- /dev/null
+++ b/owrx/controllers/template.py
@@ -0,0 +1,40 @@
+from . import Controller
+import pkg_resources
+from string import Template
+from abc import ABCMeta
+
+
+class TemplateController(Controller, metaclass=ABCMeta):
+    def render_template(self, file, **vars):
+        file_content = pkg_resources.resource_string("htdocs", file).decode("utf-8")
+        template = Template(file_content)
+
+        return template.safe_substitute(**vars)
+
+    def serve_template(self, file, **vars):
+        self.send_response(self.render_template(file, **vars), content_type="text/html")
+
+    def default_variables(self):
+        return {}
+
+
+class WebpageController(TemplateController, metaclass=ABCMeta):
+    def template_variables(self):
+        header = self.render_template("include/header.include.html")
+        return {"header": header}
+
+
+class IndexController(WebpageController):
+    def handle_request(self):
+        self.serve_template("index.html", **self.template_variables())
+
+
+class MapController(WebpageController):
+    def handle_request(self):
+        # TODO check if we have a google maps api key first?
+        self.serve_template("map.html", **self.template_variables())
+
+
+class FeatureController(WebpageController):
+    def handle_request(self):
+        self.serve_template("features.html", **self.template_variables())
diff --git a/owrx/controllers/websocket.py b/owrx/controllers/websocket.py
new file mode 100644
index 0000000..2886b54
--- /dev/null
+++ b/owrx/controllers/websocket.py
@@ -0,0 +1,10 @@
+from . import Controller
+from owrx.websocket import WebSocketConnection
+from owrx.connection import WebSocketMessageHandler
+
+
+class WebSocketController(Controller):
+    def handle_request(self):
+        conn = WebSocketConnection(self.handler, WebSocketMessageHandler())
+        # enter read loop
+        conn.handle()
diff --git a/owrx/http.py b/owrx/http.py
index 4783a27..94d8521 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -1,15 +1,19 @@
-from owrx.controllers import (
-    StatusController,
+from owrx.controllers.status import (
     StatusJsonController,
-    IndexController,
-    OwrxAssetsController,
-    WebSocketController,
-    MapController,
-    FeatureController,
-    ApiController,
-    MetricsController,
-    AprsSymbolsController,
+    StatusController
 )
+from owrx.controllers.template import (
+    IndexController,
+    MapController,
+    FeatureController
+)
+from owrx.controllers.assets import (
+    OwrxAssetsController,
+    AprsSymbolsController
+)
+from owrx.controllers.websocket import WebSocketController
+from owrx.controllers.api import ApiController
+from owrx.controllers.metrics import MetricsController
 from http.server import BaseHTTPRequestHandler
 from urllib.parse import urlparse, parse_qs
 import re
diff --git a/setup.py b/setup.py
index dd4fe70..c32d972 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ except ImportError:
 setup(
     name="OpenWebRX",
     version=str(strictversion),
-    packages=find_namespace_packages(include=["owrx", "owrx.source", "owrx.service", "csdr", "htdocs"]),
+    packages=find_namespace_packages(include=["owrx", "owrx.source", "owrx.service", "owrx.controllers", "csdr", "htdocs"]),
     package_data={"htdocs": [f[len("htdocs/") :] for f in glob("htdocs/**/*", recursive=True)]},
     entry_points={"console_scripts": ["openwebrx=owrx.__main__:main"]},
     # use the github page for now

From 42191f4e77fde99862e1ca7afac842713266e963 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Feb 2020 17:53:02 +0100
Subject: [PATCH 055/475] rewrite routing logic

---
 owrx/http.py | 95 ++++++++++++++++++++++++++++++++++------------------
 1 file changed, 62 insertions(+), 33 deletions(-)

diff --git a/owrx/http.py b/owrx/http.py
index 94d8521..d06baca 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -17,6 +17,7 @@ from owrx.controllers.metrics import MetricsController
 from http.server import BaseHTTPRequestHandler
 from urllib.parse import urlparse, parse_qs
 import re
+from abc import ABC, abstractmethod
 
 import logging
 
@@ -37,46 +38,74 @@ class RequestHandler(BaseHTTPRequestHandler):
 
 
 class Request(object):
-    def __init__(self, query=None, matches=None):
-        self.query = query
+    def __init__(self, url):
+        self.path = url.path
+        self.query = parse_qs(url.query)
+        self.matches = None
+
+    def setMatches(self, matches):
         self.matches = matches
 
 
-class Router(object):
-    mappings = [
-        {"route": "/", "controller": IndexController},
-        {"route": "/status", "controller": StatusController},
-        {"route": "/status.json", "controller": StatusJsonController},
-        {"regex": "/static/(.+)", "controller": OwrxAssetsController},
-        {"regex": "/aprs-symbols/(.+)", "controller": AprsSymbolsController},
-        {"route": "/ws/", "controller": WebSocketController},
-        {"regex": "(/favicon.ico)", "controller": OwrxAssetsController},
-        # backwards compatibility for the sdr.hu portal
-        {"regex": "/(gfx/openwebrx-avatar.png)", "controller": OwrxAssetsController},
-        {"route": "/map", "controller": MapController},
-        {"route": "/features", "controller": FeatureController},
-        {"route": "/api/features", "controller": ApiController},
-        {"route": "/metrics", "controller": MetricsController},
-    ]
+class Route(ABC):
+    def __init__(self, controller):
+        self.controller = controller
 
-    def find_controller(self, path):
-        for m in Router.mappings:
-            if "route" in m:
-                if m["route"] == path:
-                    return (m["controller"], None)
-            if "regex" in m:
-                regex = re.compile(m["regex"])
-                matches = regex.match(path)
-                if matches:
-                    return (m["controller"], matches)
+    @abstractmethod
+    def matches(self, request):
+        pass
+
+
+class StaticRoute(Route):
+    def __init__(self, route, controller):
+        self.route = route
+        super().__init__(controller)
+
+    def matches(self, request):
+        return request.path == self.route
+
+
+class RegexRoute(Route):
+    def __init__(self, regex, controller):
+        self.regex = re.compile(regex)
+        super().__init__(controller)
+
+    def matches(self, request):
+        matches = self.regex.match(request.path)
+        # this is probably not the cleanest way to do it...
+        request.setMatches(matches)
+        return matches is not None
+
+
+class Router(object):
+    def __init__(self):
+        self.routes = [
+            StaticRoute("/", IndexController),
+            StaticRoute("/status", StatusController),
+            StaticRoute("/status.json", StatusJsonController),
+            RegexRoute("/static/(.+)", OwrxAssetsController),
+            RegexRoute("/aprs-symbols/(.+)", AprsSymbolsController),
+            StaticRoute("/ws/", WebSocketController),
+            RegexRoute("(/favicon.ico)", OwrxAssetsController),
+            # backwards compatibility for the sdr.hu portal
+            RegexRoute("(/gfx/openwebrx-avatar.png)", OwrxAssetsController),
+            StaticRoute("/map", MapController),
+            StaticRoute("/features", FeatureController),
+            StaticRoute("/api/features", ApiController),
+            StaticRoute("/metrics", MetricsController),
+        ]
+
+    def find_route(self, request):
+        for r in self.routes:
+            if r.matches(request):
+                return r
 
     def route(self, handler):
         url = urlparse(handler.path)
-        res = self.find_controller(url.path)
-        if res is not None:
-            (controller, matches) = res
-            query = parse_qs(url.query)
-            request = Request(query, matches)
+        request = Request(url)
+        route = self.find_route(request)
+        if route is not None:
+            controller = route.controller
             controller(handler, request).handle_request()
         else:
             handler.send_error(404, "Not Found", "The page you requested could not be found.")

From aa9737498aecbc7cd392d1e35e7062e405c2c7e8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Feb 2020 18:32:37 +0100
Subject: [PATCH 056/475] add controller options to allow multiple routes per
 controller

---
 owrx/controllers/__init__.py  |  9 ++++++---
 owrx/controllers/api.py       |  2 +-
 owrx/controllers/assets.py    |  2 +-
 owrx/controllers/metrics.py   |  2 +-
 owrx/controllers/status.py    |  6 ++----
 owrx/controllers/template.py  |  6 +++---
 owrx/controllers/websocket.py |  2 +-
 owrx/http.py                  | 20 +++++++++-----------
 8 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/owrx/controllers/__init__.py b/owrx/controllers/__init__.py
index 04f7954..ff687ed 100644
--- a/owrx/controllers/__init__.py
+++ b/owrx/controllers/__init__.py
@@ -3,9 +3,10 @@ from datetime import datetime
 
 
 class Controller(ABC):
-    def __init__(self, handler, request):
+    def __init__(self, handler, request, options):
         self.handler = handler
         self.request = request
+        self.options = options
 
     def send_response(self, content, code=200, content_type="text/html", last_modified: datetime = None, max_age=None):
         self.handler.send_response(code)
@@ -20,6 +21,8 @@ class Controller(ABC):
             content = content.encode()
         self.handler.wfile.write(content)
 
-    @abstractmethod
     def handle_request(self):
-        pass
+        action = "indexAction"
+        if "action" in self.options:
+            action = self.options["action"]
+        getattr(self, action)()
diff --git a/owrx/controllers/api.py b/owrx/controllers/api.py
index 122363a..4e7a966 100644
--- a/owrx/controllers/api.py
+++ b/owrx/controllers/api.py
@@ -4,6 +4,6 @@ import json
 
 
 class ApiController(Controller):
-    def handle_request(self):
+    def indexAction(self):
         data = json.dumps(FeatureDetector().feature_report())
         self.send_response(data, content_type="application/json")
diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index a3b093d..4c55e17 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -35,7 +35,7 @@ class AssetsController(Controller):
         except FileNotFoundError:
             self.send_response("file not found", code=404)
 
-    def handle_request(self):
+    def indexAction(self):
         filename = self.request.matches.group(1)
         self.serve_file(filename)
 
diff --git a/owrx/controllers/metrics.py b/owrx/controllers/metrics.py
index 33f05b1..e817e9b 100644
--- a/owrx/controllers/metrics.py
+++ b/owrx/controllers/metrics.py
@@ -4,6 +4,6 @@ import json
 
 
 class MetricsController(Controller):
-    def handle_request(self):
+    def indexAction(self):
         data = json.dumps(Metrics.getSharedInstance().getMetrics())
         self.send_response(data, content_type="application/json")
diff --git a/owrx/controllers/status.py b/owrx/controllers/status.py
index 3b7f9ac..bb513ee 100644
--- a/owrx/controllers/status.py
+++ b/owrx/controllers/status.py
@@ -8,7 +8,7 @@ import json
 
 
 class StatusController(Controller):
-    def handle_request(self):
+    def indexAction(self):
         pm = PropertyManager.getSharedInstance()
         # TODO keys that have been left out since they are no longer simple strings: sdr_hw, bands, antenna
         vars = {
@@ -25,8 +25,6 @@ class StatusController(Controller):
         }
         self.send_response("\n".join(["{key}={value}".format(key=key, value=value) for key, value in vars.items()]))
 
-
-class StatusJsonController(Controller):
     def getProfileStats(self, profile):
         return {
             "name": profile["name"],
@@ -43,7 +41,7 @@ class StatusJsonController(Controller):
         }
         return stats
 
-    def handle_request(self):
+    def jsonAction(self):
         pm = PropertyManager.getSharedInstance()
 
         gps = pm["receiver_gps"]
diff --git a/owrx/controllers/template.py b/owrx/controllers/template.py
index cbcf116..3938719 100644
--- a/owrx/controllers/template.py
+++ b/owrx/controllers/template.py
@@ -25,16 +25,16 @@ class WebpageController(TemplateController, metaclass=ABCMeta):
 
 
 class IndexController(WebpageController):
-    def handle_request(self):
+    def indexAction(self):
         self.serve_template("index.html", **self.template_variables())
 
 
 class MapController(WebpageController):
-    def handle_request(self):
+    def indexAction(self):
         # TODO check if we have a google maps api key first?
         self.serve_template("map.html", **self.template_variables())
 
 
 class FeatureController(WebpageController):
-    def handle_request(self):
+    def indexAction(self):
         self.serve_template("features.html", **self.template_variables())
diff --git a/owrx/controllers/websocket.py b/owrx/controllers/websocket.py
index 2886b54..f242f2c 100644
--- a/owrx/controllers/websocket.py
+++ b/owrx/controllers/websocket.py
@@ -4,7 +4,7 @@ from owrx.connection import WebSocketMessageHandler
 
 
 class WebSocketController(Controller):
-    def handle_request(self):
+    def indexAction(self):
         conn = WebSocketConnection(self.handler, WebSocketMessageHandler())
         # enter read loop
         conn.handle()
diff --git a/owrx/http.py b/owrx/http.py
index d06baca..60e4e8d 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -1,7 +1,4 @@
-from owrx.controllers.status import (
-    StatusJsonController,
-    StatusController
-)
+from owrx.controllers.status import StatusController
 from owrx.controllers.template import (
     IndexController,
     MapController,
@@ -48,8 +45,9 @@ class Request(object):
 
 
 class Route(ABC):
-    def __init__(self, controller):
+    def __init__(self, controller, controllerOptions = None):
         self.controller = controller
+        self.controllerOptions = controllerOptions if controllerOptions is not None else {}
 
     @abstractmethod
     def matches(self, request):
@@ -57,18 +55,18 @@ class Route(ABC):
 
 
 class StaticRoute(Route):
-    def __init__(self, route, controller):
+    def __init__(self, route, controller, controllerOptions = None):
         self.route = route
-        super().__init__(controller)
+        super().__init__(controller, controllerOptions)
 
     def matches(self, request):
         return request.path == self.route
 
 
 class RegexRoute(Route):
-    def __init__(self, regex, controller):
+    def __init__(self, regex, controller, controllerOptions = None):
         self.regex = re.compile(regex)
-        super().__init__(controller)
+        super().__init__(controller, controllerOptions)
 
     def matches(self, request):
         matches = self.regex.match(request.path)
@@ -82,7 +80,7 @@ class Router(object):
         self.routes = [
             StaticRoute("/", IndexController),
             StaticRoute("/status", StatusController),
-            StaticRoute("/status.json", StatusJsonController),
+            StaticRoute("/status.json", StatusController, {"action": "jsonAction"}),
             RegexRoute("/static/(.+)", OwrxAssetsController),
             RegexRoute("/aprs-symbols/(.+)", AprsSymbolsController),
             StaticRoute("/ws/", WebSocketController),
@@ -106,6 +104,6 @@ class Router(object):
         route = self.find_route(request)
         if route is not None:
             controller = route.controller
-            controller(handler, request).handle_request()
+            controller(handler, request, route.controllerOptions).handle_request()
         else:
             handler.send_error(404, "Not Found", "The page you requested could not be found.")

From 0a20cb5e41ec1a62755303247d9031cc486a6b37 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Feb 2020 19:23:18 +0100
Subject: [PATCH 057/475] prepare route protection

---
 owrx/controllers/__init__.py |  5 +++++
 owrx/controllers/session.py  |  9 +++++++++
 owrx/controllers/settings.py | 21 +++++++++++++++++++++
 owrx/http.py                 |  5 +++++
 4 files changed, 40 insertions(+)
 create mode 100644 owrx/controllers/session.py
 create mode 100644 owrx/controllers/settings.py

diff --git a/owrx/controllers/__init__.py b/owrx/controllers/__init__.py
index ff687ed..99bfad2 100644
--- a/owrx/controllers/__init__.py
+++ b/owrx/controllers/__init__.py
@@ -21,6 +21,11 @@ class Controller(ABC):
             content = content.encode()
         self.handler.wfile.write(content)
 
+    def send_redirect(self, location, code=303):
+        self.handler.send_response(code)
+        self.handler.send_header("Location", location)
+        self.handler.end_headers()
+
     def handle_request(self):
         action = "indexAction"
         if "action" in self.options:
diff --git a/owrx/controllers/session.py b/owrx/controllers/session.py
new file mode 100644
index 0000000..1cd9ce4
--- /dev/null
+++ b/owrx/controllers/session.py
@@ -0,0 +1,9 @@
+from . import Controller
+
+
+class SessionController(Controller):
+    def loginAction(self):
+        self.send_response("login happening here")
+
+    def logoutAction(self):
+        self.send_redirect("logout happening here")
diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
new file mode 100644
index 0000000..2a8e768
--- /dev/null
+++ b/owrx/controllers/settings.py
@@ -0,0 +1,21 @@
+from . import Controller
+
+
+class Authentication(object):
+    def isAuthenticated(self, request):
+        return False
+
+
+class SettingsController(Controller):
+    def __init__(self, handler, request, options):
+        self.authentication = Authentication()
+        super().__init__(handler, request, options)
+
+    def handle_request(self):
+        if self.authentication.isAuthenticated(self.request):
+            super().handle_request()
+        else:
+            self.send_redirect("/login")
+
+    def indexAction(self):
+        self.send_response("actual content here")
diff --git a/owrx/http.py b/owrx/http.py
index 60e4e8d..a1e26c5 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -11,6 +11,8 @@ from owrx.controllers.assets import (
 from owrx.controllers.websocket import WebSocketController
 from owrx.controllers.api import ApiController
 from owrx.controllers.metrics import MetricsController
+from owrx.controllers.settings import SettingsController
+from owrx.controllers.session import SessionController
 from http.server import BaseHTTPRequestHandler
 from urllib.parse import urlparse, parse_qs
 import re
@@ -91,6 +93,9 @@ class Router(object):
             StaticRoute("/features", FeatureController),
             StaticRoute("/api/features", ApiController),
             StaticRoute("/metrics", MetricsController),
+            StaticRoute("/settings", SettingsController),
+            StaticRoute("/login", SessionController, {"action": "loginAction"}),
+            StaticRoute("/logout", SessionController, {"action": "logoutAction"}),
         ]
 
     def find_route(self, request):

From af053b9ac4b9b45397b106a7842c19e84afdf7c4 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Feb 2020 19:29:17 +0100
Subject: [PATCH 058/475] no more abstract methods

---
 owrx/controllers/__init__.py | 3 +--
 owrx/controllers/template.py | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/owrx/controllers/__init__.py b/owrx/controllers/__init__.py
index 99bfad2..6e0be48 100644
--- a/owrx/controllers/__init__.py
+++ b/owrx/controllers/__init__.py
@@ -1,8 +1,7 @@
-from abc import ABC, abstractmethod
 from datetime import datetime
 
 
-class Controller(ABC):
+class Controller(object):
     def __init__(self, handler, request, options):
         self.handler = handler
         self.request = request
diff --git a/owrx/controllers/template.py b/owrx/controllers/template.py
index 3938719..6746012 100644
--- a/owrx/controllers/template.py
+++ b/owrx/controllers/template.py
@@ -1,10 +1,9 @@
 from . import Controller
 import pkg_resources
 from string import Template
-from abc import ABCMeta
 
 
-class TemplateController(Controller, metaclass=ABCMeta):
+class TemplateController(Controller):
     def render_template(self, file, **vars):
         file_content = pkg_resources.resource_string("htdocs", file).decode("utf-8")
         template = Template(file_content)
@@ -18,7 +17,7 @@ class TemplateController(Controller, metaclass=ABCMeta):
         return {}
 
 
-class WebpageController(TemplateController, metaclass=ABCMeta):
+class WebpageController(TemplateController):
     def template_variables(self):
         header = self.render_template("include/header.include.html")
         return {"header": header}

From cad6175db05fd438adadaff09d28599026fa469a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Feb 2020 20:04:19 +0100
Subject: [PATCH 059/475] login form

---
 htdocs/css/login.css      | 37 +++++++++++++++++++++++++++++++++++++
 htdocs/lib/AudioEngine.js |  2 +-
 htdocs/login.html         | 25 +++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 htdocs/css/login.css
 create mode 100644 htdocs/login.html

diff --git a/htdocs/css/login.css b/htdocs/css/login.css
new file mode 100644
index 0000000..ca80003
--- /dev/null
+++ b/htdocs/css/login.css
@@ -0,0 +1,37 @@
+@import url("openwebrx-header.css");
+@import url("openwebrx-globals.css");
+
+/* expandable photo not implemented on login page */
+#webrx-top-photo-clip {
+    max-height: 67px;
+}
+
+
+body {
+    background-color: #2e2e2e;
+}
+
+.login {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+
+    width: 500px;
+
+    background-color: #ddd;
+    padding: 20px;
+    border-radius: 10px;
+    border: 1px solid #575757;
+}
+
+.login .btn {
+    width: 100%;
+}
+
+.btn-login {
+    color: #FFF;
+    background-color: #2e2e2e;
+    border-color: #2e2e2e;
+    height: 50px;
+}
\ No newline at end of file
diff --git a/htdocs/lib/AudioEngine.js b/htdocs/lib/AudioEngine.js
index 7e67042..b12c3a9 100644
--- a/htdocs/lib/AudioEngine.js
+++ b/htdocs/lib/AudioEngine.js
@@ -1,6 +1,6 @@
 // this controls if the new AudioWorklet API should be used if available.
 // the engine will still fall back to the ScriptProcessorNode if this is set to true but not available in the browser.
-var useAudioWorklets = true;
+var useAudioWorklets = false;
 
 function AudioEngine(maxBufferLength, audioReporter) {
     this.audioReporter = audioReporter;
diff --git a/htdocs/login.html b/htdocs/login.html
new file mode 100644
index 0000000..27f8ad9
--- /dev/null
+++ b/htdocs/login.html
@@ -0,0 +1,25 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <title>OpenWebRX Login</title>
+    <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link rel="stylesheet" type="text/css" href="static/css/login.css" />
+    <meta charset="utf-8">
+</head>
+<body>
+    ${header}
+    <div class="login">
+        <form method="POST">
+            <div class="form-group">
+                <label for="user">Username</label>
+                <input type="text" class="form-control" id="user" placeholder="Username">
+            </div>
+            <div class="form-group">
+                <label for="password">Password</label>
+                <input type="password" class="form-control" id="password" placeholder="Password">
+            </div>
+            <button type="submit" class="btn btn-login">Login</button>
+        </form>
+    </div>
+</body>
\ No newline at end of file

From 437e28c3a905ee469f7c49feb338c611d97f88ed Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Feb 2020 20:13:11 +0100
Subject: [PATCH 060/475] add templating

---
 owrx/controllers/session.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/owrx/controllers/session.py b/owrx/controllers/session.py
index 1cd9ce4..b4cf4b8 100644
--- a/owrx/controllers/session.py
+++ b/owrx/controllers/session.py
@@ -1,9 +1,9 @@
-from . import Controller
+from .template import WebpageController
 
 
-class SessionController(Controller):
+class SessionController(WebpageController):
     def loginAction(self):
-        self.send_response("login happening here")
+        self.serve_template("login.html", **self.template_variables())
 
     def logoutAction(self):
         self.send_redirect("logout happening here")

From 9f06149ae34b039cbf18cc21b8a6dd452343caaf Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Feb 2020 20:13:36 +0100
Subject: [PATCH 061/475] add shadow

---
 htdocs/css/login.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/css/login.css b/htdocs/css/login.css
index ca80003..84a2430 100644
--- a/htdocs/css/login.css
+++ b/htdocs/css/login.css
@@ -23,6 +23,7 @@ body {
     padding: 20px;
     border-radius: 10px;
     border: 1px solid #575757;
+    box-shadow: 0 0 20px #000;
 }
 
 .login .btn {

From de3694248a4bf1c0d413b1350a172e962b89201d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Feb 2020 20:14:07 +0100
Subject: [PATCH 062/475] restore audioworklets

---
 htdocs/lib/AudioEngine.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/lib/AudioEngine.js b/htdocs/lib/AudioEngine.js
index b12c3a9..7e67042 100644
--- a/htdocs/lib/AudioEngine.js
+++ b/htdocs/lib/AudioEngine.js
@@ -1,6 +1,6 @@
 // this controls if the new AudioWorklet API should be used if available.
 // the engine will still fall back to the ScriptProcessorNode if this is set to true but not available in the browser.
-var useAudioWorklets = false;
+var useAudioWorklets = true;
 
 function AudioEngine(maxBufferLength, audioReporter) {
     this.audioReporter = audioReporter;

From fa75cac7f561ba86b41a3b256985ed224b265c84 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Feb 2020 20:25:36 +0100
Subject: [PATCH 063/475] post login data

---
 owrx/controllers/session.py |  3 +++
 owrx/http.py                | 36 +++++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/owrx/controllers/session.py b/owrx/controllers/session.py
index b4cf4b8..3561c05 100644
--- a/owrx/controllers/session.py
+++ b/owrx/controllers/session.py
@@ -5,5 +5,8 @@ class SessionController(WebpageController):
     def loginAction(self):
         self.serve_template("login.html", **self.template_variables())
 
+    def processLoginAction(self):
+        self.send_redirect("/")
+
     def logoutAction(self):
         self.send_redirect("logout happening here")
diff --git a/owrx/http.py b/owrx/http.py
index a1e26c5..3927bf8 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -33,23 +33,28 @@ class RequestHandler(BaseHTTPRequestHandler):
         logger.debug("%s - - [%s] %s", self.address_string(), self.log_date_time_string(), format % args)
 
     def do_GET(self):
-        self.router.route(self)
+        self.router.route(self, "GET")
+
+    def do_POST(self):
+        self.router.route(self, "POST")
 
 
 class Request(object):
-    def __init__(self, url):
+    def __init__(self, url, method):
         self.path = url.path
         self.query = parse_qs(url.query)
         self.matches = None
+        self.method = method
 
     def setMatches(self, matches):
         self.matches = matches
 
 
 class Route(ABC):
-    def __init__(self, controller, controllerOptions = None):
+    def __init__(self, controller, method="GET", options=None):
         self.controller = controller
-        self.controllerOptions = controllerOptions if controllerOptions is not None else {}
+        self.controllerOptions = options if options is not None else {}
+        self.method = method
 
     @abstractmethod
     def matches(self, request):
@@ -57,24 +62,24 @@ class Route(ABC):
 
 
 class StaticRoute(Route):
-    def __init__(self, route, controller, controllerOptions = None):
+    def __init__(self, route, controller, method="GET", options=None):
         self.route = route
-        super().__init__(controller, controllerOptions)
+        super().__init__(controller, method, options)
 
     def matches(self, request):
-        return request.path == self.route
+        return request.path == self.route and self.method == request.method
 
 
 class RegexRoute(Route):
-    def __init__(self, regex, controller, controllerOptions = None):
+    def __init__(self, regex, controller, method="GET", options=None):
         self.regex = re.compile(regex)
-        super().__init__(controller, controllerOptions)
+        super().__init__(controller, method, options)
 
     def matches(self, request):
         matches = self.regex.match(request.path)
         # this is probably not the cleanest way to do it...
         request.setMatches(matches)
-        return matches is not None
+        return matches is not None and self.method == request.method
 
 
 class Router(object):
@@ -82,7 +87,7 @@ class Router(object):
         self.routes = [
             StaticRoute("/", IndexController),
             StaticRoute("/status", StatusController),
-            StaticRoute("/status.json", StatusController, {"action": "jsonAction"}),
+            StaticRoute("/status.json", StatusController, options={"action": "jsonAction"}),
             RegexRoute("/static/(.+)", OwrxAssetsController),
             RegexRoute("/aprs-symbols/(.+)", AprsSymbolsController),
             StaticRoute("/ws/", WebSocketController),
@@ -94,8 +99,9 @@ class Router(object):
             StaticRoute("/api/features", ApiController),
             StaticRoute("/metrics", MetricsController),
             StaticRoute("/settings", SettingsController),
-            StaticRoute("/login", SessionController, {"action": "loginAction"}),
-            StaticRoute("/logout", SessionController, {"action": "logoutAction"}),
+            StaticRoute("/login", SessionController, options={"action": "loginAction"}),
+            StaticRoute("/login", SessionController, method="POST", options={"action": "processLoginAction"}),
+            StaticRoute("/logout", SessionController, options={"action": "logoutAction"}),
         ]
 
     def find_route(self, request):
@@ -103,9 +109,9 @@ class Router(object):
             if r.matches(request):
                 return r
 
-    def route(self, handler):
+    def route(self, handler, method):
         url = urlparse(handler.path)
-        request = Request(url)
+        request = Request(url, method)
         route = self.find_route(request)
         if route is not None:
             controller = route.controller

From a70c51193bac87ed1ced6deb6d4650687be143d2 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Feb 2020 20:52:32 +0100
Subject: [PATCH 064/475] parse login data

---
 htdocs/login.html            |  4 ++--
 owrx/controllers/__init__.py |  8 +++++++-
 owrx/controllers/session.py  | 18 +++++++++++++++++-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/htdocs/login.html b/htdocs/login.html
index 27f8ad9..a776531 100644
--- a/htdocs/login.html
+++ b/htdocs/login.html
@@ -13,11 +13,11 @@
         <form method="POST">
             <div class="form-group">
                 <label for="user">Username</label>
-                <input type="text" class="form-control" id="user" placeholder="Username">
+                <input type="text" class="form-control" id="user" name="user" placeholder="Username">
             </div>
             <div class="form-group">
                 <label for="password">Password</label>
-                <input type="password" class="form-control" id="password" placeholder="Password">
+                <input type="password" class="form-control" id="password" name="password" placeholder="Password">
             </div>
             <button type="submit" class="btn btn-login">Login</button>
         </form>
diff --git a/owrx/controllers/__init__.py b/owrx/controllers/__init__.py
index 6e0be48..2faa1ab 100644
--- a/owrx/controllers/__init__.py
+++ b/owrx/controllers/__init__.py
@@ -20,11 +20,17 @@ class Controller(object):
             content = content.encode()
         self.handler.wfile.write(content)
 
-    def send_redirect(self, location, code=303):
+    def send_redirect(self, location, code=303, cookies=[]):
         self.handler.send_response(code)
         self.handler.send_header("Location", location)
         self.handler.end_headers()
 
+    def get_body(self):
+        if "Content-Length" not in self.handler.headers:
+            return None
+        length = int(self.handler.headers["Content-Length"])
+        return self.handler.rfile.read(length)
+
     def handle_request(self):
         action = "indexAction"
         if "action" in self.options:
diff --git a/owrx/controllers/session.py b/owrx/controllers/session.py
index 3561c05..ea2721a 100644
--- a/owrx/controllers/session.py
+++ b/owrx/controllers/session.py
@@ -1,4 +1,8 @@
 from .template import WebpageController
+from urllib.parse import parse_qs
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 class SessionController(WebpageController):
@@ -6,7 +10,19 @@ class SessionController(WebpageController):
         self.serve_template("login.html", **self.template_variables())
 
     def processLoginAction(self):
-        self.send_redirect("/")
+        data = parse_qs(self.get_body().decode("utf-8"))
+        data = {k: v[0] for k, v in data.items()}
+        logger.debug(data)
+        if "user" in data and "password" in data:
+            # TODO actually check user and password
+            if data["user"] == "admin" and data["password"] == "password":
+                # TODO pass the final destination
+                # TODO actual session cookie
+                self.send_redirect("/settings", cookies=["session-cookie"])
+            else:
+                self.send_redirect("/login")
+        else:
+            self.send_response("invalid request", code=400)
 
     def logoutAction(self):
         self.send_redirect("logout happening here")

From fb7422e5a8456d32fc05ef33619e3baf0443626e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Feb 2020 21:39:12 +0100
Subject: [PATCH 065/475] generate session cookie

---
 owrx/controllers/__init__.py |  4 +++-
 owrx/controllers/session.py  | 37 ++++++++++++++++++++++++++++++++++--
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/owrx/controllers/__init__.py b/owrx/controllers/__init__.py
index 2faa1ab..f668c6e 100644
--- a/owrx/controllers/__init__.py
+++ b/owrx/controllers/__init__.py
@@ -20,8 +20,10 @@ class Controller(object):
             content = content.encode()
         self.handler.wfile.write(content)
 
-    def send_redirect(self, location, code=303, cookies=[]):
+    def send_redirect(self, location, code=303, cookies=None):
         self.handler.send_response(code)
+        if cookies is not None:
+            self.handler.send_header("Set-Cookie", cookies.output(header=''))
         self.handler.send_header("Location", location)
         self.handler.end_headers()
 
diff --git a/owrx/controllers/session.py b/owrx/controllers/session.py
index ea2721a..e4da220 100644
--- a/owrx/controllers/session.py
+++ b/owrx/controllers/session.py
@@ -1,10 +1,41 @@
 from .template import WebpageController
 from urllib.parse import parse_qs
+from uuid import uuid4
+from http.cookies import SimpleCookie
 import logging
 
 logger = logging.getLogger(__name__)
 
 
+class SessionStorage(object):
+    sharedInstance = None
+
+    @staticmethod
+    def getSharedInstance():
+        if SessionStorage.sharedInstance is None:
+            SessionStorage.sharedInstance = SessionStorage()
+        return SessionStorage.sharedInstance
+
+    def __init__(self):
+        self.sessions = {}
+
+    def generateKey(self):
+        return str(uuid4())
+
+    def startSession(self, data):
+        key = self.generateKey()
+        self.updateSession(key, data)
+        return key
+
+    def getSession(self, key):
+        if key not in self.sessions:
+            return None
+        return self.sessions[key]
+
+    def updateSession(self, key, data):
+        self.sessions[key] = data
+
+
 class SessionController(WebpageController):
     def loginAction(self):
         self.serve_template("login.html", **self.template_variables())
@@ -17,8 +48,10 @@ class SessionController(WebpageController):
             # TODO actually check user and password
             if data["user"] == "admin" and data["password"] == "password":
                 # TODO pass the final destination
-                # TODO actual session cookie
-                self.send_redirect("/settings", cookies=["session-cookie"])
+                key = SessionStorage.getSharedInstance().startSession({"user": data["user"]})
+                cookie = SimpleCookie()
+                cookie["session"] = key
+                self.send_redirect("/settings", cookies=cookie)
             else:
                 self.send_redirect("/login")
         else:

From bd8b8ca410f40e64a9c84977c8d6d09b9e60b4ec Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Feb 2020 21:52:13 +0100
Subject: [PATCH 066/475] session cookie handling

---
 owrx/controllers/session.py  | 6 +-----
 owrx/controllers/settings.py | 4 ++++
 owrx/http.py                 | 9 +++++++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/owrx/controllers/session.py b/owrx/controllers/session.py
index e4da220..bb40bd4 100644
--- a/owrx/controllers/session.py
+++ b/owrx/controllers/session.py
@@ -2,9 +2,6 @@ from .template import WebpageController
 from urllib.parse import parse_qs
 from uuid import uuid4
 from http.cookies import SimpleCookie
-import logging
-
-logger = logging.getLogger(__name__)
 
 
 class SessionStorage(object):
@@ -43,14 +40,13 @@ class SessionController(WebpageController):
     def processLoginAction(self):
         data = parse_qs(self.get_body().decode("utf-8"))
         data = {k: v[0] for k, v in data.items()}
-        logger.debug(data)
         if "user" in data and "password" in data:
             # TODO actually check user and password
             if data["user"] == "admin" and data["password"] == "password":
                 # TODO pass the final destination
                 key = SessionStorage.getSharedInstance().startSession({"user": data["user"]})
                 cookie = SimpleCookie()
-                cookie["session"] = key
+                cookie["owrx-session"] = key
                 self.send_redirect("/settings", cookies=cookie)
             else:
                 self.send_redirect("/login")
diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 2a8e768..748c646 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -1,8 +1,12 @@
 from . import Controller
+from .session import SessionStorage
 
 
 class Authentication(object):
     def isAuthenticated(self, request):
+        if "owrx-session" in request.cookies:
+            session = SessionStorage.getSharedInstance().getSession(request.cookies["owrx-session"].value)
+            return session is not None
         return False
 
 
diff --git a/owrx/http.py b/owrx/http.py
index 3927bf8..07d7867 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -17,6 +17,7 @@ from http.server import BaseHTTPRequestHandler
 from urllib.parse import urlparse, parse_qs
 import re
 from abc import ABC, abstractmethod
+from http.cookies import SimpleCookie
 
 import logging
 
@@ -40,11 +41,12 @@ class RequestHandler(BaseHTTPRequestHandler):
 
 
 class Request(object):
-    def __init__(self, url, method):
+    def __init__(self, url, method, cookies):
         self.path = url.path
         self.query = parse_qs(url.query)
         self.matches = None
         self.method = method
+        self.cookies = cookies
 
     def setMatches(self, matches):
         self.matches = matches
@@ -111,7 +113,10 @@ class Router(object):
 
     def route(self, handler, method):
         url = urlparse(handler.path)
-        request = Request(url, method)
+        cookies = SimpleCookie()
+        if "Cookie" in handler.headers:
+            cookies.load(handler.headers["Cookie"])
+        request = Request(url, method, cookies)
         route = self.find_route(request)
         if route is not None:
             controller = route.controller

From 278fab268f92b9a3a83793ddff7f07a427017e83 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 25 Feb 2020 20:55:42 +0100
Subject: [PATCH 067/475] use dicts for the pipes

---
 csdr/csdr.py | 109 +++++++++++++++++++++++++++------------------------
 1 file changed, 58 insertions(+), 51 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 5aac982..b9f9d1a 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -104,6 +104,8 @@ class dsp(object):
             "iqtee2_pipe",
             "dmr_control_pipe",
         ]
+        self.pipes = {}
+        self.pipe_files = {}
         self.secondary_pipe_names = ["secondary_shift_pipe"]
         self.secondary_offset_freq = 1000
         self.unvoiced_quality = 1
@@ -301,8 +303,8 @@ class dsp(object):
         self.try_create_configs(secondary_command_demod)
 
         secondary_command_demod = secondary_command_demod.format(
-            input_pipe=self.iqtee2_pipe,
-            secondary_shift_pipe=self.secondary_shift_pipe,
+            input_pipe=self.pipes["iqtee2_pipe"],
+            secondary_shift_pipe=self.pipes["secondary_shift_pipe"],
             secondary_decimation=self.secondary_decimation(),
             secondary_samples_per_bits=self.secondary_samples_per_bits(),
             secondary_bpf_cutoff=self.secondary_bpf_cutoff(),
@@ -321,7 +323,7 @@ class dsp(object):
         if self.output.supports_type("secondary_fft"):
             secondary_command_fft = " | ".join(self.secondary_chain("fft"))
             secondary_command_fft = secondary_command_fft.format(
-                input_pipe=self.iqtee_pipe,
+                input_pipe=self.pipes["iqtee_pipe"],
                 secondary_fft_input_size=self.secondary_fft_size,
                 secondary_fft_size=self.secondary_fft_size,
                 secondary_fft_block_size=self.secondary_fft_block_size(),
@@ -347,6 +349,7 @@ class dsp(object):
 
         if self.isWsjtMode():
             smd = self.get_secondary_demodulator()
+            chopper = None
             if smd == "ft8":
                 chopper = Ft8Chopper(self.secondary_process_demod.stdout)
             elif smd == "wspr":
@@ -357,8 +360,9 @@ class dsp(object):
                 chopper = Jt9Chopper(self.secondary_process_demod.stdout)
             elif smd == "ft4":
                 chopper = Ft4Chopper(self.secondary_process_demod.stdout)
-            chopper.start()
-            self.output.send_output("wsjt_demod", chopper.read)
+            if chopper is not None:
+                chopper.start()
+                self.output.send_output("wsjt_demod", chopper.read)
         elif self.isPacket():
             # we best get the ax25 packets from the kiss socket
             kiss = KissClient(self.direwolf_port)
@@ -369,18 +373,18 @@ class dsp(object):
             self.output.send_output("secondary_demod", partial(self.secondary_process_demod.stdout.read, 1))
 
         # open control pipes for csdr and send initialization data
-        if self.secondary_shift_pipe != None:  # TODO digimodes
-            self.secondary_shift_pipe_file = open(self.secondary_shift_pipe, "w")  # TODO digimodes
+        if self.has_pipe("secondary_shift_pipe"):  # TODO digimodes
+            self.pipe_files["secondary_shift_pipe"] = open(self.pipes["secondary_shift_pipe"], "w")  # TODO digimodes
             self.set_secondary_offset_freq(self.secondary_offset_freq)  # TODO digimodes
 
     def set_secondary_offset_freq(self, value):
         self.secondary_offset_freq = value
-        if self.secondary_processes_running and hasattr(self, "secondary_shift_pipe_file"):
-            self.secondary_shift_pipe_file.write("%g\n" % (-float(self.secondary_offset_freq) / self.if_samp_rate()))
-            self.secondary_shift_pipe_file.flush()
+        if self.secondary_processes_running and self.has_pipe("secondary_shift_pipe"):
+            self.pipe_files["secondary_shift_pipe"].write("%g\n" % (-float(self.secondary_offset_freq) / self.if_samp_rate()))
+            self.pipe_files["secondary_shift_pipe"].flush()
 
     def stop_secondary_demodulator(self):
-        if self.secondary_processes_running == False:
+        if not self.secondary_processes_running:
             return
         self.try_delete_pipes(self.secondary_pipe_names)
         self.try_delete_configs()
@@ -447,7 +451,7 @@ class dsp(object):
             decimation += 1
         fraction = float(input_rate / decimation) / output_rate
         intermediate_rate = input_rate / decimation
-        return (decimation, fraction, intermediate_rate)
+        return decimation, fraction, intermediate_rate
 
     def if_samp_rate(self):
         return self.samp_rate / self.decimation
@@ -524,8 +528,8 @@ class dsp(object):
         self.offset_freq = offset_freq
         if self.running:
             self.modification_lock.acquire()
-            self.shift_pipe_file.write("%g\n" % (-float(self.offset_freq) / self.samp_rate))
-            self.shift_pipe_file.flush()
+            self.pipe_files["shift_pipe"].write("%g\n" % (-float(self.offset_freq) / self.samp_rate))
+            self.pipe_files["shift_pipe"].flush()
             self.modification_lock.release()
 
     def set_bpf(self, low_cut, high_cut):
@@ -533,10 +537,10 @@ class dsp(object):
         self.high_cut = high_cut
         if self.running:
             self.modification_lock.acquire()
-            self.bpf_pipe_file.write(
+            self.pipe_files["bpf_pipe"].write(
                 "%g %g\n" % (float(self.low_cut) / self.if_samp_rate(), float(self.high_cut) / self.if_samp_rate())
             )
-            self.bpf_pipe_file.flush()
+            self.pipe_files["bpf_pipe"].flush()
             self.modification_lock.release()
 
     def get_bpf(self):
@@ -551,8 +555,8 @@ class dsp(object):
         actual_squelch = -150 if self.isDigitalVoice() or self.isPacket() or self.isPocsag() else self.squelch_level
         if self.running:
             self.modification_lock.acquire()
-            self.squelch_pipe_file.write("%g\n" % (self.convertToLinear(actual_squelch)))
-            self.squelch_pipe_file.flush()
+            self.pipe_files["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch)))
+            self.pipe_files["squelch_pipe"].flush()
             self.modification_lock.release()
 
     def set_unvoiced_quality(self, q):
@@ -563,9 +567,9 @@ class dsp(object):
         return self.unvoiced_quality
 
     def set_dmr_filter(self, filter):
-        if self.dmr_control_pipe_file:
-            self.dmr_control_pipe_file.write("{0}\n".format(filter))
-            self.dmr_control_pipe_file.flush()
+        if self.has_pipe("dmr_control_pipe"):
+            self.pipe_files["dmr_control_pipe"].write("{0}\n".format(filter))
+            self.pipe_files["dmr_control_pipe"].flush()
 
     def mkfifo(self, path):
         try:
@@ -580,15 +584,19 @@ class dsp(object):
     def try_create_pipes(self, pipe_names, command_base):
         for pipe_name in pipe_names:
             if "{" + pipe_name + "}" in command_base:
-                setattr(self, pipe_name, self.pipe_base_path + pipe_name)
-                self.mkfifo(getattr(self, pipe_name))
+                p = self.pipe_base_path + pipe_name
+                self.pipes[pipe_name] = p
+                self.mkfifo(p)
             else:
-                setattr(self, pipe_name, None)
+                self.pipes[pipe_name] = None
+
+    def has_pipe(self, name):
+        return name in self.pipes and self.pipes[name] is not None
 
     def try_delete_pipes(self, pipe_names):
         for pipe_name in pipe_names:
-            pipe_path = getattr(self, pipe_name, None)
-            if pipe_path:
+            if self.has_pipe(pipe_name):
+                pipe_path = self.pipes[pipe_name]
                 try:
                     os.unlink(pipe_path)
                 except FileNotFoundError:
@@ -596,6 +604,8 @@ class dsp(object):
                     pass
                 except Exception:
                     logger.exception("try_delete_pipes()")
+                finally:
+                    self.pipes[pipe_name] = None
 
     def try_create_configs(self, command):
         if "{direwolf_config}" in command:
@@ -637,8 +647,14 @@ class dsp(object):
 
         # run the command
         command = command_base.format(
-            bpf_pipe=self.bpf_pipe,
-            shift_pipe=self.shift_pipe,
+            bpf_pipe=self.pipes["bpf_pipe"],
+            shift_pipe=self.pipes["shift_pipe"],
+            squelch_pipe=self.pipes["squelch_pipe"],
+            smeter_pipe=self.pipes["smeter_pipe"],
+            meta_pipe=self.pipes["meta_pipe"],
+            iqtee_pipe=self.pipes["iqtee_pipe"],
+            iqtee2_pipe=self.pipes["iqtee2_pipe"],
+            dmr_control_pipe=self.pipes["dmr_control_pipe"],
             decimation=self.decimation,
             last_decimation=self.last_decimation,
             fft_size=self.fft_size,
@@ -649,15 +665,9 @@ class dsp(object):
             flowcontrol=int(self.samp_rate * 2),
             start_bufsize=self.base_bufsize * self.decimation,
             nc_port=self.nc_port,
-            squelch_pipe=self.squelch_pipe,
-            smeter_pipe=self.smeter_pipe,
-            meta_pipe=self.meta_pipe,
-            iqtee_pipe=self.iqtee_pipe,
-            iqtee2_pipe=self.iqtee2_pipe,
             output_rate=self.get_output_rate(),
             smeter_report_every=int(self.if_samp_rate() / 6000),
             unvoiced_quality=self.get_unvoiced_quality(),
-            dmr_control_pipe=self.dmr_control_pipe,
             audio_rate=self.get_audio_rate(),
         )
 
@@ -690,40 +700,37 @@ class dsp(object):
             )
 
         # open control pipes for csdr
-        if self.bpf_pipe:
-            self.bpf_pipe_file = open(self.bpf_pipe, "w")
-        if self.shift_pipe:
-            self.shift_pipe_file = open(self.shift_pipe, "w")
-        if self.squelch_pipe:
-            self.squelch_pipe_file = open(self.squelch_pipe, "w")
+        for p in ["bpf_pipe", "shift_pipe", "squelch_pipe"]:
+            if self.has_pipe(p):
+                self.pipe_files[p] = open(self.pipes[p], "w")
         self.start_secondary_demodulator()
 
         self.modification_lock.release()
 
         # send initial config through the pipes
-        if self.squelch_pipe:
+        if self.has_pipe("squelch_pipe"):
             self.set_squelch_level(self.squelch_level)
-        if self.shift_pipe:
+        if self.has_pipe("shift_pipe"):
             self.set_offset_freq(self.offset_freq)
-        if self.bpf_pipe:
+        if self.has_pipe("bpf_pipe"):
             self.set_bpf(self.low_cut, self.high_cut)
-        if self.smeter_pipe:
-            self.smeter_pipe_file = open(self.smeter_pipe, "r")
+        if self.has_pipe("smeter_pipe"):
+            self.pipe_files["smeter_pipe"] = open(self.pipes["smeter_pipe"], "r")
 
             def read_smeter():
-                raw = self.smeter_pipe_file.readline()
+                raw = self.pipe_files["smeter_pipe"].readline()
                 if len(raw) == 0:
                     return None
                 else:
                     return float(raw.rstrip("\n"))
 
             self.output.send_output("smeter", read_smeter)
-        if self.meta_pipe != None:
+        if self.has_pipe("meta_pipe"):
             # TODO make digiham output unicode and then change this here
-            self.meta_pipe_file = open(self.meta_pipe, "r", encoding="cp437")
+            self.pipe_files["meta_pipe"] = open(self.pipes["meta_pipe"], "r", encoding="cp437")
 
             def read_meta():
-                raw = self.meta_pipe_file.readline()
+                raw = self.pipe_files["meta_pipe"].readline()
                 if len(raw) == 0:
                     return None
                 else:
@@ -731,8 +738,8 @@ class dsp(object):
 
             self.output.send_output("meta", read_meta)
 
-        if self.dmr_control_pipe:
-            self.dmr_control_pipe_file = open(self.dmr_control_pipe, "w")
+        if self.has_pipe("dmr_control_pipe"):
+            self.pipe_files["dmr_control_pipe"] = open(self.pipes["dmr_control_pipe"], "w")
 
     def stop(self):
         self.modification_lock.acquire()

From 6b2656efae17fb0f8cb019fd1b311f3ae103239a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 27 Feb 2020 18:43:44 +0100
Subject: [PATCH 068/475] fix constructor

---
 owrx/controllers/assets.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index 4c55e17..96782f5 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -46,13 +46,13 @@ class OwrxAssetsController(AssetsController):
 
 
 class AprsSymbolsController(AssetsController):
-    def __init__(self, handler, request):
+    def __init__(self, handler, request, options):
         pm = PropertyManager.getSharedInstance()
         path = pm["aprs_symbols_path"]
         if not path.endswith("/"):
             path += "/"
         self.path = path
-        super().__init__(handler, request)
+        super().__init__(handler, request, options)
 
     def getFilePath(self, file):
         return self.path + file

From 388218f9df4e62f9dfcfcf164ed669f4b57c3f37 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 27 Feb 2020 18:43:58 +0100
Subject: [PATCH 069/475] implement a reconnection loop for direwolf, ref #60

---
 owrx/kiss.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/owrx/kiss.py b/owrx/kiss.py
index d47fa4d..374cc07 100644
--- a/owrx/kiss.py
+++ b/owrx/kiss.py
@@ -69,9 +69,19 @@ class KissClient(object):
                 pass
 
     def __init__(self, port):
-        time.sleep(1)
-        self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.socket.connect(("localhost", port))
+        delay = .5
+        retries = 0
+        while True:
+            try:
+                self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+                self.socket.connect(("localhost", port))
+                break
+            except ConnectionError:
+                if retries > 20:
+                    logger.error("maximum number of connection attempts reached. did direwolf start up correctly?")
+                    raise
+                retries += 1
+            time.sleep(delay)
 
     def read(self):
         return self.socket.recv(1)

From c325368be8aca159837c88a4cba083b4b1ac0d31 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 27 Feb 2020 18:50:53 +0100
Subject: [PATCH 070/475] improve variable handling

---
 csdr/csdr.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index b9f9d1a..eb948af 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -115,6 +115,7 @@ class dsp(object):
         self.is_service = False
         self.direwolf_config = None
         self.direwolf_port = None
+        self.process = None
 
     def set_service(self, flag=True):
         self.is_service = flag
@@ -744,9 +745,10 @@ class dsp(object):
     def stop(self):
         self.modification_lock.acquire()
         self.running = False
-        if hasattr(self, "process"):
+        if self.process is not None:
             try:
                 os.killpg(os.getpgid(self.process.pid), signal.SIGTERM)
+                self.process = None
             except ProcessLookupError:
                 # been killed by something else, ignore
                 pass
@@ -764,4 +766,3 @@ class dsp(object):
 
     def __del__(self):
         self.stop()
-        del self.process

From d36be799d0b5e57394d8df8cd20b62c833785ba9 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 27 Feb 2020 19:48:22 +0100
Subject: [PATCH 071/475] improve lock handling

---
 csdr/csdr.py | 191 +++++++++++++++++++++++++--------------------------
 1 file changed, 92 insertions(+), 99 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index eb948af..441a1fc 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -111,7 +111,11 @@ class dsp(object):
         self.unvoiced_quality = 1
         self.modification_lock = threading.Lock()
         self.output = output
-        self.temporary_directory = "/tmp"
+
+        self.temporary_directory = None
+        self.pipe_base_path = None
+        self.set_temporary_directory("/tmp")
+
         self.is_service = False
         self.direwolf_config = None
         self.direwolf_port = None
@@ -122,6 +126,7 @@ class dsp(object):
 
     def set_temporary_directory(self, what):
         self.temporary_directory = what
+        self.pipe_base_path = "{tmp_dir}/openwebrx_pipe_{myid}_".format(tmp_dir=self.temporary_directory, myid=id(self))
 
     def chain(self, which):
         chain = ["nc -v 127.0.0.1 {nc_port}"]
@@ -528,21 +533,19 @@ class dsp(object):
     def set_offset_freq(self, offset_freq):
         self.offset_freq = offset_freq
         if self.running:
-            self.modification_lock.acquire()
-            self.pipe_files["shift_pipe"].write("%g\n" % (-float(self.offset_freq) / self.samp_rate))
-            self.pipe_files["shift_pipe"].flush()
-            self.modification_lock.release()
+            with self.modification_lock:
+                self.pipe_files["shift_pipe"].write("%g\n" % (-float(self.offset_freq) / self.samp_rate))
+                self.pipe_files["shift_pipe"].flush()
 
     def set_bpf(self, low_cut, high_cut):
         self.low_cut = low_cut
         self.high_cut = high_cut
         if self.running:
-            self.modification_lock.acquire()
-            self.pipe_files["bpf_pipe"].write(
-                "%g %g\n" % (float(self.low_cut) / self.if_samp_rate(), float(self.high_cut) / self.if_samp_rate())
-            )
-            self.pipe_files["bpf_pipe"].flush()
-            self.modification_lock.release()
+            with self.modification_lock:
+                self.pipe_files["bpf_pipe"].write(
+                    "%g %g\n" % (float(self.low_cut) / self.if_samp_rate(), float(self.high_cut) / self.if_samp_rate())
+                )
+                self.pipe_files["bpf_pipe"].flush()
 
     def get_bpf(self):
         return [self.low_cut, self.high_cut]
@@ -555,10 +558,9 @@ class dsp(object):
         # no squelch required on digital voice modes
         actual_squelch = -150 if self.isDigitalVoice() or self.isPacket() or self.isPocsag() else self.squelch_level
         if self.running:
-            self.modification_lock.acquire()
-            self.pipe_files["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch)))
-            self.pipe_files["squelch_pipe"].flush()
-            self.modification_lock.release()
+            with self.modification_lock:
+                self.pipe_files["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch)))
+                self.pipe_files["squelch_pipe"].flush()
 
     def set_unvoiced_quality(self, q):
         self.unvoiced_quality = q
@@ -633,80 +635,76 @@ class dsp(object):
             self.direwolf_config = None
 
     def start(self):
-        self.modification_lock.acquire()
-        if self.running:
-            self.modification_lock.release()
-            return
-        self.running = True
+        with self.modification_lock:
+            if self.running:
+                return
+            self.running = True
 
-        command_base = " | ".join(self.chain(self.demodulator))
+            command_base = " | ".join(self.chain(self.demodulator))
 
-        # create control pipes for csdr
-        self.pipe_base_path = "{tmp_dir}/openwebrx_pipe_{myid}_".format(tmp_dir=self.temporary_directory, myid=id(self))
+            # create control pipes for csdr
+            self.try_create_pipes(self.pipe_names, command_base)
 
-        self.try_create_pipes(self.pipe_names, command_base)
-
-        # run the command
-        command = command_base.format(
-            bpf_pipe=self.pipes["bpf_pipe"],
-            shift_pipe=self.pipes["shift_pipe"],
-            squelch_pipe=self.pipes["squelch_pipe"],
-            smeter_pipe=self.pipes["smeter_pipe"],
-            meta_pipe=self.pipes["meta_pipe"],
-            iqtee_pipe=self.pipes["iqtee_pipe"],
-            iqtee2_pipe=self.pipes["iqtee2_pipe"],
-            dmr_control_pipe=self.pipes["dmr_control_pipe"],
-            decimation=self.decimation,
-            last_decimation=self.last_decimation,
-            fft_size=self.fft_size,
-            fft_block_size=self.fft_block_size(),
-            fft_averages=self.fft_averages,
-            bpf_transition_bw=float(self.bpf_transition_bw) / self.if_samp_rate(),
-            ddc_transition_bw=self.ddc_transition_bw(),
-            flowcontrol=int(self.samp_rate * 2),
-            start_bufsize=self.base_bufsize * self.decimation,
-            nc_port=self.nc_port,
-            output_rate=self.get_output_rate(),
-            smeter_report_every=int(self.if_samp_rate() / 6000),
-            unvoiced_quality=self.get_unvoiced_quality(),
-            audio_rate=self.get_audio_rate(),
-        )
-
-        logger.debug("Command = %s", command)
-        my_env = os.environ.copy()
-        if self.csdr_dynamic_bufsize:
-            my_env["CSDR_DYNAMIC_BUFSIZE_ON"] = "1"
-        if self.csdr_print_bufsizes:
-            my_env["CSDR_PRINT_BUFSIZES"] = "1"
-
-        out = subprocess.PIPE if self.output.supports_type("audio") else subprocess.DEVNULL
-        self.process = subprocess.Popen(command, stdout=out, shell=True, start_new_session=True, env=my_env)
-
-        def watch_thread():
-            rc = self.process.wait()
-            logger.debug("dsp thread ended with rc=%d", rc)
-            if rc == 0 and self.running and not self.modification_lock.locked():
-                logger.debug("restarting since rc = 0, self.running = true, and no modification")
-                self.restart()
-
-        threading.Thread(target=watch_thread).start()
-
-        if self.output.supports_type("audio"):
-            self.output.send_output(
-                "audio",
-                partial(
-                    self.process.stdout.read,
-                    self.get_fft_bytes_to_read() if self.demodulator == "fft" else self.get_audio_bytes_to_read(),
-                ),
+            # run the command
+            command = command_base.format(
+                bpf_pipe=self.pipes["bpf_pipe"],
+                shift_pipe=self.pipes["shift_pipe"],
+                squelch_pipe=self.pipes["squelch_pipe"],
+                smeter_pipe=self.pipes["smeter_pipe"],
+                meta_pipe=self.pipes["meta_pipe"],
+                iqtee_pipe=self.pipes["iqtee_pipe"],
+                iqtee2_pipe=self.pipes["iqtee2_pipe"],
+                dmr_control_pipe=self.pipes["dmr_control_pipe"],
+                decimation=self.decimation,
+                last_decimation=self.last_decimation,
+                fft_size=self.fft_size,
+                fft_block_size=self.fft_block_size(),
+                fft_averages=self.fft_averages,
+                bpf_transition_bw=float(self.bpf_transition_bw) / self.if_samp_rate(),
+                ddc_transition_bw=self.ddc_transition_bw(),
+                flowcontrol=int(self.samp_rate * 2),
+                start_bufsize=self.base_bufsize * self.decimation,
+                nc_port=self.nc_port,
+                output_rate=self.get_output_rate(),
+                smeter_report_every=int(self.if_samp_rate() / 6000),
+                unvoiced_quality=self.get_unvoiced_quality(),
+                audio_rate=self.get_audio_rate(),
             )
 
-        # open control pipes for csdr
-        for p in ["bpf_pipe", "shift_pipe", "squelch_pipe"]:
-            if self.has_pipe(p):
-                self.pipe_files[p] = open(self.pipes[p], "w")
-        self.start_secondary_demodulator()
+            logger.debug("Command = %s", command)
+            my_env = os.environ.copy()
+            if self.csdr_dynamic_bufsize:
+                my_env["CSDR_DYNAMIC_BUFSIZE_ON"] = "1"
+            if self.csdr_print_bufsizes:
+                my_env["CSDR_PRINT_BUFSIZES"] = "1"
 
-        self.modification_lock.release()
+            out = subprocess.PIPE if self.output.supports_type("audio") else subprocess.DEVNULL
+            self.process = subprocess.Popen(command, stdout=out, shell=True, start_new_session=True, env=my_env)
+
+            def watch_thread():
+                rc = self.process.wait()
+                logger.debug("dsp thread ended with rc=%d", rc)
+                if rc == 0 and self.running and not self.modification_lock.locked():
+                    logger.debug("restarting since rc = 0, self.running = true, and no modification")
+                    self.restart()
+
+            threading.Thread(target=watch_thread).start()
+
+            if self.output.supports_type("audio"):
+                self.output.send_output(
+                    "audio",
+                    partial(
+                        self.process.stdout.read,
+                        self.get_fft_bytes_to_read() if self.demodulator == "fft" else self.get_audio_bytes_to_read(),
+                    ),
+                )
+
+            self.start_secondary_demodulator()
+
+            # open control pipes for csdr
+            for p in ["bpf_pipe", "shift_pipe", "squelch_pipe", "dmr_control_pipe"]:
+                if self.has_pipe(p):
+                    self.pipe_files[p] = open(self.pipes[p], "w")
 
         # send initial config through the pipes
         if self.has_pipe("squelch_pipe"):
@@ -739,24 +737,19 @@ class dsp(object):
 
             self.output.send_output("meta", read_meta)
 
-        if self.has_pipe("dmr_control_pipe"):
-            self.pipe_files["dmr_control_pipe"] = open(self.pipes["dmr_control_pipe"], "w")
-
     def stop(self):
-        self.modification_lock.acquire()
-        self.running = False
-        if self.process is not None:
-            try:
-                os.killpg(os.getpgid(self.process.pid), signal.SIGTERM)
-                self.process = None
-            except ProcessLookupError:
-                # been killed by something else, ignore
-                pass
-        self.stop_secondary_demodulator()
+        with self.modification_lock:
+            self.running = False
+            if self.process is not None:
+                try:
+                    os.killpg(os.getpgid(self.process.pid), signal.SIGTERM)
+                    self.process = None
+                except ProcessLookupError:
+                    # been killed by something else, ignore
+                    pass
+            self.stop_secondary_demodulator()
 
-        self.try_delete_pipes(self.pipe_names)
-
-        self.modification_lock.release()
+            self.try_delete_pipes(self.pipe_names)
 
     def restart(self):
         if not self.running:

From a388acdf037a65c1af8141cb2dfcab533b6b2951 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 27 Feb 2020 22:54:42 +0100
Subject: [PATCH 072/475] update changelog

---
 CHANGELOG.md     | 3 +++
 debian/changelog | 1 +
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aeb0549..cedf385 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+**unreleased**
+- Fix direwolf connection setup by implementing a retry loop
+
 **0.18.0**
 - Support for SoapyRemote
 
diff --git a/debian/changelog b/debian/changelog
index fdd831c..1fe0fdf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,5 @@
 openwebrx (0.19.0) UNRELEASED; urgency=low
+  * Fix direwolf connection setup by implementing a retry loop
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From fbcfb550a2b711c2476c1a0ca6fd27980d08e23d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 27 Feb 2020 23:21:00 +0100
Subject: [PATCH 073/475] pass direct sampling mode changes to owrx_connector

---
 owrx/source/rtl_sdr_soapy.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/owrx/source/rtl_sdr_soapy.py b/owrx/source/rtl_sdr_soapy.py
index 24fe9f4..f6b9b94 100644
--- a/owrx/source/rtl_sdr_soapy.py
+++ b/owrx/source/rtl_sdr_soapy.py
@@ -11,3 +11,9 @@ class RtlSdrSoapySource(SoapyConnectorSource):
 
     def getEventNames(self):
         return super().getEventNames() + ["direct_sampling"]
+
+    def onPropertyChange(self, prop, value):
+        if prop == "direct_sampling":
+            prop = "settings"
+            value = "direct_samp={0}".format(value)
+        super().onPropertyChange(prop, value)

From 0e47f2d92a1870c376f757a737e1d49462ed4d78 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 27 Feb 2020 23:23:22 +0100
Subject: [PATCH 074/475] update changelog

---
 CHANGELOG.md     | 1 +
 debian/changelog | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cedf385..2b57757 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 **unreleased**
 - Fix direwolf connection setup by implementing a retry loop
+- Pass direct sampling mode changes for rtl_sdr_soapy to owrx_connectorgit
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index 1fe0fdf..ffa7762 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 openwebrx (0.19.0) UNRELEASED; urgency=low
   * Fix direwolf connection setup by implementing a retry loop
+  * Pass direct sampling mode changes for rtl_sdr_soapy to owrx_connector
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From 9cc850e57875929c6754ddc18d3b785fbc186842 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 28 Feb 2020 00:20:37 +0100
Subject: [PATCH 075/475] introduce new pipe classes to improve sequencing

---
 csdr/csdr.py | 165 +++++++++++++++++++++++++++++++++------------------
 owrx/fft.py  |   4 --
 2 files changed, 106 insertions(+), 63 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 441a1fc..9dc52b5 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -64,6 +64,77 @@ class output(object):
         return True
 
 
+class Pipe(object):
+    READ = "r"
+    WRITE = "w"
+    NONE = None
+
+    @staticmethod
+    def create(path, t, encoding=None):
+        if t == Pipe.READ:
+            return ReadingPipe(path, encoding=encoding)
+        elif t == Pipe.WRITE:
+            return WritingPipe(path, encoding=encoding)
+        elif t == Pipe.NONE:
+            return Pipe(path, None, encoding=encoding)
+
+    def __init__(self, path, direction, encoding=None):
+        self.path = path
+        self.direction = direction
+        self.encoding = encoding
+        self.file = None
+        try:
+            os.unlink(path)
+        except Exception:
+            pass
+        os.mkfifo(path)
+
+    def open(self):
+        self.file = open(self.path, self.direction, encoding=self.encoding)
+
+    def close(self):
+        if self.file is None:
+            return
+        try:
+            self.file.close()
+            os.unlink(self.path)
+        except FileNotFoundError:
+            # it seems like we keep calling this twice. no idea why, but we don't need the resulting error.
+            pass
+        except Exception:
+            logger.exception("Pipe.close()")
+
+    def __str__(self):
+        return self.path
+
+
+class WritingPipe(Pipe):
+    def __init__(self, path, encoding=None):
+        super().__init__(path, "w", encoding=encoding)
+
+    def write(self, data):
+        if self.file is None:
+            self.open()
+        r =self.file.write(data)
+        self.file.flush()
+        return r
+
+
+class ReadingPipe(Pipe):
+    def __init__(self, path, encoding=None):
+        super().__init__(path, "r", encoding=encoding)
+
+    def read(self):
+        if self.file is None:
+            self.open()
+        return self.file.read()
+
+    def readline(self):
+        if self.file is None:
+            self.open()
+        return self.file.readline()
+
+
 class dsp(object):
     def __init__(self, output):
         self.samp_rate = 250000
@@ -94,19 +165,18 @@ class dsp(object):
         self.secondary_fft_size = 1024
         self.secondary_process_fft = None
         self.secondary_process_demod = None
-        self.pipe_names = [
-            "bpf_pipe",
-            "shift_pipe",
-            "squelch_pipe",
-            "smeter_pipe",
-            "meta_pipe",
-            "iqtee_pipe",
-            "iqtee2_pipe",
-            "dmr_control_pipe",
-        ]
+        self.pipe_names = {
+            "bpf_pipe": Pipe.WRITE,
+            "shift_pipe": Pipe.WRITE,
+            "squelch_pipe": Pipe.WRITE,
+            "smeter_pipe": Pipe.READ,
+            "meta_pipe": Pipe.READ,
+            "iqtee_pipe": Pipe.NONE,
+            "iqtee2_pipe": Pipe.NONE,
+            "dmr_control_pipe": Pipe.WRITE,
+        }
         self.pipes = {}
-        self.pipe_files = {}
-        self.secondary_pipe_names = ["secondary_shift_pipe"]
+        self.secondary_pipe_names = {"secondary_shift_pipe": Pipe.WRITE}
         self.secondary_offset_freq = 1000
         self.unvoiced_quality = 1
         self.modification_lock = threading.Lock()
@@ -380,14 +450,12 @@ class dsp(object):
 
         # open control pipes for csdr and send initialization data
         if self.has_pipe("secondary_shift_pipe"):  # TODO digimodes
-            self.pipe_files["secondary_shift_pipe"] = open(self.pipes["secondary_shift_pipe"], "w")  # TODO digimodes
             self.set_secondary_offset_freq(self.secondary_offset_freq)  # TODO digimodes
 
     def set_secondary_offset_freq(self, value):
         self.secondary_offset_freq = value
         if self.secondary_processes_running and self.has_pipe("secondary_shift_pipe"):
-            self.pipe_files["secondary_shift_pipe"].write("%g\n" % (-float(self.secondary_offset_freq) / self.if_samp_rate()))
-            self.pipe_files["secondary_shift_pipe"].flush()
+            self.pipes["secondary_shift_pipe"].write("%g\n" % (-float(self.secondary_offset_freq) / self.if_samp_rate()))
 
     def stop_secondary_demodulator(self):
         if not self.secondary_processes_running:
@@ -534,18 +602,16 @@ class dsp(object):
         self.offset_freq = offset_freq
         if self.running:
             with self.modification_lock:
-                self.pipe_files["shift_pipe"].write("%g\n" % (-float(self.offset_freq) / self.samp_rate))
-                self.pipe_files["shift_pipe"].flush()
+                self.pipes["shift_pipe"].write("%g\n" % (-float(self.offset_freq) / self.samp_rate))
 
     def set_bpf(self, low_cut, high_cut):
         self.low_cut = low_cut
         self.high_cut = high_cut
         if self.running:
             with self.modification_lock:
-                self.pipe_files["bpf_pipe"].write(
+                self.pipes["bpf_pipe"].write(
                     "%g %g\n" % (float(self.low_cut) / self.if_samp_rate(), float(self.high_cut) / self.if_samp_rate())
                 )
-                self.pipe_files["bpf_pipe"].flush()
 
     def get_bpf(self):
         return [self.low_cut, self.high_cut]
@@ -559,8 +625,7 @@ class dsp(object):
         actual_squelch = -150 if self.isDigitalVoice() or self.isPacket() or self.isPocsag() else self.squelch_level
         if self.running:
             with self.modification_lock:
-                self.pipe_files["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch)))
-                self.pipe_files["squelch_pipe"].flush()
+                self.pipes["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch)))
 
     def set_unvoiced_quality(self, q):
         self.unvoiced_quality = q
@@ -571,25 +636,21 @@ class dsp(object):
 
     def set_dmr_filter(self, filter):
         if self.has_pipe("dmr_control_pipe"):
-            self.pipe_files["dmr_control_pipe"].write("{0}\n".format(filter))
-            self.pipe_files["dmr_control_pipe"].flush()
-
-    def mkfifo(self, path):
-        try:
-            os.unlink(path)
-        except:
-            pass
-        os.mkfifo(path)
+            self.pipes["dmr_control_pipe"].write("{0}\n".format(filter))
 
     def ddc_transition_bw(self):
         return self.ddc_transition_bw_rate * (self.if_samp_rate() / float(self.samp_rate))
 
     def try_create_pipes(self, pipe_names, command_base):
-        for pipe_name in pipe_names:
+        for pipe_name, pipe_type in pipe_names.items():
             if "{" + pipe_name + "}" in command_base:
                 p = self.pipe_base_path + pipe_name
-                self.pipes[pipe_name] = p
-                self.mkfifo(p)
+                encoding = None
+                # TODO make digiham output unicode and then change this here
+                #      the whole pipe enoding feature onlye exists because of this
+                if pipe_name == "meta_pipe":
+                    encoding = "cp437"
+                self.pipes[pipe_name] = Pipe.create(p, pipe_type, encoding=encoding)
             else:
                 self.pipes[pipe_name] = None
 
@@ -599,16 +660,8 @@ class dsp(object):
     def try_delete_pipes(self, pipe_names):
         for pipe_name in pipe_names:
             if self.has_pipe(pipe_name):
-                pipe_path = self.pipes[pipe_name]
-                try:
-                    os.unlink(pipe_path)
-                except FileNotFoundError:
-                    # it seems like we keep calling this twice. no idea why, but we don't need the resulting error.
-                    pass
-                except Exception:
-                    logger.exception("try_delete_pipes()")
-                finally:
-                    self.pipes[pipe_name] = None
+                self.pipes[pipe_name].close()
+                self.pipes[pipe_name] = None
 
     def try_create_configs(self, command):
         if "{direwolf_config}" in command:
@@ -701,23 +754,16 @@ class dsp(object):
 
             self.start_secondary_demodulator()
 
-            # open control pipes for csdr
-            for p in ["bpf_pipe", "shift_pipe", "squelch_pipe", "dmr_control_pipe"]:
-                if self.has_pipe(p):
-                    self.pipe_files[p] = open(self.pipes[p], "w")
-
         # send initial config through the pipes
-        if self.has_pipe("squelch_pipe"):
-            self.set_squelch_level(self.squelch_level)
-        if self.has_pipe("shift_pipe"):
-            self.set_offset_freq(self.offset_freq)
         if self.has_pipe("bpf_pipe"):
             self.set_bpf(self.low_cut, self.high_cut)
+        if self.has_pipe("shift_pipe"):
+            self.set_offset_freq(self.offset_freq)
+        if self.has_pipe("squelch_pipe"):
+            self.set_squelch_level(self.squelch_level)
         if self.has_pipe("smeter_pipe"):
-            self.pipe_files["smeter_pipe"] = open(self.pipes["smeter_pipe"], "r")
-
             def read_smeter():
-                raw = self.pipe_files["smeter_pipe"].readline()
+                raw = self.pipes["smeter_pipe"].readline()
                 if len(raw) == 0:
                     return None
                 else:
@@ -725,11 +771,8 @@ class dsp(object):
 
             self.output.send_output("smeter", read_smeter)
         if self.has_pipe("meta_pipe"):
-            # TODO make digiham output unicode and then change this here
-            self.pipe_files["meta_pipe"] = open(self.pipes["meta_pipe"], "r", encoding="cp437")
-
             def read_meta():
-                raw = self.pipe_files["meta_pipe"].readline()
+                raw = self.pipes["meta_pipe"].readline()
                 if len(raw) == 0:
                     return None
                 else:
@@ -737,6 +780,10 @@ class dsp(object):
 
             self.output.send_output("meta", read_meta)
 
+        if self.csdr_dynamic_bufsize:
+            self.process.stdout.read(8)  # dummy read to skip bufsize & preamble
+            logger.debug("Note: CSDR_DYNAMIC_BUFSIZE_ON = 1")
+
     def stop(self):
         with self.modification_lock:
             self.running = False
diff --git a/owrx/fft.py b/owrx/fft.py
index 246f110..b1c61de 100644
--- a/owrx/fft.py
+++ b/owrx/fft.py
@@ -66,10 +66,6 @@ class SpectrumThread(csdr.output):
         return t == "audio"
 
     def receive_output(self, type, read_fn):
-        if self.props["csdr_dynamic_bufsize"]:
-            read_fn(8)  # dummy read to skip bufsize & preamble
-            logger.debug("Note: CSDR_DYNAMIC_BUFSIZE_ON = 1")
-
         threading.Thread(target=self.pump(read_fn, self.sdrSource.writeSpectrumData)).start()
 
     def stop(self):

From b8c71109b87152621711872f0af52a11805329ce Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 28 Feb 2020 00:30:41 +0100
Subject: [PATCH 076/475] initialize dmr filter, too

---
 csdr/csdr.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 9dc52b5..95f6a0d 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -755,6 +755,8 @@ class dsp(object):
             self.start_secondary_demodulator()
 
         # send initial config through the pipes
+        # the sequencing here is essential; the pipes must be opened in the order that they appear in the command,
+        # otherwise deadlocks will occur.
         if self.has_pipe("bpf_pipe"):
             self.set_bpf(self.low_cut, self.high_cut)
         if self.has_pipe("shift_pipe"):
@@ -779,6 +781,8 @@ class dsp(object):
                     return raw.rstrip("\n")
 
             self.output.send_output("meta", read_meta)
+        if self.has_pipe("dmr_control_pipe"):
+            self.set_dmr_filter(3)
 
         if self.csdr_dynamic_bufsize:
             self.process.stdout.read(8)  # dummy read to skip bufsize & preamble

From 10523dbbd7df12c1c64465b560f2f96b0570e25a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 28 Feb 2020 16:13:53 +0100
Subject: [PATCH 077/475] use threading to uncouble the queues

---
 csdr/csdr.py | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 95f6a0d..4ef95f6 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -110,15 +110,36 @@ class Pipe(object):
 
 class WritingPipe(Pipe):
     def __init__(self, path, encoding=None):
+        self.queue = []
+        self.queueLock = threading.Lock()
         super().__init__(path, "w", encoding=encoding)
+        self.open()
+
+    def open_and_dequeue(self):
+        super().open()
+        with self.queueLock:
+            for i in self.queue:
+                self.file.write(i)
+            self.file.flush()
+            self.queue = None
+
+    def open(self):
+        threading.Thread(target=self.open_and_dequeue).start()
 
     def write(self, data):
         if self.file is None:
-            self.open()
-        r =self.file.write(data)
+            with self.queueLock:
+                self.queue.append(data)
+            return
+        r = self.file.write(data)
         self.file.flush()
         return r
 
+    def close(self):
+        if self.file is None:
+            logger.warning("queue %s never successfully opened - thread leak!", self.path)
+        super().close()
+
 
 class ReadingPipe(Pipe):
     def __init__(self, path, encoding=None):

From 8abfe059b71874445a4fa57a6464bffc3c144fc6 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 28 Feb 2020 16:55:50 +0100
Subject: [PATCH 078/475] now the sequence doesn't matter any more

---
 csdr/csdr.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 4ef95f6..2795002 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -776,14 +776,15 @@ class dsp(object):
             self.start_secondary_demodulator()
 
         # send initial config through the pipes
-        # the sequencing here is essential; the pipes must be opened in the order that they appear in the command,
-        # otherwise deadlocks will occur.
         if self.has_pipe("bpf_pipe"):
             self.set_bpf(self.low_cut, self.high_cut)
         if self.has_pipe("shift_pipe"):
             self.set_offset_freq(self.offset_freq)
         if self.has_pipe("squelch_pipe"):
             self.set_squelch_level(self.squelch_level)
+        if self.has_pipe("dmr_control_pipe"):
+            self.set_dmr_filter(3)
+
         if self.has_pipe("smeter_pipe"):
             def read_smeter():
                 raw = self.pipes["smeter_pipe"].readline()
@@ -802,8 +803,6 @@ class dsp(object):
                     return raw.rstrip("\n")
 
             self.output.send_output("meta", read_meta)
-        if self.has_pipe("dmr_control_pipe"):
-            self.set_dmr_filter(3)
 
         if self.csdr_dynamic_bufsize:
             self.process.stdout.read(8)  # dummy read to skip bufsize & preamble

From 6b4509fca5c7680ed3b8f2ad67d405f2b77da44a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 2 Mar 2020 21:55:21 +0100
Subject: [PATCH 079/475] update owrx_connector

---
 docker/scripts/install-connectors.sh | 2 +-
 owrx/feature.py                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh
index 5025081..caf5b18 100755
--- a/docker/scripts/install-connectors.sh
+++ b/docker/scripts/install-connectors.sh
@@ -24,6 +24,6 @@ apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 
 git clone https://github.com/jketterl/owrx_connector.git
-cmakebuild owrx_connector 22a34fe649a0121a79262f54e99e9aa864b1536f
+cmakebuild owrx_connector b68210e59b8475ed3dfc4dfb25de0b0a63193b87
 
 apk del .build-deps
diff --git a/owrx/feature.py b/owrx/feature.py
index ee49bc1..7e7bf9c 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -194,7 +194,7 @@ class FeatureDetector(object):
         )
 
     def _check_connector(self, command):
-        required_version = LooseVersion("0.1")
+        required_version = LooseVersion("0.2")
 
         owrx_connector_version_regex = re.compile("^owrx-connector version (.*)$")
 

From c2702e02a986afae58f6663fc1461e4b7daa58e4 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 5 Mar 2020 17:52:40 +0100
Subject: [PATCH 080/475] use the recommended way to generate google maps urls

---
 htdocs/openwebrx.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 00bd21f..384776d 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1097,7 +1097,8 @@ function on_ws_recv(evt) {
                     case "receiver_details":
                         var r = json['value'];
                         e('webrx-rx-title').innerHTML = r['receiver_name'];
-                        e('webrx-rx-desc').innerHTML = r['receiver_location'] + ' | Loc: ' + r['locator'] + ', ASL: ' + r['receiver_asl'] + ' m, <a href="https://www.google.hu/maps/place/' + r['receiver_gps'][0] + ',' + r['receiver_gps'][1] + '" target="_blank" onclick="dont_toggle_rx_photo();">[maps]</a>';
+                        var query = encodeURIComponent(r['receiver_gps'][0] + ',' + r['receiver_gps'][1]);
+                        e('webrx-rx-desc').innerHTML = r['receiver_location'] + ' | Loc: ' + r['locator'] + ', ASL: ' + r['receiver_asl'] + ' m, <a href="https://www.google.com/maps/search/?api=1&query=' + query + '" target="_blank" onclick="dont_toggle_rx_photo();">[maps]</a>';
                         e('webrx-rx-photo-title').innerHTML = r['photo_title'];
                         e('webrx-rx-photo-desc').innerHTML = r['photo_desc'];
                         break;

From beb59da6a6497fc7b3fd3a1753c19956864abbac Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 5 Mar 2020 20:53:47 +0100
Subject: [PATCH 081/475] remove incomplete setup instructions and link to the
 wiki

---
 README.md | 56 ++++++-------------------------------------------------
 1 file changed, 6 insertions(+), 50 deletions(-)

diff --git a/README.md b/README.md
index 25a70ea..fa12827 100644
--- a/README.md
+++ b/README.md
@@ -19,58 +19,14 @@ It has the following features:
 
 ## Setup
 
-### Raspberry Pi SD Card Images
+The following methods of setting up a receiver are currently available:
 
-Probably the quickest way to get started is to download the latest Raspberry Pi SD Card Image. It contains all the
-depencencies out of the box, and should work on all Raspberry Pis. It is based off the Raspbian Lite distribution,
-so [their installation instructions](https://www.raspberrypi.org/documentation/installation/installing-images/) apply.
+- Raspberry Pi SD card images
+- Debian repository
+- Docker images
+- Manual installation
 
-You can find the latest images [here](https://s3.eu-central-1.amazonaws.com/de.dd5jfk.openwebrx/index.html). You can
-also checkout the `nightly` folder, which has the most recent builds, albeit untested.
-
-Once you have booted a Raspberry with the SD Card, it will appear in your network with the hostname "openwebrx", which
-should make it available as https://openwebrx/ on most networks. This may vary depending on your specific setup.
-
-For Digital voice, the minimum requirement right now seems to be a Rasbperry Pi 3B+. I would like to work on optimizing
-this for lower specs, but at this point I am not sure how much can be done. 
-
-### Docker Images
-
-For those familiar with docker, I am providing
-[recent builds and Releases for both x86 and arm processors on the Docker hub](https://hub.docker.com/r/jketterl/openwebrx).
-You can find a short introduction there.
-
-### Manual Installation
-
-OpenWebRX currently requires Linux and python >= 3.6 to run. 
-
-First you will need to install the dependencies:
-
-- [csdr](https://github.com/jketterl/csdr)
-- [rtl-sdr](http://sdr.osmocom.org/trac/wiki/rtl-sdr)
-- [owrx_connector](https://github.com/jketterl/owrx_connector)
-
-Optional dependencies if you want to be able to listen do digital voice:
-
-- [digiham](https://github.com/jketterl/digiham)
-- [dsd](https://github.com/f4exb/dsdcc)
-
-Optional dependency if you want to decode WSJT-X modes:
-
-- [wsjt-x](https://physics.princeton.edu/pulsar/k1jt/wsjtx.html)
-
-[Detailed installation instructions in the Wiki](https://github.com/jketterl/openwebrx/wiki/Manual-Package-installation-(including-digital-voice))
-
-After cloning this repository and connecting an RTL-SDR dongle to your computer, you can run the server:
-
-	./openwebrx.py
-	
-You can now open the GUI at <a href="http://localhost:8073">http://localhost:8073</a>.
-
-Now the next step is to customize the parameters of your server in `config_webrx.py`.
-
-Actually, if you do something cool with OpenWebRX, please drop me a mail:  
-*Jakob Ketterl, DD5JFK &lt;dd5jfk@darc.de&gt;*
+Please checkout the [setup guide on the wiki](https://github.com/jketterl/openwebrx/wiki/Setup-Guide) for more details on the respective methods.
 
 ## Usage tips
 

From 14b293e0cb96fb6585f417238a049f96f89c0c2a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 5 Mar 2020 22:03:19 +0100
Subject: [PATCH 082/475] add note about groups.io

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fa12827..9cf56c8 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,14 @@ The following methods of setting up a receiver are currently available:
 - Docker images
 - Manual installation
 
-Please checkout the [setup guide on the wiki](https://github.com/jketterl/openwebrx/wiki/Setup-Guide) for more details on the respective methods.
+Please checkout the [setup guide on the wiki](https://github.com/jketterl/openwebrx/wiki/Setup-Guide) for more details
+on the respective methods.
+
+## Community
+
+If you have trouble setting up or configuring your receiver, you have some great idea you want to see implemented, or
+you just generally want to have some OpenWebRX-related chat, come visit us over on
+[our groups.io group](https://groups.io/g/openwebrx).
 
 ## Usage tips
 

From 687e504af449227b674979932686a3af0020cf2c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 7 Mar 2020 20:53:17 +0100
Subject: [PATCH 083/475] replace links

---
 README.md                          | 2 +-
 htdocs/include/header.include.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9cf56c8..30f5e08 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ OpenWebRX
 
 OpenWebRX is a multi-user SDR receiver software with a web interface.
 
-![OpenWebRX](http://blog.sdr.hu/images/openwebrx/screenshot.png)
+![OpenWebRX](https://www.openwebrx.de/gfx/openwebrx-screenshot.png)
 
 It has the following features:
 
diff --git a/htdocs/include/header.include.html b/htdocs/include/header.include.html
index a86e4b4..8bba3c8 100644
--- a/htdocs/include/header.include.html
+++ b/htdocs/include/header.include.html
@@ -2,7 +2,7 @@
     <div id="webrx-top-photo-clip">
         <img src="static/gfx/openwebrx-top-photo.jpg" id="webrx-top-photo"/>
         <div id="webrx-top-bar" class="webrx-top-bar-parts">
-            <a href="https://sdr.hu/openwebrx" target="_blank"><img src="static/gfx/openwebrx-top-logo.png" id="webrx-top-logo" /></a>
+            <a href="https://www.openwebrx.de/" target="_blank"><img src="static/gfx/openwebrx-top-logo.png" id="webrx-top-logo" /></a>
             <a href="http://ha5kfu.sch.bme.hu/" target="_blank"><img src="static/gfx/openwebrx-ha5kfu-top-logo.png" id="webrx-ha5kfu-top-logo" /></a>
             <img id="webrx-rx-avatar" class="openwebrx-photo-trigger" src="static/gfx/openwebrx-avatar.png"/>
             <div id="webrx-rx-texts">

From 4928f8092956f40ccb0397b480f78ba6aaac157f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 7 Mar 2020 21:23:08 +0100
Subject: [PATCH 084/475] let's try to close that bracket

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 30f5e08..f3862d7 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ However, if you hold down the shift key, you can drag the center line (BFO) or t
 ## Licensing
 
 OpenWebRX is available under Affero GPL v3 license
-([summary](https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0)).
+([summary](https://tldrlegal.com/license/gnu-affero-general-public-license-v3-(agpl-3.0))).
 
 OpenWebRX is also available under a commercial license on request. Please contact me at the address
 *&lt;randras@sdr.hu&gt;* for licensing options. 

From 6ab77f958cc87731f4c7bc20bc59c14b1ebe03b6 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 8 Mar 2020 21:28:15 +0100
Subject: [PATCH 085/475] add settings button, start with the admin template

---
 htdocs/admin.html                          |  15 +++++++++++++++
 htdocs/gfx/openwebrx-panel-settings.png    | Bin 0 -> 1440 bytes
 htdocs/include/header.include.html         |   1 +
 owrx/controllers/{settings.py => admin.py} |   6 +++---
 owrx/controllers/session.py                |   2 +-
 owrx/http.py                               |   4 ++--
 6 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 htdocs/admin.html
 create mode 100644 htdocs/gfx/openwebrx-panel-settings.png
 rename owrx/controllers/{settings.py => admin.py} (81%)

diff --git a/htdocs/admin.html b/htdocs/admin.html
new file mode 100644
index 0000000..d9b8c66
--- /dev/null
+++ b/htdocs/admin.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <title>OpenWebRX Settings</title>
+    <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link rel="stylesheet" type="text/css" href="static/css/login.css" />
+    <meta charset="utf-8">
+</head>
+<body>
+${header}
+<div>
+    Admin-only area!
+</div>
+</body>
\ No newline at end of file
diff --git a/htdocs/gfx/openwebrx-panel-settings.png b/htdocs/gfx/openwebrx-panel-settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..b209b87c94cfd9c9f44b19a36b0b9c305e92fed9
GIT binary patch
literal 1440
zcmV;R1z-A!P)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iTct%Rf_9MNkfAzRkSgM+RVYG*P%E_RU~=gfG-*gu
zTpR`0f`cE6RR<SmT^(EnLGS~_$<ayCMN0f%QfLw5!Ery{-Fw`<1N_Y@Q_Y?UK-DZG
zlS&G?{HhRqMF1fTB8r5>Onpui)9@T$_we!cF3z*O&;2?2m4e9tpFljzbi*RvAfDc|
zbk6(45muHI;&bA0gDyz?$aUG}H_j!8{X8>bWHa-`5n`d##c~(3vY`@B5yuo&qkMnP
zWrgz=XSG^q?R)YUh6~!tGS_L2AcaLNL4*JqbyQG=g*dGmDJC+spY-rY9luB}nOqex
zax9<*6_Voz|AXJ%n#IY4n-oq0y)U-?F$x5CfmXw|zmILZbpiyQfh(=!uQh?0PtqG5
zEp`M9Yy%h99ZlW?E_Z<8CtWfmM+(sN7mL9A8GTb87`g@e*4*CO`#607veZ@j1~@nb
z#!8gE?(yzWcW?imY4`U7a42%7-XZ2C00006VoOIv0IvYA0I#2U7aRZp010qNS#tmY
z4c7nw4c7reD4Tcy000McNliru<O2v3EDf6Vt1$oo1D#1kK~z}7?U+w&R8<tlzguIQ
zwgwXe<<AK1NJvar+jJO2s-XoH7qo!|3F-n32?BO);!46!H>MCxY}9~@22CIcfv}J?
zU^KM+F`6g{YLq_-qP7DR=#Pb8$>jM4UwVhK=}jhi@7{CH{oc9feCOPerpDB`zazvN
z0G^Tbx};kF{*m-v2;rL;yET!Z9+9+1QiG(QBz-Swnxq3j?E`Z+uoxHx8q4M$1#SUt
zlL256FaY!e%|H!M1daiRQsfT-$APE)-fZ0gpinJPF90QAJ8%FP1}@nvyMWm#I<tUJ
zE%PfdV%;5nem)jdn?d#XJpjvrSAlsM^dARa20DS@xi<~2Ee6;z;Qjj$8oj{Ln5?`g
zsb&0Ys{|@YYL@gzjFBho_GJ~;bHFy>G;qVmejIokm{mci!*QCA@z^;@Ba(6{8?2V}
zgQQMLA4%$xv_{e{NvkA%2Xv*_%t;!SbUwyo?ar*ZiTPFLuT4&f1;A^-dIx+Bu*F{N
zO6bnB&Gv}^dKf4GgTT(j+DzbYU^7q$^Z{eQFTii!wAVJa09SyfgpGb5c_DL!09tMA
zCU6*-lUUzsqXGEDV3wAx7tCGTEi(kXld#bQ9P~&03AAPbwiDRxI+(V8!d&zua2qJ5
z$P~Qke4qyys$i=T*qc0+O2OYK>1+sLxB~XPq*IcLl70>$4E(2M3E`-NyH(O@N%K=%
zn-E4Mot0FdH7oCR?xT_(${4N<mL2;aW(Zk;l_ceX`U-}Al(bONL6dK5$`L&!sYTL&
zWzSVO%6iL{vew6|4*vZq8TD3K@P7cDH;}uaJlAL17y`DY1pil#(W{y3rfHyPqkW0B
z$4nP*0JXq}4)inr-3C4e>P;zsC98nDl0olLHxWL2&Yqi{n12zt4s0wV*tI6uh4$2D
zlW=!R$1yR2Ei+Q%-fLaTS~qan$J*l>*y-m%d$l`7?-k%eRAT_NxQKUDSfAk{e$sLy
ze%_YWKw78MMZ7r%*yq5P)oy#7RQ)mC#T=6@Rl6_#YwL`pxv`g!60oW4Ydah#xeWR_
zU>&fmthL?%TpPcr#DH6AL%qO01O46E`WY}iMW@L%_m*W#)_vE{FIDsY_%-mwc;^W`
zYo6PmB7el0+3xqe8-s6wC6jUAESjqt5*@=>?ENuB0;`jBNz&o6Ryi+eiKLk!gwY4`
u-$e-FhI{^N29)<5VMPq6sWCMsW848QF=)P$V;zM60000<MNUMnLSTX(X^}<%

literal 0
HcmV?d00001

diff --git a/htdocs/include/header.include.html b/htdocs/include/header.include.html
index 8bba3c8..13591cc 100644
--- a/htdocs/include/header.include.html
+++ b/htdocs/include/header.include.html
@@ -19,6 +19,7 @@
                     <li data-toggle-panel="openwebrx-panel-log"><img  src="static/gfx/openwebrx-panel-log.png" /><br/>Log</li>
                     <li data-toggle-panel="openwebrx-panel-receiver"><img src="static/gfx/openwebrx-panel-receiver.png" /><br/>Receiver</li>
                     <li><a href="map" target="_blank"><img src="static/gfx/openwebrx-panel-map.png" /><br/>Map</a></li>
+                    <li><a href="admin" target="_blank"><img src="static/gfx/openwebrx-panel-settings.png" /><br/>Settings</a></li>
                 </ul>
             </section>
         </div>
diff --git a/owrx/controllers/settings.py b/owrx/controllers/admin.py
similarity index 81%
rename from owrx/controllers/settings.py
rename to owrx/controllers/admin.py
index 748c646..a775068 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/admin.py
@@ -1,4 +1,4 @@
-from . import Controller
+from .template import WebpageController
 from .session import SessionStorage
 
 
@@ -10,7 +10,7 @@ class Authentication(object):
         return False
 
 
-class SettingsController(Controller):
+class AdminController(WebpageController):
     def __init__(self, handler, request, options):
         self.authentication = Authentication()
         super().__init__(handler, request, options)
@@ -22,4 +22,4 @@ class SettingsController(Controller):
             self.send_redirect("/login")
 
     def indexAction(self):
-        self.send_response("actual content here")
+        self.serve_template("admin.html", **self.template_variables())
diff --git a/owrx/controllers/session.py b/owrx/controllers/session.py
index bb40bd4..7ebd1b1 100644
--- a/owrx/controllers/session.py
+++ b/owrx/controllers/session.py
@@ -47,7 +47,7 @@ class SessionController(WebpageController):
                 key = SessionStorage.getSharedInstance().startSession({"user": data["user"]})
                 cookie = SimpleCookie()
                 cookie["owrx-session"] = key
-                self.send_redirect("/settings", cookies=cookie)
+                self.send_redirect("/admin", cookies=cookie)
             else:
                 self.send_redirect("/login")
         else:
diff --git a/owrx/http.py b/owrx/http.py
index 07d7867..86fa8f1 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -11,7 +11,7 @@ from owrx.controllers.assets import (
 from owrx.controllers.websocket import WebSocketController
 from owrx.controllers.api import ApiController
 from owrx.controllers.metrics import MetricsController
-from owrx.controllers.settings import SettingsController
+from owrx.controllers.admin import AdminController
 from owrx.controllers.session import SessionController
 from http.server import BaseHTTPRequestHandler
 from urllib.parse import urlparse, parse_qs
@@ -100,7 +100,7 @@ class Router(object):
             StaticRoute("/features", FeatureController),
             StaticRoute("/api/features", ApiController),
             StaticRoute("/metrics", MetricsController),
-            StaticRoute("/settings", SettingsController),
+            StaticRoute("/admin", AdminController),
             StaticRoute("/login", SessionController, options={"action": "loginAction"}),
             StaticRoute("/login", SessionController, method="POST", options={"action": "processLoginAction"}),
             StaticRoute("/logout", SessionController, options={"action": "logoutAction"}),

From a2dc2b3085f25f3f7154d82ce52737b3c2dfefac Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 8 Mar 2020 22:33:41 +0100
Subject: [PATCH 086/475] align the icons

---
 htdocs/css/openwebrx-header.css | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/htdocs/css/openwebrx-header.css b/htdocs/css/openwebrx-header.css
index 34802f6..30b931a 100644
--- a/htdocs/css/openwebrx-header.css
+++ b/htdocs/css/openwebrx-header.css
@@ -123,16 +123,15 @@
 
 #openwebrx-main-buttons ul
 {
-    display: table;
     margin:0;
+    padding: 0;
 }
 
 
 #openwebrx-main-buttons ul li
 {
-    display: table-cell;
-    padding-left: 5px;
-    padding-right: 5px;
+    display: inline-block;
+    width: 55px;
     cursor:pointer;
 }
 

From b9ac887eed09f4758dc49830a85795502a6009e7 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 8 Mar 2020 23:23:36 +0100
Subject: [PATCH 087/475] add the first form elements

---
 htdocs/admin.html    | 46 +++++++++++++++++++++++++++++++++++++++++---
 htdocs/css/admin.css | 12 ++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 htdocs/css/admin.css

diff --git a/htdocs/admin.html b/htdocs/admin.html
index d9b8c66..6bcdd9e 100644
--- a/htdocs/admin.html
+++ b/htdocs/admin.html
@@ -4,12 +4,52 @@
     <title>OpenWebRX Settings</title>
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-    <link rel="stylesheet" type="text/css" href="static/css/login.css" />
+    <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
     <meta charset="utf-8">
 </head>
 <body>
 ${header}
-<div>
-    Admin-only area!
+<div class="container">
+    <div class="col-12">
+        <h1>Settings</h1>
+    </div>
+    <div class="col-12 settings-category">
+        <h3 class="settings-header">
+            General Settings
+        </h3>
+        <form class="settings-body">
+            <div class="form-group row">
+                <label class="col-form-label col-form-label-sm col-3" for="receiver_name">Receiver name</label>
+                <input type="text" class="form-control form-control-sm col-9" id="receiver_name" name="receiver_name" placeholder="Receiver name">
+            </div>
+            <div class="form-group row">
+                <label class="col-form-label col-form-label-sm col-3" for="receiver_location">Receiver location</label>
+                <input type="text" class="form-control form-control-sm col-9" id="receiver_location" name="receiver_location" placeholder="Receiver location">
+            </div>
+            <div class="form-group row">
+                <label class="col-form-label col-form-label-sm col-3" for="receiver_asl">Receiver elevation</label>
+                <div class="col-9 p-0">
+                    <input type="text" class="form-control form-control-sm" id="receiver_asl" name="receiver_asl" placeholder="Receiver elevation">
+                    <small class="form-text text-muted">Elevation in meters above mean see level</small>
+                </div>
+            </div>
+            <div class="form-group row">
+                <label class="col-form-label col-form-label-sm col-3" for="receiver_admin">Receiver admin</label>
+                <input type="text" class="form-control form-control-sm col-9" id="receiver_admin" name="receiver_admin" placeholder="Receiver admin">
+            </div>
+            <div class="form-group row">
+                <label class="col-form-label col-form-label-sm col-3" for="receiver_gps">Receiver coordinates</label>
+                <div class="col-9">Placeholder for a map widget to select receiver location</div>
+            </div>
+            <div class="form-group row">
+                <label class="col-form-label col-form-label-sm col-3" for="photo_title">Photo title</label>
+                <input type="text" class="form-control form-control-sm col-9" id="photo_title" name="photo_title" placeholder="Photo title">
+            </div>
+            <div class="form-group row">
+                <label class="col-form-label col-form-label-sm col-3" for="photo_desc">Photo description</label>
+                <textarea class="form-control form-control-sm col-9" id="photo_desc" name="photo_desc"></textarea>
+            </div>
+        </form>
+    </div>
 </div>
 </body>
\ No newline at end of file
diff --git a/htdocs/css/admin.css b/htdocs/css/admin.css
new file mode 100644
index 0000000..4c153de
--- /dev/null
+++ b/htdocs/css/admin.css
@@ -0,0 +1,12 @@
+@import url("openwebrx-header.css");
+@import url("openwebrx-globals.css");
+
+/* expandable photo not implemented in admin area page */
+#webrx-top-photo-clip {
+    max-height: 67px;
+}
+
+body {
+    background-color: #2e2e2e;
+    color: #DDD;
+}

From c385fd635b45c33520509edfd7cf01038cb2a904 Mon Sep 17 00:00:00 2001
From: Justin Settle <jus10@partlycloudy.org>
Date: Wed, 11 Mar 2020 10:27:46 -0400
Subject: [PATCH 088/475] Add fallback to use OpenStreetMap/Wikipedia Maps

---
 htdocs/map.js | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/htdocs/map.js b/htdocs/map.js
index 95cfa97..12f295b 100644
--- a/htdocs/map.js
+++ b/htdocs/map.js
@@ -215,13 +215,39 @@
                     case "config":
                         var config = json.value;
                         if (!map) $.getScript("https://maps.googleapis.com/maps/api/js?key=" + config.google_maps_api_key).done(function(){
-                            map = new google.maps.Map($('.openwebrx-map')[0], {
-                                center: {
-                                    lat: config.receiver_gps[0],
-                                    lng: config.receiver_gps[1]
-                                },
-                                zoom: 5
-                            });
+                            if (config.google_maps_api_key){
+                                map = new google.maps.Map($('.openwebrx-map')[0], {
+                                    center: {
+                                        lat: config.receiver_gps[0],
+                                        lng: config.receiver_gps[1]
+                                    },
+                                    zoom: 5
+                                });
+                            } else {
+                                var mapTypeIds = [];
+                                for(var type in google.maps.MapTypeId) {
+                                    mapTypeIds.push(google.maps.MapTypeId[type]);
+                                }
+                                mapTypeIds.push("OSM");
+
+                                map = new google.maps.Map($('.openwebrx-map')[0], {
+                                    center: {
+                                        lat: config.receiver_gps[0],
+                                        lng: config.receiver_gps[1]
+                                    },
+                                    zoom: 5,
+                                    mapTypeId: "OSM"
+                                });
+
+                                map.mapTypes.set("OSM", new google.maps.ImageMapType({
+                                    getTileUrl: function(coord, zoom) {
+                                        return "https://maps.wikimedia.org/osm-intl/" + zoom + "/" + coord.x + "/" + coord.y + ".png";
+                                    },
+                                    tileSize: new google.maps.Size(256, 256),
+                                    name: "OpenStreetMap",
+                                    maxZoom: 18
+                                }));
+                            }
                             $.getScript("static/lib/nite-overlay.js").done(function(){
                                 nite.init(map);
                                 setInterval(function() { nite.refresh() }, 10000); // every 10s

From ede40e4a688802e718ab608fc70c5dca5d2f40e6 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 13 Mar 2020 23:53:14 +0100
Subject: [PATCH 089/475] always add OSM source, switch when no google maps key
 is present.

---
 htdocs/map.js | 49 ++++++++++++++++++-------------------------------
 1 file changed, 18 insertions(+), 31 deletions(-)

diff --git a/htdocs/map.js b/htdocs/map.js
index 12f295b..1fb2ec5 100644
--- a/htdocs/map.js
+++ b/htdocs/map.js
@@ -215,39 +215,26 @@
                     case "config":
                         var config = json.value;
                         if (!map) $.getScript("https://maps.googleapis.com/maps/api/js?key=" + config.google_maps_api_key).done(function(){
-                            if (config.google_maps_api_key){
-                                map = new google.maps.Map($('.openwebrx-map')[0], {
-                                    center: {
-                                        lat: config.receiver_gps[0],
-                                        lng: config.receiver_gps[1]
-                                    },
-                                    zoom: 5
-                                });
-                            } else {
-                                var mapTypeIds = [];
-                                for(var type in google.maps.MapTypeId) {
-                                    mapTypeIds.push(google.maps.MapTypeId[type]);
-                                }
-                                mapTypeIds.push("OSM");
+                            var mapTypeId = config.google_maps_api_key ? 'roadmap' : 'OSM';
 
-                                map = new google.maps.Map($('.openwebrx-map')[0], {
-                                    center: {
-                                        lat: config.receiver_gps[0],
-                                        lng: config.receiver_gps[1]
-                                    },
-                                    zoom: 5,
-                                    mapTypeId: "OSM"
-                                });
+                            map = new google.maps.Map($('.openwebrx-map')[0], {
+                                center: {
+                                    lat: config.receiver_gps[0],
+                                    lng: config.receiver_gps[1]
+                                },
+                                zoom: 5,
+                                mapTypeId: mapTypeId
+                            });
+
+                            map.mapTypes.set("OSM", new google.maps.ImageMapType({
+                                getTileUrl: function(coord, zoom) {
+                                    return "https://maps.wikimedia.org/osm-intl/" + zoom + "/" + coord.x + "/" + coord.y + ".png";
+                                },
+                                tileSize: new google.maps.Size(256, 256),
+                                name: "OpenStreetMap",
+                                maxZoom: 18
+                            }));
 
-                                map.mapTypes.set("OSM", new google.maps.ImageMapType({
-                                    getTileUrl: function(coord, zoom) {
-                                        return "https://maps.wikimedia.org/osm-intl/" + zoom + "/" + coord.x + "/" + coord.y + ".png";
-                                    },
-                                    tileSize: new google.maps.Size(256, 256),
-                                    name: "OpenStreetMap",
-                                    maxZoom: 18
-                                }));
-                            }
                             $.getScript("static/lib/nite-overlay.js").done(function(){
                                 nite.init(map);
                                 setInterval(function() { nite.refresh() }, 10000); // every 10s

From fb82daf936a259f9fe97f1e303469afeb4ee04eb Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 13 Mar 2020 23:55:45 +0100
Subject: [PATCH 090/475] add to changelog

---
 CHANGELOG.md     | 1 +
 debian/changelog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b57757..5233bc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 **unreleased**
 - Fix direwolf connection setup by implementing a retry loop
 - Pass direct sampling mode changes for rtl_sdr_soapy to owrx_connectorgit
+- OSM maps instead of Google when google_maps_api_key is not set (thanks @jquagga)
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index ffa7762..d775a62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 openwebrx (0.19.0) UNRELEASED; urgency=low
   * Fix direwolf connection setup by implementing a retry loop
   * Pass direct sampling mode changes for rtl_sdr_soapy to owrx_connector
+  * OSM maps instead of Google when google_maps_api_key is not set (thanks
+    @jquagga)
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From 5da2047935920d63800d2f65c39a8ed741280617 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 14 Mar 2020 01:04:52 +0100
Subject: [PATCH 091/475] introduce a generic mapping from sdr properties to
 soapy settings

---
 owrx/source/rtl_sdr_soapy.py | 16 ++++------------
 owrx/source/soapy.py         | 30 +++++++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/owrx/source/rtl_sdr_soapy.py b/owrx/source/rtl_sdr_soapy.py
index f6b9b94..fe85a31 100644
--- a/owrx/source/rtl_sdr_soapy.py
+++ b/owrx/source/rtl_sdr_soapy.py
@@ -1,19 +1,11 @@
 from .soapy import SoapyConnectorSource
-from owrx.command import Option
 
 
 class RtlSdrSoapySource(SoapyConnectorSource):
-    def getCommandMapper(self):
-        return super().getCommandMapper().setMappings({"direct_sampling": Option("-t direct_samp").setSpacer("=")})
+    def getSoapySettingsMappings(self):
+        mappings = super().getSoapySettingsMappings()
+        mappings.update({"direct_sampling": "direct_samp"})
+        return mappings
 
     def getDriver(self):
         return "rtlsdr"
-
-    def getEventNames(self):
-        return super().getEventNames() + ["direct_sampling"]
-
-    def onPropertyChange(self, prop, value):
-        if prop == "direct_sampling":
-            prop = "settings"
-            value = "direct_samp={0}".format(value)
-        super().onPropertyChange(prop, value)
diff --git a/owrx/source/soapy.py b/owrx/source/soapy.py
index 76ce625..fb307e6 100644
--- a/owrx/source/soapy.py
+++ b/owrx/source/soapy.py
@@ -1,12 +1,16 @@
 from abc import ABCMeta, abstractmethod
 from owrx.command import Option
-
 from .connector import ConnectorSource
 
 
 class SoapyConnectorSource(ConnectorSource, metaclass=ABCMeta):
     def getCommandMapper(self):
-        return super().getCommandMapper().setBase("soapy_connector").setMappings({"antenna": Option("-a")})
+        return super().getCommandMapper().setBase("soapy_connector").setMappings(
+            {
+                "antenna": Option("-a"),
+                "soapy_settings": Option("-t"),
+            }
+        )
 
     """
     must be implemented by child classes to be able to build a driver-based device selector by default.
@@ -20,7 +24,7 @@ class SoapyConnectorSource(ConnectorSource, metaclass=ABCMeta):
     def getEventNames(self):
         return super().getEventNames() + [
             "antenna",
-        ]
+        ] + list(self.getSoapySettingsMappings().keys())
 
     def parseDeviceString(self, dstr):
         def decodeComponent(c):
@@ -50,6 +54,16 @@ class SoapyConnectorSource(ConnectorSource, metaclass=ABCMeta):
         parsed += [{"driver": self.getDriver()}]
         return parsed
 
+    def getSoapySettingsMappings(self):
+        return {}
+
+    def buildSoapySettings(self, values):
+        settings = {}
+        for k, v in self.getSoapySettingsMappings().items():
+            if k in values:
+                settings[v] = values[k]
+        return settings
+
     def getCommandValues(self):
         values = super().getCommandValues()
         if "device" in values and values["device"] is not None:
@@ -58,4 +72,14 @@ class SoapyConnectorSource(ConnectorSource, metaclass=ABCMeta):
             parsed = []
         modified = self.buildSoapyDeviceParameters(parsed, values)
         values["device"] = self.encodeDeviceString(modified)
+        settings = ",".join(["{0}={1}".format(k, v) for k, v in self.buildSoapySettings(values).items()])
+        if len(settings):
+            values["soapy_settings"] = settings
         return values
+
+    def onPropertyChange(self, prop, value):
+        mappings = self.getSoapySettingsMappings()
+        if prop in mappings.keys():
+            value = "{0}={1}".format(mappings[prop], value)
+            prop = "settings"
+        super().onPropertyChange(prop, value)

From 4deb4c781ef2b858655e10278fad4776cca066b6 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 14 Mar 2020 01:13:23 +0100
Subject: [PATCH 092/475] use new mechanism for airspy bias-tee, too

---
 owrx/source/airspy.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/owrx/source/airspy.py b/owrx/source/airspy.py
index 4453da9..f8003ec 100644
--- a/owrx/source/airspy.py
+++ b/owrx/source/airspy.py
@@ -3,11 +3,10 @@ from .soapy import SoapyConnectorSource
 
 
 class AirspySource(SoapyConnectorSource):
-    def getCommandMapper(self):
-        return super().getCommandMapper().setMappings({"bias_tee": Flag("-t biastee=true")})
+    def getSoapySettingsMappings(self):
+        mappings = super().getSoapySettingsMappings()
+        mappings.update({"bias_tee": "biastee"})
+        return mappings
 
     def getDriver(self):
         return "airspy"
-
-    def getEventNames(self):
-        return super().getEventNames() + ["bias_tee"]

From e37e2f4540711fdb6f4a77823f534a80d3a910bc Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 14 Mar 2020 01:15:25 +0100
Subject: [PATCH 093/475] add biastee setting for sdrplay, too

---
 owrx/source/sdrplay.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/owrx/source/sdrplay.py b/owrx/source/sdrplay.py
index dac2983..1ebac37 100644
--- a/owrx/source/sdrplay.py
+++ b/owrx/source/sdrplay.py
@@ -2,5 +2,10 @@ from .soapy import SoapyConnectorSource
 
 
 class SdrplaySource(SoapyConnectorSource):
+    def getSoapySettingsMappings(self):
+        mappings = super().getSoapySettingsMappings()
+        mappings.update({"bias_tee": "biasT_ctrl"})
+        return mappings
+
     def getDriver(self):
         return "sdrplay"

From 7742d7a048d3e63abbd876ca297deadb1b7b23df Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 14 Mar 2020 01:21:30 +0100
Subject: [PATCH 094/475] don't include None values

---
 owrx/source/soapy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/source/soapy.py b/owrx/source/soapy.py
index fb307e6..e5ef480 100644
--- a/owrx/source/soapy.py
+++ b/owrx/source/soapy.py
@@ -60,7 +60,7 @@ class SoapyConnectorSource(ConnectorSource, metaclass=ABCMeta):
     def buildSoapySettings(self, values):
         settings = {}
         for k, v in self.getSoapySettingsMappings().items():
-            if k in values:
+            if k in values and values[k] is not None:
                 settings[v] = values[k]
         return settings
 

From fea2cd1cc5c00ac2fb7d4726cb72f51235e586ee Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 14 Mar 2020 01:21:43 +0100
Subject: [PATCH 095/475] add new settings mappings for rf_notch and dab_notch

---
 owrx/source/sdrplay.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/owrx/source/sdrplay.py b/owrx/source/sdrplay.py
index 1ebac37..9306b86 100644
--- a/owrx/source/sdrplay.py
+++ b/owrx/source/sdrplay.py
@@ -4,7 +4,13 @@ from .soapy import SoapyConnectorSource
 class SdrplaySource(SoapyConnectorSource):
     def getSoapySettingsMappings(self):
         mappings = super().getSoapySettingsMappings()
-        mappings.update({"bias_tee": "biasT_ctrl"})
+        mappings.update(
+            {
+                "bias_tee": "biasT_ctrl",
+                "rf_notch": "rfnotch_ctrl",
+                "dab_notch": "dabnotch_ctrl",
+            }
+        )
         return mappings
 
     def getDriver(self):

From c387fe0fe9b278f8f1ef2ae2a817033b4388cbd5 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 14 Mar 2020 01:56:17 +0100
Subject: [PATCH 096/475] add fictional bias_tee mapping for rtl_sdr_soapy

needs to be implemented in SoapyRTLSDR first
---
 owrx/source/rtl_sdr_soapy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/source/rtl_sdr_soapy.py b/owrx/source/rtl_sdr_soapy.py
index fe85a31..393286c 100644
--- a/owrx/source/rtl_sdr_soapy.py
+++ b/owrx/source/rtl_sdr_soapy.py
@@ -4,7 +4,7 @@ from .soapy import SoapyConnectorSource
 class RtlSdrSoapySource(SoapyConnectorSource):
     def getSoapySettingsMappings(self):
         mappings = super().getSoapySettingsMappings()
-        mappings.update({"direct_sampling": "direct_samp"})
+        mappings.update({"direct_sampling": "direct_samp", "bias_tee": "bias_tee"})
         return mappings
 
     def getDriver(self):

From 00a7b7877c903fd47a16a603b512e4e19ce92229 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 14 Mar 2020 23:06:52 +0100
Subject: [PATCH 097/475] update parameter to match latest dev code

---
 owrx/source/rtl_sdr_soapy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/source/rtl_sdr_soapy.py b/owrx/source/rtl_sdr_soapy.py
index 393286c..55744d5 100644
--- a/owrx/source/rtl_sdr_soapy.py
+++ b/owrx/source/rtl_sdr_soapy.py
@@ -4,7 +4,7 @@ from .soapy import SoapyConnectorSource
 class RtlSdrSoapySource(SoapyConnectorSource):
     def getSoapySettingsMappings(self):
         mappings = super().getSoapySettingsMappings()
-        mappings.update({"direct_sampling": "direct_samp", "bias_tee": "bias_tee"})
+        mappings.update({"direct_sampling": "direct_samp", "bias_tee": "biastee"})
         return mappings
 
     def getDriver(self):

From d2ce27eeab8ed822dcf916e39f7ed21a8298e8f7 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 14 Mar 2020 23:07:23 +0100
Subject: [PATCH 098/475] convert boolean values into something that soapy
 understands

---
 owrx/source/soapy.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/owrx/source/soapy.py b/owrx/source/soapy.py
index e5ef480..d4702c2 100644
--- a/owrx/source/soapy.py
+++ b/owrx/source/soapy.py
@@ -61,9 +61,14 @@ class SoapyConnectorSource(ConnectorSource, metaclass=ABCMeta):
         settings = {}
         for k, v in self.getSoapySettingsMappings().items():
             if k in values and values[k] is not None:
-                settings[v] = values[k]
+                settings[v] = self.convertSoapySettingsValue(values[k])
         return settings
 
+    def convertSoapySettingsValue(self, value):
+        if isinstance(value, bool):
+            return "true" if value else "false"
+        return value
+
     def getCommandValues(self):
         values = super().getCommandValues()
         if "device" in values and values["device"] is not None:
@@ -80,6 +85,6 @@ class SoapyConnectorSource(ConnectorSource, metaclass=ABCMeta):
     def onPropertyChange(self, prop, value):
         mappings = self.getSoapySettingsMappings()
         if prop in mappings.keys():
-            value = "{0}={1}".format(mappings[prop], value)
+            value = "{0}={1}".format(mappings[prop], self.convertSoapySettingsValue(value))
             prop = "settings"
         super().onPropertyChange(prop, value)

From 97cb51d990b4929211ffe5463e25c117cf81f418 Mon Sep 17 00:00:00 2001
From: Andrea Montefusco <andrew@montefusco.com>
Date: Sun, 15 Mar 2020 17:24:36 +0100
Subject: [PATCH 099/475] Perseus SDR HF receiver first support

---
 config_webrx.py           | 53 ++++++++++++++++++++++++++++++++++++++-
 owrx/feature.py           | 21 ++++++++++++++++
 owrx/source/perseussdr.py | 31 +++++++++++++++++++++++
 3 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 owrx/source/perseussdr.py

diff --git a/config_webrx.py b/config_webrx.py
index a568481..5ef9866 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -99,7 +99,7 @@ Note: if you experience audio underruns while CPU usage is 100%, you can:
 #################################################################################################
 
 # Currently supported types of sdr receivers:
-# "rtl_sdr", "sdrplay", "hackrf", "airspy", "airspyhf", "fifi_sdr"
+# "rtl_sdr", "sdrplay", "hackrf", "airspy", "airspyhf", "fifi_sdr", "perseussdr"
 #
 # In order to use rtl_sdr, you will need to install librtlsdr-dev and the connector.
 # In order to use sdrplay, airspy or airspyhf, you will need to install soapysdr, the corresponding driver, and the
@@ -107,6 +107,10 @@ Note: if you experience audio underruns while CPU usage is 100%, you can:
 #
 # https://github.com/jketterl/owrx_connector
 #
+# In order to use Perseus HF you need to install the libperseus-sdr
+#
+# https://github.com/Microtelecom/libperseus-sdr
+#
 # NOTE: The connector sources have replaced the old piped nmux style of reading input. If you still have any sdrs
 # configured that have type endin in "_connector", simply remove that suffix.
 
@@ -137,6 +141,53 @@ sdrs = {
             },
         },
     },
+    "perseussdr": {
+        "name": "Microtelecom Perseus HF receiver",
+        "type": "perseussdr",
+        "ppm": 0,
+        "profiles": {
+            "40m": {
+                "name": "40m",
+                "center_freq": 7150000,
+                "rf_gain": 0,
+                "samp_rate": 500000,
+                "start_freq": 7050000,
+                "start_mod": "lsb",
+            },
+            "20m": {
+                "name": "20m",
+                "center_freq": 14150000,
+                "rf_gain": 0,
+                "samp_rate": 500000,
+                "start_freq": 14070000,
+                "start_mod": "usb",
+            },
+            "30m": {
+                "name": "30m",
+                "center_freq": 10125000,
+                "rf_gain": 0,
+                "samp_rate": 192000,
+                "start_freq": 10142000,
+                "start_mod": "usb",
+            },
+            "80m": {
+                "name": "80m",
+                "center_freq": 3650000,
+                "rf_gain": 0,
+                "samp_rate": 500000,
+                "start_freq": 3570000,
+                "start_mod": "usb",
+            },
+            "49m": {
+                "name": "49m Broadcast",
+                "center_freq": 6000000,
+                "rf_gain": 0,
+                "samp_rate": 500000,
+                "start_freq": 6070000,
+                "start_mod": "am",
+            },
+        },
+    },
     "airspy": {
         "name": "Airspy HF+",
         "type": "airspyhf",
diff --git a/owrx/feature.py b/owrx/feature.py
index 7e7bf9c..e18aae9 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -25,6 +25,7 @@ class FeatureDetector(object):
         "rtl_sdr_soapy": ["soapy_connector", "soapy_rtl_sdr"],
         "sdrplay": ["soapy_connector", "soapy_sdrplay"],
         "hackrf": ["hackrf_transfer"],
+        "perseussdr": ["perseustest"],
         "airspy": ["soapy_connector", "soapy_airspy"],
         "airspyhf": ["soapy_connector", "soapy_airspyhf"],
         "lime_sdr": ["soapy_connector", "soapy_lime_sdr"],
@@ -150,6 +151,26 @@ class FeatureDetector(object):
         # TODO also check if it has the stdout feature
         return self.command_is_runnable("hackrf_transfer --help")
 
+    def has_perseustest(self):
+        """
+        To use a Microtelecom Perseus HF receiver, compile and
+        install the libperseus-sdr:
+        ```
+         sudo apt install libusb-1.0-0-dev
+         cd /tmp
+         wget https://github.com/Microtelecom/libperseus-sdr/releases/download/v0.7.5/libperseus_sdr-0.7.5.tar.gz
+         tar -zxvf libperseus_sdr-0.7.5.tar.gz
+         cd libperseus_sdr-0.7.5/
+         ./configure
+         make
+         sudo make install
+         sudo ldconfig
+         perseustest
+        ```
+        """
+        return self.command_is_runnable("perseustest -d -1 -a -t 1")
+
+
     def has_digiham(self):
         """
         To use digital voice modes, the digiham package is required. You can find the package and installation
diff --git a/owrx/source/perseussdr.py b/owrx/source/perseussdr.py
new file mode 100644
index 0000000..29c382a
--- /dev/null
+++ b/owrx/source/perseussdr.py
@@ -0,0 +1,31 @@
+from .direct import DirectSource
+from owrx.command import Flag, Option
+
+
+#
+# perseustest -s 768000 -u 0 -f 14150000 -r-|csdr convert_s8_f|nmux --bufsize 192512 --bufcnt 260 --port 35989 --address 127.0.0.1
+# perseustest -a -t0    -o -
+# perseustest -d 9 -a -t 100000 -o -  -s 768000 -u 0 -f 14150000 -r-
+
+class PerseussdrSource(DirectSource):
+    def getCommandMapper(self):
+        return super().getCommandMapper().setBase("perseustest -p -d -1 -a -t 100000 -o -  ").setMappings(
+            {
+                "samp_rate": Option("-s"),
+                "tuner_freq": Option("-f"),
+                "rf_gain": Option("-u"),
+                "lna_gain": Option("-g"),
+                "rf_amp": Option("-x"),
+            }
+        ).setStatic("-r-")
+
+    def getEventNames(self):
+        return super().getEventNames() + [
+            "lna_gain",
+            "rf_amp",
+        ]
+
+    def getFormatConversion(self):
+#        return ["csdr convert_s24_f --bigendian"]
+#        return ["csdr convert_s24_f", "csdr gain_ff 20"]
+        return ["csdr gain_ff 20"]

From 6e6861479de93bb819d08c1702bcd3e888c1a084 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 15 Mar 2020 18:45:24 +0100
Subject: [PATCH 100/475] fix bugs with negative lat / long; update formatting

ref: #81
---
 owrx/kiss.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/owrx/kiss.py b/owrx/kiss.py
index 374cc07..e24284f 100644
--- a/owrx/kiss.py
+++ b/owrx/kiss.py
@@ -40,8 +40,12 @@ IGLOGIN {callsign} {password}
 
             if pm["aprs_igate_beacon"]:
                 (lat, lon) = pm["receiver_gps"]
-                lat = "{0}^{1:.2f}{2}".format(int(lat), (lat - int(lat)) * 60, "N" if lat > 0 else "S")
-                lon = "{0}^{1:.2f}{2}".format(int(lon), (lon - int(lon)) * 60, "E" if lon > 0 else "W")
+                direction_ns = "N" if lat > 0 else "S"
+                direction_we = "E" if lon > 0 else "W"
+                lat = abs(lat)
+                lon = abs(lon)
+                lat = "{0:02d}^{1:05.2f}{2}".format(int(lat), (lat - int(lat)) * 60, direction_ns)
+                lon = "{0:03d}^{1:05.2f}{2}".format(int(lon), (lon - int(lon)) * 60, direction_we)
 
                 config += """
 PBEACON sendto=IG delay=0:30 every=60:00 symbol="igate" overlay=R lat={lat} long={lon} comment="OpenWebRX APRS gateway"

From ca5889f925875c3ab5d84f1cf972016f1d9bcf3b Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 15 Mar 2020 23:32:19 +0100
Subject: [PATCH 101/475] introduce config checking infrastructure

---
 owrx/__main__.py | 16 +++++++++++++---
 owrx/config.py   | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/owrx/__main__.py b/owrx/__main__.py
index d452e4a..109bf87 100644
--- a/owrx/__main__.py
+++ b/owrx/__main__.py
@@ -1,6 +1,6 @@
 from http.server import HTTPServer
 from owrx.http import RequestHandler
-from owrx.config import PropertyManager
+from owrx.config import PropertyManager, Config
 from owrx.feature import FeatureDetector
 from owrx.sdr import SdrService
 from socketserver import ThreadingMixIn
@@ -12,6 +12,7 @@ from owrx.pskreporter import PskReporter
 import logging
 
 logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+logger = logging.getLogger(__name__)
 
 
 class ThreadedHttpServer(ThreadingMixIn, HTTPServer):
@@ -32,13 +33,22 @@ Author contact info:    Jakob Ketterl, DD5JFK <dd5jfk@darc.de>
 
     pm = PropertyManager.getSharedInstance().loadConfig()
 
+    configErrors = Config.validateConfig()
+    if configErrors:
+        logger.error(
+            "your configuration contains errors. please address the following errors:"
+        )
+        for e in configErrors:
+            logger.error(e)
+        return
+
     featureDetector = FeatureDetector()
     if not featureDetector.is_available("core"):
-        print(
+        logger.error(
             "you are missing required dependencies to run openwebrx. "
             "please check that the following core requirements are installed:"
         )
-        print(", ".join(featureDetector.get_requirements("core")))
+        logger.error(", ".join(featureDetector.get_requirements("core")))
         return
 
     # Get error messages about unknown / unavailable features as soon as possible
diff --git a/owrx/config.py b/owrx/config.py
index 09bbd8f..b027f48 100644
--- a/owrx/config.py
+++ b/owrx/config.py
@@ -1,5 +1,6 @@
 import importlib.util
 import logging
+import os
 
 logger = logging.getLogger(__name__)
 
@@ -147,3 +148,36 @@ class PropertyManager(object):
             except FileNotFoundError:
                 pass
         raise ConfigNotFoundException("no usable config found! please make sure you have a valid configuration file!")
+
+
+class ConfigError(object):
+    def __init__(self, key, message):
+        self.key = key
+        self.message = message
+
+    def __str__(self):
+        return "Configuration Error (key: {0}): {1}".format(self.key, self.message)
+
+
+class Config:
+    @staticmethod
+    def validateConfig():
+        pm = PropertyManager.getSharedInstance()
+        errors = [
+            Config.checkTempDirectory(pm)
+        ]
+
+        return [e for e in errors if e is not None]
+
+    @staticmethod
+    def checkTempDirectory(pm: PropertyManager):
+        key = "temporary_directory"
+        if not key in pm or pm[key] is None:
+            return ConfigError(key, "temporary directory is not set")
+        if not os.path.exists(pm[key]):
+            return ConfigError(key, "temporary directory doesn't exist")
+        if not os.path.isdir(pm[key]):
+            return ConfigError(key, "temporary directory path is not a directory")
+        if not os.access(pm[key], os.W_OK):
+            return ConfigError(key, "temporary directory is not writable")
+        return None

From 1581c659afb221ae610712a22f63fc956d25ad3e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 15 Mar 2020 23:34:44 +0100
Subject: [PATCH 102/475] add version to startup messages

---
 owrx/__main__.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/owrx/__main__.py b/owrx/__main__.py
index 109bf87..ee68d80 100644
--- a/owrx/__main__.py
+++ b/owrx/__main__.py
@@ -8,6 +8,7 @@ from owrx.sdrhu import SdrHuUpdater
 from owrx.service import Services
 from owrx.websocket import WebSocketConnection
 from owrx.pskreporter import PskReporter
+from owrx.version import openwebrx_version
 
 import logging
 
@@ -31,6 +32,8 @@ Author contact info:    Jakob Ketterl, DD5JFK <dd5jfk@darc.de>
     """
     )
 
+    logger.info("OpenWebRX version {0} starting up...".format(openwebrx_version))
+
     pm = PropertyManager.getSharedInstance().loadConfig()
 
     configErrors = Config.validateConfig()

From edded220b500f2befb1186f172d97fbaef102ccc Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 15 Mar 2020 23:39:38 +0100
Subject: [PATCH 103/475] add the mailing list links

---
 htdocs/index.html | 1 +
 owrx/__main__.py  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/htdocs/index.html b/htdocs/index.html
index 3fabf73..fefefbc 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -127,6 +127,7 @@
                     <div class="nano-content">
                         <div id="openwebrx-client-log-title">OpenWebRX client log</div>
                         <div>Author contact: <a href="http://www.justjakob.de/" target="_blank">Jakob Ketterl, DD5JFK</a></div>
+                        <div>Support and information: <a href="https://groups.io/g/openwebrx" target="_blank">Groups.io Mailinglist</a></div>
                         <div id="openwebrx-debugdiv"></div>
                     </div>
                 </div>
diff --git a/owrx/__main__.py b/owrx/__main__.py
index ee68d80..948781f 100644
--- a/owrx/__main__.py
+++ b/owrx/__main__.py
@@ -28,6 +28,8 @@ OpenWebRX - Open Source SDR Web App for Everyone!  | for license see LICENSE fil
 _________________________________________________________________________________________________
 
 Author contact info:    Jakob Ketterl, DD5JFK <dd5jfk@darc.de>
+Documentation:          https://github.com/jketterl/openwebrx/wiki
+Support and info:       https://groups.io/g/openwebrx
 
     """
     )

From 68e8a77b1d279eca90fd9e2b76deb24b4b8a62a6 Mon Sep 17 00:00:00 2001
From: Andrea Montefusco <andrew@montefusco.com>
Date: Mon, 16 Mar 2020 00:13:51 +0100
Subject: [PATCH 104/475] more refinements as per Jakob Ketterl suggestions

---
 owrx/feature.py           |  8 ++++----
 owrx/source/perseussdr.py | 38 +++++++++++++++++++++++---------------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/owrx/feature.py b/owrx/feature.py
index e18aae9..f873847 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -158,9 +158,9 @@ class FeatureDetector(object):
         ```
          sudo apt install libusb-1.0-0-dev
          cd /tmp
-         wget https://github.com/Microtelecom/libperseus-sdr/releases/download/v0.7.5/libperseus_sdr-0.7.5.tar.gz
-         tar -zxvf libperseus_sdr-0.7.5.tar.gz
-         cd libperseus_sdr-0.7.5/
+         wget https://github.com/Microtelecom/libperseus-sdr/releases/download/v0.8.2/libperseus_sdr-0.8.2.tar.gz
+         tar -zxvf libperseus_sdr-0.8.2.tar.gz
+         cd libperseus_sdr-0.8.2/
          ./configure
          make
          sudo make install
@@ -168,7 +168,7 @@ class FeatureDetector(object):
          perseustest
         ```
         """
-        return self.command_is_runnable("perseustest -d -1 -a -t 1")
+        return self.command_is_runnable("perseustest -h")
 
 
     def has_digiham(self):
diff --git a/owrx/source/perseussdr.py b/owrx/source/perseussdr.py
index 29c382a..890600b 100644
--- a/owrx/source/perseussdr.py
+++ b/owrx/source/perseussdr.py
@@ -3,29 +3,37 @@ from owrx.command import Flag, Option
 
 
 #
-# perseustest -s 768000 -u 0 -f 14150000 -r-|csdr convert_s8_f|nmux --bufsize 192512 --bufcnt 260 --port 35989 --address 127.0.0.1
-# perseustest -a -t0    -o -
-# perseustest -d 9 -a -t 100000 -o -  -s 768000 -u 0 -f 14150000 -r-
+# In order to interface Perseus hardware, we resolve to use the
+# perseustest utility that comes with libperseus-sdr support package.
+# Below the base options used are shown:
+#
+# -p output    I/Q samples as 32 bits floating point
+# -d -1        suppress debug messages
+# -a           don't test attenuators on startup
+# -t 0         runs indefinitely
+# -o -         output samples on stdout
+#
+# As we are already returning I/Q samples as pairs of 32 bits
+# floating points (option -p),no need for further conversions,
+# so the method getFormatConversion(self) is not implemented at all.
 
 class PerseussdrSource(DirectSource):
     def getCommandMapper(self):
-        return super().getCommandMapper().setBase("perseustest -p -d -1 -a -t 100000 -o -  ").setMappings(
+        return super().getCommandMapper().setBase("perseustest -p -d -1 -a -t 0 -o -  ").setMappings(
             {
                 "samp_rate": Option("-s"),
                 "tuner_freq": Option("-f"),
-                "rf_gain": Option("-u"),
-                "lna_gain": Option("-g"),
-                "rf_amp": Option("-x"),
+                "attenuator": Option("-u"),
+                "adc_preamp": Option("-m"),
+                "adc_dither": Option("-x"),
+                "wideband": Option("-w"),
             }
-        ).setStatic("-r-")
+        )
 
     def getEventNames(self):
         return super().getEventNames() + [
-            "lna_gain",
-            "rf_amp",
+            "attenuator",
+            "adc_preamp",
+            "adc_dither",
+            "wideband",
         ]
-
-    def getFormatConversion(self):
-#        return ["csdr convert_s24_f --bigendian"]
-#        return ["csdr convert_s24_f", "csdr gain_ff 20"]
-        return ["csdr gain_ff 20"]

From 34ee5d8e3bfc9785906fdd0aced2fcae26bf20a3 Mon Sep 17 00:00:00 2001
From: Andrea Montefusco <andrew@montefusco.com>
Date: Mon, 16 Mar 2020 00:21:49 +0100
Subject: [PATCH 105/475] More info on Perseus integration.

---
 config_webrx.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config_webrx.py b/config_webrx.py
index 5ef9866..d564276 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -111,6 +111,9 @@ Note: if you experience audio underruns while CPU usage is 100%, you can:
 #
 # https://github.com/Microtelecom/libperseus-sdr
 #
+# and do the proper changes to the sdrs object below
+# (see also Wiki in https://github.com/jketterl/openwebrx/wiki/Sample-configuration-for-Perseus-HF-receiver).
+#
 # NOTE: The connector sources have replaced the old piped nmux style of reading input. If you still have any sdrs
 # configured that have type endin in "_connector", simply remove that suffix.
 

From d74b79f585594afe508ebd5616480da8a51d349d Mon Sep 17 00:00:00 2001
From: Andrea Montefusco <andrew@montefusco.com>
Date: Mon, 16 Mar 2020 18:05:49 +0100
Subject: [PATCH 106/475] references to Perseus HF receiver removed from main
 config file

---
 config_webrx.py | 47 -----------------------------------------------
 1 file changed, 47 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index d564276..9f33171 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -144,53 +144,6 @@ sdrs = {
             },
         },
     },
-    "perseussdr": {
-        "name": "Microtelecom Perseus HF receiver",
-        "type": "perseussdr",
-        "ppm": 0,
-        "profiles": {
-            "40m": {
-                "name": "40m",
-                "center_freq": 7150000,
-                "rf_gain": 0,
-                "samp_rate": 500000,
-                "start_freq": 7050000,
-                "start_mod": "lsb",
-            },
-            "20m": {
-                "name": "20m",
-                "center_freq": 14150000,
-                "rf_gain": 0,
-                "samp_rate": 500000,
-                "start_freq": 14070000,
-                "start_mod": "usb",
-            },
-            "30m": {
-                "name": "30m",
-                "center_freq": 10125000,
-                "rf_gain": 0,
-                "samp_rate": 192000,
-                "start_freq": 10142000,
-                "start_mod": "usb",
-            },
-            "80m": {
-                "name": "80m",
-                "center_freq": 3650000,
-                "rf_gain": 0,
-                "samp_rate": 500000,
-                "start_freq": 3570000,
-                "start_mod": "usb",
-            },
-            "49m": {
-                "name": "49m Broadcast",
-                "center_freq": 6000000,
-                "rf_gain": 0,
-                "samp_rate": 500000,
-                "start_freq": 6070000,
-                "start_mod": "am",
-            },
-        },
-    },
     "airspy": {
         "name": "Airspy HF+",
         "type": "airspyhf",

From 5273131b25eff41e6522850a277287901c16981a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 16 Mar 2020 22:16:56 +0100
Subject: [PATCH 107/475] apply new image background

---
 htdocs/gfx/openwebrx-panel-settings.png | Bin 1440 -> 2991 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/htdocs/gfx/openwebrx-panel-settings.png b/htdocs/gfx/openwebrx-panel-settings.png
index b209b87c94cfd9c9f44b19a36b0b9c305e92fed9..7120f45e97edb5986313dddfafbbe14d6413e8d5 100644
GIT binary patch
delta 2535
zcmV<D2^jXE3$GWj;{ksU7X~iPCx#9H012!~L_t(o!_Am)OdIzZ$DiNb*}gLd|A`G=
zz<+Rz_+x_;AS7u5D4o<~X_QearK&n@73yAW(xj?yy1nfSx>wUQP3hKl+45>tq~WPj
znl#d?j*!eF1e(MqI0T1(3dVK-W9;*t?fdP;?%0ppIq5W2>Pdf(ekXBfKKJ~d=leX*
z4?*<{Y21^mmH`0ZDh3*>`d;&&KM#n!r-+rR0w&3Zi504V{udy64wRNrgwe85DzJ(S
zQy~DQ=Xi4u9C{8ErQsdL7}-cTAb`rmDrp#2!R~=WRiLP6ct*Kr06;f4H}`_u?S35q
z^avpx#yCGeKmUKnP$)DF03`yD^kSt7=q?<s5lbWt0{}Vz(95eqzBd2>``&x+*<N|&
zmA_=O*`}?nEqgwncOZlgcs!o(udc3sGBY!Sh!3GvJMhel(Fkxg6ln}$x>Ki49RvVw
ze0)41iXsL8U|E(L8X5|`_10V67cX9%A-twoNj6GeK_h=-5mhCoXu?xmEEYR1isD#4
zpa0<U<;(uw-rl;2iHW0KU0rWyv)Q~L2nb_LVT>uB=V5DWYp1)r`{%cA-Fg84OqVZT
z_UH5Y4@6NMi$<fz0e~fTf!4}yq~R%=*e-5iVd0e5>%EXnCO0{b(_1VSog_&DP1EL7
zDwUm_oLqm;<#H8r8%!n>efaR<2B*_$E|<$`nx^ZvwzkA#u_!h)G*}lG7k_%-z=3N3
zPy_%007O;nVYMdFL@crQ@85r+qod=`j~+crPESu~5JFUQb8{`nak`b2m3%gvEn|!|
z;{_pv&1N&x)YMeN^L%M>aWRK6mb$yU?S8-CIXizl`+8?*=Pd%Rqy<JwfZ{EqD2jhg
zr_=k#$H$*wjFo3VhC$B|={+%n5W>VN4GawIcQ_nR^m_de02BzX?Me$(B_kOCV9Mq4
zCd;yVgwSpb$bjlHRIREY;vEWOj1WQ;%d+}%xtt*qNu8~TsUj0J05I3CUHkRW(9kDd
zuh)N+NF)lxwjlt3y1F_h7z|n+4u{ETH0m(MP$(3HWHPxkJ3E`*+1V+}&te%0dA;5m
ztJSIxhr_?o5NJx-N~TJgVE}*`9UV=dJ9n<gahx7w%#%=UZEdxoP{=6=LV9IoWomPC
zvj_mlYPGU%x7+9SdcAk=-d&H!<2e$}Xf%K7B}wAnfB*fAs(O$Nn50$WOE0H08xDt$
zxm>QHJ9q9Ri^U>Vpjum7P2Jty`{VKW&9SkunNq1#aXOt=y<V@2#bQq;CMF)5&F1aS
z&dxxoR1%*)eJU#NilSI<ZEbBlc<|u8k3ar+wMr$xG(oJ0DEr16Z<s#(@WY-%hYo+e
zlgVW0xw*Nl5-%o`i5?gjaL42En>TLUSREc7KHAgMbHrk?*z9(DLuY4aXH!!Xd;R+L
zIg`nh?da%eUs_tqDgrDBg5-2M4IYmt@bb$qCosmDnVFfA3JxPV19!#r-o1Or0)fCE
z5JI)tY&JhJG4W)3ds|Yz_~_B24yS+9DPFvI@o(qPpFd``TAh(d<i_2*cas1Bfk2@C
z`0?X|nM`JNY;5fI$jHcdlgXq$5{aahEUm4rMg9H#jTVc=gfY%VqtTJBuC9Lo054}}
zi6OFw1_0Xc_rJNZu_29*kIxE%0P5OSUteFdyuAFt<MGti*Vi|H`Q?|_qS1foIzs<`
zBo>RU1Hj);o;-QFsi|ppWo0GN*x1+u016oF?CeNauU=g;7z}uDaM11d``-kBNtppD
zC25cPBZQ2FLZKvzqNJq(9LMR>>2$&C^*V~hVm=y;rer8Zs~{GOr3699yWMVkCX*>}
z9H-OzEm0J4u~-xlLY%53?bd(FJr_;WRrN`dBur5h1z+RR>2x$wTv<)*s{EN!b&?Xs
zm}gm5uhZ!?-zXM~CA;0u#pCfcmSt-?Iy&qa@Ah^GV+`%>?RJB~P_wwWnBKQ<pONSJ
zQWbDyFc=gm+SB2ZU=;wUBoc`~*=#mycz8H)`t)g!$z<B&o%Qwg9hZO0<x3`${My>u
z!if_nPPVtVJ21uwV~pC{+a3M={U_Jg*B>u0FXvn?S92<r%BzYzb>_?&@2juA8noGL
zR3eeMM92mvb!@kYU$}4~ol2!XaX1{)ZnyiO)oOJtEiL5~&u?sOh=D+$$!s=fKmYvm
z2X42!uB)r-NGKHY_w;}CbhNaz1fD*9y87v-pZ;@jaM0Dz(9nMK=FK%ZW-&qt_xJaI
zr?$3seQIjz7o(%2qa!0D2_+kqdWndhXt%2XfEoa(xqbWgKu=H4udZCVGEYi|-|sga
zK74rpg9i`Bzxd*dRhP?U@_0OUhGFRC<>mC_$B(yPeDOthTU&qIiRtO-HCg=u0I<bk
zq0gK-(=s_Z`Sy_`M{WQ>Uba151|kGj=~!6+FakhLZ*Om1Boet2i^X=L(daf=xLaFW
zYrDF-8cL;7dSzuLk;!BV0D$avJLht_d<KJ|{;RLPN|I0jfP=xHIS>eNZEbC5A3b`M
zlc5SS*zSzLsAhjaa>6OU`|i8@D2ifvp5H_WVY!H706_70Jh!^KS_p+gw#LTBo|cvt
zJpe$VP!Ln8RQ~?``;T+ETzSvrgAnF<zC=-!ZFF?he*XOVO=4J))XGm20=ruQ0Kix%
z6n<YU7JIK>zrG|%lG64(uMgAg%aopsqA2O5mtOK142FNnnwpxQ$ll_K7^{$32`bN(
z0iet<jGgCs0b~51FF{DEGOTI=Vbwbl##rKcUeM`u^~8Xp9^o*hG1e<-TbiGrA9XsN
zwnK*w?L!Dj6h%ospU)T!2F+%(nNqx<WpZmx1%tslpU-EcC`v*INuf~4=5#u33kwUs
zBs^4655IrU9Yzv~#P>WN&u^2-<Oa*KdaKoHkR&NjQIs{EPH#sdkz_ufm()7d*VpH4
zXlO83DwPe2qG~obH-&sYFElnb?pt17{#kQ#^JnrFY7Qfm%Jt+{mH?pW^ZBmE<MAIj
z9F8@P<EF#m@M{dioSmAQddFh1WcvI28`V?wz`%ci%WAczCnqQ0W*FvdI2?YB<G3lO
z)0uww@Zk?-D1p>1^)!w&244E>4!n^_q_?lH?|0#FIHvSldc7VE4-W?;k;spa9XmGt
zjDfeLafGnDm5N*-f>zS-VnzOuJ(_pv(xs`szP`f1z<^5-gpxdo>oCT-k3Rb7j+}8N
z)d62ig@DwIFGVi24p+YRp-MCw?e+P5KSBr@<<YK?NF*)=gTbl)@lXY{z^a`ZepAO#
xSW6<bj-mdagFA{4>2KuV?puA-`K>t|{ui>(>LPP}=w$!^002ovPDHLkV1hUS<RAb5

delta 972
zcmV;-12g=u7oZEU;{ksN6D$py^{X)e00W&#L_t(o!|j+)Y*bYg#=l!*o3;iM1Le;M
z?MO&WSle_MM5>_$6&JLD1qtc`4G98vZQ@G8PB*3yO>ESFiv~>~2!XJWG+;Ee{4ts+
z2x^o+38J<G6zGqIU&-Y8248xIvgu7GdGFqH&i&rG=X~efk*0sf)VRMR#2Nsek@UKx
zTL1o$^j-+zn;5$_k)R%tv`12dq@N^xFKL>j13>Kqb2qRU7zG;3<{kxZ0d123U=c6?
z^aIU64NwG*0f$oL4*|!4r~Te+-2tFbEl@82C15*n02l@?*(<w%*(o}+fKM&+D==c+
z9e#d37F3%-_4t210Ly__fq5D99|v9rI)UK1Hw~^W2G}v+{reCay};3!th^|xW&CTa
z1S&{smh?xAktgi-Wfj(Qz&7ACaKp!b9C#a;RY9l2ahi|u*f~ifl5!~<td{hHq)tg6
zN$QfcM$#@xt0a8~bfwtLNg9@PKE`A1&aAnK`BmnxO-_G^1;A^-dIx+Bu*F{NO6bnB
z&Gv}^dKf4GgTT(j+DzbYU^7q$^Z{eQFTii!wAVJa09SyfgpGb5c_DL!09tMACU6*-
zlUUzsqXGEDV3wAx7tCGTEi(kXld#bQ9P~&03AAPbwiDRxI+(V8!d&zua2qJ5$P~Qk
ze4qyys$hSs5!jnNl}f?iDCuknVYmYJyrff-ijsZ~Aq@PdWeMS^gS%DIX-V@_TbmF@
zB%PI1pEWD*b?&2*9?BT54VE4IA7%(yfR!ZWf%*!Dew4IO(m|7NYswKlC8<TyfMw5B
zILdm<m9o~ys}BDCDH-)vS@3@VoHvlWpgh-S+8BQVwx$ICSB}xEnd_!$plG9giM7W}
z7jFQyz=sa>GydHMJ_hPdDSsuafV+}G?@>1qK6}odo1K_{5x5R)EF;*pCfJ4c)Mk@#
zcS^@GF@h~KQsdrhUCLTFaM{P&;~LoM=Rte5J4Npm;6hYm0JOM>cT`xP;Ua$0awC4;
zmezkjTBp-Ryg3Hg=fIcMZhM?m{W0Ce9Fr|oyD$E0>x`tiv6qk%u&L~8I~*su4Ei}>
z9k8sdwcY?+8^5T;fLm!py}&*L{oUF688AIXr^z+<mSs!Ueb>(~RrCJ%HSooF=LtM(
zp4*=yf5e&D?)SVKgKvQ)lX2fHnyVTT9m7Oe?ENuB0;`jBNz&o6Ryi+eiKLk!gwY4`
u-$e-FhI{^N29)<5VMPq6sWCMsW848QF=)P$V;zM60000<MNUMnLSTaNtj;|E


From 1a1ad670eebcd0c4a37319ac1b1ec82d8b745806 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 16 Mar 2020 22:32:07 +0100
Subject: [PATCH 108/475] fix background

---
 htdocs/gfx/openwebrx-panel-settings.png | Bin 2991 -> 3034 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/htdocs/gfx/openwebrx-panel-settings.png b/htdocs/gfx/openwebrx-panel-settings.png
index 7120f45e97edb5986313dddfafbbe14d6413e8d5..02a7a03a6d3c36945c4c15d793ac06076b0cd610 100644
GIT binary patch
delta 2966
zcmV;H3u*MP7upw)L4Q-FA{7-Yh&W`ZP8LK(9JLBXs1Ry}Rvk<({ScZoBq=VAf@{IS
zkHxBki?gl{u7V)=0pjH7r060g{x2!Ci1FaKAMfrx?%n}Ht;95|Z4A(K+e{_mVkWyH
zhF%dw5BkxIkjyM&R+5tN9bfkd@bxanv;5EfIl9!G#ejfFJb%Ls(<WXgp4zkx&ilj>
zR+LrZbK+5xE=c^yb;aX1&IOkRo*6OIsX5{Zu~=wfrG;71)QBgEqpGG;zL4=)<-EmN
zD^*zIp8SR3oW8uob(%v+U;&GeAVNU}8z{j>j8>f#3n|)<`}hZ4zeFyDTpM8Im`52J
zWY-V=2fw?u@_!TKUQ##?w7)pc$1o7u1?pAD`95}>`Uwzx2Cnp`zgz>RKS{4PwdfJh
zy$xJkH#KDsxZD8-o($QPT`5RY$mfCgGy0}1(02=Tu6n&S_Hp_Eq^Yaq4RCM>j1(w)
z&F9@6t-bwwrqSOI3Qcl-O00-u00006VoOIv0IvYA0F%A}C4UeV79|_W-f#c_3D-$P
zK~z}7%~)-0TGttV&*1_WFnGQOM6iSHIxE2hJH@sb{z$4Nv6n?@<0f^xwQ03f+p_Lo
zr%98l{YkVxp4wmCmNiWqwN<3Xt=!s6<Rw2)Voz;igI!$3AGIMS4G9MPh2dfh_v}aS
z^=@u1Znss_kbhoX&Jp+Chv&TKInVndDE>i3#z^M7c#g;f$XubwSoY;|AYcn1SacPC
zIR1s)w*>hRIO-cf$pI3BQSetRVT|LWPz0ouF(jR*z5$dJ2oeENNJ0#(APG(eAh#7b
zY70<U5(*hm)ZE-$tJP|K4k4rh03{)0?e^{4=Nt}40Dl1TGT?;oNHq5lIK>vA6g+SW
z0F<Io@uBYN=_xyO=+GzWbh>19b(LaSR)aCFuBfQ^X*?c(e`I6?Wd0PEq={@Qp)Eiu
zcp#K06k@>R<KxZs_4RM}_V&J;$z%!u03{_Q%45fl9S;No#~T|P13W`w=JKN0kTANL
zgSbdeDSt!^sb^+pT64MFCoIdp+27w^>-BoIqobo9hr{vPwY9bT>2w+hAqql>B9%&U
zsZ{Eo%jNogAP{H)0L{R_KrPF%Z{~8jPo}4*TL3^UdcH!!B9hzwVy098ppHZ$KdP*(
z{A)ZOpP^~mpx5geLdZJCxHOqe-X0zv9!(~btbaK98HUlcwY4=GjmDZnp%BLy8&auM
za(#V$)o3(+|IVE|zpSdN`a1xu13*r~9033#-Fd<?sQ^GdH8tgZ^wCFq!{PAA(9qBq
z0HAO>ot0XxRvQk7@5f@X3?W1|R}ezPY&L6ZYHGG+GMUV+TerRffI@qFyR)XIrg>&&
zrhj|q&Yho%z~x22IH?R!BDUy_jg7x0lSyiDaPU)(;}igZc_2u*3OEQMn}EbJz>kG1
zhcPZ3Jb18$VVIm!sXPn-SrKb_A=kFbF-4(JNYXTI5b}T!f(Rj)5P}78LJ0Ru=S25x
zKAWa#eLkO0h*IaF9HWZpmI442KA-Q8oqwI3eRXwp6%!K^_r-t!0E|YXwz09%ZZsOL
zG)?OXAtam4uEt`qug1p4W)~M1*{?}Nguj=otE;Qf>-EOL!NH$PfC)hW08v{=1$FAw
zsrwxr9a*hbs}nN<0MOLbRONEHJR2Ju(P%X4TU=aR0szD?Oqtbcb=z#VL&0G1rhnh>
zj}Sr-LSJt-old7Cgs`VipN>f+=mC8bPd*?K0HD5f>5|uCu^hW`<HpT&I$aQMbi3W#
zckkZa8VZH_&YnHn4**%K)w)fkQmOrZ|J3Enmxn7WE7u$jM+e4u_1?XED?BjB=kx1!
zyWQQ~+&p&X%$ctwr@^L{DI}t)1b+b4i4!Mu=gysLbUK~CTUuIL9UB`92|30vjArlN
zz57C;P~X77!1#$1Cyu(^?xUrprB;SvY8x6F_Sx<Bk`F%k;F`r^S+U#gKb)VR53?+r
zM+iYWoz7KNRei6bqN2I0tLsaQabk3IbVKSy5WfRAC1P@N@&|Ui{apYkS$|twi}`%M
z;dng0E-Yh5N5^in*{pl*wb#y^JbAL)U@+8<jEr3H`Fyhg0PXGV)n2dn_|nqS)LU=8
z_3<mOyz;A9ES9=@_3G!s4rLfdwSWKqHoacIjS#XnJw1Kg;c$E=mJUkl7^<tQUs_pN
zNnW{fr7xXM3rV}_w~R)kHGdk7`s(ZJjpgO#yN8B`{ya1^6c%J+czF0W0KB(n&z@g9
z9FA+zXf$B4SRMy}&xL0!EiGj~{P4poI-L%6c6L5qU0wYW0E~#wQY<|y5kgv)WmB0<
zCNDlzg``)j)g`f5EU{z9j;dTPw|M>f^{}8*0wY61L$^0JHkNkm*nhEoVPPSmR;x?I
z8%KC%CX>mtESo|I(b97p7g23o%x@DyIE*nCl6k8SMNvwOF)n7G`FF`W4J@&@gb>1N
zG#Wik(+aWe6_zTS&8AEyQ+Y5L{8FV-F|DnwHi1z=R9jkFY)YlFY<6~b-e@#3>+9=j
zp4A6@K26gKnx;z#A%CpYdSj^-jzl7F8w>{KnP;AP;i;#dI#5<tMvMPRJRZMmwOSvW
zot<5c$KxZdt*tM3z1}JTnAhvIwY9aqkVqr~6B82&tJUgGBoa|Ept7<u`st^iKKSgj
z&%S6d7??;T@{Uw8q^gVGc;k(Qm6etEw{6>Y(`vPP&1SQ8W`Abpj*tV%WO8NKu3gO)
z6%{KNFJ8Q6x7*E5r?boJ^)|P*wzk*S*6v+iUY@*g;ljs9jvRTcyu7^0=kt9k$OS@(
zbar-nbvj*UVq)SqJv}|ApMU=Okm#%|2!}W&brk@h0RT-f7~HdK*RDVH_xFF4NF+8T
zqoJXpqN%B=eSda#_M_h3-hk8TEU&Gtt)wVQ6$*vs$H&JPy1Tm@Yinzdj*pN3!|(S;
zgpFY~o9V-c4<8K%gC`pr8ioOY<>LXDfg}Zmp!zfbXuMvpc6fN$H#s@^#f=*`!oopJ
z2!Y1NMw`p!YR>2L_oLD1*uug>0wIJ<CR4f9YIQ4>N`GrG82rrd_eX>rMF?>okLMAG
z!{Kl`o%^PyrZPOJEDvncmr;@;l@nXwS6_YAj1ZzTnM_7pEFgrC-|vsi&CM-%JRXO|
zVtKr}y1Inl9Bc7-{NCv3=m2jZg^fc1fMhb63_?iL)6-*m;)y5bidk!^s}L_I&9dyd
zTrOwt>woLJ%5mJL?Gbq}BvWM(u~`)PG7cd`FveV0SJwfRN_9)4(fmThR!-!{I4o1v
zZ?Z;Fl!;~8mCc0YmqTp+#KI~_f_RSqy>Jf)00ow1S15|I6k&_V>DU8H84ia}na$>%
zZEbCJ7~=xQm~**Y7LUjCh{<H45ki~@5XX->VSj8gnP`v4Q{!^EEEr=BV_axyY1wHu
zn|IF7&;LQD?)(?SGDcBajQqH=vhpwSczl|sX}w;rH**}9!Wc7)i;MHuu3fviyu7?F
zUdpnvGP=FJy@@YIk{DxsDwSGDr_;+8i>2=F-McSu-@g5lOfkYqt+iawArAmKo6UB4
zZhvm>Ck(^nRVvk&gM))lQWUj+Vq)TDgTavBw{Kq?&sKpC?!bWqdrM18^TA;7Bt=pC
z2L}hARH;<cCX)$;LZRn)P~rlFlQ8yQ7ragN_4V&uym;|FmSyt*09vh<>hA7-acpet
zxZCXxh>F{PtKg+%8XBBTOG$X(1IF_F`G52N*I$1<)7ja%H=E6_0RU(;8a*K-b@uGp
z0IyMbnI?-|(}hTL?AtU|6mrE108rD@)6F)U?PmxfEq|D2B9X{DcDsF~NK=KA89&rJ
zLq(c+|Eo3>k?EO{t=gF&)583&8+S!P{a?2_(SO(+mIL{nHi!QS@y{i;=$;u601E&B
M07*qoM6N<$g5`syrT_o{

delta 2922
zcmV-w3zhWR7q1tPL4RANMJj@Jkm8V`I$4k^;;2<9LWNK(wCZ4T=@&F<NK#xJ1=oUu
zAB$B77iV1^Tm?b!1H{SENzp}0{9jUN5#zyeKi=JY+`R+*%_>vPo(VwJEF+Uj3c38M
z5PU@dAq*mlgv3mJP88Gd9AEeF@%1jwv%Js!Ir^1?$pD`~Jb%k{!y?`wp5C-{&ilj>
zR+bdvbK-G>E=c^yb=l=N&LxNaJTqcsGxNj|VxiQ<au>6*p%PCK#}rkge1Fbmh4U6?
zwOVKGd-4~C3);#u*J+L*g+(kuga8?JR8WP5IIS8fCNi|2^zcU=zep~bToo{KET9Gz
zlH&*egWuhn#ed0!n-oq0y)U-?F$x5CfmXw|zmILZbpiyQfh(=!uQh?0PtqG5Ep`M9
zYy%h99ZlW?E_Z<8CtWfmM+(sN7mL9A8GTb87`g@e*4*CO`#607veZ@j1~@nb#!8gE
z?(yzWcW?imY4`U7a42%7-XZ2C00006VoOIv0IvYA0F%A}C4UbW1}@Dfh7JG#39Ly(
zK~z}7&6saY8}}K<pWoftzB2~@i49)Be{hWWV}lbQBxwRDoz!G$lu;_Bsyb~I>RxQp
zq^fVaz3mISSJO02>DG4H@@iG2;i*!ZG}5Y$kjx_ln#3kJ1c!eL#&!T>?DL)N`|ZW<
z*pJ&e=`>a9Nq>)iCvj&!_xzsc`#jGNLG=r1+>@)80RZ4C1{$mSUh|(n4~V>{h?S}W
zCdr106{>*#7a)2Ll$KG1(Xvr0u!;;*ApoW4cykXNdJYt&;T^>o*+@7bfXc)wX&6?)
z?tw#9pr~hfM!9DIKsPrx_k!E)ejNbx2q7KDI6pr>|9{6&C^QWKB?6H2Vx<b`E*z~9
zOC$^f06GBB%d0`YHvj<p-h1!aUU}t}zhtx7rmd|ldp@6cAcPKhJf82buC9JEGc$vT
z51~~%@XU+R2yitNX$)byQ>RWH1ORS)d^{nFA_f3pS(X|a8VbDi)?3{dFJ7D>yrx)5
zHcDPWBY$HNRVAiq!c$x<7CSDA;#fYP|KRfF%l_Wp-nxm2iKAUzU2kWz*}NbK2xClP
zj47VyVQXt^r@OoR=eKU%dI11TmoH!T=kxgwL{S`zMx)08fF*W;*2-?A;VGKfE^c9A
z;gr|wy^u^MH#v^eTPzlxBuN5I)8<qvm7ScNTz}8yausqLOePb3`0(Kdr_*UJm&<9I
zrt7x0w!~twC^j@SSQi%;e|q4+folLz1ONd5L{;ozwI<O-EV1|R-+!T_qvOwy9z9A<
zPfuqMLR52eb1lblx|Nlcd^VdcV~jQ91tEmZW;4^&)KtUsd}(oUF^4ghy1TpWe!t&2
zJAXU-dS_?nEds8j1x8AM;w_^nihoU~)BDHA$Dd$~m1jVPLC+BBJu!n2!o(^K3=Hgd
zI2=#(di@Xp6bP^FN()sbBN+f-%H{GV%d&ce&~6OKfa)?-t*Rj69SUQN5JD8ovifql
zoFNiPovnzeA`>(KFxReK`}NS!&?jE6*MF2qBnrf~Apn57x;iEp3|buyhskI(>M+Jo
zC=`TbGPyH5JDc6v*(uA<Vi^i~z1|wD)v6DN!@toGXiC{irb?M%0Du`C9ZjD*cdp2B
zoE~G$lTdAKZMC6L$SDXydSzv0YIAe52mr`xwX$xv+voLqy?5{4U604(ITFrjG=J(P
zN#fss|NV@rdXNm5q*dZeFQ+pb4u_AqT&|%zckU#M#UfUqT3cI9-QC^$<MH^-v9Yn4
zQmIsNI-OR%UayPAVoxR}CLWs2=IzeT&OoVD5}!VODk|@aqF8QiZEZYw@Zi0VKmK^N
zN+rNFL9B=<`^Fn@m_GdQ!=6Kj4u8Fq$z<rcxw)(oFD8?T9vB#K$K&yvH*VZm9UdM&
z+SAi>#A317>~?!YXJ=<;Q&SUr{rdGelgX6r=;&x)T3X5~0xSrE<a9a>9*-yR^2;wL
zFvgjgnVFIb4kI}Ocg6JHy?e(3fxsUSLbcg!Ha{^j@nm~@TT;IG=+UDNr+?EaUc7km
zZ|BdSKW4RBosmf7#@)MjlK=pLK%oBk@#BM;OlEa#Z0z>P$jEn-$)r9KiKLY*t*xy^
z{r&xo7K_D%G0sJ!(UGpMu73akFK1_oA+m=C0NU^OzqzroA&rlZ&kBM7>e^OcUthDl
zy!^o9@zmDW*EfIp<(Jo@(SPVVLjQgw7K^O|z~4`vJbAjQscCj)WhK$r*w_OA3K;C{
z>_}IyUR^R640v#G(Czp8-voe3nE@#!X^;9Ngp7qkp(Ki;q@@8I$LZ4PbiwQOI*P?&
zJ{patWGF?eAQp?I1VPBV-EMm(lPPc<r_=f^Q512pSQHULoT?=4)_=-97fsVu^+}Q>
zOi>gCU*pp0bTm?2SxxM!{Fzd9k`l(4XIWOS)9EzdC>Dz)yWP&k<MB0?WotS*I_wzl
z_I3zk4DIdhc7wrCv$(jJ-nVa`k>~kR6>wxQ7!)bm)8Ud}6#%Ft5{W<AY&L3mcsOwS
z^l6XDWZL7M_4V}~mw(IUOD2>2+S=N}i4!MIwzs!CFvbXDjN04V9sT|NC)d~4A1^O2
z=UgsVb1Id}tBO2z=FA!ItFOKqwApM_B9XX6$Oa~LY`2JCxNsqzN~Jz=I2_Y%xBH;g
zYIQ6vE#(x?Z)|Lcfk2?iY&K^<|NQd@ZnwLxtE=lsC=~Md^ndhpw6wGYo<4oL`st^i
z{&R3}(ACh;(0=pg%{4h@F+vFU_xFFNwzhVCYHI2iqobpvBO@aTB^#A`iHM$Px2phv
z8UU!def#!6PfyRUu3Wh?PfCX0?>8Mje0cwZ2M@--_~MIIm&;}HcszE7Vd&-M<@Dpn
zkGEfZ@kMuATYuY$>FMb;S^WV3u*G7b&zw2aGC4W<_K_n;ZU8`Dwmn@2A_P|HSXlrt
z0zge~Z*N^B61ftK#df06=r&onTU%ReySlm>N~KbIWo0Fi$z%!ufb4cV=W@Ax27{sg
ztFOLFl28DEgTbIV5D0K>ZEa^CJ$jUrp$anC?u@{wW`96(!YRM|?z{Uaieh=5-$V#u
zxrk!`K=F7yx4ODo2!%qn#>U2;mX;Ph06?Ko5L2mC{{H>@k8`<PdC%m75axNlL{XG&
zbad2y{`~n(Vpx&X%1;vlyITPOz*s00eqSsWd#_)=z9dPK()K*B57X?+l%9;DDCwn_
zUh)_WhJVSLnwp=;-r|WEtB_d<D$kVxpv*9go#%N0WBi{lK}f1HtZD&a)jJZ#SmJqJ
z(CKvb#DJn6;V`8!)+=dSnxCH^bvm84Lx&FSLkLL}MM*xN&ln5_&1SQiQoNvLa%)Wm
zgTXqV&u644N<s)pp-{-?bUJMd3k$y_JXBE+zkkmiMiPm{_dFiYZ<ER72FtQ~tJP|d
zBq>i(lr^1BZ$~1LWImsl)H>DI*XL|#XfRhQl?{rbYBo1Fg?v6QG&VNwTV7uNS#xvq
zXYv+m4kMJx_2gET0HEme`L4#}@gF!Gjx~<sro-XzYYfAjotm0@$6~Q$`uqDE)l>Dr
zz<+?tYPF^(Cnw)#80Ks^9Da@CxGAU8nSS{2;SXgffz&PaG>$X|Ui#|}ypc$xx3917
zcj0h2ru18Sy&eq@4+kTW$d8X5J2w4{fw!b_gs{7nid-OqR?_fdMgEaJns@2arK!HY
zzQVx3fJ+dBl01p)Fvhu$KKkg6oN*=90bfgnfYgjHMJ}`sSHAY4N;Den_4#~1LI@e<
z(XNn4BrXMm!Kwf8PzAKWs+}5sQ^!zPOCq$6q5hwPJBkqLZ{*<aTYc2|tvMY27qZXl
UB6EG{WdHyG07*qoM6N<$f<$?jYXATM


From 8a039517131ea45a2bb561816686a7f18d42aaa4 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 16 Mar 2020 22:48:42 +0100
Subject: [PATCH 109/475] re-align main buttons

---
 htdocs/css/openwebrx-header.css    | 23 +++++++++++------------
 htdocs/include/header.include.html | 12 +++++-------
 htdocs/openwebrx.js                |  2 +-
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/htdocs/css/openwebrx-header.css b/htdocs/css/openwebrx-header.css
index 30b931a..884a049 100644
--- a/htdocs/css/openwebrx-header.css
+++ b/htdocs/css/openwebrx-header.css
@@ -121,31 +121,27 @@
     display:none;
 }
 
-#openwebrx-main-buttons ul
-{
-    margin:0;
-    padding: 0;
-}
-
-
-#openwebrx-main-buttons ul li
-{
-    display: inline-block;
+#openwebrx-main-buttons .button {
+    display: block;
     width: 55px;
     cursor:pointer;
 }
 
+#openwebrx-main-buttons .button img {
+    height: 38px;
+}
+
 #openwebrx-main-buttons a {
     color: inherit;
     text-decoration: inherit;
 }
 
-#openwebrx-main-buttons li:hover
+#openwebrx-main-buttons .button:hover
 {
     background-color: rgba(255, 255, 255, 0.3);
 }
 
-#openwebrx-main-buttons li:active
+#openwebrx-main-buttons .button:active
 {
     background-color: rgba(255, 255, 255, 0.55);
 }
@@ -153,6 +149,9 @@
 
 #openwebrx-main-buttons
 {
+    padding: 5px 0;
+    display: flex;
+    list-style: none;
     float: right;
     margin:0;
     color: white;
diff --git a/htdocs/include/header.include.html b/htdocs/include/header.include.html
index 13591cc..3a4fb11 100644
--- a/htdocs/include/header.include.html
+++ b/htdocs/include/header.include.html
@@ -14,13 +14,11 @@
                 <a id="openwebrx-rx-details-arrow-down" class="openwebrx-photo-trigger"><img src="static/gfx/openwebrx-rx-details-arrow.png" /></a>
             </div>
             <section id="openwebrx-main-buttons">
-                <ul>
-                    <li data-toggle-panel="openwebrx-panel-status"><img src="static/gfx/openwebrx-panel-status.png" /><br/>Status</li>
-                    <li data-toggle-panel="openwebrx-panel-log"><img  src="static/gfx/openwebrx-panel-log.png" /><br/>Log</li>
-                    <li data-toggle-panel="openwebrx-panel-receiver"><img src="static/gfx/openwebrx-panel-receiver.png" /><br/>Receiver</li>
-                    <li><a href="map" target="_blank"><img src="static/gfx/openwebrx-panel-map.png" /><br/>Map</a></li>
-                    <li><a href="admin" target="_blank"><img src="static/gfx/openwebrx-panel-settings.png" /><br/>Settings</a></li>
-                </ul>
+                <div class="button" data-toggle-panel="openwebrx-panel-status"><img src="static/gfx/openwebrx-panel-status.png" /><br/>Status</div>
+                <div class="button" data-toggle-panel="openwebrx-panel-log"><img  src="static/gfx/openwebrx-panel-log.png" /><br/>Log</div>
+                <div class="button" data-toggle-panel="openwebrx-panel-receiver"><img src="static/gfx/openwebrx-panel-receiver.png" /><br/>Receiver</div>
+                <a class="button" href="map" target="_blank"><img src="static/gfx/openwebrx-panel-map.png" /><br/>Map</a>
+                <a class="button" href="admin" target="_blank"><img src="static/gfx/openwebrx-panel-settings.png" /><br/>Settings</a>
             </section>
         </div>
         <div id="webrx-rx-photo-title"></div>
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 384776d..be81751 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1770,7 +1770,7 @@ function openwebrx_resize() {
 }
 
 function init_header() {
-    $('#openwebrx-main-buttons').find('li[data-toggle-panel]').click(function () {
+    $('#openwebrx-main-buttons').find('[data-toggle-panel]').click(function () {
         toggle_panel($(this).data('toggle-panel'));
     });
 }

From 55e1a97d43016c0f7b5327478643d347ad76ac13 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 21 Mar 2020 15:13:11 +0100
Subject: [PATCH 110/475] update changelogs

---
 CHANGELOG.md     | 5 ++++-
 debian/changelog | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5233bc2..44bf559 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,10 @@
 **unreleased**
 - Fix direwolf connection setup by implementing a retry loop
-- Pass direct sampling mode changes for rtl_sdr_soapy to owrx_connectorgit
+- Pass direct sampling mode changes for rtl_sdr_soapy to owrx_connector
 - OSM maps instead of Google when google_maps_api_key is not set (thanks @jquagga)
+- Improved logic to pass parameters to soapy devices.
+  - `rtl_sdr_soapy`: added support for `bias_tee`
+  - `sdrplay`: added support for `bias_tee`, `rf_notch` and `dab_notch`
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index d775a62..64d696d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
   * Pass direct sampling mode changes for rtl_sdr_soapy to owrx_connector
   * OSM maps instead of Google when google_maps_api_key is not set (thanks
     @jquagga)
+  * Improved logic to pass parameters to soapy devices.
+    - `rtl_sdr_soapy`: added support for `bias_tee`
+    - `sdrplay`: added support for `bias_tee`, `rf_notch` and `dab_notch`
+
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From fbf74a1286bb335b642aa2b86acfb6f46ff4ad60 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 21 Mar 2020 15:18:45 +0100
Subject: [PATCH 111/475] add bitpack flag for airspy

---
 CHANGELOG.md          | 1 +
 debian/changelog      | 2 +-
 owrx/source/airspy.py | 7 ++++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44bf559..25ad9cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 - Improved logic to pass parameters to soapy devices.
   - `rtl_sdr_soapy`: added support for `bias_tee`
   - `sdrplay`: added support for `bias_tee`, `rf_notch` and `dab_notch`
+  - `airspy`: added support for `bitpack`
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index 64d696d..4e65951 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,7 +6,7 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
   * Improved logic to pass parameters to soapy devices.
     - `rtl_sdr_soapy`: added support for `bias_tee`
     - `sdrplay`: added support for `bias_tee`, `rf_notch` and `dab_notch`
-
+    - `airspy`: added support for `bitpack`
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 
diff --git a/owrx/source/airspy.py b/owrx/source/airspy.py
index f8003ec..97221a3 100644
--- a/owrx/source/airspy.py
+++ b/owrx/source/airspy.py
@@ -5,7 +5,12 @@ from .soapy import SoapyConnectorSource
 class AirspySource(SoapyConnectorSource):
     def getSoapySettingsMappings(self):
         mappings = super().getSoapySettingsMappings()
-        mappings.update({"bias_tee": "biastee"})
+        mappings.update(
+            {
+                "bias_tee": "biastee",
+                "bitpack": "bitpack",
+            }
+        )
         return mappings
 
     def getDriver(self):

From 8ed6dbe5d1901483dd20f01d72c03eb2e8260888 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 21 Mar 2020 15:45:50 +0100
Subject: [PATCH 112/475] update changelog

---
 CHANGELOG.md     | 1 +
 debian/changelog | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25ad9cc..661b8b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
   - `rtl_sdr_soapy`: added support for `bias_tee`
   - `sdrplay`: added support for `bias_tee`, `rf_notch` and `dab_notch`
   - `airspy`: added support for `bitpack`
+- Added support for Perseus-SDR devices, (thanks @amontefusco)
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index 4e65951..a2df019 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
     - `rtl_sdr_soapy`: added support for `bias_tee`
     - `sdrplay`: added support for `bias_tee`, `rf_notch` and `dab_notch`
     - `airspy`: added support for `bitpack`
+  * Added support for Perseus-SDR devices, (thanks @amontefusco)
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From 135e9ae7b9bdaa815b00de743b16414ffc079a20 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 21 Mar 2020 15:49:22 +0100
Subject: [PATCH 113/475] compile the connector into soapy for faster builds

---
 docker/Dockerfiles/Dockerfile-airspy       | 4 ----
 docker/Dockerfiles/Dockerfile-limesdr      | 4 ----
 docker/Dockerfiles/Dockerfile-plutosdr     | 4 ----
 docker/Dockerfiles/Dockerfile-rtlsdr-soapy | 4 ----
 docker/Dockerfiles/Dockerfile-sdrplay      | 4 ----
 docker/Dockerfiles/Dockerfile-soapyremote  | 4 ----
 docker/Dockerfiles/Dockerfile-soapysdr     | 3 +++
 7 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/docker/Dockerfiles/Dockerfile-airspy b/docker/Dockerfiles/Dockerfile-airspy
index 4383d0d..1632870 100644
--- a/docker/Dockerfiles/Dockerfile-airspy
+++ b/docker/Dockerfiles/Dockerfile-airspy
@@ -4,7 +4,3 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-airspy.sh /
 RUN /install-dependencies-airspy.sh
 RUN rm /install-dependencies-airspy.sh
-
-ADD docker/scripts/install-connectors.sh /
-RUN /install-connectors.sh
-RUN rm /install-connectors.sh
diff --git a/docker/Dockerfiles/Dockerfile-limesdr b/docker/Dockerfiles/Dockerfile-limesdr
index dabb9c5..9a22428 100644
--- a/docker/Dockerfiles/Dockerfile-limesdr
+++ b/docker/Dockerfiles/Dockerfile-limesdr
@@ -4,7 +4,3 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-limesdr.sh /
 RUN /install-dependencies-limesdr.sh
 RUN rm /install-dependencies-limesdr.sh
-
-ADD docker/scripts/install-connectors.sh /
-RUN /install-connectors.sh
-RUN rm /install-connectors.sh
diff --git a/docker/Dockerfiles/Dockerfile-plutosdr b/docker/Dockerfiles/Dockerfile-plutosdr
index d9edda5..5a1aeef 100644
--- a/docker/Dockerfiles/Dockerfile-plutosdr
+++ b/docker/Dockerfiles/Dockerfile-plutosdr
@@ -4,7 +4,3 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-plutosdr.sh /
 RUN /install-dependencies-plutosdr.sh
 RUN rm /install-dependencies-plutosdr.sh
-
-ADD docker/scripts/install-connectors.sh /
-RUN /install-connectors.sh
-RUN rm /install-connectors.sh
diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
index 7989a6a..75a5daa 100644
--- a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
+++ b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
@@ -4,7 +4,3 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-rtlsdr-soapy.sh /
 RUN /install-dependencies-rtlsdr-soapy.sh
 RUN rm /install-dependencies-rtlsdr-soapy.sh
-
-ADD docker/scripts/install-connectors.sh /
-RUN /install-connectors.sh
-RUN rm /install-connectors.sh
diff --git a/docker/Dockerfiles/Dockerfile-sdrplay b/docker/Dockerfiles/Dockerfile-sdrplay
index 0013135..9083a07 100644
--- a/docker/Dockerfiles/Dockerfile-sdrplay
+++ b/docker/Dockerfiles/Dockerfile-sdrplay
@@ -6,7 +6,3 @@ ADD docker/scripts/install-lib.*.patch /
 RUN /install-dependencies-sdrplay.sh
 RUN rm /install-dependencies-sdrplay.sh
 RUN rm /install-lib.*.patch
-
-ADD docker/scripts/install-connectors.sh /
-RUN /install-connectors.sh
-RUN rm /install-connectors.sh
diff --git a/docker/Dockerfiles/Dockerfile-soapyremote b/docker/Dockerfiles/Dockerfile-soapyremote
index c6e4b49..1c56906 100644
--- a/docker/Dockerfiles/Dockerfile-soapyremote
+++ b/docker/Dockerfiles/Dockerfile-soapyremote
@@ -4,7 +4,3 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-soapyremote.sh /
 RUN /install-dependencies-soapyremote.sh
 RUN rm /install-dependencies-soapyremote.sh
-
-ADD docker/scripts/install-connectors.sh /
-RUN /install-connectors.sh
-RUN rm /install-connectors.sh
diff --git a/docker/Dockerfiles/Dockerfile-soapysdr b/docker/Dockerfiles/Dockerfile-soapysdr
index 82b93e9..8cfdaeb 100644
--- a/docker/Dockerfiles/Dockerfile-soapysdr
+++ b/docker/Dockerfiles/Dockerfile-soapysdr
@@ -5,3 +5,6 @@ ADD docker/scripts/install-dependencies-soapysdr.sh /
 RUN /install-dependencies-soapysdr.sh
 RUN rm /install-dependencies-soapysdr.sh
 
+ADD docker/scripts/install-connectors.sh /
+RUN /install-connectors.sh
+RUN rm /install-connectors.sh

From 2505e95d1c874f720aaf9b2ef00a2a3e7875e6ab Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 21 Mar 2020 15:54:17 +0100
Subject: [PATCH 114/475] reduce layers

---
 docker/Dockerfiles/Dockerfile-airspy       |  4 ++--
 docker/Dockerfiles/Dockerfile-base         |  4 ++--
 docker/Dockerfiles/Dockerfile-full         | 25 +++++++++++-----------
 docker/Dockerfiles/Dockerfile-hackrf       |  4 ++--
 docker/Dockerfiles/Dockerfile-limesdr      |  4 ++--
 docker/Dockerfiles/Dockerfile-plutosdr     |  4 ++--
 docker/Dockerfiles/Dockerfile-rtlsdr       | 10 ++++-----
 docker/Dockerfiles/Dockerfile-rtlsdr-soapy |  4 ++--
 docker/Dockerfiles/Dockerfile-sdrplay      |  6 +++---
 docker/Dockerfiles/Dockerfile-soapyremote  |  4 ++--
 docker/Dockerfiles/Dockerfile-soapysdr     |  9 ++++----
 11 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/docker/Dockerfiles/Dockerfile-airspy b/docker/Dockerfiles/Dockerfile-airspy
index 1632870..88b4e11 100644
--- a/docker/Dockerfiles/Dockerfile-airspy
+++ b/docker/Dockerfiles/Dockerfile-airspy
@@ -2,5 +2,5 @@ ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-airspy.sh /
-RUN /install-dependencies-airspy.sh
-RUN rm /install-dependencies-airspy.sh
+RUN /install-dependencies-airspy.sh &&\
+    rm /install-dependencies-airspy.sh
diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index 566f9d1..56abb80 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -6,8 +6,8 @@ RUN ln -s /usr/local/lib /usr/local/lib64
 
 ADD docker/scripts/direwolf-1.5.patch /
 ADD docker/scripts/install-dependencies.sh /
-RUN /install-dependencies.sh
-RUN rm /install-dependencies.sh
+RUN /install-dependencies.sh && \
+    rm /install-dependencies.sh
 
 ADD . /opt/openwebrx
 
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index 992fa8e..b38511c 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -4,17 +4,18 @@ FROM openwebrx-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-*.sh /
 ADD docker/scripts/install-lib.*.patch /
 
-RUN /install-dependencies-rtlsdr.sh
-RUN /install-dependencies-hackrf.sh
-RUN /install-dependencies-soapysdr.sh
-RUN /install-dependencies-sdrplay.sh
-RUN /install-dependencies-airspy.sh
-RUN /install-dependencies-rtlsdr-soapy.sh
-RUN /install-dependencies-plutosdr.sh
-RUN /install-dependencies-limesdr.sh
-RUN /install-dependencies-soapyremote.sh
-RUN rm /install-dependencies-*.sh
+RUN /install-dependencies-rtlsdr.sh &&\
+    /install-dependencies-hackrf.sh &&\
+    /install-dependencies-soapysdr.sh &&\
+    /install-dependencies-sdrplay.sh &&\
+    /install-dependencies-airspy.sh &&\
+    /install-dependencies-rtlsdr-soapy.sh &&\
+    /install-dependencies-plutosdr.sh &&\
+    /install-dependencies-limesdr.sh &&\
+    /install-dependencies-soapyremote.sh &&\
+    rm /install-dependencies-*.sh &&\
+    rm /install-libp.*.patch
 
 ADD docker/scripts/install-connectors.sh /
-RUN /install-connectors.sh
-RUN rm /install-connectors.sh
+RUN /install-connectors.sh &&\
+    rm /install-connectors.sh
diff --git a/docker/Dockerfiles/Dockerfile-hackrf b/docker/Dockerfiles/Dockerfile-hackrf
index 57643ab..8b26499 100644
--- a/docker/Dockerfiles/Dockerfile-hackrf
+++ b/docker/Dockerfiles/Dockerfile-hackrf
@@ -2,6 +2,6 @@ ARG ARCHTAG
 FROM openwebrx-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-hackrf.sh /
-RUN /install-dependencies-hackrf.sh
-RUN rm /install-dependencies-hackrf.sh
+RUN /install-dependencies-hackrf.sh &&\
+    rm /install-dependencies-hackrf.sh
 
diff --git a/docker/Dockerfiles/Dockerfile-limesdr b/docker/Dockerfiles/Dockerfile-limesdr
index 9a22428..ea7a050 100644
--- a/docker/Dockerfiles/Dockerfile-limesdr
+++ b/docker/Dockerfiles/Dockerfile-limesdr
@@ -2,5 +2,5 @@ ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-limesdr.sh /
-RUN /install-dependencies-limesdr.sh
-RUN rm /install-dependencies-limesdr.sh
+RUN /install-dependencies-limesdr.sh &&\
+    rm /install-dependencies-limesdr.sh
diff --git a/docker/Dockerfiles/Dockerfile-plutosdr b/docker/Dockerfiles/Dockerfile-plutosdr
index 5a1aeef..c087960 100644
--- a/docker/Dockerfiles/Dockerfile-plutosdr
+++ b/docker/Dockerfiles/Dockerfile-plutosdr
@@ -2,5 +2,5 @@ ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-plutosdr.sh /
-RUN /install-dependencies-plutosdr.sh
-RUN rm /install-dependencies-plutosdr.sh
+RUN /install-dependencies-plutosdr.sh &&\
+    rm /install-dependencies-plutosdr.sh
diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr b/docker/Dockerfiles/Dockerfile-rtlsdr
index b0726da..d637393 100644
--- a/docker/Dockerfiles/Dockerfile-rtlsdr
+++ b/docker/Dockerfiles/Dockerfile-rtlsdr
@@ -2,9 +2,9 @@ ARG ARCHTAG
 FROM openwebrx-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-rtlsdr.sh /
-RUN /install-dependencies-rtlsdr.sh
-RUN rm /install-dependencies-rtlsdr.sh
-
 ADD docker/scripts/install-connectors.sh /
-RUN /install-connectors.sh
-RUN rm /install-connectors.sh
+
+RUN /install-dependencies-rtlsdr.sh &&\
+    rm /install-dependencies-rtlsdr.sh &&\
+    /install-connectors.sh &&\
+    rm /install-connectors.sh
diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
index 75a5daa..aeb4ef5 100644
--- a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
+++ b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
@@ -2,5 +2,5 @@ ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-rtlsdr-soapy.sh /
-RUN /install-dependencies-rtlsdr-soapy.sh
-RUN rm /install-dependencies-rtlsdr-soapy.sh
+RUN /install-dependencies-rtlsdr-soapy.sh &&\
+    rm /install-dependencies-rtlsdr-soapy.sh
diff --git a/docker/Dockerfiles/Dockerfile-sdrplay b/docker/Dockerfiles/Dockerfile-sdrplay
index 9083a07..943fb2b 100644
--- a/docker/Dockerfiles/Dockerfile-sdrplay
+++ b/docker/Dockerfiles/Dockerfile-sdrplay
@@ -3,6 +3,6 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-sdrplay.sh /
 ADD docker/scripts/install-lib.*.patch /
-RUN /install-dependencies-sdrplay.sh
-RUN rm /install-dependencies-sdrplay.sh
-RUN rm /install-lib.*.patch
+RUN /install-dependencies-sdrplay.sh &&\
+    rm /install-dependencies-sdrplay.sh &&\
+    rm /install-lib.*.patch
diff --git a/docker/Dockerfiles/Dockerfile-soapyremote b/docker/Dockerfiles/Dockerfile-soapyremote
index 1c56906..3eef82b 100644
--- a/docker/Dockerfiles/Dockerfile-soapyremote
+++ b/docker/Dockerfiles/Dockerfile-soapyremote
@@ -2,5 +2,5 @@ ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-soapyremote.sh /
-RUN /install-dependencies-soapyremote.sh
-RUN rm /install-dependencies-soapyremote.sh
+RUN /install-dependencies-soapyremote.sh &&\
+    rm /install-dependencies-soapyremote.sh
diff --git a/docker/Dockerfiles/Dockerfile-soapysdr b/docker/Dockerfiles/Dockerfile-soapysdr
index 8cfdaeb..c3f8626 100644
--- a/docker/Dockerfiles/Dockerfile-soapysdr
+++ b/docker/Dockerfiles/Dockerfile-soapysdr
@@ -2,9 +2,8 @@ ARG ARCHTAG
 FROM openwebrx-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-soapysdr.sh /
-RUN /install-dependencies-soapysdr.sh
-RUN rm /install-dependencies-soapysdr.sh
-
 ADD docker/scripts/install-connectors.sh /
-RUN /install-connectors.sh
-RUN rm /install-connectors.sh
+RUN /install-dependencies-soapysdr.sh &&\
+    rm /install-dependencies-soapysdr.sh &&\
+    /install-connectors.sh &&\
+    rm /install-connectors.sh

From 05485ba8e3ff8668c3521ac6f8a27b0d9668550f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 21 Mar 2020 18:58:03 +0100
Subject: [PATCH 115/475] add perseus basic build (not enabled for now)

---
 docker/Dockerfiles/Dockerfile-full            |  2 +-
 docker/Dockerfiles/Dockerfile-perseus         |  7 ++++++
 .../scripts/install-dependencies-perseus.sh   | 24 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 docker/Dockerfiles/Dockerfile-perseus
 create mode 100755 docker/scripts/install-dependencies-perseus.sh

diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index b38511c..8ba106b 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -14,7 +14,7 @@ RUN /install-dependencies-rtlsdr.sh &&\
     /install-dependencies-limesdr.sh &&\
     /install-dependencies-soapyremote.sh &&\
     rm /install-dependencies-*.sh &&\
-    rm /install-libp.*.patch
+    rm /install-lib.*.patch
 
 ADD docker/scripts/install-connectors.sh /
 RUN /install-connectors.sh &&\
diff --git a/docker/Dockerfiles/Dockerfile-perseus b/docker/Dockerfiles/Dockerfile-perseus
new file mode 100644
index 0000000..fa3f912
--- /dev/null
+++ b/docker/Dockerfiles/Dockerfile-perseus
@@ -0,0 +1,7 @@
+ARG ARCHTAG
+FROM openwebrx-base:$ARCHTAG
+
+ADD docker/scripts/install-dependencies-perseus.sh /
+RUN /install-dependencies-perseus.sh &&\
+    rm /install-dependencies-perseus.sh
+
diff --git a/docker/scripts/install-dependencies-perseus.sh b/docker/scripts/install-dependencies-perseus.sh
new file mode 100755
index 0000000..b94ea6c
--- /dev/null
+++ b/docker/scripts/install-dependencies-perseus.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+set -euxo pipefail
+export MAKEFLAGS="-j4"
+
+cd /tmp
+
+STATIC_PACKAGES="libusb udev"
+BUILD_PACKAGES="git make gcc autoconf automake libtool musl-dev libusb-dev shadow"
+
+apk add --no-cache $STATIC_PACKAGES
+apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+
+git clone https://github.com/Microtelecom/libperseus-sdr.git
+cd libperseus-sdr
+git checkout 72ac67c5b7936a1991be0ec97c03a59c1a8ac8f3
+./bootstrap.sh
+./configure
+make
+make install
+ldconfig /etc/ld.so.conf.d
+cd ..
+rm -rf libperseus-sdr
+
+apk del .build-deps

From 7948b7bfa1e344cd555ed6cf7eb96edb1d25a427 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 21 Mar 2020 21:44:09 +0100
Subject: [PATCH 116/475] move openwebrx installation to the end to profit from
 docker build cache

---
 docker/Dockerfiles/Dockerfile-airspy       | 2 ++
 docker/Dockerfiles/Dockerfile-base         | 2 --
 docker/Dockerfiles/Dockerfile-full         | 2 ++
 docker/Dockerfiles/Dockerfile-hackrf       | 1 +
 docker/Dockerfiles/Dockerfile-limesdr      | 2 ++
 docker/Dockerfiles/Dockerfile-perseus      | 1 +
 docker/Dockerfiles/Dockerfile-plutosdr     | 2 ++
 docker/Dockerfiles/Dockerfile-rtlsdr       | 2 ++
 docker/Dockerfiles/Dockerfile-rtlsdr-soapy | 2 ++
 docker/Dockerfiles/Dockerfile-sdrplay      | 2 ++
 docker/Dockerfiles/Dockerfile-soapyremote  | 2 ++
 11 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfiles/Dockerfile-airspy b/docker/Dockerfiles/Dockerfile-airspy
index 88b4e11..d332bb5 100644
--- a/docker/Dockerfiles/Dockerfile-airspy
+++ b/docker/Dockerfiles/Dockerfile-airspy
@@ -4,3 +4,5 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-airspy.sh /
 RUN /install-dependencies-airspy.sh &&\
     rm /install-dependencies-airspy.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index 56abb80..c065768 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -9,8 +9,6 @@ ADD docker/scripts/install-dependencies.sh /
 RUN /install-dependencies.sh && \
     rm /install-dependencies.sh
 
-ADD . /opt/openwebrx
-
 WORKDIR /opt/openwebrx
 
 VOLUME /etc/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index 8ba106b..e3d1add 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -19,3 +19,5 @@ RUN /install-dependencies-rtlsdr.sh &&\
 ADD docker/scripts/install-connectors.sh /
 RUN /install-connectors.sh &&\
     rm /install-connectors.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-hackrf b/docker/Dockerfiles/Dockerfile-hackrf
index 8b26499..6d5d5e8 100644
--- a/docker/Dockerfiles/Dockerfile-hackrf
+++ b/docker/Dockerfiles/Dockerfile-hackrf
@@ -5,3 +5,4 @@ ADD docker/scripts/install-dependencies-hackrf.sh /
 RUN /install-dependencies-hackrf.sh &&\
     rm /install-dependencies-hackrf.sh
 
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-limesdr b/docker/Dockerfiles/Dockerfile-limesdr
index ea7a050..54b7a37 100644
--- a/docker/Dockerfiles/Dockerfile-limesdr
+++ b/docker/Dockerfiles/Dockerfile-limesdr
@@ -4,3 +4,5 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-limesdr.sh /
 RUN /install-dependencies-limesdr.sh &&\
     rm /install-dependencies-limesdr.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-perseus b/docker/Dockerfiles/Dockerfile-perseus
index fa3f912..8a3faaa 100644
--- a/docker/Dockerfiles/Dockerfile-perseus
+++ b/docker/Dockerfiles/Dockerfile-perseus
@@ -5,3 +5,4 @@ ADD docker/scripts/install-dependencies-perseus.sh /
 RUN /install-dependencies-perseus.sh &&\
     rm /install-dependencies-perseus.sh
 
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-plutosdr b/docker/Dockerfiles/Dockerfile-plutosdr
index c087960..d91e3f1 100644
--- a/docker/Dockerfiles/Dockerfile-plutosdr
+++ b/docker/Dockerfiles/Dockerfile-plutosdr
@@ -4,3 +4,5 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-plutosdr.sh /
 RUN /install-dependencies-plutosdr.sh &&\
     rm /install-dependencies-plutosdr.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr b/docker/Dockerfiles/Dockerfile-rtlsdr
index d637393..5e24074 100644
--- a/docker/Dockerfiles/Dockerfile-rtlsdr
+++ b/docker/Dockerfiles/Dockerfile-rtlsdr
@@ -8,3 +8,5 @@ RUN /install-dependencies-rtlsdr.sh &&\
     rm /install-dependencies-rtlsdr.sh &&\
     /install-connectors.sh &&\
     rm /install-connectors.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
index aeb4ef5..47de00d 100644
--- a/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
+++ b/docker/Dockerfiles/Dockerfile-rtlsdr-soapy
@@ -4,3 +4,5 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-rtlsdr-soapy.sh /
 RUN /install-dependencies-rtlsdr-soapy.sh &&\
     rm /install-dependencies-rtlsdr-soapy.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-sdrplay b/docker/Dockerfiles/Dockerfile-sdrplay
index 943fb2b..eb4cf2c 100644
--- a/docker/Dockerfiles/Dockerfile-sdrplay
+++ b/docker/Dockerfiles/Dockerfile-sdrplay
@@ -6,3 +6,5 @@ ADD docker/scripts/install-lib.*.patch /
 RUN /install-dependencies-sdrplay.sh &&\
     rm /install-dependencies-sdrplay.sh &&\
     rm /install-lib.*.patch
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-soapyremote b/docker/Dockerfiles/Dockerfile-soapyremote
index 3eef82b..312af40 100644
--- a/docker/Dockerfiles/Dockerfile-soapyremote
+++ b/docker/Dockerfiles/Dockerfile-soapyremote
@@ -4,3 +4,5 @@ FROM openwebrx-soapysdr-base:$ARCHTAG
 ADD docker/scripts/install-dependencies-soapyremote.sh /
 RUN /install-dependencies-soapyremote.sh &&\
     rm /install-dependencies-soapyremote.sh
+
+ADD . /opt/openwebrx

From 541c38151fef556ab01664574b25697464acb369 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 21 Mar 2020 22:40:39 +0100
Subject: [PATCH 117/475] split config and property code, first test

---
 owrx/__main__.py               |   4 +-
 owrx/client.py                 |   4 +-
 owrx/config.py                 | 173 ++++++---------------------------
 owrx/connection.py             |  13 +--
 owrx/controllers/assets.py     |   4 +-
 owrx/controllers/status.py     |   6 +-
 owrx/dsp.py                    |   4 +-
 owrx/feature.py                |   4 +-
 owrx/fft.py                    |   4 +-
 owrx/kiss.py                   |   4 +-
 owrx/map.py                    |   7 +-
 owrx/meta.py                   |   4 +-
 owrx/property/__init__.py      | 121 +++++++++++++++++++++++
 owrx/pskreporter.py            |   6 +-
 owrx/sdr.py                    |   5 +-
 owrx/sdrhu.py                  |   4 +-
 owrx/service/__init__.py       |   7 +-
 owrx/service/schedule.py       |   4 +-
 owrx/source/__init__.py        |   4 +-
 owrx/wsjt.py                   |   9 +-
 sdrhu.py                       |   4 +-
 test/__init__.py               |   0
 test/property/__init__.py      |   0
 test/property/test_property.py |   8 ++
 24 files changed, 210 insertions(+), 193 deletions(-)
 create mode 100644 owrx/property/__init__.py
 create mode 100644 test/__init__.py
 create mode 100644 test/property/__init__.py
 create mode 100644 test/property/test_property.py

diff --git a/owrx/__main__.py b/owrx/__main__.py
index 948781f..14264ed 100644
--- a/owrx/__main__.py
+++ b/owrx/__main__.py
@@ -1,6 +1,6 @@
 from http.server import HTTPServer
 from owrx.http import RequestHandler
-from owrx.config import PropertyManager, Config
+from owrx.config import Config
 from owrx.feature import FeatureDetector
 from owrx.sdr import SdrService
 from socketserver import ThreadingMixIn
@@ -36,7 +36,7 @@ Support and info:       https://groups.io/g/openwebrx
 
     logger.info("OpenWebRX version {0} starting up...".format(openwebrx_version))
 
-    pm = PropertyManager.getSharedInstance().loadConfig()
+    pm = Config.get()
 
     configErrors = Config.validateConfig()
     if configErrors:
diff --git a/owrx/client.py b/owrx/client.py
index 4fda3d4..6241a01 100644
--- a/owrx/client.py
+++ b/owrx/client.py
@@ -1,4 +1,4 @@
-from owrx.config import PropertyManager
+from owrx.config import Config
 from owrx.metrics import Metrics, DirectMetric
 import threading
 
@@ -33,7 +33,7 @@ class ClientRegistry(object):
             c.write_clients(n)
 
     def addClient(self, client):
-        pm = PropertyManager.getSharedInstance()
+        pm = Config.get()
         if len(self.clients) >= pm["max_clients"]:
             raise TooManyClientsException()
         self.clients.append(client)
diff --git a/owrx/config.py b/owrx/config.py
index b027f48..2aff716 100644
--- a/owrx/config.py
+++ b/owrx/config.py
@@ -1,155 +1,15 @@
+from owrx.property import PropertyManager
 import importlib.util
-import logging
 import os
+import logging
 
 logger = logging.getLogger(__name__)
 
 
-class Subscription(object):
-    def __init__(self, subscriptee, subscriber):
-        self.subscriptee = subscriptee
-        self.subscriber = subscriber
-
-    def call(self, *args, **kwargs):
-        self.subscriber(*args, **kwargs)
-
-    def cancel(self):
-        self.subscriptee.unwire(self)
-
-
-class Property(object):
-    def __init__(self, value=None):
-        self.value = value
-        self.subscribers = []
-
-    def getValue(self):
-        return self.value
-
-    def setValue(self, value):
-        if self.value == value:
-            return self
-        self.value = value
-        for c in self.subscribers:
-            try:
-                c.call(self.value)
-            except Exception as e:
-                logger.exception(e)
-        return self
-
-    def wire(self, callback):
-        sub = Subscription(self, callback)
-        self.subscribers.append(sub)
-        if not self.value is None:
-            sub.call(self.value)
-        return sub
-
-    def unwire(self, sub):
-        try:
-            self.subscribers.remove(sub)
-        except ValueError:
-            # happens when already removed before
-            pass
-        return self
-
-
 class ConfigNotFoundException(Exception):
     pass
 
 
-class PropertyManager(object):
-    sharedInstance = None
-
-    @staticmethod
-    def getSharedInstance():
-        if PropertyManager.sharedInstance is None:
-            PropertyManager.sharedInstance = PropertyManager()
-        return PropertyManager.sharedInstance
-
-    def collect(self, *props):
-        return PropertyManager(
-            {name: self.getProperty(name) if self.hasProperty(name) else Property() for name in props}
-        )
-
-    def __init__(self, properties=None):
-        self.properties = {}
-        self.subscribers = []
-        if properties is not None:
-            for (name, prop) in properties.items():
-                self.add(name, prop)
-
-    def add(self, name, prop):
-        self.properties[name] = prop
-
-        def fireCallbacks(value):
-            for c in self.subscribers:
-                try:
-                    c.call(name, value)
-                except Exception as e:
-                    logger.exception(e)
-
-        prop.wire(fireCallbacks)
-        return self
-
-    def __contains__(self, name):
-        return self.hasProperty(name)
-
-    def __getitem__(self, name):
-        return self.getPropertyValue(name)
-
-    def __setitem__(self, name, value):
-        if not self.hasProperty(name):
-            self.add(name, Property())
-        self.getProperty(name).setValue(value)
-
-    def __dict__(self):
-        return {k: v.getValue() for k, v in self.properties.items()}
-
-    def hasProperty(self, name):
-        return name in self.properties
-
-    def getProperty(self, name):
-        if not self.hasProperty(name):
-            self.add(name, Property())
-        return self.properties[name]
-
-    def getPropertyValue(self, name):
-        return self.getProperty(name).getValue()
-
-    def wire(self, callback):
-        sub = Subscription(self, callback)
-        self.subscribers.append(sub)
-        return sub
-
-    def unwire(self, sub):
-        try:
-            self.subscribers.remove(sub)
-        except ValueError:
-            # happens when already removed before
-            pass
-        return self
-
-    def defaults(self, other_pm):
-        for (key, p) in self.properties.items():
-            if p.getValue() is None:
-                p.setValue(other_pm[key])
-        return self
-
-    def loadConfig(self):
-        for file in ["/etc/openwebrx/config_webrx.py", "./config_webrx.py"]:
-            try:
-                spec = importlib.util.spec_from_file_location("config_webrx", file)
-                cfg = importlib.util.module_from_spec(spec)
-                spec.loader.exec_module(cfg)
-                for name, value in cfg.__dict__.items():
-                    if name.startswith("__"):
-                        continue
-                    self[name] = value
-                return self
-            except FileNotFoundError:
-                pass
-        raise ConfigNotFoundException("no usable config found! please make sure you have a valid configuration file!")
-
-
 class ConfigError(object):
     def __init__(self, key, message):
         self.key = key
@@ -160,9 +20,34 @@ class ConfigError(object):
 
 
 class Config:
+    sharedConfig = None
+
+    @staticmethod
+    def _loadConfig():
+        pm = PropertyManager()
+        for file in ["/etc/openwebrx/config_webrx.py", "./config_webrx.py"]:
+            try:
+                spec = importlib.util.spec_from_file_location("config_webrx", file)
+                cfg = importlib.util.module_from_spec(spec)
+                spec.loader.exec_module(cfg)
+                for name, value in cfg.__dict__.items():
+                    if name.startswith("__"):
+                        continue
+                    pm[name] = value
+                return pm
+            except FileNotFoundError:
+                pass
+        raise ConfigNotFoundException("no usable config found! please make sure you have a valid configuration file!")
+
+    @staticmethod
+    def get():
+        if Config.sharedConfig is None:
+            Config.sharedConfig = Config._loadConfig()
+        return Config.sharedConfig
+
     @staticmethod
     def validateConfig():
-        pm = PropertyManager.getSharedInstance()
+        pm = Config.get()
         errors = [
             Config.checkTempDirectory(pm)
         ]
@@ -172,7 +57,7 @@ class Config:
     @staticmethod
     def checkTempDirectory(pm: PropertyManager):
         key = "temporary_directory"
-        if not key in pm or pm[key] is None:
+        if key not in pm or pm[key] is None:
             return ConfigError(key, "temporary directory is not set")
         if not os.path.exists(pm[key]):
             return ConfigError(key, "temporary directory doesn't exist")
diff --git a/owrx/connection.py b/owrx/connection.py
index 6884f69..1311102 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -1,4 +1,4 @@
-from owrx.config import PropertyManager
+from owrx.config import Config
 from owrx.dsp import DspManager
 from owrx.cpu import CpuUsageThread
 from owrx.sdr import SdrService
@@ -93,7 +93,7 @@ class OpenWebRxReceiverClient(Client):
             self.close()
             raise
 
-        pm = PropertyManager.getSharedInstance()
+        pm = Config.get()
 
         self.setSdr()
 
@@ -198,7 +198,7 @@ class OpenWebRxReceiverClient(Client):
         configProps = (
             self.sdr.getProps()
             .collect(*OpenWebRxReceiverClient.config_keys)
-            .defaults(PropertyManager.getSharedInstance())
+            .defaults(Config.get())
         )
 
         def sendConfig(key, value):
@@ -247,15 +247,16 @@ class OpenWebRxReceiverClient(Client):
             self.sdr.removeSpectrumClient(self)
 
     def setParams(self, params):
+        config = Config.get()
         # allow direct configuration only if enabled in the config
-        keys = PropertyManager.getSharedInstance()["configurable_keys"]
+        keys = config["configurable_keys"]
         if not keys:
             return
         # only the keys in the protected property manager can be overridden from the web
         protected = (
             self.sdr.getProps()
             .collect(*keys)
-            .defaults(PropertyManager.getSharedInstance())
+            .defaults(config)
         )
         for key, value in params.items():
             protected[key] = value
@@ -333,7 +334,7 @@ class MapConnection(Client):
     def __init__(self, conn):
         super().__init__(conn)
 
-        pm = PropertyManager.getSharedInstance()
+        pm = Config.get()
         self.write_config(pm.collect("google_maps_api_key", "receiver_gps", "map_position_retention_time").__dict__())
 
         Map.getSharedInstance().addClient(self)
diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index 96782f5..9a8ab24 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -1,5 +1,5 @@
 from . import Controller
-from owrx.config import PropertyManager
+from owrx.config import Config
 from datetime import datetime
 import mimetypes
 import os
@@ -47,7 +47,7 @@ class OwrxAssetsController(AssetsController):
 
 class AprsSymbolsController(AssetsController):
     def __init__(self, handler, request, options):
-        pm = PropertyManager.getSharedInstance()
+        pm = Config.get()
         path = pm["aprs_symbols_path"]
         if not path.endswith("/"):
             path += "/"
diff --git a/owrx/controllers/status.py b/owrx/controllers/status.py
index bb513ee..12be28f 100644
--- a/owrx/controllers/status.py
+++ b/owrx/controllers/status.py
@@ -2,14 +2,14 @@ from . import Controller
 from owrx.client import ClientRegistry
 from owrx.version import openwebrx_version
 from owrx.sdr import SdrService
-from owrx.config import PropertyManager
+from owrx.config import Config
 import os
 import json
 
 
 class StatusController(Controller):
     def indexAction(self):
-        pm = PropertyManager.getSharedInstance()
+        pm = Config.get()
         # TODO keys that have been left out since they are no longer simple strings: sdr_hw, bands, antenna
         vars = {
             "status": "active",
@@ -42,7 +42,7 @@ class StatusController(Controller):
         return stats
 
     def jsonAction(self):
-        pm = PropertyManager.getSharedInstance()
+        pm = Config.get()
 
         gps = pm["receiver_gps"]
         status = {
diff --git a/owrx/dsp.py b/owrx/dsp.py
index f12d171..3f155c6 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -1,4 +1,4 @@
-from owrx.config import PropertyManager
+from owrx.config import Config
 from owrx.meta import MetaParser
 from owrx.wsjt import WsjtParser
 from owrx.aprs import AprsParser
@@ -39,7 +39,7 @@ class DspManager(csdr.output):
                 "temporary_directory",
                 "center_freq",
             )
-            .defaults(PropertyManager.getSharedInstance())
+            .defaults(Config.get())
         )
 
         self.dsp = csdr.dsp(self)
diff --git a/owrx/feature.py b/owrx/feature.py
index f873847..ffd266b 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -4,7 +4,7 @@ from operator import and_, or_
 import re
 from distutils.version import LooseVersion
 import inspect
-from owrx.config import PropertyManager
+from owrx.config import Config
 import shlex
 
 import logging
@@ -95,7 +95,7 @@ class FeatureDetector(object):
         return inspect.getdoc(self._get_requirement_method(requirement))
 
     def command_is_runnable(self, command):
-        tmp_dir = PropertyManager.getSharedInstance()["temporary_directory"]
+        tmp_dir = Config.get()["temporary_directory"]
         cmd = shlex.split(command)
         try:
             process = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, cwd=tmp_dir)
diff --git a/owrx/fft.py b/owrx/fft.py
index b1c61de..93cceef 100644
--- a/owrx/fft.py
+++ b/owrx/fft.py
@@ -1,4 +1,4 @@
-from owrx.config import PropertyManager
+from owrx.config import Config
 from csdr import csdr
 import threading
 from owrx.source import SdrSource
@@ -23,7 +23,7 @@ class SpectrumThread(csdr.output):
             "csdr_print_bufsizes",
             "csdr_through",
             "temporary_directory",
-        ).defaults(PropertyManager.getSharedInstance())
+        ).defaults(Config.get())
 
         self.dsp = dsp = csdr.dsp(self)
         dsp.nc_port = self.sdrSource.getPort()
diff --git a/owrx/kiss.py b/owrx/kiss.py
index e24284f..5da2907 100644
--- a/owrx/kiss.py
+++ b/owrx/kiss.py
@@ -2,7 +2,7 @@ import socket
 import time
 import logging
 import random
-from owrx.config import PropertyManager
+from owrx.config import Config
 
 logger = logging.getLogger(__name__)
 
@@ -14,7 +14,7 @@ TFESC = 0xDD
 
 class DirewolfConfig(object):
     def getConfig(self, port, is_service):
-        pm = PropertyManager.getSharedInstance()
+        pm = Config.get()
 
         config = """
 ACHANNELS 1
diff --git a/owrx/map.py b/owrx/map.py
index f7a0d5d..f70d1cc 100644
--- a/owrx/map.py
+++ b/owrx/map.py
@@ -1,7 +1,8 @@
 from datetime import datetime, timedelta
-import threading, time
-from owrx.config import PropertyManager
+from owrx.config import Config
 from owrx.bands import Band
+import threading
+import time
 import sys
 
 import logging
@@ -105,7 +106,7 @@ class Map(object):
             # TODO broadcast removal to clients
 
     def removeOldPositions(self):
-        pm = PropertyManager.getSharedInstance()
+        pm = Config.get()
         retention = timedelta(seconds=pm["map_position_retention_time"])
         cutoff = datetime.now() - retention
 
diff --git a/owrx/meta.py b/owrx/meta.py
index d69127d..c7e9c1d 100644
--- a/owrx/meta.py
+++ b/owrx/meta.py
@@ -1,4 +1,4 @@
-from owrx.config import PropertyManager
+from owrx.config import Config
 from urllib import request
 import json
 from datetime import datetime, timedelta
@@ -54,7 +54,7 @@ class DmrMetaEnricher(object):
         del self.threads[id]
 
     def enrich(self, meta):
-        if not PropertyManager.getSharedInstance()["digital_voice_dmr_id_lookup"]:
+        if not Config.get()["digital_voice_dmr_id_lookup"]:
             return None
         if not "source" in meta:
             return None
diff --git a/owrx/property/__init__.py b/owrx/property/__init__.py
new file mode 100644
index 0000000..7ef892a
--- /dev/null
+++ b/owrx/property/__init__.py
@@ -0,0 +1,121 @@
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class Subscription(object):
+    def __init__(self, subscriptee, subscriber):
+        self.subscriptee = subscriptee
+        self.subscriber = subscriber
+
+    def call(self, *args, **kwargs):
+        self.subscriber(*args, **kwargs)
+
+    def cancel(self):
+        self.subscriptee.unwire(self)
+
+
+class Property(object):
+    def __init__(self, value=None):
+        self.value = value
+        self.subscribers = []
+
+    def getValue(self):
+        return self.value
+
+    def setValue(self, value):
+        if self.value == value:
+            return self
+        self.value = value
+        for c in self.subscribers:
+            try:
+                c.call(self.value)
+            except Exception as e:
+                logger.exception(e)
+        return self
+
+    def wire(self, callback):
+        sub = Subscription(self, callback)
+        self.subscribers.append(sub)
+        if self.value is not None:
+            sub.call(self.value)
+        return sub
+
+    def unwire(self, sub):
+        try:
+            self.subscribers.remove(sub)
+        except ValueError:
+            # happens when already removed before
+            pass
+        return self
+
+
+class PropertyManager(object):
+    def collect(self, *props):
+        return PropertyManager(
+            {name: self.getProperty(name) if self.hasProperty(name) else Property() for name in props}
+        )
+
+    def __init__(self, properties=None):
+        self.properties = {}
+        self.subscribers = []
+        if properties is not None:
+            for (name, prop) in properties.items():
+                self.add(name, prop)
+
+    def add(self, name, prop):
+        self.properties[name] = prop
+
+        def fireCallbacks(value):
+            for c in self.subscribers:
+                try:
+                    c.call(name, value)
+                except Exception as e:
+                    logger.exception(e)
+
+        prop.wire(fireCallbacks)
+        return self
+
+    def __contains__(self, name):
+        return self.hasProperty(name)
+
+    def __getitem__(self, name):
+        return self.getPropertyValue(name)
+
+    def __setitem__(self, name, value):
+        if not self.hasProperty(name):
+            self.add(name, Property())
+        self.getProperty(name).setValue(value)
+
+    def __dict__(self):
+        return {k: v.getValue() for k, v in self.properties.items()}
+
+    def hasProperty(self, name):
+        return name in self.properties
+
+    def getProperty(self, name):
+        if not self.hasProperty(name):
+            self.add(name, Property())
+        return self.properties[name]
+
+    def getPropertyValue(self, name):
+        return self.getProperty(name).getValue()
+
+    def wire(self, callback):
+        sub = Subscription(self, callback)
+        self.subscribers.append(sub)
+        return sub
+
+    def unwire(self, sub):
+        try:
+            self.subscribers.remove(sub)
+        except ValueError:
+            # happens when already removed before
+            pass
+        return self
+
+    def defaults(self, other_pm):
+        for (key, p) in self.properties.items():
+            if p.getValue() is None:
+                p.setValue(other_pm[key])
+        return self
diff --git a/owrx/pskreporter.py b/owrx/pskreporter.py
index da580f0..22a813f 100644
--- a/owrx/pskreporter.py
+++ b/owrx/pskreporter.py
@@ -5,7 +5,7 @@ import random
 import socket
 from functools import reduce
 from operator import and_
-from owrx.config import PropertyManager
+from owrx.config import Config
 from owrx.version import openwebrx_version
 from owrx.locator import Locator
 from owrx.metrics import Metrics, CounterMetric
@@ -36,7 +36,7 @@ class PskReporter(object):
     def getSharedInstance():
         with PskReporter.creationLock:
             if PskReporter.sharedInstance is None:
-                if PropertyManager.getSharedInstance()["pskreporter_enabled"]:
+                if Config.get()["pskreporter_enabled"]:
                     PskReporter.sharedInstance = PskReporter()
                 else:
                     PskReporter.sharedInstance = PskReporterDummy()
@@ -181,7 +181,7 @@ class Uploader(object):
         )
 
     def getReceiverInformation(self):
-        pm = PropertyManager.getSharedInstance()
+        pm = Config.get()
         callsign = pm["pskreporter_callsign"]
         locator = Locator.fromCoordinates(pm["receiver_gps"])
         decodingSoftware = "OpenWebRX " + openwebrx_version
diff --git a/owrx/sdr.py b/owrx/sdr.py
index 52a2bbf..19c34c3 100644
--- a/owrx/sdr.py
+++ b/owrx/sdr.py
@@ -1,4 +1,5 @@
-from owrx.config import PropertyManager
+from owrx.config import Config
+from owrx.property import PropertyManager
 from owrx.feature import FeatureDetector, UnknownFeatureException
 
 import logging
@@ -14,7 +15,7 @@ class SdrService(object):
     @staticmethod
     def loadProps():
         if SdrService.sdrProps is None:
-            pm = PropertyManager.getSharedInstance()
+            pm = Config.get()
             featureDetector = FeatureDetector()
 
             def loadIntoPropertyManager(dict: dict):
diff --git a/owrx/sdrhu.py b/owrx/sdrhu.py
index f9b5207..939d352 100644
--- a/owrx/sdrhu.py
+++ b/owrx/sdrhu.py
@@ -1,6 +1,6 @@
 import threading
 import time
-from owrx.config import PropertyManager
+from owrx.config import Config
 from urllib import request, parse
 
 import logging
@@ -14,7 +14,7 @@ class SdrHuUpdater(threading.Thread):
         super().__init__(daemon=True)
 
     def update(self):
-        pm = PropertyManager.getSharedInstance().collect("server_hostname", "web_port", "sdrhu_key")
+        pm = Config.get().collect("server_hostname", "web_port", "sdrhu_key")
         data = parse.urlencode({
             "url": "http://{server_hostname}:{web_port}".format(**pm.__dict__()),
             "apikey": pm["sdrhu_key"]
diff --git a/owrx/service/__init__.py b/owrx/service/__init__.py
index 3e1a337..efda39d 100644
--- a/owrx/service/__init__.py
+++ b/owrx/service/__init__.py
@@ -5,9 +5,10 @@ from owrx.bands import Bandplan
 from csdr.csdr import dsp, output
 from owrx.wsjt import WsjtParser
 from owrx.aprs import AprsParser
-from owrx.config import PropertyManager
+from owrx.config import Config
 from owrx.source.resampler import Resampler
 from owrx.feature import FeatureDetector
+from owrx.property import PropertyManager
 from abc import ABCMeta, abstractmethod
 from .schedule import ServiceScheduler
 
@@ -96,7 +97,7 @@ class ServiceHandler(object):
         # this looks overly complicated... but i'd like modes with no requirements to be always available without
         # being listed in the hash above
         unavailable = [mode for mode, req in requirements.items() if not fd.is_available(req)]
-        configured = PropertyManager.getSharedInstance()["services_decoders"]
+        configured = Config.get()["services_decoders"]
         available = [mode for mode in configured if mode not in unavailable]
 
         return mode in available
@@ -260,7 +261,7 @@ class Services(object):
 
     @staticmethod
     def start():
-        if not PropertyManager.getSharedInstance()["services_enabled"]:
+        if not Config.get()["services_enabled"]:
             return
         for source in SdrService.getSources().values():
             props = source.getProps()
diff --git a/owrx/service/schedule.py b/owrx/service/schedule.py
index 509a26f..ade3976 100644
--- a/owrx/service/schedule.py
+++ b/owrx/service/schedule.py
@@ -1,6 +1,6 @@
 from datetime import datetime, timezone, timedelta
 from owrx.source import SdrSource
-from owrx.config import PropertyManager
+from owrx.config import Config
 import threading
 import math
 from abc import ABC, ABCMeta, abstractmethod
@@ -134,7 +134,7 @@ class DaylightSchedule(TimerangeSchedule):
         self.schedule = scheduleDict
 
     def getSunTimes(self, date):
-        pm = PropertyManager.getSharedInstance()
+        pm = Config.get()
         lat, lng = pm["receiver_gps"]
         degtorad = math.pi / 180
         radtodeg = 180 / math.pi
diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index cb050f2..abc35d2 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -1,4 +1,4 @@
-from owrx.config import PropertyManager
+from owrx.config import Config
 import threading
 import subprocess
 import os
@@ -35,7 +35,7 @@ class SdrSource(ABC):
         self.props = props
         self.profile_id = None
         self.activateProfile()
-        self.rtlProps = self.props.collect(*self.getEventNames()).defaults(PropertyManager.getSharedInstance())
+        self.rtlProps = self.props.collect(*self.getEventNames()).defaults(Config.get())
         self.wireEvents()
         self.commandMapper = None
 
diff --git a/owrx/wsjt.py b/owrx/wsjt.py
index 4818201..08bb911 100644
--- a/owrx/wsjt.py
+++ b/owrx/wsjt.py
@@ -7,8 +7,7 @@ from multiprocessing.connection import Pipe
 from owrx.map import Map, LocatorLocation
 import re
 from queue import Queue, Full
-from owrx.config import PropertyManager
-from owrx.bands import Bandplan
+from owrx.config import Config
 from owrx.metrics import Metrics, CounterMetric, DirectMetric
 from owrx.pskreporter import PskReporter
 from owrx.parser import Parser
@@ -45,7 +44,7 @@ class WsjtQueue(Queue):
     def getSharedInstance():
         with WsjtQueue.creationLock:
             if WsjtQueue.sharedInstance is None:
-                pm = PropertyManager.getSharedInstance()
+                pm = Config.get()
                 WsjtQueue.sharedInstance = WsjtQueue(maxsize=pm["wsjt_queue_length"], workers=pm["wsjt_queue_workers"])
         return WsjtQueue.sharedInstance
 
@@ -89,7 +88,7 @@ class WsjtQueue(Queue):
 class WsjtChopper(threading.Thread):
     def __init__(self, source):
         self.source = source
-        self.tmp_dir = PropertyManager.getSharedInstance()["temporary_directory"]
+        self.tmp_dir = Config.get()["temporary_directory"]
         (self.wavefilename, self.wavefile) = self.getWaveFile()
         self.switchingLock = threading.Lock()
         self.timer = None
@@ -193,7 +192,7 @@ class WsjtChopper(threading.Thread):
             return None
 
     def decoding_depth(self, mode):
-        pm = PropertyManager.getSharedInstance()
+        pm = Config.get()
         # mode-specific setting?
         if "wsjt_decoding_depths" in pm and mode in pm["wsjt_decoding_depths"]:
             return pm["wsjt_decoding_depths"][mode]
diff --git a/sdrhu.py b/sdrhu.py
index 53c5c6d..9678a9b 100755
--- a/sdrhu.py
+++ b/sdrhu.py
@@ -22,14 +22,14 @@
 """
 
 from owrx.sdrhu import SdrHuUpdater
-from owrx.config import PropertyManager
+from owrx.config import Config
 
 import logging
 logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
 logger = logging.getLogger(__name__)
 
 if __name__ == "__main__":
-    pm = PropertyManager.getSharedInstance().loadConfig()
+    pm = Config.get()
 
     if "sdrhu_public_listing" not in pm or not pm["sdrhu_public_listing"]:
         logger.error('Public listing on sdr.hu is not activated. Please check "sdrhu_public_listing" in your config.')
diff --git a/test/__init__.py b/test/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/test/property/__init__.py b/test/property/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/test/property/test_property.py b/test/property/test_property.py
new file mode 100644
index 0000000..1529f8c
--- /dev/null
+++ b/test/property/test_property.py
@@ -0,0 +1,8 @@
+import unittest
+from owrx.property import Property
+
+
+class PropertyTest(unittest.TestCase):
+    def testSimple(self):
+        prop = Property("testvalue")
+        self.assertEqual(prop.getValue(), "testvalue")

From 92cd65b66fa9b4f4fd738dc5df3df6009970bc23 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 22 Mar 2020 11:56:43 +0100
Subject: [PATCH 118/475] remove installation leftovers

---
 docker/scripts/install-dependencies.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index cbe8bcd..64a8d0b 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -49,6 +49,7 @@ WSJT_TGZ=${WSJT_DIR}.tgz
 wget http://physics.princeton.edu/pulsar/k1jt/$WSJT_TGZ
 tar xvfz $WSJT_TGZ
 cmakebuild $WSJT_DIR
+rm $WSJT_TGZ
 
 git clone --depth 1 -b 1.5 https://github.com/wb2osz/direwolf.git
 cd direwolf

From 9768fa7c5074157246547461ea973cc7f0017832 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 22 Mar 2020 15:32:39 +0100
Subject: [PATCH 119/475] add docker build for perseus

---
 build.sh                                       | 1 +
 docker/Dockerfiles/Dockerfile-full             | 1 +
 docker/env                                     | 2 +-
 docker/scripts/install-dependencies-perseus.sh | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.sh b/build.sh
index cbeff6f..d91df81 100755
--- a/build.sh
+++ b/build.sh
@@ -12,4 +12,5 @@ docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-rtlsdr-soapy:$AR
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-plutosdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-plutosdr .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-limesdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-limesdr .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-soapyremote:$ARCHTAG -f docker/Dockerfiles/Dockerfile-soapyremote .
+docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-perseus:$ARCHTAG -f docker/Dockerfiles/Dockerfile-perseus .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-full:$ARCHTAG -t jketterl/openwebrx:$ARCHTAG -f docker/Dockerfiles/Dockerfile-full .
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index e3d1add..9571428 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -13,6 +13,7 @@ RUN /install-dependencies-rtlsdr.sh &&\
     /install-dependencies-plutosdr.sh &&\
     /install-dependencies-limesdr.sh &&\
     /install-dependencies-soapyremote.sh &&\
+    /install-dependencies-perseus.sh &&\
     rm /install-dependencies-*.sh &&\
     rm /install-lib.*.patch
 
diff --git a/docker/env b/docker/env
index af1b7f6..18c5220 100644
--- a/docker/env
+++ b/docker/env
@@ -1,5 +1,5 @@
 ARCH=$(uname -m)
-IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-full openwebrx"
+IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-perseus openwebrx-full openwebrx"
 ALL_ARCHS="x86_64 armv7l aarch64"
 TAG=${TAG:-"latest"}
 ARCHTAG="$TAG-$ARCH"
diff --git a/docker/scripts/install-dependencies-perseus.sh b/docker/scripts/install-dependencies-perseus.sh
index b94ea6c..62a0a71 100755
--- a/docker/scripts/install-dependencies-perseus.sh
+++ b/docker/scripts/install-dependencies-perseus.sh
@@ -5,7 +5,7 @@ export MAKEFLAGS="-j4"
 cd /tmp
 
 STATIC_PACKAGES="libusb udev"
-BUILD_PACKAGES="git make gcc autoconf automake libtool musl-dev libusb-dev shadow"
+BUILD_PACKAGES="git make gcc autoconf automake libtool musl-dev libusb-dev shadow vim"
 
 apk add --no-cache $STATIC_PACKAGES
 apk add --no-cache --virtual .build-deps $BUILD_PACKAGES

From 5076f79aaa5b23d40cde6a3a7bdbcfe828b367a7 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 22 Mar 2020 15:39:59 +0100
Subject: [PATCH 120/475] add owrx.property to the setup

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index c32d972..5c9d16b 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ except ImportError:
 setup(
     name="OpenWebRX",
     version=str(strictversion),
-    packages=find_namespace_packages(include=["owrx", "owrx.source", "owrx.service", "owrx.controllers", "csdr", "htdocs"]),
+    packages=find_namespace_packages(include=["owrx", "owrx.source", "owrx.service", "owrx.controllers", "owrx.property", "csdr", "htdocs"]),
     package_data={"htdocs": [f[len("htdocs/") :] for f in glob("htdocs/**/*", recursive=True)]},
     entry_points={"console_scripts": ["openwebrx=owrx.__main__:main"]},
     # use the github page for now

From b3a5a36d9c9504cef66a911f995734225a53bf0f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 22 Mar 2020 19:42:59 +0100
Subject: [PATCH 121/475] more tests

---
 test/property/test_property.py | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/test/property/test_property.py b/test/property/test_property.py
index 1529f8c..26634c9 100644
--- a/test/property/test_property.py
+++ b/test/property/test_property.py
@@ -1,8 +1,28 @@
 import unittest
+from unittest.mock import Mock
 from owrx.property import Property
 
 
 class PropertyTest(unittest.TestCase):
-    def testSimple(self):
+    def testValue(self):
         prop = Property("testvalue")
         self.assertEqual(prop.getValue(), "testvalue")
+
+    def testChangeValue(self):
+        prop = Property("before")
+        prop.setValue("after")
+        self.assertEqual(prop.getValue(), "after")
+
+    def testInitialValueOnCallback(self):
+        prop = Property("before")
+        m = Mock()
+        prop.wire(m.method)
+        m.method.assert_called_once_with("before")
+
+    def testChangedValueOnCallback(self):
+        prop = Property("before")
+        m = Mock()
+        prop.wire(m.method)
+        m.reset_mock()
+        prop.setValue("after")
+        m.method.assert_called_with("after")

From 885d02cecac0b6e69cb731b1186b5f77ae9bf6fa Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 22 Mar 2020 21:51:49 +0100
Subject: [PATCH 122/475] start implementing property layering

---
 owrx/property/__init__.py              | 22 +++++++++++++
 test/property/test_property_overlay.py | 43 ++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)
 create mode 100644 test/property/test_property_overlay.py

diff --git a/owrx/property/__init__.py b/owrx/property/__init__.py
index 7ef892a..655cd42 100644
--- a/owrx/property/__init__.py
+++ b/owrx/property/__init__.py
@@ -119,3 +119,25 @@ class PropertyManager(object):
             if p.getValue() is None:
                 p.setValue(other_pm[key])
         return self
+
+
+class PropertyLayers(object):
+    def __init__(self):
+        self.layers = []
+
+    def addLayer(self, priority: int, pm: PropertyManager):
+        """
+        highest priority = 0
+        """
+        self.layers.append({"priority": priority, "props": pm})
+
+    def removeLayer(self, pm: PropertyManager):
+        for layer in self.layers:
+            if layer["props"] == pm:
+                self.layers.remove(layer)
+
+    def __getitem__(self, item):
+        layers = [la["props"] for la in sorted(self.layers, key=lambda l: l["priority"])]
+        for m in layers:
+            if item in m:
+                return m[item]
\ No newline at end of file
diff --git a/test/property/test_property_overlay.py b/test/property/test_property_overlay.py
new file mode 100644
index 0000000..efa330a
--- /dev/null
+++ b/test/property/test_property_overlay.py
@@ -0,0 +1,43 @@
+from unittest import TestCase
+from unittest.mock import Mock
+from owrx.property import PropertyManager, PropertyLayers
+
+
+class TestPropertyMock(TestCase):
+    def testLayer(self):
+        om = PropertyLayers()
+        pm = PropertyManager()
+        pm["testkey"] = "testvalue"
+        om.addLayer(1, pm)
+        self.assertEqual(om["testkey"], "testvalue")
+
+    def testHighPriority(self):
+        om = PropertyLayers()
+        low_pm = PropertyManager()
+        high_pm = PropertyManager()
+        low_pm["testkey"] = "low value"
+        high_pm["testkey"] = "high value"
+        om.addLayer(1, low_pm)
+        om.addLayer(0, high_pm)
+        self.assertEqual(om["testkey"], "high value")
+
+    def testPriorityFallback(self):
+        om = PropertyLayers()
+        low_pm = PropertyManager()
+        high_pm = PropertyManager()
+        low_pm["testkey"] = "low value"
+        om.addLayer(1, low_pm)
+        om.addLayer(0, high_pm)
+        self.assertEqual(om["testkey"], "low value")
+
+    def testLayerRemoval(self):
+        om = PropertyLayers()
+        low_pm = PropertyManager()
+        high_pm = PropertyManager()
+        low_pm["testkey"] = "low value"
+        high_pm["testkey"] = "high value"
+        om.addLayer(1, low_pm)
+        om.addLayer(0, high_pm)
+        self.assertEqual(om["testkey"], "high value")
+        om.removeLayer(high_pm)
+        self.assertEqual(om["testkey"], "low value")

From b25e61ae9a42bef088439d066340e0616195a7aa Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 22 Mar 2020 21:59:22 +0100
Subject: [PATCH 123/475] rename

---
 .../{test_property_overlay.py => test_property_layers.py}       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename test/property/{test_property_overlay.py => test_property_layers.py} (97%)

diff --git a/test/property/test_property_overlay.py b/test/property/test_property_layers.py
similarity index 97%
rename from test/property/test_property_overlay.py
rename to test/property/test_property_layers.py
index efa330a..7bd0336 100644
--- a/test/property/test_property_overlay.py
+++ b/test/property/test_property_layers.py
@@ -3,7 +3,7 @@ from unittest.mock import Mock
 from owrx.property import PropertyManager, PropertyLayers
 
 
-class TestPropertyMock(TestCase):
+class TestPropertyLayers(TestCase):
     def testLayer(self):
         om = PropertyLayers()
         pm = PropertyManager()

From 7cae3831270076d7869f3633f7d9fcf73372e1aa Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 23 Mar 2020 22:09:05 +0100
Subject: [PATCH 124/475] include defaults

---
 csdr/csdr.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 2795002..f0d2498 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -174,6 +174,8 @@ class dsp(object):
         self.demodulator = "nfm"
         self.name = "csdr"
         self.base_bufsize = 512
+        self.decimation = None
+        self.last_decimation = None
         self.nc_port = None
         self.csdr_dynamic_bufsize = False
         self.csdr_print_bufsizes = False

From 37e74f9027b221548a8d64c51c0feaede1520e16 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 23 Mar 2020 22:09:26 +0100
Subject: [PATCH 125/475] use dictionary api

---
 owrx/__main__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/__main__.py b/owrx/__main__.py
index 14264ed..8e082e9 100644
--- a/owrx/__main__.py
+++ b/owrx/__main__.py
@@ -66,7 +66,7 @@ Support and info:       https://groups.io/g/openwebrx
     Services.start()
 
     try:
-        server = ThreadedHttpServer(("0.0.0.0", pm.getPropertyValue("web_port")), RequestHandler)
+        server = ThreadedHttpServer(("0.0.0.0", pm["web_port"]), RequestHandler)
         server.serve_forever()
     except KeyboardInterrupt:
         WebSocketConnection.closeAll()

From 7562dc8ecbd87c58f2f1c2b7894ca89510d82572 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 23 Mar 2020 22:09:41 +0100
Subject: [PATCH 126/475] use dictionary api

---
 owrx/connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index 1311102..56d5748 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -106,7 +106,7 @@ class OpenWebRxReceiverClient(Client):
             "photo_title",
             "photo_desc",
         ]
-        receiver_details = dict((key, pm.getPropertyValue(key)) for key in receiver_keys)
+        receiver_details = dict((key, pm[key]) for key in receiver_keys)
         receiver_details["locator"] = Locator.fromCoordinates(receiver_details["receiver_gps"])
         self.write_receiver_details(receiver_details)
 

From c83d8580bae4d23da98fbf7ce75d80f0ce10a9d9 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 23 Mar 2020 23:56:05 +0100
Subject: [PATCH 127/475] rewrite property engine

Property class is gone; logic is now done with Layers, Stack and Filter
---
 owrx/config.py                                |   6 +-
 owrx/connection.py                            |  22 +--
 owrx/dsp.py                                   |  74 +++----
 owrx/fft.py                                   |  18 +-
 owrx/property/__init__.py                     | 183 ++++++++++--------
 owrx/sdr.py                                   |   4 +-
 owrx/service/__init__.py                      |   4 +-
 owrx/source/__init__.py                       |   6 +-
 test/property/test_property.py                |  28 ---
 test/property/test_property_filter.py         |  51 +++++
 test/property/test_property_layer.py          |  52 +++++
 ...perty_layers.py => test_property_stack.py} |  26 +--
 12 files changed, 298 insertions(+), 176 deletions(-)
 delete mode 100644 test/property/test_property.py
 create mode 100644 test/property/test_property_filter.py
 create mode 100644 test/property/test_property_layer.py
 rename test/property/{test_property_layers.py => test_property_stack.py} (67%)

diff --git a/owrx/config.py b/owrx/config.py
index 2aff716..a87d066 100644
--- a/owrx/config.py
+++ b/owrx/config.py
@@ -1,4 +1,4 @@
-from owrx.property import PropertyManager
+from owrx.property import PropertyLayer
 import importlib.util
 import os
 import logging
@@ -24,7 +24,7 @@ class Config:
 
     @staticmethod
     def _loadConfig():
-        pm = PropertyManager()
+        pm = PropertyLayer()
         for file in ["/etc/openwebrx/config_webrx.py", "./config_webrx.py"]:
             try:
                 spec = importlib.util.spec_from_file_location("config_webrx", file)
@@ -55,7 +55,7 @@ class Config:
         return [e for e in errors if e is not None]
 
     @staticmethod
-    def checkTempDirectory(pm: PropertyManager):
+    def checkTempDirectory(pm: PropertyLayer):
         key = "temporary_directory"
         if key not in pm or pm[key] is None:
             return ConfigError(key, "temporary directory is not set")
diff --git a/owrx/connection.py b/owrx/connection.py
index 56d5748..b420568 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -10,6 +10,7 @@ from owrx.bands import Bandplan
 from owrx.bookmarks import Bookmarks
 from owrx.map import Map
 from owrx.locator import Locator
+from owrx.property import PropertyStack
 from multiprocessing import Queue
 from queue import Full
 import json
@@ -195,14 +196,14 @@ class OpenWebRxReceiverClient(Client):
         # send initial config
         self.setDspProperties(self.connectionProperties)
 
-        configProps = (
-            self.sdr.getProps()
-            .collect(*OpenWebRxReceiverClient.config_keys)
-            .defaults(Config.get())
-        )
+        stack = PropertyStack()
+        stack.addLayer(0, self.sdr.getProps())
+        stack.addLayer(1, Config.get())
+        configProps = stack.collect(*OpenWebRxReceiverClient.config_keys)
 
         def sendConfig(key, value):
-            config = dict((key, configProps[key]) for key in OpenWebRxReceiverClient.config_keys)
+            #config = dict((key, configProps[key]) for key in OpenWebRxReceiverClient.config_keys)
+            config = configProps.__dict__()
             # TODO mathematical properties? hmmmm
             config["start_offset_freq"] = configProps["start_freq"] - configProps["center_freq"]
             # TODO this is a hack to support multiple sdrs
@@ -253,11 +254,10 @@ class OpenWebRxReceiverClient(Client):
         if not keys:
             return
         # only the keys in the protected property manager can be overridden from the web
-        protected = (
-            self.sdr.getProps()
-            .collect(*keys)
-            .defaults(config)
-        )
+        stack = PropertyStack()
+        stack.addLayer(0, self.sdr.getProps())
+        stack.addLayer(1, config)
+        protected = stack.collect(*keys)
         for key, value in params.items():
             protected[key] = value
 
diff --git a/owrx/dsp.py b/owrx/dsp.py
index 3f155c6..693d12f 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -4,6 +4,7 @@ from owrx.wsjt import WsjtParser
 from owrx.aprs import AprsParser
 from owrx.pocsag import PocsagParser
 from owrx.source import SdrSource
+from owrx.property import PropertyStack
 from csdr import csdr
 import threading
 
@@ -23,23 +24,30 @@ class DspManager(csdr.output):
             "pocsag_demod": PocsagParser(self.handler),
         }
 
-        self.localProps = (
-            self.sdrSource.getProps()
-            .collect(
-                "audio_compression",
-                "fft_compression",
-                "digimodes_fft_size",
-                "csdr_dynamic_bufsize",
-                "csdr_print_bufsizes",
-                "csdr_through",
-                "digimodes_enable",
-                "samp_rate",
-                "digital_voice_unvoiced_quality",
-                "dmr_filter",
-                "temporary_directory",
-                "center_freq",
-            )
-            .defaults(Config.get())
+        stack = PropertyStack()
+        stack.addLayer(0, self.sdrSource.getProps())
+        stack.addLayer(1, Config.get())
+        self.localProps = stack.collect(
+            "audio_compression",
+            "fft_compression",
+            "digimodes_fft_size",
+            "csdr_dynamic_bufsize",
+            "csdr_print_bufsizes",
+            "csdr_through",
+            "digimodes_enable",
+            "samp_rate",
+            "digital_voice_unvoiced_quality",
+            "dmr_filter",
+            "temporary_directory",
+            "center_freq",
+
+            # TODO: following properties are set from the client
+            "output_rate",
+            "squelch_level",
+            "secondary_mod",
+            "low_cut",
+            "high_cut",
+            "offset_freq",
         )
 
         self.dsp = csdr.dsp(self)
@@ -61,19 +69,19 @@ class DspManager(csdr.output):
                 parser.setDialFrequency(freq)
 
         self.subscriptions = [
-            self.localProps.getProperty("audio_compression").wire(self.dsp.set_audio_compression),
-            self.localProps.getProperty("fft_compression").wire(self.dsp.set_fft_compression),
-            self.localProps.getProperty("digimodes_fft_size").wire(self.dsp.set_secondary_fft_size),
-            self.localProps.getProperty("samp_rate").wire(self.dsp.set_samp_rate),
-            self.localProps.getProperty("output_rate").wire(self.dsp.set_output_rate),
-            self.localProps.getProperty("offset_freq").wire(self.dsp.set_offset_freq),
-            self.localProps.getProperty("squelch_level").wire(self.dsp.set_squelch_level),
-            self.localProps.getProperty("low_cut").wire(set_low_cut),
-            self.localProps.getProperty("high_cut").wire(set_high_cut),
-            self.localProps.getProperty("mod").wire(self.dsp.set_demodulator),
-            self.localProps.getProperty("digital_voice_unvoiced_quality").wire(self.dsp.set_unvoiced_quality),
-            self.localProps.getProperty("dmr_filter").wire(self.dsp.set_dmr_filter),
-            self.localProps.getProperty("temporary_directory").wire(self.dsp.set_temporary_directory),
+            self.localProps.wireProperty("audio_compression", self.dsp.set_audio_compression),
+            self.localProps.wireProperty("fft_compression", self.dsp.set_fft_compression),
+            self.localProps.wireProperty("digimodes_fft_size", self.dsp.set_secondary_fft_size),
+            self.localProps.wireProperty("samp_rate", self.dsp.set_samp_rate),
+            self.localProps.wireProperty("output_rate", self.dsp.set_output_rate),
+            self.localProps.wireProperty("offset_freq", self.dsp.set_offset_freq),
+            self.localProps.wireProperty("squelch_level", self.dsp.set_squelch_level),
+            self.localProps.wireProperty("low_cut", set_low_cut),
+            self.localProps.wireProperty("high_cut", set_high_cut),
+            self.localProps.wireProperty("mod", self.dsp.set_demodulator),
+            self.localProps.wireProperty("digital_voice_unvoiced_quality", self.dsp.set_unvoiced_quality),
+            self.localProps.wireProperty("dmr_filter", self.dsp.set_dmr_filter),
+            self.localProps.wireProperty("temporary_directory", self.dsp.set_temporary_directory),
             self.localProps.collect("center_freq", "offset_freq").wire(set_dial_freq),
         ]
 
@@ -99,8 +107,8 @@ class DspManager(csdr.output):
                     )
 
             self.subscriptions += [
-                self.localProps.getProperty("secondary_mod").wire(set_secondary_mod),
-                self.localProps.getProperty("secondary_offset_freq").wire(self.dsp.set_secondary_offset_freq),
+                self.localProps.collect("secondary_mod").wire(set_secondary_mod),
+                self.localProps.collect("secondary_offset_freq").wire(self.dsp.set_secondary_offset_freq),
             ]
 
         self.sdrSource.addClient(self)
@@ -134,7 +142,7 @@ class DspManager(csdr.output):
         self.subscriptions = []
 
     def setProperty(self, prop, value):
-        self.localProps.getProperty(prop).setValue(value)
+        self.localProps[prop] = value
 
     def getClientClass(self):
         return SdrSource.CLIENT_USER
diff --git a/owrx/fft.py b/owrx/fft.py
index 93cceef..9d37bcf 100644
--- a/owrx/fft.py
+++ b/owrx/fft.py
@@ -2,6 +2,7 @@ from owrx.config import Config
 from csdr import csdr
 import threading
 from owrx.source import SdrSource
+from owrx.property import PropertyStack
 
 import logging
 
@@ -13,7 +14,10 @@ class SpectrumThread(csdr.output):
         self.sdrSource = sdrSource
         super().__init__()
 
-        self.props = props = self.sdrSource.props.collect(
+        stack = PropertyStack()
+        stack.addLayer(0, self.sdrSource.props)
+        stack.addLayer(1, Config.get())
+        self.props = props = stack.collect(
             "samp_rate",
             "fft_size",
             "fft_fps",
@@ -23,7 +27,7 @@ class SpectrumThread(csdr.output):
             "csdr_print_bufsizes",
             "csdr_through",
             "temporary_directory",
-        ).defaults(Config.get())
+        )
 
         self.dsp = dsp = csdr.dsp(self)
         dsp.nc_port = self.sdrSource.getPort()
@@ -42,11 +46,11 @@ class SpectrumThread(csdr.output):
             )
 
         self.subscriptions = [
-            props.getProperty("samp_rate").wire(dsp.set_samp_rate),
-            props.getProperty("fft_size").wire(dsp.set_fft_size),
-            props.getProperty("fft_fps").wire(dsp.set_fft_fps),
-            props.getProperty("fft_compression").wire(dsp.set_fft_compression),
-            props.getProperty("temporary_directory").wire(dsp.set_temporary_directory),
+            props.wireProperty("samp_rate", dsp.set_samp_rate),
+            props.wireProperty("fft_size", dsp.set_fft_size),
+            props.wireProperty("fft_fps", dsp.set_fft_fps),
+            props.wireProperty("fft_compression", dsp.set_fft_compression),
+            props.wireProperty("temporary_directory", dsp.set_temporary_directory),
             props.collect("samp_rate", "fft_size", "fft_fps", "fft_voverlap_factor").wire(set_fft_averages),
         ]
 
diff --git a/owrx/property/__init__.py b/owrx/property/__init__.py
index 655cd42..8489fec 100644
--- a/owrx/property/__init__.py
+++ b/owrx/property/__init__.py
@@ -1,13 +1,18 @@
+from abc import ABC, abstractmethod
 import logging
 
 logger = logging.getLogger(__name__)
 
 
 class Subscription(object):
-    def __init__(self, subscriptee, subscriber):
+    def __init__(self, subscriptee, name, subscriber):
         self.subscriptee = subscriptee
+        self.name = name
         self.subscriber = subscriber
 
+    def getName(self):
+        return self.name
+
     def call(self, *args, **kwargs):
         self.subscriber(*args, **kwargs)
 
@@ -15,30 +20,39 @@ class Subscription(object):
         self.subscriptee.unwire(self)
 
 
-class Property(object):
-    def __init__(self, value=None):
-        self.value = value
+class PropertyManager(ABC):
+    def __init__(self):
         self.subscribers = []
 
-    def getValue(self):
-        return self.value
+    @abstractmethod
+    def __getitem__(self, item):
+        pass
 
-    def setValue(self, value):
-        if self.value == value:
-            return self
-        self.value = value
-        for c in self.subscribers:
-            try:
-                c.call(self.value)
-            except Exception as e:
-                logger.exception(e)
-        return self
+    @abstractmethod
+    def __setitem__(self, key, value):
+        pass
+
+    @abstractmethod
+    def __contains__(self, item):
+        pass
+
+    @abstractmethod
+    def __dict__(self):
+        pass
+
+    def collect(self, *props):
+        return PropertyFilter(self, *props)
 
     def wire(self, callback):
-        sub = Subscription(self, callback)
+        sub = Subscription(self, None, callback)
         self.subscribers.append(sub)
-        if self.value is not None:
-            sub.call(self.value)
+        return sub
+
+    def wireProperty(self, name, callback):
+        sub = Subscription(self, name, callback)
+        self.subscribers.append(sub)
+        if name in self:
+            sub.call(self[name])
         return sub
 
     def unwire(self, sub):
@@ -49,80 +63,79 @@ class Property(object):
             pass
         return self
 
+    def _fireCallbacks(self, name, value):
+        for c in self.subscribers:
+            try:
+                if c.getName() is None:
+                    c.call(name, value)
+                elif c.getName() == name:
+                    c.call(value)
+            except Exception as e:
+                logger.exception(e)
 
-class PropertyManager(object):
-    def collect(self, *props):
-        return PropertyManager(
-            {name: self.getProperty(name) if self.hasProperty(name) else Property() for name in props}
-        )
 
+class PropertyLayer(PropertyManager):
     def __init__(self, properties=None):
+        super().__init__()
         self.properties = {}
-        self.subscribers = []
         if properties is not None:
             for (name, prop) in properties.items():
-                self.add(name, prop)
+                self._add(name, prop)
 
-    def add(self, name, prop):
+    def _add(self, name, prop):
         self.properties[name] = prop
-
-        def fireCallbacks(value):
-            for c in self.subscribers:
-                try:
-                    c.call(name, value)
-                except Exception as e:
-                    logger.exception(e)
-
-        prop.wire(fireCallbacks)
+        self._fireCallbacks(name, prop.getValue())
         return self
 
     def __contains__(self, name):
-        return self.hasProperty(name)
-
-    def __getitem__(self, name):
-        return self.getPropertyValue(name)
-
-    def __setitem__(self, name, value):
-        if not self.hasProperty(name):
-            self.add(name, Property())
-        self.getProperty(name).setValue(value)
-
-    def __dict__(self):
-        return {k: v.getValue() for k, v in self.properties.items()}
-
-    def hasProperty(self, name):
         return name in self.properties
 
-    def getProperty(self, name):
-        if not self.hasProperty(name):
-            self.add(name, Property())
+    def __getitem__(self, name):
         return self.properties[name]
 
-    def getPropertyValue(self, name):
-        return self.getProperty(name).getValue()
+    def __setitem__(self, name, value):
+        logger.debug("property change: %s => %s", name, value)
+        self.properties[name] = value
+        self._fireCallbacks(name, value)
 
-    def wire(self, callback):
-        sub = Subscription(self, callback)
-        self.subscribers.append(sub)
-        return sub
-
-    def unwire(self, sub):
-        try:
-            self.subscribers.remove(sub)
-        except ValueError:
-            # happens when already removed before
-            pass
-        return self
-
-    def defaults(self, other_pm):
-        for (key, p) in self.properties.items():
-            if p.getValue() is None:
-                p.setValue(other_pm[key])
-        return self
+    def __dict__(self):
+        return {k: v for k, v in self.properties.items()}
 
 
-class PropertyLayers(object):
+class PropertyFilter(PropertyManager):
+    def __init__(self, pm: PropertyManager, *props: str):
+        super().__init__()
+        self.pm = pm
+        self.props = props
+        self.pm.wire(self.receiveEvent)
+
+    def receiveEvent(self, name, value):
+        if name not in self.props:
+            return
+        self._fireCallbacks(name, value)
+
+    def __getitem__(self, item):
+        if item not in self.props:
+            raise KeyError(item)
+        return self.pm.__getitem__(item)
+
+    def __setitem__(self, key, value):
+        if key not in self.props:
+            raise KeyError(key)
+        return self.pm.__setitem__(key, value)
+
+    def __contains__(self, item):
+        if item not in self.props:
+            return False
+        return self.pm.__contains__(item)
+
+    def __dict__(self):
+        return {k: v for k, v in self.pm.__dict__().items() if k in self.props}
+
+
+class PropertyStack(PropertyManager):
     def __init__(self):
+        super().__init__()
         self.layers = []
 
     def addLayer(self, priority: int, pm: PropertyManager):
@@ -136,8 +149,26 @@ class PropertyLayers(object):
             if layer["props"] == pm:
                 self.layers.remove(layer)
 
-    def __getitem__(self, item):
+    def _getLayer(self, item):
         layers = [la["props"] for la in sorted(self.layers, key=lambda l: l["priority"])]
         for m in layers:
             if item in m:
-                return m[item]
\ No newline at end of file
+                return m
+        # return top layer by default
+        return layers[0]
+
+    def __getitem__(self, item):
+        layer = self._getLayer(item)
+        return layer.__getitem__(item)
+
+    def __setitem__(self, key, value):
+        layer = self._getLayer(key)
+        return layer.__setitem__(key, value)
+
+    def __contains__(self, item):
+        layer = self._getLayer(item)
+        return layer.__contains__(item)
+
+    def __dict__(self):
+        keys = [key for l in self.layers for key in l["props"].__dict__().keys()]
+        return {k: self.__getitem__(k) for k in keys}
diff --git a/owrx/sdr.py b/owrx/sdr.py
index 19c34c3..69aa261 100644
--- a/owrx/sdr.py
+++ b/owrx/sdr.py
@@ -1,5 +1,5 @@
 from owrx.config import Config
-from owrx.property import PropertyManager
+from owrx.property import PropertyLayer
 from owrx.feature import FeatureDetector, UnknownFeatureException
 
 import logging
@@ -19,7 +19,7 @@ class SdrService(object):
             featureDetector = FeatureDetector()
 
             def loadIntoPropertyManager(dict: dict):
-                propertyManager = PropertyManager()
+                propertyManager = PropertyLayer()
                 for (name, value) in dict.items():
                     propertyManager[name] = value
                 return propertyManager
diff --git a/owrx/service/__init__.py b/owrx/service/__init__.py
index efda39d..7bda36b 100644
--- a/owrx/service/__init__.py
+++ b/owrx/service/__init__.py
@@ -8,7 +8,7 @@ from owrx.aprs import AprsParser
 from owrx.config import Config
 from owrx.source.resampler import Resampler
 from owrx.feature import FeatureDetector
-from owrx.property import PropertyManager
+from owrx.property import PropertyLayer
 from abc import ABCMeta, abstractmethod
 from .schedule import ServiceScheduler
 
@@ -164,7 +164,7 @@ class ServiceHandler(object):
                     cf = (min + max) / 2
                     bw = max - min
                     logger.debug("group center frequency: {0}, bandwidth: {1}".format(cf, bw))
-                    resampler_props = PropertyManager()
+                    resampler_props = PropertyLayer()
                     resampler_props["center_freq"] = cf
                     # TODO the + 24000 is a temporary fix since the resampling optimizer does not account for required bandwidths
                     resampler_props["samp_rate"] = bw + 24000
diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index abc35d2..1518f0b 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -9,6 +9,7 @@ import signal
 from abc import ABC, abstractmethod
 from owrx.command import CommandMapper
 from owrx.socket import getAvailablePort
+from owrx.property import PropertyStack
 
 import logging
 
@@ -35,7 +36,10 @@ class SdrSource(ABC):
         self.props = props
         self.profile_id = None
         self.activateProfile()
-        self.rtlProps = self.props.collect(*self.getEventNames()).defaults(Config.get())
+        stack = PropertyStack()
+        stack.addLayer(0, self.props)
+        stack.addLayer(1, Config.get())
+        self.rtlProps = stack.collect(*self.getEventNames())
         self.wireEvents()
         self.commandMapper = None
 
diff --git a/test/property/test_property.py b/test/property/test_property.py
deleted file mode 100644
index 26634c9..0000000
--- a/test/property/test_property.py
+++ /dev/null
@@ -1,28 +0,0 @@
-import unittest
-from unittest.mock import Mock
-from owrx.property import Property
-
-
-class PropertyTest(unittest.TestCase):
-    def testValue(self):
-        prop = Property("testvalue")
-        self.assertEqual(prop.getValue(), "testvalue")
-
-    def testChangeValue(self):
-        prop = Property("before")
-        prop.setValue("after")
-        self.assertEqual(prop.getValue(), "after")
-
-    def testInitialValueOnCallback(self):
-        prop = Property("before")
-        m = Mock()
-        prop.wire(m.method)
-        m.method.assert_called_once_with("before")
-
-    def testChangedValueOnCallback(self):
-        prop = Property("before")
-        m = Mock()
-        prop.wire(m.method)
-        m.reset_mock()
-        prop.setValue("after")
-        m.method.assert_called_with("after")
diff --git a/test/property/test_property_filter.py b/test/property/test_property_filter.py
new file mode 100644
index 0000000..66eff3b
--- /dev/null
+++ b/test/property/test_property_filter.py
@@ -0,0 +1,51 @@
+from unittest import TestCase
+from unittest.mock import Mock
+from owrx.property import PropertyLayer, PropertyFilter
+
+
+class PropertyFilterTest(TestCase):
+
+    def testPassesProperty(self):
+        pm = PropertyLayer()
+        pm["testkey"] = "testvalue"
+        pf = PropertyFilter(pm, "testkey")
+        self.assertEqual(pf["testkey"], "testvalue")
+
+    def testMissesPropert(self):
+        pm = PropertyLayer()
+        pm["testkey"] = "testvalue"
+        pf = PropertyFilter(pm, "other_key")
+        self.assertFalse("testkey" in pf)
+        with self.assertRaises(KeyError):
+            x = pf["testkey"]
+
+    def testForwardsEvent(self):
+        pm = PropertyLayer()
+        pf = PropertyFilter(pm, "testkey")
+        mock = Mock()
+        pf.wire(mock.method)
+        pm["testkey"] = "testvalue"
+        mock.method.assert_called_once_with("testkey", "testvalue")
+
+    def testForwardsPropertyEvent(self):
+        pm = PropertyLayer()
+        pf = PropertyFilter(pm, "testkey")
+        mock = Mock()
+        pf.wireProperty("testkey", mock.method)
+        pm["testkey"] = "testvalue"
+        mock.method.assert_called_once_with("testvalue")
+
+    def testForwardsWrite(self):
+        pm = PropertyLayer()
+        pf = PropertyFilter(pm, "testkey")
+        pf["testkey"] = "testvalue"
+        self.assertTrue("testkey" in pm)
+        self.assertEqual(pm["testkey"], "testvalue")
+
+    def testOverwrite(self):
+        pm = PropertyLayer()
+        pm["testkey"] = "old value"
+        pf = PropertyFilter(pm, "testkey")
+        pf["testkey"] = "new value"
+        self.assertEqual(pm["testkey"], "new value")
+        self.assertEqual(pf["testkey"], "new value")
diff --git a/test/property/test_property_layer.py b/test/property/test_property_layer.py
new file mode 100644
index 0000000..b307a39
--- /dev/null
+++ b/test/property/test_property_layer.py
@@ -0,0 +1,52 @@
+from owrx.property import PropertyLayer
+from unittest import TestCase
+from unittest.mock import Mock
+
+
+class PropertyLayerTest(TestCase):
+    def testKeyIsset(self):
+        pm = PropertyLayer()
+        self.assertFalse("some_key" in pm)
+
+    def testKeyError(self):
+        pm = PropertyLayer()
+        with self.assertRaises(KeyError):
+            x = pm["some_key"]
+
+    def testSubscription(self):
+        pm = PropertyLayer()
+        pm["testkey"] = "before"
+        mock = Mock()
+        pm.wire(mock.method)
+        pm["testkey"] = "after"
+        mock.method.assert_called_once_with("testkey", "after")
+
+    def testUnsubscribe(self):
+        pm = PropertyLayer()
+        pm["testkey"] = "before"
+        mock = Mock()
+        sub = pm.wire(mock.method)
+        pm["testkey"] = "between"
+        mock.method.assert_called_once_with("testkey", "between")
+
+        mock.reset_mock()
+        pm.unwire(sub)
+        pm["testkey"] = "after"
+        mock.method.assert_not_called()
+
+    def testContains(self):
+        pm = PropertyLayer()
+        pm["testkey"] = "value"
+        self.assertTrue("testkey" in pm)
+
+    def testDoesNotContain(self):
+        pm = PropertyLayer()
+        self.assertFalse("testkey" in pm)
+
+    def testSubscribeBeforeSet(self):
+        pm = PropertyLayer()
+        mock = Mock()
+        pm.wireProperty("testkey", mock.method)
+        mock.method.assert_not_called()
+        pm["testkey"] = "newvalue"
+        mock.method.assert_called_once_with("newvalue")
diff --git a/test/property/test_property_layers.py b/test/property/test_property_stack.py
similarity index 67%
rename from test/property/test_property_layers.py
rename to test/property/test_property_stack.py
index 7bd0336..2102a2c 100644
--- a/test/property/test_property_layers.py
+++ b/test/property/test_property_stack.py
@@ -1,20 +1,20 @@
 from unittest import TestCase
 from unittest.mock import Mock
-from owrx.property import PropertyManager, PropertyLayers
+from owrx.property import PropertyLayer, PropertyStack
 
 
-class TestPropertyLayers(TestCase):
+class PropertyStackTest(TestCase):
     def testLayer(self):
-        om = PropertyLayers()
-        pm = PropertyManager()
+        om = PropertyStack()
+        pm = PropertyLayer()
         pm["testkey"] = "testvalue"
         om.addLayer(1, pm)
         self.assertEqual(om["testkey"], "testvalue")
 
     def testHighPriority(self):
-        om = PropertyLayers()
-        low_pm = PropertyManager()
-        high_pm = PropertyManager()
+        om = PropertyStack()
+        low_pm = PropertyLayer()
+        high_pm = PropertyLayer()
         low_pm["testkey"] = "low value"
         high_pm["testkey"] = "high value"
         om.addLayer(1, low_pm)
@@ -22,18 +22,18 @@ class TestPropertyLayers(TestCase):
         self.assertEqual(om["testkey"], "high value")
 
     def testPriorityFallback(self):
-        om = PropertyLayers()
-        low_pm = PropertyManager()
-        high_pm = PropertyManager()
+        om = PropertyStack()
+        low_pm = PropertyLayer()
+        high_pm = PropertyLayer()
         low_pm["testkey"] = "low value"
         om.addLayer(1, low_pm)
         om.addLayer(0, high_pm)
         self.assertEqual(om["testkey"], "low value")
 
     def testLayerRemoval(self):
-        om = PropertyLayers()
-        low_pm = PropertyManager()
-        high_pm = PropertyManager()
+        om = PropertyStack()
+        low_pm = PropertyLayer()
+        high_pm = PropertyLayer()
         low_pm["testkey"] = "low value"
         high_pm["testkey"] = "high value"
         om.addLayer(1, low_pm)

From d5c2f8414ea04153262b35d3dc0926bc407844ee Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 24 Mar 2020 00:08:48 +0100
Subject: [PATCH 128/475] add stack event handling

---
 owrx/property/__init__.py            | 18 ++++++++++++++----
 test/property/test_property_stack.py | 24 ++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/owrx/property/__init__.py b/owrx/property/__init__.py
index 8489fec..6c57a1d 100644
--- a/owrx/property/__init__.py
+++ b/owrx/property/__init__.py
@@ -144,12 +144,22 @@ class PropertyStack(PropertyManager):
         """
         self.layers.append({"priority": priority, "props": pm})
 
+        def eventClosure(name, value):
+            self.receiveEvent(pm, name, value)
+
+        pm.wire(eventClosure)
+
+    def receiveEvent(self, layer, name, value):
+        if layer != self._getTopLayer(name):
+            return
+        self._fireCallbacks(name, value)
+
     def removeLayer(self, pm: PropertyManager):
         for layer in self.layers:
             if layer["props"] == pm:
                 self.layers.remove(layer)
 
-    def _getLayer(self, item):
+    def _getTopLayer(self, item):
         layers = [la["props"] for la in sorted(self.layers, key=lambda l: l["priority"])]
         for m in layers:
             if item in m:
@@ -158,15 +168,15 @@ class PropertyStack(PropertyManager):
         return layers[0]
 
     def __getitem__(self, item):
-        layer = self._getLayer(item)
+        layer = self._getTopLayer(item)
         return layer.__getitem__(item)
 
     def __setitem__(self, key, value):
-        layer = self._getLayer(key)
+        layer = self._getTopLayer(key)
         return layer.__setitem__(key, value)
 
     def __contains__(self, item):
-        layer = self._getLayer(item)
+        layer = self._getTopLayer(item)
         return layer.__contains__(item)
 
     def __dict__(self):
diff --git a/test/property/test_property_stack.py b/test/property/test_property_stack.py
index 2102a2c..ff83635 100644
--- a/test/property/test_property_stack.py
+++ b/test/property/test_property_stack.py
@@ -41,3 +41,27 @@ class PropertyStackTest(TestCase):
         self.assertEqual(om["testkey"], "high value")
         om.removeLayer(high_pm)
         self.assertEqual(om["testkey"], "low value")
+
+    def testPropertyChange(self):
+        layer = PropertyLayer()
+        stack = PropertyStack()
+        stack.addLayer(0, layer)
+        mock = Mock()
+        stack.wire(mock.method)
+        layer["testkey"] = "testvalue"
+        mock.method.assert_called_once_with("testkey", "testvalue")
+
+    def testPropertyChangeEventPriority(self):
+        low_layer = PropertyLayer()
+        high_layer = PropertyLayer()
+        low_layer["testkey"] = "initial low value"
+        high_layer["testkey"] = "initial high value"
+        stack = PropertyStack()
+        stack.addLayer(1, low_layer)
+        stack.addLayer(0, high_layer)
+        mock = Mock()
+        stack.wire(mock.method)
+        low_layer["testkey"] = "modified low value"
+        mock.method.assert_not_called()
+        high_layer["testkey"] = "modified high value"
+        mock.method.assert_called_once_with("testkey", "modified high value")

From cc5c130f49695afc3f6f3894885b632c90cf2be1 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 24 Mar 2020 00:18:10 +0100
Subject: [PATCH 129/475] fix secondary demod; add same-value handling

---
 owrx/dsp.py                          | 8 +++++---
 owrx/property/__init__.py            | 2 ++
 test/property/test_property_layer.py | 8 ++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/owrx/dsp.py b/owrx/dsp.py
index 693d12f..29b8088 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -41,13 +41,15 @@ class DspManager(csdr.output):
             "temporary_directory",
             "center_freq",
 
-            # TODO: following properties are set from the client
+            # TODO: following properties are set from the client; check if it's really necessary to have the Properties
             "output_rate",
             "squelch_level",
             "secondary_mod",
             "low_cut",
             "high_cut",
             "offset_freq",
+            "mod",
+            "secondary_offset_freq",
         )
 
         self.dsp = csdr.dsp(self)
@@ -107,8 +109,8 @@ class DspManager(csdr.output):
                     )
 
             self.subscriptions += [
-                self.localProps.collect("secondary_mod").wire(set_secondary_mod),
-                self.localProps.collect("secondary_offset_freq").wire(self.dsp.set_secondary_offset_freq),
+                self.localProps.wireProperty("secondary_mod", set_secondary_mod),
+                self.localProps.wireProperty("secondary_offset_freq", self.dsp.set_secondary_offset_freq),
             ]
 
         self.sdrSource.addClient(self)
diff --git a/owrx/property/__init__.py b/owrx/property/__init__.py
index 6c57a1d..c3c1ec9 100644
--- a/owrx/property/__init__.py
+++ b/owrx/property/__init__.py
@@ -94,6 +94,8 @@ class PropertyLayer(PropertyManager):
         return self.properties[name]
 
     def __setitem__(self, name, value):
+        if name in self.properties and self.properties[name] == value:
+            return
         logger.debug("property change: %s => %s", name, value)
         self.properties[name] = value
         self._fireCallbacks(name, value)
diff --git a/test/property/test_property_layer.py b/test/property/test_property_layer.py
index b307a39..472c14f 100644
--- a/test/property/test_property_layer.py
+++ b/test/property/test_property_layer.py
@@ -50,3 +50,11 @@ class PropertyLayerTest(TestCase):
         mock.method.assert_not_called()
         pm["testkey"] = "newvalue"
         mock.method.assert_called_once_with("newvalue")
+
+    def testEventPreventedWhenValueUnchanged(self):
+        pm = PropertyLayer()
+        pm["testkey"] = "testvalue"
+        mock = Mock()
+        pm.wire(mock.method)
+        pm["testkey"] = "testvalue"
+        mock.method.assert_not_called()

From 4b7ac0e2991b3c393f618bc193ce18b175e154d7 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 24 Mar 2020 00:29:59 +0100
Subject: [PATCH 130/475] remove unused specials

---
 owrx/property/__init__.py | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/owrx/property/__init__.py b/owrx/property/__init__.py
index c3c1ec9..486b9fe 100644
--- a/owrx/property/__init__.py
+++ b/owrx/property/__init__.py
@@ -75,17 +75,9 @@ class PropertyManager(ABC):
 
 
 class PropertyLayer(PropertyManager):
-    def __init__(self, properties=None):
+    def __init__(self):
         super().__init__()
         self.properties = {}
-        if properties is not None:
-            for (name, prop) in properties.items():
-                self._add(name, prop)
-
-    def _add(self, name, prop):
-        self.properties[name] = prop
-        self._fireCallbacks(name, prop.getValue())
-        return self
 
     def __contains__(self, name):
         return name in self.properties

From 14634af83c912e3225ee820c6edbb53bc83ffd31 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 24 Mar 2020 20:36:26 +0100
Subject: [PATCH 131/475] add layer add / remove events + tests

---
 owrx/property/__init__.py            | 33 +++++++++++--
 test/property/test_property_stack.py | 71 ++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 4 deletions(-)

diff --git a/owrx/property/__init__.py b/owrx/property/__init__.py
index 486b9fe..5db390a 100644
--- a/owrx/property/__init__.py
+++ b/owrx/property/__init__.py
@@ -40,6 +40,10 @@ class PropertyManager(ABC):
     def __dict__(self):
         pass
 
+    @abstractmethod
+    def keys(self):
+        pass
+
     def collect(self, *props):
         return PropertyFilter(self, *props)
 
@@ -95,6 +99,9 @@ class PropertyLayer(PropertyManager):
     def __dict__(self):
         return {k: v for k, v in self.properties.items()}
 
+    def keys(self):
+        return self.properties.keys()
+
 
 class PropertyFilter(PropertyManager):
     def __init__(self, pm: PropertyManager, *props: str):
@@ -126,6 +133,9 @@ class PropertyFilter(PropertyManager):
     def __dict__(self):
         return {k: v for k, v in self.pm.__dict__().items() if k in self.props}
 
+    def keys(self):
+        return [k for k in self.pm.keys() if k in self.props]
+
 
 class PropertyStack(PropertyManager):
     def __init__(self):
@@ -136,6 +146,10 @@ class PropertyStack(PropertyManager):
         """
         highest priority = 0
         """
+        for key in pm.keys():
+            if key not in self or self[key] != pm[key]:
+                self._fireCallbacks(key, pm[key])
+
         self.layers.append({"priority": priority, "props": pm})
 
         def eventClosure(name, value):
@@ -152,6 +166,12 @@ class PropertyStack(PropertyManager):
         for layer in self.layers:
             if layer["props"] == pm:
                 self.layers.remove(layer)
+                for key in pm.keys():
+                    if key in self:
+                        if self[key] != pm[key]:
+                            self._fireCallbacks(key, self[key])
+                    else:
+                        self._fireCallbacks(key, None)
 
     def _getTopLayer(self, item):
         layers = [la["props"] for la in sorted(self.layers, key=lambda l: l["priority"])]
@@ -159,7 +179,8 @@ class PropertyStack(PropertyManager):
             if item in m:
                 return m
         # return top layer by default
-        return layers[0]
+        if layers:
+            return layers[0]
 
     def __getitem__(self, item):
         layer = self._getTopLayer(item)
@@ -171,8 +192,12 @@ class PropertyStack(PropertyManager):
 
     def __contains__(self, item):
         layer = self._getTopLayer(item)
-        return layer.__contains__(item)
+        if layer:
+            return layer.__contains__(item)
+        return False
 
     def __dict__(self):
-        keys = [key for l in self.layers for key in l["props"].__dict__().keys()]
-        return {k: self.__getitem__(k) for k in keys}
+        return {k: self.__getitem__(k) for k in self.keys()}
+
+    def keys(self):
+        return set([key for l in self.layers for key in l["props"].keys()])
diff --git a/test/property/test_property_stack.py b/test/property/test_property_stack.py
index ff83635..b2658ef 100644
--- a/test/property/test_property_stack.py
+++ b/test/property/test_property_stack.py
@@ -65,3 +65,74 @@ class PropertyStackTest(TestCase):
         mock.method.assert_not_called()
         high_layer["testkey"] = "modified high value"
         mock.method.assert_called_once_with("testkey", "modified high value")
+
+    def testPropertyEventOnLayerAdd(self):
+        low_layer = PropertyLayer()
+        low_layer["testkey"] = "low value"
+        stack = PropertyStack()
+        stack.addLayer(1, low_layer)
+        mock = Mock()
+        stack.wireProperty("testkey", mock.method)
+        mock.reset_mock()
+        high_layer = PropertyLayer()
+        high_layer["testkey"] = "high value"
+        stack.addLayer(0, high_layer)
+        mock.method.assert_called_once_with("high value")
+
+    def testNoEventOnExistingValue(self):
+        low_layer = PropertyLayer()
+        low_layer["testkey"] = "same value"
+        stack = PropertyStack()
+        stack.addLayer(1, low_layer)
+        mock = Mock()
+        stack.wireProperty("testkey", mock.method)
+        mock.reset_mock()
+        high_layer = PropertyLayer()
+        high_layer["testkey"] = "same value"
+        stack.addLayer(0, high_layer)
+        mock.method.assert_not_called()
+
+    def testEventOnLayerWithNewProperty(self):
+        low_layer = PropertyLayer()
+        low_layer["existingkey"] = "existing value"
+        stack = PropertyStack()
+        stack.addLayer(1, low_layer)
+        mock = Mock()
+        stack.wireProperty("newkey", mock.method)
+        high_layer = PropertyLayer()
+        high_layer["newkey"] = "new value"
+        stack.addLayer(0, high_layer)
+        mock.method.assert_called_once_with("new value")
+
+    def testEventOnLayerRemoval(self):
+        low_layer = PropertyLayer()
+        high_layer = PropertyLayer()
+        stack = PropertyStack()
+        stack.addLayer(1, low_layer)
+        stack.addLayer(0, high_layer)
+        low_layer["testkey"] = "low value"
+        high_layer["testkey"] = "high value"
+
+        mock = Mock()
+        stack.wireProperty("testkey", mock.method)
+        mock.method.assert_called_once_with("high value")
+        mock.reset_mock()
+        stack.removeLayer(high_layer)
+        mock.method.assert_called_once_with("low value")
+
+    def testNoneOnKeyRemoval(self):
+        low_layer = PropertyLayer()
+        high_layer = PropertyLayer()
+        stack = PropertyStack()
+        stack.addLayer(1, low_layer)
+        stack.addLayer(0, high_layer)
+        low_layer["testkey"] = "low value"
+        high_layer["testkey"] = "high value"
+        high_layer["unique key"] = "unique value"
+
+        mock = Mock()
+        stack.wireProperty("unique key", mock.method)
+        mock.method.assert_called_once_with("unique value")
+        mock.reset_mock()
+        stack.removeLayer(high_layer)
+        mock.method.assert_called_once_with(None)

From 236f3d20586c83263b4e475fc1b8be60200d85ec Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 24 Mar 2020 22:11:54 +0100
Subject: [PATCH 132/475] more layer replacement

---
 owrx/property/__init__.py            | 59 ++++++++++++++++++++--------
 test/property/test_property_stack.py | 31 +++++++++++++++
 2 files changed, 74 insertions(+), 16 deletions(-)

diff --git a/owrx/property/__init__.py b/owrx/property/__init__.py
index 5db390a..4454bfd 100644
--- a/owrx/property/__init__.py
+++ b/owrx/property/__init__.py
@@ -92,7 +92,6 @@ class PropertyLayer(PropertyManager):
     def __setitem__(self, name, value):
         if name in self.properties and self.properties[name] == value:
             return
-        logger.debug("property change: %s => %s", name, value)
         self.properties[name] = value
         self._fireCallbacks(name, value)
 
@@ -146,33 +145,61 @@ class PropertyStack(PropertyManager):
         """
         highest priority = 0
         """
+        self._fireChanges(self._addLayer(priority, pm))
+
+    def _addLayer(self, priority: int, pm: PropertyManager):
+        changes = {}
         for key in pm.keys():
             if key not in self or self[key] != pm[key]:
-                self._fireCallbacks(key, pm[key])
-
-        self.layers.append({"priority": priority, "props": pm})
+                changes[key] = pm[key]
 
         def eventClosure(name, value):
             self.receiveEvent(pm, name, value)
 
-        pm.wire(eventClosure)
+        sub = pm.wire(eventClosure)
+
+        self.layers.append({"priority": priority, "props": pm, "sub": sub})
+
+        return changes
+
+    def removeLayer(self, pm: PropertyManager):
+        for layer in self.layers:
+            if layer["props"] == pm:
+                self._fireChanges(self._removeLayer(layer))
+
+    def _removeLayer(self, layer):
+        layer["sub"].cancel()
+        self.layers.remove(layer)
+        changes = {}
+        pm = layer["props"]
+        for key in pm.keys():
+            if key in self:
+                if self[key] != pm[key]:
+                    changes[key] = self[key]
+            else:
+                changes[key] = None
+        return changes
+
+    def replaceLayer(self, priority: int, pm: PropertyManager):
+        layers = [x for x in self.layers if x["priority"] == priority]
+        changes = {}
+        if layers:
+            changes = self._removeLayer(layers[0])
+
+        for k, v in self._addLayer(priority, pm).items():
+            changes[k] = v
+
+        self._fireChanges(changes)
+
+    def _fireChanges(self, changes):
+        for k, v in changes.items():
+            self._fireCallbacks(k, v)
 
     def receiveEvent(self, layer, name, value):
         if layer != self._getTopLayer(name):
             return
         self._fireCallbacks(name, value)
 
-    def removeLayer(self, pm: PropertyManager):
-        for layer in self.layers:
-            if layer["props"] == pm:
-                self.layers.remove(layer)
-                for key in pm.keys():
-                    if key in self:
-                        if self[key] != pm[key]:
-                            self._fireCallbacks(key, self[key])
-                    else:
-                        self._fireCallbacks(key, None)
-
     def _getTopLayer(self, item):
         layers = [la["props"] for la in sorted(self.layers, key=lambda l: l["priority"])]
         for m in layers:
diff --git a/test/property/test_property_stack.py b/test/property/test_property_stack.py
index b2658ef..c86ae67 100644
--- a/test/property/test_property_stack.py
+++ b/test/property/test_property_stack.py
@@ -136,3 +136,34 @@ class PropertyStackTest(TestCase):
         mock.reset_mock()
         stack.removeLayer(high_layer)
         mock.method.assert_called_once_with(None)
+
+    def testReplaceLayer(self):
+        first_layer = PropertyLayer()
+        first_layer["testkey"] = "old value"
+        second_layer = PropertyLayer()
+        second_layer["testkey"] = "new value"
+
+        stack = PropertyStack()
+        stack.addLayer(0, first_layer)
+
+        mock = Mock()
+        stack.wireProperty("testkey", mock.method)
+        mock.method.assert_called_once_with("old value")
+        mock.reset_mock()
+
+        stack.replaceLayer(0, second_layer)
+        mock.method.assert_called_once_with("new value")
+
+    def testUnwiresEventsOnRemoval(self):
+        layer = PropertyLayer()
+        layer["testkey"] = "before"
+        stack = PropertyStack()
+        stack.addLayer(0, layer)
+        mock = Mock()
+        stack.wire(mock.method)
+        stack.removeLayer(layer)
+        mock.method.assert_called_once_with("testkey", None)
+        mock.reset_mock()
+
+        layer["testkey"] = "after"
+        mock.method.assert_not_called()

From f30cf3fecd19443f9628c06a7db87125b30ee358 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 24 Mar 2020 22:13:42 +0100
Subject: [PATCH 133/475] fix up properties in the application

---
 owrx/dsp.py             | 78 ++++++++++++++++++++---------------------
 owrx/source/__init__.py | 25 +++++++------
 2 files changed, 54 insertions(+), 49 deletions(-)

diff --git a/owrx/dsp.py b/owrx/dsp.py
index 29b8088..50039e3 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -4,7 +4,7 @@ from owrx.wsjt import WsjtParser
 from owrx.aprs import AprsParser
 from owrx.pocsag import PocsagParser
 from owrx.source import SdrSource
-from owrx.property import PropertyStack
+from owrx.property import PropertyStack, PropertyLayer
 from csdr import csdr
 import threading
 
@@ -24,10 +24,20 @@ class DspManager(csdr.output):
             "pocsag_demod": PocsagParser(self.handler),
         }
 
-        stack = PropertyStack()
-        stack.addLayer(0, self.sdrSource.getProps())
-        stack.addLayer(1, Config.get())
-        self.localProps = stack.collect(
+        self.props = PropertyStack()
+        # local demodulator properties not forwarded to the sdr
+        self.props.addLayer(0, PropertyLayer().collect(
+            "output_rate",
+            "squelch_level",
+            "secondary_mod",
+            "low_cut",
+            "high_cut",
+            "offset_freq",
+            "mod",
+            "secondary_offset_freq",
+        ))
+        # properties that we inherit from the sdr
+        self.props.addLayer(1, self.sdrSource.getProps().collect(
             "audio_compression",
             "fft_compression",
             "digimodes_fft_size",
@@ -40,17 +50,7 @@ class DspManager(csdr.output):
             "dmr_filter",
             "temporary_directory",
             "center_freq",
-
-            # TODO: following properties are set from the client; check if it's really necessary to have the Properties
-            "output_rate",
-            "squelch_level",
-            "secondary_mod",
-            "low_cut",
-            "high_cut",
-            "offset_freq",
-            "mod",
-            "secondary_offset_freq",
-        )
+        ))
 
         self.dsp = csdr.dsp(self)
         self.dsp.nc_port = self.sdrSource.getPort()
@@ -66,34 +66,34 @@ class DspManager(csdr.output):
             self.dsp.set_bpf(*bpf)
 
         def set_dial_freq(key, value):
-            freq = self.localProps["center_freq"] + self.localProps["offset_freq"]
+            freq = self.props["center_freq"] + self.props["offset_freq"]
             for parser in self.parsers.values():
                 parser.setDialFrequency(freq)
 
         self.subscriptions = [
-            self.localProps.wireProperty("audio_compression", self.dsp.set_audio_compression),
-            self.localProps.wireProperty("fft_compression", self.dsp.set_fft_compression),
-            self.localProps.wireProperty("digimodes_fft_size", self.dsp.set_secondary_fft_size),
-            self.localProps.wireProperty("samp_rate", self.dsp.set_samp_rate),
-            self.localProps.wireProperty("output_rate", self.dsp.set_output_rate),
-            self.localProps.wireProperty("offset_freq", self.dsp.set_offset_freq),
-            self.localProps.wireProperty("squelch_level", self.dsp.set_squelch_level),
-            self.localProps.wireProperty("low_cut", set_low_cut),
-            self.localProps.wireProperty("high_cut", set_high_cut),
-            self.localProps.wireProperty("mod", self.dsp.set_demodulator),
-            self.localProps.wireProperty("digital_voice_unvoiced_quality", self.dsp.set_unvoiced_quality),
-            self.localProps.wireProperty("dmr_filter", self.dsp.set_dmr_filter),
-            self.localProps.wireProperty("temporary_directory", self.dsp.set_temporary_directory),
-            self.localProps.collect("center_freq", "offset_freq").wire(set_dial_freq),
+            self.props.wireProperty("audio_compression", self.dsp.set_audio_compression),
+            self.props.wireProperty("fft_compression", self.dsp.set_fft_compression),
+            self.props.wireProperty("digimodes_fft_size", self.dsp.set_secondary_fft_size),
+            self.props.wireProperty("samp_rate", self.dsp.set_samp_rate),
+            self.props.wireProperty("output_rate", self.dsp.set_output_rate),
+            self.props.wireProperty("offset_freq", self.dsp.set_offset_freq),
+            self.props.wireProperty("squelch_level", self.dsp.set_squelch_level),
+            self.props.wireProperty("low_cut", set_low_cut),
+            self.props.wireProperty("high_cut", set_high_cut),
+            self.props.wireProperty("mod", self.dsp.set_demodulator),
+            self.props.wireProperty("digital_voice_unvoiced_quality", self.dsp.set_unvoiced_quality),
+            self.props.wireProperty("dmr_filter", self.dsp.set_dmr_filter),
+            self.props.wireProperty("temporary_directory", self.dsp.set_temporary_directory),
+            self.props.collect("center_freq", "offset_freq").wire(set_dial_freq),
         ]
 
         self.dsp.set_offset_freq(0)
         self.dsp.set_bpf(-4000, 4000)
-        self.dsp.csdr_dynamic_bufsize = self.localProps["csdr_dynamic_bufsize"]
-        self.dsp.csdr_print_bufsizes = self.localProps["csdr_print_bufsizes"]
-        self.dsp.csdr_through = self.localProps["csdr_through"]
+        self.dsp.csdr_dynamic_bufsize = self.props["csdr_dynamic_bufsize"]
+        self.dsp.csdr_print_bufsizes = self.props["csdr_print_bufsizes"]
+        self.dsp.csdr_through = self.props["csdr_through"]
 
-        if self.localProps["digimodes_enable"]:
+        if self.props["digimodes_enable"]:
 
             def set_secondary_mod(mod):
                 if mod == False:
@@ -102,15 +102,15 @@ class DspManager(csdr.output):
                 if mod is not None:
                     self.handler.write_secondary_dsp_config(
                         {
-                            "secondary_fft_size": self.localProps["digimodes_fft_size"],
+                            "secondary_fft_size": self.props["digimodes_fft_size"],
                             "if_samp_rate": self.dsp.if_samp_rate(),
                             "secondary_bw": self.dsp.secondary_bw(),
                         }
                     )
 
             self.subscriptions += [
-                self.localProps.wireProperty("secondary_mod", set_secondary_mod),
-                self.localProps.wireProperty("secondary_offset_freq", self.dsp.set_secondary_offset_freq),
+                self.props.wireProperty("secondary_mod", set_secondary_mod),
+                self.props.wireProperty("secondary_offset_freq", self.dsp.set_secondary_offset_freq),
             ]
 
         self.sdrSource.addClient(self)
@@ -144,7 +144,7 @@ class DspManager(csdr.output):
         self.subscriptions = []
 
     def setProperty(self, prop, value):
-        self.localProps[prop] = value
+        self.props[prop] = value
 
     def getClientClass(self):
         return SdrSource.CLIENT_USER
diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index 1518f0b..7726a0b 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -9,7 +9,7 @@ import signal
 from abc import ABC, abstractmethod
 from owrx.command import CommandMapper
 from owrx.socket import getAvailablePort
-from owrx.property import PropertyStack
+from owrx.property import PropertyStack, PropertyLayer
 
 import logging
 
@@ -33,13 +33,15 @@ class SdrSource(ABC):
 
     def __init__(self, id, props):
         self.id = id
-        self.props = props
+
+        self.props = PropertyStack()
+        # layer 0 reserved for profile properties
+        self.props.addLayer(1, props)
+        self.props.addLayer(2, Config.get())
+        self.rtlProps = self.props.collect(*self.getEventNames())
+
         self.profile_id = None
         self.activateProfile()
-        stack = PropertyStack()
-        stack.addLayer(0, self.props)
-        stack.addLayer(1, Config.get())
-        self.rtlProps = stack.collect(*self.getEventNames())
         self.wireEvents()
         self.commandMapper = None
 
@@ -97,14 +99,17 @@ class SdrSource(ABC):
         if profile_id == self.profile_id:
             return
         logger.debug("activating profile {0}".format(profile_id))
-        self.profile_id = profile_id
-        profile = profiles[profile_id]
         self.props["profile_id"] = profile_id
+        profile = profiles[profile_id]
+        self.profile_id = profile_id
+
+        layer = PropertyLayer()
         for (key, value) in profile.items():
             # skip the name, that would overwrite the source name.
             if key == "name":
                 continue
-            self.props[key] = value
+            layer[key] = value
+        self.props.replaceLayer(0, layer)
 
     def getId(self):
         return self.id
@@ -125,7 +130,7 @@ class SdrSource(ABC):
         return self.port
 
     def getCommandValues(self):
-        dict = self.rtlProps.collect(*self.getEventNames()).__dict__()
+        dict = self.rtlProps.__dict__()
         if "lfo_offset" in dict and dict["lfo_offset"] is not None:
             dict["tuner_freq"] = dict["center_freq"] + dict["lfo_offset"]
         else:

From 25b287344f3ec9284f252c6d84b29e1255f4f518 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 24 Mar 2020 22:16:11 +0100
Subject: [PATCH 134/475] rename collect -> filter

---
 owrx/connection.py        | 6 +++---
 owrx/dsp.py               | 6 +++---
 owrx/fft.py               | 4 ++--
 owrx/property/__init__.py | 2 +-
 owrx/sdrhu.py             | 2 +-
 owrx/service/__init__.py  | 2 +-
 owrx/service/schedule.py  | 2 +-
 owrx/source/__init__.py   | 2 +-
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index b420568..9266a79 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -199,7 +199,7 @@ class OpenWebRxReceiverClient(Client):
         stack = PropertyStack()
         stack.addLayer(0, self.sdr.getProps())
         stack.addLayer(1, Config.get())
-        configProps = stack.collect(*OpenWebRxReceiverClient.config_keys)
+        configProps = stack.filter(*OpenWebRxReceiverClient.config_keys)
 
         def sendConfig(key, value):
             #config = dict((key, configProps[key]) for key in OpenWebRxReceiverClient.config_keys)
@@ -257,7 +257,7 @@ class OpenWebRxReceiverClient(Client):
         stack = PropertyStack()
         stack.addLayer(0, self.sdr.getProps())
         stack.addLayer(1, config)
-        protected = stack.collect(*keys)
+        protected = stack.filter(*keys)
         for key, value in params.items():
             protected[key] = value
 
@@ -335,7 +335,7 @@ class MapConnection(Client):
         super().__init__(conn)
 
         pm = Config.get()
-        self.write_config(pm.collect("google_maps_api_key", "receiver_gps", "map_position_retention_time").__dict__())
+        self.write_config(pm.filter("google_maps_api_key", "receiver_gps", "map_position_retention_time").__dict__())
 
         Map.getSharedInstance().addClient(self)
 
diff --git a/owrx/dsp.py b/owrx/dsp.py
index 50039e3..f0f1fd5 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -26,7 +26,7 @@ class DspManager(csdr.output):
 
         self.props = PropertyStack()
         # local demodulator properties not forwarded to the sdr
-        self.props.addLayer(0, PropertyLayer().collect(
+        self.props.addLayer(0, PropertyLayer().filter(
             "output_rate",
             "squelch_level",
             "secondary_mod",
@@ -37,7 +37,7 @@ class DspManager(csdr.output):
             "secondary_offset_freq",
         ))
         # properties that we inherit from the sdr
-        self.props.addLayer(1, self.sdrSource.getProps().collect(
+        self.props.addLayer(1, self.sdrSource.getProps().filter(
             "audio_compression",
             "fft_compression",
             "digimodes_fft_size",
@@ -84,7 +84,7 @@ class DspManager(csdr.output):
             self.props.wireProperty("digital_voice_unvoiced_quality", self.dsp.set_unvoiced_quality),
             self.props.wireProperty("dmr_filter", self.dsp.set_dmr_filter),
             self.props.wireProperty("temporary_directory", self.dsp.set_temporary_directory),
-            self.props.collect("center_freq", "offset_freq").wire(set_dial_freq),
+            self.props.filter("center_freq", "offset_freq").wire(set_dial_freq),
         ]
 
         self.dsp.set_offset_freq(0)
diff --git a/owrx/fft.py b/owrx/fft.py
index 9d37bcf..cbb98a6 100644
--- a/owrx/fft.py
+++ b/owrx/fft.py
@@ -17,7 +17,7 @@ class SpectrumThread(csdr.output):
         stack = PropertyStack()
         stack.addLayer(0, self.sdrSource.props)
         stack.addLayer(1, Config.get())
-        self.props = props = stack.collect(
+        self.props = props = stack.filter(
             "samp_rate",
             "fft_size",
             "fft_fps",
@@ -51,7 +51,7 @@ class SpectrumThread(csdr.output):
             props.wireProperty("fft_fps", dsp.set_fft_fps),
             props.wireProperty("fft_compression", dsp.set_fft_compression),
             props.wireProperty("temporary_directory", dsp.set_temporary_directory),
-            props.collect("samp_rate", "fft_size", "fft_fps", "fft_voverlap_factor").wire(set_fft_averages),
+            props.filter("samp_rate", "fft_size", "fft_fps", "fft_voverlap_factor").wire(set_fft_averages),
         ]
 
         set_fft_averages(None, None)
diff --git a/owrx/property/__init__.py b/owrx/property/__init__.py
index 4454bfd..256c391 100644
--- a/owrx/property/__init__.py
+++ b/owrx/property/__init__.py
@@ -44,7 +44,7 @@ class PropertyManager(ABC):
     def keys(self):
         pass
 
-    def collect(self, *props):
+    def filter(self, *props):
         return PropertyFilter(self, *props)
 
     def wire(self, callback):
diff --git a/owrx/sdrhu.py b/owrx/sdrhu.py
index 939d352..193399f 100644
--- a/owrx/sdrhu.py
+++ b/owrx/sdrhu.py
@@ -14,7 +14,7 @@ class SdrHuUpdater(threading.Thread):
         super().__init__(daemon=True)
 
     def update(self):
-        pm = Config.get().collect("server_hostname", "web_port", "sdrhu_key")
+        pm = Config.get().filter("server_hostname", "web_port", "sdrhu_key")
         data = parse.urlencode({
             "url": "http://{server_hostname}:{web_port}".format(**pm.__dict__()),
             "apikey": pm["sdrhu_key"]
diff --git a/owrx/service/__init__.py b/owrx/service/__init__.py
index 7bda36b..66a7880 100644
--- a/owrx/service/__init__.py
+++ b/owrx/service/__init__.py
@@ -57,7 +57,7 @@ class ServiceHandler(object):
         self.startupTimer = None
         self.source.addClient(self)
         props = self.source.getProps()
-        props.collect("center_freq", "samp_rate").wire(self.onFrequencyChange)
+        props.filter("center_freq", "samp_rate").wire(self.onFrequencyChange)
         if self.source.isAvailable():
             self.scheduleServiceStartup()
         self.scheduler = None
diff --git a/owrx/service/schedule.py b/owrx/service/schedule.py
index ade3976..62df44d 100644
--- a/owrx/service/schedule.py
+++ b/owrx/service/schedule.py
@@ -210,7 +210,7 @@ class ServiceScheduler(object):
         self.source.addClient(self)
         props = self.source.getProps()
         self.schedule = Schedule.parse(props)
-        props.collect("center_freq", "samp_rate").wire(self.onFrequencyChange)
+        props.filter("center_freq", "samp_rate").wire(self.onFrequencyChange)
         self.scheduleSelection()
 
     def shutdown(self):
diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index 7726a0b..781db97 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -38,7 +38,7 @@ class SdrSource(ABC):
         # layer 0 reserved for profile properties
         self.props.addLayer(1, props)
         self.props.addLayer(2, Config.get())
-        self.rtlProps = self.props.collect(*self.getEventNames())
+        self.rtlProps = self.props.filter(*self.getEventNames())
 
         self.profile_id = None
         self.activateProfile()

From d1ef1810bf9e32840533f3cc864a30503f91722e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 24 Mar 2020 22:35:44 +0100
Subject: [PATCH 135/475] update changelog

---
 CHANGELOG.md     | 1 +
 debian/changelog | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 661b8b8..3ea4b25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
   - `sdrplay`: added support for `bias_tee`, `rf_notch` and `dab_notch`
   - `airspy`: added support for `bitpack`
 - Added support for Perseus-SDR devices, (thanks @amontefusco)
+- Property System has been rewritten so that defaults on sdr behave as expected
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index a2df019..af7f6ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
     - `sdrplay`: added support for `bias_tee`, `rf_notch` and `dab_notch`
     - `airspy`: added support for `bitpack`
   * Added support for Perseus-SDR devices, (thanks @amontefusco)
+  * Property System has been rewritten so that defaults on sdr behave as
+    expected
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From cfea251d6096df8e95c5fca7637ba1335db2f011 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 24 Mar 2020 22:50:18 +0100
Subject: [PATCH 136/475] clean up

---
 owrx/connection.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index 9266a79..51bf8b0 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -202,7 +202,6 @@ class OpenWebRxReceiverClient(Client):
         configProps = stack.filter(*OpenWebRxReceiverClient.config_keys)
 
         def sendConfig(key, value):
-            #config = dict((key, configProps[key]) for key in OpenWebRxReceiverClient.config_keys)
             config = configProps.__dict__()
             # TODO mathematical properties? hmmmm
             config["start_offset_freq"] = configProps["start_freq"] - configProps["center_freq"]

From 4e4266f1c4e34522fd7ee18b593226e8c6e58ffb Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 24 Mar 2020 22:50:43 +0100
Subject: [PATCH 137/475] fix wording

---
 owrx/sdr.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/owrx/sdr.py b/owrx/sdr.py
index 69aa261..c52406f 100644
--- a/owrx/sdr.py
+++ b/owrx/sdr.py
@@ -28,7 +28,7 @@ class SdrService(object):
                 try:
                     if not featureDetector.is_available(value["type"]):
                         logger.error(
-                            'The RTL source type "{0}" is not available. please check requirements.'.format(
+                            'The SDR source type "{0}" is not available. please check requirements.'.format(
                                 value["type"]
                             )
                         )
@@ -36,7 +36,7 @@ class SdrService(object):
                     return True
                 except UnknownFeatureException:
                     logger.error(
-                        'The RTL source type "{0}" is invalid. Please check your configuration'.format(value["type"])
+                        'The SDR source type "{0}" is invalid. Please check your configuration'.format(value["type"])
                     )
                     return False
 

From 8a2356580a2ebd5bbf0bf94a0d265883fbd55819 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 24 Mar 2020 22:52:17 +0100
Subject: [PATCH 138/475] rename

---
 owrx/source/__init__.py  | 6 +++---
 owrx/source/connector.py | 6 +++---
 owrx/source/direct.py    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index 781db97..ba70737 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -38,7 +38,7 @@ class SdrSource(ABC):
         # layer 0 reserved for profile properties
         self.props.addLayer(1, props)
         self.props.addLayer(2, Config.get())
-        self.rtlProps = self.props.filter(*self.getEventNames())
+        self.sdrProps = self.props.filter(*self.getEventNames())
 
         self.profile_id = None
         self.activateProfile()
@@ -84,7 +84,7 @@ class SdrSource(ABC):
         pass
 
     def wireEvents(self):
-        self.rtlProps.wire(self.onPropertyChange)
+        self.sdrProps.wire(self.onPropertyChange)
 
     def getCommand(self):
         return [self.getCommandMapper().map(self.getCommandValues())]
@@ -130,7 +130,7 @@ class SdrSource(ABC):
         return self.port
 
     def getCommandValues(self):
-        dict = self.rtlProps.__dict__()
+        dict = self.sdrProps.__dict__()
         if "lfo_offset" in dict and dict["lfo_offset"] is not None:
             dict["tuner_freq"] = dict["center_freq"] + dict["lfo_offset"]
         else:
diff --git a/owrx/source/connector.py b/owrx/source/connector.py
index c626506..d365b4b 100644
--- a/owrx/source/connector.py
+++ b/owrx/source/connector.py
@@ -45,10 +45,10 @@ class ConnectorSource(SdrSource):
             return
         if (
             (prop == "center_freq" or prop == "lfo_offset")
-            and "lfo_offset" in self.rtlProps
-            and self.rtlProps["lfo_offset"] is not None
+            and "lfo_offset" in self.sdrProps
+            and self.sdrProps["lfo_offset"] is not None
         ):
-            freq = self.rtlProps["center_freq"] + self.rtlProps["lfo_offset"]
+            freq = self.sdrProps["center_freq"] + self.sdrProps["lfo_offset"]
             self.sendControlMessage("center_freq", freq)
         else:
             self.sendControlMessage(prop, value)
diff --git a/owrx/source/direct.py b/owrx/source/direct.py
index a2b26ec..904d2ea 100644
--- a/owrx/source/direct.py
+++ b/owrx/source/direct.py
@@ -23,7 +23,7 @@ class DirectSource(SdrSource, metaclass=ABCMeta):
         ]
 
     def getNmuxCommand(self):
-        props = self.rtlProps
+        props = self.sdrProps
 
         nmux_bufcnt = nmux_bufsize = 0
         while nmux_bufsize < props["samp_rate"] / 4:

From 4aac5c9584287c99f1cb52916561de33841aa269 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 25 Mar 2020 15:47:15 +0100
Subject: [PATCH 139/475] use the interface

---
 owrx/config.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/owrx/config.py b/owrx/config.py
index a87d066..45311eb 100644
--- a/owrx/config.py
+++ b/owrx/config.py
@@ -1,4 +1,4 @@
-from owrx.property import PropertyLayer
+from owrx.property import PropertyManager
 import importlib.util
 import os
 import logging
@@ -55,7 +55,7 @@ class Config:
         return [e for e in errors if e is not None]
 
     @staticmethod
-    def checkTempDirectory(pm: PropertyLayer):
+    def checkTempDirectory(pm: PropertyManager):
         key = "temporary_directory"
         if key not in pm or pm[key] is None:
             return ConfigError(key, "temporary directory is not set")

From 0e19a40968ba8bd0618e8fdd83d98ed89a183ae3 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 25 Mar 2020 15:48:27 +0100
Subject: [PATCH 140/475] fix import

---
 owrx/config.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/config.py b/owrx/config.py
index 45311eb..7f93733 100644
--- a/owrx/config.py
+++ b/owrx/config.py
@@ -1,4 +1,4 @@
-from owrx.property import PropertyManager
+from owrx.property import PropertyManager, PropertyLayer
 import importlib.util
 import os
 import logging

From 14382e012f794d8aaf19f4365d3db65a8db0ff12 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 25 Mar 2020 17:59:00 +0100
Subject: [PATCH 141/475] don't send event when value doesn't change

---
 owrx/property/__init__.py            | 10 +++++-----
 test/property/test_property_stack.py | 18 ++++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/owrx/property/__init__.py b/owrx/property/__init__.py
index 256c391..853cca3 100644
--- a/owrx/property/__init__.py
+++ b/owrx/property/__init__.py
@@ -182,12 +182,12 @@ class PropertyStack(PropertyManager):
 
     def replaceLayer(self, priority: int, pm: PropertyManager):
         layers = [x for x in self.layers if x["priority"] == priority]
-        changes = {}
-        if layers:
-            changes = self._removeLayer(layers[0])
 
-        for k, v in self._addLayer(priority, pm).items():
-            changes[k] = v
+        originalState = self.__dict__()
+
+        changes = self._removeLayer(layers[0]) if layers else {}
+        changes = {**changes, **self._addLayer(priority, pm)}
+        changes = {k: v for k, v in changes.items() if k not in originalState or originalState[k] != v}
 
         self._fireChanges(changes)
 
diff --git a/test/property/test_property_stack.py b/test/property/test_property_stack.py
index c86ae67..31e3b36 100644
--- a/test/property/test_property_stack.py
+++ b/test/property/test_property_stack.py
@@ -167,3 +167,21 @@ class PropertyStackTest(TestCase):
 
         layer["testkey"] = "after"
         mock.method.assert_not_called()
+
+    def testReplaceLayerNoEventWhenValueUnchanged(self):
+        fixed = PropertyLayer()
+        fixed["testkey"] = "fixed value"
+        first_layer = PropertyLayer()
+        first_layer["testkey"] = "same value"
+        second_layer = PropertyLayer()
+        second_layer["testkey"] = "same value"
+
+        stack = PropertyStack()
+        stack.addLayer(1, fixed)
+        stack.addLayer(0, first_layer)
+        mock = Mock()
+        stack.wire(mock.method)
+        mock.method.assert_not_called()
+
+        stack.replaceLayer(0, second_layer)
+        mock.method.assert_not_called()

From 0bffc2b3dd9273b15bcda53ba135683b306f9444 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 25 Mar 2020 20:35:42 +0100
Subject: [PATCH 142/475] this doesn't do anything useful any more

---
 htdocs/openwebrx.js | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index be81751..fa7e2bc 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1739,21 +1739,6 @@ function waterfall_add(data) {
     if (canvas_actual_line < 0) add_canvas();
 }
 
-function check_top_bar_congestion() {
-    var rmf = function (x) {
-        return x.offsetLeft + x.offsetWidth;
-    };
-    var wet = e("webrx-rx-title");
-    var wed = e("webrx-rx-desc");
-    var tl = e("openwebrx-main-buttons");
-
-    [wet, wed].map(function (what) {
-        if (rmf(what) > tl.offsetLeft - 20) what.style.opacity = what.style.opacity = "0";
-        else wet.style.opacity = wed.style.opacity = "1";
-    });
-
-}
-
 function waterfall_clear() {
     while (canvases.length) //delete all canvases
     {
@@ -1766,7 +1751,6 @@ function waterfall_clear() {
 function openwebrx_resize() {
     resize_canvases();
     resize_scale();
-    check_top_bar_congestion();
 }
 
 function init_header() {
@@ -1830,7 +1814,6 @@ function openwebrx_init() {
     });
     mouseFrequencyDisplay = new FrequencyDisplay($('#webrx-mouse-freq'));
     window.addEventListener("resize", openwebrx_resize);
-    check_top_bar_congestion();
     init_header();
     bookmarks = new BookmarkBar();
     initSliders();

From a7345bb16f0a8f38150b2a7ade0fbf8caffd23b0 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 25 Mar 2020 20:49:34 +0100
Subject: [PATCH 143/475] propagate measurement reset to reporters, closes #88

---
 htdocs/lib/Measurement.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/htdocs/lib/Measurement.js b/htdocs/lib/Measurement.js
index 202070e..e07b196 100644
--- a/htdocs/lib/Measurement.js
+++ b/htdocs/lib/Measurement.js
@@ -1,4 +1,5 @@
 function Measurement() {
+    this.reporters = [];
     this.reset();
 }
 
@@ -21,10 +22,13 @@ Measurement.prototype.getRate = function() {
 Measurement.prototype.reset = function() {
     this.value = 0;
     this.start = new Date();
+    this.reporters.forEach(function(r){ r.reset(); });
 };
 
 Measurement.prototype.report = function(range, interval, callback) {
-    return new Reporter(this, range, interval, callback);
+    var reporter = new Reporter(this, range, interval, callback);
+    this.reporters.push(reporter);
+    return reporter;
 };
 
 function Reporter(measurement, range, interval, callback) {
@@ -59,4 +63,8 @@ Reporter.prototype.report = function(){
     var accumulated = newest.value - oldest.value;
     // we want rate per second, but our time is in milliseconds... compensate by 1000
     this.callback(accumulated * 1000 / elapsed);
+};
+
+Reporter.prototype.reset = function(){
+    this.samples = [];
 };
\ No newline at end of file

From 25755d09dd37e264a129557e544a773b0ead5348 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 25 Mar 2020 21:50:22 +0100
Subject: [PATCH 144/475] improve waterfall auto-adjust for SDRs with
 oversampling

---
 htdocs/openwebrx.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index fa7e2bc..c9d06d7 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1447,8 +1447,11 @@ var waterfall_measure_minmax_min = 1e100;
 var waterfall_measure_minmax_max = -1e100;
 
 function waterfall_measure_minmax_do(what) {
-    waterfall_measure_minmax_min = Math.min(waterfall_measure_minmax_min, Math.min.apply(Math, what));
-    waterfall_measure_minmax_max = Math.max(waterfall_measure_minmax_max, Math.max.apply(Math, what));
+    // this is based on an oversampling factor of about 1,25
+    var ignored = .1 * what.length;
+    var data = what.slice(ignored, -ignored);
+    waterfall_measure_minmax_min = Math.min(waterfall_measure_minmax_min, Math.min.apply(Math, data));
+    waterfall_measure_minmax_max = Math.max(waterfall_measure_minmax_max, Math.max.apply(Math, data));
 }
 
 function on_ws_opened() {

From 895d8019e37360ab22b72c93ab7982580b9810b4 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 26 Mar 2020 09:45:41 +0100
Subject: [PATCH 145/475] switch to raw mode to avoid arecord file size limit

---
 owrx/source/fifi_sdr.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/source/fifi_sdr.py b/owrx/source/fifi_sdr.py
index f591b52..fa97d89 100644
--- a/owrx/source/fifi_sdr.py
+++ b/owrx/source/fifi_sdr.py
@@ -11,7 +11,7 @@ class FifiSdrSource(DirectSource):
     def getCommandMapper(self):
         return super().getCommandMapper().setBase("arecord").setMappings(
             {"device": Option("-D"), "samp_rate": Option("-r")}
-        ).setStatic("-f S16_LE -c2 -")
+        ).setStatic("-t raw -f S16_LE -c2 -")
 
     def getEventNames(self):
         return super().getEventNames() + ["device"]

From 8a053f47d4e46f588d9e67e864a63d7c3fe83ad6 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 26 Mar 2020 12:53:58 +0100
Subject: [PATCH 146/475] update changelog

---
 CHANGELOG.md     | 4 ++++
 debian/changelog | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ea4b25..964d80e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,10 @@
   - `airspy`: added support for `bitpack`
 - Added support for Perseus-SDR devices, (thanks @amontefusco)
 - Property System has been rewritten so that defaults on sdr behave as expected
+- Waterfall range auto-adjustment now only takes the center 80% of the spectrum into account, which should work better
+  with SDRs that oversample or have rather flat filter curves towards the spectrum edges
+- Bugfix for negative network usage
+- FiFi SDR: prevent arecord from shutting down after 2GB of data has been sent
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index af7f6ec..180c7c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,12 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
   * Added support for Perseus-SDR devices, (thanks @amontefusco)
   * Property System has been rewritten so that defaults on sdr behave as
     expected
+  * Waterfall range auto-adjustment now only takes the center 80% of the
+    spectrum into account, which should work better with SDRs that oversample
+    or have rather flat filter curves towards the spectrum edges
+  * Bugfix for negative network usage
+  * FiFi SDR: prevent arecord from shutting down after 2GB of data has been
+    sent
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From b87f7017d181ac072db026f181f12d7be22665ee Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 26 Mar 2020 13:14:25 +0100
Subject: [PATCH 147/475] remove unused detector

---
 owrx/feature.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/owrx/feature.py b/owrx/feature.py
index ffd266b..b62003f 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -124,13 +124,6 @@ class FeatureDetector(object):
         """
         return self.command_is_runnable("nc --help")
 
-    def has_rtl_sdr(self):
-        """
-        The rtl-sdr command is required to read I/Q data from an RTL SDR USB-Stick. It is available in most
-        distribution package managers.
-        """
-        return self.command_is_runnable("rtl_sdr --help")
-
     def has_hackrf_transfer(self):
         """
         To use a HackRF, compile the HackRF host tools from its "stdout" branch:

From 16d5db00afa7c222e10a2e5b8ce2296c4d1a13b8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 26 Mar 2020 13:33:32 +0100
Subject: [PATCH 148/475] send bias tee configs for rtl_sdr

---
 owrx/source/rtl_sdr.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/owrx/source/rtl_sdr.py b/owrx/source/rtl_sdr.py
index 64badf1..bc7c523 100644
--- a/owrx/source/rtl_sdr.py
+++ b/owrx/source/rtl_sdr.py
@@ -1,6 +1,14 @@
 from .connector import ConnectorSource
+from owrx.command import Flag
 
 
 class RtlSdrSource(ConnectorSource):
     def getCommandMapper(self):
-        return super().getCommandMapper().setBase("rtl_connector")
+        return super().getCommandMapper().setBase("rtl_connector").setMappings(
+            {
+                "bias_tee": Flag("-b")
+            }
+        )
+
+    def getEventNames(self):
+        return super().getEventNames() + ["bias_tee"]

From 69b43b40b5759ffd8470c20247be05f60d9b5225 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 26 Mar 2020 13:38:14 +0100
Subject: [PATCH 149/475] update changelog

---
 CHANGELOG.md     | 1 +
 debian/changelog | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 964d80e..b8bca7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
   with SDRs that oversample or have rather flat filter curves towards the spectrum edges
 - Bugfix for negative network usage
 - FiFi SDR: prevent arecord from shutting down after 2GB of data has been sent
+- Added support for bias tee control on rtl_sdr devices
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index 180c7c0..5655239 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
   * Bugfix for negative network usage
   * FiFi SDR: prevent arecord from shutting down after 2GB of data has been
     sent
+  * Added support for bias tee control on rtl_sdr devices
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From 0d931860667f7c700b60b863e2dff802b2095459 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 26 Mar 2020 15:36:49 +0100
Subject: [PATCH 150/475] drop the passed modulation if the frequency is
 invalid

---
 htdocs/openwebrx.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index c9d06d7..0f8540a 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1520,8 +1520,8 @@ function parseHash() {
 function validateHash() {
     var params = parseHash();
     params = Object.keys(params).filter(function(key) {
-        if (key == 'freq') {
-            return Math.abs(params[key] - center_freq) < bandwidth;
+        if (key == 'freq' || key == 'mod') {
+            return params.freq && Math.abs(params.freq - center_freq) < bandwidth;
         }
         return true;
     }).reduce(function(p, key) {

From 24a4d03eff8567d8aeb1b6a46288c3218aa9708a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 26 Mar 2020 17:28:37 +0100
Subject: [PATCH 151/475] note about agc in changelog

---
 CHANGELOG.md     | 1 +
 debian/changelog | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8bca7d..802c4a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Bugfix for negative network usage
 - FiFi SDR: prevent arecord from shutting down after 2GB of data has been sent
 - Added support for bias tee control on rtl_sdr devices
+- All connector driven SDRs now support `"rf_gain": "auto"` to enable AGC
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index 5655239..af78450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
   * FiFi SDR: prevent arecord from shutting down after 2GB of data has been
     sent
   * Added support for bias tee control on rtl_sdr devices
+  * All connector driven SDRs now support `"rf_gain": "auto"` to enable AGC
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From 2d86483907314a02b92458a82230093a8e11f1cf Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 26 Mar 2020 20:13:36 +0100
Subject: [PATCH 152/475] no more debugging for the map

---
 owrx/map.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/owrx/map.py b/owrx/map.py
index f70d1cc..779696b 100644
--- a/owrx/map.py
+++ b/owrx/map.py
@@ -8,6 +8,7 @@ import sys
 import logging
 
 logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)
 
 
 class Location(object):

From 16639c0b5b73f9f4cf8eaf9d3796abb2d2e6efe9 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 26 Mar 2020 20:19:05 +0100
Subject: [PATCH 153/475] add autofocus

---
 htdocs/login.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/login.html b/htdocs/login.html
index a776531..b86efd9 100644
--- a/htdocs/login.html
+++ b/htdocs/login.html
@@ -13,7 +13,7 @@
         <form method="POST">
             <div class="form-group">
                 <label for="user">Username</label>
-                <input type="text" class="form-control" id="user" name="user" placeholder="Username">
+                <input type="text" class="form-control" id="user" name="user" autofocus="autofocus" placeholder="Username">
             </div>
             <div class="form-group">
                 <label for="password">Password</label>

From ab9df41a21a5132e1713e05b292b342006bff26f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 26 Mar 2020 21:52:34 +0100
Subject: [PATCH 154/475] render inputs in code, not in html

---
 htdocs/admin.html            | 34 +---------------
 owrx/controllers/admin.py    |  3 --
 owrx/controllers/settings.py | 75 ++++++++++++++++++++++++++++++++++++
 owrx/http.py                 |  4 +-
 4 files changed, 78 insertions(+), 38 deletions(-)
 create mode 100644 owrx/controllers/settings.py

diff --git a/htdocs/admin.html b/htdocs/admin.html
index 6bcdd9e..acddb4b 100644
--- a/htdocs/admin.html
+++ b/htdocs/admin.html
@@ -17,39 +17,7 @@ ${header}
         <h3 class="settings-header">
             General Settings
         </h3>
-        <form class="settings-body">
-            <div class="form-group row">
-                <label class="col-form-label col-form-label-sm col-3" for="receiver_name">Receiver name</label>
-                <input type="text" class="form-control form-control-sm col-9" id="receiver_name" name="receiver_name" placeholder="Receiver name">
-            </div>
-            <div class="form-group row">
-                <label class="col-form-label col-form-label-sm col-3" for="receiver_location">Receiver location</label>
-                <input type="text" class="form-control form-control-sm col-9" id="receiver_location" name="receiver_location" placeholder="Receiver location">
-            </div>
-            <div class="form-group row">
-                <label class="col-form-label col-form-label-sm col-3" for="receiver_asl">Receiver elevation</label>
-                <div class="col-9 p-0">
-                    <input type="text" class="form-control form-control-sm" id="receiver_asl" name="receiver_asl" placeholder="Receiver elevation">
-                    <small class="form-text text-muted">Elevation in meters above mean see level</small>
-                </div>
-            </div>
-            <div class="form-group row">
-                <label class="col-form-label col-form-label-sm col-3" for="receiver_admin">Receiver admin</label>
-                <input type="text" class="form-control form-control-sm col-9" id="receiver_admin" name="receiver_admin" placeholder="Receiver admin">
-            </div>
-            <div class="form-group row">
-                <label class="col-form-label col-form-label-sm col-3" for="receiver_gps">Receiver coordinates</label>
-                <div class="col-9">Placeholder for a map widget to select receiver location</div>
-            </div>
-            <div class="form-group row">
-                <label class="col-form-label col-form-label-sm col-3" for="photo_title">Photo title</label>
-                <input type="text" class="form-control form-control-sm col-9" id="photo_title" name="photo_title" placeholder="Photo title">
-            </div>
-            <div class="form-group row">
-                <label class="col-form-label col-form-label-sm col-3" for="photo_desc">Photo description</label>
-                <textarea class="form-control form-control-sm col-9" id="photo_desc" name="photo_desc"></textarea>
-            </div>
-        </form>
+        ${form}
     </div>
 </div>
 </body>
\ No newline at end of file
diff --git a/owrx/controllers/admin.py b/owrx/controllers/admin.py
index a775068..adae5b3 100644
--- a/owrx/controllers/admin.py
+++ b/owrx/controllers/admin.py
@@ -20,6 +20,3 @@ class AdminController(WebpageController):
             super().handle_request()
         else:
             self.send_redirect("/login")
-
-    def indexAction(self):
-        self.serve_template("admin.html", **self.template_variables())
diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
new file mode 100644
index 0000000..ed9462d
--- /dev/null
+++ b/owrx/controllers/settings.py
@@ -0,0 +1,75 @@
+from abc import ABC, abstractmethod
+from .admin import AdminController
+
+
+class Input(ABC):
+    def __init__(self, id, label, infotext=None):
+        self.id = id
+        self.label = label
+        self.infotext = infotext
+
+    def bootstrap_decorate(self, input):
+        infotext = "<small>{text}</small>".format(text=self.infotext) if self.infotext else ""
+        return """
+            <div class="form-group row">
+                <label class="col-form-label col-form-label-sm col-3" for="{id}">{label}</label>
+                <div class="col-9 p-0">
+                    {input}
+                    {infotext}
+                </div>
+            </div>
+        """.format(id=self.id, label=self.label, input=input, infotext=infotext)
+
+    def input_classes(self):
+        return " ".join(["form-control", "form-control-sm"])
+
+    @abstractmethod
+    def render_input(self):
+        pass
+
+    def render(self):
+        return self.bootstrap_decorate(self.render_input())
+
+
+class TextInput(Input):
+    def render_input(self):
+        return """
+            <input type="text" class="{classes}" id="{id}" name="{id}" placeholder="{label}">
+        """.format(id=self.id, label=self.label, classes=self.input_classes())
+
+
+class LocationInput(Input):
+    def render_input(self):
+        # TODO make this work and pretty
+        return "Placeholder for a map widget to select receiver location"
+
+
+class TextAreaInput(Input):
+    def render_input(self):
+        return """
+            <textarea class="{classes}" id="{id}" name="{id}"></textarea>
+        """.format(id=self.id, classes=self.input_classes())
+
+
+class SettingsController(AdminController):
+    inputs = [
+        TextInput("receiver_name", "Receiver name"),
+        TextInput("receiver_location", "Receiver location"),
+        TextInput("receiver_asl", "Receiver elevation", infotext="Elevation in meters above mean see level"),
+        TextInput("receiver_admin", "Receiver admin"),
+        LocationInput("receiver_gps", "Receiver coordinates"),
+        TextInput("photo_title", "Photo title"),
+        TextAreaInput("photo_desc", "Photo description")
+    ]
+
+    def indexAction(self):
+        self.serve_template("admin.html", **self.template_variables())
+
+    def render_form(self):
+        inputs = "".join([i.render() for i in SettingsController.inputs])
+        return "<form class=\"settings-body\">{inputs}</form>".format(inputs=inputs)
+
+    def template_variables(self):
+        variables = super().template_variables()
+        variables["form"] = self.render_form()
+        return variables
diff --git a/owrx/http.py b/owrx/http.py
index 86fa8f1..2863243 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -11,7 +11,7 @@ from owrx.controllers.assets import (
 from owrx.controllers.websocket import WebSocketController
 from owrx.controllers.api import ApiController
 from owrx.controllers.metrics import MetricsController
-from owrx.controllers.admin import AdminController
+from owrx.controllers.settings import SettingsController
 from owrx.controllers.session import SessionController
 from http.server import BaseHTTPRequestHandler
 from urllib.parse import urlparse, parse_qs
@@ -100,7 +100,7 @@ class Router(object):
             StaticRoute("/features", FeatureController),
             StaticRoute("/api/features", ApiController),
             StaticRoute("/metrics", MetricsController),
-            StaticRoute("/admin", AdminController),
+            StaticRoute("/admin", SettingsController),
             StaticRoute("/login", SessionController, options={"action": "loginAction"}),
             StaticRoute("/login", SessionController, method="POST", options={"action": "processLoginAction"}),
             StaticRoute("/logout", SessionController, options={"action": "logoutAction"}),

From d71dc35239895966b22d93f979f00f149b2be6fe Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 26 Mar 2020 22:08:24 +0100
Subject: [PATCH 155/475] fill the form with data

---
 owrx/controllers/settings.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index ed9462d..77268d3 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 from .admin import AdminController
+from owrx.config import Config
 
 
 class Input(ABC):
@@ -24,31 +25,31 @@ class Input(ABC):
         return " ".join(["form-control", "form-control-sm"])
 
     @abstractmethod
-    def render_input(self):
+    def render_input(self, value):
         pass
 
-    def render(self):
-        return self.bootstrap_decorate(self.render_input())
+    def render(self, config):
+        return self.bootstrap_decorate(self.render_input(config[self.id]))
 
 
 class TextInput(Input):
-    def render_input(self):
+    def render_input(self, value):
         return """
-            <input type="text" class="{classes}" id="{id}" name="{id}" placeholder="{label}">
-        """.format(id=self.id, label=self.label, classes=self.input_classes())
+            <input type="text" class="{classes}" id="{id}" name="{id}" placeholder="{label}" value="{value}">
+        """.format(id=self.id, label=self.label, classes=self.input_classes(), value=value)
 
 
 class LocationInput(Input):
-    def render_input(self):
+    def render_input(self, value):
         # TODO make this work and pretty
         return "Placeholder for a map widget to select receiver location"
 
 
 class TextAreaInput(Input):
-    def render_input(self):
+    def render_input(self, value):
         return """
-            <textarea class="{classes}" id="{id}" name="{id}"></textarea>
-        """.format(id=self.id, classes=self.input_classes())
+            <textarea class="{classes}" id="{id}" name="{id}" style="height:200px;">{value}</textarea>
+        """.format(id=self.id, classes=self.input_classes(), value=value)
 
 
 class SettingsController(AdminController):
@@ -66,7 +67,8 @@ class SettingsController(AdminController):
         self.serve_template("admin.html", **self.template_variables())
 
     def render_form(self):
-        inputs = "".join([i.render() for i in SettingsController.inputs])
+        config = Config.get()
+        inputs = "".join([i.render(config) for i in SettingsController.inputs])
         return "<form class=\"settings-body\">{inputs}</form>".format(inputs=inputs)
 
     def template_variables(self):

From 7efe254a66e18ba37deb2a279b2a1c4883c18277 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 26 Mar 2020 23:04:02 +0100
Subject: [PATCH 156/475] apply new values to config

---
 htdocs/css/admin.css         |  4 ++++
 owrx/controllers/settings.py | 24 +++++++++++++++++++++++-
 owrx/http.py                 |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/htdocs/css/admin.css b/htdocs/css/admin.css
index 4c153de..d948451 100644
--- a/htdocs/css/admin.css
+++ b/htdocs/css/admin.css
@@ -10,3 +10,7 @@ body {
     background-color: #2e2e2e;
     color: #DDD;
 }
+
+.buttons {
+    text-align: right;
+}
diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 77268d3..dcbe5ec 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -1,6 +1,10 @@
 from abc import ABC, abstractmethod
 from .admin import AdminController
 from owrx.config import Config
+from urllib.parse import parse_qs
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 class Input(ABC):
@@ -31,6 +35,9 @@ class Input(ABC):
     def render(self, config):
         return self.bootstrap_decorate(self.render_input(config[self.id]))
 
+    def validate(self, data):
+        return {self.id: data[self.id][0]} if self.id in data else {}
+
 
 class TextInput(Input):
     def render_input(self, value):
@@ -69,9 +76,24 @@ class SettingsController(AdminController):
     def render_form(self):
         config = Config.get()
         inputs = "".join([i.render(config) for i in SettingsController.inputs])
-        return "<form class=\"settings-body\">{inputs}</form>".format(inputs=inputs)
+        return """
+            <form class="settings-body" method="POST">
+                {inputs}
+                <div class="buttons">
+                    <button type="submit" class="btn btn-primary">Apply</button>
+                </div>
+            </form>
+        """.format(inputs=inputs)
 
     def template_variables(self):
         variables = super().template_variables()
         variables["form"] = self.render_form()
         return variables
+
+    def processFormData(self):
+        data = parse_qs(self.get_body().decode("utf-8"))
+        data = {k: v for i in SettingsController.inputs for k, v in i.validate(data).items()}
+        config = Config.get()
+        for k, v in data.items():
+            config[k] = v
+        self.send_redirect("/admin")
diff --git a/owrx/http.py b/owrx/http.py
index 2863243..7e8d104 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -101,6 +101,7 @@ class Router(object):
             StaticRoute("/api/features", ApiController),
             StaticRoute("/metrics", MetricsController),
             StaticRoute("/admin", SettingsController),
+            StaticRoute("/admin", SettingsController, method="POST", options={"action": "processFormData"}),
             StaticRoute("/login", SessionController, options={"action": "loginAction"}),
             StaticRoute("/login", SessionController, method="POST", options={"action": "processLoginAction"}),
             StaticRoute("/logout", SessionController, options={"action": "logoutAction"}),

From c5a5d25320d2e49b91486917804c44b856f4ffe0 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 26 Mar 2020 23:34:25 +0100
Subject: [PATCH 157/475] update config settings directly in the frontend

---
 owrx/connection.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index 51bf8b0..2ee6d26 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -98,18 +98,21 @@ class OpenWebRxReceiverClient(Client):
 
         self.setSdr()
 
-        # send receiver info
-        receiver_keys = [
+        receiver_details = pm.filter(
             "receiver_name",
             "receiver_location",
             "receiver_asl",
             "receiver_gps",
             "photo_title",
             "photo_desc",
-        ]
-        receiver_details = dict((key, pm[key]) for key in receiver_keys)
-        receiver_details["locator"] = Locator.fromCoordinates(receiver_details["receiver_gps"])
-        self.write_receiver_details(receiver_details)
+        )
+
+        def send_receiver_info(*args):
+            receiver_info = receiver_details.__dict__()
+            receiver_info["locator"] = Locator.fromCoordinates(receiver_info["receiver_gps"])
+            self.write_receiver_details(receiver_info)
+
+        receiver_details.wire(send_receiver_info)
 
         self.__sendProfiles()
 

From df21a1eed6f748488dd23fa3ae8eec81ab7dedb3 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 27 Mar 2020 00:35:05 +0100
Subject: [PATCH 158/475] send initial settings

---
 owrx/connection.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/owrx/connection.py b/owrx/connection.py
index 2ee6d26..b0d6dc9 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -113,6 +113,7 @@ class OpenWebRxReceiverClient(Client):
             self.write_receiver_details(receiver_info)
 
         receiver_details.wire(send_receiver_info)
+        send_receiver_info()
 
         self.__sendProfiles()
 

From 6493fb86c10731bd64c9d12f43d1780d272d1cf9 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 27 Mar 2020 01:14:38 +0100
Subject: [PATCH 159/475] add sdr.hu settings

---
 htdocs/admin.html            |  7 +--
 owrx/connection.py           |  1 +
 owrx/controllers/settings.py | 91 ++++++++++++++++++++++++++++--------
 3 files changed, 74 insertions(+), 25 deletions(-)

diff --git a/htdocs/admin.html b/htdocs/admin.html
index acddb4b..b7310f6 100644
--- a/htdocs/admin.html
+++ b/htdocs/admin.html
@@ -13,11 +13,6 @@ ${header}
     <div class="col-12">
         <h1>Settings</h1>
     </div>
-    <div class="col-12 settings-category">
-        <h3 class="settings-header">
-            General Settings
-        </h3>
-        ${form}
-    </div>
+    ${sections}
 </div>
 </body>
\ No newline at end of file
diff --git a/owrx/connection.py b/owrx/connection.py
index b0d6dc9..75b89f4 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -112,6 +112,7 @@ class OpenWebRxReceiverClient(Client):
             receiver_info["locator"] = Locator.fromCoordinates(receiver_info["receiver_gps"])
             self.write_receiver_details(receiver_info)
 
+        # TODO unsubscribe
         receiver_details.wire(send_receiver_info)
         send_receiver_info()
 
diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index dcbe5ec..7b26601 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -35,7 +35,7 @@ class Input(ABC):
     def render(self, config):
         return self.bootstrap_decorate(self.render_input(config[self.id]))
 
-    def validate(self, data):
+    def parse(self, data):
         return {self.id: data[self.id][0]} if self.id in data else {}
 
 
@@ -59,40 +59,93 @@ class TextAreaInput(Input):
         """.format(id=self.id, classes=self.input_classes(), value=value)
 
 
+class CheckboxInput(Input):
+    def __init__(self, id, label, checkboxText, infotext=None):
+        super().__init__(id, label, infotext=infotext)
+        self.checkboxText = checkboxText
+
+    def render_input(self, value):
+        return """
+          <div class="{classes}">
+            <input class="form-check-input" type="checkbox" id="{id}" name="{id}" {checked}>
+            <label class="form-check-label" for="{id}">
+              {checkboxText}
+            </label>
+          </div>
+        """.format(id=self.id, classes=self.input_classes(), checked="checked" if value else "", checkboxText=self.checkboxText)
+
+    def input_classes(self):
+        return " ".join(["form-check", "form-control-sm"])
+
+    def parse(self, data):
+        return {self.id: self.id in data and data[self.id][0] == "on"}
+
+
+class Section(object):
+    def __init__(self, title, *inputs):
+        self.title = title
+        self.inputs = inputs
+
+    def render_inputs(self):
+        config = Config.get()
+        return "".join([i.render(config) for i in self.inputs])
+
+    def render(self):
+        return """
+            <div class="col-12 settings-category">
+                <h3 class="settings-header">
+                    {title}
+                </h3>
+                {inputs}
+            </div>
+        """.format(title=self.title, inputs=self.render_inputs())
+
+    def parse(self, data):
+        return {k: v for i in self.inputs for k, v in i.parse(data).items()}
+
+
 class SettingsController(AdminController):
-    inputs = [
-        TextInput("receiver_name", "Receiver name"),
-        TextInput("receiver_location", "Receiver location"),
-        TextInput("receiver_asl", "Receiver elevation", infotext="Elevation in meters above mean see level"),
-        TextInput("receiver_admin", "Receiver admin"),
-        LocationInput("receiver_gps", "Receiver coordinates"),
-        TextInput("photo_title", "Photo title"),
-        TextAreaInput("photo_desc", "Photo description")
+    sections = [
+        Section(
+            "General Settings",
+            TextInput("receiver_name", "Receiver name"),
+            TextInput("receiver_location", "Receiver location"),
+            TextInput("receiver_asl", "Receiver elevation", infotext="Elevation in meters above mean see level"),
+            TextInput("receiver_admin", "Receiver admin"),
+            LocationInput("receiver_gps", "Receiver coordinates"),
+            TextInput("photo_title", "Photo title"),
+            TextAreaInput("photo_desc", "Photo description"),
+        ),
+        Section(
+            "sdr.hu",
+            TextInput("sdrhu_key", "sdr.hu key", infotext="Please obtain your personal key on <a href=\"https://sdr.hu\">sdr.hu</a>"),
+            CheckboxInput("sdrhu_public_listing", "List on sdr.hu", "List msy receiver on sdr.hu"),
+            TextInput("server_hostname", "Hostname"),
+        ),
     ]
 
-    def indexAction(self):
-        self.serve_template("admin.html", **self.template_variables())
-
-    def render_form(self):
-        config = Config.get()
-        inputs = "".join([i.render(config) for i in SettingsController.inputs])
+    def render_sections(self):
+        sections = "".join(section.render() for section in SettingsController.sections)
         return """
             <form class="settings-body" method="POST">
-                {inputs}
+                {sections}
                 <div class="buttons">
                     <button type="submit" class="btn btn-primary">Apply</button>
                 </div>
             </form>
-        """.format(inputs=inputs)
+        """.format(sections=sections)
+
+    def indexAction(self):
+        self.serve_template("admin.html", **self.template_variables())
 
     def template_variables(self):
         variables = super().template_variables()
-        variables["form"] = self.render_form()
+        variables["sections"] = self.render_sections()
         return variables
 
     def processFormData(self):
         data = parse_qs(self.get_body().decode("utf-8"))
-        data = {k: v for i in SettingsController.inputs for k, v in i.validate(data).items()}
+        data = {k: v for i in SettingsController.sections for k, v in i.parse(data).items()}
         config = Config.get()
         for k, v in data.items():
             config[k] = v

From 0e9bb45d89e8874ae804f2fe5d7e17849ebc390c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 27 Mar 2020 21:11:33 +0100
Subject: [PATCH 160/475] add more fields

---
 owrx/controllers/settings.py | 187 +++++++++++++++++++++++++++++++++--
 1 file changed, 179 insertions(+), 8 deletions(-)

diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 7b26601..7327f9f 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -23,7 +23,9 @@ class Input(ABC):
                     {infotext}
                 </div>
             </div>
-        """.format(id=self.id, label=self.label, input=input, infotext=infotext)
+        """.format(
+            id=self.id, label=self.label, input=input, infotext=infotext
+        )
 
     def input_classes(self):
         return " ".join(["form-control", "form-control-sm"])
@@ -43,7 +45,9 @@ class TextInput(Input):
     def render_input(self, value):
         return """
             <input type="text" class="{classes}" id="{id}" name="{id}" placeholder="{label}" value="{value}">
-        """.format(id=self.id, label=self.label, classes=self.input_classes(), value=value)
+        """.format(
+            id=self.id, label=self.label, classes=self.input_classes(), value=value
+        )
 
 
 class LocationInput(Input):
@@ -56,7 +60,9 @@ class TextAreaInput(Input):
     def render_input(self, value):
         return """
             <textarea class="{classes}" id="{id}" name="{id}" style="height:200px;">{value}</textarea>
-        """.format(id=self.id, classes=self.input_classes(), value=value)
+        """.format(
+            id=self.id, classes=self.input_classes(), value=value
+        )
 
 
 class CheckboxInput(Input):
@@ -72,7 +78,9 @@ class CheckboxInput(Input):
               {checkboxText}
             </label>
           </div>
-        """.format(id=self.id, classes=self.input_classes(), checked="checked" if value else "", checkboxText=self.checkboxText)
+        """.format(
+            id=self.id, classes=self.input_classes(), checked="checked" if value else "", checkboxText=self.checkboxText
+        )
 
     def input_classes(self):
         return " ".join(["form-check", "form-control-sm"])
@@ -81,6 +89,33 @@ class CheckboxInput(Input):
         return {self.id: self.id in data and data[self.id][0] == "on"}
 
 
+class DropdownOption(object):
+    def __init__(self, value, text):
+        self.value = value
+        self.text = text
+
+
+class DropdownInput(Input):
+    def __init__(self, id, label, options, infotext = None):
+        super().__init__(id, label, infotext=infotext)
+        self.options = options
+
+    def render_input(self, value):
+        return """
+            <select class="{classes}" id="{id}" name="{id}">{options}</select>
+        """.format(classes=self.input_classes(), id=self.id, options=self.render_options(value))
+
+    def render_options(self, value):
+        options = [
+            """
+                <option value="{value}" {selected}>{text}</option>
+            """.format(
+                text=o.text, value=o.value, selected="selected" if o.value == value else ""
+            ) for o in self.options
+        ]
+        return "".join(options)
+
+
 class Section(object):
     def __init__(self, title, *inputs):
         self.title = title
@@ -98,7 +133,9 @@ class Section(object):
                 </h3>
                 {inputs}
             </div>
-        """.format(title=self.title, inputs=self.render_inputs())
+        """.format(
+            title=self.title, inputs=self.render_inputs()
+        )
 
     def parse(self, data):
         return {k: v for i in self.inputs for k, v in i.parse(data).items()}
@@ -107,7 +144,7 @@ class Section(object):
 class SettingsController(AdminController):
     sections = [
         Section(
-            "General Settings",
+            "General settings",
             TextInput("receiver_name", "Receiver name"),
             TextInput("receiver_location", "Receiver location"),
             TextInput("receiver_asl", "Receiver elevation", infotext="Elevation in meters above mean see level"),
@@ -116,9 +153,141 @@ class SettingsController(AdminController):
             TextInput("photo_title", "Photo title"),
             TextAreaInput("photo_desc", "Photo description"),
         ),
+        Section(
+            "Waterfall settings",
+            TextInput(
+                "fft_fps",
+                "FFT frames per second",
+                infotext="This setting specifies how many lines are being added to the waterfall per second. "
+                + "Higher values will give you a faster waterfall, but will also use more CPU.",
+            ),
+            TextInput("fft_size", "FFT size"),
+            TextInput(
+                "fft_voverlap_factor",
+                "FFT vertical overlap factor",
+                infotext="If fft_voverlap_factor is above 0, multiple FFTs will be used for creating a line on the "
+                + "diagram.",
+            ),
+            TextInput("waterfall_min_level", "Lowest waterfall level"),
+            TextInput("waterfall_max_level", "Highest waterfall level"),
+        ),
+        Section(
+            "Compression",
+            DropdownInput("audio_compression", "Audio compression", options=[
+                DropdownOption("adpcm", "ADPCM"),
+                DropdownOption("none", "None"),
+            ]),
+            DropdownInput("fft_compression", "Waterfall compression", options=[
+                DropdownOption("adpcm", "ADPCM"),
+                DropdownOption("none", "None"),
+            ]),
+        ),
+        Section(
+            "Digimodes",
+            CheckboxInput("digimodes_enable", "", checkboxText="Enable Digimodes"),
+            TextInput("digimodes_fft_size", "Digimodes FFT size"),
+        ),
+        Section(
+            "Digital voice",
+            TextInput(
+                "digital_voice_unvoiced_quality",
+                "Quality of unvoiced sounds in synthesized voice",
+                infotext="Determines the quality, and thus the cpu usage, for the ambe codec used by digital voice"
+                + "modes.<br />If you're running on a Raspi (up to 3B+) you should leave this set at 1"
+            ),
+            CheckboxInput(
+                "digital_voice_dmr_id_lookup",
+                "DMR id lookup",
+                checkboxText="Enable lookup of DMR ids in the radioid database to show callsigns and names"
+            ),
+        ),
+        Section(
+            "Experimental pipe settings",
+            CheckboxInput(
+                "csdr_dynamic_bufsize",
+                "",
+                checkboxText="Enable dynamic buffer sizes",
+                infotext="This allows you to change the buffering mode of csdr."
+            ),
+            CheckboxInput(
+                "csdr_print_bufsizes",
+                "",
+                checkboxText="Print buffer sizez",
+                infotext="This prints the buffer sizes used for csdr processes."
+            ),
+            CheckboxInput(
+                "csdr_through",
+                "",
+                checkboxText="Print throughput",
+                infotext="Enabling this will print out how much data is going into the DSP chains."
+            ),
+        ),
+        Section(
+            "Map settings",
+            TextInput(
+                "google_maps_api_key",
+                "Google Maps API key",
+                infotext="Google Maps requires an API key, check out "
+                + '<a href="https://developers.google.com/maps/documentation/embed/get-api-key" target="_blank">'
+                + "their documentation</a> on how to obtain one."
+            ),
+            TextInput(
+                "map_position_retention_time",
+                "Map retention time",
+                infotext="Unit is seconds<br/>Specifies how log markers / grids will remain visible on the map"
+            ),
+        ),
+        Section(
+            "WSJT-X settings",
+            TextInput("wsjt_queue_workers", "Number of WSJT decoding workers"),
+            TextInput("wsjt_queue_length", "Maximum length of WSJT job queue"),
+            TextInput(
+                "wsjt_decoding_depth",
+                "WSJT decoding depth",
+                infotext="A higher decoding depth will allow more results, but will also consume more cpu"
+            )
+        ),
+        Section(
+            "Background decoding",
+            CheckboxInput("services_enabled", "Service", checkboxText="Enable background decoding services"),
+        ),
+        Section(
+            "APRS settings",
+            TextInput(
+                "aprs_callsign",
+                "APRS callsign",
+                infotext="This callsign will be used to send data to the APRS-IS network"
+            ),
+            CheckboxInput(
+                "aprs_igate_enabled",
+                "APRS I-Gate",
+                checkboxText="Enable APRS receive-only I-Gate"
+            ),
+            TextInput("aprs_igate_server", "APRS-IS server"),
+            TextInput("aprs_igate_password", "APRS-IS network password"),
+            CheckboxInput(
+                "aprs_igate_beacon",
+                "APRS beacon",
+                checkboxText="Send the receiver position to the APRS-IS network",
+                infotext="Please check that your receiver location is setup correctly"
+            ),
+        ),
+        Section(
+            "pskreporter settings",
+            CheckboxInput("pskreporter_enabled", "Reporting", checkboxText="Enable sending spots to pskreporter.info"),
+            TextInput(
+                "pskreporter_callsign",
+                "pskreporter callsign",
+                infotext="This callsign will be used to send spots to pskreporter.info"
+            ),
+        ),
         Section(
             "sdr.hu",
-            TextInput("sdrhu_key", "sdr.hu key", infotext="Please obtain your personal key on <a href=\"https://sdr.hu\">sdr.hu</a>"),
+            TextInput(
+                "sdrhu_key",
+                "sdr.hu key",
+                infotext='Please obtain your personal key on <a href="https://sdr.hu" target="_blank">sdr.hu</a>',
+            ),
             CheckboxInput("sdrhu_public_listing", "List on sdr.hu", "List msy receiver on sdr.hu"),
             TextInput("server_hostname", "Hostname"),
         ),
@@ -133,7 +302,9 @@ class SettingsController(AdminController):
                     <button type="submit" class="btn btn-primary">Apply</button>
                 </div>
             </form>
-        """.format(sections=sections)
+        """.format(
+            sections=sections
+        )
 
     def indexAction(self):
         self.serve_template("admin.html", **self.template_variables())

From 54dc412c4ac0bfacdfea4c332c56debca66bcd5f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 27 Mar 2020 22:00:10 +0100
Subject: [PATCH 161/475] add number types

---
 owrx/controllers/settings.py | 44 ++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 12 deletions(-)

diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 7327f9f..4276f40 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -50,6 +50,26 @@ class TextInput(Input):
         )
 
 
+class NumberInput(Input):
+    def render_input(self, value):
+        return """
+            <input type="number" class="{classes}" id="{id}" name="{id}" placeholder="{label}" value="{value}">
+        """.format(
+            id=self.id, label=self.label, classes=self.input_classes(), value=value
+        )
+
+    def convert_value(self, v):
+        return int(v)
+
+    def parse(self, data):
+        return {k: self.convert_value(v) for k, v in super().parse(data).items()}
+
+
+class FloatInput(NumberInput):
+    def convert_value(self, v):
+        return float(v)
+
+
 class LocationInput(Input):
     def render_input(self, value):
         # TODO make this work and pretty
@@ -147,7 +167,7 @@ class SettingsController(AdminController):
             "General settings",
             TextInput("receiver_name", "Receiver name"),
             TextInput("receiver_location", "Receiver location"),
-            TextInput("receiver_asl", "Receiver elevation", infotext="Elevation in meters above mean see level"),
+            NumberInput("receiver_asl", "Receiver elevation", infotext="Elevation in meters above mean see level"),
             TextInput("receiver_admin", "Receiver admin"),
             LocationInput("receiver_gps", "Receiver coordinates"),
             TextInput("photo_title", "Photo title"),
@@ -155,21 +175,21 @@ class SettingsController(AdminController):
         ),
         Section(
             "Waterfall settings",
-            TextInput(
+            NumberInput(
                 "fft_fps",
                 "FFT frames per second",
                 infotext="This setting specifies how many lines are being added to the waterfall per second. "
                 + "Higher values will give you a faster waterfall, but will also use more CPU.",
             ),
-            TextInput("fft_size", "FFT size"),
-            TextInput(
+            NumberInput("fft_size", "FFT size"),
+            FloatInput(
                 "fft_voverlap_factor",
                 "FFT vertical overlap factor",
                 infotext="If fft_voverlap_factor is above 0, multiple FFTs will be used for creating a line on the "
                 + "diagram.",
             ),
-            TextInput("waterfall_min_level", "Lowest waterfall level"),
-            TextInput("waterfall_max_level", "Highest waterfall level"),
+            NumberInput("waterfall_min_level", "Lowest waterfall level"),
+            NumberInput("waterfall_max_level", "Highest waterfall level"),
         ),
         Section(
             "Compression",
@@ -185,11 +205,11 @@ class SettingsController(AdminController):
         Section(
             "Digimodes",
             CheckboxInput("digimodes_enable", "", checkboxText="Enable Digimodes"),
-            TextInput("digimodes_fft_size", "Digimodes FFT size"),
+            NumberInput("digimodes_fft_size", "Digimodes FFT size"),
         ),
         Section(
             "Digital voice",
-            TextInput(
+            NumberInput(
                 "digital_voice_unvoiced_quality",
                 "Quality of unvoiced sounds in synthesized voice",
                 infotext="Determines the quality, and thus the cpu usage, for the ambe codec used by digital voice"
@@ -231,7 +251,7 @@ class SettingsController(AdminController):
                 + '<a href="https://developers.google.com/maps/documentation/embed/get-api-key" target="_blank">'
                 + "their documentation</a> on how to obtain one."
             ),
-            TextInput(
+            NumberInput(
                 "map_position_retention_time",
                 "Map retention time",
                 infotext="Unit is seconds<br/>Specifies how log markers / grids will remain visible on the map"
@@ -239,9 +259,9 @@ class SettingsController(AdminController):
         ),
         Section(
             "WSJT-X settings",
-            TextInput("wsjt_queue_workers", "Number of WSJT decoding workers"),
-            TextInput("wsjt_queue_length", "Maximum length of WSJT job queue"),
-            TextInput(
+            NumberInput("wsjt_queue_workers", "Number of WSJT decoding workers"),
+            NumberInput("wsjt_queue_length", "Maximum length of WSJT job queue"),
+            NumberInput(
                 "wsjt_decoding_depth",
                 "WSJT decoding depth",
                 infotext="A higher decoding depth will allow more results, but will also consume more cpu"

From 3011e62fad8ad7e5925528d13afca900fc2492f8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 27 Mar 2020 23:44:03 +0100
Subject: [PATCH 162/475] add first steps towards a storage implementation

---
 owrx/config.py               | 43 +++++++++++++++++++++++++++---------
 owrx/controllers/settings.py |  1 +
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/owrx/config.py b/owrx/config.py
index 7f93733..a339410 100644
--- a/owrx/config.py
+++ b/owrx/config.py
@@ -2,6 +2,7 @@ from owrx.property import PropertyManager, PropertyLayer
 import importlib.util
 import os
 import logging
+import yaml
 
 logger = logging.getLogger(__name__)
 
@@ -23,18 +24,35 @@ class Config:
     sharedConfig = None
 
     @staticmethod
-    def _loadConfig():
+    def _loadPythonFile(file):
+        spec = importlib.util.spec_from_file_location("config_webrx", file)
+        cfg = importlib.util.module_from_spec(spec)
+        spec.loader.exec_module(cfg)
         pm = PropertyLayer()
-        for file in ["/etc/openwebrx/config_webrx.py", "./config_webrx.py"]:
+        for name, value in cfg.__dict__.items():
+            if name.startswith("__"):
+                continue
+            pm[name] = value
+        return pm
+
+    @staticmethod
+    def _loadYamlFile(file):
+        with open(file, "r") as f:
+            pm = PropertyLayer()
+            for k, v in yaml.load(f).items():
+                pm[k] = v
+            return pm
+
+    @staticmethod
+    def _loadConfig():
+        for file in ["settings.yaml", "/etc/openwebrx/config_webrx.py", "./config_webrx.py"]:
             try:
-                spec = importlib.util.spec_from_file_location("config_webrx", file)
-                cfg = importlib.util.module_from_spec(spec)
-                spec.loader.exec_module(cfg)
-                for name, value in cfg.__dict__.items():
-                    if name.startswith("__"):
-                        continue
-                    pm[name] = value
-                return pm
+                if file.endswith(".py"):
+                    return Config._loadPythonFile(file)
+                elif file.endswith(".yaml"):
+                    return Config._loadYamlFile(file)
+                else:
+                    logger.warning("unsupported file type: %s", file)
             except FileNotFoundError:
                 pass
         raise ConfigNotFoundException("no usable config found! please make sure you have a valid configuration file!")
@@ -45,6 +63,11 @@ class Config:
             Config.sharedConfig = Config._loadConfig()
         return Config.sharedConfig
 
+    @staticmethod
+    def store():
+        with open("settings.yaml", "w") as file:
+            yaml.dump(Config.get().__dict__(), file)
+
     @staticmethod
     def validateConfig():
         pm = Config.get()
diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 4276f40..4e24f43 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -340,4 +340,5 @@ class SettingsController(AdminController):
         config = Config.get()
         for k, v in data.items():
             config[k] = v
+        Config.store()
         self.send_redirect("/admin")

From f81e53e455e37a60415234594bf764862c145f90 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 28 Mar 2020 00:40:36 +0100
Subject: [PATCH 163/475] fix typo

---
 owrx/controllers/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 4e24f43..11bf6ee 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -308,7 +308,7 @@ class SettingsController(AdminController):
                 "sdr.hu key",
                 infotext='Please obtain your personal key on <a href="https://sdr.hu" target="_blank">sdr.hu</a>',
             ),
-            CheckboxInput("sdrhu_public_listing", "List on sdr.hu", "List msy receiver on sdr.hu"),
+            CheckboxInput("sdrhu_public_listing", "List on sdr.hu", "List my receiver on sdr.hu"),
             TextInput("server_hostname", "Hostname"),
         ),
     ]

From 2b7d6738f1995fa0131d389476311077ef52ff45 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 17:14:37 +0200
Subject: [PATCH 164/475] switch to json to avoid external dependency

---
 owrx/config.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/owrx/config.py b/owrx/config.py
index a339410..b833efc 100644
--- a/owrx/config.py
+++ b/owrx/config.py
@@ -2,7 +2,7 @@ from owrx.property import PropertyManager, PropertyLayer
 import importlib.util
 import os
 import logging
-import yaml
+import json
 
 logger = logging.getLogger(__name__)
 
@@ -36,21 +36,21 @@ class Config:
         return pm
 
     @staticmethod
-    def _loadYamlFile(file):
+    def _loadJsonFile(file):
         with open(file, "r") as f:
             pm = PropertyLayer()
-            for k, v in yaml.load(f).items():
+            for k, v in json.load(f).items():
                 pm[k] = v
             return pm
 
     @staticmethod
     def _loadConfig():
-        for file in ["settings.yaml", "/etc/openwebrx/config_webrx.py", "./config_webrx.py"]:
+        for file in ["settings.json", "/etc/openwebrx/config_webrx.py", "./config_webrx.py"]:
             try:
                 if file.endswith(".py"):
                     return Config._loadPythonFile(file)
-                elif file.endswith(".yaml"):
-                    return Config._loadYamlFile(file)
+                elif file.endswith(".json"):
+                    return Config._loadJsonFile(file)
                 else:
                     logger.warning("unsupported file type: %s", file)
             except FileNotFoundError:
@@ -65,8 +65,8 @@ class Config:
 
     @staticmethod
     def store():
-        with open("settings.yaml", "w") as file:
-            yaml.dump(Config.get().__dict__(), file)
+        with open("settings.json", "w") as file:
+            json.dump(Config.get().__dict__(), file, indent=4)
 
     @staticmethod
     def validateConfig():

From fd9e913a49a2cad190d5cd6ae8d5ba65af5293a7 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 18:08:26 +0200
Subject: [PATCH 165/475] config migration for receiver_gps

---
 htdocs/map.js              |  4 ++--
 htdocs/openwebrx.js        |  2 +-
 owrx/config.py             | 34 ++++++++++++++++++++++++++++++++--
 owrx/controllers/status.py |  7 ++++---
 owrx/kiss.py               |  3 ++-
 owrx/locator.py            |  3 ++-
 owrx/service/schedule.py   |  3 ++-
 7 files changed, 45 insertions(+), 11 deletions(-)

diff --git a/htdocs/map.js b/htdocs/map.js
index 1fb2ec5..948e83b 100644
--- a/htdocs/map.js
+++ b/htdocs/map.js
@@ -219,8 +219,8 @@
 
                             map = new google.maps.Map($('.openwebrx-map')[0], {
                                 center: {
-                                    lat: config.receiver_gps[0],
-                                    lng: config.receiver_gps[1]
+                                    lat: config.receiver_gps.lat,
+                                    lng: config.receiver_gps.lon
                                 },
                                 zoom: 5,
                                 mapTypeId: mapTypeId
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 0f8540a..6029463 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1097,7 +1097,7 @@ function on_ws_recv(evt) {
                     case "receiver_details":
                         var r = json['value'];
                         e('webrx-rx-title').innerHTML = r['receiver_name'];
-                        var query = encodeURIComponent(r['receiver_gps'][0] + ',' + r['receiver_gps'][1]);
+                        var query = encodeURIComponent(r['receiver_gps']['lat'] + ',' + r['receiver_gps']['lon']);
                         e('webrx-rx-desc').innerHTML = r['receiver_location'] + ' | Loc: ' + r['locator'] + ', ASL: ' + r['receiver_asl'] + ' m, <a href="https://www.google.com/maps/search/?api=1&query=' + query + '" target="_blank" onclick="dont_toggle_rx_photo();">[maps]</a>';
                         e('webrx-rx-photo-title').innerHTML = r['photo_title'];
                         e('webrx-rx-photo-desc').innerHTML = r['photo_desc'];
diff --git a/owrx/config.py b/owrx/config.py
index b833efc..10f0dd7 100644
--- a/owrx/config.py
+++ b/owrx/config.py
@@ -3,6 +3,7 @@ import importlib.util
 import os
 import logging
 import json
+from abc import ABC, abstractmethod
 
 logger = logging.getLogger(__name__)
 
@@ -20,8 +21,27 @@ class ConfigError(object):
         return "Configuration Error (key: {0}): {1}".format(self.key, self.message)
 
 
+class ConfigMigrator(ABC):
+    @abstractmethod
+    def migrate(self, config):
+        pass
+
+
+class ConfigMigratorVersion1(ConfigMigrator):
+    def migrate(self, config):
+        gps = config["receiver_gps"]
+        config["receiver_gps"] = {"lat": gps[0], "lon": gps[1]}
+
+        config["version"] = 2
+        return config
+
+
 class Config:
     sharedConfig = None
+    currentVersion = 2
+    migrators = {
+        1: ConfigMigratorVersion1()
+    }
 
     @staticmethod
     def _loadPythonFile(file):
@@ -45,7 +65,7 @@ class Config:
 
     @staticmethod
     def _loadConfig():
-        for file in ["settings.json", "/etc/openwebrx/config_webrx.py", "./config_webrx.py"]:
+        for file in ["./settings.json", "/etc/openwebrx/config_webrx.py", "./config_webrx.py"]:
             try:
                 if file.endswith(".py"):
                     return Config._loadPythonFile(file)
@@ -60,7 +80,7 @@ class Config:
     @staticmethod
     def get():
         if Config.sharedConfig is None:
-            Config.sharedConfig = Config._loadConfig()
+            Config.sharedConfig = Config._migrate(Config._loadConfig())
         return Config.sharedConfig
 
     @staticmethod
@@ -89,3 +109,13 @@ class Config:
         if not os.access(pm[key], os.W_OK):
             return ConfigError(key, "temporary directory is not writable")
         return None
+
+    @staticmethod
+    def _migrate(config):
+        version = config["version"] if "version" in config else 1
+        if version == Config.currentVersion:
+            return config
+
+        logger.debug("migrating config from version %i", version)
+        migrator = Config.migrators[version]
+        return migrator.migrate(config)
diff --git a/owrx/controllers/status.py b/owrx/controllers/status.py
index 12be28f..1c73f66 100644
--- a/owrx/controllers/status.py
+++ b/owrx/controllers/status.py
@@ -10,6 +10,8 @@ import json
 class StatusController(Controller):
     def indexAction(self):
         pm = Config.get()
+        # convert to old format
+        gps = (pm["receiver_gps"]["lat"], pm["receiver_gps"]["lon"])
         # TODO keys that have been left out since they are no longer simple strings: sdr_hw, bands, antenna
         vars = {
             "status": "active",
@@ -17,7 +19,7 @@ class StatusController(Controller):
             "op_email": pm["receiver_admin"],
             "users": ClientRegistry.getSharedInstance().clientCount(),
             "users_max": pm["max_clients"],
-            "gps": pm["receiver_gps"],
+            "gps": gps,
             "asl": pm["receiver_asl"],
             "loc": pm["receiver_location"],
             "sw_version": openwebrx_version,
@@ -44,12 +46,11 @@ class StatusController(Controller):
     def jsonAction(self):
         pm = Config.get()
 
-        gps = pm["receiver_gps"]
         status = {
             "receiver": {
                 "name": pm["receiver_name"],
                 "admin": pm["receiver_admin"],
-                "gps": {"lat": gps[0], "lon": gps[1]},
+                "gps": pm["receiver_gps"],
                 "asl": pm["receiver_asl"],
                 "location": pm["receiver_location"],
             },
diff --git a/owrx/kiss.py b/owrx/kiss.py
index 5da2907..440cdab 100644
--- a/owrx/kiss.py
+++ b/owrx/kiss.py
@@ -39,7 +39,8 @@ IGLOGIN {callsign} {password}
             )
 
             if pm["aprs_igate_beacon"]:
-                (lat, lon) = pm["receiver_gps"]
+                lat = pm["receiver_gps"]["lat"]
+                lon = pm["receiver_gps"]["lon"]
                 direction_ns = "N" if lat > 0 else "S"
                 direction_we = "E" if lon > 0 else "W"
                 lat = abs(lat)
diff --git a/owrx/locator.py b/owrx/locator.py
index ec80b03..52c37e5 100644
--- a/owrx/locator.py
+++ b/owrx/locator.py
@@ -2,7 +2,8 @@ class Locator(object):
     @staticmethod
     def fromCoordinates(coordinates, depth=3):
 
-        lat, lon = coordinates
+        lat = coordinates["lat"]
+        lon = coordinates["lon"]
 
         lon = lon + 180
         lat = lat + 90
diff --git a/owrx/service/schedule.py b/owrx/service/schedule.py
index 62df44d..992757e 100644
--- a/owrx/service/schedule.py
+++ b/owrx/service/schedule.py
@@ -135,7 +135,8 @@ class DaylightSchedule(TimerangeSchedule):
 
     def getSunTimes(self, date):
         pm = Config.get()
-        lat, lng = pm["receiver_gps"]
+        lat = pm["receiver_gps"]["lat"]
+        lng = pm["receiver_gps"]["lon"]
         degtorad = math.pi / 180
         radtodeg = 180 / math.pi
 

From a6b5984dce448cd0363b5639d560024fb427f994 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 18:28:18 +0200
Subject: [PATCH 166/475] migrate to version 2

---
 config_webrx.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index 9f33171..de8b8e2 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -32,8 +32,11 @@ config_webrx: configuration options for OpenWebRX
     and use them for running your web service with OpenWebRX.)
 """
 
+# configuration version. please only modify if you're able to perform the associated migration steps.
+version = 2
+
 # NOTE: you can find additional information about configuring OpenWebRX in the Wiki:
-#       https://github.com/simonyiszk/openwebrx/wiki
+# https://github.com/jketterl/openwebrx/wiki/Configuration-guide
 
 # ==== Server settings ====
 web_port = 8073
@@ -44,7 +47,7 @@ receiver_name = "[Callsign]"
 receiver_location = "Budapest, Hungary"
 receiver_asl = 200
 receiver_admin = "example@example.com"
-receiver_gps = (47.000000, 19.000000)
+receiver_gps = { "lat": 47.000000, "lon": 19.000000)
 photo_title = "Panorama of Budapest from Schönherz Zoltán Dormitory"
 photo_desc = """
 You can add your own background photo and receiver information.<br />

From 7914202df343ea3efbb0666449f215203e9e2a25 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 18:33:14 +0200
Subject: [PATCH 167/475] move over to fork

---
 owrx/feature.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/feature.py b/owrx/feature.py
index b62003f..09aa0c4 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -106,7 +106,7 @@ class FeatureDetector(object):
     def has_csdr(self):
         """
         OpenWebRX uses the demodulator and pipeline tools provided by the csdr project. Please check out [the project
-        page on github](https://github.com/simonyiszk/csdr) for further details and installation instructions.
+        page on github](https://github.com/jketterl/csdr) for further details and installation instructions.
         """
         return self.command_is_runnable("csdr")
 

From 1d5f450f745a3a41fbf6eeee3ed89274678bf043 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 18:35:48 +0200
Subject: [PATCH 168/475] config file brush-up

---
 config_webrx.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index de8b8e2..1736cab 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -96,13 +96,14 @@ Note: if you experience audio underruns while CPU usage is 100%, you can:
 # ==== I/Q sources ====
 # (Uncomment the appropriate by removing # characters at the beginning of the corresponding lines.)
 
-#################################################################################################
-# Is my SDR hardware supported?                                                                 #
-# Check here: https://github.com/simonyiszk/openwebrx/wiki#guides-for-receiver-hardware-support #
-#################################################################################################
+###############################################################################
+# Is my SDR hardware supported?                                               #
+# Check here: https://github.com/jketterl/openwebrx/wiki/Supported-Hardware   #
+###############################################################################
 
 # Currently supported types of sdr receivers:
-# "rtl_sdr", "sdrplay", "hackrf", "airspy", "airspyhf", "fifi_sdr", "perseussdr"
+# "rtl_sdr", "rtl_sdr_soapy", "sdrplay", "hackrf", "airspy", "airspyhf", "fifi_sdr",
+# "perseussdr", "lime_sdr", "pluto_sdr", "soapy_remote"
 #
 # In order to use rtl_sdr, you will need to install librtlsdr-dev and the connector.
 # In order to use sdrplay, airspy or airspyhf, you will need to install soapysdr, the corresponding driver, and the
@@ -117,8 +118,6 @@ Note: if you experience audio underruns while CPU usage is 100%, you can:
 # and do the proper changes to the sdrs object below
 # (see also Wiki in https://github.com/jketterl/openwebrx/wiki/Sample-configuration-for-Perseus-HF-receiver).
 #
-# NOTE: The connector sources have replaced the old piped nmux style of reading input. If you still have any sdrs
-# configured that have type endin in "_connector", simply remove that suffix.
 
 sdrs = {
     "rtlsdr": {

From 056a8a3289b04aa361ba4d0140d06c36b67b7cdb Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 18:49:13 +0200
Subject: [PATCH 169/475] migrate waterfall settings away from tuples

---
 config_webrx.py     | 16 ++++++++--------
 htdocs/openwebrx.js |  4 ++--
 owrx/config.py      |  9 +++++++--
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index 1736cab..0508d7c 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -47,7 +47,7 @@ receiver_name = "[Callsign]"
 receiver_location = "Budapest, Hungary"
 receiver_asl = 200
 receiver_admin = "example@example.com"
-receiver_gps = { "lat": 47.000000, "lon": 19.000000)
+receiver_gps = {"lat": 47.000000, "lon": 19.000000}
 photo_title = "Panorama of Budapest from Schönherz Zoltán Dormitory"
 photo_desc = """
 You can add your own background photo and receiver information.<br />
@@ -254,21 +254,21 @@ sdrs = {
 waterfall_colors = [0x000000FF, 0x0000FFFF, 0x00FFFFFF, 0x00FF00FF, 0xFFFF00FF, 0xFF0000FF, 0xFF00FFFF, 0xFFFFFFFF]
 waterfall_min_level = -88  # in dB
 waterfall_max_level = -20
-waterfall_auto_level_margin = (5, 40)
+waterfall_auto_level_margin = {"min": 5, "max": 40}
 ### old theme by HA7ILM:
 # waterfall_colors = "[0x000000ff,0x2e6893ff, 0x69a5d0ff, 0x214b69ff, 0x9dc4e0ff,  0xfff775ff, 0xff8a8aff, 0xb20000ff]"
 # waterfall_min_level = -115 #in dB
 # waterfall_max_level = 0
-# waterfall_auto_level_margin = (20, 30)
+# waterfall_auto_level_margin = {"min": 20, "max": 30}
 ##For the old colors, you might also want to set [fft_voverlap_factor] to 0.
 
 # Note: When the auto waterfall level button is clicked, the following happens:
-#   [waterfall_min_level] = [current_min_power_level] - [waterfall_auto_level_margin[0]]
-#   [waterfall_max_level] = [current_max_power_level] + [waterfall_auto_level_margin[1]]
+#   [waterfall_min_level] = [current_min_power_level] - [waterfall_auto_level_margin["min"]]
+#   [waterfall_max_level] = [current_max_power_level] + [waterfall_auto_level_margin["max"]]
 #
-#   ___|____________________________________|____________________________________|____________________________________|___> signal power
-#        \_waterfall_auto_level_margin[0]_/ |__ current_min_power_level          | \_waterfall_auto_level_margin[1]_/
-#                                                      current_max_power_level __|
+#   ___|________________________________________|____________________________________|________________________________________|___> signal power
+#        \_waterfall_auto_level_margin["min"]_/ |__ current_min_power_level          | \_waterfall_auto_level_margin["max"]_/
+#                                                          current_max_power_level __|
 
 # === Experimental settings ===
 # Warning! The settings below are very experimental.
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 6029463..52770c6 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -171,8 +171,8 @@ function waterfallColorsDefault() {
 }
 
 function waterfallColorsAuto() {
-    e("openwebrx-waterfall-color-min").value = (waterfall_measure_minmax_min - waterfall_auto_level_margin[0]).toString();
-    e("openwebrx-waterfall-color-max").value = (waterfall_measure_minmax_max + waterfall_auto_level_margin[1]).toString();
+    e("openwebrx-waterfall-color-min").value = (waterfall_measure_minmax_min - waterfall_auto_level_margin.min).toString();
+    e("openwebrx-waterfall-color-max").value = (waterfall_measure_minmax_max + waterfall_auto_level_margin.max).toString();
     updateWaterfallColors(0);
 }
 
diff --git a/owrx/config.py b/owrx/config.py
index 10f0dd7..4aa1c8e 100644
--- a/owrx/config.py
+++ b/owrx/config.py
@@ -29,8 +29,13 @@ class ConfigMigrator(ABC):
 
 class ConfigMigratorVersion1(ConfigMigrator):
     def migrate(self, config):
-        gps = config["receiver_gps"]
-        config["receiver_gps"] = {"lat": gps[0], "lon": gps[1]}
+        if "receiver_gps" in config:
+            gps = config["receiver_gps"]
+            config["receiver_gps"] = {"lat": gps[0], "lon": gps[1]}
+
+        if "waterfall_auto_level_margin" in config:
+            levels = config["waterfall_auto_level_margin"]
+            config["waterfall_auto_level_margin"] = {"min": levels[0], "max": levels[1]}
 
         config["version"] = 2
         return config

From 199dfe106a853430a61f015bba3332f3627a319e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 19:50:37 +0200
Subject: [PATCH 170/475] add a new multi-checkbox to select background
 detection services

---
 owrx/controllers/settings.py | 44 +++++++++++++++++++
 owrx/service/__init__.py     | 85 +++++++++++++++++++++++++-----------
 2 files changed, 104 insertions(+), 25 deletions(-)

diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 11bf6ee..d4c50cd 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -1,6 +1,7 @@
 from abc import ABC, abstractmethod
 from .admin import AdminController
 from owrx.config import Config
+from owrx.service import ServiceDetector
 from urllib.parse import parse_qs
 import logging
 
@@ -109,6 +110,48 @@ class CheckboxInput(Input):
         return {self.id: self.id in data and data[self.id][0] == "on"}
 
 
+class MultiCheckboxInput(Input):
+    def __init__(self, id, label, options, infotext=None):
+        super().__init__(id, label, infotext=infotext)
+        self.options = options
+
+    def render_input(self, value):
+        return "".join(self.render_checkbox(o, value) for o in self.options)
+
+    def checkbox_id(self, option):
+        return "{0}-{1}".format(self.id, option.value)
+
+    def render_checkbox(self, option, value):
+        return """
+          <div class="{classes}">
+            <input class="form-check-input" type="checkbox" id="{id}" name="{id}" {checked}>
+            <label class="form-check-label" for="{id}">
+              {checkboxText}
+            </label>
+          </div>
+        """.format(
+            id=self.checkbox_id(option),
+            classes=self.input_classes(),
+            checked="checked" if option.value in value else "",
+            checkboxText=option.text
+        )
+
+    def parse(self, data):
+        def in_response(option):
+            boxid = self.checkbox_id(option)
+            return boxid in data and data[boxid][0] == "on"
+        return {self.id: [o.value for o in self.options if in_response(o)]}
+
+    def input_classes(self):
+        return " ".join(["form-check", "form-control-sm"])
+
+
+class ServicesCheckboxInput(MultiCheckboxInput):
+    def __init__(self, id, label, infotext=None):
+        services = [DropdownOption(s, s.upper()) for s in ServiceDetector.getAvailableServices()]
+        super().__init__(id, label, services, infotext)
+
+
 class DropdownOption(object):
     def __init__(self, value, text):
         self.value = value
@@ -270,6 +313,7 @@ class SettingsController(AdminController):
         Section(
             "Background decoding",
             CheckboxInput("services_enabled", "Service", checkboxText="Enable background decoding services"),
+            ServicesCheckboxInput("services_decoders", "Enabled services")
         ),
         Section(
             "APRS settings",
diff --git a/owrx/service/__init__.py b/owrx/service/__init__.py
index 66a7880..b1686dc 100644
--- a/owrx/service/__init__.py
+++ b/owrx/service/__init__.py
@@ -11,6 +11,7 @@ from owrx.feature import FeatureDetector
 from owrx.property import PropertyLayer
 from abc import ABCMeta, abstractmethod
 from .schedule import ServiceScheduler
+from functools import reduce
 
 import logging
 
@@ -49,6 +50,30 @@ class AprsServiceOutput(ServiceOutput):
         return t == "packet_demod"
 
 
+class ServiceDetector(object):
+    requirements = {
+        "ft8": ["wsjt-x"],
+        "ft4": ["wsjt-x"],
+        "jt65": ["wsjt-x"],
+        "jt9": ["wsjt-x"],
+        "wspr": ["wsjt-x"],
+        "packet": ["packet"],
+    }
+
+    @staticmethod
+    def getAvailableServices():
+        # TODO this should be in a more central place (the frontend also needs this)
+        fd = FeatureDetector()
+
+        return [
+            name
+            for name, requirements in ServiceDetector.requirements.items()
+            if reduce(
+                lambda a, b: a and b, [fd.is_available(r) for r in requirements], True
+            )
+        ]
+
+
 class ServiceHandler(object):
     def __init__(self, source):
         self.lock = threading.Lock()
@@ -83,24 +108,9 @@ class ServiceHandler(object):
         pass
 
     def isSupported(self, mode):
-        # TODO this should be in a more central place (the frontend also needs this)
-        requirements = {
-            "ft8": "wsjt-x",
-            "ft4": "wsjt-x",
-            "jt65": "wsjt-x",
-            "jt9": "wsjt-x",
-            "wspr": "wsjt-x",
-            "packet": "packet",
-        }
-        fd = FeatureDetector()
-
-        # this looks overly complicated... but i'd like modes with no requirements to be always available without
-        # being listed in the hash above
-        unavailable = [mode for mode, req in requirements.items() if not fd.is_available(req)]
         configured = Config.get()["services_decoders"]
-        available = [mode for mode in configured if mode not in unavailable]
-
-        return mode in available
+        available = ServiceDetector.getAvailableServices()
+        return mode in configured and mode in available
 
     def shutdown(self):
         self.stopServices()
@@ -141,7 +151,9 @@ class ServiceHandler(object):
 
         dials = [
             dial
-            for dial in Bandplan.getSharedInstance().collectDialFrequencies(frequency_range)
+            for dial in Bandplan.getSharedInstance().collectDialFrequencies(
+                frequency_range
+            )
             if self.isSupported(dial["mode"])
         ]
 
@@ -155,7 +167,9 @@ class ServiceHandler(object):
             groups = self.optimizeResampling(dials, sr)
             if groups is None:
                 for dial in dials:
-                    self.services.append(self.setupService(dial["mode"], dial["frequency"], self.source))
+                    self.services.append(
+                        self.setupService(dial["mode"], dial["frequency"], self.source)
+                    )
             else:
                 for group in groups:
                     frequencies = sorted([f["frequency"] for f in group])
@@ -163,7 +177,9 @@ class ServiceHandler(object):
                     max = frequencies[-1]
                     cf = (min + max) / 2
                     bw = max - min
-                    logger.debug("group center frequency: {0}, bandwidth: {1}".format(cf, bw))
+                    logger.debug(
+                        "group center frequency: {0}, bandwidth: {1}".format(cf, bw)
+                    )
                     resampler_props = PropertyLayer()
                     resampler_props["center_freq"] = cf
                     # TODO the + 24000 is a temporary fix since the resampling optimizer does not account for required bandwidths
@@ -172,7 +188,11 @@ class ServiceHandler(object):
                     resampler.start()
 
                     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 still running
                     self.services.append(resampler)
@@ -180,7 +200,10 @@ class ServiceHandler(object):
     def optimizeResampling(self, freqs, bandwidth):
         freqs = sorted(freqs, key=lambda f: f["frequency"])
         distances = [
-            {"frequency": freqs[i]["frequency"], "distance": freqs[i + 1]["frequency"] - freqs[i]["frequency"]}
+            {
+                "frequency": freqs[i]["frequency"],
+                "distance": freqs[i + 1]["frequency"] - freqs[i]["frequency"],
+            }
             for i in range(0, len(freqs) - 1)
         ]
 
@@ -203,15 +226,27 @@ class ServiceHandler(object):
                 return bandwidth + len(group) * (freqs[-1] - freqs[0] + 24000)
 
             total_bandwidth = sum([get_bandwitdh(group) for group in groups])
-            return {"num_splits": num_splits, "total_bandwidth": total_bandwidth, "groups": groups}
+            return {
+                "num_splits": num_splits,
+                "total_bandwidth": total_bandwidth,
+                "groups": groups,
+            }
 
         usages = [calculate_usage(i) for i in range(0, len(freqs))]
         # another possible outcome might be that it's best not to resample at all. this is a special case.
-        usages += [{"num_splits": None, "total_bandwidth": bandwidth * len(freqs), "groups": [freqs]}]
+        usages += [
+            {
+                "num_splits": None,
+                "total_bandwidth": bandwidth * len(freqs),
+                "groups": [freqs],
+            }
+        ]
         results = sorted(usages, key=lambda f: f["total_bandwidth"])
 
         for r in results:
-            logger.debug("splits: {0}, total: {1}".format(r["num_splits"], r["total_bandwidth"]))
+            logger.debug(
+                "splits: {0}, total: {1}".format(r["num_splits"], r["total_bandwidth"])
+            )
 
         best = results[0]
         if best["num_splits"] is None:

From 65a0320cea36f66b6c2fbb63eb4f69ea9ed0ad13 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 19:52:56 +0200
Subject: [PATCH 171/475] refactor

---
 owrx/controllers/settings.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index d4c50cd..831fbf3 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -110,6 +110,13 @@ class CheckboxInput(Input):
         return {self.id: self.id in data and data[self.id][0] == "on"}
 
 
+class Option(object):
+    # used for both MultiCheckboxInput and DropdownInput
+    def __init__(self, value, text):
+        self.value = value
+        self.text = text
+
+
 class MultiCheckboxInput(Input):
     def __init__(self, id, label, options, infotext=None):
         super().__init__(id, label, infotext=infotext)
@@ -148,16 +155,10 @@ class MultiCheckboxInput(Input):
 
 class ServicesCheckboxInput(MultiCheckboxInput):
     def __init__(self, id, label, infotext=None):
-        services = [DropdownOption(s, s.upper()) for s in ServiceDetector.getAvailableServices()]
+        services = [Option(s, s.upper()) for s in ServiceDetector.getAvailableServices()]
         super().__init__(id, label, services, infotext)
 
 
-class DropdownOption(object):
-    def __init__(self, value, text):
-        self.value = value
-        self.text = text
-
-
 class DropdownInput(Input):
     def __init__(self, id, label, options, infotext = None):
         super().__init__(id, label, infotext=infotext)
@@ -237,12 +238,12 @@ class SettingsController(AdminController):
         Section(
             "Compression",
             DropdownInput("audio_compression", "Audio compression", options=[
-                DropdownOption("adpcm", "ADPCM"),
-                DropdownOption("none", "None"),
+                Option("adpcm", "ADPCM"),
+                Option("none", "None"),
             ]),
             DropdownInput("fft_compression", "Waterfall compression", options=[
-                DropdownOption("adpcm", "ADPCM"),
-                DropdownOption("none", "None"),
+                Option("adpcm", "ADPCM"),
+                Option("none", "None"),
             ]),
         ),
         Section(

From 2ef80eee1defcece0d7a7a7914e49dcd16ea559d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 20:14:34 +0200
Subject: [PATCH 172/475] refactor and format

---
 owrx/controllers/settings.py | 257 ++++++++---------------------------
 owrx/form/__init__.py        | 187 +++++++++++++++++++++++++
 2 files changed, 243 insertions(+), 201 deletions(-)
 create mode 100644 owrx/form/__init__.py

diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 831fbf3..c5b6288 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -1,185 +1,22 @@
-from abc import ABC, abstractmethod
 from .admin import AdminController
 from owrx.config import Config
-from owrx.service import ServiceDetector
 from urllib.parse import parse_qs
+from owrx.form import (
+    TextInput,
+    NumberInput,
+    FloatInput,
+    LocationInput,
+    TextAreaInput,
+    CheckboxInput,
+    DropdownInput,
+    Option,
+    ServicesCheckboxInput,
+)
 import logging
 
 logger = logging.getLogger(__name__)
 
 
-class Input(ABC):
-    def __init__(self, id, label, infotext=None):
-        self.id = id
-        self.label = label
-        self.infotext = infotext
-
-    def bootstrap_decorate(self, input):
-        infotext = "<small>{text}</small>".format(text=self.infotext) if self.infotext else ""
-        return """
-            <div class="form-group row">
-                <label class="col-form-label col-form-label-sm col-3" for="{id}">{label}</label>
-                <div class="col-9 p-0">
-                    {input}
-                    {infotext}
-                </div>
-            </div>
-        """.format(
-            id=self.id, label=self.label, input=input, infotext=infotext
-        )
-
-    def input_classes(self):
-        return " ".join(["form-control", "form-control-sm"])
-
-    @abstractmethod
-    def render_input(self, value):
-        pass
-
-    def render(self, config):
-        return self.bootstrap_decorate(self.render_input(config[self.id]))
-
-    def parse(self, data):
-        return {self.id: data[self.id][0]} if self.id in data else {}
-
-
-class TextInput(Input):
-    def render_input(self, value):
-        return """
-            <input type="text" class="{classes}" id="{id}" name="{id}" placeholder="{label}" value="{value}">
-        """.format(
-            id=self.id, label=self.label, classes=self.input_classes(), value=value
-        )
-
-
-class NumberInput(Input):
-    def render_input(self, value):
-        return """
-            <input type="number" class="{classes}" id="{id}" name="{id}" placeholder="{label}" value="{value}">
-        """.format(
-            id=self.id, label=self.label, classes=self.input_classes(), value=value
-        )
-
-    def convert_value(self, v):
-        return int(v)
-
-    def parse(self, data):
-        return {k: self.convert_value(v) for k, v in super().parse(data).items()}
-
-
-class FloatInput(NumberInput):
-    def convert_value(self, v):
-        return float(v)
-
-
-class LocationInput(Input):
-    def render_input(self, value):
-        # TODO make this work and pretty
-        return "Placeholder for a map widget to select receiver location"
-
-
-class TextAreaInput(Input):
-    def render_input(self, value):
-        return """
-            <textarea class="{classes}" id="{id}" name="{id}" style="height:200px;">{value}</textarea>
-        """.format(
-            id=self.id, classes=self.input_classes(), value=value
-        )
-
-
-class CheckboxInput(Input):
-    def __init__(self, id, label, checkboxText, infotext=None):
-        super().__init__(id, label, infotext=infotext)
-        self.checkboxText = checkboxText
-
-    def render_input(self, value):
-        return """
-          <div class="{classes}">
-            <input class="form-check-input" type="checkbox" id="{id}" name="{id}" {checked}>
-            <label class="form-check-label" for="{id}">
-              {checkboxText}
-            </label>
-          </div>
-        """.format(
-            id=self.id, classes=self.input_classes(), checked="checked" if value else "", checkboxText=self.checkboxText
-        )
-
-    def input_classes(self):
-        return " ".join(["form-check", "form-control-sm"])
-
-    def parse(self, data):
-        return {self.id: self.id in data and data[self.id][0] == "on"}
-
-
-class Option(object):
-    # used for both MultiCheckboxInput and DropdownInput
-    def __init__(self, value, text):
-        self.value = value
-        self.text = text
-
-
-class MultiCheckboxInput(Input):
-    def __init__(self, id, label, options, infotext=None):
-        super().__init__(id, label, infotext=infotext)
-        self.options = options
-
-    def render_input(self, value):
-        return "".join(self.render_checkbox(o, value) for o in self.options)
-
-    def checkbox_id(self, option):
-        return "{0}-{1}".format(self.id, option.value)
-
-    def render_checkbox(self, option, value):
-        return """
-          <div class="{classes}">
-            <input class="form-check-input" type="checkbox" id="{id}" name="{id}" {checked}>
-            <label class="form-check-label" for="{id}">
-              {checkboxText}
-            </label>
-          </div>
-        """.format(
-            id=self.checkbox_id(option),
-            classes=self.input_classes(),
-            checked="checked" if option.value in value else "",
-            checkboxText=option.text
-        )
-
-    def parse(self, data):
-        def in_response(option):
-            boxid = self.checkbox_id(option)
-            return boxid in data and data[boxid][0] == "on"
-        return {self.id: [o.value for o in self.options if in_response(o)]}
-
-    def input_classes(self):
-        return " ".join(["form-check", "form-control-sm"])
-
-
-class ServicesCheckboxInput(MultiCheckboxInput):
-    def __init__(self, id, label, infotext=None):
-        services = [Option(s, s.upper()) for s in ServiceDetector.getAvailableServices()]
-        super().__init__(id, label, services, infotext)
-
-
-class DropdownInput(Input):
-    def __init__(self, id, label, options, infotext = None):
-        super().__init__(id, label, infotext=infotext)
-        self.options = options
-
-    def render_input(self, value):
-        return """
-            <select class="{classes}" id="{id}" name="{id}">{options}</select>
-        """.format(classes=self.input_classes(), id=self.id, options=self.render_options(value))
-
-    def render_options(self, value):
-        options = [
-            """
-                <option value="{value}" {selected}>{text}</option>
-            """.format(
-                text=o.text, value=o.value, selected="selected" if o.value == value else ""
-            ) for o in self.options
-        ]
-        return "".join(options)
-
-
 class Section(object):
     def __init__(self, title, *inputs):
         self.title = title
@@ -211,7 +48,11 @@ class SettingsController(AdminController):
             "General settings",
             TextInput("receiver_name", "Receiver name"),
             TextInput("receiver_location", "Receiver location"),
-            NumberInput("receiver_asl", "Receiver elevation", infotext="Elevation in meters above mean see level"),
+            NumberInput(
+                "receiver_asl",
+                "Receiver elevation",
+                infotext="Elevation in meters above mean see level",
+            ),
             TextInput("receiver_admin", "Receiver admin"),
             LocationInput("receiver_gps", "Receiver coordinates"),
             TextInput("photo_title", "Photo title"),
@@ -237,14 +78,16 @@ class SettingsController(AdminController):
         ),
         Section(
             "Compression",
-            DropdownInput("audio_compression", "Audio compression", options=[
-                Option("adpcm", "ADPCM"),
-                Option("none", "None"),
-            ]),
-            DropdownInput("fft_compression", "Waterfall compression", options=[
-                Option("adpcm", "ADPCM"),
-                Option("none", "None"),
-            ]),
+            DropdownInput(
+                "audio_compression",
+                "Audio compression",
+                options=[Option("adpcm", "ADPCM"), Option("none", "None"),],
+            ),
+            DropdownInput(
+                "fft_compression",
+                "Waterfall compression",
+                options=[Option("adpcm", "ADPCM"), Option("none", "None"),],
+            ),
         ),
         Section(
             "Digimodes",
@@ -257,12 +100,12 @@ class SettingsController(AdminController):
                 "digital_voice_unvoiced_quality",
                 "Quality of unvoiced sounds in synthesized voice",
                 infotext="Determines the quality, and thus the cpu usage, for the ambe codec used by digital voice"
-                + "modes.<br />If you're running on a Raspi (up to 3B+) you should leave this set at 1"
+                + "modes.<br />If you're running on a Raspi (up to 3B+) you should leave this set at 1",
             ),
             CheckboxInput(
                 "digital_voice_dmr_id_lookup",
                 "DMR id lookup",
-                checkboxText="Enable lookup of DMR ids in the radioid database to show callsigns and names"
+                checkboxText="Enable lookup of DMR ids in the radioid database to show callsigns and names",
             ),
         ),
         Section(
@@ -271,19 +114,19 @@ class SettingsController(AdminController):
                 "csdr_dynamic_bufsize",
                 "",
                 checkboxText="Enable dynamic buffer sizes",
-                infotext="This allows you to change the buffering mode of csdr."
+                infotext="This allows you to change the buffering mode of csdr.",
             ),
             CheckboxInput(
                 "csdr_print_bufsizes",
                 "",
                 checkboxText="Print buffer sizez",
-                infotext="This prints the buffer sizes used for csdr processes."
+                infotext="This prints the buffer sizes used for csdr processes.",
             ),
             CheckboxInput(
                 "csdr_through",
                 "",
                 checkboxText="Print throughput",
-                infotext="Enabling this will print out how much data is going into the DSP chains."
+                infotext="Enabling this will print out how much data is going into the DSP chains.",
             ),
         ),
         Section(
@@ -293,12 +136,12 @@ class SettingsController(AdminController):
                 "Google Maps API key",
                 infotext="Google Maps requires an API key, check out "
                 + '<a href="https://developers.google.com/maps/documentation/embed/get-api-key" target="_blank">'
-                + "their documentation</a> on how to obtain one."
+                + "their documentation</a> on how to obtain one.",
             ),
             NumberInput(
                 "map_position_retention_time",
                 "Map retention time",
-                infotext="Unit is seconds<br/>Specifies how log markers / grids will remain visible on the map"
+                infotext="Unit is seconds<br/>Specifies how log markers / grids will remain visible on the map",
             ),
         ),
         Section(
@@ -308,25 +151,29 @@ class SettingsController(AdminController):
             NumberInput(
                 "wsjt_decoding_depth",
                 "WSJT decoding depth",
-                infotext="A higher decoding depth will allow more results, but will also consume more cpu"
-            )
+                infotext="A higher decoding depth will allow more results, but will also consume more cpu",
+            ),
         ),
         Section(
             "Background decoding",
-            CheckboxInput("services_enabled", "Service", checkboxText="Enable background decoding services"),
-            ServicesCheckboxInput("services_decoders", "Enabled services")
+            CheckboxInput(
+                "services_enabled",
+                "Service",
+                checkboxText="Enable background decoding services",
+            ),
+            ServicesCheckboxInput("services_decoders", "Enabled services"),
         ),
         Section(
             "APRS settings",
             TextInput(
                 "aprs_callsign",
                 "APRS callsign",
-                infotext="This callsign will be used to send data to the APRS-IS network"
+                infotext="This callsign will be used to send data to the APRS-IS network",
             ),
             CheckboxInput(
                 "aprs_igate_enabled",
                 "APRS I-Gate",
-                checkboxText="Enable APRS receive-only I-Gate"
+                checkboxText="Enable APRS receive-only I-Gate",
             ),
             TextInput("aprs_igate_server", "APRS-IS server"),
             TextInput("aprs_igate_password", "APRS-IS network password"),
@@ -334,16 +181,20 @@ class SettingsController(AdminController):
                 "aprs_igate_beacon",
                 "APRS beacon",
                 checkboxText="Send the receiver position to the APRS-IS network",
-                infotext="Please check that your receiver location is setup correctly"
+                infotext="Please check that your receiver location is setup correctly",
             ),
         ),
         Section(
             "pskreporter settings",
-            CheckboxInput("pskreporter_enabled", "Reporting", checkboxText="Enable sending spots to pskreporter.info"),
+            CheckboxInput(
+                "pskreporter_enabled",
+                "Reporting",
+                checkboxText="Enable sending spots to pskreporter.info",
+            ),
             TextInput(
                 "pskreporter_callsign",
                 "pskreporter callsign",
-                infotext="This callsign will be used to send spots to pskreporter.info"
+                infotext="This callsign will be used to send spots to pskreporter.info",
             ),
         ),
         Section(
@@ -353,7 +204,9 @@ class SettingsController(AdminController):
                 "sdr.hu key",
                 infotext='Please obtain your personal key on <a href="https://sdr.hu" target="_blank">sdr.hu</a>',
             ),
-            CheckboxInput("sdrhu_public_listing", "List on sdr.hu", "List my receiver on sdr.hu"),
+            CheckboxInput(
+                "sdrhu_public_listing", "List on sdr.hu", "List my receiver on sdr.hu"
+            ),
             TextInput("server_hostname", "Hostname"),
         ),
     ]
@@ -381,7 +234,9 @@ class SettingsController(AdminController):
 
     def processFormData(self):
         data = parse_qs(self.get_body().decode("utf-8"))
-        data = {k: v for i in SettingsController.sections for k, v in i.parse(data).items()}
+        data = {
+            k: v for i in SettingsController.sections for k, v in i.parse(data).items()
+        }
         config = Config.get()
         for k, v in data.items():
             config[k] = v
diff --git a/owrx/form/__init__.py b/owrx/form/__init__.py
new file mode 100644
index 0000000..2ba65ea
--- /dev/null
+++ b/owrx/form/__init__.py
@@ -0,0 +1,187 @@
+from abc import ABC, abstractmethod
+from owrx.service import ServiceDetector
+
+
+class Input(ABC):
+    def __init__(self, id, label, infotext=None):
+        self.id = id
+        self.label = label
+        self.infotext = infotext
+
+    def bootstrap_decorate(self, input):
+        infotext = (
+            "<small>{text}</small>".format(text=self.infotext) if self.infotext else ""
+        )
+        return """
+            <div class="form-group row">
+                <label class="col-form-label col-form-label-sm col-3" for="{id}">{label}</label>
+                <div class="col-9 p-0">
+                    {input}
+                    {infotext}
+                </div>
+            </div>
+        """.format(
+            id=self.id, label=self.label, input=input, infotext=infotext
+        )
+
+    def input_classes(self):
+        return " ".join(["form-control", "form-control-sm"])
+
+    @abstractmethod
+    def render_input(self, value):
+        pass
+
+    def render(self, config):
+        return self.bootstrap_decorate(self.render_input(config[self.id]))
+
+    def parse(self, data):
+        return {self.id: data[self.id][0]} if self.id in data else {}
+
+
+class TextInput(Input):
+    def render_input(self, value):
+        return """
+            <input type="text" class="{classes}" id="{id}" name="{id}" placeholder="{label}" value="{value}">
+        """.format(
+            id=self.id, label=self.label, classes=self.input_classes(), value=value
+        )
+
+
+class NumberInput(Input):
+    def render_input(self, value):
+        return """
+            <input type="number" class="{classes}" id="{id}" name="{id}" placeholder="{label}" value="{value}">
+        """.format(
+            id=self.id, label=self.label, classes=self.input_classes(), value=value
+        )
+
+    def convert_value(self, v):
+        return int(v)
+
+    def parse(self, data):
+        return {k: self.convert_value(v) for k, v in super().parse(data).items()}
+
+
+class FloatInput(NumberInput):
+    def convert_value(self, v):
+        return float(v)
+
+
+class LocationInput(Input):
+    def render_input(self, value):
+        # TODO make this work and pretty
+        return "Placeholder for a map widget to select receiver location"
+
+
+class TextAreaInput(Input):
+    def render_input(self, value):
+        return """
+            <textarea class="{classes}" id="{id}" name="{id}" style="height:200px;">{value}</textarea>
+        """.format(
+            id=self.id, classes=self.input_classes(), value=value
+        )
+
+
+class CheckboxInput(Input):
+    def __init__(self, id, label, checkboxText, infotext=None):
+        super().__init__(id, label, infotext=infotext)
+        self.checkboxText = checkboxText
+
+    def render_input(self, value):
+        return """
+          <div class="{classes}">
+            <input class="form-check-input" type="checkbox" id="{id}" name="{id}" {checked}>
+            <label class="form-check-label" for="{id}">
+              {checkboxText}
+            </label>
+          </div>
+        """.format(
+            id=self.id,
+            classes=self.input_classes(),
+            checked="checked" if value else "",
+            checkboxText=self.checkboxText,
+        )
+
+    def input_classes(self):
+        return " ".join(["form-check", "form-control-sm"])
+
+    def parse(self, data):
+        return {self.id: self.id in data and data[self.id][0] == "on"}
+
+
+class Option(object):
+    # used for both MultiCheckboxInput and DropdownInput
+    def __init__(self, value, text):
+        self.value = value
+        self.text = text
+
+
+class MultiCheckboxInput(Input):
+    def __init__(self, id, label, options, infotext=None):
+        super().__init__(id, label, infotext=infotext)
+        self.options = options
+
+    def render_input(self, value):
+        return "".join(self.render_checkbox(o, value) for o in self.options)
+
+    def checkbox_id(self, option):
+        return "{0}-{1}".format(self.id, option.value)
+
+    def render_checkbox(self, option, value):
+        return """
+          <div class="{classes}">
+            <input class="form-check-input" type="checkbox" id="{id}" name="{id}" {checked}>
+            <label class="form-check-label" for="{id}">
+              {checkboxText}
+            </label>
+          </div>
+        """.format(
+            id=self.checkbox_id(option),
+            classes=self.input_classes(),
+            checked="checked" if option.value in value else "",
+            checkboxText=option.text,
+        )
+
+    def parse(self, data):
+        def in_response(option):
+            boxid = self.checkbox_id(option)
+            return boxid in data and data[boxid][0] == "on"
+
+        return {self.id: [o.value for o in self.options if in_response(o)]}
+
+    def input_classes(self):
+        return " ".join(["form-check", "form-control-sm"])
+
+
+class ServicesCheckboxInput(MultiCheckboxInput):
+    def __init__(self, id, label, infotext=None):
+        services = [
+            Option(s, s.upper()) for s in ServiceDetector.getAvailableServices()
+        ]
+        super().__init__(id, label, services, infotext)
+
+
+class DropdownInput(Input):
+    def __init__(self, id, label, options, infotext=None):
+        super().__init__(id, label, infotext=infotext)
+        self.options = options
+
+    def render_input(self, value):
+        return """
+            <select class="{classes}" id="{id}" name="{id}">{options}</select>
+        """.format(
+            classes=self.input_classes(), id=self.id, options=self.render_options(value)
+        )
+
+    def render_options(self, value):
+        options = [
+            """
+                <option value="{value}" {selected}>{text}</option>
+            """.format(
+                text=o.text,
+                value=o.value,
+                selected="selected" if o.value == value else "",
+            )
+            for o in self.options
+        ]
+        return "".join(options)

From a3126b060df618296acf3714e6a4200f6fb37b66 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 20:15:13 +0200
Subject: [PATCH 173/475] add forms to setup

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 5c9d16b..0d512eb 100644
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ except ImportError:
 setup(
     name="OpenWebRX",
     version=str(strictversion),
-    packages=find_namespace_packages(include=["owrx", "owrx.source", "owrx.service", "owrx.controllers", "owrx.property", "csdr", "htdocs"]),
+    packages=find_namespace_packages(include=["owrx", "owrx.source", "owrx.service", "owrx.controllers", "owrx.property", "owrx.form", "csdr", "htdocs"]),
     package_data={"htdocs": [f[len("htdocs/") :] for f in glob("htdocs/**/*", recursive=True)]},
     entry_points={"console_scripts": ["openwebrx=owrx.__main__:main"]},
     # use the github page for now

From 29566430a66b652c6ae4cb483d1d692166c95aa4 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 20:49:37 +0200
Subject: [PATCH 174/475] add location input fields

---
 owrx/form/__init__.py | 41 ++++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/owrx/form/__init__.py b/owrx/form/__init__.py
index 2ba65ea..399665a 100644
--- a/owrx/form/__init__.py
+++ b/owrx/form/__init__.py
@@ -48,11 +48,19 @@ class TextInput(Input):
 
 
 class NumberInput(Input):
+    def __init__(self, id, label, infotext=None):
+        super().__init__(id, label, infotext)
+        self.step = None
+
     def render_input(self, value):
         return """
-            <input type="number" class="{classes}" id="{id}" name="{id}" placeholder="{label}" value="{value}">
+            <input type="number" class="{classes}" id="{id}" name="{id}" placeholder="{label}" value="{value}" {step}>
         """.format(
-            id=self.id, label=self.label, classes=self.input_classes(), value=value
+            id=self.id,
+            label=self.label,
+            classes=self.input_classes(),
+            value=value,
+            step='step="{0}"'.format(self.step) if self.step else "",
         )
 
     def convert_value(self, v):
@@ -63,6 +71,10 @@ class NumberInput(Input):
 
 
 class FloatInput(NumberInput):
+    def __init__(self, id, label, infotext=None):
+        super().__init__(id, label, infotext)
+        self.step = "any"
+
     def convert_value(self, v):
         return float(v)
 
@@ -70,7 +82,30 @@ class FloatInput(NumberInput):
 class LocationInput(Input):
     def render_input(self, value):
         # TODO make this work and pretty
-        return "Placeholder for a map widget to select receiver location"
+        return """
+            <div class="row">
+                {inputs}
+            </div>
+        """.format(
+            inputs="".join(self.render_sub_input(value, id) for id in ["lat", "lon"])
+        )
+
+    def render_sub_input(self, value, id):
+        return """
+            <div class="col">
+                <input type="number" class="{classes}" id="{id}" name="{id}" placeholder="{label}" value="{value}" step="any">
+            </div>
+        """.format(
+            id="{0}-{1}".format(self.id, id),
+            label=self.label,
+            classes=self.input_classes(),
+            value=value[id],
+        )
+
+    def parse(self, data):
+        return {
+            self.id: {k: float(data["{0}-{1}".format(self.id, k)][0]) for k in ["lat", "lon"]}
+        }
 
 
 class TextAreaInput(Input):

From f0ef5bb371c47156dec931f2adab028c884c5744 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 21:40:29 +0200
Subject: [PATCH 175/475] add location picker so set receiver location

---
 htdocs/admin.html     |  3 +++
 htdocs/css/admin.css  |  4 ++++
 htdocs/settings.js    | 23 +++++++++++++++++++++++
 owrx/form/__init__.py |  9 +++++++--
 4 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 htdocs/settings.js

diff --git a/htdocs/admin.html b/htdocs/admin.html
index b7310f6..54e8fe4 100644
--- a/htdocs/admin.html
+++ b/htdocs/admin.html
@@ -5,6 +5,9 @@
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
+    <script src="static/lib/jquery-3.2.1.min.js"></script>
+    <script src="https://unpkg.com/location-picker/dist/location-picker.min.js"></script>
+    <script src="static/settings.js"></script>
     <meta charset="utf-8">
 </head>
 <body>
diff --git a/htdocs/css/admin.css b/htdocs/css/admin.css
index d948451..8836244 100644
--- a/htdocs/css/admin.css
+++ b/htdocs/css/admin.css
@@ -14,3 +14,7 @@ body {
 .buttons {
     text-align: right;
 }
+
+.row .map-input {
+    margin: 15px 15px 0;
+}
diff --git a/htdocs/settings.js b/htdocs/settings.js
new file mode 100644
index 0000000..89c3eea
--- /dev/null
+++ b/htdocs/settings.js
@@ -0,0 +1,23 @@
+$(function(){
+    $(".map-input").each(function(el) {
+        var $el = $(this);
+        var field_id = $el.attr("for");
+        var $lat = $('#' + field_id + '-lat');
+        var $lon = $('#' + field_id + '-lon');
+        $.getScript("https://maps.googleapis.com/maps/api/js?key=" + $el.data("key")).done(function(){
+            $el.css("height", "200px");
+            var lp = new locationPicker($el.get(0), {
+                lat: parseFloat($lat.val()),
+                lng: parseFloat($lon.val())
+            }, {
+                zoom: 7
+            });
+
+            google.maps.event.addListener(lp.map, 'idle', function(event){
+                var pos = lp.getMarkerPosition();
+                $lat.val(pos.lat);
+                $lon.val(pos.lng);
+            });
+        });
+    })
+});
\ No newline at end of file
diff --git a/owrx/form/__init__.py b/owrx/form/__init__.py
index 399665a..2861683 100644
--- a/owrx/form/__init__.py
+++ b/owrx/form/__init__.py
@@ -1,5 +1,6 @@
 from abc import ABC, abstractmethod
 from owrx.service import ServiceDetector
+from owrx.config import Config
 
 
 class Input(ABC):
@@ -81,13 +82,17 @@ class FloatInput(NumberInput):
 
 class LocationInput(Input):
     def render_input(self, value):
-        # TODO make this work and pretty
         return """
             <div class="row">
                 {inputs}
             </div>
+            <div class="row">
+                <div class="col map-input" data-key="{key}" for="{id}"></div>
+            </div>
         """.format(
-            inputs="".join(self.render_sub_input(value, id) for id in ["lat", "lon"])
+            id=self.id,
+            inputs="".join(self.render_sub_input(value, id) for id in ["lat", "lon"]),
+            key=Config.get()["google_maps_api_key"],
         )
 
     def render_sub_input(self, value, id):

From b7831b824a089659437cbb6ccedfe95ffb0477b2 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 29 Mar 2020 22:48:10 +0200
Subject: [PATCH 176/475] update dependencies

---
 docker/scripts/install-connectors.sh                | 2 +-
 docker/scripts/install-dependencies-airspy.sh       | 4 ++--
 docker/scripts/install-dependencies-hackrf.sh       | 2 +-
 docker/scripts/install-dependencies-limesdr.sh      | 2 +-
 docker/scripts/install-dependencies-plutosdr.sh     | 4 ++--
 docker/scripts/install-dependencies-rtlsdr-soapy.sh | 4 ++--
 docker/scripts/install-dependencies-rtlsdr.sh       | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh
index caf5b18..dd604c1 100755
--- a/docker/scripts/install-connectors.sh
+++ b/docker/scripts/install-connectors.sh
@@ -24,6 +24,6 @@ apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 
 git clone https://github.com/jketterl/owrx_connector.git
-cmakebuild owrx_connector b68210e59b8475ed3dfc4dfb25de0b0a63193b87
+cmakebuild owrx_connector 047ed89f30ea19ad6ba3123accf7891ddc859e0d
 
 apk del .build-deps
diff --git a/docker/scripts/install-dependencies-airspy.sh b/docker/scripts/install-dependencies-airspy.sh
index dd13d22..a7813d3 100755
--- a/docker/scripts/install-dependencies-airspy.sh
+++ b/docker/scripts/install-dependencies-airspy.sh
@@ -28,12 +28,12 @@ git clone https://github.com/airspy/airspyone_host.git
 cmakebuild airspyone_host bceca18f9e3a5f89cff78c4d949c71771d92dfd3
 
 git clone https://github.com/pothosware/SoapyAirspy.git
-cmakebuild SoapyAirspy 99756be5c3413a2d447baf70cb5a880662452655
+cmakebuild SoapyAirspy 10d697b209e7f1acc8b2c8d24851d46170ef77e3
 
 git clone https://github.com/airspy/airspyhf.git
 cmakebuild airspyhf 613852a2bb64af42690bf9be2201826af69a9475
 
 git clone https://github.com/pothosware/SoapyAirspyHF.git
-cmakebuild SoapyAirspyHF 54f5487dd96207540b2dd562ff9e718e0588770b
+cmakebuild SoapyAirspyHF 81ca737bb044dd930a9de738bced1e4915491f1b
 
 apk del .build-deps
diff --git a/docker/scripts/install-dependencies-hackrf.sh b/docker/scripts/install-dependencies-hackrf.sh
index 274c1cc..0e56119 100755
--- a/docker/scripts/install-dependencies-hackrf.sh
+++ b/docker/scripts/install-dependencies-hackrf.sh
@@ -26,7 +26,7 @@ apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 git clone https://github.com/mossmann/hackrf.git
 cd hackrf
-git checkout 06eb9192cd348083f5f7de9c0da9ead276020011
+git checkout 43e6f99fe8543094d18ff3a6550ed2066c398862
 cmakebuild host
 cd ..
 rm -rf hackrf
diff --git a/docker/scripts/install-dependencies-limesdr.sh b/docker/scripts/install-dependencies-limesdr.sh
index 7a5341a..0e5cef5 100755
--- a/docker/scripts/install-dependencies-limesdr.sh
+++ b/docker/scripts/install-dependencies-limesdr.sh
@@ -12,7 +12,7 @@ apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 git clone https://github.com/myriadrf/LimeSuite.git
 cd LimeSuite
-git checkout 1c1c202f9a6ae4bb34068b6f3f576f7f8e74c7f1
+git checkout 0854a51ec06b30b01f19a562149c39461e92f24d
 mkdir builddir
 cd builddir
 cmake .. -DENABLE_EXAMPLES=OFF -DENABLE_DESKTOP=OFF -DENABLE_LIME_UTIL=OFF -DENABLE_QUICKTEST=OFF -DENABLE_OCTAVE=OFF -DENABLE_GUI=OFF -DCMAKE_CXX_STANDARD_LIBRARIES="-latomic"
diff --git a/docker/scripts/install-dependencies-plutosdr.sh b/docker/scripts/install-dependencies-plutosdr.sh
index 76ff3bf..50cd353 100755
--- a/docker/scripts/install-dependencies-plutosdr.sh
+++ b/docker/scripts/install-dependencies-plutosdr.sh
@@ -25,12 +25,12 @@ apk add --no-cache $STATIC_PACKAGES
 apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 git clone https://github.com/analogdevicesinc/libiio.git
-cmakebuild libiio 4e22517c60f3c5e691320871956edede15459ae3 -DCMAKE_INSTALL_PREFIX=/usr/local
+cmakebuild libiio 5f5af2e417129ad8f4e05fc5c1b730f0694dca12 -DCMAKE_INSTALL_PREFIX=/usr/local
 
 git clone https://github.com/analogdevicesinc/libad9361-iio.git
 cmakebuild libad9361-iio 8ac95f3325c18c2e34cd9cfd49c7b63d69a0a9d2
 
 git clone https://github.com/pothosware/SoapyPlutoSDR.git
-cmakebuild SoapyPlutoSDR e28e4f5c68c16a38c0b50b9606035f3267a135c8
+cmakebuild SoapyPlutoSDR c88b7f5bac1e5785f212f9a7c6ce8fef64eb719e
 
 apk del .build-deps
diff --git a/docker/scripts/install-dependencies-rtlsdr-soapy.sh b/docker/scripts/install-dependencies-rtlsdr-soapy.sh
index 31d2675..8a70417 100755
--- a/docker/scripts/install-dependencies-rtlsdr-soapy.sh
+++ b/docker/scripts/install-dependencies-rtlsdr-soapy.sh
@@ -25,9 +25,9 @@ apk add --no-cache $STATIC_PACKAGES
 apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 git clone https://github.com/osmocom/rtl-sdr.git
-cmakebuild rtl-sdr b5af355b1d833b3c898a61cf1e072b59b0ea3440
+cmakebuild rtl-sdr d794155ba65796a76cd0a436f9709f4601509320
 
 git clone https://github.com/pothosware/SoapyRTLSDR.git
-cmakebuild SoapyRTLSDR 5c5d9503337c6d1c34b496dec6f908aab9478b0f
+cmakebuild SoapyRTLSDR 8ba18f17d64005e43ff2a4e46611f8c710b05007
 
 apk del .build-deps
diff --git a/docker/scripts/install-dependencies-rtlsdr.sh b/docker/scripts/install-dependencies-rtlsdr.sh
index c612f91..9c7370b 100755
--- a/docker/scripts/install-dependencies-rtlsdr.sh
+++ b/docker/scripts/install-dependencies-rtlsdr.sh
@@ -25,6 +25,6 @@ apk add --no-cache $STATIC_PACKAGES
 apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 git clone https://github.com/osmocom/rtl-sdr.git
-cmakebuild rtl-sdr b5af355b1d833b3c898a61cf1e072b59b0ea3440
+cmakebuild rtl-sdr d794155ba65796a76cd0a436f9709f4601509320
 
 apk del .build-deps

From 3f742c7b1a6bb106487cec33e519d0e292dc4789 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 1 Apr 2020 21:39:53 +0200
Subject: [PATCH 177/475] webadmin feature flag

---
 owrx/controllers/admin.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/owrx/controllers/admin.py b/owrx/controllers/admin.py
index adae5b3..6aa2a4b 100644
--- a/owrx/controllers/admin.py
+++ b/owrx/controllers/admin.py
@@ -1,5 +1,6 @@
 from .template import WebpageController
 from .session import SessionStorage
+from owrx.config import Config
 
 
 class Authentication(object):
@@ -16,6 +17,10 @@ class AdminController(WebpageController):
         super().__init__(handler, request, options)
 
     def handle_request(self):
+        config = Config.get()
+        if not config["webadmin_enabled"]:
+            self.send_response("Web Admin is disabled", code=403)
+            return
         if self.authentication.isAuthenticated(self.request):
             super().handle_request()
         else:

From c2e85ce9a6b96eded0de850dba4cd6887ceb8c0e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 1 Apr 2020 21:40:33 +0200
Subject: [PATCH 178/475] web admin is disabled by default for now

---
 config_webrx.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config_webrx.py b/config_webrx.py
index 0508d7c..f9ad9bc 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -323,3 +323,6 @@ aprs_symbols_path = "/opt/aprs-symbols/png"
 # this also uses the receiver_gps setting from above, so make sure it contains a correct locator
 pskreporter_enabled = False
 pskreporter_callsign = "N0CALL"
+
+# === Web admin settings ===
+webadmin_enabled = False

From 6c3bb0b520a80e47677be6b5a262b209a50e36df Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 1 Apr 2020 22:29:42 +0200
Subject: [PATCH 179/475] add first user storage implementation

---
 owrx/controllers/session.py | 23 ++++++-----
 owrx/users.py               | 80 +++++++++++++++++++++++++++++++++++++
 users.json                  | 11 +++++
 3 files changed, 103 insertions(+), 11 deletions(-)
 create mode 100644 owrx/users.py
 create mode 100644 users.json

diff --git a/owrx/controllers/session.py b/owrx/controllers/session.py
index 7ebd1b1..3a9d342 100644
--- a/owrx/controllers/session.py
+++ b/owrx/controllers/session.py
@@ -2,6 +2,7 @@ from .template import WebpageController
 from urllib.parse import parse_qs
 from uuid import uuid4
 from http.cookies import SimpleCookie
+from owrx.users import UserList
 
 
 class SessionStorage(object):
@@ -40,18 +41,18 @@ class SessionController(WebpageController):
     def processLoginAction(self):
         data = parse_qs(self.get_body().decode("utf-8"))
         data = {k: v[0] for k, v in data.items()}
+        userlist = UserList.getSharedInstance()
         if "user" in data and "password" in data:
-            # TODO actually check user and password
-            if data["user"] == "admin" and data["password"] == "password":
-                # TODO pass the final destination
-                key = SessionStorage.getSharedInstance().startSession({"user": data["user"]})
-                cookie = SimpleCookie()
-                cookie["owrx-session"] = key
-                self.send_redirect("/admin", cookies=cookie)
-            else:
-                self.send_redirect("/login")
-        else:
-            self.send_response("invalid request", code=400)
+            if data["user"] in userlist:
+                user = userlist[data["user"]]
+                if user.password.is_valid(data["password"]):
+                    # TODO pass the final destination
+                    key = SessionStorage.getSharedInstance().startSession({"user": user.name})
+                    cookie = SimpleCookie()
+                    cookie["owrx-session"] = key
+                    self.send_redirect("/admin", cookies=cookie)
+                    return
+        self.send_redirect("/login")
 
     def logoutAction(self):
         self.send_redirect("logout happening here")
diff --git a/owrx/users.py b/owrx/users.py
new file mode 100644
index 0000000..43e0865
--- /dev/null
+++ b/owrx/users.py
@@ -0,0 +1,80 @@
+from abc import ABC, abstractmethod
+import json
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class PasswordException(Exception):
+    pass
+
+
+class Password(ABC):
+    @staticmethod
+    def from_dict(d: dict):
+        if "encoding" not in d:
+            raise PasswordException("password encoding not set")
+        if d["encoding"] == "string":
+            return CleartextPassword(d)
+        raise PasswordException("invalid passord encoding: {0}".format(d["type"]))
+
+    def __init__(self, pwinfo: dict):
+        self.pwinfo = pwinfo
+
+    @abstractmethod
+    def is_valid(self, inp: str):
+        pass
+
+
+class CleartextPassword(Password):
+    def is_valid(self, inp: str):
+        return self.pwinfo['value'] == inp
+
+
+class User(object):
+    def __init__(self, name: str, enabled: bool, password: Password):
+        self.name = name
+        self.enabled = enabled
+        self.password = password
+
+
+class UserList(object):
+    sharedInstance = None
+
+    @staticmethod
+    def getSharedInstance():
+        if UserList.sharedInstance is None:
+            UserList.sharedInstance = UserList()
+        return UserList.sharedInstance
+
+    def __init__(self):
+        self.users = self._loadUsers()
+
+    def _loadUsers(self):
+        for file in ["/etc/openwebrx/users.json", "users.json"]:
+            try:
+                f = open(file, "r")
+                users_json = json.load(f)
+                f.close()
+
+                return {u.name: u for u in [self.buildUser(d) for d in users_json]}
+            except FileNotFoundError:
+                pass
+            except json.JSONDecodeError:
+                logger.exception("error while parsing users file %s", file)
+                return {}
+            except Exception:
+                logger.exception("error while processing users from %s", file)
+                return {}
+        return {}
+
+    def buildUser(self, d):
+        if "user" in d and "password" in d and "enabled" in d:
+            return User(d["user"], d["enabled"], Password.from_dict(d["password"]))
+
+    def __getitem__(self, item):
+        return self.users[item]
+
+    def __contains__(self, item):
+        return item in self.users
diff --git a/users.json b/users.json
new file mode 100644
index 0000000..298d7f2
--- /dev/null
+++ b/users.json
@@ -0,0 +1,11 @@
+[
+  {
+    "user": "admin",
+    "password": {
+      "encoding": "string",
+      "value": "password",
+      "force_change": true
+    },
+    "enabled": true
+  }
+]
\ No newline at end of file

From 513b477face13d26ee9722a20e23fe46a8758402 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 1 Apr 2020 22:31:14 +0200
Subject: [PATCH 180/475] add user.json provisioning

---
 debian/openwebrx.install | 1 +
 docker/scripts/run.sh    | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/debian/openwebrx.install b/debian/openwebrx.install
index caa2fff..84b1f9c 100644
--- a/debian/openwebrx.install
+++ b/debian/openwebrx.install
@@ -1,4 +1,5 @@
 config_webrx.py etc/openwebrx/
 bands.json etc/openwebrx/
 bookmarks.json etc/openwebrx/
+users.json etc/openwebrx/
 systemd/openwebrx.service lib/systemd/system/
\ No newline at end of file
diff --git a/docker/scripts/run.sh b/docker/scripts/run.sh
index 5ae7d82..0f8bd32 100755
--- a/docker/scripts/run.sh
+++ b/docker/scripts/run.sh
@@ -12,6 +12,9 @@ fi
 if [[ ! -f /etc/openwebrx/bookmarks.json ]] ; then
   cp bookmarks.json /etc/openwebrx/
 fi
+if [[ ! -f /etc/openwebrx/users.json ]] ; then
+  cp users.json /etc/openwebrx/
+fi
 
 
 _term() {

From 78704885d7d3800da579fef66893d19f7e4503b4 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 1 Apr 2020 22:39:32 +0200
Subject: [PATCH 181/475] drop another todo

---
 owrx/controllers/session.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/owrx/controllers/session.py b/owrx/controllers/session.py
index 3a9d342..dd6d0f9 100644
--- a/owrx/controllers/session.py
+++ b/owrx/controllers/session.py
@@ -47,6 +47,7 @@ class SessionController(WebpageController):
                 user = userlist[data["user"]]
                 if user.password.is_valid(data["password"]):
                     # TODO pass the final destination
+                    # TODO evaluate password force_change and redirect to password change
                     key = SessionStorage.getSharedInstance().startSession({"user": user.name})
                     cookie = SimpleCookie()
                     cookie["owrx-session"] = key

From 70ba0cd618f17c784ecfd91743aff8450464bb4c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 1 Apr 2020 23:37:40 +0200
Subject: [PATCH 182/475] add direct_sampling mapping for rtl_sdr

---
 CHANGELOG.md           |  1 +
 debian/changelog       |  1 +
 owrx/source/rtl_sdr.py | 13 +++++++------
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 802c4a5..e5ae9f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 - FiFi SDR: prevent arecord from shutting down after 2GB of data has been sent
 - Added support for bias tee control on rtl_sdr devices
 - All connector driven SDRs now support `"rf_gain": "auto"` to enable AGC
+- `rtl_sdr` type now also supports the `direct_sampling` option
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index af78450..ded59bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
     sent
   * Added support for bias tee control on rtl_sdr devices
   * All connector driven SDRs now support `"rf_gain": "auto"` to enable AGC
+  * `rtl_sdr` type now also supports the `direct_sampling` option
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 
diff --git a/owrx/source/rtl_sdr.py b/owrx/source/rtl_sdr.py
index bc7c523..ab7b40c 100644
--- a/owrx/source/rtl_sdr.py
+++ b/owrx/source/rtl_sdr.py
@@ -1,14 +1,15 @@
 from .connector import ConnectorSource
-from owrx.command import Flag
+from owrx.command import Flag, Option
 
 
 class RtlSdrSource(ConnectorSource):
     def getCommandMapper(self):
-        return super().getCommandMapper().setBase("rtl_connector").setMappings(
-            {
-                "bias_tee": Flag("-b")
-            }
+        return (
+            super()
+            .getCommandMapper()
+            .setBase("rtl_connector")
+            .setMappings({"bias_tee": Flag("-b"), "direct_sampling": Option("-e")})
         )
 
     def getEventNames(self):
-        return super().getEventNames() + ["bias_tee"]
+        return super().getEventNames() + ["bias_tee", "direct_sampling"]

From d9e15357f3687032a375c8aba15ff4992180b2b8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 1 Apr 2020 23:50:00 +0200
Subject: [PATCH 183/475] update connector for docker

---
 docker/scripts/install-connectors.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh
index dd604c1..cc2572d 100755
--- a/docker/scripts/install-connectors.sh
+++ b/docker/scripts/install-connectors.sh
@@ -24,6 +24,6 @@ apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 
 git clone https://github.com/jketterl/owrx_connector.git
-cmakebuild owrx_connector 047ed89f30ea19ad6ba3123accf7891ddc859e0d
+cmakebuild owrx_connector 9d72cf1382ed90735632a6d0ef6f820a4758f733
 
 apk del .build-deps

From 112eda2021b88943f96f0e6a3c35e9fa6797e028 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 2 Apr 2020 00:10:28 +0200
Subject: [PATCH 184/475] use the command mapper to generate event keys

---
 owrx/source/__init__.py   | 5 +++--
 owrx/source/connector.py  | 7 -------
 owrx/source/hackrf.py     | 6 ------
 owrx/source/perseussdr.py | 8 --------
 owrx/source/rtl_sdr.py    | 3 ---
 owrx/source/soapy.py      | 4 +---
 6 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index ba70737..407f0bc 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -34,6 +34,8 @@ class SdrSource(ABC):
     def __init__(self, id, props):
         self.id = id
 
+        self.commandMapper = None
+
         self.props = PropertyStack()
         # layer 0 reserved for profile properties
         self.props.addLayer(1, props)
@@ -43,7 +45,6 @@ class SdrSource(ABC):
         self.profile_id = None
         self.activateProfile()
         self.wireEvents()
-        self.commandMapper = None
 
         if "port" in props and props["port"] is not None:
             self.port = props["port"]
@@ -72,7 +73,7 @@ class SdrSource(ABC):
             "ppm",
             "rf_gain",
             "lfo_offset",
-        ]
+        ] + list(self.getCommandMapper().keys())
 
     def getCommandMapper(self):
         if self.commandMapper is None:
diff --git a/owrx/source/connector.py b/owrx/source/connector.py
index d365b4b..f28da98 100644
--- a/owrx/source/connector.py
+++ b/owrx/source/connector.py
@@ -29,13 +29,6 @@ class ConnectorSource(SdrSource):
             }
         )
 
-    def getEventNames(self):
-        return super().getEventNames() + [
-            "device",
-            "iqswap",
-            "rtltcp_compat",
-        ]
-
     def sendControlMessage(self, prop, value):
         logger.debug("sending property change over control socket: {0} changed to {1}".format(prop, value))
         self.controlSocket.sendall("{prop}:{value}\n".format(prop=prop, value=value).encode())
diff --git a/owrx/source/hackrf.py b/owrx/source/hackrf.py
index 50001ae..2e6b9b6 100644
--- a/owrx/source/hackrf.py
+++ b/owrx/source/hackrf.py
@@ -14,11 +14,5 @@ class HackrfSource(DirectSource):
             }
         ).setStatic("-r-")
 
-    def getEventNames(self):
-        return super().getEventNames() + [
-            "lna_gain",
-            "rf_amp",
-        ]
-
     def getFormatConversion(self):
         return ["csdr convert_s8_f"]
diff --git a/owrx/source/perseussdr.py b/owrx/source/perseussdr.py
index 890600b..bad4f38 100644
--- a/owrx/source/perseussdr.py
+++ b/owrx/source/perseussdr.py
@@ -29,11 +29,3 @@ class PerseussdrSource(DirectSource):
                 "wideband": Option("-w"),
             }
         )
-
-    def getEventNames(self):
-        return super().getEventNames() + [
-            "attenuator",
-            "adc_preamp",
-            "adc_dither",
-            "wideband",
-        ]
diff --git a/owrx/source/rtl_sdr.py b/owrx/source/rtl_sdr.py
index ab7b40c..a6ecbc9 100644
--- a/owrx/source/rtl_sdr.py
+++ b/owrx/source/rtl_sdr.py
@@ -10,6 +10,3 @@ class RtlSdrSource(ConnectorSource):
             .setBase("rtl_connector")
             .setMappings({"bias_tee": Flag("-b"), "direct_sampling": Option("-e")})
         )
-
-    def getEventNames(self):
-        return super().getEventNames() + ["bias_tee", "direct_sampling"]
diff --git a/owrx/source/soapy.py b/owrx/source/soapy.py
index d4702c2..e713ba0 100644
--- a/owrx/source/soapy.py
+++ b/owrx/source/soapy.py
@@ -22,9 +22,7 @@ class SoapyConnectorSource(ConnectorSource, metaclass=ABCMeta):
         pass
 
     def getEventNames(self):
-        return super().getEventNames() + [
-            "antenna",
-        ] + list(self.getSoapySettingsMappings().keys())
+        return super().getEventNames() + list(self.getSoapySettingsMappings().keys())
 
     def parseDeviceString(self, dstr):
         def decodeComponent(c):

From 2301141b44949f8f2d1ae94f1d634ee181e1c54b Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 2 Apr 2020 18:21:45 +0200
Subject: [PATCH 185/475] add missing keys() method

---
 owrx/command.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/owrx/command.py b/owrx/command.py
index 9cf0327..871e414 100644
--- a/owrx/command.py
+++ b/owrx/command.py
@@ -33,6 +33,9 @@ class CommandMapper(object):
         self.static = static
         return self
 
+    def keys(self):
+        return self.mappings.keys()
+
 
 class CommandMapping(ABC):
     @abstractmethod

From 366def0235e4bda4c0d630760adcc40adce4debe Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 5 Apr 2020 15:22:23 +0200
Subject: [PATCH 186/475] use abc

---
 owrx/wsjt.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/owrx/wsjt.py b/owrx/wsjt.py
index 08bb911..4a30864 100644
--- a/owrx/wsjt.py
+++ b/owrx/wsjt.py
@@ -11,6 +11,7 @@ from owrx.config import Config
 from owrx.metrics import Metrics, CounterMetric, DirectMetric
 from owrx.pskreporter import PskReporter
 from owrx.parser import Parser
+from abc import ABCMeta, abstractmethod
 
 import logging
 
@@ -85,7 +86,7 @@ class WsjtQueue(Queue):
         self.errorCounter.inc()
 
 
-class WsjtChopper(threading.Thread):
+class WsjtChopper(threading.Thread, metaclass=ABCMeta):
     def __init__(self, source):
         self.source = source
         self.tmp_dir = Config.get()["temporary_directory"]
@@ -140,11 +141,9 @@ class WsjtChopper(threading.Thread):
             os.unlink(filename)
         self._scheduleNextSwitch()
 
+    @abstractmethod
     def decoder_commandline(self, file):
-        """
-        must be overridden in child classes
-        """
-        return []
+        pass
 
     def decode(self, file):
         decoder = subprocess.Popen(

From d06e9151b9c559d9c847446f5115b719ff7f04bc Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 5 Apr 2020 16:35:46 +0200
Subject: [PATCH 187/475] pass the frequency along with the job, refs #22 #61

---
 csdr/csdr.py             | 23 ++++++++++++-----
 owrx/dsp.py              |  1 +
 owrx/service/__init__.py |  4 ++-
 owrx/wsjt.py             | 55 +++++++++++++++++++++++++---------------
 4 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index f0d2498..651944e 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -162,6 +162,7 @@ class dsp(object):
         self.output_rate = 11025
         self.fft_size = 1024
         self.fft_fps = 5
+        self.center_freq = 0
         self.offset_freq = 0
         self.low_cut = -4000
         self.high_cut = 4000
@@ -448,18 +449,19 @@ class dsp(object):
 
         if self.isWsjtMode():
             smd = self.get_secondary_demodulator()
-            chopper = None
+            chopper_cls = None
             if smd == "ft8":
-                chopper = Ft8Chopper(self.secondary_process_demod.stdout)
+                chopper_cls = Ft8Chopper
             elif smd == "wspr":
-                chopper = WsprChopper(self.secondary_process_demod.stdout)
+                chopper_cls = WsprChopper
             elif smd == "jt65":
-                chopper = Jt65Chopper(self.secondary_process_demod.stdout)
+                chopper_cls = Jt65Chopper
             elif smd == "jt9":
-                chopper = Jt9Chopper(self.secondary_process_demod.stdout)
+                chopper_cls = Jt9Chopper
             elif smd == "ft4":
-                chopper = Ft4Chopper(self.secondary_process_demod.stdout)
-            if chopper is not None:
+                chopper_cls = Ft4Chopper
+            if chopper_cls is not None:
+                chopper = chopper_cls(self, self.secondary_process_demod.stdout)
                 chopper.start()
                 self.output.send_output("wsjt_demod", chopper.read)
         elif self.isPacket():
@@ -627,6 +629,13 @@ class dsp(object):
             with self.modification_lock:
                 self.pipes["shift_pipe"].write("%g\n" % (-float(self.offset_freq) / self.samp_rate))
 
+    def set_center_freq(self, center_freq):
+        # dsp only needs to know this to be able to pass it to decoders in the form of get_operating_freq()
+        self.center_freq = center_freq
+
+    def get_operating_freq(self):
+        return self.center_freq + self.offset_freq
+
     def set_bpf(self, low_cut, high_cut):
         self.low_cut = low_cut
         self.high_cut = high_cut
diff --git a/owrx/dsp.py b/owrx/dsp.py
index f0f1fd5..32b9116 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -77,6 +77,7 @@ class DspManager(csdr.output):
             self.props.wireProperty("samp_rate", self.dsp.set_samp_rate),
             self.props.wireProperty("output_rate", self.dsp.set_output_rate),
             self.props.wireProperty("offset_freq", self.dsp.set_offset_freq),
+            self.props.wireProperty("center_freq", self.dsp.set_center_freq),
             self.props.wireProperty("squelch_level", self.dsp.set_squelch_level),
             self.props.wireProperty("low_cut", set_low_cut),
             self.props.wireProperty("high_cut", set_high_cut),
diff --git a/owrx/service/__init__.py b/owrx/service/__init__.py
index b1686dc..5498e5e 100644
--- a/owrx/service/__init__.py
+++ b/owrx/service/__init__.py
@@ -262,7 +262,9 @@ class ServiceHandler(object):
             output = WsjtServiceOutput(frequency)
         d = dsp(output)
         d.nc_port = source.getPort()
-        d.set_offset_freq(frequency - source.getProps()["center_freq"])
+        center_freq = source.getProps()["center_freq"]
+        d.set_offset_freq(frequency - center_freq)
+        d.set_center_freq(center_freq)
         if mode == "packet":
             d.set_demodulator("nfm")
             d.set_bpf(-4000, 4000)
diff --git a/owrx/wsjt.py b/owrx/wsjt.py
index 4a30864..651c825 100644
--- a/owrx/wsjt.py
+++ b/owrx/wsjt.py
@@ -19,6 +19,16 @@ logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
 
+class QueueJob(object):
+    def __init__(self, decoder, file, freq):
+        self.decoder = decoder
+        self.file = file
+        self.freq = freq
+
+    def run(self):
+        self.decoder.decode(self)
+
+
 class WsjtQueueWorker(threading.Thread):
     def __init__(self, queue):
         self.queue = queue
@@ -27,10 +37,9 @@ class WsjtQueueWorker(threading.Thread):
 
     def run(self) -> None:
         while self.doRun:
-            (processor, file) = self.queue.get()
+            job = self.queue.get()
             try:
-                logger.debug("processing file %s", file)
-                processor.decode(file)
+                job.run()
             except Exception:
                 logger.exception("failed to decode job")
                 self.queue.onError()
@@ -87,7 +96,8 @@ class WsjtQueue(Queue):
 
 
 class WsjtChopper(threading.Thread, metaclass=ABCMeta):
-    def __init__(self, source):
+    def __init__(self, dsp, source):
+        self.dsp = dsp
         self.source = source
         self.tmp_dir = Config.get()["temporary_directory"]
         (self.wavefilename, self.wavefile) = self.getWaveFile()
@@ -135,7 +145,7 @@ class WsjtChopper(threading.Thread, metaclass=ABCMeta):
 
         file.close()
         try:
-            WsjtQueue.getSharedInstance().put((self, filename))
+            WsjtQueue.getSharedInstance().put(QueueJob(self, filename, self.dsp.get_operating_freq()))
         except Full:
             logger.warning("wsjt decoding queue overflow; dropping one file")
             os.unlink(filename)
@@ -145,15 +155,16 @@ class WsjtChopper(threading.Thread, metaclass=ABCMeta):
     def decoder_commandline(self, file):
         pass
 
-    def decode(self, file):
+    def decode(self, job: QueueJob):
+        logger.debug("processing file %s", job.file)
         decoder = subprocess.Popen(
-            ["nice", "-n", "10"] + self.decoder_commandline(file),
+            ["nice", "-n", "10"] + self.decoder_commandline(job.file),
             stdout=subprocess.PIPE,
             cwd=self.tmp_dir,
             close_fds=True,
         )
         for line in decoder.stdout:
-            self.outputWriter.send(line)
+            self.outputWriter.send((job.freq, line))
         try:
             rc = decoder.wait(timeout=10)
             if rc != 0:
@@ -161,7 +172,7 @@ class WsjtChopper(threading.Thread, metaclass=ABCMeta):
         except subprocess.TimeoutExpired:
             logger.warning("subprocess (pid=%i}) did not terminate correctly; sending kill signal.", decoder.pid)
             decoder.kill()
-        os.unlink(file)
+        os.unlink(job.file)
 
     def run(self) -> None:
         logger.debug("WSJT chopper starting up")
@@ -203,20 +214,20 @@ class WsjtChopper(threading.Thread, metaclass=ABCMeta):
 
 
 class Ft8Chopper(WsjtChopper):
-    def __init__(self, source):
+    def __init__(self, dsp, source):
         self.interval = 15
         self.fileTimestampFormat = "%y%m%d_%H%M%S"
-        super().__init__(source)
+        super().__init__(dsp, source)
 
     def decoder_commandline(self, file):
         return ["jt9", "--ft8", "-d", str(self.decoding_depth("ft8")), file]
 
 
 class WsprChopper(WsjtChopper):
-    def __init__(self, source):
+    def __init__(self, dsp, source):
         self.interval = 120
         self.fileTimestampFormat = "%y%m%d_%H%M"
-        super().__init__(source)
+        super().__init__(dsp, source)
 
     def decoder_commandline(self, file):
         cmd = ["wsprd"]
@@ -227,30 +238,30 @@ class WsprChopper(WsjtChopper):
 
 
 class Jt65Chopper(WsjtChopper):
-    def __init__(self, source):
+    def __init__(self, dsp, source):
         self.interval = 60
         self.fileTimestampFormat = "%y%m%d_%H%M"
-        super().__init__(source)
+        super().__init__(dsp, source)
 
     def decoder_commandline(self, file):
         return ["jt9", "--jt65", "-d", str(self.decoding_depth("jt65")), file]
 
 
 class Jt9Chopper(WsjtChopper):
-    def __init__(self, source):
+    def __init__(self, dsp, source):
         self.interval = 60
         self.fileTimestampFormat = "%y%m%d_%H%M"
-        super().__init__(source)
+        super().__init__(dsp, source)
 
     def decoder_commandline(self, file):
         return ["jt9", "--jt9", "-d", str(self.decoding_depth("jt9")), file]
 
 
 class Ft4Chopper(WsjtChopper):
-    def __init__(self, source):
+    def __init__(self, dsp, source):
         self.interval = 7.5
         self.fileTimestampFormat = "%y%m%d_%H%M%S"
-        super().__init__(source)
+        super().__init__(dsp, source)
 
     def decoder_commandline(self, file):
         return ["jt9", "--ft4", "-d", str(self.decoding_depth("ft4")), file]
@@ -261,7 +272,9 @@ class WsjtParser(Parser):
 
     def parse(self, data):
         try:
-            msg = data.decode().rstrip()
+            freq, raw_msg = data
+            self.setDialFrequency(freq)
+            msg = raw_msg.decode().rstrip()
             # known debug messages we know to skip
             if msg.startswith("<DecodeFinished>"):
                 return
@@ -273,7 +286,7 @@ class WsjtParser(Parser):
                 decoder = Jt9Decoder()
             else:
                 decoder = WsprDecoder()
-            out = decoder.parse(msg, self.dial_freq)
+            out = decoder.parse(msg, freq)
             if "mode" in out:
                 self.pushDecode(out["mode"])
                 if "callsign" in out and "locator" in out:

From 4d67b684e477a59a22f255678c23705e499bff54 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 5 Apr 2020 19:08:58 +0200
Subject: [PATCH 188/475] refactor

---
 owrx/wsjt.py | 58 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 22 deletions(-)

diff --git a/owrx/wsjt.py b/owrx/wsjt.py
index 651c825..8ea00bc 100644
--- a/owrx/wsjt.py
+++ b/owrx/wsjt.py
@@ -107,9 +107,17 @@ class WsjtChopper(threading.Thread, metaclass=ABCMeta):
         self.doRun = True
         super().__init__()
 
+    @abstractmethod
+    def getInterval(self):
+        pass
+
+    @abstractmethod
+    def getFileTimestampFormat(self):
+        pass
+
     def getWaveFile(self):
         filename = "{tmp_dir}/openwebrx-wsjtchopper-{id}-{timestamp}.wav".format(
-            tmp_dir=self.tmp_dir, id=id(self), timestamp=datetime.utcnow().strftime(self.fileTimestampFormat)
+            tmp_dir=self.tmp_dir, id=id(self), timestamp=datetime.utcnow().strftime(self.getFileTimestampFormat())
         )
         wavefile = wave.open(filename, "wb")
         wavefile.setnchannels(1)
@@ -121,7 +129,8 @@ class WsjtChopper(threading.Thread, metaclass=ABCMeta):
         t = datetime.utcnow()
         zeroed = t.replace(minute=0, second=0, microsecond=0)
         delta = t - zeroed
-        seconds = (int(delta.total_seconds() / self.interval) + 1) * self.interval
+        interval = self.getInterval()
+        seconds = (int(delta.total_seconds() / interval) + 1) * interval
         t = zeroed + timedelta(seconds=seconds)
         logger.debug("scheduling: {0}".format(t))
         return t
@@ -214,20 +223,22 @@ class WsjtChopper(threading.Thread, metaclass=ABCMeta):
 
 
 class Ft8Chopper(WsjtChopper):
-    def __init__(self, dsp, source):
-        self.interval = 15
-        self.fileTimestampFormat = "%y%m%d_%H%M%S"
-        super().__init__(dsp, source)
+    def getInterval(self):
+        return 15
+
+    def getFileTimestampFormat(self):
+        return "%y%m%d_%H%M%S"
 
     def decoder_commandline(self, file):
         return ["jt9", "--ft8", "-d", str(self.decoding_depth("ft8")), file]
 
 
 class WsprChopper(WsjtChopper):
-    def __init__(self, dsp, source):
-        self.interval = 120
-        self.fileTimestampFormat = "%y%m%d_%H%M"
-        super().__init__(dsp, source)
+    def getInterval(self):
+        return 120
+
+    def getFileTimestampFormat(self):
+        return "%y%m%d_%H%M"
 
     def decoder_commandline(self, file):
         cmd = ["wsprd"]
@@ -238,30 +249,33 @@ class WsprChopper(WsjtChopper):
 
 
 class Jt65Chopper(WsjtChopper):
-    def __init__(self, dsp, source):
-        self.interval = 60
-        self.fileTimestampFormat = "%y%m%d_%H%M"
-        super().__init__(dsp, source)
+    def getInterval(self):
+        return 60
+
+    def getFileTimestampFormat(self):
+        return "%y%m%d_%H%M"
 
     def decoder_commandline(self, file):
         return ["jt9", "--jt65", "-d", str(self.decoding_depth("jt65")), file]
 
 
 class Jt9Chopper(WsjtChopper):
-    def __init__(self, dsp, source):
-        self.interval = 60
-        self.fileTimestampFormat = "%y%m%d_%H%M"
-        super().__init__(dsp, source)
+    def getInterval(self):
+        return 60
+
+    def getFileTimestampFormat(self):
+        return "%y%m%d_%H%M"
 
     def decoder_commandline(self, file):
         return ["jt9", "--jt9", "-d", str(self.decoding_depth("jt9")), file]
 
 
 class Ft4Chopper(WsjtChopper):
-    def __init__(self, dsp, source):
-        self.interval = 7.5
-        self.fileTimestampFormat = "%y%m%d_%H%M%S"
-        super().__init__(dsp, source)
+    def getInterval(self):
+        return 7.5
+
+    def getFileTimestampFormat(self):
+        return "%y%m%d_%H%M%S"
 
     def decoder_commandline(self, file):
         return ["jt9", "--ft4", "-d", str(self.decoding_depth("ft4")), file]

From 8fdf263e4b3c7a1b08d3eb8859cfefd9a09987ea Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 5 Apr 2020 21:47:40 +0200
Subject: [PATCH 189/475] explicitly cast frequency

---
 owrx/pskreporter.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/pskreporter.py b/owrx/pskreporter.py
index 22a813f..357e6d8 100644
--- a/owrx/pskreporter.py
+++ b/owrx/pskreporter.py
@@ -154,7 +154,7 @@ class Uploader(object):
     def encodeSpot(self, spot):
         return bytes(
             self.encodeString(spot["callsign"])
-            + list(spot["freq"].to_bytes(4, "big"))
+            + list(int(spot["freq"]).to_bytes(4, "big"))
             + list(int(spot["db"]).to_bytes(1, "big", signed=True))
             + self.encodeString(spot["mode"])
             + self.encodeString(spot["locator"])

From d07cbb2b1054ad128fb16b67d18c9f243d6a8c0b Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 5 Apr 2020 21:48:05 +0200
Subject: [PATCH 190/475] more abc

---
 owrx/wsjt.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/owrx/wsjt.py b/owrx/wsjt.py
index 8ea00bc..982e475 100644
--- a/owrx/wsjt.py
+++ b/owrx/wsjt.py
@@ -11,7 +11,7 @@ from owrx.config import Config
 from owrx.metrics import Metrics, CounterMetric, DirectMetric
 from owrx.pskreporter import PskReporter
 from owrx.parser import Parser
-from abc import ABCMeta, abstractmethod
+from abc import ABC, ABCMeta, abstractmethod
 
 import logging
 
@@ -333,13 +333,17 @@ class WsjtParser(Parser):
         metric.inc()
 
 
-class Decoder(object):
+class Decoder(ABC):
     def parse_timestamp(self, instring, dateformat):
         ts = datetime.strptime(instring, dateformat)
         return int(
             datetime.combine(datetime.utcnow().date(), ts.time()).replace(tzinfo=timezone.utc).timestamp() * 1000
         )
 
+    @abstractmethod
+    def parse(self, msg, dial_freq):
+        pass
+
 
 class Jt9Decoder(Decoder):
     locator_pattern = re.compile("[A-Z0-9]+\\s([A-Z0-9]+)\\s([A-R]{2}[0-9]{2})$")

From c30740c4e307165dca1d46a7ce2096d1e5c98f03 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 10 Apr 2020 16:33:04 +0200
Subject: [PATCH 191/475] add uhd and redpitaya device modules; switch driver
 detection to factories

---
 owrx/feature.py           | 38 +++++++++++++++++++++++++++++---------
 owrx/source/red_pitaya.py |  6 ++++++
 owrx/source/uhd.py        |  6 ++++++
 3 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 owrx/source/red_pitaya.py
 create mode 100644 owrx/source/uhd.py

diff --git a/owrx/feature.py b/owrx/feature.py
index 09aa0c4..47ac631 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -32,6 +32,8 @@ class FeatureDetector(object):
         "fifi_sdr": ["alsa"],
         "pluto_sdr": ["soapy_connector", "soapy_pluto_sdr"],
         "soapy_remote": ["soapy_connector", "soapy_remote"],
+        "uhd": ["soapy_connector", "soapy_uhd"],
+        "red_pitaya": ["soapy_connector", "soapy_red_pitaya"],
         # optional features and their requirements
         "digital_voice_digiham": ["digiham", "sox"],
         "digital_voice_dsd": ["dsd", "sox", "digiham"],
@@ -244,14 +246,16 @@ class FeatureDetector(object):
     def _has_soapy_driver(self, driver):
         try:
             process = subprocess.Popen(["SoapySDRUtil", "--info"], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
-            driverRegex = re.compile("^Module found: .*lib(.*)Support.so")
+            factory_regex = re.compile("^Available factories\\.\\.\\. (.*)$")
 
-            def matchLine(line):
-                matches = driverRegex.match(line.decode())
-                return matches is not None and matches.group(1) == driver
+            drivers = []
+            for line in process.stdout:
+                matches = factory_regex.match(line.decode())
+                if matches:
+                    drivers = [s.strip() for s in matches[1].split(", ")]
+            logger.debug(drivers)
 
-            lines = [matchLine(line) for line in process.stdout]
-            return reduce(or_, lines, False)
+            return driver in drivers
         except FileNotFoundError:
             return False
 
@@ -270,7 +274,7 @@ class FeatureDetector(object):
 
         You can get it [here](https://github.com/pothosware/SoapySDRPlay/wiki).
         """
-        return self._has_soapy_driver("sdrPlay")
+        return self._has_soapy_driver("sdrplay")
 
     def has_soapy_airspy(self):
         """
@@ -295,7 +299,7 @@ class FeatureDetector(object):
 
         You can get it [here](https://github.com/myriadrf/LimeSuite).
         """
-        return self._has_soapy_driver("LMS7")
+        return self._has_soapy_driver("lime")
 
     def has_soapy_pluto_sdr(self):
         """
@@ -303,7 +307,7 @@ class FeatureDetector(object):
 
         You can get it [here](https://github.com/photosware/SoapyPlutoSDR).
         """
-        return self._has_soapy_driver("PlutoSDR")
+        return self._has_soapy_driver("plutosdr")
 
     def has_soapy_remote(self):
         """
@@ -313,6 +317,22 @@ class FeatureDetector(object):
         """
         return self._has_soapy_driver("remote")
 
+    def has_soapy_uhd(self):
+        """
+        The SoapyUHD module allows using UHD / USRP devices with SoapySDR.
+
+        You can get it [here](https://github.com/pothosware/SoapyUHD/wiki).
+        """
+        return self._has_soapy_driver("uhd")
+
+    def has_soapy_red_pitaya(self):
+        """
+        The SoapyRedPitaya allows Red Pitaya deviced to be used with SoapySDR.
+
+        You can get it [here](https://github.com/pothosware/SoapyRedPitaya/wiki).
+        """
+        return self._has_soapy_driver("redpitaya")
+
     def has_dsd(self):
         """
         The digital voice modes NXDN and D-Star can be decoded by the dsd project. Please note that you need the version
diff --git a/owrx/source/red_pitaya.py b/owrx/source/red_pitaya.py
new file mode 100644
index 0000000..06431f0
--- /dev/null
+++ b/owrx/source/red_pitaya.py
@@ -0,0 +1,6 @@
+from .soapy import SoapyConnectorSource
+
+
+class RedPitayaSource(SoapyConnectorSource):
+    def getDriver(self):
+        return "redpitaya"
diff --git a/owrx/source/uhd.py b/owrx/source/uhd.py
new file mode 100644
index 0000000..29e2909
--- /dev/null
+++ b/owrx/source/uhd.py
@@ -0,0 +1,6 @@
+from .soapy import SoapyConnectorSource
+
+
+class UhdSource(SoapyConnectorSource):
+    def getDriver(self):
+        return "uhd"

From aa2983603994d387a8f030d5513ba477c887872f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 10 Apr 2020 17:21:53 +0200
Subject: [PATCH 192/475] remove debugging output

---
 owrx/feature.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/owrx/feature.py b/owrx/feature.py
index 47ac631..12b14aa 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -253,7 +253,6 @@ class FeatureDetector(object):
                 matches = factory_regex.match(line.decode())
                 if matches:
                     drivers = [s.strip() for s in matches[1].split(", ")]
-            logger.debug(drivers)
 
             return driver in drivers
         except FileNotFoundError:

From f7c9fbcc221759f509d0ff9c57b89757167cc34e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 10 Apr 2020 17:25:32 +0200
Subject: [PATCH 193/475] factory name has been changed in v3

---
 owrx/feature.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/feature.py b/owrx/feature.py
index 12b14aa..0b96159 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -273,7 +273,7 @@ class FeatureDetector(object):
 
         You can get it [here](https://github.com/pothosware/SoapySDRPlay/wiki).
         """
-        return self._has_soapy_driver("sdrplay")
+        return self._has_soapy_driver("sdrplay") or self._has_soapy_driver("sdrPlay")
 
     def has_soapy_airspy(self):
         """

From 893a56aa836456094e15d9c975769e736df0b5e0 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 10 Apr 2020 18:03:19 +0200
Subject: [PATCH 194/475] update install script patch

---
 .../scripts/install-dependencies-sdrplay.sh   | 10 +++---
 docker/scripts/install-lib.x86_64.patch       | 36 +++++--------------
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/docker/scripts/install-dependencies-sdrplay.sh b/docker/scripts/install-dependencies-sdrplay.sh
index d127602..bf0a5d4 100755
--- a/docker/scripts/install-dependencies-sdrplay.sh
+++ b/docker/scripts/install-dependencies-sdrplay.sh
@@ -28,13 +28,13 @@ ARCH=$(uname -m)
 
 case $ARCH in
   x86_64)
-    BINARY=SDRplay_RSP_API-Linux-2.13.1.run
+    BINARY=SDRplay_RSP_API-Linux-3.06.1.run
     ;;
   armv*)
-    BINARY=SDRplay_RSP_API-RPi-2.13.1.run
+    BINARY=SDRplay_RSP_API-ARM32-3.06.1.run
     ;;
   aarch64)
-    BINARY=SDRplay_RSP_API-ARM64-2.13.1.run
+    BINARY=SDRplay_RSP_API-ARM64-3.06.1.run
     ;;
 esac
 
@@ -48,7 +48,7 @@ cd ..
 rm -rf sdrplay
 rm $BINARY
 
-git clone https://github.com/pothosware/SoapySDRPlay.git
-cmakebuild SoapySDRPlay 14ec39e4ff0dab7ae7fdf1afbbd2d28b49b0ffae
+git clone https://github.com/fventuri/SoapySDRPlay.git
+cmakebuild SoapySDRPlay 9746de21d5a3778c444cc5e70da2a61c27cb614a
 
 apk del .build-deps
diff --git a/docker/scripts/install-lib.x86_64.patch b/docker/scripts/install-lib.x86_64.patch
index 588f14e..0666bf4 100644
--- a/docker/scripts/install-lib.x86_64.patch
+++ b/docker/scripts/install-lib.x86_64.patch
@@ -1,9 +1,11 @@
---- sdrplay/install_lib.sh	2018-06-21 01:57:02.000000000 +0200
-+++ sdrplay/install_lib_patched.sh	2019-01-22 17:21:06.445804136 +0100
-@@ -2,19 +2,7 @@
- 
- echo "Installing SDRplay RSP API library 2.13..."
+--- sdrplay/install_lib.sh
++++ sdrplay/install_lib_patched.sh
+@@ -4,19 +4,6 @@
+ MAJVERS="3"
  
+ echo "Installing SDRplay RSP API library ${VERS}..."
+-read -p "Press RETURN to view the license agreement" ret
+-
 -more sdrplay_license.txt
 -
 -while true; do
@@ -15,26 +17,6 @@
 -        * ) echo "Please answer y or n";;
 -    esac
 -done
--
--export ARCH=`arch`
-+export ARCH=`uname -m`
- export VERS="2.13"
- 
- echo "Architecture: ${ARCH}"
-@@ -60,16 +48,6 @@
- 	echo " "
- 	exit 1
- fi
--
--if /sbin/ldconfig -p | /bin/fgrep -q libusb-1.0; then
--	echo "Libusb found, continuing..."
--else
--	echo " "
--	echo "ERROR: Libusb cannot be found. Please install libusb and then run"
--	echo "the installer again. Libusb can be installed from http://libusb.info"
--	echo " "
--	exit 1
--fi
- 
- #echo "Installing SoapySDRPlay..."
  
+ ARCH=`uname -m`
+ OSDIST="Unknown"

From 3c0146b1c43df198682fdefa8f71ba93769d3abf Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 10 Apr 2020 18:37:09 +0200
Subject: [PATCH 195/475] add patches for armv7l and aarch64

---
 docker/scripts/install-lib.aarch64.patch | 43 ++++++++++++------------
 docker/scripts/install-lib.armv7l.patch  | 35 +++++++++----------
 2 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/docker/scripts/install-lib.aarch64.patch b/docker/scripts/install-lib.aarch64.patch
index 5e989cc..6f1323d 100644
--- a/docker/scripts/install-lib.aarch64.patch
+++ b/docker/scripts/install-lib.aarch64.patch
@@ -1,8 +1,10 @@
---- sdrplay/install_lib.sh	2018-06-21 18:47:08.000000000 +0000
-+++ sdrplay/install_lib_patched.sh	2019-12-15 01:49:49.477386963 +0000
-@@ -3,19 +3,7 @@
+--- sdrplay/install_lib.sh
++++ sdrplay/install_lib_patched.sh
+@@ -4,20 +4,7 @@
+ export MAJVERS="3"
  
- echo "Installing SDRplay RSP API library 2.13..."
+ echo "Installing SDRplay RSP API library ${VERS}..."
+-read -p "Press RETURN to view the license agreement" ret
  
 -more sdrplay_license.txt
 -
@@ -16,25 +18,24 @@
 -    esac
 -done
 -
--export ARCH=`arch`
-+export ARCH=`uname -m`
- export VERS="2.13"
+ export ARCH=`uname -m`
  
  echo "Architecture: ${ARCH}"
-@@ -63,16 +51,6 @@
-     echo " "
-     exit 1
- fi
+@@ -46,17 +33,6 @@
+ 	echo "ERROR: udev rules directory not found, add udev support and run the"
+ 	echo "installer again. udev support can be added by running..."
+ 	echo "sudo apt-get install libudev-dev"
+-	echo " "
+-	exit 1
+-fi
 -
 -if /sbin/ldconfig -p | /bin/fgrep -q libusb-1.0; then
--    echo "Libusb found, continuing..."
+-	echo "Libusb found, continuing..."
 -else
--    echo " "
--    echo "ERROR: Libusb cannot be found. Please install libusb and then run"
--    echo "the installer again. Libusb can be installed from http://libusb.info"
--    echo " "
--    exit 1
--fi
- 
- sudo ldconfig
- 
+-	echo " "
+-	echo "ERROR: Libusb cannot be found. Please install libusb and then run"
+-	echo "the installer again. Libusb can be installed by running..."
+-    echo "sudo apt-get install libusb-1.0.0-dev"
+ 	echo " "
+ 	exit 1
+ fi
diff --git a/docker/scripts/install-lib.armv7l.patch b/docker/scripts/install-lib.armv7l.patch
index 0306c2b..775ef89 100644
--- a/docker/scripts/install-lib.armv7l.patch
+++ b/docker/scripts/install-lib.armv7l.patch
@@ -1,8 +1,10 @@
 --- sdrplay/install_lib.sh
 +++ sdrplay/install_lib_patched.sh
-@@ -3,19 +3,7 @@
+@@ -4,20 +4,7 @@
+ export MAJVERS="3"
  
- echo "Installing SDRplay RSP API library 2.13..."
+ echo "Installing SDRplay RSP API library ${VERS}..."
+-read -p "Press RETURN to view the license agreement" ret
  
 -more sdrplay_license.txt
 -
@@ -16,25 +18,24 @@
 -    esac
 -done
 -
--export ARCH=`arch`
-+export ARCH=`uname -m`
- export VERS="2.13"
+ export ARCH=`uname -m`
  
  echo "Architecture: ${ARCH}"
-@@ -60,16 +48,6 @@
-     echo "ERROR: udev rules directory not found, add udev support and run the"
-     echo "installer again. udev support can be added by running..."
-     echo "sudo apt-get install libudev-dev"
--    echo " "
--    exit 1
+@@ -44,17 +31,6 @@
+ 	echo "ERROR: udev rules directory not found, add udev support and run the"
+ 	echo "installer again. udev support can be added by running..."
+ 	echo "sudo apt-get install libudev-dev"
+-	echo " "
+-	exit 1
 -fi
 -
 -if /sbin/ldconfig -p | /bin/fgrep -q libusb-1.0; then
--    echo "Libusb found, continuing..."
+-	echo "Libusb found, continuing..."
 -else
--    echo " "
--    echo "ERROR: Libusb cannot be found. Please install libusb and then run"
--    echo "the installer again. Libusb can be installed from http://libusb.info"
-     echo " "
-     exit 1
+-	echo " "
+-	echo "ERROR: Libusb cannot be found. Please install libusb and then run"
+-	echo "the installer again. Libusb can be installed by running..."
+-    echo "sudo apt-get install libusb-1.0.0-dev"
+ 	echo " "
+ 	exit 1
  fi

From 6d43126fa540edcbf0a97afb070346b81e937d48 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 10 Apr 2020 20:05:06 +0200
Subject: [PATCH 196/475] remove unused import

---
 owrx/source/hackrf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/source/hackrf.py b/owrx/source/hackrf.py
index 2e6b9b6..0f3855b 100644
--- a/owrx/source/hackrf.py
+++ b/owrx/source/hackrf.py
@@ -1,5 +1,5 @@
 from .direct import DirectSource
-from owrx.command import Flag, Option
+from owrx.command import Option
 
 
 class HackrfSource(DirectSource):

From 1b2e237816f30e6e730162e6dc2e7ef0ee47c5f8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 12 Apr 2020 00:32:01 +0200
Subject: [PATCH 197/475] increment connector dependency

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index cb02c37..6f557cf 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 10), dh-python, python3 (>= 3.5)
 
 Package: openwebrx
 Architecture: all
-Depends: adduser, python3 (>= 3.5), python3-pkg-resources, csdr (>= 0.14), netcat, owrx-connector (>= 0.1), ${python3:Depends}, ${misc:Depends}
+Depends: adduser, python3 (>= 3.5), python3-pkg-resources, csdr (>= 0.14), netcat, owrx-connector (>= 0.2), ${python3:Depends}, ${misc:Depends}
 Recommends: digiham (>= 0.3), dsd (>= 1.7), sox, direwolf (>= 1.4), wsjtx, soapysdr-tools
 Description: multi-user web sdr
  Open source, multi-user SDR receiver with a web interface
\ No newline at end of file

From 0e8715b5a19059fd3d4cd9ebee3e4feb7b6064f9 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 12 Apr 2020 00:53:58 +0200
Subject: [PATCH 198/475] the space has been introduced at some point, make it
 optional

---
 owrx/feature.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/feature.py b/owrx/feature.py
index 12b14aa..df2434b 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -246,7 +246,7 @@ class FeatureDetector(object):
     def _has_soapy_driver(self, driver):
         try:
             process = subprocess.Popen(["SoapySDRUtil", "--info"], stdout=subprocess.PIPE, stderr=subprocess.DEVNULL)
-            factory_regex = re.compile("^Available factories\\.\\.\\. (.*)$")
+            factory_regex = re.compile("^Available factories\\.\\.\\. ?(.*)$")
 
             drivers = []
             for line in process.stdout:

From ddfd85c586ee6188265b350c2101954e9c36e7fb Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 12 Apr 2020 13:10:23 +0200
Subject: [PATCH 199/475] add js8 decoding if available

---
 bands.json          | 30 ++++++++++++++++++++----------
 csdr/csdr.py        |  9 +++++++--
 htdocs/index.html   |  1 +
 htdocs/openwebrx.js |  5 +++--
 owrx/dsp.py         |  3 ++-
 owrx/feature.py     |  7 +++++++
 owrx/js8.py         | 32 ++++++++++++++++++++++++++++++++
 7 files changed, 72 insertions(+), 15 deletions(-)
 create mode 100644 owrx/js8.py

diff --git a/bands.json b/bands.json
index 90e4c87..1629d4a 100644
--- a/bands.json
+++ b/bands.json
@@ -8,7 +8,8 @@
       "ft8": 1840000,
       "wspr": 1836600,
       "jt65": 1838000,
-      "jt9": 1839000
+      "jt9": 1839000,
+      "js8": 1842000
     }
   },
   {
@@ -21,7 +22,8 @@
       "wspr": 3592600,
       "jt65": 3570000,
       "jt9": 3572000,
-      "ft4": [3568000, 3575000]
+      "ft4": [3568000, 3575000],
+      "js8": 3578000
     }
   },
   {
@@ -43,7 +45,8 @@
       "wspr": 7038600,
       "jt65": 7076000,
       "jt9": 7078000,
-      "ft4": 7047500
+      "ft4": 7047500,
+      "js8": 7078000
     }
   },
   {
@@ -56,7 +59,8 @@
       "wspr": 10138700,
       "jt65": 10138000,
       "jt9": 10140000,
-      "ft4": 10140000
+      "ft4": 10140000,
+      "js8": 10130000
     }
   },
   {
@@ -69,7 +73,8 @@
       "wspr": 14095600,
       "jt65": 14076000,
       "jt9": 14078000,
-      "ft4": 14080000
+      "ft4": 14080000,
+      "js8": 14078000
     }
   },
   {
@@ -82,7 +87,8 @@
       "wspr": 18104600,
       "jt65": 18102000,
       "jt9": 18104000,
-      "ft4": 18104000
+      "ft4": 18104000,
+      "js8": 18104000
     }
   },
   {
@@ -95,7 +101,8 @@
       "wspr": 21094600,
       "jt65": 21076000,
       "jt9": 21078000,
-      "ft4": 21140000
+      "ft4": 21140000,
+      "js8": 21078000
     }
   },
   {
@@ -108,7 +115,8 @@
       "wspr": 24924600,
       "jt65": 24917000,
       "jt9": 24919000,
-      "ft4": 24919000
+      "ft4": 24919000,
+      "js8": 24922000
     }
   },
   {
@@ -121,7 +129,8 @@
       "wspr": 28124600,
       "jt65": 28076000,
       "jt9": 28078000,
-      "ft4": 28180000
+      "ft4": 28180000,
+      "js8": 28078000
     }
   },
   {
@@ -134,7 +143,8 @@
       "wspr": 50293000,
       "jt65": 50310000,
       "jt9": 50312000,
-      "ft4": 50318000
+      "ft4": 50318000,
+      "js8": 50318000
     }
   },
   {
diff --git a/csdr/csdr.py b/csdr/csdr.py
index 651944e..ac4dee3 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -30,6 +30,7 @@ from functools import partial
 
 from owrx.kiss import KissClient, DirewolfConfig
 from owrx.wsjt import Ft8Chopper, WsprChopper, Jt9Chopper, Jt65Chopper, Ft4Chopper
+from owrx.js8 import Js8Chopper
 
 import logging
 
@@ -450,6 +451,7 @@ class dsp(object):
         if self.isWsjtMode():
             smd = self.get_secondary_demodulator()
             chopper_cls = None
+            output_name = "wsjt_demod"
             if smd == "ft8":
                 chopper_cls = Ft8Chopper
             elif smd == "wspr":
@@ -460,10 +462,13 @@ class dsp(object):
                 chopper_cls = Jt9Chopper
             elif smd == "ft4":
                 chopper_cls = Ft4Chopper
+            elif smd == "js8":
+                chopper_cls = Js8Chopper
+                output_name = "js8_demod"
             if chopper_cls is not None:
                 chopper = chopper_cls(self, self.secondary_process_demod.stdout)
                 chopper.start()
-                self.output.send_output("wsjt_demod", chopper.read)
+                self.output.send_output(output_name, chopper.read)
         elif self.isPacket():
             # we best get the ax25 packets from the kiss socket
             kiss = KissClient(self.direwolf_port)
@@ -576,7 +581,7 @@ class dsp(object):
     def isWsjtMode(self, demodulator=None):
         if demodulator is None:
             demodulator = self.get_secondary_demodulator()
-        return demodulator in ["ft8", "wspr", "jt65", "jt9", "ft4"]
+        return demodulator in ["ft8", "wspr", "jt65", "jt9", "ft4", "js8"]
 
     def isPacket(self, demodulator=None):
         if demodulator is None:
diff --git a/htdocs/index.html b/htdocs/index.html
index fefefbc..4ad78ef 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -193,6 +193,7 @@
                         <option value="jt65" data-feature="wsjt-x">JT65</option>
                         <option value="jt9" data-feature="wsjt-x">JT9</option>
                         <option value="ft4" data-feature="wsjt-x">FT4</option>
+                        <option value="js8" data-feature="js8call">JS8Call</option>
                         <option value="packet" data-feature="packet">Packet</option>
                         <option value="pocsag" data-feature="pocsag">Pocsag</option>
                     </select>
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 52770c6..0c85f28 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1305,7 +1305,7 @@ function update_wsjt_panel(msg) {
     };
     var linkedmsg = msg['msg'];
     var matches;
-    if (['FT8', 'JT65', 'JT9', 'FT4'].indexOf(msg['mode']) >= 0) {
+    if (['FT8', 'JT65', 'JT9', 'FT4', 'JS8'].indexOf(msg['mode']) >= 0) {
         matches = linkedmsg.match(/(.*\s[A-Z0-9]+\s)([A-R]{2}[0-9]{2})$/);
         if (matches && matches[2] !== 'RR73') {
             linkedmsg = html_escape(matches[1]) + '<a href="map?locator=' + matches[2] + '" target="_blank">' + matches[2] + '</a>';
@@ -2019,6 +2019,7 @@ function demodulator_digital_replace(subtype) {
         case "jt65":
         case "jt9":
         case "ft4":
+        case "js8":
             secondary_demod_start(subtype);
             demodulator_analog_replace('usb', true);
             break;
@@ -2045,7 +2046,7 @@ function demodulator_digital_replace(subtype) {
     demodulator_buttons_update();
     $('#openwebrx-panel-digimodes').attr('data-mode', subtype);
     toggle_panel("openwebrx-panel-digimodes", true);
-    toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4'].indexOf(subtype) >= 0);
+    toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4', 'js8'].indexOf(subtype) >= 0);
     toggle_panel("openwebrx-panel-packet-message", subtype === "packet");
     toggle_panel("openwebrx-panel-pocsag-message", subtype === "pocsag");
     updateHash();
diff --git a/owrx/dsp.py b/owrx/dsp.py
index 32b9116..d06a455 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -1,6 +1,6 @@
-from owrx.config import Config
 from owrx.meta import MetaParser
 from owrx.wsjt import WsjtParser
+from owrx.js8 import Js8Parser
 from owrx.aprs import AprsParser
 from owrx.pocsag import PocsagParser
 from owrx.source import SdrSource
@@ -22,6 +22,7 @@ class DspManager(csdr.output):
             "wsjt_demod": WsjtParser(self.handler),
             "packet_demod": AprsParser(self.handler),
             "pocsag_demod": PocsagParser(self.handler),
+            "js8_demod": Js8Parser(self.handler),
         }
 
         self.props = PropertyStack()
diff --git a/owrx/feature.py b/owrx/feature.py
index df2434b..7c7d457 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -40,6 +40,7 @@ class FeatureDetector(object):
         "wsjt-x": ["wsjtx", "sox"],
         "packet": ["direwolf", "sox"],
         "pocsag": ["digiham", "sox"],
+        "js8call": ["js8", "sox"],
     }
 
     def feature_availability(self):
@@ -370,6 +371,12 @@ class FeatureDetector(object):
         """
         return reduce(and_, map(self.command_is_runnable, ["jt9", "wsprd"]), True)
 
+    def has_js8(self):
+        """
+        To decode JS8, you will need to install [JS8Call](http://js8call.com/)
+        """
+        return self.command_is_runnable("js8")
+
     def has_alsa(self):
         """
         Some SDR receivers are identifying themselves as a soundcard. In order to read their data, OpenWebRX relies
diff --git a/owrx/js8.py b/owrx/js8.py
new file mode 100644
index 0000000..2042ad8
--- /dev/null
+++ b/owrx/js8.py
@@ -0,0 +1,32 @@
+from .wsjt import WsjtChopper
+from .parser import Parser
+import re
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class Js8Chopper(WsjtChopper):
+    def getInterval(self):
+        return 15
+
+    def getFileTimestampFormat(self):
+        return "%y%m%d_%H%M%S"
+
+    def decoder_commandline(self, file):
+        return ["js8", "--js8", "-d", str(self.decoding_depth("js8")), file]
+
+
+class Js8Parser(Parser):
+    decoderRegex = re.compile(" ?<Decode(Started|Debug|Finished)>")
+
+    def parse(self, raw):
+        freq, raw_msg = raw
+        self.setDialFrequency(freq)
+        msg = raw_msg.decode().rstrip()
+        if Js8Parser.decoderRegex.match(msg):
+            return
+        if msg.startswith(" EOF on input file"):
+            return
+        logger.debug(msg)

From bcb8a2315c8ded2ea0abb8a02ec6920b10ae5939 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 13 Apr 2020 16:35:31 +0200
Subject: [PATCH 200/475] use new library for js8 decoding

---
 owrx/js8.py | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/owrx/js8.py b/owrx/js8.py
index 2042ad8..ac0916d 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -1,6 +1,8 @@
 from .wsjt import WsjtChopper
 from .parser import Parser
 import re
+from js8py import Js8
+from js8py.frames import Js8FrameDirected, Js8FrameData, Js8FrameDataCompressed
 
 import logging
 
@@ -22,11 +24,24 @@ class Js8Parser(Parser):
     decoderRegex = re.compile(" ?<Decode(Started|Debug|Finished)>")
 
     def parse(self, raw):
-        freq, raw_msg = raw
-        self.setDialFrequency(freq)
-        msg = raw_msg.decode().rstrip()
-        if Js8Parser.decoderRegex.match(msg):
-            return
-        if msg.startswith(" EOF on input file"):
-            return
-        logger.debug(msg)
+        try:
+            freq, raw_msg = raw
+            self.setDialFrequency(freq)
+            msg = raw_msg.decode().rstrip()
+            if Js8Parser.decoderRegex.match(msg):
+                return
+            if msg.startswith(" EOF on input file"):
+                return
+
+            logger.debug(msg)
+
+            frame = Js8().parse_message(msg)
+            if frame is None:
+                logger.warning("message could not be parsed")
+            elif isinstance(frame, Js8FrameDirected):
+                logger.debug("directed frame from: {0} to: {1}".format(frame.callsign_from, frame.callsign_to))
+            elif isinstance(frame, Js8FrameData) or isinstance(frame, Js8FrameDataCompressed):
+                logger.debug("message frame: {0}".format(frame.message))
+
+        except Exception:
+            logger.exception("error while parsing js8 message")

From 7948d1f27abfcef777ae235a33df7d40a891c27b Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <dd5jfk@darc.de>
Date: Tue, 14 Apr 2020 13:43:26 +0200
Subject: [PATCH 201/475] move dmr_filter property to the right list

---
 owrx/dsp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/dsp.py b/owrx/dsp.py
index 32b9116..d6fed7f 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -35,6 +35,7 @@ class DspManager(csdr.output):
             "offset_freq",
             "mod",
             "secondary_offset_freq",
+            "dmr_filter",
         ))
         # properties that we inherit from the sdr
         self.props.addLayer(1, self.sdrSource.getProps().filter(
@@ -47,7 +48,6 @@ class DspManager(csdr.output):
             "digimodes_enable",
             "samp_rate",
             "digital_voice_unvoiced_quality",
-            "dmr_filter",
             "temporary_directory",
             "center_freq",
         ))

From 2de0cbc6c0f8f37269224be634d6315d9a0e2191 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 14 Apr 2020 21:10:35 +0200
Subject: [PATCH 202/475] send messages to frontend, spots to pskreporter

---
 owrx/connection.py  | 10 ++++++++++
 owrx/js8.py         | 26 +++++++++++++++++++-------
 owrx/pskreporter.py |  2 +-
 3 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index 75b89f4..e513f27 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -13,6 +13,7 @@ from owrx.locator import Locator
 from owrx.property import PropertyStack
 from multiprocessing import Queue
 from queue import Full
+from js8py import Js8Frame
 import json
 import threading
 
@@ -333,6 +334,15 @@ class OpenWebRxReceiverClient(Client):
     def write_backoff_message(self, reason):
         self.send({"type": "backoff", "reason": reason})
 
+    def write_js8_message(self, frame: Js8Frame, freq: int):
+        self.send({"type": "js8_message", "value": {
+            "msg": str(frame),
+            "timestamp": frame.timestamp,
+            "db": frame.db,
+            "dt": frame.dt,
+            "freq": freq + frame.freq,
+        }})
+
 
 class MapConnection(Client):
     def __init__(self, conn):
diff --git a/owrx/js8.py b/owrx/js8.py
index ac0916d..e514b87 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -2,7 +2,9 @@ from .wsjt import WsjtChopper
 from .parser import Parser
 import re
 from js8py import Js8
-from js8py.frames import Js8FrameDirected, Js8FrameData, Js8FrameDataCompressed
+from js8py.frames import Js8FrameHeartbeat
+from owrx.map import Map, LocatorLocation
+from owrx.pskreporter import PskReporter
 
 import logging
 
@@ -36,12 +38,22 @@ class Js8Parser(Parser):
             logger.debug(msg)
 
             frame = Js8().parse_message(msg)
-            if frame is None:
-                logger.warning("message could not be parsed")
-            elif isinstance(frame, Js8FrameDirected):
-                logger.debug("directed frame from: {0} to: {1}".format(frame.callsign_from, frame.callsign_to))
-            elif isinstance(frame, Js8FrameData) or isinstance(frame, Js8FrameDataCompressed):
-                logger.debug("message frame: {0}".format(frame.message))
+            self.handler.write_js8_message(frame, self.dial_freq)
+            logger.debug(frame)
+
+            if isinstance(frame, Js8FrameHeartbeat):
+                Map.getSharedInstance().updateLocation(
+                    frame.callsign, LocatorLocation(frame.grid), "JS8", self.band
+                )
+                PskReporter.getSharedInstance().spot({
+                    "callsign": frame.callsign,
+                    "mode": "JS8",
+                    "locator": frame.grid,
+                    "freq": self.dial_freq + frame.freq,
+                    "db": frame.db,
+                    "timestamp": frame.timestamp,
+                    "msg": str(frame)
+                })
 
         except Exception:
             logger.exception("error while parsing js8 message")
diff --git a/owrx/pskreporter.py b/owrx/pskreporter.py
index 357e6d8..981ecc8 100644
--- a/owrx/pskreporter.py
+++ b/owrx/pskreporter.py
@@ -30,7 +30,7 @@ class PskReporter(object):
     sharedInstance = None
     creationLock = threading.Lock()
     interval = 300
-    supportedModes = ["FT8", "FT4", "JT9", "JT65"]
+    supportedModes = ["FT8", "FT4", "JT9", "JT65", "JS8"]
 
     @staticmethod
     def getSharedInstance():

From 899445d5865a245de16583e86d47bf3151baee06 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 14 Apr 2020 21:12:25 +0200
Subject: [PATCH 203/475] display messages on the web

---
 htdocs/css/openwebrx.css | 8 ++++++--
 htdocs/openwebrx.js      | 3 ++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index 719b47d..f3b44f2 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -381,6 +381,7 @@ input[type=range]:focus::-ms-fill-upper
 	border-radius: 15px;
 	-moz-border-radius: 15px;
 	margin: 5.9px;
+	box-sizing: content-box;
 }
 
 .openwebrx-panel a
@@ -1078,13 +1079,15 @@ img.openwebrx-mirror-img
 #openwebrx-panel-digimodes[data-mode="ft4"]    #openwebrx-digimode-content-container,
 #openwebrx-panel-digimodes[data-mode="packet"] #openwebrx-digimode-content-container,
 #openwebrx-panel-digimodes[data-mode="pocsag"] #openwebrx-digimode-content-container,
+#openwebrx-panel-digimodes[data-mode="js8"]    #openwebrx-digimode-content-container,
 #openwebrx-panel-digimodes[data-mode="ft8"]    #openwebrx-digimode-select-channel,
 #openwebrx-panel-digimodes[data-mode="wspr"]   #openwebrx-digimode-select-channel,
 #openwebrx-panel-digimodes[data-mode="jt65"]   #openwebrx-digimode-select-channel,
 #openwebrx-panel-digimodes[data-mode="jt9"]    #openwebrx-digimode-select-channel,
 #openwebrx-panel-digimodes[data-mode="ft4"]    #openwebrx-digimode-select-channel,
 #openwebrx-panel-digimodes[data-mode="packet"] #openwebrx-digimode-select-channel,
-#openwebrx-panel-digimodes[data-mode="pocsag"] #openwebrx-digimode-select-channel
+#openwebrx-panel-digimodes[data-mode="pocsag"] #openwebrx-digimode-select-channel,
+#openwebrx-panel-digimodes[data-mode="js8"]    #openwebrx-digimode-select-channel
 {
     display: none;
 }
@@ -1095,7 +1098,8 @@ img.openwebrx-mirror-img
 #openwebrx-panel-digimodes[data-mode="jt9"]    #openwebrx-digimode-canvas-container,
 #openwebrx-panel-digimodes[data-mode="ft4"]    #openwebrx-digimode-canvas-container,
 #openwebrx-panel-digimodes[data-mode="packet"] #openwebrx-digimode-canvas-container,
-#openwebrx-panel-digimodes[data-mode="pocsag"] #openwebrx-digimode-canvas-container
+#openwebrx-panel-digimodes[data-mode="pocsag"] #openwebrx-digimode-canvas-container,
+#openwebrx-panel-digimodes[data-mode="js8"]    #openwebrx-digimode-canvas-container
 {
     height: 200px;
     margin: -10px;
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 0c85f28..95c2008 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1133,6 +1133,7 @@ function on_ws_recv(evt) {
                         update_metadata(json['value']);
                         break;
                     case "wsjt_message":
+                    case "js8_message":
                         update_wsjt_panel(json['value']);
                         break;
                     case "dial_frequencies":
@@ -1305,7 +1306,7 @@ function update_wsjt_panel(msg) {
     };
     var linkedmsg = msg['msg'];
     var matches;
-    if (['FT8', 'JT65', 'JT9', 'FT4', 'JS8'].indexOf(msg['mode']) >= 0) {
+    if (['FT8', 'JT65', 'JT9', 'FT4'].indexOf(msg['mode']) >= 0) {
         matches = linkedmsg.match(/(.*\s[A-Z0-9]+\s)([A-R]{2}[0-9]{2})$/);
         if (matches && matches[2] !== 'RR73') {
             linkedmsg = html_escape(matches[1]) + '<a href="map?locator=' + matches[2] + '" target="_blank">' + matches[2] + '</a>';

From 99b4a25de7b4874882bbeee9f17cbb08f127466a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 14 Apr 2020 21:27:50 +0200
Subject: [PATCH 204/475] js8 service

---
 owrx/service/__init__.py | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/owrx/service/__init__.py b/owrx/service/__init__.py
index 5498e5e..8310fa4 100644
--- a/owrx/service/__init__.py
+++ b/owrx/service/__init__.py
@@ -5,10 +5,12 @@ from owrx.bands import Bandplan
 from csdr.csdr import dsp, output
 from owrx.wsjt import WsjtParser
 from owrx.aprs import AprsParser
+from owrx.js8 import Js8Parser
 from owrx.config import Config
 from owrx.source.resampler import Resampler
 from owrx.feature import FeatureDetector
 from owrx.property import PropertyLayer
+from js8py import Js8Frame
 from abc import ABCMeta, abstractmethod
 from .schedule import ServiceScheduler
 from functools import reduce
@@ -50,6 +52,14 @@ class AprsServiceOutput(ServiceOutput):
         return t == "packet_demod"
 
 
+class Js8ServiceOutput(ServiceOutput):
+    def getParser(self):
+        return Js8Parser(Js8Handler())
+
+    def supports_type(self, t):
+        return t == "js8_demod"
+
+
 class ServiceDetector(object):
     requirements = {
         "ft8": ["wsjt-x"],
@@ -58,6 +68,7 @@ class ServiceDetector(object):
         "jt9": ["wsjt-x"],
         "wspr": ["wsjt-x"],
         "packet": ["packet"],
+        "js8": ["js8call"],
     }
 
     @staticmethod
@@ -258,6 +269,8 @@ class ServiceHandler(object):
         # TODO selecting outputs will need some more intelligence here
         if mode == "packet":
             output = AprsServiceOutput(frequency)
+        elif mode == "js8":
+            output = Js8ServiceOutput(frequency)
         else:
             output = WsjtServiceOutput(frequency)
         d = dsp(output)
@@ -293,6 +306,11 @@ class AprsHandler(object):
         pass
 
 
+class Js8Handler(object):
+    def write_js8_message(self, frame: Js8Frame, freq: int):
+        pass
+
+
 class Services(object):
     handlers = []
 

From da4917998dff083d1aae566f58c4579bf972824a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 14 Apr 2020 22:31:30 +0200
Subject: [PATCH 205/475] js8 metrics

---
 owrx/js8.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/owrx/js8.py b/owrx/js8.py
index e514b87..6301f4e 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -5,6 +5,7 @@ from js8py import Js8
 from js8py.frames import Js8FrameHeartbeat
 from owrx.map import Map, LocatorLocation
 from owrx.pskreporter import PskReporter
+from owrx.metrics import Metrics, CounterMetric
 
 import logging
 
@@ -41,6 +42,8 @@ class Js8Parser(Parser):
             self.handler.write_js8_message(frame, self.dial_freq)
             logger.debug(frame)
 
+            self.pushDecode()
+
             if isinstance(frame, Js8FrameHeartbeat):
                 Map.getSharedInstance().updateLocation(
                     frame.callsign, LocatorLocation(frame.grid), "JS8", self.band
@@ -57,3 +60,19 @@ class Js8Parser(Parser):
 
         except Exception:
             logger.exception("error while parsing js8 message")
+
+    def pushDecode(self):
+        metrics = Metrics.getSharedInstance()
+        band = "unknown"
+        if self.band is not None:
+            band = self.band.getName()
+        if band is None:
+            band = "unknown"
+
+        name = "js8call.decodes.{band}.js8".format(band=band)
+        metric = metrics.getMetric(name)
+        if metric is None:
+            metric = CounterMetric()
+            metrics.addMetric(name, metric)
+
+        metric.inc()

From eb9059a7115a5c4808dbd799eb4163d09f46db36 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 14 Apr 2020 22:32:31 +0200
Subject: [PATCH 206/475] switch to homepage url

---
 setup.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 0d512eb..c29fdda 100644
--- a/setup.py
+++ b/setup.py
@@ -14,8 +14,7 @@ setup(
     packages=find_namespace_packages(include=["owrx", "owrx.source", "owrx.service", "owrx.controllers", "owrx.property", "owrx.form", "csdr", "htdocs"]),
     package_data={"htdocs": [f[len("htdocs/") :] for f in glob("htdocs/**/*", recursive=True)]},
     entry_points={"console_scripts": ["openwebrx=owrx.__main__:main"]},
-    # use the github page for now
-    url="https://github.com/jketterl/openwebrx",
+    url="https://www.openwebrx.de/",
     author="Jakob Ketterl",
     author_email="jakob.ketterl@gmx.de",
     maintainer="Jakob Ketterl",

From 7fe694ba0a91fa6e9e3d18c85296959e43fd99d7 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 14 Apr 2020 22:36:15 +0200
Subject: [PATCH 207/475] add urls to debian packaging

---
 debian/control | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/control b/debian/control
index 6f557cf..f7a4af0 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,9 @@ Section: hamradio
 Priority: optional
 Standards-Version: 4.2.0
 Build-Depends: debhelper (>= 10), dh-python, python3 (>= 3.5)
+Homepage: https://www.openwebrx.de/
+Vcs-Browser: https://github.com/jketterl/openwebrx
+Vcs-Git: https://github.com/jketterl/openwebrx.git
 
 Package: openwebrx
 Architecture: all

From 1f70b9331039812d2c990a2f650d8ef721d97542 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 14 Apr 2020 23:16:45 +0200
Subject: [PATCH 208/475] seems like we're in upper case

---
 owrx/js8.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/js8.py b/owrx/js8.py
index 6301f4e..2b9c9a1 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -69,7 +69,7 @@ class Js8Parser(Parser):
         if band is None:
             band = "unknown"
 
-        name = "js8call.decodes.{band}.js8".format(band=band)
+        name = "js8call.decodes.{band}.JS8".format(band=band)
         metric = metrics.getMetric(name)
         if metric is None:
             metric = CounterMetric()

From 70818836de34c18d755ec132eca2223efa4cb171 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 15 Apr 2020 20:40:03 +0200
Subject: [PATCH 209/475] switch to recommended dependencies

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index f7a4af0..7af71f7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Jakob Ketterl <jakob.ketterl@gmx.de>
 Section: hamradio
 Priority: optional
 Standards-Version: 4.2.0
-Build-Depends: debhelper (>= 10), dh-python, python3 (>= 3.5)
+Build-Depends: debhelper (>= 11), dh-python, python3-all (>= 3.5), python3-setuptools
 Homepage: https://www.openwebrx.de/
 Vcs-Browser: https://github.com/jketterl/openwebrx
 Vcs-Git: https://github.com/jketterl/openwebrx.git

From 4d157d275a3ed4d034dbc57fc61bf8dc62122e2b Mon Sep 17 00:00:00 2001
From: Markus Hauschild <markus@moepman.eu>
Date: Wed, 15 Apr 2020 21:22:06 +0200
Subject: [PATCH 210/475] hackrf: properly use ppm setting as parameter

---
 owrx/source/hackrf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/owrx/source/hackrf.py b/owrx/source/hackrf.py
index 0f3855b..23ffcc8 100644
--- a/owrx/source/hackrf.py
+++ b/owrx/source/hackrf.py
@@ -11,6 +11,7 @@ class HackrfSource(DirectSource):
                 "rf_gain": Option("-g"),
                 "lna_gain": Option("-l"),
                 "rf_amp": Option("-a"),
+                "ppm": Option("-C"),
             }
         ).setStatic("-r-")
 

From 05a4139f94ab6d4d0c8f21f2677cded24b55a7a6 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 15 Apr 2020 22:26:45 +0200
Subject: [PATCH 211/475] add js8call dependency

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 7af71f7..5afe4be 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Git: https://github.com/jketterl/openwebrx.git
 
 Package: openwebrx
 Architecture: all
-Depends: adduser, python3 (>= 3.5), python3-pkg-resources, csdr (>= 0.14), netcat, owrx-connector (>= 0.2), ${python3:Depends}, ${misc:Depends}
+Depends: adduser, python3 (>= 3.5), python3-pkg-resources, csdr (>= 0.14), netcat, owrx-connector (>= 0.2), python3-js8py (>= 0.1), ${python3:Depends}, ${misc:Depends}
 Recommends: digiham (>= 0.3), dsd (>= 1.7), sox, direwolf (>= 1.4), wsjtx, soapysdr-tools
 Description: multi-user web sdr
  Open source, multi-user SDR receiver with a web interface
\ No newline at end of file

From f52bf560ec486da7fd94324a180a41e87740ca44 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 15 Apr 2020 23:20:17 +0200
Subject: [PATCH 212/475] add hamlib and js8 to docker (not working yet)

---
 docker/scripts/install-dependencies.sh | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index 64a8d0b..3ba8717 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -44,12 +44,30 @@ cmakebuild digiham 95206501be89b38d0267bf6c29a6898e7c65656f
 git clone https://github.com/f4exb/dsd.git
 cmakebuild dsd f6939f9edbbc6f66261833616391a4e59cb2b3d7
 
+git clone https://github.com/Hamlib/Hamlib.git
+pushd Hamlib
+git checkout 301ebb92eaa538dfa75c06821f46715f40dd7673
+./bootstrap
+./configure
+make
+make install
+popd
+rm -rf Hamlib
+
+JS8CALL_VERSION=2.1.1
+JS8CALL_DIR=js8call-${JS8CALL_VERSION}
+JS8CALL_TGZ=${JS8CALL_DIR}.tgz
+wget http://files.js8call.com/${JS8CALL_VERSION}/${JS8CALL_TGZ}
+tar xvfz ${JS8CALL_TGZ}
+cmakebuild ${JS8CALL_DIR}
+rm ${JS8CALL_TGZ}
+
 WSJT_DIR=wsjtx-2.1.2
 WSJT_TGZ=${WSJT_DIR}.tgz
-wget http://physics.princeton.edu/pulsar/k1jt/$WSJT_TGZ
-tar xvfz $WSJT_TGZ
-cmakebuild $WSJT_DIR
-rm $WSJT_TGZ
+wget http://physics.princeton.edu/pulsar/k1jt/${WSJT_TGZ}
+tar xvfz ${WSJT_TGZ}
+cmakebuild ${WSJT_DIR}
+rm ${WSJT_TGZ}
 
 git clone --depth 1 -b 1.5 https://github.com/wb2osz/direwolf.git
 cd direwolf

From 5843aec3429a7705149a5e58a04cf84fa4ed32e0 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 16 Apr 2020 22:01:51 +0200
Subject: [PATCH 213/475] fix js8call in the docker build

---
 docker/scripts/install-dependencies.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index 3ba8717..5b47d9c 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -9,7 +9,7 @@ function cmakebuild() {
   fi
   mkdir build
   cd build
-  cmake ..
+  cmake ${CMAKE_ARGS:-} ..
   make
   make install
   cd ../..
@@ -58,14 +58,14 @@ JS8CALL_VERSION=2.1.1
 JS8CALL_DIR=js8call-${JS8CALL_VERSION}
 JS8CALL_TGZ=${JS8CALL_DIR}.tgz
 wget http://files.js8call.com/${JS8CALL_VERSION}/${JS8CALL_TGZ}
-tar xvfz ${JS8CALL_TGZ}
-cmakebuild ${JS8CALL_DIR}
+tar xfz ${JS8CALL_TGZ}
+CMAKE_ARGS="-D CMAKE_CXX_FLAGS=-DJS8_USE_LEGACY_HAMLIB" cmakebuild ${JS8CALL_DIR}
 rm ${JS8CALL_TGZ}
 
 WSJT_DIR=wsjtx-2.1.2
 WSJT_TGZ=${WSJT_DIR}.tgz
 wget http://physics.princeton.edu/pulsar/k1jt/${WSJT_TGZ}
-tar xvfz ${WSJT_TGZ}
+tar xfz ${WSJT_TGZ}
 cmakebuild ${WSJT_DIR}
 rm ${WSJT_TGZ}
 

From 1023087c8a4c9983c9f28f6e1b09d7c30f8b4ddb Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 17 Apr 2020 23:50:23 +0200
Subject: [PATCH 214/475] get locator from compound frame, too

---
 owrx/js8.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/owrx/js8.py b/owrx/js8.py
index 2b9c9a1..796e4eb 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -2,7 +2,7 @@ from .wsjt import WsjtChopper
 from .parser import Parser
 import re
 from js8py import Js8
-from js8py.frames import Js8FrameHeartbeat
+from js8py.frames import Js8FrameHeartbeat, Js8FrameCompound
 from owrx.map import Map, LocatorLocation
 from owrx.pskreporter import PskReporter
 from owrx.metrics import Metrics, CounterMetric
@@ -44,7 +44,7 @@ class Js8Parser(Parser):
 
             self.pushDecode()
 
-            if isinstance(frame, Js8FrameHeartbeat):
+            if (isinstance(frame, Js8FrameHeartbeat) or isinstance(frame, Js8FrameCompound)) and frame.grid:
                 Map.getSharedInstance().updateLocation(
                     frame.callsign, LocatorLocation(frame.grid), "JS8", self.band
                 )

From 32bd1bb4aa23cfac342e1ecc452de00f99b542d1 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 18 Apr 2020 00:41:16 +0200
Subject: [PATCH 215/475] install js8py

---
 docker/scripts/install-dependencies.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index 5b47d9c..dda0376 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -24,6 +24,12 @@ BUILD_PACKAGES="git libsndfile-dev fftw-dev cmake ca-certificates make gcc musl-
 apk add --no-cache $STATIC_PACKAGES
 apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
+git clone https://github.com/jketterl/js8py.git
+pushd js8py
+git checkout b55b6c7668c353b9f1af507c505b8a774951dee6
+python3 setup.py install
+popd
+
 git clone https://git.code.sf.net/p/itpp/git itpp
 cmakebuild itpp bb5c7e95f40e8fdb5c3f3d01a84bcbaf76f3676d
 

From 4287387a5ee3b42e6d491db829e67fdb6c233fa8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 19 Apr 2020 22:10:32 +0200
Subject: [PATCH 216/475] threading frontend implementation

---
 htdocs/css/openwebrx.css | 43 +++++++++++---------
 htdocs/index.html        | 15 +++++--
 htdocs/lib/Js8Threads.js | 86 ++++++++++++++++++++++++++++++++++++++++
 htdocs/openwebrx.js      |  8 +++-
 owrx/connection.py       |  1 +
 5 files changed, 129 insertions(+), 24 deletions(-)
 create mode 100644 htdocs/lib/Js8Threads.js

diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index f3b44f2..2ab29e3 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -924,37 +924,23 @@ img.openwebrx-mirror-img
     display: inline-block;
 }
 
-#openwebrx-panel-wsjt-message,
-#openwebrx-panel-packet-message,
-#openwebrx-panel-pocsag-message
-{
+.openwebrx-message-panel {
     height: 180px;
 }
 
-#openwebrx-panel-wsjt-message tbody,
-#openwebrx-panel-packet-message tbody,
-#openwebrx-panel-pocsag-message tbody
-{
+.openwebrx-message-panel tbody {
     display: block;
     overflow: auto;
     height: 150px;
     width: 100%;
 }
 
-#openwebrx-panel-wsjt-message thead tr,
-#openwebrx-panel-packet-message thead tr,
-#openwebrx-panel-pocsag-message thead tr
-{
+.openwebrx-message-panel thead tr {
     display: block;
 }
 
-#openwebrx-panel-wsjt-message th,
-#openwebrx-panel-wsjt-message td,
-#openwebrx-panel-packet-message th,
-#openwebrx-panel-packet-message td,
-#openwebrx-panel-pocsag-message th,
-#openwebrx-panel-pocsag-message td
-{
+.openwebrx-message-panel th,
+.openwebrx-message-panel td {
     width: 50px;
     text-align: left;
     padding: 1px 3px;
@@ -973,6 +959,25 @@ img.openwebrx-mirror-img
     width: 70px;
 }
 
+#openwebrx-panel-js8-message .message {
+    width: 470px;
+    max-width: 470px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    direction: rtl;
+    text-aligh: left;
+}
+
+#openwebrx-panel-js8-message .decimal {
+    text-align: right;
+    width: 35px;
+}
+
+#openwebrx-panel-js8-message .decimal.freq {
+    width: 70px;
+}
+
 #openwebrx-panel-packet-message .message {
     width: 410px;
     max-width: 410px;
diff --git a/htdocs/index.html b/htdocs/index.html
index 4ad78ef..77b0fe3 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -32,6 +32,7 @@
         <script src="static/lib/ProgressBar.js"></script>
         <script src="static/lib/Measurement.js"></script>
         <script src="static/lib/FrequencyDisplay.js"></script>
+        <script src="static/lib/Js8Threads.js"></script>
         <link rel="stylesheet" type="text/css" href="static/lib/nanoscroller.css" />
         <link rel="stylesheet" type="text/css" href="static/css/openwebrx.css" />
         <meta charset="utf-8">
@@ -67,7 +68,7 @@
                     </div>
                 </div>
             </div>
-            <table class="openwebrx-panel" id="openwebrx-panel-wsjt-message" style="display: none; width: 619px;" data-panel-name="wsjt-message">
+            <table class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-wsjt-message" style="display: none; width: 619px;" data-panel-name="wsjt-message">
                 <thead><tr>
                     <th>UTC</th>
                     <th class="decimal">dB</th>
@@ -77,7 +78,15 @@
                 </tr></thead>
                 <tbody></tbody>
             </table>
-            <table class="openwebrx-panel" id="openwebrx-panel-packet-message" style="display: none; width: 619px;" data-panel-name="aprs-message">
+            <table class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-js8-message" style="display:none; width: 619px;" data-panel-name="js8-message">
+                <thead><tr>
+                    <th>UTC</th>
+                    <th class="decimal freq">Freq</th>
+                    <th class="message">Message</th>
+                </tr></thead>
+                <tbody></tbody>
+            </table>
+            <table class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-packet-message" style="display: none; width: 619px;" data-panel-name="aprs-message">
                 <thead><tr>
                     <th>UTC</th>
                     <th class="callsign">Callsign</th>
@@ -86,7 +95,7 @@
                 </tr></thead>
                 <tbody></tbody>
             </table>
-            <table class="openwebrx-panel" id="openwebrx-panel-pocsag-message" style="display: none; width: 619px;" data-panel-name="pocsag-message">
+            <table class="openwebrx-panel openwebrx-message-panel" id="openwebrx-panel-pocsag-message" style="display: none; width: 619px;" data-panel-name="pocsag-message">
                 <thead><tr>
                     <th class="address">Address</th>
                     <th class="message">Message</th>
diff --git a/htdocs/lib/Js8Threads.js b/htdocs/lib/Js8Threads.js
new file mode 100644
index 0000000..07e3069
--- /dev/null
+++ b/htdocs/lib/Js8Threads.js
@@ -0,0 +1,86 @@
+Js8Thread = function(el){
+    this.messages = [];
+    this.el = el;
+}
+
+Js8Thread.prototype.getAverageFrequency = function(){
+    var total = this.messages.map(function(message){
+        return message.freq;
+    }).reduce(function(t, f){
+        return t + f;
+    }, 0);
+    return total / this.messages.length;
+}
+
+Js8Thread.prototype.pushMessage = function(message) {
+    this.messages.push(message);
+    this.render();
+}
+
+Js8Thread.prototype.render = function() {
+    this.el.html(
+        '<td>' + this.renderTimestamp(this.getLatestTimestamp()) + '</td>' +
+        '<td class="decimal freq">' + Math.round(this.getAverageFrequency()) + '</td>' +
+        '<td class="message">' + this.renderMessages() + '</td>'
+    );
+}
+
+Js8Thread.prototype.getLatestTimestamp() {
+    return this.messages(this.messages.length - 1).timestamp;
+}
+
+Js8Thread.prototype.renderMessages = function() {
+    res = []
+    for (var i = 0; i < this.messages.length; i++) {
+        var msg = this.messages[i];
+        if (msg.thread_type & 1) {
+            res.push('[ ');
+        } else if (i > 0 && msg.timestamp - this.messages[i - 1].timestamp > 15000) {
+            res.push(' ... ');
+        }
+        res.push(msg.msg);
+        if (msg.thread_type & 2) {
+            res.push(' ]');
+        }
+    }
+    return res.join('');
+}
+
+Js8Thread.prototype.renderTimestamp = function(timestamp) {
+    var t = new Date(timestamp);
+    var pad = function (i) {
+        return ('' + i).padStart(2, "0");
+    };
+    return pad(t.getUTCHours()) + pad(t.getUTCMinutes()) + pad(t.getUTCSeconds());
+}
+
+Js8Threader = function(el){
+    this.threads = [];
+    this.tbody = $(el).find('tbody');
+    console.info(this.tbody);
+};
+
+Js8Threader.prototype.findThread = function(freq) {
+    var matching = this.threads.filter(function(thread) {
+        return Math.abs(thread.getAverageFrequency() - freq) <= 5;
+    });
+    return matching[0] || false;
+}
+
+Js8Threader.prototype.pushMessage = function(message) {
+    var thread = this.findThread(message.freq);
+    if (!thread) {
+        var line = $("<tr></tr>")
+        this.tbody.append(line);
+        var thread = new Js8Thread(line);
+        this.threads.push(thread);
+    }
+    thread.pushMessage(message);
+}
+
+$.fn.js8 = function() {
+    if (!this.data('threader')) {
+        this.data('threader', new Js8Threader(this));
+    }
+    return this.data('threader');
+}
\ No newline at end of file
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 95c2008..05d4f51 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1132,8 +1132,10 @@ function on_ws_recv(evt) {
                     case "metadata":
                         update_metadata(json['value']);
                         break;
-                    case "wsjt_message":
                     case "js8_message":
+                        $("#openwebrx-panel-js8-message").js8().pushMessage(json['value']);
+                        break;
+                    case "wsjt_message":
                         update_wsjt_panel(json['value']);
                         break;
                     case "dial_frequencies":
@@ -2047,7 +2049,8 @@ function demodulator_digital_replace(subtype) {
     demodulator_buttons_update();
     $('#openwebrx-panel-digimodes').attr('data-mode', subtype);
     toggle_panel("openwebrx-panel-digimodes", true);
-    toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4', 'js8'].indexOf(subtype) >= 0);
+    toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4'].indexOf(subtype) >= 0);
+    toggle_panel("openwebrx-panel-js8-message", subtype == "js8");
     toggle_panel("openwebrx-panel-packet-message", subtype === "packet");
     toggle_panel("openwebrx-panel-pocsag-message", subtype === "pocsag");
     updateHash();
@@ -2141,6 +2144,7 @@ function secondary_demod_close_window() {
     toggle_panel("openwebrx-panel-wsjt-message", false);
     toggle_panel("openwebrx-panel-packet-message", false);
     toggle_panel("openwebrx-panel-pocsag-message", false);
+    toggle_panel("openwebrx-panel-js8-message", false);
 }
 
 function secondary_demod_waterfall_add(data) {
diff --git a/owrx/connection.py b/owrx/connection.py
index e513f27..7432978 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -341,6 +341,7 @@ class OpenWebRxReceiverClient(Client):
             "db": frame.db,
             "dt": frame.dt,
             "freq": freq + frame.freq,
+            "thread_type": frame.thread_type
         }})
 
 

From c90b415c8bdabaa3f41ebcc3a4126a11c9167003 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 19 Apr 2020 23:35:06 +0200
Subject: [PATCH 217/475] add scroll-to-bottom and cleanup intervals

---
 htdocs/css/openwebrx.css |  2 +-
 htdocs/lib/Js8Threads.js | 41 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index 2ab29e3..9c939a0 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -966,7 +966,7 @@ img.openwebrx-mirror-img
     overflow: hidden;
     text-overflow: ellipsis;
     direction: rtl;
-    text-aligh: left;
+    text-align: left;
 }
 
 #openwebrx-panel-js8-message .decimal {
diff --git a/htdocs/lib/Js8Threads.js b/htdocs/lib/Js8Threads.js
index 07e3069..a9bc014 100644
--- a/htdocs/lib/Js8Threads.js
+++ b/htdocs/lib/Js8Threads.js
@@ -21,12 +21,18 @@ Js8Thread.prototype.render = function() {
     this.el.html(
         '<td>' + this.renderTimestamp(this.getLatestTimestamp()) + '</td>' +
         '<td class="decimal freq">' + Math.round(this.getAverageFrequency()) + '</td>' +
-        '<td class="message">' + this.renderMessages() + '</td>'
+        '<td class="message">&lrm;' + this.renderMessages() + '</td>'
     );
 }
 
-Js8Thread.prototype.getLatestTimestamp() {
-    return this.messages(this.messages.length - 1).timestamp;
+Js8Thread.prototype.getLatestTimestamp = function() {
+    var startingMessages = this.messages.filter(function(m){
+        return m.thread_type & 1;
+    });
+    if (startingMessages.length) {
+        return startingMessages[startingMessages.length - 1].timestamp;
+    }
+    return this.messages[0].timestamp;
 }
 
 Js8Thread.prototype.renderMessages = function() {
@@ -35,7 +41,7 @@ Js8Thread.prototype.renderMessages = function() {
         var msg = this.messages[i];
         if (msg.thread_type & 1) {
             res.push('[ ');
-        } else if (i > 0 && msg.timestamp - this.messages[i - 1].timestamp > 15000) {
+        } else if (i == 0 || msg.timestamp - this.messages[i - 1].timestamp > 15000) {
             res.push(' ... ');
         }
         res.push(msg.msg);
@@ -54,14 +60,38 @@ Js8Thread.prototype.renderTimestamp = function(timestamp) {
     return pad(t.getUTCHours()) + pad(t.getUTCMinutes()) + pad(t.getUTCSeconds());
 }
 
+Js8Thread.prototype.purgeOldMessages = function() {
+    var now = new Date().getTime();
+    this.messages = this.messages.filter(function(m) {
+        // keep messages around for 20 minutes
+        return now - m.timestamp < 20 * 60 * 1000;
+    });
+    if (!this.messages.length) {
+        this.el.remove();
+    } else {
+        this.render();
+    }
+    return this.messages.length;
+}
+
 Js8Threader = function(el){
     this.threads = [];
     this.tbody = $(el).find('tbody');
-    console.info(this.tbody);
+    var me = this;
+    this.interval = setInterval(function(){
+        me.purgeOldMessages();
+    }, 15000);
+};
+
+Js8Threader.prototype.purgeOldMessages = function() {
+    this.threads = this.threads.filter(function(t) {
+        return t.purgeOldMessages();
+    });
 };
 
 Js8Threader.prototype.findThread = function(freq) {
     var matching = this.threads.filter(function(thread) {
+        // max frequency deviation: 5 Hz. this may be a little tight.
         return Math.abs(thread.getAverageFrequency() - freq) <= 5;
     });
     return matching[0] || false;
@@ -76,6 +106,7 @@ Js8Threader.prototype.pushMessage = function(message) {
         this.threads.push(thread);
     }
     thread.pushMessage(message);
+    this.tbody.scrollTop(this.tbody[0].scrollHeight);
 }
 
 $.fn.js8 = function() {

From 9a86bc23beed5b8d714b15ebfdc6e114026711e5 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 19 Apr 2020 23:36:35 +0200
Subject: [PATCH 218/475] make hackrf sleep for 1 second on restarts (device is
 not released immediately)

---
 owrx/source/hackrf.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/owrx/source/hackrf.py b/owrx/source/hackrf.py
index 23ffcc8..f59a448 100644
--- a/owrx/source/hackrf.py
+++ b/owrx/source/hackrf.py
@@ -1,5 +1,6 @@
 from .direct import DirectSource
 from owrx.command import Option
+import time
 
 
 class HackrfSource(DirectSource):
@@ -17,3 +18,6 @@ class HackrfSource(DirectSource):
 
     def getFormatConversion(self):
         return ["csdr convert_s8_f"]
+
+    def sleepOnRestart(self):
+        time.sleep(1)

From 5ba77012a71b63cc47c4b0feee028281d5ae694a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 19 Apr 2020 23:42:36 +0200
Subject: [PATCH 219/475] update js8py library

---
 docker/scripts/install-dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index dda0376..1f195d7 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -26,7 +26,7 @@ apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 git clone https://github.com/jketterl/js8py.git
 pushd js8py
-git checkout b55b6c7668c353b9f1af507c505b8a774951dee6
+git checkout 888e62be375316882ad2b2ac8e396c3bf857b6fc
 python3 setup.py install
 popd
 

From f474ab94d2febaf19390b50f0293bd8c1fa9a138 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <dd5jfk@darc.de>
Date: Mon, 20 Apr 2020 18:31:45 +0200
Subject: [PATCH 220/475] close threads when ending message has been received

---
 htdocs/lib/Js8Threads.js | 46 +++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/htdocs/lib/Js8Threads.js b/htdocs/lib/Js8Threads.js
index a9bc014..b191061 100644
--- a/htdocs/lib/Js8Threads.js
+++ b/htdocs/lib/Js8Threads.js
@@ -1,7 +1,7 @@
 Js8Thread = function(el){
     this.messages = [];
     this.el = el;
-}
+};
 
 Js8Thread.prototype.getAverageFrequency = function(){
     var total = this.messages.map(function(message){
@@ -10,12 +10,12 @@ Js8Thread.prototype.getAverageFrequency = function(){
         return t + f;
     }, 0);
     return total / this.messages.length;
-}
+};
 
 Js8Thread.prototype.pushMessage = function(message) {
     this.messages.push(message);
     this.render();
-}
+};
 
 Js8Thread.prototype.render = function() {
     this.el.html(
@@ -23,34 +23,36 @@ Js8Thread.prototype.render = function() {
         '<td class="decimal freq">' + Math.round(this.getAverageFrequency()) + '</td>' +
         '<td class="message">&lrm;' + this.renderMessages() + '</td>'
     );
-}
+};
 
 Js8Thread.prototype.getLatestTimestamp = function() {
-    var startingMessages = this.messages.filter(function(m){
-        return m.thread_type & 1;
-    });
-    if (startingMessages.length) {
-        return startingMessages[startingMessages.length - 1].timestamp;
-    }
     return this.messages[0].timestamp;
-}
+};
+
+Js8Thread.prototype.isOpen = function() {
+    if (!this.messages.length) return true;
+    var last_message = this.messages[this.messages.length - 1];
+    return (last_message.thread_type & 2) === 0;
+};
 
 Js8Thread.prototype.renderMessages = function() {
-    res = []
+    var res = [];
     for (var i = 0; i < this.messages.length; i++) {
         var msg = this.messages[i];
         if (msg.thread_type & 1) {
             res.push('[ ');
-        } else if (i == 0 || msg.timestamp - this.messages[i - 1].timestamp > 15000) {
+        } else if (i === 0 || msg.timestamp - this.messages[i - 1].timestamp > 15000) {
             res.push(' ... ');
         }
         res.push(msg.msg);
         if (msg.thread_type & 2) {
             res.push(' ]');
+        } else if (i === this.messages.length -1) {
+            res.push(' ... ');
         }
     }
     return res.join('');
-}
+};
 
 Js8Thread.prototype.renderTimestamp = function(timestamp) {
     var t = new Date(timestamp);
@@ -58,7 +60,7 @@ Js8Thread.prototype.renderTimestamp = function(timestamp) {
         return ('' + i).padStart(2, "0");
     };
     return pad(t.getUTCHours()) + pad(t.getUTCMinutes()) + pad(t.getUTCSeconds());
-}
+};
 
 Js8Thread.prototype.purgeOldMessages = function() {
     var now = new Date().getTime();
@@ -72,7 +74,7 @@ Js8Thread.prototype.purgeOldMessages = function() {
         this.render();
     }
     return this.messages.length;
-}
+};
 
 Js8Threader = function(el){
     this.threads = [];
@@ -92,26 +94,26 @@ Js8Threader.prototype.purgeOldMessages = function() {
 Js8Threader.prototype.findThread = function(freq) {
     var matching = this.threads.filter(function(thread) {
         // max frequency deviation: 5 Hz. this may be a little tight.
-        return Math.abs(thread.getAverageFrequency() - freq) <= 5;
+        return thread.isOpen() && Math.abs(thread.getAverageFrequency() - freq) <= 5;
     });
     return matching[0] || false;
-}
+};
 
 Js8Threader.prototype.pushMessage = function(message) {
     var thread = this.findThread(message.freq);
     if (!thread) {
-        var line = $("<tr></tr>")
+        var line = $("<tr></tr>");
         this.tbody.append(line);
-        var thread = new Js8Thread(line);
+        thread = new Js8Thread(line);
         this.threads.push(thread);
     }
     thread.pushMessage(message);
     this.tbody.scrollTop(this.tbody[0].scrollHeight);
-}
+};
 
 $.fn.js8 = function() {
     if (!this.data('threader')) {
         this.data('threader', new Js8Threader(this));
     }
     return this.data('threader');
-}
\ No newline at end of file
+};
\ No newline at end of file

From 0c12d07a26fb1158d108bab3439f34e73ee5ca80 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 20 Apr 2020 22:07:21 +0200
Subject: [PATCH 221/475] finalize visual message representation

---
 htdocs/css/openwebrx.css | 16 +++++++++++-----
 htdocs/lib/Js8Threads.js |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index 9c939a0..b5693c8 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -960,13 +960,19 @@ img.openwebrx-mirror-img
 }
 
 #openwebrx-panel-js8-message .message {
-    width: 470px;
-    max-width: 470px;
+    width: 465px;
+    max-width: 465px;
+}
+
+#openwebrx-panel-js8-message td.message {
     white-space: nowrap;
     overflow: hidden;
-    text-overflow: ellipsis;
-    direction: rtl;
-    text-align: left;
+    display: flex;
+    flex-direction: row-reverse;
+}
+
+#openwebrx-panel-js8-message .message div {
+    flex: 1;
 }
 
 #openwebrx-panel-js8-message .decimal {
diff --git a/htdocs/lib/Js8Threads.js b/htdocs/lib/Js8Threads.js
index b191061..fcecfa6 100644
--- a/htdocs/lib/Js8Threads.js
+++ b/htdocs/lib/Js8Threads.js
@@ -21,7 +21,7 @@ Js8Thread.prototype.render = function() {
     this.el.html(
         '<td>' + this.renderTimestamp(this.getLatestTimestamp()) + '</td>' +
         '<td class="decimal freq">' + Math.round(this.getAverageFrequency()) + '</td>' +
-        '<td class="message">&lrm;' + this.renderMessages() + '</td>'
+        '<td class="message"><div>' + this.renderMessages() + '</div></td>'
     );
 };
 

From aa4362fe9fdba1a8fb49f453826fb5c912bbb81b Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 20 Apr 2020 22:12:33 +0200
Subject: [PATCH 222/475] add js8 to the changelog

---
 CHANGELOG.md     | 3 +++
 debian/changelog | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5ae9f0..23dab09 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,9 @@
 - Added support for bias tee control on rtl_sdr devices
 - All connector driven SDRs now support `"rf_gain": "auto"` to enable AGC
 - `rtl_sdr` type now also supports the `direct_sampling` option
+- Added decoding implementation for for digimode "JS8Call"
+  (requires an installation of [js8call](http://js8call.com/) and
+  [the js8py library](https://github.com/jketterl/js8py))
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index ded59bd..b4497f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
   * Added support for bias tee control on rtl_sdr devices
   * All connector driven SDRs now support `"rf_gain": "auto"` to enable AGC
   * `rtl_sdr` type now also supports the `direct_sampling` option
+  * Added decoding implementation for for digimode "JS8Call" (requires an
+    installation of js8call and the js8py library)
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From 681a583711569a9928fb9a949acb5c358a0aca6c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <dd5jfk@darc.de>
Date: Tue, 21 Apr 2020 18:11:07 +0200
Subject: [PATCH 223/475] always begin a new message if the flag says so

---
 htdocs/lib/Js8Threads.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/htdocs/lib/Js8Threads.js b/htdocs/lib/Js8Threads.js
index fcecfa6..12997a6 100644
--- a/htdocs/lib/Js8Threads.js
+++ b/htdocs/lib/Js8Threads.js
@@ -100,7 +100,11 @@ Js8Threader.prototype.findThread = function(freq) {
 };
 
 Js8Threader.prototype.pushMessage = function(message) {
-    var thread = this.findThread(message.freq);
+    var thread;
+    // only look for exising threads if the message is not a starting message
+    if ((message.thread_type & 1) === 0) {
+        thread = this.findThread(message.freq);
+    }
     if (!thread) {
         var line = $("<tr></tr>");
         this.tbody.append(line);

From 0a16500133c17bf9257a6f059cbaefbaea0d4402 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 21 Apr 2020 19:24:57 +0200
Subject: [PATCH 224/475] get avatar path from pkg_resources, refs #108

---
 owrx/controllers/status.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/owrx/controllers/status.py b/owrx/controllers/status.py
index 1c73f66..61f7102 100644
--- a/owrx/controllers/status.py
+++ b/owrx/controllers/status.py
@@ -5,6 +5,7 @@ from owrx.sdr import SdrService
 from owrx.config import Config
 import os
 import json
+import pkg_resources
 
 
 class StatusController(Controller):
@@ -12,6 +13,7 @@ class StatusController(Controller):
         pm = Config.get()
         # convert to old format
         gps = (pm["receiver_gps"]["lat"], pm["receiver_gps"]["lon"])
+        avatar_path = pkg_resources.resource_filename("htdocs", "gfx/openwebrx-avatar.png")
         # TODO keys that have been left out since they are no longer simple strings: sdr_hw, bands, antenna
         vars = {
             "status": "active",
@@ -23,7 +25,7 @@ class StatusController(Controller):
             "asl": pm["receiver_asl"],
             "loc": pm["receiver_location"],
             "sw_version": openwebrx_version,
-            "avatar_ctime": os.path.getctime("htdocs/gfx/openwebrx-avatar.png"),
+            "avatar_ctime": os.path.getctime(avatar_path),
         }
         self.send_response("\n".join(["{key}={value}".format(key=key, value=value) for key, value in vars.items()]))
 

From 4f07c62cc9364969fb4adf7e74a4e05d821db801 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 21 Apr 2020 21:00:16 +0200
Subject: [PATCH 225/475] use the latest available thread

---
 htdocs/lib/Js8Threads.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/lib/Js8Threads.js b/htdocs/lib/Js8Threads.js
index 12997a6..d665b10 100644
--- a/htdocs/lib/Js8Threads.js
+++ b/htdocs/lib/Js8Threads.js
@@ -96,6 +96,9 @@ Js8Threader.prototype.findThread = function(freq) {
         // max frequency deviation: 5 Hz. this may be a little tight.
         return thread.isOpen() && Math.abs(thread.getAverageFrequency() - freq) <= 5;
     });
+    matching.sort(function(a, b){
+        return b.getLatestTimestamp() - a.getLatestTimestamp();
+    });
     return matching[0] || false;
 };
 

From 78ccaa7d65ba3fb23b8729b907756c8a08e98c64 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 22 Apr 2020 18:28:45 +0200
Subject: [PATCH 226/475] access regex groups in python 3.5 compatible way,
 closes #109

---
 owrx/feature.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/feature.py b/owrx/feature.py
index df2434b..24cd547 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -252,7 +252,7 @@ class FeatureDetector(object):
             for line in process.stdout:
                 matches = factory_regex.match(line.decode())
                 if matches:
-                    drivers = [s.strip() for s in matches[1].split(", ")]
+                    drivers = [s.strip() for s in matches.group(1).split(", ")]
 
             return driver in drivers
         except FileNotFoundError:

From 0120b33a25767b40506e91abbefb2957506e40a3 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 22 Apr 2020 23:53:19 +0200
Subject: [PATCH 227/475] refactor chopper out of wsjt

---
 csdr/csdr.py  |  23 ++---
 owrx/audio.py | 226 +++++++++++++++++++++++++++++++++++++++++++++++++
 owrx/js8.py   |   4 +-
 owrx/wsjt.py  | 227 ++------------------------------------------------
 4 files changed, 249 insertions(+), 231 deletions(-)
 create mode 100644 owrx/audio.py

diff --git a/csdr/csdr.py b/csdr/csdr.py
index ac4dee3..07feb01 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -29,8 +29,9 @@ import math
 from functools import partial
 
 from owrx.kiss import KissClient, DirewolfConfig
-from owrx.wsjt import Ft8Chopper, WsprChopper, Jt9Chopper, Jt65Chopper, Ft4Chopper
-from owrx.js8 import Js8Chopper
+from owrx.wsjt import Ft8Profile, WsprProfile, Jt9Profile, Jt65Profile, Ft4Profile
+from owrx.js8 import Js8NormalProfile
+from owrx.audio import AudioChopper
 
 import logging
 
@@ -450,23 +451,23 @@ class dsp(object):
 
         if self.isWsjtMode():
             smd = self.get_secondary_demodulator()
-            chopper_cls = None
+            chopper_profile = None
             output_name = "wsjt_demod"
             if smd == "ft8":
-                chopper_cls = Ft8Chopper
+                chopper_profile = Ft8Profile()
             elif smd == "wspr":
-                chopper_cls = WsprChopper
+                chopper_profile = WsprProfile()
             elif smd == "jt65":
-                chopper_cls = Jt65Chopper
+                chopper_profile = Jt65Profile()
             elif smd == "jt9":
-                chopper_cls = Jt9Chopper
+                chopper_profile = Jt9Profile()
             elif smd == "ft4":
-                chopper_cls = Ft4Chopper
+                chopper_profile = Ft4Profile()
             elif smd == "js8":
-                chopper_cls = Js8Chopper
+                chopper_profile = Js8NormalProfile()
                 output_name = "js8_demod"
-            if chopper_cls is not None:
-                chopper = chopper_cls(self, self.secondary_process_demod.stdout)
+            if chopper_profile is not None:
+                chopper = AudioChopper(self, self.secondary_process_demod.stdout, chopper_profile)
                 chopper.start()
                 self.output.send_output(output_name, chopper.read)
         elif self.isPacket():
diff --git a/owrx/audio.py b/owrx/audio.py
new file mode 100644
index 0000000..90b22a5
--- /dev/null
+++ b/owrx/audio.py
@@ -0,0 +1,226 @@
+from abc import ABC, ABCMeta, abstractmethod
+from owrx.config import Config
+from owrx.metrics import Metrics, CounterMetric, DirectMetric
+import threading
+import wave
+import subprocess
+import os
+from multiprocessing.connection import Pipe
+from datetime import datetime, timedelta
+from queue import Queue, Full
+
+
+import logging
+
+logger = logging.getLogger(__name__)
+logger.setLevel(logging.INFO)
+
+
+class QueueJob(object):
+    def __init__(self, decoder, file, freq):
+        self.decoder = decoder
+        self.file = file
+        self.freq = freq
+
+    def run(self):
+        self.decoder.decode(self)
+
+
+class QueueWorker(threading.Thread):
+    def __init__(self, queue):
+        self.queue = queue
+        self.doRun = True
+        super().__init__(daemon=True)
+
+    def run(self) -> None:
+        while self.doRun:
+            job = self.queue.get()
+            try:
+                job.run()
+            except Exception:
+                logger.exception("failed to decode job")
+                self.queue.onError()
+            self.queue.task_done()
+
+
+class DecoderQueue(Queue):
+    sharedInstance = None
+    creationLock = threading.Lock()
+
+    @staticmethod
+    def getSharedInstance():
+        with DecoderQueue.creationLock:
+            if DecoderQueue.sharedInstance is None:
+                pm = Config.get()
+                DecoderQueue.sharedInstance = DecoderQueue(maxsize=pm["wsjt_queue_length"], workers=pm["wsjt_queue_workers"])
+        return DecoderQueue.sharedInstance
+
+    def __init__(self, maxsize, workers):
+        super().__init__(maxsize)
+        metrics = Metrics.getSharedInstance()
+        metrics.addMetric("wsjt.queue.length", DirectMetric(self.qsize))
+        self.inCounter = CounterMetric()
+        metrics.addMetric("wsjt.queue.in", self.inCounter)
+        self.outCounter = CounterMetric()
+        metrics.addMetric("wsjt.queue.out", self.outCounter)
+        self.overflowCounter = CounterMetric()
+        metrics.addMetric("wsjt.queue.overflow", self.overflowCounter)
+        self.errorCounter = CounterMetric()
+        metrics.addMetric("wsjt.queue.error", self.errorCounter)
+        self.workers = [self.newWorker() for _ in range(0, workers)]
+
+    def put(self, item, **kwars):
+        self.inCounter.inc()
+        try:
+            super(DecoderQueue, self).put(item, block=False)
+        except Full:
+            self.overflowCounter.inc()
+            raise
+
+    def get(self, **kwargs):
+        # super.get() is blocking, so it would mess up the stats to inc() first
+        out = super(DecoderQueue, self).get(**kwargs)
+        self.outCounter.inc()
+        return out
+
+    def newWorker(self):
+        worker = QueueWorker(self)
+        worker.start()
+        return worker
+
+    def onError(self):
+        self.errorCounter.inc()
+
+
+class AudioChopperProfile(ABC):
+    @abstractmethod
+    def getInterval(self):
+        pass
+
+    @abstractmethod
+    def getFileTimestampFormat(self):
+        pass
+
+    @abstractmethod
+    def decoder_commandline(self, file):
+        pass
+
+    def decoding_depth(self, mode):
+        pm = Config.get()
+        # mode-specific setting?
+        if "wsjt_decoding_depths" in pm and mode in pm["wsjt_decoding_depths"]:
+            return pm["wsjt_decoding_depths"][mode]
+        # return global default
+        if "wsjt_decoding_depth" in pm:
+            return pm["wsjt_decoding_depth"]
+        # default when no setting is provided
+        return 3
+
+
+class AudioChopper(threading.Thread, metaclass=ABCMeta):
+    def __init__(self, dsp, source, profile: AudioChopperProfile):
+        self.dsp = dsp
+        self.source = source
+        self.profile = profile
+        self.tmp_dir = Config.get()["temporary_directory"]
+        self.wavefile = None
+        self.wavefilename = None
+        self.switchingLock = threading.Lock()
+        self.timer = None
+        (self.outputReader, self.outputWriter) = Pipe()
+        self.doRun = True
+        super().__init__()
+
+    def getWaveFile(self):
+        filename = "{tmp_dir}/openwebrx-audiochopper-{id}-{timestamp}.wav".format(
+            tmp_dir=self.tmp_dir, id=id(self), timestamp=datetime.utcnow().strftime(self.profile.getFileTimestampFormat())
+        )
+        wavefile = wave.open(filename, "wb")
+        wavefile.setnchannels(1)
+        wavefile.setsampwidth(2)
+        wavefile.setframerate(12000)
+        return filename, wavefile
+
+    def getNextDecodingTime(self):
+        t = datetime.utcnow()
+        zeroed = t.replace(minute=0, second=0, microsecond=0)
+        delta = t - zeroed
+        interval = self.profile.getInterval()
+        seconds = (int(delta.total_seconds() / interval) + 1) * interval
+        t = zeroed + timedelta(seconds=seconds)
+        logger.debug("scheduling: {0}".format(t))
+        return t
+
+    def cancelTimer(self):
+        if self.timer:
+            self.timer.cancel()
+            self.timer = None
+
+    def _scheduleNextSwitch(self):
+        self.cancelTimer()
+        if self.doRun:
+            delta = self.getNextDecodingTime() - datetime.utcnow()
+            self.timer = threading.Timer(delta.total_seconds(), self.switchFiles)
+            self.timer.start()
+
+    def switchFiles(self):
+        self.switchingLock.acquire()
+        file = self.wavefile
+        filename = self.wavefilename
+        (self.wavefilename, self.wavefile) = self.getWaveFile()
+        self.switchingLock.release()
+
+        file.close()
+        try:
+            DecoderQueue.getSharedInstance().put(QueueJob(self, filename, self.dsp.get_operating_freq()))
+        except Full:
+            logger.warning("wsjt decoding queue overflow; dropping one file")
+            os.unlink(filename)
+        self._scheduleNextSwitch()
+
+    def decode(self, job: QueueJob):
+        logger.debug("processing file %s", job.file)
+        decoder = subprocess.Popen(
+            ["nice", "-n", "10"] + self.profile.decoder_commandline(job.file),
+            stdout=subprocess.PIPE,
+            cwd=self.tmp_dir,
+            close_fds=True,
+            )
+        for line in decoder.stdout:
+            self.outputWriter.send((job.freq, line))
+        try:
+            rc = decoder.wait(timeout=10)
+            if rc != 0:
+                logger.warning("decoder return code: %i", rc)
+        except subprocess.TimeoutExpired:
+            logger.warning("subprocess (pid=%i}) did not terminate correctly; sending kill signal.", decoder.pid)
+            decoder.kill()
+        os.unlink(job.file)
+
+    def run(self) -> None:
+        logger.debug("WSJT chopper starting up")
+        (self.wavefilename, self.wavefile) = self.getWaveFile()
+        self._scheduleNextSwitch()
+        while self.doRun:
+            data = self.source.read(256)
+            if data is None or (isinstance(data, bytes) and len(data) == 0):
+                self.doRun = False
+            else:
+                self.switchingLock.acquire()
+                self.wavefile.writeframes(data)
+                self.switchingLock.release()
+
+        logger.debug("WSJT chopper shutting down")
+        self.outputReader.close()
+        self.outputWriter.close()
+        self.cancelTimer()
+        try:
+            os.unlink(self.wavefilename)
+        except Exception:
+            logger.exception("error removing undecoded file")
+
+    def read(self):
+        try:
+            return self.outputReader.recv()
+        except EOFError:
+            return None
diff --git a/owrx/js8.py b/owrx/js8.py
index 796e4eb..303a273 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -1,4 +1,4 @@
-from .wsjt import WsjtChopper
+from .audio import AudioChopperProfile
 from .parser import Parser
 import re
 from js8py import Js8
@@ -12,7 +12,7 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-class Js8Chopper(WsjtChopper):
+class Js8NormalProfile(AudioChopperProfile):
     def getInterval(self):
         return 15
 
diff --git a/owrx/wsjt.py b/owrx/wsjt.py
index 982e475..475e3b3 100644
--- a/owrx/wsjt.py
+++ b/owrx/wsjt.py
@@ -1,17 +1,11 @@
-import threading
-import wave
-from datetime import datetime, timedelta, timezone
-import subprocess
-import os
-from multiprocessing.connection import Pipe
+from datetime import datetime, timezone
 from owrx.map import Map, LocatorLocation
 import re
-from queue import Queue, Full
-from owrx.config import Config
-from owrx.metrics import Metrics, CounterMetric, DirectMetric
+from owrx.metrics import Metrics, CounterMetric
 from owrx.pskreporter import PskReporter
 from owrx.parser import Parser
-from abc import ABC, ABCMeta, abstractmethod
+from owrx.audio import AudioChopperProfile
+from abc import ABC, abstractmethod
 
 import logging
 
@@ -19,210 +13,7 @@ logger = logging.getLogger(__name__)
 logger.setLevel(logging.INFO)
 
 
-class QueueJob(object):
-    def __init__(self, decoder, file, freq):
-        self.decoder = decoder
-        self.file = file
-        self.freq = freq
-
-    def run(self):
-        self.decoder.decode(self)
-
-
-class WsjtQueueWorker(threading.Thread):
-    def __init__(self, queue):
-        self.queue = queue
-        self.doRun = True
-        super().__init__(daemon=True)
-
-    def run(self) -> None:
-        while self.doRun:
-            job = self.queue.get()
-            try:
-                job.run()
-            except Exception:
-                logger.exception("failed to decode job")
-                self.queue.onError()
-            self.queue.task_done()
-
-
-class WsjtQueue(Queue):
-    sharedInstance = None
-    creationLock = threading.Lock()
-
-    @staticmethod
-    def getSharedInstance():
-        with WsjtQueue.creationLock:
-            if WsjtQueue.sharedInstance is None:
-                pm = Config.get()
-                WsjtQueue.sharedInstance = WsjtQueue(maxsize=pm["wsjt_queue_length"], workers=pm["wsjt_queue_workers"])
-        return WsjtQueue.sharedInstance
-
-    def __init__(self, maxsize, workers):
-        super().__init__(maxsize)
-        metrics = Metrics.getSharedInstance()
-        metrics.addMetric("wsjt.queue.length", DirectMetric(self.qsize))
-        self.inCounter = CounterMetric()
-        metrics.addMetric("wsjt.queue.in", self.inCounter)
-        self.outCounter = CounterMetric()
-        metrics.addMetric("wsjt.queue.out", self.outCounter)
-        self.overflowCounter = CounterMetric()
-        metrics.addMetric("wsjt.queue.overflow", self.overflowCounter)
-        self.errorCounter = CounterMetric()
-        metrics.addMetric("wsjt.queue.error", self.errorCounter)
-        self.workers = [self.newWorker() for _ in range(0, workers)]
-
-    def put(self, item):
-        self.inCounter.inc()
-        try:
-            super(WsjtQueue, self).put(item, block=False)
-        except Full:
-            self.overflowCounter.inc()
-            raise
-
-    def get(self, **kwargs):
-        # super.get() is blocking, so it would mess up the stats to inc() first
-        out = super(WsjtQueue, self).get(**kwargs)
-        self.outCounter.inc()
-        return out
-
-    def newWorker(self):
-        worker = WsjtQueueWorker(self)
-        worker.start()
-        return worker
-
-    def onError(self):
-        self.errorCounter.inc()
-
-
-class WsjtChopper(threading.Thread, metaclass=ABCMeta):
-    def __init__(self, dsp, source):
-        self.dsp = dsp
-        self.source = source
-        self.tmp_dir = Config.get()["temporary_directory"]
-        (self.wavefilename, self.wavefile) = self.getWaveFile()
-        self.switchingLock = threading.Lock()
-        self.timer = None
-        (self.outputReader, self.outputWriter) = Pipe()
-        self.doRun = True
-        super().__init__()
-
-    @abstractmethod
-    def getInterval(self):
-        pass
-
-    @abstractmethod
-    def getFileTimestampFormat(self):
-        pass
-
-    def getWaveFile(self):
-        filename = "{tmp_dir}/openwebrx-wsjtchopper-{id}-{timestamp}.wav".format(
-            tmp_dir=self.tmp_dir, id=id(self), timestamp=datetime.utcnow().strftime(self.getFileTimestampFormat())
-        )
-        wavefile = wave.open(filename, "wb")
-        wavefile.setnchannels(1)
-        wavefile.setsampwidth(2)
-        wavefile.setframerate(12000)
-        return filename, wavefile
-
-    def getNextDecodingTime(self):
-        t = datetime.utcnow()
-        zeroed = t.replace(minute=0, second=0, microsecond=0)
-        delta = t - zeroed
-        interval = self.getInterval()
-        seconds = (int(delta.total_seconds() / interval) + 1) * interval
-        t = zeroed + timedelta(seconds=seconds)
-        logger.debug("scheduling: {0}".format(t))
-        return t
-
-    def cancelTimer(self):
-        if self.timer:
-            self.timer.cancel()
-
-    def _scheduleNextSwitch(self):
-        if self.doRun:
-            delta = self.getNextDecodingTime() - datetime.utcnow()
-            self.timer = threading.Timer(delta.total_seconds(), self.switchFiles)
-            self.timer.start()
-
-    def switchFiles(self):
-        self.switchingLock.acquire()
-        file = self.wavefile
-        filename = self.wavefilename
-        (self.wavefilename, self.wavefile) = self.getWaveFile()
-        self.switchingLock.release()
-
-        file.close()
-        try:
-            WsjtQueue.getSharedInstance().put(QueueJob(self, filename, self.dsp.get_operating_freq()))
-        except Full:
-            logger.warning("wsjt decoding queue overflow; dropping one file")
-            os.unlink(filename)
-        self._scheduleNextSwitch()
-
-    @abstractmethod
-    def decoder_commandline(self, file):
-        pass
-
-    def decode(self, job: QueueJob):
-        logger.debug("processing file %s", job.file)
-        decoder = subprocess.Popen(
-            ["nice", "-n", "10"] + self.decoder_commandline(job.file),
-            stdout=subprocess.PIPE,
-            cwd=self.tmp_dir,
-            close_fds=True,
-        )
-        for line in decoder.stdout:
-            self.outputWriter.send((job.freq, line))
-        try:
-            rc = decoder.wait(timeout=10)
-            if rc != 0:
-                logger.warning("decoder return code: %i", rc)
-        except subprocess.TimeoutExpired:
-            logger.warning("subprocess (pid=%i}) did not terminate correctly; sending kill signal.", decoder.pid)
-            decoder.kill()
-        os.unlink(job.file)
-
-    def run(self) -> None:
-        logger.debug("WSJT chopper starting up")
-        self._scheduleNextSwitch()
-        while self.doRun:
-            data = self.source.read(256)
-            if data is None or (isinstance(data, bytes) and len(data) == 0):
-                self.doRun = False
-            else:
-                self.switchingLock.acquire()
-                self.wavefile.writeframes(data)
-                self.switchingLock.release()
-
-        logger.debug("WSJT chopper shutting down")
-        self.outputReader.close()
-        self.outputWriter.close()
-        self.cancelTimer()
-        try:
-            os.unlink(self.wavefilename)
-        except Exception:
-            logger.exception("error removing undecoded file")
-
-    def read(self):
-        try:
-            return self.outputReader.recv()
-        except EOFError:
-            return None
-
-    def decoding_depth(self, mode):
-        pm = Config.get()
-        # mode-specific setting?
-        if "wsjt_decoding_depths" in pm and mode in pm["wsjt_decoding_depths"]:
-            return pm["wsjt_decoding_depths"][mode]
-        # return global default
-        if "wsjt_decoding_depth" in pm:
-            return pm["wsjt_decoding_depth"]
-        # default when no setting is provided
-        return 3
-
-
-class Ft8Chopper(WsjtChopper):
+class Ft8Profile(AudioChopperProfile):
     def getInterval(self):
         return 15
 
@@ -233,7 +24,7 @@ class Ft8Chopper(WsjtChopper):
         return ["jt9", "--ft8", "-d", str(self.decoding_depth("ft8")), file]
 
 
-class WsprChopper(WsjtChopper):
+class WsprProfile(AudioChopperProfile):
     def getInterval(self):
         return 120
 
@@ -248,7 +39,7 @@ class WsprChopper(WsjtChopper):
         return cmd
 
 
-class Jt65Chopper(WsjtChopper):
+class Jt65Profile(AudioChopperProfile):
     def getInterval(self):
         return 60
 
@@ -259,7 +50,7 @@ class Jt65Chopper(WsjtChopper):
         return ["jt9", "--jt65", "-d", str(self.decoding_depth("jt65")), file]
 
 
-class Jt9Chopper(WsjtChopper):
+class Jt9Profile(AudioChopperProfile):
     def getInterval(self):
         return 60
 
@@ -270,7 +61,7 @@ class Jt9Chopper(WsjtChopper):
         return ["jt9", "--jt9", "-d", str(self.decoding_depth("jt9")), file]
 
 
-class Ft4Chopper(WsjtChopper):
+class Ft4Profile(AudioChopperProfile):
     def getInterval(self):
         return 7.5
 

From 5ab2f02f63e97efbf1035161e99a8da4edf78c77 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 23 Apr 2020 00:21:59 +0200
Subject: [PATCH 228/475] multi-profile decoding

---
 owrx/audio.py | 64 +++++++++++++++++++++++++++++++++------------------
 owrx/js8.py   | 59 ++++++++++++++++++++++++-----------------------
 owrx/wsjt.py  | 54 +++++++++++++++++++++----------------------
 3 files changed, 99 insertions(+), 78 deletions(-)

diff --git a/owrx/audio.py b/owrx/audio.py
index 90b22a5..4e81f06 100644
--- a/owrx/audio.py
+++ b/owrx/audio.py
@@ -5,7 +5,7 @@ import threading
 import wave
 import subprocess
 import os
-from multiprocessing.connection import Pipe
+from multiprocessing.connection import Pipe, wait
 from datetime import datetime, timedelta
 from queue import Queue, Full
 
@@ -13,7 +13,7 @@ from queue import Queue, Full
 import logging
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
+#logger.setLevel(logging.INFO)
 
 
 class QueueJob(object):
@@ -117,7 +117,7 @@ class AudioChopperProfile(ABC):
         return 3
 
 
-class AudioChopper(threading.Thread, metaclass=ABCMeta):
+class AudioWriter(object):
     def __init__(self, dsp, source, profile: AudioChopperProfile):
         self.dsp = dsp
         self.source = source
@@ -128,12 +128,12 @@ class AudioChopper(threading.Thread, metaclass=ABCMeta):
         self.switchingLock = threading.Lock()
         self.timer = None
         (self.outputReader, self.outputWriter) = Pipe()
-        self.doRun = True
-        super().__init__()
 
     def getWaveFile(self):
         filename = "{tmp_dir}/openwebrx-audiochopper-{id}-{timestamp}.wav".format(
-            tmp_dir=self.tmp_dir, id=id(self), timestamp=datetime.utcnow().strftime(self.profile.getFileTimestampFormat())
+            tmp_dir=self.tmp_dir,
+            id=id(self.profile),
+            timestamp=datetime.utcnow().strftime(self.profile.getFileTimestampFormat()),
         )
         wavefile = wave.open(filename, "wb")
         wavefile.setnchannels(1)
@@ -158,10 +158,9 @@ class AudioChopper(threading.Thread, metaclass=ABCMeta):
 
     def _scheduleNextSwitch(self):
         self.cancelTimer()
-        if self.doRun:
-            delta = self.getNextDecodingTime() - datetime.utcnow()
-            self.timer = threading.Timer(delta.total_seconds(), self.switchFiles)
-            self.timer.start()
+        delta = self.getNextDecodingTime() - datetime.utcnow()
+        self.timer = threading.Timer(delta.total_seconds(), self.switchFiles)
+        self.timer.start()
 
     def switchFiles(self):
         self.switchingLock.acquire()
@@ -197,20 +196,16 @@ class AudioChopper(threading.Thread, metaclass=ABCMeta):
             decoder.kill()
         os.unlink(job.file)
 
-    def run(self) -> None:
-        logger.debug("WSJT chopper starting up")
+    def start(self):
         (self.wavefilename, self.wavefile) = self.getWaveFile()
         self._scheduleNextSwitch()
-        while self.doRun:
-            data = self.source.read(256)
-            if data is None or (isinstance(data, bytes) and len(data) == 0):
-                self.doRun = False
-            else:
-                self.switchingLock.acquire()
-                self.wavefile.writeframes(data)
-                self.switchingLock.release()
 
-        logger.debug("WSJT chopper shutting down")
+    def write(self, data):
+        self.switchingLock.acquire()
+        self.wavefile.writeframes(data)
+        self.switchingLock.release()
+
+    def stop(self):
         self.outputReader.close()
         self.outputWriter.close()
         self.cancelTimer()
@@ -219,8 +214,33 @@ class AudioChopper(threading.Thread, metaclass=ABCMeta):
         except Exception:
             logger.exception("error removing undecoded file")
 
+
+class AudioChopper(threading.Thread, metaclass=ABCMeta):
+    def __init__(self, dsp, source, *profiles: AudioChopperProfile):
+        self.source = source
+        self.writers = [AudioWriter(dsp, source, p) for p in profiles]
+        self.doRun = True
+        super().__init__()
+
+    def run(self) -> None:
+        logger.debug("Audio chopper starting up")
+        for w in self.writers:
+            w.start()
+        while self.doRun:
+            data = self.source.read(256)
+            if data is None or (isinstance(data, bytes) and len(data) == 0):
+                self.doRun = False
+            else:
+                for w in self.writers:
+                    w.write(data)
+
+        logger.debug("Audio chopper shutting down")
+        for w in self.writers:
+            w.stop()
+
     def read(self):
         try:
-            return self.outputReader.recv()
+            readers = wait([w.outputReader for w in self.writers])
+            return [r.recv() for r in readers]
         except EOFError:
             return None
diff --git a/owrx/js8.py b/owrx/js8.py
index 303a273..5611f07 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -26,40 +26,41 @@ class Js8NormalProfile(AudioChopperProfile):
 class Js8Parser(Parser):
     decoderRegex = re.compile(" ?<Decode(Started|Debug|Finished)>")
 
-    def parse(self, raw):
-        try:
-            freq, raw_msg = raw
-            self.setDialFrequency(freq)
-            msg = raw_msg.decode().rstrip()
-            if Js8Parser.decoderRegex.match(msg):
-                return
-            if msg.startswith(" EOF on input file"):
-                return
+    def parse(self, messages):
+        for raw in messages:
+            try:
+                freq, raw_msg = raw
+                self.setDialFrequency(freq)
+                msg = raw_msg.decode().rstrip()
+                if Js8Parser.decoderRegex.match(msg):
+                    return
+                if msg.startswith(" EOF on input file"):
+                    return
 
-            logger.debug(msg)
+                logger.debug(msg)
 
-            frame = Js8().parse_message(msg)
-            self.handler.write_js8_message(frame, self.dial_freq)
-            logger.debug(frame)
+                frame = Js8().parse_message(msg)
+                self.handler.write_js8_message(frame, self.dial_freq)
+                logger.debug(frame)
 
-            self.pushDecode()
+                self.pushDecode()
 
-            if (isinstance(frame, Js8FrameHeartbeat) or isinstance(frame, Js8FrameCompound)) and frame.grid:
-                Map.getSharedInstance().updateLocation(
-                    frame.callsign, LocatorLocation(frame.grid), "JS8", self.band
-                )
-                PskReporter.getSharedInstance().spot({
-                    "callsign": frame.callsign,
-                    "mode": "JS8",
-                    "locator": frame.grid,
-                    "freq": self.dial_freq + frame.freq,
-                    "db": frame.db,
-                    "timestamp": frame.timestamp,
-                    "msg": str(frame)
-                })
+                if (isinstance(frame, Js8FrameHeartbeat) or isinstance(frame, Js8FrameCompound)) and frame.grid:
+                    Map.getSharedInstance().updateLocation(
+                        frame.callsign, LocatorLocation(frame.grid), "JS8", self.band
+                    )
+                    PskReporter.getSharedInstance().spot({
+                        "callsign": frame.callsign,
+                        "mode": "JS8",
+                        "locator": frame.grid,
+                        "freq": self.dial_freq + frame.freq,
+                        "db": frame.db,
+                        "timestamp": frame.timestamp,
+                        "msg": str(frame)
+                    })
 
-        except Exception:
-            logger.exception("error while parsing js8 message")
+            except Exception:
+                logger.exception("error while parsing js8 message")
 
     def pushDecode(self):
         metrics = Metrics.getSharedInstance()
diff --git a/owrx/wsjt.py b/owrx/wsjt.py
index 475e3b3..6e4ea1a 100644
--- a/owrx/wsjt.py
+++ b/owrx/wsjt.py
@@ -10,7 +10,6 @@ from abc import ABC, abstractmethod
 import logging
 
 logger = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 
 class Ft8Profile(AudioChopperProfile):
@@ -75,34 +74,35 @@ class Ft4Profile(AudioChopperProfile):
 class WsjtParser(Parser):
     modes = {"~": "FT8", "#": "JT65", "@": "JT9", "+": "FT4"}
 
-    def parse(self, data):
-        try:
-            freq, raw_msg = data
-            self.setDialFrequency(freq)
-            msg = raw_msg.decode().rstrip()
-            # known debug messages we know to skip
-            if msg.startswith("<DecodeFinished>"):
-                return
-            if msg.startswith(" EOF on input file"):
-                return
+    def parse(self, messages):
+        for data in messages:
+            try:
+                freq, raw_msg = data
+                self.setDialFrequency(freq)
+                msg = raw_msg.decode().rstrip()
+                # known debug messages we know to skip
+                if msg.startswith("<DecodeFinished>"):
+                    return
+                if msg.startswith(" EOF on input file"):
+                    return
 
-            modes = list(WsjtParser.modes.keys())
-            if msg[21] in modes or msg[19] in modes:
-                decoder = Jt9Decoder()
-            else:
-                decoder = WsprDecoder()
-            out = decoder.parse(msg, freq)
-            if "mode" in out:
-                self.pushDecode(out["mode"])
-                if "callsign" in out and "locator" in out:
-                    Map.getSharedInstance().updateLocation(
-                        out["callsign"], LocatorLocation(out["locator"]), out["mode"], self.band
-                    )
-                    PskReporter.getSharedInstance().spot(out)
+                modes = list(WsjtParser.modes.keys())
+                if msg[21] in modes or msg[19] in modes:
+                    decoder = Jt9Decoder()
+                else:
+                    decoder = WsprDecoder()
+                out = decoder.parse(msg, freq)
+                if "mode" in out:
+                    self.pushDecode(out["mode"])
+                    if "callsign" in out and "locator" in out:
+                        Map.getSharedInstance().updateLocation(
+                            out["callsign"], LocatorLocation(out["locator"]), out["mode"], self.band
+                        )
+                        PskReporter.getSharedInstance().spot(out)
 
-            self.handler.write_wsjt_message(out)
-        except ValueError:
-            logger.exception("error while parsing wsjt message")
+                self.handler.write_wsjt_message(out)
+            except ValueError:
+                logger.exception("error while parsing wsjt message")
 
     def pushDecode(self, mode):
         metrics = Metrics.getSharedInstance()

From 2df56ad8b97bf7801845b56435413696c62e415e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 23 Apr 2020 00:34:49 +0200
Subject: [PATCH 229/475] js8 slow mode (attempt?)

---
 owrx/audio.py |  4 ++--
 owrx/js8.py   | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/owrx/audio.py b/owrx/audio.py
index 4e81f06..0b1cbc4 100644
--- a/owrx/audio.py
+++ b/owrx/audio.py
@@ -13,7 +13,7 @@ from queue import Queue, Full
 import logging
 
 logger = logging.getLogger(__name__)
-#logger.setLevel(logging.INFO)
+logger.setLevel(logging.INFO)
 
 
 class QueueJob(object):
@@ -132,7 +132,7 @@ class AudioWriter(object):
     def getWaveFile(self):
         filename = "{tmp_dir}/openwebrx-audiochopper-{id}-{timestamp}.wav".format(
             tmp_dir=self.tmp_dir,
-            id=id(self.profile),
+            id=id(self),
             timestamp=datetime.utcnow().strftime(self.profile.getFileTimestampFormat()),
         )
         wavefile = wave.open(filename, "wb")
diff --git a/owrx/js8.py b/owrx/js8.py
index 5611f07..80b69ea 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -6,16 +6,14 @@ from js8py.frames import Js8FrameHeartbeat, Js8FrameCompound
 from owrx.map import Map, LocatorLocation
 from owrx.pskreporter import PskReporter
 from owrx.metrics import Metrics, CounterMetric
+from abc import ABCMeta
 
 import logging
 
 logger = logging.getLogger(__name__)
 
 
-class Js8NormalProfile(AudioChopperProfile):
-    def getInterval(self):
-        return 15
-
+class Js8Profile(AudioChopperProfile, metaclass=ABCMeta):
     def getFileTimestampFormat(self):
         return "%y%m%d_%H%M%S"
 
@@ -23,6 +21,16 @@ class Js8NormalProfile(AudioChopperProfile):
         return ["js8", "--js8", "-d", str(self.decoding_depth("js8")), file]
 
 
+class Js8NormalProfile(Js8Profile):
+    def getInterval(self):
+        return 15
+
+
+class Js8SlowProfile(Js8Profile):
+    def getInterval(self):
+        return 30
+
+
 class Js8Parser(Parser):
     decoderRegex = re.compile(" ?<Decode(Started|Debug|Finished)>")
 

From 280e39d9c4960b28b1ffde8af4d2fee02e7fa208 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 23 Apr 2020 22:19:07 +0200
Subject: [PATCH 230/475] js8 slow mode

---
 owrx/js8.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/owrx/js8.py b/owrx/js8.py
index 80b69ea..bc66626 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -6,7 +6,7 @@ from js8py.frames import Js8FrameHeartbeat, Js8FrameCompound
 from owrx.map import Map, LocatorLocation
 from owrx.pskreporter import PskReporter
 from owrx.metrics import Metrics, CounterMetric
-from abc import ABCMeta
+from abc import ABCMeta, abstractmethod
 
 import logging
 
@@ -18,18 +18,28 @@ class Js8Profile(AudioChopperProfile, metaclass=ABCMeta):
         return "%y%m%d_%H%M%S"
 
     def decoder_commandline(self, file):
-        return ["js8", "--js8", "-d", str(self.decoding_depth("js8")), file]
+        return ["js8", "--js8", "-b", self.get_sub_mode(), "-d", str(self.decoding_depth("js8")), file]
+
+    @abstractmethod
+    def get_sub_mode(self):
+        pass
 
 
 class Js8NormalProfile(Js8Profile):
     def getInterval(self):
         return 15
 
+    def get_sub_mode(self):
+        return "A"
+
 
 class Js8SlowProfile(Js8Profile):
     def getInterval(self):
         return 30
 
+    def get_sub_mode(self):
+        return "E"
+
 
 class Js8Parser(Parser):
     decoderRegex = re.compile(" ?<Decode(Started|Debug|Finished)>")

From 34838abfa9fba55bec2954e300aaf2da885b9fb8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 23 Apr 2020 22:21:26 +0200
Subject: [PATCH 231/475] profiles

---
 csdr/csdr.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 07feb01..cb994a4 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -30,7 +30,7 @@ from functools import partial
 
 from owrx.kiss import KissClient, DirewolfConfig
 from owrx.wsjt import Ft8Profile, WsprProfile, Jt9Profile, Jt65Profile, Ft4Profile
-from owrx.js8 import Js8NormalProfile
+from owrx.js8 import Js8NormalProfile, Js8SlowProfile
 from owrx.audio import AudioChopper
 
 import logging
@@ -451,23 +451,23 @@ class dsp(object):
 
         if self.isWsjtMode():
             smd = self.get_secondary_demodulator()
-            chopper_profile = None
+            chopper_profiles = None
             output_name = "wsjt_demod"
             if smd == "ft8":
-                chopper_profile = Ft8Profile()
+                chopper_profiles = [Ft8Profile()]
             elif smd == "wspr":
-                chopper_profile = WsprProfile()
+                chopper_profiles = [WsprProfile()]
             elif smd == "jt65":
-                chopper_profile = Jt65Profile()
+                chopper_profiles = [Jt65Profile()]
             elif smd == "jt9":
-                chopper_profile = Jt9Profile()
+                chopper_profiles = [Jt9Profile()]
             elif smd == "ft4":
-                chopper_profile = Ft4Profile()
+                chopper_profiles = [Ft4Profile()]
             elif smd == "js8":
-                chopper_profile = Js8NormalProfile()
+                chopper_profiles = [Js8NormalProfile(), Js8SlowProfile()]
                 output_name = "js8_demod"
-            if chopper_profile is not None:
-                chopper = AudioChopper(self, self.secondary_process_demod.stdout, chopper_profile)
+            if chopper_profiles is not None:
+                chopper = AudioChopper(self, self.secondary_process_demod.stdout, *chopper_profiles)
                 chopper.start()
                 self.output.send_output(output_name, chopper.read)
         elif self.isPacket():

From 623f21f769031359e59c25a0d7e42e5e9b65f9e3 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 23 Apr 2020 22:27:03 +0200
Subject: [PATCH 232/475] fast and turbo modes

---
 csdr/csdr.py |  4 ++--
 owrx/js8.py  | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index cb994a4..611ab19 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -30,7 +30,7 @@ from functools import partial
 
 from owrx.kiss import KissClient, DirewolfConfig
 from owrx.wsjt import Ft8Profile, WsprProfile, Jt9Profile, Jt65Profile, Ft4Profile
-from owrx.js8 import Js8NormalProfile, Js8SlowProfile
+from owrx.js8 import Js8NormalProfile, Js8SlowProfile, Js8FastProfile, Js8TurboProfile
 from owrx.audio import AudioChopper
 
 import logging
@@ -464,7 +464,7 @@ class dsp(object):
             elif smd == "ft4":
                 chopper_profiles = [Ft4Profile()]
             elif smd == "js8":
-                chopper_profiles = [Js8NormalProfile(), Js8SlowProfile()]
+                chopper_profiles = [Js8NormalProfile(), Js8SlowProfile(), Js8FastProfile(), Js8TurboProfile()]
                 output_name = "js8_demod"
             if chopper_profiles is not None:
                 chopper = AudioChopper(self, self.secondary_process_demod.stdout, *chopper_profiles)
diff --git a/owrx/js8.py b/owrx/js8.py
index bc66626..859c1d0 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -41,6 +41,22 @@ class Js8SlowProfile(Js8Profile):
         return "E"
 
 
+class Js8FastProfile(Js8Profile):
+    def getInterval(self):
+        return 10
+
+    def get_sub_mode(self):
+        return "B"
+
+
+class Js8TurboProfile(Js8Profile):
+    def getInterval(self):
+        return 6
+
+    def get_sub_mode(self):
+        return "C"
+
+
 class Js8Parser(Parser):
     decoderRegex = re.compile(" ?<Decode(Started|Debug|Finished)>")
 

From 4e67be8a3c92ccffe77ac8d31ac341de62da6123 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 23 Apr 2020 23:30:56 +0200
Subject: [PATCH 233/475] dynamic profiles

---
 config_webrx.py |  3 +++
 csdr/csdr.py    |  4 ++--
 owrx/js8.py     | 20 +++++++++++++++++---
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index f9ad9bc..1829211 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -301,6 +301,9 @@ wsjt_decoding_depth = 3
 # jt65 seems to be somewhat prone to erroneous decodes, this setting handles that to some extent
 wsjt_decoding_depths = {"jt65": 1}
 
+# JS8 comes in different speeds: normal, slow, fast, turbo. This setting controls which ones are enabled.
+js8_enabled_profiles = ["normal", "slow"]
+
 temporary_directory = "/tmp"
 
 services_enabled = False
diff --git a/csdr/csdr.py b/csdr/csdr.py
index 611ab19..76c4876 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -30,7 +30,7 @@ from functools import partial
 
 from owrx.kiss import KissClient, DirewolfConfig
 from owrx.wsjt import Ft8Profile, WsprProfile, Jt9Profile, Jt65Profile, Ft4Profile
-from owrx.js8 import Js8NormalProfile, Js8SlowProfile, Js8FastProfile, Js8TurboProfile
+from owrx.js8 import Js8Profiles
 from owrx.audio import AudioChopper
 
 import logging
@@ -464,7 +464,7 @@ class dsp(object):
             elif smd == "ft4":
                 chopper_profiles = [Ft4Profile()]
             elif smd == "js8":
-                chopper_profiles = [Js8NormalProfile(), Js8SlowProfile(), Js8FastProfile(), Js8TurboProfile()]
+                chopper_profiles = Js8Profiles.getEnabledProfiles()
                 output_name = "js8_demod"
             if chopper_profiles is not None:
                 chopper = AudioChopper(self, self.secondary_process_demod.stdout, *chopper_profiles)
diff --git a/owrx/js8.py b/owrx/js8.py
index 859c1d0..8b41ce2 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -3,9 +3,10 @@ from .parser import Parser
 import re
 from js8py import Js8
 from js8py.frames import Js8FrameHeartbeat, Js8FrameCompound
-from owrx.map import Map, LocatorLocation
-from owrx.pskreporter import PskReporter
-from owrx.metrics import Metrics, CounterMetric
+from .map import Map, LocatorLocation
+from .pskreporter import PskReporter
+from .metrics import Metrics, CounterMetric
+from .config import Config
 from abc import ABCMeta, abstractmethod
 
 import logging
@@ -13,6 +14,19 @@ import logging
 logger = logging.getLogger(__name__)
 
 
+class Js8Profiles(object):
+    @staticmethod
+    def getEnabledProfiles():
+        config = Config.get()
+        profiles = config["js8_enabled_profiles"] if "js8_enabled_profiles" in config else []
+        return [Js8Profiles.loadProfile(p) for p in profiles]
+
+    @staticmethod
+    def loadProfile(profileName):
+        className = "Js8{0}Profile".format(profileName[0].upper() + profileName[1:].lower())
+        return globals()[className]()
+
+
 class Js8Profile(AudioChopperProfile, metaclass=ABCMeta):
     def getFileTimestampFormat(self):
         return "%y%m%d_%H%M%S"

From a828f61c72f9b025f26a6af00f9fb8ffa16ce3c4 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 24 Apr 2020 23:47:05 +0200
Subject: [PATCH 234/475] use right message delay for mode

---
 htdocs/lib/Js8Threads.js | 32 ++++++++++++++++++++++++++++----
 owrx/connection.py       |  3 ++-
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/htdocs/lib/Js8Threads.js b/htdocs/lib/Js8Threads.js
index d665b10..4cecf46 100644
--- a/htdocs/lib/Js8Threads.js
+++ b/htdocs/lib/Js8Threads.js
@@ -41,7 +41,7 @@ Js8Thread.prototype.renderMessages = function() {
         var msg = this.messages[i];
         if (msg.thread_type & 1) {
             res.push('[ ');
-        } else if (i === 0 || msg.timestamp - this.messages[i - 1].timestamp > 15000) {
+        } else if (i === 0 || msg.timestamp - this.messages[i - 1].timestamp > this.getMessageDuration()) {
             res.push(' ... ');
         }
         res.push(msg.msg);
@@ -54,6 +54,30 @@ Js8Thread.prototype.renderMessages = function() {
     return res.join('');
 };
 
+Js8Thread.prototype.getMessageDuration = function() {
+    switch (this.getMode()) {
+        case 'A':
+            return 15000;
+        case 'E':
+            return 30000;
+        case 'B':
+            return 10000;
+        case 'C':
+            return 6000;
+    }
+};
+
+Js8Thread.prototype.getMode = function() {
+    // we filter messages by mode, so the first one is as good as any
+    if (!this.messages.length) return;
+    return this.messages[0].mode;
+};
+
+Js8Thread.prototype.acceptsMode = function(mode) {
+    var currentMode = this.getMode();
+    return typeof(currentMode) === 'undefined' || currentMode === mode;
+};
+
 Js8Thread.prototype.renderTimestamp = function(timestamp) {
     var t = new Date(timestamp);
     var pad = function (i) {
@@ -91,10 +115,10 @@ Js8Threader.prototype.purgeOldMessages = function() {
     });
 };
 
-Js8Threader.prototype.findThread = function(freq) {
+Js8Threader.prototype.findThread = function(freq, mode) {
     var matching = this.threads.filter(function(thread) {
         // max frequency deviation: 5 Hz. this may be a little tight.
-        return thread.isOpen() && Math.abs(thread.getAverageFrequency() - freq) <= 5;
+        return thread.isOpen() && thread.acceptsMode(mode) && Math.abs(thread.getAverageFrequency() - freq) <= 5;
     });
     matching.sort(function(a, b){
         return b.getLatestTimestamp() - a.getLatestTimestamp();
@@ -106,7 +130,7 @@ Js8Threader.prototype.pushMessage = function(message) {
     var thread;
     // only look for exising threads if the message is not a starting message
     if ((message.thread_type & 1) === 0) {
-        thread = this.findThread(message.freq);
+        thread = this.findThread(message.freq, message.mode);
     }
     if (!thread) {
         var line = $("<tr></tr>");
diff --git a/owrx/connection.py b/owrx/connection.py
index 7432978..b483a22 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -341,7 +341,8 @@ class OpenWebRxReceiverClient(Client):
             "db": frame.db,
             "dt": frame.dt,
             "freq": freq + frame.freq,
-            "thread_type": frame.thread_type
+            "thread_type": frame.thread_type,
+            "mode": frame.mode
         }})
 
 

From 978eea400dbfd66f48444c1e8b78686d13b42bda Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Apr 2020 16:22:40 +0200
Subject: [PATCH 235/475] clean up wsjt remainders in absctract code

---
 config_webrx.py              | 15 +++++++++------
 owrx/audio.py                | 25 +++++++------------------
 owrx/controllers/settings.py |  4 ++--
 owrx/js8.py                  |  8 ++++++++
 owrx/wsjt.py                 | 26 ++++++++++++++++++++------
 5 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index 1829211..fc1fc12 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -285,16 +285,17 @@ google_maps_api_key = ""
 # in seconds; default: 2 hours
 map_position_retention_time = 2 * 60 * 60
 
-# wsjt decoder queue configuration
-# due to the nature of the wsjt operating modes (ft8, ft8, jt9, jt65 and wspr), the data is recorded for a given amount
-# of time (6.5 seconds up to 2 minutes) and decoded at the end. this can lead to very high peak loads.
+# decoder queue configuration
+# due to the nature of some operating modes (ft8, ft8, jt9, jt65, wspr and js8), the data is recorded for a given amount
+# of time (6 seconds up to 2 minutes) and decoded at the end. this can lead to very high peak loads.
 # to mitigate this, the recordings will be queued and processed in sequence.
 # the number of workers will limit the total amount of work (one worker will losely occupy one cpu / thread)
-wsjt_queue_workers = 2
+decoding_queue_workers = 2
 # the maximum queue length will cause decodes to be dumped if the workers cannot keep up
 # if you are running background services, make sure this number is high enough to accept the task influx during peaks
-# i.e. this should be higher than the number of wsjt services running at the same time
-wsjt_queue_length = 10
+# i.e. this should be higher than the number of decoding services running at the same time
+decoding_queue_length = 10
+
 # wsjt decoding depth will allow more results, but will also consume more cpu
 wsjt_decoding_depth = 3
 # can also be set for each mode separately
@@ -303,6 +304,8 @@ wsjt_decoding_depths = {"jt65": 1}
 
 # JS8 comes in different speeds: normal, slow, fast, turbo. This setting controls which ones are enabled.
 js8_enabled_profiles = ["normal", "slow"]
+# JS8 decoding depth; higher value will get more results, but will also consume more cpu
+js8_decoding_depth = 3
 
 temporary_directory = "/tmp"
 
diff --git a/owrx/audio.py b/owrx/audio.py
index 0b1cbc4..aa8b5c0 100644
--- a/owrx/audio.py
+++ b/owrx/audio.py
@@ -52,21 +52,21 @@ class DecoderQueue(Queue):
         with DecoderQueue.creationLock:
             if DecoderQueue.sharedInstance is None:
                 pm = Config.get()
-                DecoderQueue.sharedInstance = DecoderQueue(maxsize=pm["wsjt_queue_length"], workers=pm["wsjt_queue_workers"])
+                DecoderQueue.sharedInstance = DecoderQueue(maxsize=pm["decoding_queue_length"], workers=pm["decoding_queue_workers"])
         return DecoderQueue.sharedInstance
 
     def __init__(self, maxsize, workers):
         super().__init__(maxsize)
         metrics = Metrics.getSharedInstance()
-        metrics.addMetric("wsjt.queue.length", DirectMetric(self.qsize))
+        metrics.addMetric("decoding.queue.length", DirectMetric(self.qsize))
         self.inCounter = CounterMetric()
-        metrics.addMetric("wsjt.queue.in", self.inCounter)
+        metrics.addMetric("decoding.queue.in", self.inCounter)
         self.outCounter = CounterMetric()
-        metrics.addMetric("wsjt.queue.out", self.outCounter)
+        metrics.addMetric("decoding.queue.out", self.outCounter)
         self.overflowCounter = CounterMetric()
-        metrics.addMetric("wsjt.queue.overflow", self.overflowCounter)
+        metrics.addMetric("decoding.queue.overflow", self.overflowCounter)
         self.errorCounter = CounterMetric()
-        metrics.addMetric("wsjt.queue.error", self.errorCounter)
+        metrics.addMetric("decoding.queue.error", self.errorCounter)
         self.workers = [self.newWorker() for _ in range(0, workers)]
 
     def put(self, item, **kwars):
@@ -105,17 +105,6 @@ class AudioChopperProfile(ABC):
     def decoder_commandline(self, file):
         pass
 
-    def decoding_depth(self, mode):
-        pm = Config.get()
-        # mode-specific setting?
-        if "wsjt_decoding_depths" in pm and mode in pm["wsjt_decoding_depths"]:
-            return pm["wsjt_decoding_depths"][mode]
-        # return global default
-        if "wsjt_decoding_depth" in pm:
-            return pm["wsjt_decoding_depth"]
-        # default when no setting is provided
-        return 3
-
 
 class AudioWriter(object):
     def __init__(self, dsp, source, profile: AudioChopperProfile):
@@ -173,7 +162,7 @@ class AudioWriter(object):
         try:
             DecoderQueue.getSharedInstance().put(QueueJob(self, filename, self.dsp.get_operating_freq()))
         except Full:
-            logger.warning("wsjt decoding queue overflow; dropping one file")
+            logger.warning("decoding queue overflow; dropping one file")
             os.unlink(filename)
         self._scheduleNextSwitch()
 
diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index c5b6288..527253f 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -146,8 +146,8 @@ class SettingsController(AdminController):
         ),
         Section(
             "WSJT-X settings",
-            NumberInput("wsjt_queue_workers", "Number of WSJT decoding workers"),
-            NumberInput("wsjt_queue_length", "Maximum length of WSJT job queue"),
+            NumberInput("decoding_queue_workers", "Number of decoding workers"),
+            NumberInput("decoding_queue_length", "Maximum length of decoding job queue"),
             NumberInput(
                 "wsjt_decoding_depth",
                 "WSJT decoding depth",
diff --git a/owrx/js8.py b/owrx/js8.py
index 8b41ce2..c303d9d 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -28,6 +28,14 @@ class Js8Profiles(object):
 
 
 class Js8Profile(AudioChopperProfile, metaclass=ABCMeta):
+    def decoding_depth(self, mode):
+        pm = Config.get()
+        # return global default
+        if "js8_decoding_depth" in pm:
+            return pm["js8_decoding_depth"]
+        # default when no setting is provided
+        return 3
+
     def getFileTimestampFormat(self):
         return "%y%m%d_%H%M%S"
 
diff --git a/owrx/wsjt.py b/owrx/wsjt.py
index 6e4ea1a..046ae7d 100644
--- a/owrx/wsjt.py
+++ b/owrx/wsjt.py
@@ -5,14 +5,28 @@ from owrx.metrics import Metrics, CounterMetric
 from owrx.pskreporter import PskReporter
 from owrx.parser import Parser
 from owrx.audio import AudioChopperProfile
-from abc import ABC, abstractmethod
+from abc import ABC, ABCMeta, abstractmethod
+from owrx.config import Config
 
 import logging
 
 logger = logging.getLogger(__name__)
 
 
-class Ft8Profile(AudioChopperProfile):
+class WsjtProfile(AudioChopperProfile, metaclass=ABCMeta):
+    def decoding_depth(self, mode):
+        pm = Config.get()
+        # mode-specific setting?
+        if "wsjt_decoding_depths" in pm and mode in pm["wsjt_decoding_depths"]:
+            return pm["wsjt_decoding_depths"][mode]
+        # return global default
+        if "wsjt_decoding_depth" in pm:
+            return pm["wsjt_decoding_depth"]
+        # default when no setting is provided
+        return 3
+
+
+class Ft8Profile(WsjtProfile):
     def getInterval(self):
         return 15
 
@@ -23,7 +37,7 @@ class Ft8Profile(AudioChopperProfile):
         return ["jt9", "--ft8", "-d", str(self.decoding_depth("ft8")), file]
 
 
-class WsprProfile(AudioChopperProfile):
+class WsprProfile(WsjtProfile):
     def getInterval(self):
         return 120
 
@@ -38,7 +52,7 @@ class WsprProfile(AudioChopperProfile):
         return cmd
 
 
-class Jt65Profile(AudioChopperProfile):
+class Jt65Profile(WsjtProfile):
     def getInterval(self):
         return 60
 
@@ -49,7 +63,7 @@ class Jt65Profile(AudioChopperProfile):
         return ["jt9", "--jt65", "-d", str(self.decoding_depth("jt65")), file]
 
 
-class Jt9Profile(AudioChopperProfile):
+class Jt9Profile(WsjtProfile):
     def getInterval(self):
         return 60
 
@@ -60,7 +74,7 @@ class Jt9Profile(AudioChopperProfile):
         return ["jt9", "--jt9", "-d", str(self.decoding_depth("jt9")), file]
 
 
-class Ft4Profile(AudioChopperProfile):
+class Ft4Profile(WsjtProfile):
     def getInterval(self):
         return 7.5
 

From 2198c00d00415b34e7a6e046f896eea481e96edd Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Apr 2020 17:33:30 +0200
Subject: [PATCH 236/475] add js8 settings to web configuration

---
 owrx/controllers/settings.py | 14 ++++++++++++--
 owrx/form/__init__.py        | 11 +++++++++++
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 527253f..8243d09 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -11,6 +11,7 @@ from owrx.form import (
     DropdownInput,
     Option,
     ServicesCheckboxInput,
+    Js8ProfileCheckboxInput,
 )
 import logging
 
@@ -145,14 +146,23 @@ class SettingsController(AdminController):
             ),
         ),
         Section(
-            "WSJT-X settings",
+            "Decoding settings",
             NumberInput("decoding_queue_workers", "Number of decoding workers"),
             NumberInput("decoding_queue_length", "Maximum length of decoding job queue"),
             NumberInput(
                 "wsjt_decoding_depth",
-                "WSJT decoding depth",
+                "Default WSJT decoding depth",
                 infotext="A higher decoding depth will allow more results, but will also consume more cpu",
             ),
+            NumberInput(
+                "js8_decoding_depth",
+                "Js8Call decoding depth",
+                infotext="A higher decoding depth will allow more results, but will also consume more cpu",
+            ),
+            Js8ProfileCheckboxInput(
+                "js8_enabled_profiles",
+                "Js8Call enabled modes"
+            ),
         ),
         Section(
             "Background decoding",
diff --git a/owrx/form/__init__.py b/owrx/form/__init__.py
index 2861683..fb7160e 100644
--- a/owrx/form/__init__.py
+++ b/owrx/form/__init__.py
@@ -201,6 +201,17 @@ class ServicesCheckboxInput(MultiCheckboxInput):
         super().__init__(id, label, services, infotext)
 
 
+class Js8ProfileCheckboxInput(MultiCheckboxInput):
+    def __init__(self, id, label, infotext=None):
+        profiles = [
+            Option("normal", "Normal (15s, 50Hz, ~16WPM)"),
+            Option("slow", "Slow (30s, 25Hz, ~8WPM"),
+            Option("fast", "Fast (10s, 80Hz, ~24WPM"),
+            Option("turbo", "Turbo (6s, 160Hz, ~40WPM"),
+        ]
+        super().__init__(id, label, profiles, infotext)
+
+
 class DropdownInput(Input):
     def __init__(self, id, label, options, infotext=None):
         super().__init__(id, label, infotext=infotext)

From b58357741a743acdb73153e1111375181df6136f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Apr 2020 19:05:24 +0200
Subject: [PATCH 237/475] separate modes in here, too

---
 csdr/csdr.py | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 76c4876..8fe1606 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -338,7 +338,7 @@ class dsp(object):
                 "CSDR_FIXED_BUFSIZE=1 csdr dbpsk_decoder_c_u8",
                 "CSDR_FIXED_BUFSIZE=1 csdr psk31_varicode_decoder_u8_u8",
             ]
-        elif self.isWsjtMode(which):
+        elif self.isWsjtMode(which) or self.isJs8(which):
             chain += ["csdr realpart_cf"]
             if self.last_decimation != 1.0:
                 chain += ["csdr fractional_decimator_ff {last_decimation}"]
@@ -451,25 +451,25 @@ class dsp(object):
 
         if self.isWsjtMode():
             smd = self.get_secondary_demodulator()
-            chopper_profiles = None
-            output_name = "wsjt_demod"
+            chopper_profile = None
             if smd == "ft8":
-                chopper_profiles = [Ft8Profile()]
+                chopper_profile = Ft8Profile()
             elif smd == "wspr":
-                chopper_profiles = [WsprProfile()]
+                chopper_profile = WsprProfile()
             elif smd == "jt65":
-                chopper_profiles = [Jt65Profile()]
+                chopper_profile = Jt65Profile()
             elif smd == "jt9":
-                chopper_profiles = [Jt9Profile()]
+                chopper_profile = Jt9Profile()
             elif smd == "ft4":
-                chopper_profiles = [Ft4Profile()]
-            elif smd == "js8":
-                chopper_profiles = Js8Profiles.getEnabledProfiles()
-                output_name = "js8_demod"
-            if chopper_profiles is not None:
-                chopper = AudioChopper(self, self.secondary_process_demod.stdout, *chopper_profiles)
+                chopper_profile = Ft4Profile()
+            if chopper_profile is not None:
+                chopper = AudioChopper(self, self.secondary_process_demod.stdout, chopper_profile)
                 chopper.start()
-                self.output.send_output(output_name, chopper.read)
+                self.output.send_output("wsjt_demod", chopper.read)
+        elif self.isJs8():
+            chopper = AudioChopper(self, self.secondary_process_demod.stdout, *Js8Profiles.getEnabledProfiles())
+            chopper.start()
+            self.output.send_output("js8_demod", chopper.read)
         elif self.isPacket():
             # we best get the ax25 packets from the kiss socket
             kiss = KissClient(self.direwolf_port)
@@ -570,7 +570,7 @@ class dsp(object):
     def get_audio_rate(self):
         if self.isDigitalVoice() or self.isPacket() or self.isPocsag():
             return 48000
-        elif self.isWsjtMode():
+        elif self.isWsjtMode() or self.isJs8():
             return 12000
         return self.get_output_rate()
 
@@ -582,7 +582,12 @@ class dsp(object):
     def isWsjtMode(self, demodulator=None):
         if demodulator is None:
             demodulator = self.get_secondary_demodulator()
-        return demodulator in ["ft8", "wspr", "jt65", "jt9", "ft4", "js8"]
+        return demodulator in ["ft8", "wspr", "jt65", "jt9", "ft4"]
+
+    def isJs8(self, demodulator = None):
+        if demodulator is None:
+            demodulator = self.get_secondary_demodulator()
+        return demodulator == "js8"
 
     def isPacket(self, demodulator=None):
         if demodulator is None:

From e064352621187df00c8c6a1e202a69065d189eb6 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Apr 2020 19:18:30 +0200
Subject: [PATCH 238/475] finally, remove debugging

---
 owrx/js8.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/owrx/js8.py b/owrx/js8.py
index c303d9d..7d3c474 100644
--- a/owrx/js8.py
+++ b/owrx/js8.py
@@ -93,11 +93,8 @@ class Js8Parser(Parser):
                 if msg.startswith(" EOF on input file"):
                     return
 
-                logger.debug(msg)
-
                 frame = Js8().parse_message(msg)
                 self.handler.write_js8_message(frame, self.dial_freq)
-                logger.debug(frame)
 
                 self.pushDecode()
 

From 4a2b81c793fb2ca3fff49ed55327f8ad0b7cbbb2 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Apr 2020 20:32:11 +0200
Subject: [PATCH 239/475] use autogain on airspyhf

---
 config_webrx.py                          |   6 +-----
 htdocs/gfx/openwebrx-ha5kfu-top-logo.png | Bin 2010 -> 0 bytes
 2 files changed, 1 insertion(+), 5 deletions(-)
 delete mode 100644 htdocs/gfx/openwebrx-ha5kfu-top-logo.png

diff --git a/config_webrx.py b/config_webrx.py
index fc1fc12..27c4835 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -150,11 +150,11 @@ sdrs = {
         "name": "Airspy HF+",
         "type": "airspyhf",
         "ppm": 0,
+        "rf_gain": "auto",
         "profiles": {
             "20m": {
                 "name": "20m",
                 "center_freq": 14150000,
-                "rf_gain": 10,
                 "samp_rate": 768000,
                 "start_freq": 14070000,
                 "start_mod": "usb",
@@ -162,7 +162,6 @@ sdrs = {
             "30m": {
                 "name": "30m",
                 "center_freq": 10125000,
-                "rf_gain": 10,
                 "samp_rate": 192000,
                 "start_freq": 10142000,
                 "start_mod": "usb",
@@ -170,7 +169,6 @@ sdrs = {
             "40m": {
                 "name": "40m",
                 "center_freq": 7100000,
-                "rf_gain": 10,
                 "samp_rate": 256000,
                 "start_freq": 7070000,
                 "start_mod": "usb",
@@ -178,7 +176,6 @@ sdrs = {
             "80m": {
                 "name": "80m",
                 "center_freq": 3650000,
-                "rf_gain": 10,
                 "samp_rate": 768000,
                 "start_freq": 3570000,
                 "start_mod": "usb",
@@ -186,7 +183,6 @@ sdrs = {
             "49m": {
                 "name": "49m Broadcast",
                 "center_freq": 6000000,
-                "rf_gain": 10,
                 "samp_rate": 768000,
                 "start_freq": 6070000,
                 "start_mod": "am",
diff --git a/htdocs/gfx/openwebrx-ha5kfu-top-logo.png b/htdocs/gfx/openwebrx-ha5kfu-top-logo.png
deleted file mode 100644
index 2686eef0aa16eceddfa68cc79dbcd626de4bec4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2010
zcmV<02POE4P)<h;3K|Lk000e1NJLTq003hE0012b1^@s6z7x_U00004b3#c}2nYxW
zd<bNS00009a7bBm001Lj001Lj0q(#yr2qf`8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H12Ukf%K~!jg-C13X8&?(n&b2qm5|N#z3Q(yCwUEZHprYgzx?`at
zt+N86su5~=>1xY1Elr{0Ss{cpV?dxXHc~-Ip$TbUD&7hY8@s4YJzJ{&h_nxRsGXF8
zc%XoUwv(2JptbMeVSe^{JhsO_n=JVxYi8~}_nhN<?ma*E5;J2E=-Km20PW)Y51$-J
zI3e;i&sIKfVa5>vFA?GGu(4Ux?D)9r3EAN!VjqZiPh0T8`o_&!7RwA+3EdkI_&pe3
zVBp@cF<0{}03e_Y3AeeZxzpC`S|Wup01VqcBOt%#>70R;VWBes5L{xcr&;y+v)-d1
z+{l0h0V`McT<V~Fy%;5>F~n4ik*j+R2<Tvcb&u+Hnn$!>2Cw$*wT-(a#P?aCalIHN
zoiQdve$CTapaCQs;b8rr2eQ295dcVXTLk_UK>t=<)7!=UF93KU<jn$l{_JJ5d1S7#
z?SE*SK*Iz0Ti*e3mhU?})}K7|ymyo&o&&+fCO_8t>J1mdzI@HIneiA1S~P(92_m|p
z@?hpw5Y0w9B^WeU_Znd6Ah@jstuT(R*BaYujD8c8uX%Q~14fA%Yn~1PJscZ1O0)z2
zPYohcQ8C7g84MkaAB7W>U-R@_-D@ylf#8xvp|zkD(#DSFqUJV>n%ydDL_nDVD_8S4
zzvk&-KS>mrF*laJ*BH^xSXx>-FgrV&Q9Il1cKfNjR=x>las1WaJiWQOx$D%aQ~w%A
zP*>cLD5$~qV0~j>mc`>tm<L1e)zaTR@pLxK%>3O)Uv4eTy)=$)I|Wey&t|iK+T7gy
zl-fx|7Xh3EfOfn6TO!f{>={*v>OO9o)$VTSXh-d8n#=eL0p<932IiB}*}yQa?+*D~
zzIOScW^wM<qw2R)kS?1Nlh+vpl$#5Rf3JBq3s|G1xk0R%57XJu{k0afLcZqNkbH4c
zJ+CFMN@^Rf;P5+F_Zk3n2A;WC)E-F9Coou$g;}|pcb+6lVJw-h)>j{KW4r<2LjWBB
zZD#%(0DuJ((VNVCXi|Z>`ujfylTH$a)|f?Fv#8nmHP2;%GeI1pN%h(Z=rYFN_uu^O
z+8xD*!Gb|7Avp`+UVuAK-SyxvzV-5{Pfse4I`krd7bmTjgYmb9nbh@wE@OPS>!W+X
z^Z>vB10Vvztd{7lL5xh()FGt~01(1;9LMdUF${Y#d|wwxqA8V1Ib!}s)X<MtAa4<X
z*+|I1;t2SdhG7rm-6aF)(X)$3A2`*j9h3E(<2V=MbgQM(Dl>lsm}boI4PgcEfD$7V
zSPFd)jcJ-XF*jm-Ez>j$J(H%&OQ&BbZ=eo9G}$3tIiv{|KqF4y2PzLh%0C0>F$PPy
z3Zff<s}#UfgE@I}{R!CCxL}&54rU9?dQ!h(7<URFts%z3jxolG6DRiVo|)031|nCT
z7}GTMzAnY5T^}ewh{Un6UC@6x@U>V|Pdzj#c8oE0&&)ioemj*)!8DAm`o?!lZsK6(
zb*Eaj#}M1s2*msoDMY<esl3udD@3o`oC3OxK|)UL5@}>G-{&U`0DwOP&oZ_q!GiCH
zlkn((zEN-mz!Sp^yB&rAV#YZ1-o;P8{29FhLaB$6QDf$`ThlTPBXw{sm&;iY9aNfL
z2jIIFDI-1uT-E-rU8I7@1yOn61g4=;&{viMr&=93#>G!<pILtG%$X#@LeqT@z@4KC
zNQ3`;@WBt%?{H=I$)Hr4^Fx_4>yWY$rl~y;qTp02+v0Xcg#du#$B%yuz#M?xvfchf
z5@E)t6)P(%(?6bO-U^OHZhp<v^EJ=To!wYMccARvZ9<qJa#PAk-l@!1UqfAGWLH*J
zZer$hfPdT8AsV#3W|;Zh^78UmPM<!#F@Ua|<aY<SlFx^)|2U9GaK!O6NLZI{`BM3|
zzy5KHhvKS&r`t~nvs7wC8Cjo{70f!Ab+c4*(<TDrxF7-&7deQc#Vy!R3G<O|LJSjh
zSP0QLcI;SY2wf_~tJya{ch5Qiw2ImiK+Q|H>fHkZS7n-}ZW@Md8iw6(Ww$$>qp20~
zjb)jJ!D%Y&ln661Fwv2CXQ21iH3k4RaDq9L#_D(M-Me=N{(<6TAesk9M=ox&sM)!i
zXXR?1-zcM%A6~US1i+3}{8p({Iyxieg-$k`ky2)uS<7ZJKgFQa|5z=fAWT5Y!;Vab
z;2eN20zk0)8nJq)%XRi#yGoJnCU$C2CnHcayjE=$HEJ$uu3E4$@Nob=MI15zu1)kV
zcRH7dxha6xx_BqW7T+xqfO4PMW2s5QsOWKd!R}LjDvX|)&vyPR0s1Z&27nTnRzdjQ
z4V#y*#Azo*+#RUOtM?O02X&6)xT%9T01)*}%bjY~b}E$ugeYLzm9@`v7;L9n{drFX
zzDvp<KDd7JefaT25K$(0etoJ+`nWxM8$PjH1t8Hp5LM|mfO`OZw%<5vx1asllTW@g
sOc^C1@K0P-7dj>ap48{qrOOTe4?ZTDtFhq@9smFU07*qoM6N<$f=qd`SpWb4


From 4dc10fb6a3779d9c729c00e0d803e5425c4f31ff Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Apr 2020 20:36:08 +0200
Subject: [PATCH 240/475] lose the logo

---
 htdocs/css/openwebrx-header.css    | 8 +-------
 htdocs/include/header.include.html | 1 -
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/htdocs/css/openwebrx-header.css b/htdocs/css/openwebrx-header.css
index 884a049..c369fb1 100644
--- a/htdocs/css/openwebrx-header.css
+++ b/htdocs/css/openwebrx-header.css
@@ -47,12 +47,6 @@
     float: left;
 }
 
-#webrx-ha5kfu-top-logo
-{
-    float: right;
-    padding: 15px;
-}
-
 #webrx-rx-avatar
 {
     background-color: rgba(154, 154, 154, .5);
@@ -149,7 +143,7 @@
 
 #openwebrx-main-buttons
 {
-    padding: 5px 0;
+    padding: 5px 15px;
     display: flex;
     list-style: none;
     float: right;
diff --git a/htdocs/include/header.include.html b/htdocs/include/header.include.html
index 3a4fb11..ac48bc1 100644
--- a/htdocs/include/header.include.html
+++ b/htdocs/include/header.include.html
@@ -3,7 +3,6 @@
         <img src="static/gfx/openwebrx-top-photo.jpg" id="webrx-top-photo"/>
         <div id="webrx-top-bar" class="webrx-top-bar-parts">
             <a href="https://www.openwebrx.de/" target="_blank"><img src="static/gfx/openwebrx-top-logo.png" id="webrx-top-logo" /></a>
-            <a href="http://ha5kfu.sch.bme.hu/" target="_blank"><img src="static/gfx/openwebrx-ha5kfu-top-logo.png" id="webrx-ha5kfu-top-logo" /></a>
             <img id="webrx-rx-avatar" class="openwebrx-photo-trigger" src="static/gfx/openwebrx-avatar.png"/>
             <div id="webrx-rx-texts">
                 <div id="webrx-rx-title" class="openwebrx-photo-trigger"></div>

From dd492fa63c6716cedd8e78993d0e1f6bcd3387d0 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Apr 2020 20:52:41 +0200
Subject: [PATCH 241/475] hide "settings" link if features is disabled

---
 htdocs/include/header.include.html | 2 +-
 owrx/controllers/template.py       | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/htdocs/include/header.include.html b/htdocs/include/header.include.html
index ac48bc1..c86977c 100644
--- a/htdocs/include/header.include.html
+++ b/htdocs/include/header.include.html
@@ -17,7 +17,7 @@
                 <div class="button" data-toggle-panel="openwebrx-panel-log"><img  src="static/gfx/openwebrx-panel-log.png" /><br/>Log</div>
                 <div class="button" data-toggle-panel="openwebrx-panel-receiver"><img src="static/gfx/openwebrx-panel-receiver.png" /><br/>Receiver</div>
                 <a class="button" href="map" target="_blank"><img src="static/gfx/openwebrx-panel-map.png" /><br/>Map</a>
-                <a class="button" href="admin" target="_blank"><img src="static/gfx/openwebrx-panel-settings.png" /><br/>Settings</a>
+                ${settingslink}
             </section>
         </div>
         <div id="webrx-rx-photo-title"></div>
diff --git a/owrx/controllers/template.py b/owrx/controllers/template.py
index 6746012..4adbe8c 100644
--- a/owrx/controllers/template.py
+++ b/owrx/controllers/template.py
@@ -1,6 +1,7 @@
 from . import Controller
 import pkg_resources
 from string import Template
+from owrx.config import Config
 
 
 class TemplateController(Controller):
@@ -19,7 +20,11 @@ class TemplateController(Controller):
 
 class WebpageController(TemplateController):
     def template_variables(self):
-        header = self.render_template("include/header.include.html")
+        settingslink = ""
+        pm = Config.get()
+        if "webadmin_enabled" in pm and pm["webadmin_enabled"]:
+            settingslink = """<a class="button" href="admin" target="_blank"><img src="static/gfx/openwebrx-panel-settings.png" /><br/>Settings</a>"""
+        header = self.render_template("include/header.include.html", settingslink=settingslink)
         return {"header": header}
 
 

From a4ebf872632bddcfcdad4a61c470b71727f4541c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Apr 2020 20:55:33 +0200
Subject: [PATCH 242/475] check for key

---
 owrx/controllers/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/controllers/admin.py b/owrx/controllers/admin.py
index 6aa2a4b..9ea8b24 100644
--- a/owrx/controllers/admin.py
+++ b/owrx/controllers/admin.py
@@ -18,7 +18,7 @@ class AdminController(WebpageController):
 
     def handle_request(self):
         config = Config.get()
-        if not config["webadmin_enabled"]:
+        if "webadmin_enabled" not in config or not config["webadmin_enabled"]:
             self.send_response("Web Admin is disabled", code=403)
             return
         if self.authentication.isAuthenticated(self.request):

From 2f011ea2495ec511da7779a83d4ba8bfc5a4f606 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Apr 2020 20:57:12 +0200
Subject: [PATCH 243/475] add remark about web admin

---
 config_webrx.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config_webrx.py b/config_webrx.py
index 27c4835..fdde08e 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -327,4 +327,6 @@ pskreporter_enabled = False
 pskreporter_callsign = "N0CALL"
 
 # === Web admin settings ===
-webadmin_enabled = False
+# this feature is experimental at the moment. it should not be enabled on shared receivers since it allows remote
+# changes to the receiver settings. enable for testing in controlled environment only.
+# webadmin_enabled = False

From b874583931c6041ae854f798fd20179c62fba9d0 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Apr 2020 21:42:00 +0200
Subject: [PATCH 244/475] setup for multiple settings sections

---
 htdocs/{admin.html => generalsettings.html} |  0
 htdocs/settings.html                        | 26 +++++++++++++++++++++
 owrx/controllers/session.py                 |  4 ++--
 owrx/controllers/settings.py                | 11 ++++++---
 owrx/controllers/template.py                |  2 +-
 owrx/http.py                                |  7 +++---
 6 files changed, 41 insertions(+), 9 deletions(-)
 rename htdocs/{admin.html => generalsettings.html} (100%)
 create mode 100644 htdocs/settings.html

diff --git a/htdocs/admin.html b/htdocs/generalsettings.html
similarity index 100%
rename from htdocs/admin.html
rename to htdocs/generalsettings.html
diff --git a/htdocs/settings.html b/htdocs/settings.html
new file mode 100644
index 0000000..659b660
--- /dev/null
+++ b/htdocs/settings.html
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <title>OpenWebRX Settings</title>
+    <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
+    <script src="static/lib/jquery-3.2.1.min.js"></script>
+    <script src="https://unpkg.com/location-picker/dist/location-picker.min.js"></script>
+    <script src="static/settings.js"></script>
+    <meta charset="utf-8">
+</head>
+<body>
+${header}
+<div class="container">
+    <div class="col-12">
+        <h1>Settings</h1>
+    </div>
+    <div class="col-12">
+        <a href="generalsettings">General settings</a>
+    </div>
+    <div class="col-12">
+        <a href="sdrsettings">SDR device settings</a>
+    </div>
+</div>
+</body>
\ No newline at end of file
diff --git a/owrx/controllers/session.py b/owrx/controllers/session.py
index dd6d0f9..51bf399 100644
--- a/owrx/controllers/session.py
+++ b/owrx/controllers/session.py
@@ -46,12 +46,12 @@ class SessionController(WebpageController):
             if data["user"] in userlist:
                 user = userlist[data["user"]]
                 if user.password.is_valid(data["password"]):
-                    # TODO pass the final destination
                     # TODO evaluate password force_change and redirect to password change
                     key = SessionStorage.getSharedInstance().startSession({"user": user.name})
                     cookie = SimpleCookie()
                     cookie["owrx-session"] = key
-                    self.send_redirect("/admin", cookies=cookie)
+                    # TODO pass the final destination
+                    self.send_redirect("/settings", cookies=cookie)
                     return
         self.send_redirect("/login")
 
diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 8243d09..8f5e11e 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -44,6 +44,11 @@ class Section(object):
 
 
 class SettingsController(AdminController):
+    def indexAction(self):
+        self.serve_template("settings.html", **self.template_variables())
+
+
+class GeneralSettingsController(AdminController):
     sections = [
         Section(
             "General settings",
@@ -222,7 +227,7 @@ class SettingsController(AdminController):
     ]
 
     def render_sections(self):
-        sections = "".join(section.render() for section in SettingsController.sections)
+        sections = "".join(section.render() for section in GeneralSettingsController.sections)
         return """
             <form class="settings-body" method="POST">
                 {sections}
@@ -235,7 +240,7 @@ class SettingsController(AdminController):
         )
 
     def indexAction(self):
-        self.serve_template("admin.html", **self.template_variables())
+        self.serve_template("generalsettings.html", **self.template_variables())
 
     def template_variables(self):
         variables = super().template_variables()
@@ -245,7 +250,7 @@ class SettingsController(AdminController):
     def processFormData(self):
         data = parse_qs(self.get_body().decode("utf-8"))
         data = {
-            k: v for i in SettingsController.sections for k, v in i.parse(data).items()
+            k: v for i in GeneralSettingsController.sections for k, v in i.parse(data).items()
         }
         config = Config.get()
         for k, v in data.items():
diff --git a/owrx/controllers/template.py b/owrx/controllers/template.py
index 4adbe8c..6030fd1 100644
--- a/owrx/controllers/template.py
+++ b/owrx/controllers/template.py
@@ -23,7 +23,7 @@ class WebpageController(TemplateController):
         settingslink = ""
         pm = Config.get()
         if "webadmin_enabled" in pm and pm["webadmin_enabled"]:
-            settingslink = """<a class="button" href="admin" target="_blank"><img src="static/gfx/openwebrx-panel-settings.png" /><br/>Settings</a>"""
+            settingslink = """<a class="button" href="settings" target="_blank"><img src="static/gfx/openwebrx-panel-settings.png" /><br/>Settings</a>"""
         header = self.render_template("include/header.include.html", settingslink=settingslink)
         return {"header": header}
 
diff --git a/owrx/http.py b/owrx/http.py
index 7e8d104..b8ec63c 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -11,7 +11,7 @@ from owrx.controllers.assets import (
 from owrx.controllers.websocket import WebSocketController
 from owrx.controllers.api import ApiController
 from owrx.controllers.metrics import MetricsController
-from owrx.controllers.settings import SettingsController
+from owrx.controllers.settings import SettingsController, GeneralSettingsController
 from owrx.controllers.session import SessionController
 from http.server import BaseHTTPRequestHandler
 from urllib.parse import urlparse, parse_qs
@@ -100,8 +100,9 @@ class Router(object):
             StaticRoute("/features", FeatureController),
             StaticRoute("/api/features", ApiController),
             StaticRoute("/metrics", MetricsController),
-            StaticRoute("/admin", SettingsController),
-            StaticRoute("/admin", SettingsController, method="POST", options={"action": "processFormData"}),
+            StaticRoute("/settings", SettingsController),
+            StaticRoute("/generalsettings", GeneralSettingsController),
+            StaticRoute("/generalsettings", GeneralSettingsController, method="POST", options={"action": "processFormData"}),
             StaticRoute("/login", SessionController, options={"action": "loginAction"}),
             StaticRoute("/login", SessionController, method="POST", options={"action": "processLoginAction"}),
             StaticRoute("/logout", SessionController, options={"action": "logoutAction"}),

From 9942b3baf2a90a103f7330be59cd12a3e719100d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 25 Apr 2020 21:55:52 +0200
Subject: [PATCH 245/475] separate page for sdr settings

---
 htdocs/generalsettings.html  |  2 +-
 htdocs/sdrsettings.html      | 20 ++++++++++++++++++++
 owrx/controllers/settings.py |  5 +++++
 owrx/http.py                 |  3 ++-
 4 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 htdocs/sdrsettings.html

diff --git a/htdocs/generalsettings.html b/htdocs/generalsettings.html
index 54e8fe4..edd52e7 100644
--- a/htdocs/generalsettings.html
+++ b/htdocs/generalsettings.html
@@ -14,7 +14,7 @@
 ${header}
 <div class="container">
     <div class="col-12">
-        <h1>Settings</h1>
+        <h1>General settings</h1>
     </div>
     ${sections}
 </div>
diff --git a/htdocs/sdrsettings.html b/htdocs/sdrsettings.html
new file mode 100644
index 0000000..0cb8ec4
--- /dev/null
+++ b/htdocs/sdrsettings.html
@@ -0,0 +1,20 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <title>OpenWebRX Settings</title>
+    <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
+    <script src="static/lib/jquery-3.2.1.min.js"></script>
+    <script src="https://unpkg.com/location-picker/dist/location-picker.min.js"></script>
+    <script src="static/settings.js"></script>
+    <meta charset="utf-8">
+</head>
+<body>
+${header}
+<div class="container">
+    <div class="col-12">
+        <h1>SDR device settings</h1>
+    </div>
+</div>
+</body>
\ No newline at end of file
diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 8f5e11e..6934bf7 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -48,6 +48,11 @@ class SettingsController(AdminController):
         self.serve_template("settings.html", **self.template_variables())
 
 
+class SdrSettingsController(AdminController):
+    def indexAction(self):
+        self.serve_template("sdrsettings.html", **self.template_variables())
+
+
 class GeneralSettingsController(AdminController):
     sections = [
         Section(
diff --git a/owrx/http.py b/owrx/http.py
index b8ec63c..f7203a5 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -11,7 +11,7 @@ from owrx.controllers.assets import (
 from owrx.controllers.websocket import WebSocketController
 from owrx.controllers.api import ApiController
 from owrx.controllers.metrics import MetricsController
-from owrx.controllers.settings import SettingsController, GeneralSettingsController
+from owrx.controllers.settings import SettingsController, GeneralSettingsController, SdrSettingsController
 from owrx.controllers.session import SessionController
 from http.server import BaseHTTPRequestHandler
 from urllib.parse import urlparse, parse_qs
@@ -103,6 +103,7 @@ class Router(object):
             StaticRoute("/settings", SettingsController),
             StaticRoute("/generalsettings", GeneralSettingsController),
             StaticRoute("/generalsettings", GeneralSettingsController, method="POST", options={"action": "processFormData"}),
+            StaticRoute("/sdrsettings", SdrSettingsController),
             StaticRoute("/login", SessionController, options={"action": "loginAction"}),
             StaticRoute("/login", SessionController, method="POST", options={"action": "processLoginAction"}),
             StaticRoute("/logout", SessionController, options={"action": "logoutAction"}),

From 5282b5f8dffe1ef6447e95f9e65d5174a5ddf844 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 26 Apr 2020 01:54:48 +0200
Subject: [PATCH 246/475] implement redirect on login

---
 owrx/controllers/admin.py   | 8 +++++++-
 owrx/controllers/session.py | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/owrx/controllers/admin.py b/owrx/controllers/admin.py
index 9ea8b24..3879141 100644
--- a/owrx/controllers/admin.py
+++ b/owrx/controllers/admin.py
@@ -1,6 +1,11 @@
 from .template import WebpageController
 from .session import SessionStorage
 from owrx.config import Config
+from urllib import parse
+
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 class Authentication(object):
@@ -24,4 +29,5 @@ class AdminController(WebpageController):
         if self.authentication.isAuthenticated(self.request):
             super().handle_request()
         else:
-            self.send_redirect("/login")
+            target = "/login?{0}".format(parse.urlencode({"ref": self.request.path}))
+            self.send_redirect(target)
diff --git a/owrx/controllers/session.py b/owrx/controllers/session.py
index 51bf399..ac38a43 100644
--- a/owrx/controllers/session.py
+++ b/owrx/controllers/session.py
@@ -50,8 +50,8 @@ class SessionController(WebpageController):
                     key = SessionStorage.getSharedInstance().startSession({"user": user.name})
                     cookie = SimpleCookie()
                     cookie["owrx-session"] = key
-                    # TODO pass the final destination
-                    self.send_redirect("/settings", cookies=cookie)
+                    target = self.request.query["ref"][0] if "ref" in self.request.query else "/settings"
+                    self.send_redirect(target, cookies=cookie)
                     return
         self.send_redirect("/login")
 

From fb90a4e54bacff5160be34ea06a2146a99214f1f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 26 Apr 2020 02:15:19 +0200
Subject: [PATCH 247/475] display sdr devices

---
 htdocs/css/admin.css         |  4 ++++
 htdocs/sdrsettings.html      |  3 +++
 owrx/controllers/settings.py | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/htdocs/css/admin.css b/htdocs/css/admin.css
index 8836244..fa2b020 100644
--- a/htdocs/css/admin.css
+++ b/htdocs/css/admin.css
@@ -18,3 +18,7 @@ body {
 .row .map-input {
     margin: 15px 15px 0;
 }
+
+.device {
+    margin-top: 20px;
+}
diff --git a/htdocs/sdrsettings.html b/htdocs/sdrsettings.html
index 0cb8ec4..51de0f0 100644
--- a/htdocs/sdrsettings.html
+++ b/htdocs/sdrsettings.html
@@ -16,5 +16,8 @@ ${header}
     <div class="col-12">
         <h1>SDR device settings</h1>
     </div>
+    <div class="col-12">
+        ${devices}
+    </div>
 </div>
 </body>
\ No newline at end of file
diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 6934bf7..7a219e3 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -49,6 +49,25 @@ class SettingsController(AdminController):
 
 
 class SdrSettingsController(AdminController):
+    def template_variables(self):
+        variables = super().template_variables()
+        variables["devices"] = self.render_devices()
+        return variables
+
+    def render_devices(self):
+        def render_devicde(device_id, config):
+            return """
+                <div class="card device bg-dark text-white">
+                    <div class="card-header">
+                        {device_name}
+                    </div>
+                    <div class="card-body">
+                        device settings go here
+                    </div>
+                </div>
+            """.format(device_name=config["name"])
+        return "".join(render_devicde(key, value) for key, value in Config.get()["sdrs"].items())
+
     def indexAction(self):
         self.serve_template("sdrsettings.html", **self.template_variables())
 

From e61d3a22a3de2c1d661df79ee328376d6d55a35f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 26 Apr 2020 13:49:03 +0200
Subject: [PATCH 248/475] add if_mode mapping for sdrplay, refs #105

---
 owrx/source/sdrplay.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/owrx/source/sdrplay.py b/owrx/source/sdrplay.py
index 9306b86..da2398a 100644
--- a/owrx/source/sdrplay.py
+++ b/owrx/source/sdrplay.py
@@ -9,6 +9,7 @@ class SdrplaySource(SoapyConnectorSource):
                 "bias_tee": "biasT_ctrl",
                 "rf_notch": "rfnotch_ctrl",
                 "dab_notch": "dabnotch_ctrl",
+                "if_mode": "if_mode",
             }
         )
         return mappings

From 907787cfdc1ae6fce5293f3cd6db01bf9a956a54 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 26 Apr 2020 15:17:03 +0200
Subject: [PATCH 249/475] implement first stages of active mode communication

---
 htdocs/index.html        |  1 +
 htdocs/lib/Modes.js      | 28 ++++++++++++++++++++++++++
 htdocs/openwebrx.js      |  9 +++++++++
 owrx/connection.py       | 11 ++++++++++
 owrx/form/__init__.py    |  4 ++--
 owrx/modes.py            | 43 ++++++++++++++++++++++++++++++++++++++++
 owrx/service/__init__.py | 30 ++--------------------------
 7 files changed, 96 insertions(+), 30 deletions(-)
 create mode 100644 htdocs/lib/Modes.js
 create mode 100644 owrx/modes.py

diff --git a/htdocs/index.html b/htdocs/index.html
index 77b0fe3..9027ef1 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -33,6 +33,7 @@
         <script src="static/lib/Measurement.js"></script>
         <script src="static/lib/FrequencyDisplay.js"></script>
         <script src="static/lib/Js8Threads.js"></script>
+        <script src="static/lib/Modes.js"></script>
         <link rel="stylesheet" type="text/css" href="static/lib/nanoscroller.css" />
         <link rel="stylesheet" type="text/css" href="static/css/openwebrx.css" />
         <meta charset="utf-8">
diff --git a/htdocs/lib/Modes.js b/htdocs/lib/Modes.js
new file mode 100644
index 0000000..ea7e8b7
--- /dev/null
+++ b/htdocs/lib/Modes.js
@@ -0,0 +1,28 @@
+var Modes = {
+    modes: [],
+    features: {},
+    setModes:function(json){
+        this.modes = json.map(function(m){ return new Mode(m); });
+    },
+    setFeatures:function(features){
+        this.features = features;
+    },
+    findByModulation:function(modulation){
+        matches = this.modes.filter(function(m) { return m.modulation === modulation; });
+        if (matches.length) return matches[0]
+    }
+}
+
+var Mode = function(json){
+    this.modulation = json.modulation;
+    this.name = json.name;
+    this.requirements = json.requirements;
+};
+
+Mode.prototype.isAvailable = function(){
+    return this.requirements.map(function(r){
+        return Modes.features[r];
+    }).reduce(function(a, b){
+        return a && b;
+    }, true);
+}
\ No newline at end of file
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 05d4f51..41c91a4 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1177,6 +1177,10 @@ function on_ws_recv(evt) {
                         // set a higher reconnection timeout right away to avoid additional load
                         reconnect_timeout = 16000;
                         break;
+                    case 'modes':
+                        Modes.setModes(json['value']);
+                        console.info(Modes);
+                        break;
                     default:
                         console.warn('received message of unknown type: ' + json['type']);
                 }
@@ -2014,6 +2018,11 @@ function demodulator_digital_replace_last() {
 
 function demodulator_digital_replace(subtype) {
     if (secondary_demod === subtype) return;
+    var mode = Modes.findByModulation(subtype);
+    if (mode && !mode.isAvailable()) {
+        divlog('Digital mode "' + mode.name + '" not supported. Please check requirements', true);
+        return;
+    }
     switch (subtype) {
         case "bpsk31":
         case "bpsk63":
diff --git a/owrx/connection.py b/owrx/connection.py
index b483a22..4367e55 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -11,6 +11,7 @@ from owrx.bookmarks import Bookmarks
 from owrx.map import Map
 from owrx.locator import Locator
 from owrx.property import PropertyStack
+from owrx.modes import Modes
 from multiprocessing import Queue
 from queue import Full
 from js8py import Js8Frame
@@ -122,6 +123,9 @@ class OpenWebRxReceiverClient(Client):
         features = FeatureDetector().feature_availability()
         self.write_features(features)
 
+        modes = Modes.getModes()
+        self.write_modes(modes)
+
         CpuUsageThread.getSharedInstance().add_client(self)
 
     def __sendProfiles(self):
@@ -345,6 +349,13 @@ class OpenWebRxReceiverClient(Client):
             "mode": frame.mode
         }})
 
+    def write_modes(self, modes):
+        self.send({"type": "modes", "value": [{
+            "modulation": m.modulation,
+            "name": m.name,
+            "requirements": m.requirements
+        } for m in modes]})
+
 
 class MapConnection(Client):
     def __init__(self, conn):
diff --git a/owrx/form/__init__.py b/owrx/form/__init__.py
index fb7160e..7f59bf5 100644
--- a/owrx/form/__init__.py
+++ b/owrx/form/__init__.py
@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from owrx.service import ServiceDetector
+from owrx.modes import Modes
 from owrx.config import Config
 
 
@@ -196,7 +196,7 @@ class MultiCheckboxInput(Input):
 class ServicesCheckboxInput(MultiCheckboxInput):
     def __init__(self, id, label, infotext=None):
         services = [
-            Option(s, s.upper()) for s in ServiceDetector.getAvailableServices()
+            Option(s.modulation, s.name) for s in Modes.getAvailableServices()
         ]
         super().__init__(id, label, services, infotext)
 
diff --git a/owrx/modes.py b/owrx/modes.py
new file mode 100644
index 0000000..b0721fc
--- /dev/null
+++ b/owrx/modes.py
@@ -0,0 +1,43 @@
+from owrx.feature import FeatureDetector
+from functools import reduce
+
+
+class Mode(object):
+    def __init__(self, modulation, name, requirements=None, service=False):
+        self.modulation = modulation
+        self.name = name
+        self.requirements = requirements if requirements is not None else []
+        self.service = service
+
+    def is_available(self):
+        fd = FeatureDetector()
+        return reduce(
+            lambda a, b: a and b, [fd.is_available(r) for r in self.requirements], True
+        )
+
+    def is_service(self):
+        return self.service
+
+
+class Modes(object):
+    mappings = [
+        Mode("ft8", "FT8", ["wsjt-x"], True),
+        Mode("ft4", "FT4", ["wsjt-x"], True),
+        Mode("jt65", "JT65", ["wsjt-x"], True),
+        Mode("jt9", "JT9", ["wsjt-x"], True),
+        Mode("wspr", "WSPR", ["wsjt-x"], True),
+        Mode("packet", "Packet", ["packet"], True),
+        Mode("js8", "JS8Call", ["js8call"], True),
+    ]
+
+    @staticmethod
+    def getModes():
+        return Modes.mappings
+
+    @staticmethod
+    def getAvailableModes():
+        return [m for m in Modes.getModes() if m.is_available()]
+
+    @staticmethod
+    def getAvailableServices():
+        return [m for m in Modes.getAvailableModes() if m.is_service()]
diff --git a/owrx/service/__init__.py b/owrx/service/__init__.py
index 8310fa4..d4c97df 100644
--- a/owrx/service/__init__.py
+++ b/owrx/service/__init__.py
@@ -8,12 +8,11 @@ from owrx.aprs import AprsParser
 from owrx.js8 import Js8Parser
 from owrx.config import Config
 from owrx.source.resampler import Resampler
-from owrx.feature import FeatureDetector
 from owrx.property import PropertyLayer
 from js8py import Js8Frame
 from abc import ABCMeta, abstractmethod
 from .schedule import ServiceScheduler
-from functools import reduce
+from owrx.modes import Modes
 
 import logging
 
@@ -60,31 +59,6 @@ class Js8ServiceOutput(ServiceOutput):
         return t == "js8_demod"
 
 
-class ServiceDetector(object):
-    requirements = {
-        "ft8": ["wsjt-x"],
-        "ft4": ["wsjt-x"],
-        "jt65": ["wsjt-x"],
-        "jt9": ["wsjt-x"],
-        "wspr": ["wsjt-x"],
-        "packet": ["packet"],
-        "js8": ["js8call"],
-    }
-
-    @staticmethod
-    def getAvailableServices():
-        # TODO this should be in a more central place (the frontend also needs this)
-        fd = FeatureDetector()
-
-        return [
-            name
-            for name, requirements in ServiceDetector.requirements.items()
-            if reduce(
-                lambda a, b: a and b, [fd.is_available(r) for r in requirements], True
-            )
-        ]
-
-
 class ServiceHandler(object):
     def __init__(self, source):
         self.lock = threading.Lock()
@@ -120,7 +94,7 @@ class ServiceHandler(object):
 
     def isSupported(self, mode):
         configured = Config.get()["services_decoders"]
-        available = ServiceDetector.getAvailableServices()
+        available = [m.modulation for m in Modes.getAvailableServices()]
         return mode in configured and mode in available
 
     def shutdown(self):

From bb1b561c476837e39998f29f0eb197c5887b954c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 26 Apr 2020 16:58:31 +0200
Subject: [PATCH 250/475] fully-automatic mode panel generation

---
 htdocs/index.html   | 43 +------------------------------------------
 htdocs/lib/Modes.js | 45 +++++++++++++++++++++++++++++++++++++++++++++
 htdocs/openwebrx.js |  2 +-
 owrx/connection.py  |  1 +
 owrx/modes.py       | 28 ++++++++++++++++++++--------
 5 files changed, 68 insertions(+), 51 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 9027ef1..f6d08ac 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -166,48 +166,7 @@
                     <select id="openwebrx-sdr-profiles-listbox" onchange="sdr_profile_changed();">
                     </select>
                 </div>
-                <div class="openwebrx-panel-line openwebrx-panel-flex-line">
-                    <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-nfm"
-                         onclick="demodulator_analog_replace('nfm');">FM</div>
-                    <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-am"
-                         onclick="demodulator_analog_replace('am');">AM</div>
-                    <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-lsb"
-                         onclick="demodulator_analog_replace('lsb');">LSB</div>
-                    <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-usb"
-                         onclick="demodulator_analog_replace('usb');">USB</div>
-                    <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-cw"
-                         onclick="demodulator_analog_replace('cw');">CW</div>
-                </div>
-                <div class="openwebrx-panel-line openwebrx-panel-flex-line">
-                    <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-dmr"
-                         style="display:none;" data-feature="digital_voice_digiham"
-                         onclick="demodulator_analog_replace('dmr');">DMR</div>
-                    <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-dstar"
-                         style="display:none;" data-feature="digital_voice_dsd"
-                         onclick="demodulator_analog_replace('dstar');">DStar</div>
-                    <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-nxdn"
-                         style="display:none;" data-feature="digital_voice_dsd"
-                         onclick="demodulator_analog_replace('nxdn');">NXDN</div>
-                    <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-ysf"
-                         style="display:none;" data-feature="digital_voice_digiham"
-                         onclick="demodulator_analog_replace('ysf');">YSF</div>
-                </div>
-                <div class="openwebrx-panel-line openwebrx-panel-flex-line">
-                    <div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-dig" onclick="demodulator_digital_replace_last();">DIG</div>
-                    <select id="openwebrx-secondary-demod-listbox" onchange="secondary_demod_listbox_changed();">
-                        <option value="none"></option>
-                        <option value="bpsk31">BPSK31</option>
-                        <option value="bpsk63">BPSK63</option>
-                        <option value="ft8" data-feature="wsjt-x">FT8</option>
-                        <option value="wspr" data-feature="wsjt-x">WSPR</option>
-                        <option value="jt65" data-feature="wsjt-x">JT65</option>
-                        <option value="jt9" data-feature="wsjt-x">JT9</option>
-                        <option value="ft4" data-feature="wsjt-x">FT4</option>
-                        <option value="js8" data-feature="js8call">JS8Call</option>
-                        <option value="packet" data-feature="packet">Packet</option>
-                        <option value="pocsag" data-feature="pocsag">Pocsag</option>
-                    </select>
-                </div>
+                <div class="openwebrx-modes openwebrx-panel-line"></div>
                 <div class="openwebrx-panel-line">
                     <div title="Mute on/off" id="openwebrx-mute-off" class="openwebrx-button" onclick="toggleMute();"><img src="static/gfx/openwebrx-speaker.png" class="openwebrx-sliderbtn-img" id="openwebrx-mute-img"></div>
                     <input title="Volume" id="openwebrx-panel-volume" class="openwebrx-panel-slider" type="range" min="0" max="150" value="50" step="1" onchange="updateVolume()" oninput="updateVolume()">
diff --git a/htdocs/lib/Modes.js b/htdocs/lib/Modes.js
index ea7e8b7..dda89f2 100644
--- a/htdocs/lib/Modes.js
+++ b/htdocs/lib/Modes.js
@@ -3,19 +3,64 @@ var Modes = {
     features: {},
     setModes:function(json){
         this.modes = json.map(function(m){ return new Mode(m); });
+        this.updateModePanel();
     },
     setFeatures:function(features){
         this.features = features;
+        this.updateModePanel();
     },
     findByModulation:function(modulation){
         matches = this.modes.filter(function(m) { return m.modulation === modulation; });
         if (matches.length) return matches[0]
+    },
+    updateModePanel:function() {
+        var available = this.modes.filter(function(m){ return m.isAvailable(); });
+        var normalModes = available.filter(function(m){ return !m.digimode; });
+        var digiModes = available.filter(function(m){ return m.digimode; });
+
+        var index = 0;
+        var arrayLength = normalModes.length;
+        var chunks = [];
+
+
+        for (index = 0; index < arrayLength; index += 5) {
+            chunks.push(normalModes.slice(index, index + 5));
+        }
+
+        var html = []
+
+        html.push.apply(html, chunks.map(function(chunk){
+            return $(
+                '<div class="openwebrx-panel-line openwebrx-panel-flex-line">' +
+                    chunk.map(function(m){
+                        return '<div class="openwebrx-button openwebrx-demodulator-button"' +
+                               'id="openwebrx-button-' + m.modulation + '"' +
+                               'onclick="demodulator_analog_replace(\'' + m.modulation + '\');">' +
+                               m.name + '</div>';
+                    }).join('') +
+                '</div>');
+        }));
+
+        html.push($(
+            '<div class="openwebrx-panel-line openwebrx-panel-flex-line">' +
+                '<div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-dig" onclick="demodulator_digital_replace_last();">DIG</div>' +
+                '<select id="openwebrx-secondary-demod-listbox" onchange="secondary_demod_listbox_changed();">' +
+                    '<option value="none"></option>' +
+                    digiModes.map(function(m){
+                        return '<option value="' + m.modulation + '">' + m.name + '</option>';
+                    }).join('') +
+                '</select>' +
+            '</div>'
+        ));
+
+        $("#openwebrx-panel-receiver").find(".openwebrx-modes").html(html);
     }
 }
 
 var Mode = function(json){
     this.modulation = json.modulation;
     this.name = json.name;
+    this.digimode = json.digimode;
     this.requirements = json.requirements;
 };
 
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 41c91a4..9798d19 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1123,6 +1123,7 @@ function on_ws_recv(evt) {
                         break;
                     case "features":
                         var features = json['value'];
+                        Modes.setFeatures(features);
                         for (var feature in features) {
                             if (features.hasOwnProperty(feature)) {
                                 $('[data-feature="' + feature + '"]')[features[feature] ? "show" : "hide"]();
@@ -1179,7 +1180,6 @@ function on_ws_recv(evt) {
                         break;
                     case 'modes':
                         Modes.setModes(json['value']);
-                        console.info(Modes);
                         break;
                     default:
                         console.warn('received message of unknown type: ' + json['type']);
diff --git a/owrx/connection.py b/owrx/connection.py
index 4367e55..3d54ee8 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -353,6 +353,7 @@ class OpenWebRxReceiverClient(Client):
         self.send({"type": "modes", "value": [{
             "modulation": m.modulation,
             "name": m.name,
+            "digimode": m.digimode,
             "requirements": m.requirements
         } for m in modes]})
 
diff --git a/owrx/modes.py b/owrx/modes.py
index b0721fc..d2d890a 100644
--- a/owrx/modes.py
+++ b/owrx/modes.py
@@ -3,9 +3,10 @@ from functools import reduce
 
 
 class Mode(object):
-    def __init__(self, modulation, name, requirements=None, service=False):
+    def __init__(self, modulation, name, requirements=None, service=False, digimode=False):
         self.modulation = modulation
         self.name = name
+        self.digimode = digimode
         self.requirements = requirements if requirements is not None else []
         self.service = service
 
@@ -21,13 +22,24 @@ class Mode(object):
 
 class Modes(object):
     mappings = [
-        Mode("ft8", "FT8", ["wsjt-x"], True),
-        Mode("ft4", "FT4", ["wsjt-x"], True),
-        Mode("jt65", "JT65", ["wsjt-x"], True),
-        Mode("jt9", "JT9", ["wsjt-x"], True),
-        Mode("wspr", "WSPR", ["wsjt-x"], True),
-        Mode("packet", "Packet", ["packet"], True),
-        Mode("js8", "JS8Call", ["js8call"], True),
+        Mode("nfm", "FM"),
+        Mode("am", "AM"),
+        Mode("lsb", "LSB"),
+        Mode("usb", "USB"),
+        Mode("cw", "CW"),
+        Mode("dmr", "DMR", requirements=["digital_voice_digiham"]),
+        Mode("dstar", "DStar", requirements=["digital_voice_dsd"]),
+        Mode("nxdn", "NXDN", requirements=["digital_voice_dsd"]),
+        Mode("ysf", "YSF", requirements=["digital_voice_digiham"]),
+        Mode("bpsk31", "BPSK31", digimode=True),
+        Mode("bpsk63", "BPSK63", digimode=True),
+        Mode("ft8", "FT8", requirements=["wsjt-x"], service=True, digimode=True),
+        Mode("ft4", "FT4", requirements=["wsjt-x"], service=True, digimode=True),
+        Mode("jt65", "JT65", requirements=["wsjt-x"], service=True, digimode=True),
+        Mode("jt9", "JT9", requirements=["wsjt-x"], service=True, digimode=True),
+        Mode("wspr", "WSPR", requirements=["wsjt-x"], service=True, digimode=True),
+        Mode("packet", "Packet", ["packet"], service=True, digimode=True),
+        Mode("js8", "JS8Call", requirements=["js8call"], service=True, digimode=True),
     ]
 
     @staticmethod

From 39f9d4c27369a01b557b967f226c41b55b43b8c1 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 26 Apr 2020 17:18:48 +0200
Subject: [PATCH 251/475] streamline button generation

---
 htdocs/lib/Modes.js | 39 +++++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/htdocs/lib/Modes.js b/htdocs/lib/Modes.js
index dda89f2..e7b2597 100644
--- a/htdocs/lib/Modes.js
+++ b/htdocs/lib/Modes.js
@@ -18,27 +18,30 @@ var Modes = {
         var normalModes = available.filter(function(m){ return !m.digimode; });
         var digiModes = available.filter(function(m){ return m.digimode; });
 
-        var index = 0;
-        var arrayLength = normalModes.length;
-        var chunks = [];
-
-
-        for (index = 0; index < arrayLength; index += 5) {
-            chunks.push(normalModes.slice(index, index + 5));
-        }
 
         var html = []
 
-        html.push.apply(html, chunks.map(function(chunk){
+        var buttons = normalModes.map(function(m){
             return $(
-                '<div class="openwebrx-panel-line openwebrx-panel-flex-line">' +
-                    chunk.map(function(m){
-                        return '<div class="openwebrx-button openwebrx-demodulator-button"' +
-                               'id="openwebrx-button-' + m.modulation + '"' +
-                               'onclick="demodulator_analog_replace(\'' + m.modulation + '\');">' +
-                               m.name + '</div>';
-                    }).join('') +
-                '</div>');
+                '<div class="openwebrx-button openwebrx-demodulator-button"' +
+                'id="openwebrx-button-' + m.modulation + '"' +
+                'onclick="demodulator_analog_replace(\'' + m.modulation + '\');">' +
+                m.name + '</div>'
+            );
+        });
+
+        var index = 0;
+        var arrayLength = buttons.length;
+        var chunks = [];
+
+        for (index = 0; index < arrayLength; index += 5) {
+            chunks.push(buttons.slice(index, index + 5));
+        }
+
+        html.push.apply(html, chunks.map(function(chunk){
+            $line = $('<div class="openwebrx-panel-line openwebrx-panel-flex-line"></div>');
+            $line.append.apply($line, chunk);
+            return $line
         }));
 
         html.push($(
@@ -55,7 +58,7 @@ var Modes = {
 
         $("#openwebrx-panel-receiver").find(".openwebrx-modes").html(html);
     }
-}
+};
 
 var Mode = function(json){
     this.modulation = json.modulation;

From 449b3b39860e90583aec95d89dbf64e5b8a14ba9 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 26 Apr 2020 17:19:05 +0200
Subject: [PATCH 252/475] features no longer used on this level

---
 htdocs/openwebrx.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 9798d19..cd08808 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1122,13 +1122,7 @@ function on_ws_recv(evt) {
                         }
                         break;
                     case "features":
-                        var features = json['value'];
-                        Modes.setFeatures(features);
-                        for (var feature in features) {
-                            if (features.hasOwnProperty(feature)) {
-                                $('[data-feature="' + feature + '"]')[features[feature] ? "show" : "hide"]();
-                            }
-                        }
+                        Modes.setFeatures(json['value']);
                         break;
                     case "metadata":
                         update_metadata(json['value']);

From 26321ab68b3775e7646cb3ab9ef605e5947964b8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 26 Apr 2020 18:45:41 +0200
Subject: [PATCH 253/475] keep more parameters on the server side

---
 csdr/csdr.py             |   2 +
 htdocs/css/openwebrx.css |   4 ++
 htdocs/lib/Modes.js      |  13 +++--
 htdocs/openwebrx.js      | 116 ++++++++++-----------------------------
 owrx/connection.py       |  37 ++++++++-----
 owrx/modes.py            |  57 ++++++++++++-------
 6 files changed, 106 insertions(+), 123 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 8fe1606..57cd5cb 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -607,6 +607,8 @@ class dsp(object):
         self.restart()
 
     def set_demodulator(self, demodulator):
+        if demodulator in ["usb", "lsb", "cw"]:
+            demodulator = "ssb"
         if self.demodulator == demodulator:
             return
         self.demodulator = demodulator
diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index b5693c8..731bac1 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -446,6 +446,10 @@ input[type=range]:focus::-ms-fill-upper
 	margin-right: 5px;
 }
 
+.openwebrx-demodulator-button.disabled {
+    color: #B6B6B6;
+}
+
 .openwebrx-square-button img
 {
 	height: 27px;
diff --git a/htdocs/lib/Modes.js b/htdocs/lib/Modes.js
index e7b2597..bf258d1 100644
--- a/htdocs/lib/Modes.js
+++ b/htdocs/lib/Modes.js
@@ -15,9 +15,8 @@ var Modes = {
     },
     updateModePanel:function() {
         var available = this.modes.filter(function(m){ return m.isAvailable(); });
-        var normalModes = available.filter(function(m){ return !m.digimode; });
-        var digiModes = available.filter(function(m){ return m.digimode; });
-
+        var normalModes = available.filter(function(m){ return m.type === 'analog'; });
+        var digiModes = available.filter(function(m){ return m.type === 'digimode'; });
 
         var html = []
 
@@ -63,8 +62,14 @@ var Modes = {
 var Mode = function(json){
     this.modulation = json.modulation;
     this.name = json.name;
-    this.digimode = json.digimode;
+    this.type = json.type;
     this.requirements = json.requirements;
+    if (json.bandpass) {
+        this.bandpass = json.bandpass;
+    }
+    if (this.type === 'digimode') {
+        this.underlying = json.underlying;
+    }
 };
 
 Mode.prototype.isAvailable = function(){
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index cd08808..ea1b281 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -374,40 +374,10 @@ function Demodulator_default_analog(offset_frequency, subtype) {
             };
         }
     };
-    //Subtypes only define some filter parameters and the mod string sent to server,
-    //so you may set these parameters in your custom child class.
-    //Why? As of demodulation is done on the server, difference is mainly on the server side.
-    this.server_mod = subtype;
-    if (subtype === "lsb") {
-        this.low_cut = -3000;
-        this.high_cut = -300;
-        this.server_mod = "ssb";
-    }
-    else if (subtype === "usb") {
-        this.low_cut = 300;
-        this.high_cut = 3000;
-        this.server_mod = "ssb";
-    }
-    else if (subtype === "cw") {
-        this.low_cut = 700;
-        this.high_cut = 900;
-        this.server_mod = "ssb";
-    }
-    else if (subtype === "nfm") {
-        this.low_cut = -4000;
-        this.high_cut = 4000;
-    }
-    else if (subtype === "dmr" || subtype === "ysf") {
-        this.low_cut = -4000;
-        this.high_cut = 4000;
-    }
-    else if (subtype === "dstar" || subtype === "nxdn") {
-        this.low_cut = -3250;
-        this.high_cut = 3250;
-    }
-    else if (subtype === "am") {
-        this.low_cut = -4000;
-        this.high_cut = 4000;
+    var mode = Modes.findByModulation(subtype);
+    if (mode) {
+        this.low_cut = mode.bandpass.low_cut;
+        this.high_cut = mode.bandpass.high_cut;
     }
 
     this.wait_for_timer = false;
@@ -433,7 +403,7 @@ function Demodulator_default_analog(offset_frequency, subtype) {
             "high_cut": this.high_cut,
             "offset_freq": this.offset_frequency
         };
-        if (first_time) params.mod = this.server_mod;
+        if (first_time) params.mod = this.subtype;
         ws.send(JSON.stringify({"type": "dspcontrol", "params": params}));
         mkenvelopes(get_visible_freq_range());
     };
@@ -1174,6 +1144,7 @@ function on_ws_recv(evt) {
                         break;
                     case 'modes':
                         Modes.setModes(json['value']);
+                        demodulator_buttons_update();
                         break;
                     default:
                         console.warn('received message of unknown type: ' + json['type']);
@@ -1947,29 +1918,24 @@ function initPanels() {
 }
 
 function demodulator_buttons_update() {
-    $(".openwebrx-demodulator-button").removeClass("highlighted");
+    var $buttons = $(".openwebrx-demodulator-button");
+    $buttons.removeClass("highlighted").removeClass('disabled');
     if (!demodulators.length) return;
+    var mod = demodulators[0].subtype;
+    $("#openwebrx-button-" + mod).addClass("highlighted");
     if (secondary_demod) {
         $("#openwebrx-button-dig").addClass("highlighted");
         $('#openwebrx-secondary-demod-listbox').val(secondary_demod);
-    } else switch (demodulators[0].subtype) {
-        case "lsb":
-        case "usb":
-        case "cw":
-            if (demodulators[0].high_cut - demodulators[0].low_cut < 300)
-                $("#openwebrx-button-cw").addClass("highlighted");
-            else {
-                if (demodulators[0].high_cut < 0)
-                    $("#openwebrx-button-lsb").addClass("highlighted");
-                else if (demodulators[0].low_cut > 0)
-                    $("#openwebrx-button-usb").addClass("highlighted");
-                else $("#openwebrx-button-lsb, #openwebrx-button-usb").addClass("highlighted");
-            }
-            break;
-        default:
-            var mod = demodulators[0].subtype;
-            $("#openwebrx-button-" + mod).addClass("highlighted");
-            break;
+        var mode = Modes.findByModulation(secondary_demod);
+        if (mode) {
+            var active = mode.underlying.map(function(u){ return 'openwebrx-button-' + u; });
+            console.info(active);
+            $buttons.filter(function(){
+                console.info(this.id);
+                console.info(active.indexOf(this.id));
+                return this.id !== "openwebrx-button-dig" && active.indexOf(this.id) < 0;
+            }).addClass('disabled');
+        }
     }
 }
 
@@ -2013,41 +1979,19 @@ function demodulator_digital_replace_last() {
 function demodulator_digital_replace(subtype) {
     if (secondary_demod === subtype) return;
     var mode = Modes.findByModulation(subtype);
-    if (mode && !mode.isAvailable()) {
+    if (!mode) {
+        return;
+    }
+    if (!mode.isAvailable()) {
         divlog('Digital mode "' + mode.name + '" not supported. Please check requirements', true);
         return;
     }
-    switch (subtype) {
-        case "bpsk31":
-        case "bpsk63":
-        case "rtty":
-        case "ft8":
-        case "jt65":
-        case "jt9":
-        case "ft4":
-        case "js8":
-            secondary_demod_start(subtype);
-            demodulator_analog_replace('usb', true);
-            break;
-        case "wspr":
-            secondary_demod_start(subtype);
-            demodulator_analog_replace('usb', true);
-            // WSPR only samples between 1400 and 1600 Hz
-            demodulators[0].low_cut = 1350;
-            demodulators[0].high_cut = 1650;
-            demodulators[0].set();
-            break;
-        case "packet":
-            secondary_demod_start(subtype);
-            demodulator_analog_replace('nfm', true);
-            break;
-        case "pocsag":
-            secondary_demod_start(subtype);
-            demodulator_analog_replace('nfm', true);
-            demodulators[0].low_cut = -6000;
-            demodulators[0].high_cut = 6000;
-            demodulators[0].set();
-            break;
+    secondary_demod_start(subtype);
+    demodulator_analog_replace(mode.underlying[0], true);
+    if (mode.bandpass) {
+        demodulators[0].low_cut = mode.bandpass.low_cut;
+        demodulators[0].high_cut = mode.bandpass.high_cut;
+        demodulators[0].set();
     }
     demodulator_buttons_update();
     $('#openwebrx-panel-digimodes').attr('data-mode', subtype);
diff --git a/owrx/connection.py b/owrx/connection.py
index 3d54ee8..8deff4f 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -11,7 +11,7 @@ from owrx.bookmarks import Bookmarks
 from owrx.map import Map
 from owrx.locator import Locator
 from owrx.property import PropertyStack
-from owrx.modes import Modes
+from owrx.modes import Modes, DigitalMode
 from multiprocessing import Queue
 from queue import Full
 from js8py import Js8Frame
@@ -114,18 +114,18 @@ class OpenWebRxReceiverClient(Client):
             receiver_info["locator"] = Locator.fromCoordinates(receiver_info["receiver_gps"])
             self.write_receiver_details(receiver_info)
 
-        # TODO unsubscribe
-        receiver_details.wire(send_receiver_info)
-        send_receiver_info()
-
-        self.__sendProfiles()
-
         features = FeatureDetector().feature_availability()
         self.write_features(features)
 
         modes = Modes.getModes()
         self.write_modes(modes)
 
+        # TODO unsubscribe
+        receiver_details.wire(send_receiver_info)
+        send_receiver_info()
+
+        self.__sendProfiles()
+
         CpuUsageThread.getSharedInstance().add_client(self)
 
     def __sendProfiles(self):
@@ -350,12 +350,23 @@ class OpenWebRxReceiverClient(Client):
         }})
 
     def write_modes(self, modes):
-        self.send({"type": "modes", "value": [{
-            "modulation": m.modulation,
-            "name": m.name,
-            "digimode": m.digimode,
-            "requirements": m.requirements
-        } for m in modes]})
+        def to_json(m):
+            res = {
+                "modulation": m.modulation,
+                "name": m.name,
+                "type": "digimode" if isinstance(m, DigitalMode) else "analog",
+                "requirements": m.requirements
+            }
+            if m.bandpass is not None:
+                res["bandpass"] = {
+                    "low_cut": m.bandpass.low_cut,
+                    "high_cut": m.bandpass.high_cut
+                }
+            if isinstance(m, DigitalMode):
+                res["underlying"] = m.underlying
+            return res
+
+        self.send({"type": "modes", "value": [to_json(m) for m in modes]})
 
 
 class MapConnection(Client):
diff --git a/owrx/modes.py b/owrx/modes.py
index d2d890a..80fe94b 100644
--- a/owrx/modes.py
+++ b/owrx/modes.py
@@ -2,13 +2,19 @@ from owrx.feature import FeatureDetector
 from functools import reduce
 
 
+class Bandpass(object):
+    def __init__(self, low_cut, high_cut):
+        self.low_cut = low_cut
+        self.high_cut = high_cut
+
+
 class Mode(object):
-    def __init__(self, modulation, name, requirements=None, service=False, digimode=False):
+    def __init__(self, modulation, name, bandpass: Bandpass = None, requirements=None, service=False):
         self.modulation = modulation
         self.name = name
-        self.digimode = digimode
         self.requirements = requirements if requirements is not None else []
         self.service = service
+        self.bandpass = bandpass
 
     def is_available(self):
         fd = FeatureDetector()
@@ -20,26 +26,37 @@ class Mode(object):
         return self.service
 
 
+class AnalogMode(Mode):
+    pass
+
+
+class DigitalMode(Mode):
+    def __init__(self, modulation, name, underlying, bandpass: Bandpass = None, requirements=None, service=False):
+        super().__init__(modulation, name, bandpass, requirements, service)
+        self.underlying = underlying
+
+
 class Modes(object):
     mappings = [
-        Mode("nfm", "FM"),
-        Mode("am", "AM"),
-        Mode("lsb", "LSB"),
-        Mode("usb", "USB"),
-        Mode("cw", "CW"),
-        Mode("dmr", "DMR", requirements=["digital_voice_digiham"]),
-        Mode("dstar", "DStar", requirements=["digital_voice_dsd"]),
-        Mode("nxdn", "NXDN", requirements=["digital_voice_dsd"]),
-        Mode("ysf", "YSF", requirements=["digital_voice_digiham"]),
-        Mode("bpsk31", "BPSK31", digimode=True),
-        Mode("bpsk63", "BPSK63", digimode=True),
-        Mode("ft8", "FT8", requirements=["wsjt-x"], service=True, digimode=True),
-        Mode("ft4", "FT4", requirements=["wsjt-x"], service=True, digimode=True),
-        Mode("jt65", "JT65", requirements=["wsjt-x"], service=True, digimode=True),
-        Mode("jt9", "JT9", requirements=["wsjt-x"], service=True, digimode=True),
-        Mode("wspr", "WSPR", requirements=["wsjt-x"], service=True, digimode=True),
-        Mode("packet", "Packet", ["packet"], service=True, digimode=True),
-        Mode("js8", "JS8Call", requirements=["js8call"], service=True, digimode=True),
+        AnalogMode("nfm", "FM", bandpass=Bandpass(-4000, 4000)),
+        AnalogMode("am", "AM", bandpass=Bandpass(-4000, 4000)),
+        AnalogMode("lsb", "LSB", bandpass=Bandpass(-3000, -300)),
+        AnalogMode("usb", "USB", bandpass=Bandpass(300, 3000)),
+        AnalogMode("cw", "CW", bandpass=Bandpass(700, 900)),
+        AnalogMode("dmr", "DMR", bandpass=Bandpass(-4000, 4000), requirements=["digital_voice_digiham"]),
+        AnalogMode("dstar", "DStar", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_dsd"]),
+        AnalogMode("nxdn", "NXDN", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_dsd"]),
+        AnalogMode("ysf", "YSF", bandpass=Bandpass(-4000, 4000), requirements=["digital_voice_digiham"]),
+        DigitalMode("bpsk31", "BPSK31", underlying=["usb"]),
+        DigitalMode("bpsk63", "BPSK63", underlying=["usb"]),
+        DigitalMode("ft8", "FT8", underlying=["usb"], requirements=["wsjt-x"], service=True),
+        DigitalMode("ft4", "FT4", underlying=["usb"], requirements=["wsjt-x"], service=True),
+        DigitalMode("jt65", "JT65", underlying=["usb"], requirements=["wsjt-x"], service=True),
+        DigitalMode("jt9", "JT9", underlying=["usb"], requirements=["wsjt-x"], service=True),
+        DigitalMode("wspr", "WSPR", underlying=["usb"], bandpass=Bandpass(1350, 1650), requirements=["wsjt-x"], service=True),
+        DigitalMode("js8", "JS8Call", underlying=["usb"], requirements=["js8call"], service=True),
+        DigitalMode("packet", "Packet", underlying=["nfm", "usb", "lsb"], requirements=["packet"], service=True),
+        DigitalMode("pocsag", "Pocsag", underlying=["nfm"], bandpass=Bandpass(-6000, 6000), requirements=["pocsag"])
     ]
 
     @staticmethod

From 6a8168025dd7a531032bccdfaf350ec156bd2c6f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 26 Apr 2020 22:46:30 +0200
Subject: [PATCH 254/475] improve demodulator initialization

---
 htdocs/openwebrx.js | 16 ++++++++++++----
 owrx/dsp.py         | 19 +++++++++++++++++--
 owrx/modes.py       |  6 ++++++
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index ea1b281..04598bb 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1048,7 +1048,7 @@ function on_ws_recv(evt) {
                         updateSquelch();
 
                         waterfall_init();
-                        initialize_demodulator(initial_demodulator_params);
+                        synchronize_demodulator_init({initialParams: initial_demodulator_params});
                         bookmarks.loadLocalBookmarks();
 
                         waterfall_clear();
@@ -1093,6 +1093,7 @@ function on_ws_recv(evt) {
                         break;
                     case "features":
                         Modes.setFeatures(json['value']);
+                        synchronize_demodulator_init({features: true});
                         break;
                     case "metadata":
                         update_metadata(json['value']);
@@ -1144,6 +1145,7 @@ function on_ws_recv(evt) {
                         break;
                     case 'modes':
                         Modes.setModes(json['value']);
+                        synchronize_demodulator_init({modes: true});
                         demodulator_buttons_update();
                         break;
                     default:
@@ -1539,6 +1541,15 @@ function onAudioStart(success, apiType){
     updateVolume();
 }
 
+var sync_params = {}
+
+function synchronize_demodulator_init(params) {
+    sync_params = $.extend(sync_params, params);
+    if (sync_params.initialParams && sync_params.modes && sync_params.features) {
+        initialize_demodulator(sync_params.initialParams);
+    }
+}
+
 function initialize_demodulator(initialParams) {
     mkscale();
     var params = $.extend(initialParams || {}, validateHash());
@@ -1929,10 +1940,7 @@ function demodulator_buttons_update() {
         var mode = Modes.findByModulation(secondary_demod);
         if (mode) {
             var active = mode.underlying.map(function(u){ return 'openwebrx-button-' + u; });
-            console.info(active);
             $buttons.filter(function(){
-                console.info(this.id);
-                console.info(active.indexOf(this.id));
                 return this.id !== "openwebrx-button-dig" && active.indexOf(this.id) < 0;
             }).addClass('disabled');
         }
diff --git a/owrx/dsp.py b/owrx/dsp.py
index 98d2b00..1f8850e 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -5,6 +5,7 @@ from owrx.aprs import AprsParser
 from owrx.pocsag import PocsagParser
 from owrx.source import SdrSource
 from owrx.property import PropertyStack, PropertyLayer
+from owrx.modes import Modes
 from csdr import csdr
 import threading
 
@@ -51,6 +52,8 @@ class DspManager(csdr.output):
             "digital_voice_unvoiced_quality",
             "temporary_directory",
             "center_freq",
+            "start_mod",
+            "start_freq",
         ))
 
         self.dsp = csdr.dsp(self)
@@ -71,6 +74,20 @@ class DspManager(csdr.output):
             for parser in self.parsers.values():
                 parser.setDialFrequency(freq)
 
+        if "start_mod" in self.props:
+            self.dsp.set_demodulator(self.props["start_mod"])
+            mode = Modes.findByModulation(self.props["start_mod"])
+
+            if mode and mode.bandpass:
+                self.dsp.set_bpf(mode.bandpass.low_cut, mode.bandpass.high_cut)
+            else:
+                self.dsp.set_bpf(-4000, 4000)
+
+        if "start_freq" in self.props and "center_freq" in self.props:
+            self.dsp.set_offset_freq(self.props["start_freq"] - self.props["center_freq"])
+        else:
+            self.dsp.set_offset_freq(0)
+
         self.subscriptions = [
             self.props.wireProperty("audio_compression", self.dsp.set_audio_compression),
             self.props.wireProperty("fft_compression", self.dsp.set_fft_compression),
@@ -89,8 +106,6 @@ class DspManager(csdr.output):
             self.props.filter("center_freq", "offset_freq").wire(set_dial_freq),
         ]
 
-        self.dsp.set_offset_freq(0)
-        self.dsp.set_bpf(-4000, 4000)
         self.dsp.csdr_dynamic_bufsize = self.props["csdr_dynamic_bufsize"]
         self.dsp.csdr_print_bufsizes = self.props["csdr_print_bufsizes"]
         self.dsp.csdr_through = self.props["csdr_through"]
diff --git a/owrx/modes.py b/owrx/modes.py
index 80fe94b..7617b5f 100644
--- a/owrx/modes.py
+++ b/owrx/modes.py
@@ -70,3 +70,9 @@ class Modes(object):
     @staticmethod
     def getAvailableServices():
         return [m for m in Modes.getAvailableModes() if m.is_service()]
+
+    @staticmethod
+    def findByModulation(modulation):
+        modes = [m for m in Modes.getAvailableModes() if m.modulation == modulation]
+        if modes:
+            return modes[0]
\ No newline at end of file

From 25a7bbd86a96d75041ff3d32320ad14eac166e38 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 26 Apr 2020 23:14:34 +0200
Subject: [PATCH 255/475] reset secondary demodulator, too

---
 htdocs/openwebrx.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 04598bb..24b5cc2 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1494,7 +1494,7 @@ function parseHash() {
 function validateHash() {
     var params = parseHash();
     params = Object.keys(params).filter(function(key) {
-        if (key == 'freq' || key == 'mod') {
+        if (key == 'freq' || key == 'mod' || key == 'secondary_mod') {
             return params.freq && Math.abs(params.freq - center_freq) < bandwidth;
         }
         return true;

From f1dc9af651ee376b9da75e1923783359f5fa7f34 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 27 Apr 2020 22:49:24 +0200
Subject: [PATCH 256/475] use synchronized setup; start dsp later

---
 htdocs/openwebrx.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 24b5cc2..15c7f24 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1445,10 +1445,6 @@ function on_ws_opened() {
         "type": "connectionproperties",
         "params": {"output_rate": audioEngine.getOutputRate()}
     }));
-    ws.send(JSON.stringify({
-        "type": "dspcontrol",
-        "action": "start"
-    }));
 }
 
 var was_error = 0;
@@ -1530,7 +1526,7 @@ function onAudioStart(success, apiType){
     divlog('Web Audio API succesfully initialized, using ' + apiType  + ' API, sample rate: ' + audioEngine.getSampleRate() + " Hz");
 
     // canvas_container is set after waterfall_init() has been called. we cannot initialize before.
-    if (canvas_container) initialize_demodulator();
+    if (canvas_container) synchronize_demodulator_init();
 
     //hide log panel in a second (if user has not hidden it yet)
     window.setTimeout(function () {
@@ -1544,7 +1540,7 @@ function onAudioStart(success, apiType){
 var sync_params = {}
 
 function synchronize_demodulator_init(params) {
-    sync_params = $.extend(sync_params, params);
+    sync_params = $.extend(sync_params, params || {});
     if (sync_params.initialParams && sync_params.modes && sync_params.features) {
         initialize_demodulator(sync_params.initialParams);
     }
@@ -1561,6 +1557,10 @@ function initialize_demodulator(initialParams) {
     if (params.offset_frequency) {
         demodulators[0].set_offset_frequency(params.offset_frequency);
     }
+    ws.send(JSON.stringify({
+        "type": "dspcontrol",
+        "action": "start"
+    }));
 }
 
 var reconnect_timeout = false;
@@ -1804,7 +1804,7 @@ function openwebrx_init() {
     bookmarks = new BookmarkBar();
     initSliders();
     window.addEventListener('hashchange', function() {
-        initialize_demodulator();
+        synchronize_demodulator_init();
     });
 }
 

From 33762574c3b09552c0b457b63af34b1abdeb711b Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 30 Apr 2020 22:07:19 +0200
Subject: [PATCH 257/475] improve demodulator initalization, part 2: refactor
 js classes

---
 htdocs/index.html         |   1 +
 htdocs/lib/Demodulator.js | 217 +++++++++++++++++++++++++++++++++++++
 htdocs/openwebrx.js       | 220 +++-----------------------------------
 owrx/connection.py        |  70 ++++++------
 owrx/dsp.py               |   5 +
 5 files changed, 275 insertions(+), 238 deletions(-)
 create mode 100644 htdocs/lib/Demodulator.js

diff --git a/htdocs/index.html b/htdocs/index.html
index f6d08ac..98916dd 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -27,6 +27,7 @@
         <script src="static/openwebrx.js"></script>
         <script src="static/lib/jquery-3.2.1.min.js"></script>
         <script src="static/lib/jquery.nanoscroller.js"></script>
+        <script src="static/lib/Demodulator.js"></script>
         <script src="static/lib/BookmarkBar.js"></script>
         <script src="static/lib/AudioEngine.js"></script>
         <script src="static/lib/ProgressBar.js"></script>
diff --git a/htdocs/lib/Demodulator.js b/htdocs/lib/Demodulator.js
new file mode 100644
index 0000000..66a7196
--- /dev/null
+++ b/htdocs/lib/Demodulator.js
@@ -0,0 +1,217 @@
+function Filter() {
+    this.min_passband = 100;
+}
+
+Filter.prototype.getLimits = function() {
+    var max_bw;
+    if (secondary_demod === 'pocsag') {
+        max_bw = 12500;
+    } else {
+        max_bw = (audioEngine.getOutputRate() / 2) - 1;
+    }
+    return {
+        high: max_bw,
+        low: -max_bw
+    };
+};
+
+function Envelope(parent) {
+    this.parent = parent;
+    this.dragged_range = Demodulator.draggable_ranges.none;
+}
+
+Envelope.prototype.draw = function(visible_range){
+    this.visible_range = visible_range;
+    this.drag_ranges = demod_envelope_draw(
+        range,
+        center_freq + this.parent.offset_frequency + this.parent.low_cut,
+        center_freq + this.parent.offset_frequency + this.parent.high_cut,
+        this.color, center_freq + this.parent.offset_frequency
+    );
+};
+
+Envelope.prototype.drag_start = function(x, key_modifiers){
+    this.key_modifiers = key_modifiers;
+    this.dragged_range = demod_envelope_where_clicked(x, this.drag_ranges, key_modifiers);
+    this.drag_origin = {
+        x: x,
+        low_cut: this.parent.low_cut,
+        high_cut: this.parent.high_cut,
+        offset_frequency: this.parent.offset_frequency
+    };
+    return this.dragged_range !== Demodulator.draggable_ranges.none;
+};
+
+Envelope.prototype.drag_move = function(x) {
+    var dr = Demodulator.draggable_ranges;
+    var new_value;
+    if (this.dragged_range === dr.none) return false; // we return if user is not dragging (us) at all
+    var freq_change = Math.round(this.visible_range.hps * (x - this.drag_origin.x));
+
+    //dragging the line in the middle of the filter envelope while holding Shift does emulate
+    //the BFO knob on radio equipment: moving offset frequency, while passband remains unchanged
+    //Filter passband moves in the opposite direction than dragged, hence the minus below.
+    var minus = (this.dragged_range === dr.bfo) ? -1 : 1;
+    //dragging any other parts of the filter envelope while holding Shift does emulate the PBS knob
+    //(PassBand Shift) on radio equipment: PBS does move the whole passband without moving the offset
+    //frequency.
+    if (this.dragged_range === dr.beginning || this.dragged_range === dr.bfo || this.dragged_range === dr.pbs) {
+        //we don't let low_cut go beyond its limits
+        if ((new_value = this.drag_origin.low_cut + minus * freq_change) < this.parent.filter.getLimits().low) return true;
+        //nor the filter passband be too small
+        if (this.parent.high_cut - new_value < this.parent.filter.min_passband) return true;
+        //sanity check to prevent GNU Radio "firdes check failed: fa <= fb"
+        if (new_value >= this.parent.high_cut) return true;
+        this.parent.low_cut = new_value;
+    }
+    if (this.dragged_range === dr.ending || this.dragged_range === dr.bfo || this.dragged_range === dr.pbs) {
+        //we don't let high_cut go beyond its limits
+        if ((new_value = this.drag_origin.high_cut + minus * freq_change) > this.parent.filter.getLimits().high) return true;
+        //nor the filter passband be too small
+        if (new_value - this.parent.low_cut < this.parent.filter.min_passband) return true;
+        //sanity check to prevent GNU Radio "firdes check failed: fa <= fb"
+        if (new_value <= this.parent.low_cut) return true;
+        this.parent.high_cut = new_value;
+    }
+    if (this.dragged_range === dr.anything_else || this.dragged_range === dr.bfo) {
+        //when any other part of the envelope is dragged, the offset frequency is changed (whole passband also moves with it)
+        new_value = this.drag_origin.offset_frequency + freq_change;
+        if (new_value > bandwidth / 2 || new_value < -bandwidth / 2) return true; //we don't allow tuning above Nyquist frequency :-)
+        this.parent.offset_frequency = new_value;
+    }
+    //now do the actual modifications:
+    mkenvelopes(this.visible_range);
+    this.parent.set();
+    //will have to change this when changing to multi-demodulator mode:
+    tunedFrequencyDisplay.setFrequency(center_freq + this.parent.offset_frequency);
+    return true;
+};
+
+Envelope.prototype.drag_end = function(){
+    demodulator_buttons_update();
+    var to_return = this.dragged_range !== Demodulator.draggable_ranges.none; //this part is required for cliking anywhere on the scale to set offset
+    this.dragged_range = Demodulator.draggable_ranges.none;
+    return to_return;
+};
+
+
+//******* class Demodulator_default_analog *******
+// This can be used as a base for basic audio demodulators.
+// It already supports most basic modulations used for ham radio and commercial services: AM/FM/LSB/USB
+
+function Demodulator(offset_frequency, modulation) {
+    this.offset_frequency = offset_frequency;
+    this.envelope = new Envelope(this);
+    this.color = Demodulator.get_next_color();
+    this.modulation = modulation;
+    this.filter = new Filter();
+    this.squelch_level = -150;
+    this.dmr_filter = 3;
+    this.state = {};
+    var mode = Modes.findByModulation(modulation);
+    if (mode) {
+        this.low_cut = mode.bandpass.low_cut;
+        this.high_cut = mode.bandpass.high_cut;
+    }
+}
+
+//ranges on filter envelope that can be dragged:
+Demodulator.draggable_ranges = {
+    none: 0,
+    beginning: 1 /*from*/,
+    ending: 2 /*to*/,
+    anything_else: 3,
+    bfo: 4 /*line (while holding shift)*/,
+    pbs: 5
+}; //to which parameter these correspond in demod_envelope_draw()
+
+Demodulator.color_index = 0;
+Demodulator.colors = ["#ffff00", "#00ff00", "#00ffff", "#058cff", "#ff9600", "#a1ff39", "#ff4e39", "#ff5dbd"];
+
+Demodulator.get_next_color = function() {
+    if (this.color_index >= this.colors.length) this.color_index = 0;
+    return (this.colors[this.color_index++]);
+}
+
+
+
+Demodulator.prototype.set_offset_frequency = function(to_what) {
+    if (to_what > bandwidth / 2 || to_what < -bandwidth / 2) return;
+    this.offset_frequency = Math.round(to_what);
+    this.set();
+    mkenvelopes(get_visible_freq_range());
+    tunedFrequencyDisplay.setFrequency(center_freq + to_what);
+    updateHash();
+};
+
+Demodulator.prototype.get_offset_frequency = function() {
+    return this.offset_frequency;
+};
+
+Demodulator.prototype.get_modulation = function() {
+    return this.modulation;
+};
+
+Demodulator.prototype.start = function() {
+    this.set();
+    ws.send(JSON.stringify({
+        "type": "dspcontrol",
+        "action": "start"
+    }));
+};
+
+// TODO check if this is actually used
+Demodulator.prototype.stop = function() {
+};
+
+Demodulator.prototype.send = function(params) {
+    ws.send(JSON.stringify({"type": "dspcontrol", "params": params}));
+}
+
+Demodulator.prototype.set = function () {  //this function sends demodulator parameters to the server
+    var params = {
+        "low_cut": this.low_cut,
+        "high_cut": this.high_cut,
+        "offset_freq": this.offset_frequency,
+        "mod": this.modulation,
+        "dmr_filter": this.dmr_filter,
+        "squelch_level": this.squelch_level
+    };
+    var to_send = {};
+    for (var key in params) {
+        if (!(key in this.state) || params[key] !== this.state[key]) {
+            to_send[key] = params[key];
+        }
+    }
+    if (Object.keys(to_send).length > 0) {
+        this.send(to_send);
+        for (var key in to_send) {
+            this.state[key] = to_send[key];
+        }
+    }
+    mkenvelopes(get_visible_freq_range());
+};
+
+Demodulator.prototype.setSquelch = function(squelch) {
+    this.squelch_level = squelch;
+    this.set();
+};
+
+Demodulator.prototype.setDmrFilter = function(dmr_filter) {
+    this.dmr_filter = dmr_filter;
+    this.set();
+};
+
+Demodulator.prototype.setBandpass = function(bandpass) {
+    this.bandpass = bandpass;
+    this.low_cut = bandpass.low_cut;
+    this.high_cut = bandpass.high_cut;
+    this.set();
+};
+
+Demodulator.prototype.getBandpass = function() {
+    return {
+        low_cut: this.low_cut,
+        high_cut: this.high_cut
+    };
+};
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 15c7f24..1dcdd3f 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -142,7 +142,7 @@ function setSquelchToAuto() {
 
 function updateSquelch() {
     var sliderValue = parseInt($("#openwebrx-panel-squelch").val());
-    ws.send(JSON.stringify({"type": "dspcontrol", "params": {"squelch_level": sliderValue}}));
+    if (demodulators[0]) demodulators[0].setSquelch(sliderValue);
 }
 
 var waterfall_min_level;
@@ -238,14 +238,6 @@ function typeInAnimation(element, timeout, what, onFinish) {
 
 demodulators = [];
 
-var demodulator_color_index = 0;
-var demodulator_colors = ["#ffff00", "#00ff00", "#00ffff", "#058cff", "#ff9600", "#a1ff39", "#ff4e39", "#ff5dbd"];
-
-function demodulators_get_next_color() {
-    if (demodulator_color_index >= demodulator_colors.length) demodulator_color_index = 0;
-    return (demodulator_colors[demodulator_color_index++]);
-}
-
 function demod_envelope_draw(range, from, to, color, line) {  //                                               ____
     // Draws a standard filter envelope like this: _/    \_
     // Parameters are given in offset frequency (Hz).
@@ -331,166 +323,6 @@ function demod_envelope_where_clicked(x, drag_ranges, key_modifiers) {  // Check
     return dr.none; //User doesn't drag the envelope for this demodulator
 }
 
-//******* class Demodulator *******
-// this can be used as a base class for ANY demodulator
-Demodulator = function (offset_frequency) {
-    this.offset_frequency = offset_frequency;
-    this.envelope = {};
-    this.color = demodulators_get_next_color();
-    this.stop = function () {
-    };
-};
-//ranges on filter envelope that can be dragged:
-Demodulator.draggable_ranges = {
-    none: 0,
-    beginning: 1 /*from*/,
-    ending: 2 /*to*/,
-    anything_else: 3,
-    bfo: 4 /*line (while holding shift)*/,
-    pbs: 5
-}; //to which parameter these correspond in demod_envelope_draw()
-
-//******* class Demodulator_default_analog *******
-// This can be used as a base for basic audio demodulators.
-// It already supports most basic modulations used for ham radio and commercial services: AM/FM/LSB/USB
-
-demodulator_response_time = 50;
-
-function Demodulator_default_analog(offset_frequency, subtype) {
-    Demodulator.call(this, offset_frequency);
-    this.subtype = subtype;
-    this.filter = {
-        min_passband: 100,
-        getLimits: function() {
-            var max_bw;
-            if (secondary_demod === 'pocsag') {
-                max_bw = 12500;
-            } else {
-                max_bw = (audioEngine.getOutputRate() / 2) - 1;
-            }
-            return {
-                high: max_bw,
-                low: -max_bw
-            };
-        }
-    };
-    var mode = Modes.findByModulation(subtype);
-    if (mode) {
-        this.low_cut = mode.bandpass.low_cut;
-        this.high_cut = mode.bandpass.high_cut;
-    }
-
-    this.wait_for_timer = false;
-    this.set_after = false;
-    this.set = function () { //set() is a wrapper to call doset(), but it ensures that doset won't execute more frequently than demodulator_response_time.
-        if (!this.wait_for_timer) {
-            this.doset(false);
-            this.set_after = false;
-            this.wait_for_timer = true;
-            var timeout_this = this; //http://stackoverflow.com/a/2130411
-            window.setTimeout(function () {
-                timeout_this.wait_for_timer = false;
-                if (timeout_this.set_after) timeout_this.set();
-            }, demodulator_response_time);
-        } else {
-            this.set_after = true;
-        }
-    };
-
-    this.doset = function (first_time) {  //this function sends demodulator parameters to the server
-        var params = {
-            "low_cut": this.low_cut,
-            "high_cut": this.high_cut,
-            "offset_freq": this.offset_frequency
-        };
-        if (first_time) params.mod = this.subtype;
-        ws.send(JSON.stringify({"type": "dspcontrol", "params": params}));
-        mkenvelopes(get_visible_freq_range());
-    };
-    this.doset(true); //we set parameters on object creation
-
-    //******* envelope object *******
-    // for drawing the filter envelope above scale
-    this.envelope.parent = this;
-
-    this.envelope.draw = function (visible_range) {
-        this.visible_range = visible_range;
-        this.drag_ranges = demod_envelope_draw(range,
-            center_freq + this.parent.offset_frequency + this.parent.low_cut,
-            center_freq + this.parent.offset_frequency + this.parent.high_cut,
-            this.color, center_freq + this.parent.offset_frequency);
-    };
-
-    this.envelope.dragged_range = Demodulator.draggable_ranges.none;
-
-    // event handlers
-    this.envelope.drag_start = function (x, key_modifiers) {
-        this.key_modifiers = key_modifiers;
-        this.dragged_range = demod_envelope_where_clicked(x, this.drag_ranges, key_modifiers);
-        this.drag_origin = {
-            x: x,
-            low_cut: this.parent.low_cut,
-            high_cut: this.parent.high_cut,
-            offset_frequency: this.parent.offset_frequency
-        };
-        return this.dragged_range !== Demodulator.draggable_ranges.none;
-    };
-
-    this.envelope.drag_move = function (x) {
-        var dr = Demodulator.draggable_ranges;
-        var new_value;
-        if (this.dragged_range === dr.none) return false; // we return if user is not dragging (us) at all
-        var freq_change = Math.round(this.visible_range.hps * (x - this.drag_origin.x));
-
-        //dragging the line in the middle of the filter envelope while holding Shift does emulate
-        //the BFO knob on radio equipment: moving offset frequency, while passband remains unchanged
-        //Filter passband moves in the opposite direction than dragged, hence the minus below.
-        var minus = (this.dragged_range === dr.bfo) ? -1 : 1;
-        //dragging any other parts of the filter envelope while holding Shift does emulate the PBS knob
-        //(PassBand Shift) on radio equipment: PBS does move the whole passband without moving the offset
-        //frequency.
-        if (this.dragged_range === dr.beginning || this.dragged_range === dr.bfo || this.dragged_range === dr.pbs) {
-            //we don't let low_cut go beyond its limits
-            if ((new_value = this.drag_origin.low_cut + minus * freq_change) < this.parent.filter.getLimits().low) return true;
-            //nor the filter passband be too small
-            if (this.parent.high_cut - new_value < this.parent.filter.min_passband) return true;
-            //sanity check to prevent GNU Radio "firdes check failed: fa <= fb"
-            if (new_value >= this.parent.high_cut) return true;
-            this.parent.low_cut = new_value;
-        }
-        if (this.dragged_range === dr.ending || this.dragged_range === dr.bfo || this.dragged_range === dr.pbs) {
-            //we don't let high_cut go beyond its limits
-            if ((new_value = this.drag_origin.high_cut + minus * freq_change) > this.parent.filter.getLimits().high) return true;
-            //nor the filter passband be too small
-            if (new_value - this.parent.low_cut < this.parent.filter.min_passband) return true;
-            //sanity check to prevent GNU Radio "firdes check failed: fa <= fb"
-            if (new_value <= this.parent.low_cut) return true;
-            this.parent.high_cut = new_value;
-        }
-        if (this.dragged_range === dr.anything_else || this.dragged_range === dr.bfo) {
-            //when any other part of the envelope is dragged, the offset frequency is changed (whole passband also moves with it)
-            new_value = this.drag_origin.offset_frequency + freq_change;
-            if (new_value > bandwidth / 2 || new_value < -bandwidth / 2) return true; //we don't allow tuning above Nyquist frequency :-)
-            this.parent.offset_frequency = new_value;
-        }
-        //now do the actual modifications:
-        mkenvelopes(this.visible_range);
-        this.parent.set();
-        //will have to change this when changing to multi-demodulator mode:
-        tunedFrequencyDisplay.setFrequency(center_freq + this.parent.offset_frequency);
-        return true;
-    };
-
-    this.envelope.drag_end = function () { //in this demodulator we've already changed values in the drag_move() function so we shouldn't do too much here.
-        demodulator_buttons_update();
-        var to_return = this.dragged_range !== Demodulator.draggable_ranges.none; //this part is required for cliking anywhere on the scale to set offset
-        this.dragged_range = Demodulator.draggable_ranges.none;
-        return to_return;
-    };
-
-}
-
-Demodulator_default_analog.prototype = new Demodulator();
 
 function mkenvelopes(visible_range) //called from mkscale
 {
@@ -498,7 +330,10 @@ function mkenvelopes(visible_range) //called from mkscale
     for (var i = 0; i < demodulators.length; i++) {
         demodulators[i].envelope.draw(visible_range);
     }
-    if (demodulators.length) secondary_demod_waterfall_set_zoom(demodulators[0].low_cut, demodulators[0].high_cut);
+    if (demodulators.length) {
+        var bandpass = demodulators[0].getBandpass()
+        secondary_demod_waterfall_set_zoom(bandpass.low_cut, bandpass.high_cut);
+    }
 }
 
 function demodulator_remove(which) {
@@ -519,33 +354,22 @@ function demodulator_analog_replace(subtype, for_digital) { //this function shou
         secondary_demod_close_window();
         secondary_demod_listbox_update();
     }
-    if (!demodulators || !demodulators[0] || demodulators[0].subtype !== subtype) {
+    if (!demodulators || !demodulators[0] || demodulators[0].get_modulation() !== subtype) {
         last_analog_demodulator_subtype = subtype;
         var temp_offset = 0;
         if (demodulators.length) {
-            temp_offset = demodulators[0].offset_frequency;
+            temp_offset = demodulators[0].get_offset_frequency();
             demodulator_remove(0);
         }
-        demodulator_add(new Demodulator_default_analog(temp_offset, subtype));
+        var demod = new Demodulator(temp_offset, subtype);
+        demod.start();
+        demodulator_add(demod);
     }
     demodulator_buttons_update();
     update_digitalvoice_panels("openwebrx-panel-metadata-" + subtype);
     updateHash();
 }
 
-Demodulator.prototype.set_offset_frequency = function(to_what) {
-    if (to_what > bandwidth / 2 || to_what < -bandwidth / 2) return;
-    this.offset_frequency = Math.round(to_what);
-    this.set();
-    mkenvelopes(get_visible_freq_range());
-    tunedFrequencyDisplay.setFrequency(center_freq + to_what);
-    updateHash();
-}
-
-Demodulator.prototype.get_offset_frequency = function() {
-    return this.offset_frequency;
-}
-
 function waterfallWidth() {
     return $('body').width();
 }
@@ -988,7 +812,7 @@ function zoom_set(level) {
     level = parseInt(level);
     zoom_level = level;
     //zoom_center_rel=canvas_get_freq_offset(-canvases[0].offsetLeft+waterfallWidth()/2); //zoom to screen center instead of demod envelope
-    zoom_center_rel = demodulators[0].offset_frequency;
+    zoom_center_rel = demodulators[0].get_offset_frequency();
     zoom_center_where = 0.5 + (zoom_center_rel / bandwidth); //this is a kind of hack
     resize_canvases(true);
     mkscale();
@@ -1468,12 +1292,6 @@ var mute = false;
 // Optimalise these if audio lags or is choppy:
 var audio_buffer_maximal_length_sec = 1; //actual number of samples are calculated from sample rate
 
-function webrx_set_param(what, value) {
-    var params = {};
-    params[what] = value;
-    ws.send(JSON.stringify({"type": "dspcontrol", "params": params}));
-}
-
 function parseHash() {
     if (!window.location.hash) {
         return {};
@@ -1512,7 +1330,7 @@ function updateHash() {
     if (!demod) return;
     window.location.hash = $.map({
         freq: demod.get_offset_frequency() + center_freq,
-        mod: demod.subtype,
+        mod: demod.get_modulation(),
         secondary_mod: secondary_demod
     }, function(value, key){
         if (!value) return undefined;
@@ -1543,6 +1361,7 @@ function synchronize_demodulator_init(params) {
     sync_params = $.extend(sync_params, params || {});
     if (sync_params.initialParams && sync_params.modes && sync_params.features) {
         initialize_demodulator(sync_params.initialParams);
+        delete sync_params.initialParams;
     }
 }
 
@@ -1557,10 +1376,7 @@ function initialize_demodulator(initialParams) {
     if (params.offset_frequency) {
         demodulators[0].set_offset_frequency(params.offset_frequency);
     }
-    ws.send(JSON.stringify({
-        "type": "dspcontrol",
-        "action": "start"
-    }));
+    demodulators[0].start()
 }
 
 var reconnect_timeout = false;
@@ -1836,7 +1652,7 @@ function update_dmr_timeslot_filtering() {
     }).toArray().reduce(function (acc, v) {
         return acc | v;
     }, 0);
-    webrx_set_param("dmr_filter", filter);
+    demodulators[0].setDmrFilter(filter);
 }
 
 function playButtonClick() {
@@ -1932,7 +1748,7 @@ function demodulator_buttons_update() {
     var $buttons = $(".openwebrx-demodulator-button");
     $buttons.removeClass("highlighted").removeClass('disabled');
     if (!demodulators.length) return;
-    var mod = demodulators[0].subtype;
+    var mod = demodulators[0].get_modulation();
     $("#openwebrx-button-" + mod).addClass("highlighted");
     if (secondary_demod) {
         $("#openwebrx-button-dig").addClass("highlighted");
@@ -1997,9 +1813,7 @@ function demodulator_digital_replace(subtype) {
     secondary_demod_start(subtype);
     demodulator_analog_replace(mode.underlying[0], true);
     if (mode.bandpass) {
-        demodulators[0].low_cut = mode.bandpass.low_cut;
-        demodulators[0].high_cut = mode.bandpass.high_cut;
-        demodulators[0].set();
+        demodulators[0].setBandpass(mode.bandpass);
     }
     demodulator_buttons_update();
     $('#openwebrx-panel-digimodes').attr('data-mode', subtype);
diff --git a/owrx/connection.py b/owrx/connection.py
index 8deff4f..07c32ae 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -139,6 +139,7 @@ class OpenWebRxReceiverClient(Client):
     def handleTextMessage(self, conn, message):
         try:
             message = json.loads(message)
+            logger.debug(message)
             if "type" in message:
                 if message["type"] == "dspcontrol":
                     if "action" in message and message["action"] == "start":
@@ -146,7 +147,7 @@ class OpenWebRxReceiverClient(Client):
 
                     if "params" in message:
                         params = message["params"]
-                        self.setDspProperties(params)
+                        self.getDsp().setProperties(params)
 
                 elif message["type"] == "config":
                     if "params" in message:
@@ -163,7 +164,7 @@ class OpenWebRxReceiverClient(Client):
                     if "params" in message:
                         self.connectionProperties = message["params"]
                         if self.dsp:
-                            self.setDspProperties(self.connectionProperties)
+                            self.getDsp().setProperties(self.connectionProperties)
 
             else:
                 logger.warning("received message without type: {0}".format(message))
@@ -172,39 +173,30 @@ class OpenWebRxReceiverClient(Client):
             logger.warning("message is not json: {0}".format(message))
 
     def setSdr(self, id=None):
-        while True:
-            next = None
-            if id is not None:
-                next = SdrService.getSource(id)
-            if next is None:
-                next = SdrService.getFirstSource()
-            if next is None:
-                # exit condition: no sdrs available
-                self.handleNoSdrsAvailable()
-                return
+        next = None
+        if id is not None:
+            next = SdrService.getSource(id)
+        if next is None:
+            next = SdrService.getFirstSource()
+        if next is None:
+            # exit condition: no sdrs available
+            self.handleNoSdrsAvailable()
+            return
 
-            # exit condition: no change
-            if next == self.sdr:
-                return
+        # exit condition: no change
+        if next == self.sdr:
+            return
 
-            self.stopDsp()
+        self.stopDsp()
 
-            if self.configSub is not None:
-                self.configSub.cancel()
-                self.configSub = None
+        if self.configSub is not None:
+            self.configSub.cancel()
+            self.configSub = None
 
-            self.sdr = next
-
-            self.startDsp()
-
-            # keep trying until we find a suitable SDR
-            if self.sdr.getState() == SdrSource.STATE_FAILED:
-                self.write_log_message('SDR device "{0}" has failed, selecting new device'.format(self.sdr.getName()))
-            else:
-                break
+        self.sdr = next
 
         # send initial config
-        self.setDspProperties(self.connectionProperties)
+        self.getDsp().setProperties(self.connectionProperties)
 
         stack = PropertyStack()
         stack.addLayer(0, self.sdr.getProps())
@@ -236,9 +228,14 @@ class OpenWebRxReceiverClient(Client):
         self.write_sdr_error("No SDR Devices available")
 
     def startDsp(self):
-        if self.dsp is None and self.sdr is not None:
-            self.dsp = DspManager(self, self.sdr)
-            self.dsp.start()
+        while True:
+            logger.debug("starting dsp...")
+            self.getDsp().start()
+            if self.sdr.getState() == SdrSource.STATE_FAILED:
+                self.write_log_message('SDR device "{0}" has failed, selecting new device'.format(self.sdr.getName()))
+                self.setSdr()
+            else:
+                break
 
     def close(self):
         self.stopDsp()
@@ -250,6 +247,7 @@ class OpenWebRxReceiverClient(Client):
         super().close()
 
     def stopDsp(self):
+        logger.debug("stopDsp")
         if self.dsp is not None:
             self.dsp.stop()
             self.dsp = None
@@ -270,9 +268,11 @@ class OpenWebRxReceiverClient(Client):
         for key, value in params.items():
             protected[key] = value
 
-    def setDspProperties(self, params):
-        for key, value in params.items():
-            self.dsp.setProperty(key, value)
+    def getDsp(self):
+        if self.dsp is None:
+            logger.debug("new DSP")
+            self.dsp = DspManager(self, self.sdr)
+        return self.dsp
 
     def write_spectrum_data(self, data):
         self.mp_send(bytes([0x01]) + data)
diff --git a/owrx/dsp.py b/owrx/dsp.py
index 1f8850e..979011e 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -135,6 +135,7 @@ class DspManager(csdr.output):
         super().__init__()
 
     def start(self):
+        logger.debug(self.sdrSource)
         if self.sdrSource.isAvailable():
             self.dsp.start()
 
@@ -160,6 +161,10 @@ class DspManager(csdr.output):
             sub.cancel()
         self.subscriptions = []
 
+    def setProperties(self, props):
+        for k, v in props.items():
+            self.setProperty(k, v)
+
     def setProperty(self, prop, value):
         self.props[prop] = value
 

From 1764abe65f509b0f1692a3238bd01a3e2a110475 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 30 Apr 2020 22:31:18 +0200
Subject: [PATCH 258/475] update secondary parameters

---
 htdocs/lib/Demodulator.js | 15 ++++++++++++++-
 htdocs/openwebrx.js       | 13 ++++++-------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/htdocs/lib/Demodulator.js b/htdocs/lib/Demodulator.js
index 66a7196..3938514 100644
--- a/htdocs/lib/Demodulator.js
+++ b/htdocs/lib/Demodulator.js
@@ -108,6 +108,7 @@ function Demodulator(offset_frequency, modulation) {
     this.squelch_level = -150;
     this.dmr_filter = 3;
     this.state = {};
+    this.secondary_demod = false;
     var mode = Modes.findByModulation(modulation);
     if (mode) {
         this.low_cut = mode.bandpass.low_cut;
@@ -175,7 +176,9 @@ Demodulator.prototype.set = function () {  //this function sends demodulator par
         "offset_freq": this.offset_frequency,
         "mod": this.modulation,
         "dmr_filter": this.dmr_filter,
-        "squelch_level": this.squelch_level
+        "squelch_level": this.squelch_level,
+        "secondary_mod": this.secondary_demod,
+        "secondary_offset_freq": this.secondary_offset_freq
     };
     var to_send = {};
     for (var key in params) {
@@ -215,3 +218,13 @@ Demodulator.prototype.getBandpass = function() {
         high_cut: this.high_cut
     };
 };
+
+Demodulator.prototype.set_secondary_demod = function(secondary_demod) {
+    this.secondary_demod = secondary_demod;
+    this.set();
+};
+
+Demodulator.prototype.set_secondary_offset_freq = function(secondary_offset) {
+    this.secondary_offset_freq = secondary_offset;
+    this.set();
+};
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 1dcdd3f..2c8d13a 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1810,8 +1810,8 @@ function demodulator_digital_replace(subtype) {
         divlog('Digital mode "' + mode.name + '" not supported. Please check requirements', true);
         return;
     }
-    secondary_demod_start(subtype);
     demodulator_analog_replace(mode.underlying[0], true);
+    secondary_demod_start(subtype);
     if (mode.bandpass) {
         demodulators[0].setBandpass(mode.bandpass);
     }
@@ -1879,12 +1879,14 @@ function secondary_demod_init() {
 
 function secondary_demod_start(subtype) {
     secondary_demod_canvases_initialized = false;
-    ws.send(JSON.stringify({"type": "dspcontrol", "params": {"secondary_mod": subtype}}));
+    demodulators[0].set_secondary_demod(subtype);
     secondary_demod = subtype;
 }
 
 function secondary_demod_stop() {
-    ws.send(JSON.stringify({"type": "dspcontrol", "params": {"secondary_mod": false}}));
+    if (demodulators[0]) {
+        demodulators[0].set_secondary_demod(false);
+    }
     secondary_demod = false;
 }
 
@@ -1969,10 +1971,7 @@ function secondary_demod_update_channel_freq_from_event(evt) {
     if (!secondary_demod_waiting_for_set) {
         secondary_demod_waiting_for_set = true;
         window.setTimeout(function () {
-                ws.send(JSON.stringify({
-                    "type": "dspcontrol",
-                    "params": {"secondary_offset_freq": Math.floor(secondary_demod_channel_freq)}
-                }));
+                demodulators[0].set_secondary_offset_freq(Math.floor(secondary_demod_channel_freq));
                 secondary_demod_waiting_for_set = false;
             },
             50

From 56f3f089a143db656f9a3ac527c3533667756d69 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 30 Apr 2020 22:54:44 +0200
Subject: [PATCH 259/475] fix debugging; synchronize startup

---
 owrx/connection.py |  3 ---
 owrx/dsp.py        | 10 ++++++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index 07c32ae..bd020ed 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -229,7 +229,6 @@ class OpenWebRxReceiverClient(Client):
 
     def startDsp(self):
         while True:
-            logger.debug("starting dsp...")
             self.getDsp().start()
             if self.sdr.getState() == SdrSource.STATE_FAILED:
                 self.write_log_message('SDR device "{0}" has failed, selecting new device'.format(self.sdr.getName()))
@@ -247,7 +246,6 @@ class OpenWebRxReceiverClient(Client):
         super().close()
 
     def stopDsp(self):
-        logger.debug("stopDsp")
         if self.dsp is not None:
             self.dsp.stop()
             self.dsp = None
@@ -270,7 +268,6 @@ class OpenWebRxReceiverClient(Client):
 
     def getDsp(self):
         if self.dsp is None:
-            logger.debug("new DSP")
             self.dsp = DspManager(self, self.sdr)
         return self.dsp
 
diff --git a/owrx/dsp.py b/owrx/dsp.py
index 979011e..cc94097 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -130,14 +130,17 @@ class DspManager(csdr.output):
                 self.props.wireProperty("secondary_offset_freq", self.dsp.set_secondary_offset_freq),
             ]
 
+        self.startOnAvailable = False
+
         self.sdrSource.addClient(self)
 
         super().__init__()
 
     def start(self):
-        logger.debug(self.sdrSource)
         if self.sdrSource.isAvailable():
             self.dsp.start()
+        else:
+            self.startOnAvailable = True
 
     def receive_output(self, t, read_fn):
         logger.debug("adding new output of type %s", t)
@@ -156,6 +159,7 @@ class DspManager(csdr.output):
 
     def stop(self):
         self.dsp.stop()
+        self.startOnAvailable = False
         self.sdrSource.removeClient(self)
         for sub in self.subscriptions:
             sub.cancel()
@@ -174,7 +178,9 @@ class DspManager(csdr.output):
     def onStateChange(self, state):
         if state == SdrSource.STATE_RUNNING:
             logger.debug("received STATE_RUNNING, attempting DspSource restart")
-            self.dsp.start()
+            if self.startOnAvailable:
+                self.dsp.start()
+                self.startOnAvailable = False
         elif state == SdrSource.STATE_STOPPING:
             logger.debug("received STATE_STOPPING, shutting down DspSource")
             self.dsp.stop()

From 1441b9610ce9982d3eb149cd1501009393b8ae75 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 30 Apr 2020 23:16:49 +0200
Subject: [PATCH 260/475] refactor into the classes, too

---
 htdocs/lib/Demodulator.js | 91 ++++++++++++++++++++++++++++++++++++++-
 htdocs/openwebrx.js       | 85 ------------------------------------
 2 files changed, 89 insertions(+), 87 deletions(-)

diff --git a/htdocs/lib/Demodulator.js b/htdocs/lib/Demodulator.js
index 3938514..09bdd0a 100644
--- a/htdocs/lib/Demodulator.js
+++ b/htdocs/lib/Demodulator.js
@@ -22,7 +22,7 @@ function Envelope(parent) {
 
 Envelope.prototype.draw = function(visible_range){
     this.visible_range = visible_range;
-    this.drag_ranges = demod_envelope_draw(
+    this.drag_ranges = this.envelope_draw(
         range,
         center_freq + this.parent.offset_frequency + this.parent.low_cut,
         center_freq + this.parent.offset_frequency + this.parent.high_cut,
@@ -30,9 +30,73 @@ Envelope.prototype.draw = function(visible_range){
     );
 };
 
+Envelope.prototype.envelope_draw = function (range, from, to, color, line) {
+    //                                               ____
+    // Draws a standard filter envelope like this: _/    \_
+    // Parameters are given in offset frequency (Hz).
+    // Envelope is drawn on the scale canvas.
+    // A "drag range" object is returned, containing information about the draggable areas of the envelope
+    // (beginning, ending and the line showing the offset frequency).
+    if (typeof color === "undefined") color = "#ffff00"; //yellow
+    var env_bounding_line_w = 5;   //
+    var env_att_w = 5;             //     _______   ___env_h2 in px   ___|_____
+    var env_h1 = 17;               //   _/|      \_ ___env_h1 in px _/   |_    \_
+    var env_h2 = 5;                //   |||env_att_line_w                |_env_lineplus
+    var env_lineplus = 1;          //   ||env_bounding_line_w
+    var env_line_click_area = 6;
+    //range=get_visible_freq_range();
+    var from_px = scale_px_from_freq(from, range);
+    var to_px = scale_px_from_freq(to, range);
+    if (to_px < from_px) /* swap'em */ {
+        var temp_px = to_px;
+        to_px = from_px;
+        from_px = temp_px;
+    }
+
+    /*from_px-=env_bounding_line_w/2;
+    to_px+=env_bounding_line_w/2;*/
+    from_px -= (env_att_w + env_bounding_line_w);
+    to_px += (env_att_w + env_bounding_line_w);
+    // do drawing:
+    scale_ctx.lineWidth = 3;
+    scale_ctx.strokeStyle = color;
+    scale_ctx.fillStyle = color;
+    var drag_ranges = {envelope_on_screen: false, line_on_screen: false};
+    if (!(to_px < 0 || from_px > window.innerWidth)) // out of screen?
+    {
+        drag_ranges.beginning = {x1: from_px, x2: from_px + env_bounding_line_w + env_att_w};
+        drag_ranges.ending = {x1: to_px - env_bounding_line_w - env_att_w, x2: to_px};
+        drag_ranges.whole_envelope = {x1: from_px, x2: to_px};
+        drag_ranges.envelope_on_screen = true;
+        scale_ctx.beginPath();
+        scale_ctx.moveTo(from_px, env_h1);
+        scale_ctx.lineTo(from_px + env_bounding_line_w, env_h1);
+        scale_ctx.lineTo(from_px + env_bounding_line_w + env_att_w, env_h2);
+        scale_ctx.lineTo(to_px - env_bounding_line_w - env_att_w, env_h2);
+        scale_ctx.lineTo(to_px - env_bounding_line_w, env_h1);
+        scale_ctx.lineTo(to_px, env_h1);
+        scale_ctx.globalAlpha = 0.3;
+        scale_ctx.fill();
+        scale_ctx.globalAlpha = 1;
+        scale_ctx.stroke();
+    }
+    if (typeof line !== "undefined") // out of screen?
+    {
+        var line_px = scale_px_from_freq(line, range);
+        if (!(line_px < 0 || line_px > window.innerWidth)) {
+            drag_ranges.line = {x1: line_px - env_line_click_area / 2, x2: line_px + env_line_click_area / 2};
+            drag_ranges.line_on_screen = true;
+            scale_ctx.moveTo(line_px, env_h1 + env_lineplus);
+            scale_ctx.lineTo(line_px, env_h2 - env_lineplus);
+            scale_ctx.stroke();
+        }
+    }
+    return drag_ranges;
+};
+
 Envelope.prototype.drag_start = function(x, key_modifiers){
     this.key_modifiers = key_modifiers;
-    this.dragged_range = demod_envelope_where_clicked(x, this.drag_ranges, key_modifiers);
+    this.dragged_range = this.where_clicked(x, this.drag_ranges, key_modifiers);
     this.drag_origin = {
         x: x,
         low_cut: this.parent.low_cut,
@@ -42,6 +106,29 @@ Envelope.prototype.drag_start = function(x, key_modifiers){
     return this.dragged_range !== Demodulator.draggable_ranges.none;
 };
 
+Envelope.prototype.where_clicked = function(x, drag_ranges, key_modifiers) {  // Check exactly what the user has clicked based on ranges returned by demod_envelope_draw().
+    var in_range = function (x, range) {
+        return range.x1 <= x && range.x2 >= x;
+    };
+    var dr = Demodulator.draggable_ranges;
+
+    if (key_modifiers.shiftKey) {
+        //Check first: shift + center drag emulates BFO knob
+        if (drag_ranges.line_on_screen && in_range(x, drag_ranges.line)) return dr.bfo;
+        //Check second: shift + envelope drag emulates PBF knob
+        if (drag_ranges.envelope_on_screen && in_range(x, drag_ranges.whole_envelope)) return dr.pbs;
+    }
+    if (drag_ranges.envelope_on_screen) {
+        // For low and high cut:
+        if (in_range(x, drag_ranges.beginning)) return dr.beginning;
+        if (in_range(x, drag_ranges.ending)) return dr.ending;
+        // Last priority: having clicked anything else on the envelope, without holding the shift key
+        if (in_range(x, drag_ranges.whole_envelope)) return dr.anything_else;
+    }
+    return dr.none; //User doesn't drag the envelope for this demodulator
+};
+
+
 Envelope.prototype.drag_move = function(x) {
     var dr = Demodulator.draggable_ranges;
     var new_value;
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 2c8d13a..0f7537f 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -238,91 +238,6 @@ function typeInAnimation(element, timeout, what, onFinish) {
 
 demodulators = [];
 
-function demod_envelope_draw(range, from, to, color, line) {  //                                               ____
-    // Draws a standard filter envelope like this: _/    \_
-    // Parameters are given in offset frequency (Hz).
-    // Envelope is drawn on the scale canvas.
-    // A "drag range" object is returned, containing information about the draggable areas of the envelope
-    // (beginning, ending and the line showing the offset frequency).
-    if (typeof color === "undefined") color = "#ffff00"; //yellow
-    var env_bounding_line_w = 5;   //
-    var env_att_w = 5;             //     _______   ___env_h2 in px   ___|_____
-    var env_h1 = 17;               //   _/|      \_ ___env_h1 in px _/   |_    \_
-    var env_h2 = 5;                //   |||env_att_line_w                |_env_lineplus
-    var env_lineplus = 1;          //   ||env_bounding_line_w
-    var env_line_click_area = 6;
-    //range=get_visible_freq_range();
-    var from_px = scale_px_from_freq(from, range);
-    var to_px = scale_px_from_freq(to, range);
-    if (to_px < from_px) /* swap'em */ {
-        var temp_px = to_px;
-        to_px = from_px;
-        from_px = temp_px;
-    }
-
-    /*from_px-=env_bounding_line_w/2;
-	to_px+=env_bounding_line_w/2;*/
-    from_px -= (env_att_w + env_bounding_line_w);
-    to_px += (env_att_w + env_bounding_line_w);
-    // do drawing:
-    scale_ctx.lineWidth = 3;
-    scale_ctx.strokeStyle = color;
-    scale_ctx.fillStyle = color;
-    var drag_ranges = {envelope_on_screen: false, line_on_screen: false};
-    if (!(to_px < 0 || from_px > window.innerWidth)) // out of screen?
-    {
-        drag_ranges.beginning = {x1: from_px, x2: from_px + env_bounding_line_w + env_att_w};
-        drag_ranges.ending = {x1: to_px - env_bounding_line_w - env_att_w, x2: to_px};
-        drag_ranges.whole_envelope = {x1: from_px, x2: to_px};
-        drag_ranges.envelope_on_screen = true;
-        scale_ctx.beginPath();
-        scale_ctx.moveTo(from_px, env_h1);
-        scale_ctx.lineTo(from_px + env_bounding_line_w, env_h1);
-        scale_ctx.lineTo(from_px + env_bounding_line_w + env_att_w, env_h2);
-        scale_ctx.lineTo(to_px - env_bounding_line_w - env_att_w, env_h2);
-        scale_ctx.lineTo(to_px - env_bounding_line_w, env_h1);
-        scale_ctx.lineTo(to_px, env_h1);
-        scale_ctx.globalAlpha = 0.3;
-        scale_ctx.fill();
-        scale_ctx.globalAlpha = 1;
-        scale_ctx.stroke();
-    }
-    if (typeof line !== "undefined") // out of screen?
-    {
-        var line_px = scale_px_from_freq(line, range);
-        if (!(line_px < 0 || line_px > window.innerWidth)) {
-            drag_ranges.line = {x1: line_px - env_line_click_area / 2, x2: line_px + env_line_click_area / 2};
-            drag_ranges.line_on_screen = true;
-            scale_ctx.moveTo(line_px, env_h1 + env_lineplus);
-            scale_ctx.lineTo(line_px, env_h2 - env_lineplus);
-            scale_ctx.stroke();
-        }
-    }
-    return drag_ranges;
-}
-
-function demod_envelope_where_clicked(x, drag_ranges, key_modifiers) {  // Check exactly what the user has clicked based on ranges returned by demod_envelope_draw().
-    var in_range = function (x, range) {
-        return range.x1 <= x && range.x2 >= x;
-    };
-    var dr = Demodulator.draggable_ranges;
-
-    if (key_modifiers.shiftKey) {
-        //Check first: shift + center drag emulates BFO knob
-        if (drag_ranges.line_on_screen && in_range(x, drag_ranges.line)) return dr.bfo;
-        //Check second: shift + envelope drag emulates PBF knob
-        if (drag_ranges.envelope_on_screen && in_range(x, drag_ranges.whole_envelope)) return dr.pbs;
-    }
-    if (drag_ranges.envelope_on_screen) {
-        // For low and high cut:
-        if (in_range(x, drag_ranges.beginning)) return dr.beginning;
-        if (in_range(x, drag_ranges.ending)) return dr.ending;
-        // Last priority: having clicked anything else on the envelope, without holding the shift key
-        if (in_range(x, drag_ranges.whole_envelope)) return dr.anything_else;
-    }
-    return dr.none; //User doesn't drag the envelope for this demodulator
-}
-
 
 function mkenvelopes(visible_range) //called from mkscale
 {

From 02a632660558a2e9b7273e059ba94d515bbe12e5 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 30 Apr 2020 23:20:56 +0200
Subject: [PATCH 261/475] fix method names in comments

---
 htdocs/lib/Demodulator.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/lib/Demodulator.js b/htdocs/lib/Demodulator.js
index 09bdd0a..24448de 100644
--- a/htdocs/lib/Demodulator.js
+++ b/htdocs/lib/Demodulator.js
@@ -106,7 +106,7 @@ Envelope.prototype.drag_start = function(x, key_modifiers){
     return this.dragged_range !== Demodulator.draggable_ranges.none;
 };
 
-Envelope.prototype.where_clicked = function(x, drag_ranges, key_modifiers) {  // Check exactly what the user has clicked based on ranges returned by demod_envelope_draw().
+Envelope.prototype.where_clicked = function(x, drag_ranges, key_modifiers) {  // Check exactly what the user has clicked based on ranges returned by envelope_draw().
     var in_range = function (x, range) {
         return range.x1 <= x && range.x2 >= x;
     };
@@ -211,7 +211,7 @@ Demodulator.draggable_ranges = {
     anything_else: 3,
     bfo: 4 /*line (while holding shift)*/,
     pbs: 5
-}; //to which parameter these correspond in demod_envelope_draw()
+}; //to which parameter these correspond in envelope_draw()
 
 Demodulator.color_index = 0;
 Demodulator.colors = ["#ffff00", "#00ff00", "#00ffff", "#058cff", "#ff9600", "#a1ff39", "#ff4e39", "#ff5dbd"];

From 5013af2117ad2d5e576441099cf15f8106fc896a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 30 Apr 2020 23:31:52 +0200
Subject: [PATCH 262/475] combine methods

---
 htdocs/lib/Demodulator.js | 49 +++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/htdocs/lib/Demodulator.js b/htdocs/lib/Demodulator.js
index 24448de..e742028 100644
--- a/htdocs/lib/Demodulator.js
+++ b/htdocs/lib/Demodulator.js
@@ -15,29 +15,21 @@ Filter.prototype.getLimits = function() {
     };
 };
 
-function Envelope(parent) {
-    this.parent = parent;
+function Envelope(demodulator) {
+    this.demodulator = demodulator;
     this.dragged_range = Demodulator.draggable_ranges.none;
 }
 
 Envelope.prototype.draw = function(visible_range){
     this.visible_range = visible_range;
-    this.drag_ranges = this.envelope_draw(
-        range,
-        center_freq + this.parent.offset_frequency + this.parent.low_cut,
-        center_freq + this.parent.offset_frequency + this.parent.high_cut,
-        this.color, center_freq + this.parent.offset_frequency
-    );
-};
+    var line = center_freq + this.demodulator.offset_frequency;
 
-Envelope.prototype.envelope_draw = function (range, from, to, color, line) {
     //                                               ____
     // Draws a standard filter envelope like this: _/    \_
     // Parameters are given in offset frequency (Hz).
     // Envelope is drawn on the scale canvas.
     // A "drag range" object is returned, containing information about the draggable areas of the envelope
     // (beginning, ending and the line showing the offset frequency).
-    if (typeof color === "undefined") color = "#ffff00"; //yellow
     var env_bounding_line_w = 5;   //
     var env_att_w = 5;             //     _______   ___env_h2 in px   ___|_____
     var env_h1 = 17;               //   _/|      \_ ___env_h1 in px _/   |_    \_
@@ -45,7 +37,9 @@ Envelope.prototype.envelope_draw = function (range, from, to, color, line) {
     var env_lineplus = 1;          //   ||env_bounding_line_w
     var env_line_click_area = 6;
     //range=get_visible_freq_range();
+    var from = center_freq + this.demodulator.offset_frequency + this.demodulator.low_cut;
     var from_px = scale_px_from_freq(from, range);
+    var to = center_freq + this.demodulator.offset_frequency + this.demodulator.high_cut;
     var to_px = scale_px_from_freq(to, range);
     if (to_px < from_px) /* swap'em */ {
         var temp_px = to_px;
@@ -53,12 +47,11 @@ Envelope.prototype.envelope_draw = function (range, from, to, color, line) {
         from_px = temp_px;
     }
 
-    /*from_px-=env_bounding_line_w/2;
-    to_px+=env_bounding_line_w/2;*/
     from_px -= (env_att_w + env_bounding_line_w);
     to_px += (env_att_w + env_bounding_line_w);
     // do drawing:
     scale_ctx.lineWidth = 3;
+    var color = this.color || '#ffff00'; // yellow
     scale_ctx.strokeStyle = color;
     scale_ctx.fillStyle = color;
     var drag_ranges = {envelope_on_screen: false, line_on_screen: false};
@@ -91,7 +84,7 @@ Envelope.prototype.envelope_draw = function (range, from, to, color, line) {
             scale_ctx.stroke();
         }
     }
-    return drag_ranges;
+    this.drag_ranges = drag_ranges;
 };
 
 Envelope.prototype.drag_start = function(x, key_modifiers){
@@ -99,9 +92,9 @@ Envelope.prototype.drag_start = function(x, key_modifiers){
     this.dragged_range = this.where_clicked(x, this.drag_ranges, key_modifiers);
     this.drag_origin = {
         x: x,
-        low_cut: this.parent.low_cut,
-        high_cut: this.parent.high_cut,
-        offset_frequency: this.parent.offset_frequency
+        low_cut: this.demodulator.low_cut,
+        high_cut: this.demodulator.high_cut,
+        offset_frequency: this.demodulator.offset_frequency
     };
     return this.dragged_range !== Demodulator.draggable_ranges.none;
 };
@@ -144,33 +137,33 @@ Envelope.prototype.drag_move = function(x) {
     //frequency.
     if (this.dragged_range === dr.beginning || this.dragged_range === dr.bfo || this.dragged_range === dr.pbs) {
         //we don't let low_cut go beyond its limits
-        if ((new_value = this.drag_origin.low_cut + minus * freq_change) < this.parent.filter.getLimits().low) return true;
+        if ((new_value = this.drag_origin.low_cut + minus * freq_change) < this.demodulator.filter.getLimits().low) return true;
         //nor the filter passband be too small
-        if (this.parent.high_cut - new_value < this.parent.filter.min_passband) return true;
+        if (this.demodulator.high_cut - new_value < this.demodulator.filter.min_passband) return true;
         //sanity check to prevent GNU Radio "firdes check failed: fa <= fb"
-        if (new_value >= this.parent.high_cut) return true;
-        this.parent.low_cut = new_value;
+        if (new_value >= this.demodulator.high_cut) return true;
+        this.demodulator.low_cut = new_value;
     }
     if (this.dragged_range === dr.ending || this.dragged_range === dr.bfo || this.dragged_range === dr.pbs) {
         //we don't let high_cut go beyond its limits
-        if ((new_value = this.drag_origin.high_cut + minus * freq_change) > this.parent.filter.getLimits().high) return true;
+        if ((new_value = this.drag_origin.high_cut + minus * freq_change) > this.demodulator.filter.getLimits().high) return true;
         //nor the filter passband be too small
-        if (new_value - this.parent.low_cut < this.parent.filter.min_passband) return true;
+        if (new_value - this.demodulator.low_cut < this.demodulator.filter.min_passband) return true;
         //sanity check to prevent GNU Radio "firdes check failed: fa <= fb"
-        if (new_value <= this.parent.low_cut) return true;
-        this.parent.high_cut = new_value;
+        if (new_value <= this.demodulator.low_cut) return true;
+        this.demodulator.high_cut = new_value;
     }
     if (this.dragged_range === dr.anything_else || this.dragged_range === dr.bfo) {
         //when any other part of the envelope is dragged, the offset frequency is changed (whole passband also moves with it)
         new_value = this.drag_origin.offset_frequency + freq_change;
         if (new_value > bandwidth / 2 || new_value < -bandwidth / 2) return true; //we don't allow tuning above Nyquist frequency :-)
-        this.parent.offset_frequency = new_value;
+        this.demodulator.offset_frequency = new_value;
     }
     //now do the actual modifications:
     mkenvelopes(this.visible_range);
-    this.parent.set();
+    this.demodulator.set();
     //will have to change this when changing to multi-demodulator mode:
-    tunedFrequencyDisplay.setFrequency(center_freq + this.parent.offset_frequency);
+    tunedFrequencyDisplay.setFrequency(center_freq + this.demodulator.offset_frequency);
     return true;
 };
 

From b8f7686a6dcb6da2011348ea2daf670fd8763b5d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 00:05:20 +0200
Subject: [PATCH 263/475] refactor demodulator classes, part 1

---
 htdocs/css/openwebrx.css       |  14 ++-
 htdocs/index.html              |   5 +-
 htdocs/lib/BookmarkBar.js      |  22 ++--
 htdocs/lib/Demodulator.js      |  41 ++++++--
 htdocs/lib/DemodulatorPanel.js | 158 ++++++++++++++++++++++++++++
 htdocs/lib/FrequencyDisplay.js |  25 +++--
 htdocs/lib/Modes.js            |  62 +++--------
 htdocs/openwebrx.js            | 185 +++++----------------------------
 8 files changed, 273 insertions(+), 239 deletions(-)
 create mode 100644 htdocs/lib/DemodulatorPanel.js

diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index 731bac1..981bf9c 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -311,7 +311,7 @@ input[type=range]:focus::-ms-fill-upper
     font-style: normal;
 }
 
-#webrx-actual-freq {
+.webrx-actual-freq {
 	width: 100%;
 	text-align: left;
 	padding: 0;
@@ -320,11 +320,11 @@ input[type=range]:focus::-ms-fill-upper
 	flex-direction: row;
 }
 
-#webrx-actual-freq > * {
+.webrx-actual-freq > * {
     flex: 1;
 }
 
-#webrx-actual-freq input {
+.webrx-actual-freq input {
     font-family: 'roboto-mono';
     width: 0;
     box-sizing: border-box;
@@ -334,14 +334,13 @@ input[type=range]:focus::-ms-fill-upper
     color: inherit;
 }
 
-#webrx-actual-freq, #webrx-actual-freq input {
+.webrx-actual-freq, .webrx-actual-freq input {
 	font-size: 16pt;
 	font-family: 'roboto-mono';
 	line-height: 22px;
 }
 
-#webrx-mouse-freq
-{
+.webrx-mouse-freq {
 	width: 100%;
 	text-align: left;
 	font-size: 10pt;
@@ -728,8 +727,7 @@ img.openwebrx-mirror-img
 	color: White;
 }
 
-#openwebrx-secondary-demod-listbox
-{
+.openwebrx-secondary-demod-listbox {
 	width: 173px;
 	height: 27px;
 	padding-left:3px;
diff --git a/htdocs/index.html b/htdocs/index.html
index 98916dd..3c706f3 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -28,6 +28,7 @@
         <script src="static/lib/jquery-3.2.1.min.js"></script>
         <script src="static/lib/jquery.nanoscroller.js"></script>
         <script src="static/lib/Demodulator.js"></script>
+        <script src="static/lib/DemodulatorPanel.js"></script>
         <script src="static/lib/BookmarkBar.js"></script>
         <script src="static/lib/AudioEngine.js"></script>
         <script src="static/lib/ProgressBar.js"></script>
@@ -156,8 +157,8 @@
             <div class="openwebrx-panel" id="openwebrx-panel-receiver" data-panel-name="client-params" style="width: 259px;">
                 <div class="openwebrx-panel-line frequencies-container">
                     <div class="frequencies">
-                        <div id="webrx-actual-freq"></div>
-                        <div id="webrx-mouse-freq"></div>
+                        <div class="webrx-actual-freq"></div>
+                        <div class="webrx-mouse-freq"></div>
                     </div>
                     <div class="openwebrx-button openwebrx-square-button openwebrx-bookmark-button" style="display:none;" title="Add bookmark...">
                         <img src="static/gfx/openwebrx-bookmark.png">
diff --git a/htdocs/lib/BookmarkBar.js b/htdocs/lib/BookmarkBar.js
index d039494..402e3d4 100644
--- a/htdocs/lib/BookmarkBar.js
+++ b/htdocs/lib/BookmarkBar.js
@@ -9,11 +9,11 @@ function BookmarkBar() {
         me.$container.find('.bookmark').removeClass('selected');
         var b = $bookmark.data();
         if (!b || !b.frequency || (!b.modulation && !b.digital_modulation)) return;
-        demodulators[0].set_offset_frequency(b.frequency - center_freq);
+        me.getDemodulator().set_offset_frequency(b.frequency - center_freq);
         if (b.modulation) {
-            demodulator_analog_replace(b.modulation);
+            me.getDemodulatorPanel().setMode(b.modulation);
         } else if (b.digital_modulation) {
-            demodulator_digital_replace(b.digital_modulation);
+            me.getDemodulatorPanel().setDigiMode(b.digital_modulation);
         }
         $bookmark.addClass('selected');
     });
@@ -108,8 +108,8 @@ BookmarkBar.prototype.showEditDialog = function(bookmark) {
     if (!bookmark) {
         bookmark = {
             name: "",
-            frequency: center_freq + demodulators[0].offset_frequency,
-            modulation: demodulators[0].subtype
+            frequency: center_freq + this.getDemodulator().get_offset_frequency(),
+            modulation: this.getDemodulator().get_modulation()
         }
     }
     ['name', 'frequency', 'modulation'].forEach(function(key){
@@ -154,6 +154,14 @@ BookmarkBar.prototype.storeBookmark = function() {
     me.$dialog.hide();
 };
 
+BookmarkBar.prototype.getDemodulatorPanel = function() {
+    return $('#openwebrx-panel-receiver').demodulatorPanel();
+};
+
+BookmarkBar.prototype.getDemodulator = function() {
+    return this.getDemodulatorPanel().getDemodulator();
+};
+
 BookmarkLocalStorage = function(){
 };
 
@@ -171,7 +179,3 @@ BookmarkLocalStorage.prototype.deleteBookmark = function(data) {
     bookmarks = bookmarks.filter(function(b) { return b.id !== data; });
     this.setBookmarks(bookmarks);
 };
-
-
-
-
diff --git a/htdocs/lib/Demodulator.js b/htdocs/lib/Demodulator.js
index e742028..73dbe10 100644
--- a/htdocs/lib/Demodulator.js
+++ b/htdocs/lib/Demodulator.js
@@ -157,18 +157,15 @@ Envelope.prototype.drag_move = function(x) {
         //when any other part of the envelope is dragged, the offset frequency is changed (whole passband also moves with it)
         new_value = this.drag_origin.offset_frequency + freq_change;
         if (new_value > bandwidth / 2 || new_value < -bandwidth / 2) return true; //we don't allow tuning above Nyquist frequency :-)
-        this.demodulator.offset_frequency = new_value;
+        this.demodulator.set_offset_frequency(new_value);
     }
     //now do the actual modifications:
-    mkenvelopes(this.visible_range);
-    this.demodulator.set();
-    //will have to change this when changing to multi-demodulator mode:
-    tunedFrequencyDisplay.setFrequency(center_freq + this.demodulator.offset_frequency);
+    //mkenvelopes(this.visible_range);
+    //this.demodulator.set();
     return true;
 };
 
 Envelope.prototype.drag_end = function(){
-    demodulator_buttons_update();
     var to_return = this.dragged_range !== Demodulator.draggable_ranges.none; //this part is required for cliking anywhere on the scale to set offset
     this.dragged_range = Demodulator.draggable_ranges.none;
     return to_return;
@@ -194,6 +191,9 @@ function Demodulator(offset_frequency, modulation) {
         this.low_cut = mode.bandpass.low_cut;
         this.high_cut = mode.bandpass.high_cut;
     }
+    this.listeners = {
+        "frequencychange": []
+    };
 }
 
 //ranges on filter envelope that can be dragged:
@@ -216,12 +216,27 @@ Demodulator.get_next_color = function() {
 
 
 
+Demodulator.prototype.on = function(event, handler) {
+    this.listeners[event].push(handler);
+};
+
+Demodulator.prototype.emit = function(event, params) {
+    this.listeners[event].forEach(function(fn) {
+        fn(params);
+    });
+};
+
 Demodulator.prototype.set_offset_frequency = function(to_what) {
     if (to_what > bandwidth / 2 || to_what < -bandwidth / 2) return;
-    this.offset_frequency = Math.round(to_what);
+    to_what = Math.round(to_what);
+    if (this.offset_frequency === to_what) {
+        return;
+    }
+    this.offset_frequency = to_what;
     this.set();
+    this.emit("frequencychange", to_what);
     mkenvelopes(get_visible_freq_range());
-    tunedFrequencyDisplay.setFrequency(center_freq + to_what);
+    //tunedFrequencyDisplay.setFrequency(center_freq + to_what);
     updateHash();
 };
 
@@ -300,11 +315,21 @@ Demodulator.prototype.getBandpass = function() {
 };
 
 Demodulator.prototype.set_secondary_demod = function(secondary_demod) {
+    if (this.secondary_demod === secondary_demod) {
+        return;
+    }
     this.secondary_demod = secondary_demod;
     this.set();
 };
 
+Demodulator.prototype.get_secondary_demod = function() {
+    return this.secondary_demod;
+};
+
 Demodulator.prototype.set_secondary_offset_freq = function(secondary_offset) {
+    if (this.secondary_offset_freq === secondary_offset) {
+        return;
+    }
     this.secondary_offset_freq = secondary_offset;
     this.set();
 };
diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
new file mode 100644
index 0000000..09c2cfd
--- /dev/null
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -0,0 +1,158 @@
+function DemodulatorPanel(el) {
+    var self = this;
+    self.el = el;
+    self.demodulator = null;
+
+    var displayEl = el.find('.webrx-actual-freq')
+    this.tuneableFrequencyDisplay = displayEl.tuneableFrequencyDisplay();
+    displayEl.on('frequencychange', function(event, freq) {
+        self.getDemodulator().set_offset_frequency(freq - center_freq);
+    });
+
+    Modes.registerModePanel(this);
+    el.on('click', '.openwebrx-demodulator-button[data-modulation]', function() {
+        self.setMode($(this).data('modulation'));
+    });
+    el.on('change', '.openwebrx-secondary-demod-listbox', function() {
+        self.setDigiMode($(this).val());
+    });
+    // TODO: disable digimodes
+};
+
+DemodulatorPanel.prototype.render = function() {
+    var available = Modes.getModes().filter(function(m){ return m.isAvailable(); });
+    var normalModes = available.filter(function(m){ return m.type === 'analog'; });
+    var digiModes = available.filter(function(m){ return m.type === 'digimode'; });
+
+    var html = []
+
+    var buttons = normalModes.map(function(m){
+        return $(
+            '<div ' +
+                'class="openwebrx-button openwebrx-demodulator-button" ' +
+                'data-modulation="' + m.modulation + '" ' +
+                'id="openwebrx-button-' + m.modulation + '" r' +
+            '>' + m.name + '</div>'
+        );
+    });
+
+    var index = 0;
+    var arrayLength = buttons.length;
+    var chunks = [];
+
+    for (index = 0; index < arrayLength; index += 5) {
+        chunks.push(buttons.slice(index, index + 5));
+    }
+
+    html.push.apply(html, chunks.map(function(chunk){
+        $line = $('<div class="openwebrx-panel-line openwebrx-panel-flex-line"></div>');
+        $line.append.apply($line, chunk);
+        return $line
+    }));
+
+    html.push($(
+        '<div class="openwebrx-panel-line openwebrx-panel-flex-line">' +
+            '<div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-dig" onclick="demodulator_digital_replace_last();">DIG</div>' +
+            '<select class="openwebrx-secondary-demod-listbox">' +
+                '<option value="none"></option>' +
+                digiModes.map(function(m){
+                    return '<option value="' + m.modulation + '">' + m.name + '</option>';
+                }).join('') +
+            '</select>' +
+        '</div>'
+    ));
+
+    this.el.find(".openwebrx-modes").html(html);
+};
+
+DemodulatorPanel.prototype.setMode = function(mode) {
+    var offset_frequency = 0;
+    if (this.demodulator) {
+        if (this.demodulator.get_modulation() === mode) {
+            return;
+        }
+        offset_frequency = this.demodulator.get_offset_frequency();
+        this.demodulator.stop();
+    }
+    this.demodulator = new Demodulator(offset_frequency, mode);
+    var self = this;
+    this.demodulator.on("frequencychange", function(freq) {
+        self.tuneableFrequencyDisplay.setFrequency(center_freq + freq);
+    });
+    this.demodulator.start();
+    this.updateButtons();
+};
+
+DemodulatorPanel.prototype.setDigiMode = function(modulation) {
+    var mode = Modes.findByModulation(modulation);
+    if (!mode) {
+        return;
+    }
+    if (!mode.isAvailable()) {
+        divlog('Digital mode "' + mode.name + '" not supported. Please check requirements', true);
+        return;
+    }
+    this.setMode(mode.underlying[0]);
+    this.getDemodulator().set_secondary_demod(modulation);
+    if (mode.bandpass) {
+        this.getDemodulator().setBandpass(mode.bandpass);
+    }
+    $('#openwebrx-panel-digimodes').attr('data-mode', modulation);
+    toggle_panel("openwebrx-panel-digimodes", true);
+    toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4'].indexOf(modulation) >= 0);
+    toggle_panel("openwebrx-panel-js8-message", modulation == "js8");
+    toggle_panel("openwebrx-panel-packet-message", modulation === "packet");
+    toggle_panel("openwebrx-panel-pocsag-message", modulation === "pocsag");
+    updateHash();
+};
+
+DemodulatorPanel.prototype.getDemodulator = function() {
+    return this.demodulator;
+};
+
+DemodulatorPanel.prototype.startDemodulator = function() {
+    var params = $.extend(this.initialParams || {}, validateHash());
+    this._apply(params);
+};
+
+DemodulatorPanel.prototype._apply = function(params) {
+    this.setMode(params.mod);
+    this.getDemodulator().set_offset_frequency(params.offset_frequency);
+    this.updateButtons();
+};
+
+DemodulatorPanel.prototype.setInitialParams = function(params) {
+    this.initialParams = params;
+};
+
+DemodulatorPanel.prototype.setHashParams = function(params) {
+    this._apply(params);
+};
+
+DemodulatorPanel.prototype.updateButtons = function() {
+    var $buttons = this.el.find(".openwebrx-demodulator-button");
+    $buttons.removeClass("highlighted").removeClass('disabled');
+    var demod = this.getDemodulator()
+    if (!demod) return;
+    var mod = demod.get_modulation();
+    this.el.find('[data-modulation=' + mod + ']').addClass("highlighted");
+    var secondary_demod = this.getDemodulator().get_secondary_demod()
+    if (secondary_demod) {
+        this.el.find("#openwebrx-button-dig").addClass("highlighted");
+        this.el.find('#openwebrx-secondary-demod-listbox').val(secondary_demod);
+        var mode = Modes.findByModulation(secondary_demod);
+        if (mode) {
+            var active = mode.underlying.map(function(u){ return 'openwebrx-button-' + u; });
+            $buttons.filter(function(){
+                return this.id !== "openwebrx-button-dig" && active.indexOf(this.id) < 0;
+            }).addClass('disabled');
+        }
+    }
+}
+
+$.fn.demodulatorPanel = function(){
+    if (!this.data('panel')) {
+        this.data('panel', new DemodulatorPanel(this));
+    };
+    return this.data('panel');
+};
\ No newline at end of file
diff --git a/htdocs/lib/FrequencyDisplay.js b/htdocs/lib/FrequencyDisplay.js
index 5aab3ee..8210592 100644
--- a/htdocs/lib/FrequencyDisplay.js
+++ b/htdocs/lib/FrequencyDisplay.js
@@ -50,7 +50,6 @@ TuneableFrequencyDisplay.prototype.setupElements = function() {
 
 TuneableFrequencyDisplay.prototype.setupEvents = function() {
     var me = this;
-    me.listeners = [];
 
     me.element.on('wheel', function(e){
         e.preventDefault();
@@ -63,17 +62,13 @@ TuneableFrequencyDisplay.prototype.setupEvents = function() {
         if (e.originalEvent.deltaY > 0) delta *= -1;
         var newFrequency = me.frequency + delta;
 
-        me.listeners.forEach(function(l) {
-            l(newFrequency);
-        });
+        me.element.trigger('frequencychange', newFrequency);
     });
 
     var submit = function(){
         var freq = parseInt(me.input.val());
         if (!isNaN(freq)) {
-            me.listeners.forEach(function(l) {
-                l(freq);
-            });
+            me.element.trigger('frequencychange', freq);
         }
         me.input.hide();
         me.displayContainer.show();
@@ -96,6 +91,16 @@ TuneableFrequencyDisplay.prototype.setupEvents = function() {
     });
 };
 
-TuneableFrequencyDisplay.prototype.onFrequencyChange = function(listener){
-    this.listeners.push(listener);
-};
+$.fn.frequencyDisplay = function() {
+    if (!this.data('frequencyDisplay')) {
+        this.data('frequencyDisplay', new FrequencyDisplay(this));
+    }
+    return this.data('frequencyDisplay');
+}
+
+$.fn.tuneableFrequencyDisplay = function() {
+    if (!this.data('frequencyDisplay')) {
+        this.data('frequencyDisplay', new TuneableFrequencyDisplay(this));
+    }
+    return this.data('frequencyDisplay');
+}
diff --git a/htdocs/lib/Modes.js b/htdocs/lib/Modes.js
index bf258d1..6e7f928 100644
--- a/htdocs/lib/Modes.js
+++ b/htdocs/lib/Modes.js
@@ -1,61 +1,33 @@
 var Modes = {
     modes: [],
     features: {},
+    panels: [],
     setModes:function(json){
         this.modes = json.map(function(m){ return new Mode(m); });
-        this.updateModePanel();
+        this.updatePanels();
+    },
+    getModes:function(){
+        return this.modes;
     },
     setFeatures:function(features){
         this.features = features;
-        this.updateModePanel();
+        this.updatePanels();
     },
     findByModulation:function(modulation){
         matches = this.modes.filter(function(m) { return m.modulation === modulation; });
         if (matches.length) return matches[0]
     },
-    updateModePanel:function() {
-        var available = this.modes.filter(function(m){ return m.isAvailable(); });
-        var normalModes = available.filter(function(m){ return m.type === 'analog'; });
-        var digiModes = available.filter(function(m){ return m.type === 'digimode'; });
-
-        var html = []
-
-        var buttons = normalModes.map(function(m){
-            return $(
-                '<div class="openwebrx-button openwebrx-demodulator-button"' +
-                'id="openwebrx-button-' + m.modulation + '"' +
-                'onclick="demodulator_analog_replace(\'' + m.modulation + '\');">' +
-                m.name + '</div>'
-            );
+    registerModePanel: function(el) {
+        this.panels.push(el);
+    },
+    updatePanels: function() {
+        var init_complete = this.modes && this.features;
+        this.panels.forEach(function(p) {
+            p.render();
+            if (init_complete) {
+                p.startDemodulator();
+            }
         });
-
-        var index = 0;
-        var arrayLength = buttons.length;
-        var chunks = [];
-
-        for (index = 0; index < arrayLength; index += 5) {
-            chunks.push(buttons.slice(index, index + 5));
-        }
-
-        html.push.apply(html, chunks.map(function(chunk){
-            $line = $('<div class="openwebrx-panel-line openwebrx-panel-flex-line"></div>');
-            $line.append.apply($line, chunk);
-            return $line
-        }));
-
-        html.push($(
-            '<div class="openwebrx-panel-line openwebrx-panel-flex-line">' +
-                '<div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-dig" onclick="demodulator_digital_replace_last();">DIG</div>' +
-                '<select id="openwebrx-secondary-demod-listbox" onchange="secondary_demod_listbox_changed();">' +
-                    '<option value="none"></option>' +
-                    digiModes.map(function(m){
-                        return '<option value="' + m.modulation + '">' + m.name + '</option>';
-                    }).join('') +
-                '</select>' +
-            '</div>'
-        ));
-
-        $("#openwebrx-panel-receiver").find(".openwebrx-modes").html(html);
     }
 };
 
@@ -78,4 +50,4 @@ Mode.prototype.isAvailable = function(){
     }).reduce(function(a, b){
         return a && b;
     }, true);
-}
\ No newline at end of file
+};
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 0f7537f..543e78a 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -142,7 +142,8 @@ function setSquelchToAuto() {
 
 function updateSquelch() {
     var sliderValue = parseInt($("#openwebrx-panel-squelch").val());
-    if (demodulators[0]) demodulators[0].setSquelch(sliderValue);
+    var demod = $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator();
+    if (demod) demod.setSquelch(sliderValue);
 }
 
 var waterfall_min_level;
@@ -236,11 +237,17 @@ function typeInAnimation(element, timeout, what, onFinish) {
 // ================  DEMODULATOR ROUTINES  ================
 // ========================================================
 
-demodulators = [];
-
+function getDemodulators() {
+    return [
+        $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator()
+    ].filter(function(d) {
+        return !!d;
+    });
+};
 
 function mkenvelopes(visible_range) //called from mkscale
 {
+    var demodulators = getDemodulators();
     scale_ctx.clearRect(0, 0, scale_ctx.canvas.width, 22); //clear the upper part of the canvas (where filter envelopes reside)
     for (var i = 0; i < demodulators.length; i++) {
         demodulators[i].envelope.draw(visible_range);
@@ -251,40 +258,6 @@ function mkenvelopes(visible_range) //called from mkscale
     }
 }
 
-function demodulator_remove(which) {
-    demodulators[which].stop();
-    demodulators.splice(which, 1);
-}
-
-function demodulator_add(what) {
-    demodulators.push(what);
-    mkenvelopes(get_visible_freq_range());
-}
-
-var last_analog_demodulator_subtype = 'nfm';
-var last_digital_demodulator_subtype = 'bpsk31';
-
-function demodulator_analog_replace(subtype, for_digital) { //this function should only exist until the multi-demodulator capability is added
-    if (!(typeof for_digital !== "undefined" && for_digital && secondary_demod)) {
-        secondary_demod_close_window();
-        secondary_demod_listbox_update();
-    }
-    if (!demodulators || !demodulators[0] || demodulators[0].get_modulation() !== subtype) {
-        last_analog_demodulator_subtype = subtype;
-        var temp_offset = 0;
-        if (demodulators.length) {
-            temp_offset = demodulators[0].get_offset_frequency();
-            demodulator_remove(0);
-        }
-        var demod = new Demodulator(temp_offset, subtype);
-        demod.start();
-        demodulator_add(demod);
-    }
-    demodulator_buttons_update();
-    update_digitalvoice_panels("openwebrx-panel-metadata-" + subtype);
-    updateHash();
-}
-
 function waterfallWidth() {
     return $('body').width();
 }
@@ -296,11 +269,8 @@ function waterfallWidth() {
 
 var scale_ctx;
 var scale_canvas;
-var tunedFrequencyDisplay;
-var mouseFrequencyDisplay;
 
 function scale_setup() {
-    tunedFrequencyDisplay.setFrequency(canvas_get_frequency(window.innerWidth / 2));
     scale_canvas = e("openwebrx-scale-canvas");
     scale_ctx = scale_canvas.getContext("2d");
     scale_canvas.addEventListener("mousedown", scale_canvas_mousedown, false);
@@ -336,6 +306,7 @@ function scale_offset_freq_from_px(x, visible_range) {
 function scale_canvas_mousemove(evt) {
     var event_handled = false;
     var i;
+    var demodulators = getDemodulators();
     if (scale_canvas_drag_params.mouse_down && !scale_canvas_drag_params.drag && Math.abs(evt.pageX - scale_canvas_drag_params.start_x) > canvas_drag_min_delta)
     //we can use the main drag_min_delta thing of the main canvas
     {
@@ -354,7 +325,7 @@ function scale_canvas_mousemove(evt) {
 
 function frequency_container_mousemove(evt) {
     var frequency = center_freq + scale_offset_freq_from_px(evt.pageX);
-    mouseFrequencyDisplay.setFrequency(frequency);
+    $('.webrx-mouse-freq').frequencyDisplay().setFrequency(frequency);
 }
 
 function scale_canvas_end_drag(x) {
@@ -362,6 +333,7 @@ function scale_canvas_end_drag(x) {
     scale_canvas_drag_params.drag = false;
     scale_canvas_drag_params.mouse_down = false;
     var event_handled = false;
+    var demodulators = getDemodulators();
     for (var i = 0; i < demodulators.length; i++) event_handled |= demodulators[i].envelope.drag_end();
     if (!event_handled) demodulators[0].set_offset_frequency(scale_offset_freq_from_px(x));
 }
@@ -631,7 +603,7 @@ function canvas_mousemove(evt) {
             bookmarks.position();
         }
     } else {
-        mouseFrequencyDisplay.setFrequency(canvas_get_frequency(relativeX));
+        $('.webrx-mouse-freq').frequencyDisplay().setFrequency(canvas_get_frequency(relativeX));
     }
 }
 
@@ -644,7 +616,7 @@ function canvas_mouseup(evt) {
     var relativeX = get_relative_x(evt);
 
     if (!canvas_drag) {
-        demodulators[0].set_offset_frequency(canvas_get_freq_offset(relativeX));
+        $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator().set_offset_frequency(canvas_get_freq_offset(relativeX));
     }
     else {
         canvas_end_drag();
@@ -727,7 +699,7 @@ function zoom_set(level) {
     level = parseInt(level);
     zoom_level = level;
     //zoom_center_rel=canvas_get_freq_offset(-canvases[0].offsetLeft+waterfallWidth()/2); //zoom to screen center instead of demod envelope
-    zoom_center_rel = demodulators[0].get_offset_frequency();
+    zoom_center_rel = $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator().get_offset_frequency();
     zoom_center_where = 0.5 + (zoom_center_rel / bandwidth); //this is a kind of hack
     resize_canvases(true);
     mkscale();
@@ -787,7 +759,7 @@ function on_ws_recv(evt) {
                         updateSquelch();
 
                         waterfall_init();
-                        synchronize_demodulator_init({initialParams: initial_demodulator_params});
+                        $('#openwebrx-panel-receiver').demodulatorPanel().setInitialParams(initial_demodulator_params);
                         bookmarks.loadLocalBookmarks();
 
                         waterfall_clear();
@@ -832,7 +804,6 @@ function on_ws_recv(evt) {
                         break;
                     case "features":
                         Modes.setFeatures(json['value']);
-                        synchronize_demodulator_init({features: true});
                         break;
                     case "metadata":
                         update_metadata(json['value']);
@@ -884,8 +855,6 @@ function on_ws_recv(evt) {
                         break;
                     case 'modes':
                         Modes.setModes(json['value']);
-                        synchronize_demodulator_init({modes: true});
-                        demodulator_buttons_update();
                         break;
                     default:
                         console.warn('received message of unknown type: ' + json['type']);
@@ -1241,12 +1210,12 @@ function validateHash() {
 }
 
 function updateHash() {
-    var demod = demodulators[0];
+    var demod = $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator();
     if (!demod) return;
     window.location.hash = $.map({
         freq: demod.get_offset_frequency() + center_freq,
         mod: demod.get_modulation(),
-        secondary_mod: secondary_demod
+        secondary_mod: demod.get_secondary_demod()
     }, function(value, key){
         if (!value) return undefined;
         return key + '=' + value;
@@ -1259,7 +1228,7 @@ function onAudioStart(success, apiType){
     divlog('Web Audio API succesfully initialized, using ' + apiType  + ' API, sample rate: ' + audioEngine.getSampleRate() + " Hz");
 
     // canvas_container is set after waterfall_init() has been called. we cannot initialize before.
-    if (canvas_container) synchronize_demodulator_init();
+    //if (canvas_container) synchronize_demodulator_init();
 
     //hide log panel in a second (if user has not hidden it yet)
     window.setTimeout(function () {
@@ -1270,30 +1239,6 @@ function onAudioStart(success, apiType){
     updateVolume();
 }
 
-var sync_params = {}
-
-function synchronize_demodulator_init(params) {
-    sync_params = $.extend(sync_params, params || {});
-    if (sync_params.initialParams && sync_params.modes && sync_params.features) {
-        initialize_demodulator(sync_params.initialParams);
-        delete sync_params.initialParams;
-    }
-}
-
-function initialize_demodulator(initialParams) {
-    mkscale();
-    var params = $.extend(initialParams || {}, validateHash());
-    if (params.secondary_mod) {
-        demodulator_digital_replace(params.secondary_mod);
-    } else if (params.mod) {
-        demodulator_analog_replace(params.mod);
-    }
-    if (params.offset_frequency) {
-        demodulators[0].set_offset_frequency(params.offset_frequency);
-    }
-    demodulators[0].start()
-}
-
 var reconnect_timeout = false;
 
 function on_ws_closed() {
@@ -1525,17 +1470,13 @@ function openwebrx_init() {
     secondary_demod_init();
     digimodes_init();
     initPanels();
-    tunedFrequencyDisplay = new TuneableFrequencyDisplay($('#webrx-actual-freq'));
-    tunedFrequencyDisplay.onFrequencyChange(function(f) {
-        demodulators[0].set_offset_frequency(f - center_freq);
-    });
-    mouseFrequencyDisplay = new FrequencyDisplay($('#webrx-mouse-freq'));
+    $('#openwebrx-panel-receiver').demodulatorPanel();
     window.addEventListener("resize", openwebrx_resize);
     init_header();
     bookmarks = new BookmarkBar();
     initSliders();
     window.addEventListener('hashchange', function() {
-        synchronize_demodulator_init();
+        $('#openwebrx-panel-receiver').demodulatorPanel().setHashParams(validateHash());
     });
 }
 
@@ -1567,7 +1508,7 @@ function update_dmr_timeslot_filtering() {
     }).toArray().reduce(function (acc, v) {
         return acc | v;
     }, 0);
-    demodulators[0].setDmrFilter(filter);
+    $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator().setDmrFilter(filter);
 }
 
 function playButtonClick() {
@@ -1659,29 +1600,6 @@ function initPanels() {
     });
 }
 
-function demodulator_buttons_update() {
-    var $buttons = $(".openwebrx-demodulator-button");
-    $buttons.removeClass("highlighted").removeClass('disabled');
-    if (!demodulators.length) return;
-    var mod = demodulators[0].get_modulation();
-    $("#openwebrx-button-" + mod).addClass("highlighted");
-    if (secondary_demod) {
-        $("#openwebrx-button-dig").addClass("highlighted");
-        $('#openwebrx-secondary-demod-listbox').val(secondary_demod);
-        var mode = Modes.findByModulation(secondary_demod);
-        if (mode) {
-            var active = mode.underlying.map(function(u){ return 'openwebrx-button-' + u; });
-            $buttons.filter(function(){
-                return this.id !== "openwebrx-button-dig" && active.indexOf(this.id) < 0;
-            }).addClass('disabled');
-        }
-    }
-}
-
-function demodulator_analog_replace_last() {
-    demodulator_analog_replace(last_analog_demodulator_subtype);
-}
-
 /*
   _____  _       _                     _
  |  __ \(_)     (_)                   | |
@@ -1693,7 +1611,6 @@ function demodulator_analog_replace_last() {
            |___/
 */
 
-var secondary_demod = false;
 var secondary_demod_fft_offset_db = 30; //need to calculate that later
 var secondary_demod_canvases_initialized = false;
 var secondary_demod_listbox_updating = false;
@@ -1710,36 +1627,6 @@ var secondary_demod_current_canvas_context;
 var secondary_demod_current_canvas_index;
 var secondary_demod_canvases;
 
-function demodulator_digital_replace_last() {
-    demodulator_digital_replace(last_digital_demodulator_subtype);
-    secondary_demod_listbox_update();
-}
-
-function demodulator_digital_replace(subtype) {
-    if (secondary_demod === subtype) return;
-    var mode = Modes.findByModulation(subtype);
-    if (!mode) {
-        return;
-    }
-    if (!mode.isAvailable()) {
-        divlog('Digital mode "' + mode.name + '" not supported. Please check requirements', true);
-        return;
-    }
-    demodulator_analog_replace(mode.underlying[0], true);
-    secondary_demod_start(subtype);
-    if (mode.bandpass) {
-        demodulators[0].setBandpass(mode.bandpass);
-    }
-    demodulator_buttons_update();
-    $('#openwebrx-panel-digimodes').attr('data-mode', subtype);
-    toggle_panel("openwebrx-panel-digimodes", true);
-    toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4'].indexOf(subtype) >= 0);
-    toggle_panel("openwebrx-panel-js8-message", subtype == "js8");
-    toggle_panel("openwebrx-panel-packet-message", subtype === "packet");
-    toggle_panel("openwebrx-panel-pocsag-message", subtype === "pocsag");
-    updateHash();
-}
-
 function secondary_demod_create_canvas() {
     var new_canvas = document.createElement("canvas");
     new_canvas.width = secondary_fft_size;
@@ -1792,12 +1679,12 @@ function secondary_demod_init() {
     init_digital_removal_timer();
 }
 
+// TODO
 function secondary_demod_start(subtype) {
     secondary_demod_canvases_initialized = false;
-    demodulators[0].set_secondary_demod(subtype);
-    secondary_demod = subtype;
 }
 
+// TODO
 function secondary_demod_stop() {
     if (demodulators[0]) {
         demodulators[0].set_secondary_demod(false);
@@ -1834,7 +1721,6 @@ function secondary_demod_close_window() {
 }
 
 function secondary_demod_waterfall_add(data) {
-    if (!secondary_demod) return;
     var w = secondary_fft_size;
 
     //Add line to waterfall image
@@ -1854,22 +1740,6 @@ function secondary_demod_waterfall_add(data) {
     if (secondary_demod_current_canvas_actual_line < 0) secondary_demod_swap_canvases();
 }
 
-function secondary_demod_listbox_changed() {
-    if (secondary_demod_listbox_updating) return;
-    var sdm = $("#openwebrx-secondary-demod-listbox")[0].value;
-    if (sdm === "none") {
-        demodulator_analog_replace_last();
-    } else {
-        demodulator_digital_replace(sdm);
-    }
-}
-
-function secondary_demod_listbox_update() {
-    secondary_demod_listbox_updating = true;
-    $("#openwebrx-secondary-demod-listbox").val((secondary_demod) ? secondary_demod : "none");
-    secondary_demod_listbox_updating = false;
-}
-
 function secondary_demod_update_marker() {
     var width = Math.max((secondary_bw / (if_samp_rate / 2)) * secondary_demod_canvas_width, 5);
     var center_at = (secondary_demod_channel_freq / (if_samp_rate / 2)) * secondary_demod_canvas_width + secondary_demod_canvas_left;
@@ -1877,6 +1747,7 @@ function secondary_demod_update_marker() {
     $("#openwebrx-digimode-select-channel").width(width).css("left", left + "px")
 }
 
+// TODO
 function secondary_demod_update_channel_freq_from_event(evt) {
     if (typeof evt !== "undefined") {
         var relativeX = (evt.offsetX) ? evt.offsetX : evt.layerX;
@@ -1886,7 +1757,7 @@ function secondary_demod_update_channel_freq_from_event(evt) {
     if (!secondary_demod_waiting_for_set) {
         secondary_demod_waiting_for_set = true;
         window.setTimeout(function () {
-                demodulators[0].set_secondary_offset_freq(Math.floor(secondary_demod_channel_freq));
+                $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator().set_secondary_offset_freq(Math.floor(secondary_demod_channel_freq));
                 secondary_demod_waiting_for_set = false;
             },
             50
@@ -1919,7 +1790,7 @@ function secondary_demod_canvas_container_mouseup(evt) {
 
 
 function secondary_demod_waterfall_set_zoom(low_cut, high_cut) {
-    if (!secondary_demod || !secondary_demod_canvases_initialized) return;
+    if (!secondary_demod_canvases_initialized) return;
     if (low_cut < 0 && high_cut < 0) {
         var hctmp = high_cut;
         var lctmp = low_cut;

From d9a818525d4f0b04447dfa13e741b107e341347e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 01:07:44 +0200
Subject: [PATCH 264/475] refactor demodulator classes, part 2

---
 htdocs/lib/BookmarkBar.js      |   3 +-
 htdocs/lib/DemodulatorPanel.js | 106 +++++++++++++++++++++------------
 htdocs/lib/Modes.js            |   2 +-
 3 files changed, 70 insertions(+), 41 deletions(-)

diff --git a/htdocs/lib/BookmarkBar.js b/htdocs/lib/BookmarkBar.js
index 402e3d4..fadf00a 100644
--- a/htdocs/lib/BookmarkBar.js
+++ b/htdocs/lib/BookmarkBar.js
@@ -13,7 +13,8 @@ function BookmarkBar() {
         if (b.modulation) {
             me.getDemodulatorPanel().setMode(b.modulation);
         } else if (b.digital_modulation) {
-            me.getDemodulatorPanel().setDigiMode(b.digital_modulation);
+            // TODO: update bookmarks so they don't contain digital_modulation
+            me.getDemodulatorPanel().setMode(b.digital_modulation);
         }
         $bookmark.addClass('selected');
     });
diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index 09c2cfd..8d37085 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -10,13 +10,22 @@ function DemodulatorPanel(el) {
     });
 
     Modes.registerModePanel(this);
-    el.on('click', '.openwebrx-demodulator-button[data-modulation]', function() {
-        self.setMode($(this).data('modulation'));
+    el.on('click', '.openwebrx-demodulator-button', function() {
+        var modulation = $(this).data('modulation');
+        if (modulation) {
+            self.setMode(modulation);
+        } else {
+            self.disableDigiMode();
+        }
     });
     el.on('change', '.openwebrx-secondary-demod-listbox', function() {
-        self.setDigiMode($(this).val());
+        var value = $(this).val();
+        if (value === 'none') {
+            self.disableDigiMode();
+        } else {
+            self.setMode(value);
+        }
     });
-    // TODO: disable digimodes
 };
 
 DemodulatorPanel.prototype.render = function() {
@@ -52,7 +61,7 @@ DemodulatorPanel.prototype.render = function() {
 
     html.push($(
         '<div class="openwebrx-panel-line openwebrx-panel-flex-line">' +
-            '<div class="openwebrx-button openwebrx-demodulator-button" id="openwebrx-button-dig" onclick="demodulator_digital_replace_last();">DIG</div>' +
+            '<div class="openwebrx-button openwebrx-demodulator-button openwebrx-button-dig">DIG</div>' +
             '<select class="openwebrx-secondary-demod-listbox">' +
                 '<option value="none"></option>' +
                 digiModes.map(function(m){
@@ -65,45 +74,60 @@ DemodulatorPanel.prototype.render = function() {
     this.el.find(".openwebrx-modes").html(html);
 };
 
-DemodulatorPanel.prototype.setMode = function(mode) {
-    var offset_frequency = 0;
-    if (this.demodulator) {
-        if (this.demodulator.get_modulation() === mode) {
-            return;
-        }
-        offset_frequency = this.demodulator.get_offset_frequency();
-        this.demodulator.stop();
-    }
-    this.demodulator = new Demodulator(offset_frequency, mode);
-    var self = this;
-    this.demodulator.on("frequencychange", function(freq) {
-        self.tuneableFrequencyDisplay.setFrequency(center_freq + freq);
-    });
-    this.demodulator.start();
-    this.updateButtons();
-};
-
-DemodulatorPanel.prototype.setDigiMode = function(modulation) {
+DemodulatorPanel.prototype.setMode = function(modulation) {
     var mode = Modes.findByModulation(modulation);
     if (!mode) {
         return;
     }
     if (!mode.isAvailable()) {
-        divlog('Digital mode "' + mode.name + '" not supported. Please check requirements', true);
+        divlog('Modulation "' + mode.name + '" not supported. Please check requirements', true);
         return;
     }
-    this.setMode(mode.underlying[0]);
-    this.getDemodulator().set_secondary_demod(modulation);
-    if (mode.bandpass) {
-        this.getDemodulator().setBandpass(mode.bandpass);
+
+    if (mode.type === 'digimode') {
+        modulation = mode.underlying[0];
     }
+
+    var current_offset_frequency = 0;
+    var current_modulation = false;
+    if (this.demodulator) {
+        current_modulation = this.demodulator.get_modulation();
+        current_offset_frequency = this.demodulator.get_offset_frequency();
+    }
+
+    if (current_modulation !== modulation) {
+        if (this.demodulator) this.demodulator.stop();
+        this.demodulator = new Demodulator(current_offset_frequency, modulation);
+        var self = this;
+        this.demodulator.on("frequencychange", function(freq) {
+            self.tuneableFrequencyDisplay.setFrequency(center_freq + freq);
+        });
+    }
+    if (mode.type === 'digimode') {
+        this.demodulator.set_secondary_demod(mode.modulation);
+    } else {
+        this.demodulator.set_secondary_demod(false);
+    }
+    this.demodulator.start();
+
+    this.updateButtons();
+    this.updatePanels();
+    updateHash();
+};
+
+DemodulatorPanel.prototype.disableDigiMode = function() {
+    var modulation = this.el.find('.openwebrx-button.highlighted[data-modulation]').data('modulation');
+    this.setMode(modulation);
+};
+
+DemodulatorPanel.prototype.updatePanels = function() {
+    var modulation = this.getDemodulator().get_secondary_demod();
     $('#openwebrx-panel-digimodes').attr('data-mode', modulation);
-    toggle_panel("openwebrx-panel-digimodes", true);
+    toggle_panel("openwebrx-panel-digimodes", !!modulation);
     toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4'].indexOf(modulation) >= 0);
     toggle_panel("openwebrx-panel-js8-message", modulation == "js8");
     toggle_panel("openwebrx-panel-packet-message", modulation === "packet");
     toggle_panel("openwebrx-panel-pocsag-message", modulation === "pocsag");
-    updateHash();
 };
 
 DemodulatorPanel.prototype.getDemodulator = function() {
@@ -126,7 +150,10 @@ DemodulatorPanel.prototype.setInitialParams = function(params) {
 };
 
 DemodulatorPanel.prototype.setHashParams = function(params) {
-    this._apply(params);
+    this._apply({
+        mod: params.secondary_mod || params.mod,
+        offset_frequency: params.offset_frequency
+    });
 };
 
 DemodulatorPanel.prototype.updateButtons = function() {
@@ -134,19 +161,20 @@ DemodulatorPanel.prototype.updateButtons = function() {
     $buttons.removeClass("highlighted").removeClass('disabled');
     var demod = this.getDemodulator()
     if (!demod) return;
-    var mod = demod.get_modulation();
-    this.el.find('[data-modulation=' + mod + ']').addClass("highlighted");
-    var secondary_demod = this.getDemodulator().get_secondary_demod()
+    this.el.find('[data-modulation=' + demod.get_modulation() + ']').addClass("highlighted");
+    var secondary_demod = demod.get_secondary_demod()
     if (secondary_demod) {
-        this.el.find("#openwebrx-button-dig").addClass("highlighted");
-        this.el.find('#openwebrx-secondary-demod-listbox').val(secondary_demod);
+        this.el.find(".openwebrx-button-dig").addClass("highlighted");
+        this.el.find('.openwebrx-secondary-demod-listbox').val(secondary_demod);
         var mode = Modes.findByModulation(secondary_demod);
         if (mode) {
-            var active = mode.underlying.map(function(u){ return 'openwebrx-button-' + u; });
             $buttons.filter(function(){
-                return this.id !== "openwebrx-button-dig" && active.indexOf(this.id) < 0;
+                var mod = $(this).data('modulation');
+                return mod && mode.underlying.indexOf(mod) < 0;
             }).addClass('disabled');
         }
+    } else {
+        this.el.find('.openwebrx-secondary-demod-listbox').val('none');
     }
 }
 
diff --git a/htdocs/lib/Modes.js b/htdocs/lib/Modes.js
index 6e7f928..6c6fa80 100644
--- a/htdocs/lib/Modes.js
+++ b/htdocs/lib/Modes.js
@@ -21,7 +21,7 @@ var Modes = {
         this.panels.push(el);
     },
     updatePanels: function() {
-        var init_complete = this.modes && this.features;
+        var init_complete = this.modes.length && Object.keys(this.features).length;
         this.panels.forEach(function(p) {
             p.render();
             if (init_complete) {

From 20023e3989ccfc4b0cf484a87f9774014e4ae9fd Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 01:10:41 +0200
Subject: [PATCH 265/475] update bookmarks

---
 htdocs/lib/BookmarkBar.js | 5 +----
 htdocs/openwebrx.js       | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/htdocs/lib/BookmarkBar.js b/htdocs/lib/BookmarkBar.js
index fadf00a..653eb02 100644
--- a/htdocs/lib/BookmarkBar.js
+++ b/htdocs/lib/BookmarkBar.js
@@ -8,13 +8,10 @@ function BookmarkBar() {
         var $bookmark = $(e.target).closest('.bookmark');
         me.$container.find('.bookmark').removeClass('selected');
         var b = $bookmark.data();
-        if (!b || !b.frequency || (!b.modulation && !b.digital_modulation)) return;
+        if (!b || !b.frequency || !b.modulation) return;
         me.getDemodulator().set_offset_frequency(b.frequency - center_freq);
         if (b.modulation) {
             me.getDemodulatorPanel().setMode(b.modulation);
-        } else if (b.digital_modulation) {
-            // TODO: update bookmarks so they don't contain digital_modulation
-            me.getDemodulatorPanel().setMode(b.digital_modulation);
         }
         $bookmark.addClass('selected');
     });
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 543e78a..44302d6 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -818,7 +818,7 @@ function on_ws_recv(evt) {
                         var as_bookmarks = json['value'].map(function (d) {
                             return {
                                 name: d['mode'].toUpperCase(),
-                                digital_modulation: d['mode'],
+                                modulation: d['mode'],
                                 frequency: d['frequency']
                             };
                         });

From b956a0dcd6c8b848099ebd74958942aff2fd5d49 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 01:16:36 +0200
Subject: [PATCH 266/475] resolve todos

---
 htdocs/openwebrx.js | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 44302d6..4bf531d 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1679,19 +1679,6 @@ function secondary_demod_init() {
     init_digital_removal_timer();
 }
 
-// TODO
-function secondary_demod_start(subtype) {
-    secondary_demod_canvases_initialized = false;
-}
-
-// TODO
-function secondary_demod_stop() {
-    if (demodulators[0]) {
-        demodulators[0].set_secondary_demod(false);
-    }
-    secondary_demod = false;
-}
-
 function secondary_demod_push_data(x) {
     x = Array.from(x).filter(function (y) {
         var c = y.charCodeAt(0);
@@ -1711,15 +1698,6 @@ function secondary_demod_push_data(x) {
     $("#openwebrx-cursor-blink").before(x);
 }
 
-function secondary_demod_close_window() {
-    secondary_demod_stop();
-    toggle_panel("openwebrx-panel-digimodes", false);
-    toggle_panel("openwebrx-panel-wsjt-message", false);
-    toggle_panel("openwebrx-panel-packet-message", false);
-    toggle_panel("openwebrx-panel-pocsag-message", false);
-    toggle_panel("openwebrx-panel-js8-message", false);
-}
-
 function secondary_demod_waterfall_add(data) {
     var w = secondary_fft_size;
 
@@ -1747,7 +1725,6 @@ function secondary_demod_update_marker() {
     $("#openwebrx-digimode-select-channel").width(width).css("left", left + "px")
 }
 
-// TODO
 function secondary_demod_update_channel_freq_from_event(evt) {
     if (typeof evt !== "undefined") {
         var relativeX = (evt.offsetX) ? evt.offsetX : evt.layerX;

From 19518da2e2af8ade2f0a3eb4e65fda32a2fc1055 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 01:25:23 +0200
Subject: [PATCH 267/475] fix filter setup

---
 htdocs/lib/Demodulator.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/htdocs/lib/Demodulator.js b/htdocs/lib/Demodulator.js
index 73dbe10..b43dfcb 100644
--- a/htdocs/lib/Demodulator.js
+++ b/htdocs/lib/Demodulator.js
@@ -1,10 +1,11 @@
-function Filter() {
+function Filter(demodulator) {
+    this.demodulator = demodulator;
     this.min_passband = 100;
 }
 
 Filter.prototype.getLimits = function() {
     var max_bw;
-    if (secondary_demod === 'pocsag') {
+    if (this.demodulator.get_secondary_demod() === 'pocsag') {
         max_bw = 12500;
     } else {
         max_bw = (audioEngine.getOutputRate() / 2) - 1;
@@ -142,7 +143,7 @@ Envelope.prototype.drag_move = function(x) {
         if (this.demodulator.high_cut - new_value < this.demodulator.filter.min_passband) return true;
         //sanity check to prevent GNU Radio "firdes check failed: fa <= fb"
         if (new_value >= this.demodulator.high_cut) return true;
-        this.demodulator.low_cut = new_value;
+        this.demodulator.setLowCut(new_value);
     }
     if (this.dragged_range === dr.ending || this.dragged_range === dr.bfo || this.dragged_range === dr.pbs) {
         //we don't let high_cut go beyond its limits
@@ -151,7 +152,7 @@ Envelope.prototype.drag_move = function(x) {
         if (new_value - this.demodulator.low_cut < this.demodulator.filter.min_passband) return true;
         //sanity check to prevent GNU Radio "firdes check failed: fa <= fb"
         if (new_value <= this.demodulator.low_cut) return true;
-        this.demodulator.high_cut = new_value;
+        this.demodulator.setHighCut(new_value);
     }
     if (this.dragged_range === dr.anything_else || this.dragged_range === dr.bfo) {
         //when any other part of the envelope is dragged, the offset frequency is changed (whole passband also moves with it)
@@ -181,7 +182,7 @@ function Demodulator(offset_frequency, modulation) {
     this.envelope = new Envelope(this);
     this.color = Demodulator.get_next_color();
     this.modulation = modulation;
-    this.filter = new Filter();
+    this.filter = new Filter(this);
     this.squelch_level = -150;
     this.dmr_filter = 3;
     this.state = {};
@@ -307,6 +308,16 @@ Demodulator.prototype.setBandpass = function(bandpass) {
     this.set();
 };
 
+Demodulator.prototype.setLowCut = function(low_cut) {
+    this.low_cut = low_cut;
+    this.set();
+};
+
+Demodulator.prototype.setHighCut = function(high_cut) {
+    this.high_cut = high_cut;
+    this.set();
+};
+
 Demodulator.prototype.getBandpass = function() {
     return {
         low_cut: this.low_cut,

From e5196c6af94aca40bab7e6740b4896f67cb026dc Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 01:35:38 +0200
Subject: [PATCH 268/475] prevent starting demodulator if already started

---
 htdocs/lib/DemodulatorPanel.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index 8d37085..c8d9fc4 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -95,7 +95,8 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
         current_offset_frequency = this.demodulator.get_offset_frequency();
     }
 
-    if (current_modulation !== modulation) {
+    var replace_modulator = current_modulation !== modulation;
+    if (replace_modulator) {
         if (this.demodulator) this.demodulator.stop();
         this.demodulator = new Demodulator(current_offset_frequency, modulation);
         var self = this;
@@ -108,7 +109,10 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
     } else {
         this.demodulator.set_secondary_demod(false);
     }
-    this.demodulator.start();
+
+    if (replace_modulator) {
+        this.demodulator.start();
+    }
 
     this.updateButtons();
     this.updatePanels();

From a96690c8bd1d38d58cd7a496b69f40925de4e86f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 01:36:12 +0200
Subject: [PATCH 269/475] fft_fps isn't even used in the frontend

---
 htdocs/openwebrx.js | 2 --
 owrx/connection.py  | 1 -
 2 files changed, 3 deletions(-)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 4bf531d..19d59c8 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -27,7 +27,6 @@ is_firefox = navigator.userAgent.indexOf("Firefox") >= 0;
 var bandwidth;
 var center_freq;
 var fft_size;
-var fft_fps;
 var fft_compression = "none";
 var fft_codec;
 var waterfall_setup_done = 0;
@@ -747,7 +746,6 @@ function on_ws_recv(evt) {
                         bandwidth = config['samp_rate'];
                         center_freq = config['center_freq'];
                         fft_size = config['fft_size'];
-                        fft_fps = config['fft_fps'];
                         var audio_compression = config['audio_compression'];
                         audioEngine.setCompression(audio_compression);
                         divlog("Audio stream is " + ((audio_compression === "adpcm") ? "compressed" : "uncompressed") + ".");
diff --git a/owrx/connection.py b/owrx/connection.py
index bd020ed..e1f7083 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -70,7 +70,6 @@ class OpenWebRxReceiverClient(Client):
         "waterfall_auto_level_margin",
         "samp_rate",
         "fft_size",
-        "fft_fps",
         "audio_compression",
         "fft_compression",
         "max_clients",

From 28c1425a8fce82cccd29b873508532b4f8e637ce Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 02:13:16 +0200
Subject: [PATCH 270/475] fix digimode init from hash

---
 htdocs/lib/Demodulator.js      |  2 --
 htdocs/lib/DemodulatorPanel.js | 11 ++++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/htdocs/lib/Demodulator.js b/htdocs/lib/Demodulator.js
index b43dfcb..c268c48 100644
--- a/htdocs/lib/Demodulator.js
+++ b/htdocs/lib/Demodulator.js
@@ -237,8 +237,6 @@ Demodulator.prototype.set_offset_frequency = function(to_what) {
     this.set();
     this.emit("frequencychange", to_what);
     mkenvelopes(get_visible_freq_range());
-    //tunedFrequencyDisplay.setFrequency(center_freq + to_what);
-    updateHash();
 };
 
 Demodulator.prototype.get_offset_frequency = function() {
diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index c8d9fc4..a3a6ca8 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -102,6 +102,7 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
         var self = this;
         this.demodulator.on("frequencychange", function(freq) {
             self.tuneableFrequencyDisplay.setFrequency(center_freq + freq);
+            updateHash();
         });
     }
     if (mode.type === 'digimode') {
@@ -139,7 +140,7 @@ DemodulatorPanel.prototype.getDemodulator = function() {
 };
 
 DemodulatorPanel.prototype.startDemodulator = function() {
-    var params = $.extend(this.initialParams || {}, validateHash());
+    var params = $.extend(this.initialParams || {}, this.transformHashParams(validateHash()));
     this._apply(params);
 };
 
@@ -154,10 +155,14 @@ DemodulatorPanel.prototype.setInitialParams = function(params) {
 };
 
 DemodulatorPanel.prototype.setHashParams = function(params) {
-    this._apply({
+    this._apply(this.transformHashParams(params));
+};
+
+DemodulatorPanel.prototype.transformHashParams = function(params) {
+    return {
         mod: params.secondary_mod || params.mod,
         offset_frequency: params.offset_frequency
-    });
+    };
 };
 
 DemodulatorPanel.prototype.updateButtons = function() {

From 54812f0de156d05a911b2a9c1d4c482d64d2ec1f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 02:32:49 +0200
Subject: [PATCH 271/475] fix band changes

---
 htdocs/lib/DemodulatorPanel.js | 16 ++++++++++++++--
 htdocs/openwebrx.js            |  1 +
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index a3a6ca8..aa8de15 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -6,7 +6,7 @@ function DemodulatorPanel(el) {
     var displayEl = el.find('.webrx-actual-freq')
     this.tuneableFrequencyDisplay = displayEl.tuneableFrequencyDisplay();
     displayEl.on('frequencychange', function(event, freq) {
-        self.getDemodulator().set_offset_frequency(freq - center_freq);
+        self.getDemodulator().set_offset_frequency(freq - self.center_freq);
     });
 
     Modes.registerModePanel(this);
@@ -101,7 +101,7 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
         this.demodulator = new Demodulator(current_offset_frequency, modulation);
         var self = this;
         this.demodulator.on("frequencychange", function(freq) {
-            self.tuneableFrequencyDisplay.setFrequency(center_freq + freq);
+            self.tuneableFrequencyDisplay.setFrequency(self.center_freq + freq);
             updateHash();
         });
     }
@@ -187,6 +187,18 @@ DemodulatorPanel.prototype.updateButtons = function() {
     }
 }
 
+DemodulatorPanel.prototype.setCenterFrequency = function(center_freq) {
+    if (this.center_freq === center_freq) {
+        return ;
+    }
+    this.center_freq = center_freq;
+    var demod = this.getDemodulator();
+    if (demod) {
+        this.tuneableFrequencyDisplay.setFrequency(center_freq + demod.get_offset_frequency());
+    }
+    updateHash();
+};
+
 $.fn.demodulatorPanel = function(){
     if (!this.data('panel')) {
         this.data('panel', new DemodulatorPanel(this));
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 19d59c8..971cf65 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -745,6 +745,7 @@ function on_ws_recv(evt) {
 
                         bandwidth = config['samp_rate'];
                         center_freq = config['center_freq'];
+                        $('#openwebrx-panel-receiver').demodulatorPanel().setCenterFrequency(center_freq);
                         fft_size = config['fft_size'];
                         var audio_compression = config['audio_compression'];
                         audioEngine.setCompression(audio_compression);

From 7a3043559fc332d5816b6ff87a9921339207e777 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 02:35:55 +0200
Subject: [PATCH 272/475] initialize mouseover display

---
 htdocs/openwebrx.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 971cf65..65f3ab4 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1469,6 +1469,7 @@ function openwebrx_init() {
     secondary_demod_init();
     digimodes_init();
     initPanels();
+    $('.webrx-mouse-freq').frequencyDisplay();
     $('#openwebrx-panel-receiver').demodulatorPanel();
     window.addEventListener("resize", openwebrx_resize);
     init_header();

From 8c8445eb3bc6bc05343f9a9f6c40309fc0573585 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 13:35:42 +0200
Subject: [PATCH 273/475] improve receiver load times by concating javascript

---
 htdocs/index.html          | 13 +------
 owrx/controllers/assets.py | 71 +++++++++++++++++++++++++++++++++-----
 owrx/http.py               |  4 ++-
 3 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 3c706f3..07b9fcc 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -24,18 +24,7 @@
     <head>
         <title>OpenWebRX | Open Source SDR Web App for Everyone!</title>
         <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
-        <script src="static/openwebrx.js"></script>
-        <script src="static/lib/jquery-3.2.1.min.js"></script>
-        <script src="static/lib/jquery.nanoscroller.js"></script>
-        <script src="static/lib/Demodulator.js"></script>
-        <script src="static/lib/DemodulatorPanel.js"></script>
-        <script src="static/lib/BookmarkBar.js"></script>
-        <script src="static/lib/AudioEngine.js"></script>
-        <script src="static/lib/ProgressBar.js"></script>
-        <script src="static/lib/Measurement.js"></script>
-        <script src="static/lib/FrequencyDisplay.js"></script>
-        <script src="static/lib/Js8Threads.js"></script>
-        <script src="static/lib/Modes.js"></script>
+        <script src="compiled/receiver.js"></script>
         <link rel="stylesheet" type="text/css" href="static/lib/nanoscroller.css" />
         <link rel="stylesheet" type="text/css" href="static/css/openwebrx.css" />
         <meta charset="utf-8">
diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index 9a8ab24..c8af2d8 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -4,13 +4,22 @@ from datetime import datetime
 import mimetypes
 import os
 import pkg_resources
+from abc import ABCMeta, abstractmethod
+
+import logging
+
+logger = logging.getLogger(__name__)
 
 
-class AssetsController(Controller):
+class AssetsController(Controller, metaclass=ABCMeta):
     def getModified(self, file):
-        return None
+        return datetime.fromtimestamp(os.path.getmtime(self.getFilePath(file)))
 
     def openFile(self, file):
+        return open(self.getFilePath(file), "rb")
+
+    @abstractmethod
+    def getFilePath(self, file):
         pass
 
     def serve_file(self, file, content_type=None):
@@ -41,8 +50,8 @@ class AssetsController(Controller):
 
 
 class OwrxAssetsController(AssetsController):
-    def openFile(self, file):
-        return pkg_resources.resource_stream("htdocs", file)
+    def getFilePath(self, file):
+        return pkg_resources.resource_filename("htdocs", file)
 
 
 class AprsSymbolsController(AssetsController):
@@ -57,8 +66,54 @@ class AprsSymbolsController(AssetsController):
     def getFilePath(self, file):
         return self.path + file
 
-    def getModified(self, file):
-        return datetime.fromtimestamp(os.path.getmtime(self.getFilePath(file)))
 
-    def openFile(self, file):
-        return open(self.getFilePath(file), "rb")
+class CompiledAssetsController(Controller):
+    profiles = {
+        "receiver.js": [
+            "openwebrx.js",
+            "lib/jquery-3.2.1.min.js",
+            "lib/jquery.nanoscroller.js",
+            "lib/Demodulator.js",
+            "lib/DemodulatorPanel.js",
+            "lib/BookmarkBar.js",
+            "lib/AudioEngine.js",
+            "lib/ProgressBar.js",
+            "lib/Measurement.js",
+            "lib/FrequencyDisplay.js",
+            "lib/Js8Threads.js",
+            "lib/Modes.js",
+        ]
+    }
+
+    def indexAction(self):
+        profileName = self.request.matches.group(1)
+        if profileName not in CompiledAssetsController.profiles:
+            self.send_response("profile not found", code=404)
+
+        files = CompiledAssetsController.profiles[profileName]
+        logger.debug(files)
+        files = [pkg_resources.resource_filename("htdocs", f) for f in files]
+        logger.debug(files)
+
+        modified = self.getModified(files)
+
+        if modified is not None and "If-Modified-Since" in self.handler.headers:
+            client_modified = datetime.strptime(
+                self.handler.headers["If-Modified-Since"], "%a, %d %b %Y %H:%M:%S %Z"
+            )
+            if modified <= client_modified:
+                self.send_response("", code=304)
+                return
+
+        contents = [self.getContents(f) for f in files]
+
+        (content_type, encoding) = mimetypes.MimeTypes().guess_type(profileName)
+        self.send_response("\n".join(contents), content_type=content_type, last_modified=modified, max_age=3600)
+
+    def getContents(self, file):
+        with open(file) as f:
+            return f.read()
+
+    def getModified(self, files):
+        modified = [datetime.fromtimestamp(os.path.getmtime(f)) for f in files]
+        return max(*modified)
diff --git a/owrx/http.py b/owrx/http.py
index f7203a5..39e2bdf 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -6,7 +6,8 @@ from owrx.controllers.template import (
 )
 from owrx.controllers.assets import (
     OwrxAssetsController,
-    AprsSymbolsController
+    AprsSymbolsController,
+    CompiledAssetsController
 )
 from owrx.controllers.websocket import WebSocketController
 from owrx.controllers.api import ApiController
@@ -91,6 +92,7 @@ class Router(object):
             StaticRoute("/status", StatusController),
             StaticRoute("/status.json", StatusController, options={"action": "jsonAction"}),
             RegexRoute("/static/(.+)", OwrxAssetsController),
+            RegexRoute("/compiled/(.+)", CompiledAssetsController),
             RegexRoute("/aprs-symbols/(.+)", AprsSymbolsController),
             StaticRoute("/ws/", WebSocketController),
             RegexRoute("(/favicon.ico)", OwrxAssetsController),

From e01a12a945c335692de76be962749c5551b8e13f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 13:57:19 +0200
Subject: [PATCH 274/475] just a comma

---
 owrx/controllers/assets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index c8af2d8..d0d9785 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -82,7 +82,7 @@ class CompiledAssetsController(Controller):
             "lib/FrequencyDisplay.js",
             "lib/Js8Threads.js",
             "lib/Modes.js",
-        ]
+        ],
     }
 
     def indexAction(self):

From 3504c8b54ec88f543ed5b20321f19806f98293da Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 14:40:01 +0200
Subject: [PATCH 275/475] update changelog

---
 CHANGELOG.md     | 2 ++
 debian/changelog | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23dab09..4c2046b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@
 - Added decoding implementation for for digimode "JS8Call"
   (requires an installation of [js8call](http://js8call.com/) and
   [the js8py library](https://github.com/jketterl/js8py))
+- Reorganization of the frontend demodulator code
+- Improve receiver load time by concatenating javascript assets
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index b4497f7..f8b4c6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
   * `rtl_sdr` type now also supports the `direct_sampling` option
   * Added decoding implementation for for digimode "JS8Call" (requires an
     installation of js8call and the js8py library)
+  * Reorganization of the frontend demodulator code
+  * Improve receiver load time by concatenating javascript assets
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From 6ff1b7d20a08e450277693b04fad4a2182ef995b Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 14:51:00 +0200
Subject: [PATCH 276/475] fix reconnection behavior

---
 htdocs/lib/DemodulatorPanel.js | 10 +++++++++-
 htdocs/openwebrx.js            |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index aa8de15..b5b4bb9 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -97,7 +97,7 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
 
     var replace_modulator = current_modulation !== modulation;
     if (replace_modulator) {
-        if (this.demodulator) this.demodulator.stop();
+        this.stopDemodulator();
         this.demodulator = new Demodulator(current_offset_frequency, modulation);
         var self = this;
         this.demodulator.on("frequencychange", function(freq) {
@@ -144,6 +144,14 @@ DemodulatorPanel.prototype.startDemodulator = function() {
     this._apply(params);
 };
 
+DemodulatorPanel.prototype.stopDemodulator = function() {
+    if (!this.demodulator) {
+        return;
+    }
+    this.demodulator.stop();
+    this.demodulator = false;
+}
+
 DemodulatorPanel.prototype._apply = function(params) {
     this.setMode(params.mod);
     this.getDemodulator().set_offset_frequency(params.offset_frequency);
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 65f3ab4..8c72612 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1241,6 +1241,7 @@ function onAudioStart(success, apiType){
 var reconnect_timeout = false;
 
 function on_ws_closed() {
+    $("#openwebrx-panel-receiver").demodulatorPanel().stopDemodulator();
     if (reconnect_timeout) {
         // max value: roundabout 8 and a half minutes
         reconnect_timeout = Math.min(reconnect_timeout * 2, 512000);

From 3405bc485b8413326f7090959f71133ecc4462b5 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 15:07:47 +0200
Subject: [PATCH 277/475] fix profile switching

---
 htdocs/lib/DemodulatorPanel.js | 12 +++++-------
 htdocs/lib/Modes.js            |  8 ++++----
 htdocs/openwebrx.js            |  5 +++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index b5b4bb9..c6e127e 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -140,7 +140,8 @@ DemodulatorPanel.prototype.getDemodulator = function() {
 };
 
 DemodulatorPanel.prototype.startDemodulator = function() {
-    var params = $.extend(this.initialParams || {}, this.transformHashParams(validateHash()));
+    if (!Modes.initComplete()) return;
+    var params = $.extend({}, this.initialParams || {}, this.transformHashParams(validateHash()));
     this._apply(params);
 };
 
@@ -197,14 +198,11 @@ DemodulatorPanel.prototype.updateButtons = function() {
 
 DemodulatorPanel.prototype.setCenterFrequency = function(center_freq) {
     if (this.center_freq === center_freq) {
-        return ;
+        return;
     }
+    this.stopDemodulator();
     this.center_freq = center_freq;
-    var demod = this.getDemodulator();
-    if (demod) {
-        this.tuneableFrequencyDisplay.setFrequency(center_freq + demod.get_offset_frequency());
-    }
-    updateHash();
+    this.startDemodulator();
 };
 
 $.fn.demodulatorPanel = function(){
diff --git a/htdocs/lib/Modes.js b/htdocs/lib/Modes.js
index 6c6fa80..c12ff23 100644
--- a/htdocs/lib/Modes.js
+++ b/htdocs/lib/Modes.js
@@ -20,13 +20,13 @@ var Modes = {
     registerModePanel: function(el) {
         this.panels.push(el);
     },
+    initComplete: function() {
+        return this.modes.length && Object.keys(this.features).length;
+    },
     updatePanels: function() {
-        var init_complete = this.modes.length && Object.keys(this.features).length;
         this.panels.forEach(function(p) {
             p.render();
-            if (init_complete) {
-                p.startDemodulator();
-            }
+            p.startDemodulator();
         });
     }
 };
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 8c72612..e5a7489 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -745,7 +745,6 @@ function on_ws_recv(evt) {
 
                         bandwidth = config['samp_rate'];
                         center_freq = config['center_freq'];
-                        $('#openwebrx-panel-receiver').demodulatorPanel().setCenterFrequency(center_freq);
                         fft_size = config['fft_size'];
                         var audio_compression = config['audio_compression'];
                         audioEngine.setCompression(audio_compression);
@@ -758,7 +757,9 @@ function on_ws_recv(evt) {
                         updateSquelch();
 
                         waterfall_init();
-                        $('#openwebrx-panel-receiver').demodulatorPanel().setInitialParams(initial_demodulator_params);
+                        var demodulatorPanel = $('#openwebrx-panel-receiver').demodulatorPanel();
+                        demodulatorPanel.setInitialParams(initial_demodulator_params);
+                        demodulatorPanel.setCenterFrequency(center_freq);
                         bookmarks.loadLocalBookmarks();
 
                         waterfall_clear();

From 1bfe7686010c2f1651ac3d9a086a41a06b8ac0d6 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 15:17:09 +0200
Subject: [PATCH 278/475] hash handling fits better into here now

---
 htdocs/lib/DemodulatorPanel.js | 64 +++++++++++++++++++++++++++++++---
 htdocs/openwebrx.js            | 51 ---------------------------
 2 files changed, 59 insertions(+), 56 deletions(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index c6e127e..0994e4c 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -26,6 +26,9 @@ function DemodulatorPanel(el) {
             self.setMode(value);
         }
     });
+    window.addEventListener('hashchange', function() {
+        self.onHashChange();
+    });
 };
 
 DemodulatorPanel.prototype.render = function() {
@@ -102,7 +105,7 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
         var self = this;
         this.demodulator.on("frequencychange", function(freq) {
             self.tuneableFrequencyDisplay.setFrequency(self.center_freq + freq);
-            updateHash();
+            self.updateHash();
         });
     }
     if (mode.type === 'digimode') {
@@ -117,7 +120,7 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
 
     this.updateButtons();
     this.updatePanels();
-    updateHash();
+    this.updateHash();
 };
 
 DemodulatorPanel.prototype.disableDigiMode = function() {
@@ -141,7 +144,7 @@ DemodulatorPanel.prototype.getDemodulator = function() {
 
 DemodulatorPanel.prototype.startDemodulator = function() {
     if (!Modes.initComplete()) return;
-    var params = $.extend({}, this.initialParams || {}, this.transformHashParams(validateHash()));
+    var params = $.extend({}, this.initialParams || {}, this.transformHashParams(this.parseHash()));
     this._apply(params);
 };
 
@@ -163,8 +166,8 @@ DemodulatorPanel.prototype.setInitialParams = function(params) {
     this.initialParams = params;
 };
 
-DemodulatorPanel.prototype.setHashParams = function(params) {
-    this._apply(this.transformHashParams(params));
+DemodulatorPanel.prototype.onHashChange = function() {
+    this._apply(this.transformHashParams(this.parseHash()));
 };
 
 DemodulatorPanel.prototype.transformHashParams = function(params) {
@@ -205,6 +208,57 @@ DemodulatorPanel.prototype.setCenterFrequency = function(center_freq) {
     this.startDemodulator();
 };
 
+DemodulatorPanel.prototype.parseHash = function() {
+    if (!window.location.hash) {
+        return {};
+    }
+    var params = window.location.hash.substring(1).split(",").map(function(x) {
+        var harr = x.split('=');
+        return [harr[0], harr.slice(1).join('=')];
+    }).reduce(function(params, p){
+        params[p[0]] = p[1];
+        return params;
+    }, {});
+
+    return this.validateHash(params);
+};
+
+DemodulatorPanel.prototype.validateHash = function(params) {
+    var self = this;
+    params = Object.keys(params).filter(function(key) {
+        if (key == 'freq' || key == 'mod' || key == 'secondary_mod') {
+            return params.freq && Math.abs(params.freq - self.center_freq) < bandwidth;
+        }
+        return true;
+    }).reduce(function(p, key) {
+        p[key] = params[key];
+        return p;
+    }, {});
+
+    if (params['freq']) {
+        params['offset_frequency'] = params['freq'] - self.center_freq;
+        delete params['freq'];
+    }
+
+    return params;
+};
+
+DemodulatorPanel.prototype.updateHash = function() {
+    var demod = this.getDemodulator();
+    if (!demod) return;
+    var self = this;
+    window.location.hash = $.map({
+        freq: demod.get_offset_frequency() + self.center_freq,
+        mod: demod.get_modulation(),
+        secondary_mod: demod.get_secondary_demod()
+    }, function(value, key){
+        if (!value) return undefined;
+        return key + '=' + value;
+    }).filter(function(v) {
+        return !!v;
+    }).join(',');
+};
+
 $.fn.demodulatorPanel = function(){
     if (!this.data('panel')) {
         this.data('panel', new DemodulatorPanel(this));
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index e5a7489..47c8800 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1176,54 +1176,6 @@ var mute = false;
 // Optimalise these if audio lags or is choppy:
 var audio_buffer_maximal_length_sec = 1; //actual number of samples are calculated from sample rate
 
-function parseHash() {
-    if (!window.location.hash) {
-        return {};
-    }
-    return window.location.hash.substring(1).split(",").map(function(x) {
-        var harr = x.split('=');
-        return [harr[0], harr.slice(1).join('=')];
-    }).reduce(function(params, p){
-        params[p[0]] = p[1];
-        return params;
-    }, {});
-}
-
-function validateHash() {
-    var params = parseHash();
-    params = Object.keys(params).filter(function(key) {
-        if (key == 'freq' || key == 'mod' || key == 'secondary_mod') {
-            return params.freq && Math.abs(params.freq - center_freq) < bandwidth;
-        }
-        return true;
-    }).reduce(function(p, key) {
-        p[key] = params[key];
-        return p;
-    }, {});
-
-    if (params['freq']) {
-        params['offset_frequency'] = params['freq'] - center_freq;
-        delete params['freq'];
-    }
-
-    return params;
-}
-
-function updateHash() {
-    var demod = $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator();
-    if (!demod) return;
-    window.location.hash = $.map({
-        freq: demod.get_offset_frequency() + center_freq,
-        mod: demod.get_modulation(),
-        secondary_mod: demod.get_secondary_demod()
-    }, function(value, key){
-        if (!value) return undefined;
-        return key + '=' + value;
-    }).filter(function(v) {
-        return !!v;
-    }).join(',');
-}
-
 function onAudioStart(success, apiType){
     divlog('Web Audio API succesfully initialized, using ' + apiType  + ' API, sample rate: ' + audioEngine.getSampleRate() + " Hz");
 
@@ -1477,9 +1429,6 @@ function openwebrx_init() {
     init_header();
     bookmarks = new BookmarkBar();
     initSliders();
-    window.addEventListener('hashchange', function() {
-        $('#openwebrx-panel-receiver').demodulatorPanel().setHashParams(validateHash());
-    });
 }
 
 function initSliders() {

From 0868e643c95026f24eaadcfbfe2c04a05c31eafc Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 2 May 2020 16:59:27 +0200
Subject: [PATCH 279/475] return after sending 404

---
 owrx/controllers/assets.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index d0d9785..9c609ec 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -89,6 +89,7 @@ class CompiledAssetsController(Controller):
         profileName = self.request.matches.group(1)
         if profileName not in CompiledAssetsController.profiles:
             self.send_response("profile not found", code=404)
+            return
 
         files = CompiledAssetsController.profiles[profileName]
         logger.debug(files)

From 2f2d52df85fcf5e02f9ce42dba3b9dec917a4a14 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 12:09:18 +0200
Subject: [PATCH 280/475] re-wire digital voice meta panels

---
 htdocs/lib/DemodulatorPanel.js | 7 +++++++
 htdocs/openwebrx.js            | 7 -------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index 0994e4c..fb6e7c3 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -136,6 +136,13 @@ DemodulatorPanel.prototype.updatePanels = function() {
     toggle_panel("openwebrx-panel-js8-message", modulation == "js8");
     toggle_panel("openwebrx-panel-packet-message", modulation === "packet");
     toggle_panel("openwebrx-panel-pocsag-message", modulation === "pocsag");
+
+    modulation = this.getDemodulator().get_modulation();
+    var showing = 'openwebrx-panel-metadata-' + modulation;
+    $(".openwebrx-meta-panel").each(function (_, p) {
+        toggle_panel(p.id, p.id === showing);
+    });
+    clear_metadata();
 };
 
 DemodulatorPanel.prototype.getDemodulator = function() {
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 47c8800..2e41038 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1110,13 +1110,6 @@ function update_pocsag_panel(msg) {
     $b.scrollTop($b[0].scrollHeight);
 }
 
-function update_digitalvoice_panels(showing) {
-    $(".openwebrx-meta-panel").each(function (_, p) {
-        toggle_panel(p.id, p.id === showing);
-    });
-    clear_metadata();
-}
-
 function clear_metadata() {
     $(".openwebrx-meta-panel .openwebrx-meta-autoclear").text("");
     $(".openwebrx-meta-slot").removeClass("active").removeClass("sync");

From e409c37158f54969d0abdb4e773610bdf92289b1 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 12:09:36 +0200
Subject: [PATCH 281/475] add remark about js8 binary location

---
 owrx/feature.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/owrx/feature.py b/owrx/feature.py
index 9891e0a..17172a5 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -374,6 +374,10 @@ class FeatureDetector(object):
     def has_js8(self):
         """
         To decode JS8, you will need to install [JS8Call](http://js8call.com/)
+
+        Please note that the `js8` command line decoder is not made available on $PATH by some JS8Call package builds.
+        You will need to manually make it available by either linking it to `/usr/bin` or by adding its location to
+        $PATH.
         """
         return self.command_is_runnable("js8")
 

From 26ba8ca999edbb04e05d3cc1bc011ab1dc34b6ec Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 12:23:23 +0200
Subject: [PATCH 282/475] update bandpass for secondary modes

---
 htdocs/lib/DemodulatorPanel.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index fb6e7c3..6cdc8f0 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -110,6 +110,9 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
     }
     if (mode.type === 'digimode') {
         this.demodulator.set_secondary_demod(mode.modulation);
+        if (mode.bandpass) {
+            this.demodulator.setBandpass(mode.bandpass);
+        }
     } else {
         this.demodulator.set_secondary_demod(false);
     }

From e92a91663d346cd9496550c3e8cd6092cd20ef4e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 12:48:25 +0200
Subject: [PATCH 283/475] restart demodulator based on modes

---
 htdocs/lib/DemodulatorPanel.js | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index 6cdc8f0..960a4ca 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -2,6 +2,7 @@ function DemodulatorPanel(el) {
     var self = this;
     self.el = el;
     self.demodulator = null;
+    self.mode = null;
 
     var displayEl = el.find('.webrx-actual-freq')
     this.tuneableFrequencyDisplay = displayEl.tuneableFrequencyDisplay();
@@ -82,32 +83,32 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
     if (!mode) {
         return;
     }
+    if (this.mode === mode) {
+        return;
+    }
     if (!mode.isAvailable()) {
         divlog('Modulation "' + mode.name + '" not supported. Please check requirements', true);
         return;
     }
 
+    this.mode = mode;
+
     if (mode.type === 'digimode') {
         modulation = mode.underlying[0];
     }
 
     var current_offset_frequency = 0;
-    var current_modulation = false;
     if (this.demodulator) {
-        current_modulation = this.demodulator.get_modulation();
         current_offset_frequency = this.demodulator.get_offset_frequency();
     }
 
-    var replace_modulator = current_modulation !== modulation;
-    if (replace_modulator) {
-        this.stopDemodulator();
-        this.demodulator = new Demodulator(current_offset_frequency, modulation);
-        var self = this;
-        this.demodulator.on("frequencychange", function(freq) {
-            self.tuneableFrequencyDisplay.setFrequency(self.center_freq + freq);
-            self.updateHash();
-        });
-    }
+    this.stopDemodulator();
+    this.demodulator = new Demodulator(current_offset_frequency, modulation);
+    var self = this;
+    this.demodulator.on("frequencychange", function(freq) {
+        self.tuneableFrequencyDisplay.setFrequency(self.center_freq + freq);
+        self.updateHash();
+    });
     if (mode.type === 'digimode') {
         this.demodulator.set_secondary_demod(mode.modulation);
         if (mode.bandpass) {
@@ -117,9 +118,7 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
         this.demodulator.set_secondary_demod(false);
     }
 
-    if (replace_modulator) {
-        this.demodulator.start();
-    }
+    this.demodulator.start();
 
     this.updateButtons();
     this.updatePanels();
@@ -127,8 +126,7 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
 };
 
 DemodulatorPanel.prototype.disableDigiMode = function() {
-    var modulation = this.el.find('.openwebrx-button.highlighted[data-modulation]').data('modulation');
-    this.setMode(modulation);
+    this.setMode(this.getDemodulator().get_modulation());
 };
 
 DemodulatorPanel.prototype.updatePanels = function() {

From ac136313cb56c1afda0c79523f0dc4de51d35371 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 13:10:25 +0200
Subject: [PATCH 284/475] keep back changes until start command is given

---
 htdocs/lib/Demodulator.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/lib/Demodulator.js b/htdocs/lib/Demodulator.js
index c268c48..1683ada 100644
--- a/htdocs/lib/Demodulator.js
+++ b/htdocs/lib/Demodulator.js
@@ -185,6 +185,7 @@ function Demodulator(offset_frequency, modulation) {
     this.filter = new Filter(this);
     this.squelch_level = -150;
     this.dmr_filter = 3;
+    this.started = false;
     this.state = {};
     this.secondary_demod = false;
     var mode = Modes.findByModulation(modulation);
@@ -248,6 +249,7 @@ Demodulator.prototype.get_modulation = function() {
 };
 
 Demodulator.prototype.start = function() {
+    this.started = true;
     this.set();
     ws.send(JSON.stringify({
         "type": "dspcontrol",
@@ -264,6 +266,7 @@ Demodulator.prototype.send = function(params) {
 }
 
 Demodulator.prototype.set = function () {  //this function sends demodulator parameters to the server
+    if (!this.started) return;
     var params = {
         "low_cut": this.low_cut,
         "high_cut": this.high_cut,

From acb392e56c65ce4cf65fca7c334e24304f63e967 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 13:10:54 +0200
Subject: [PATCH 285/475] reset & stabilize modes

---
 htdocs/lib/DemodulatorPanel.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index 960a4ca..b4c2c07 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -91,8 +91,6 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
         return;
     }
 
-    this.mode = mode;
-
     if (mode.type === 'digimode') {
         modulation = mode.underlying[0];
     }
@@ -119,6 +117,7 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
     }
 
     this.demodulator.start();
+    this.mode = mode;
 
     this.updateButtons();
     this.updatePanels();
@@ -161,7 +160,8 @@ DemodulatorPanel.prototype.stopDemodulator = function() {
         return;
     }
     this.demodulator.stop();
-    this.demodulator = false;
+    this.demodulator = null;
+    this.mode = null;
 }
 
 DemodulatorPanel.prototype._apply = function(params) {

From 52367e53f5add78e23aa4cef4c740d1f01d9c9e1 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 17:46:32 +0200
Subject: [PATCH 286/475] remove the debugging

---
 owrx/controllers/assets.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index 9c609ec..88563e5 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -6,10 +6,6 @@ import os
 import pkg_resources
 from abc import ABCMeta, abstractmethod
 
-import logging
-
-logger = logging.getLogger(__name__)
-
 
 class AssetsController(Controller, metaclass=ABCMeta):
     def getModified(self, file):
@@ -92,9 +88,7 @@ class CompiledAssetsController(Controller):
             return
 
         files = CompiledAssetsController.profiles[profileName]
-        logger.debug(files)
         files = [pkg_resources.resource_filename("htdocs", f) for f in files]
-        logger.debug(files)
 
         modified = self.getModified(files)
 

From d98abe42bc2830b66ffb11da78d05b15cc24b32f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 17:50:37 +0200
Subject: [PATCH 287/475] fix configurable_keys exception

---
 owrx/connection.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/owrx/connection.py b/owrx/connection.py
index e1f7083..9fbc088 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -254,6 +254,8 @@ class OpenWebRxReceiverClient(Client):
     def setParams(self, params):
         config = Config.get()
         # allow direct configuration only if enabled in the config
+        if "configurable_keys" not in config:
+            return
         keys = config["configurable_keys"]
         if not keys:
             return

From beed0c1a70a09b307569effe5ced917f24408d1e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 19:55:48 +0200
Subject: [PATCH 288/475] improve squelch handling

squelch is now included in the URL hash
some modes now have the squelch visually disabled, refs #65
---
 htdocs/css/openwebrx.css       |  8 +++++
 htdocs/index.html              |  4 +--
 htdocs/lib/Demodulator.js      | 11 +++++-
 htdocs/lib/DemodulatorPanel.js | 61 +++++++++++++++++++++++++++++-----
 htdocs/lib/Modes.js            |  1 +
 htdocs/openwebrx.js            | 21 ++----------
 owrx/connection.py             |  3 +-
 owrx/modes.py                  | 40 ++++++++++++++--------
 8 files changed, 104 insertions(+), 45 deletions(-)

diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index 981bf9c..dbc0f14 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -150,6 +150,10 @@ input[type=range]:focus::-ms-fill-upper
 	background: #B6B6B6;
 }
 
+input[type=range]:disabled {
+    opacity: 0.5;
+}
+
 #webrx-page-container
 {
     height: 100%;
@@ -435,6 +439,10 @@ input[type=range]:focus::-ms-fill-upper
     margin-right: 0;
 }
 
+.openwebrx-button.disabled {
+    opacity: 0.5;
+}
+
 .openwebrx-demodulator-button
 {
 	width: 38px;
diff --git a/htdocs/index.html b/htdocs/index.html
index 07b9fcc..abff134 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -165,8 +165,8 @@
                     <input title="Waterfall minimum level" id="openwebrx-waterfall-color-min" class="openwebrx-panel-slider" type="range" min="-200" max="100" value="50" step="1" onchange="updateWaterfallColors(0);" oninput="updateVolume()">
                 </div>
                 <div class="openwebrx-panel-line">
-                    <div title="Auto-set squelch level" id="openwebrx-squelch-default" class="openwebrx-button" onclick="setSquelchToAuto()"><img src="static/gfx/openwebrx-squelch-button.png" class="openwebrx-sliderbtn-img"></div>
-                    <input title="Squelch" id="openwebrx-panel-squelch" class="openwebrx-panel-slider" type="range" min="-150" max="0" value="-150" step="1" onchange="updateSquelch()" oninput="updateSquelch()">
+                    <div title="Auto-set squelch level" class="openwebrx-squelch-default openwebrx-button"><img src="static/gfx/openwebrx-squelch-button.png" class="openwebrx-sliderbtn-img"></div>
+                    <input title="Squelch" class="openwebrx-squelch-slider openwebrx-panel-slider" type="range" min="-150" max="0" value="-150" step="1">
                     <div title="Set waterfall colors to default" id="openwebrx-waterfall-colors-default" class="openwebrx-button" onclick="waterfallColorsDefault()"><img src="static/gfx/openwebrx-waterfall-default.png" class="openwebrx-sliderbtn-img"></div>
                     <input title="Waterfall maximum level" id="openwebrx-waterfall-color-max" class="openwebrx-panel-slider" type="range" min="-200" max="100" value="50" step="1" onchange="updateWaterfallColors(1);" oninput="updateVolume()">
                 </div>
diff --git a/htdocs/lib/Demodulator.js b/htdocs/lib/Demodulator.js
index 1683ada..1c47560 100644
--- a/htdocs/lib/Demodulator.js
+++ b/htdocs/lib/Demodulator.js
@@ -194,7 +194,8 @@ function Demodulator(offset_frequency, modulation) {
         this.high_cut = mode.bandpass.high_cut;
     }
     this.listeners = {
-        "frequencychange": []
+        "frequencychange": [],
+        "squelchchange": []
     };
 }
 
@@ -293,8 +294,16 @@ Demodulator.prototype.set = function () {  //this function sends demodulator par
 };
 
 Demodulator.prototype.setSquelch = function(squelch) {
+    if (this.squelch_level == squelch) {
+        return;
+    }
     this.squelch_level = squelch;
     this.set();
+    this.emit("squelchchange", squelch);
+};
+
+Demodulator.prototype.getSquelch = function() {
+    return this.squelch_level;
 };
 
 Demodulator.prototype.setDmrFilter = function(dmr_filter) {
diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index b4c2c07..8a92f2a 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -27,6 +27,14 @@ function DemodulatorPanel(el) {
             self.setMode(value);
         }
     });
+    el.on('click', '.openwebrx-squelch-default', function() {
+        if (!self.squelchAvailable()) return;
+        el.find('.openwebrx-squelch-slider').val(getLogSmeterValue(smeter_level) + 10);
+        self.updateSquelch();
+    });
+    el.on('change', '.openwebrx-squelch-slider', function() {
+        self.updateSquelch();
+    });
     window.addEventListener('hashchange', function() {
         self.onHashChange();
     });
@@ -95,18 +103,27 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
         modulation = mode.underlying[0];
     }
 
-    var current_offset_frequency = 0;
+    var current = this.collectParams();
     if (this.demodulator) {
-        current_offset_frequency = this.demodulator.get_offset_frequency();
+        current.offset_frequency = this.demodulator.get_offset_frequency();
+        current.squelch_level = this.demodulator.getSquelch();
     }
 
     this.stopDemodulator();
-    this.demodulator = new Demodulator(current_offset_frequency, modulation);
+    this.demodulator = new Demodulator(current.offset_frequency, modulation);
+    this.demodulator.setSquelch(current.squelch_level);
     var self = this;
     this.demodulator.on("frequencychange", function(freq) {
         self.tuneableFrequencyDisplay.setFrequency(self.center_freq + freq);
         self.updateHash();
     });
+    updateSquelch = function(squelch) {
+        self.el.find('.openwebrx-squelch-slider').val(squelch);
+        self.updateHash();
+    };
+    this.demodulator.on('squelchchange', updateSquelch);
+    updateSquelch(this.demodulator.getSquelch());
+
     if (mode.type === 'digimode') {
         this.demodulator.set_secondary_demod(mode.modulation);
         if (mode.bandpass) {
@@ -149,9 +166,18 @@ DemodulatorPanel.prototype.getDemodulator = function() {
     return this.demodulator;
 };
 
+DemodulatorPanel.prototype.collectParams = function() {
+    var defaults = {
+        offset_frequency: 0,
+        squelch_level: -150,
+        mod: 'nfm'
+    }
+    return $.extend(new Object(), defaults, this.initialParams || {}, this.transformHashParams(this.parseHash()));
+};
+
 DemodulatorPanel.prototype.startDemodulator = function() {
     if (!Modes.initComplete()) return;
-    var params = $.extend({}, this.initialParams || {}, this.transformHashParams(this.parseHash()));
+    var params = this.collectParams();
     this._apply(params);
 };
 
@@ -167,6 +193,7 @@ DemodulatorPanel.prototype.stopDemodulator = function() {
 DemodulatorPanel.prototype._apply = function(params) {
     this.setMode(params.mod);
     this.getDemodulator().set_offset_frequency(params.offset_frequency);
+    this.getDemodulator().setSquelch(params.squelch_level);
     this.updateButtons();
 };
 
@@ -179,12 +206,18 @@ DemodulatorPanel.prototype.onHashChange = function() {
 };
 
 DemodulatorPanel.prototype.transformHashParams = function(params) {
-    return {
-        mod: params.secondary_mod || params.mod,
-        offset_frequency: params.offset_frequency
+    var ret = {
+        mod: params.secondary_mod || params.mod
     };
+    if (params.offset_frequency) ret.offset_frequency = params.offset_frequency;
+    if (params.sql) ret.squelch_level = parseInt(params.sql);
+    return ret;
 };
 
+DemodulatorPanel.prototype.squelchAvailable = function () {
+    return this.mode && this.mode.squelch;
+}
+
 DemodulatorPanel.prototype.updateButtons = function() {
     var $buttons = this.el.find(".openwebrx-demodulator-button");
     $buttons.removeClass("highlighted").removeClass('disabled');
@@ -205,6 +238,9 @@ DemodulatorPanel.prototype.updateButtons = function() {
     } else {
         this.el.find('.openwebrx-secondary-demod-listbox').val('none');
     }
+    var squelch_disabled = !this.squelchAvailable();
+    this.el.find('.openwebrx-squelch-slider').prop('disabled', squelch_disabled);
+    this.el.find('.openwebrx-squelch-default')[squelch_disabled ? 'addClass' : 'removeClass']('disabled');
 }
 
 DemodulatorPanel.prototype.setCenterFrequency = function(center_freq) {
@@ -234,7 +270,7 @@ DemodulatorPanel.prototype.parseHash = function() {
 DemodulatorPanel.prototype.validateHash = function(params) {
     var self = this;
     params = Object.keys(params).filter(function(key) {
-        if (key == 'freq' || key == 'mod' || key == 'secondary_mod') {
+        if (key == 'freq' || key == 'mod' || key == 'secondary_mod' || key == 'sql') {
             return params.freq && Math.abs(params.freq - self.center_freq) < bandwidth;
         }
         return true;
@@ -258,7 +294,8 @@ DemodulatorPanel.prototype.updateHash = function() {
     window.location.hash = $.map({
         freq: demod.get_offset_frequency() + self.center_freq,
         mod: demod.get_modulation(),
-        secondary_mod: demod.get_secondary_demod()
+        secondary_mod: demod.get_secondary_demod(),
+        sql: demod.getSquelch(),
     }, function(value, key){
         if (!value) return undefined;
         return key + '=' + value;
@@ -267,6 +304,12 @@ DemodulatorPanel.prototype.updateHash = function() {
     }).join(',');
 };
 
+DemodulatorPanel.prototype.updateSquelch = function() {
+    var sliderValue = parseInt(this.el.find(".openwebrx-squelch-slider").val());
+    var demod = this.getDemodulator();
+    if (demod) demod.setSquelch(sliderValue);
+};
+
 $.fn.demodulatorPanel = function(){
     if (!this.data('panel')) {
         this.data('panel', new DemodulatorPanel(this));
diff --git a/htdocs/lib/Modes.js b/htdocs/lib/Modes.js
index c12ff23..a33cf4f 100644
--- a/htdocs/lib/Modes.js
+++ b/htdocs/lib/Modes.js
@@ -36,6 +36,7 @@ var Mode = function(json){
     this.name = json.name;
     this.type = json.type;
     this.requirements = json.requirements;
+    this.squelch = json.squelch;
     if (json.bandpass) {
         this.bandpass = json.bandpass;
     }
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 2e41038..7b32731 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -103,14 +103,12 @@ function toggleMute() {
         e("openwebrx-mute-on").id = "openwebrx-mute-off";
         e("openwebrx-mute-img").src = "static/gfx/openwebrx-speaker.png";
         e("openwebrx-panel-volume").disabled = false;
-        e("openwebrx-panel-volume").style.opacity = 1.0;
         e("openwebrx-panel-volume").value = volumeBeforeMute;
     } else {
         mute = true;
         e("openwebrx-mute-off").id = "openwebrx-mute-on";
         e("openwebrx-mute-img").src = "static/gfx/openwebrx-speaker-muted.png";
         e("openwebrx-panel-volume").disabled = true;
-        e("openwebrx-panel-volume").style.opacity = 0.5;
         volumeBeforeMute = e("openwebrx-panel-volume").value;
         e("openwebrx-panel-volume").value = 0;
     }
@@ -134,17 +132,6 @@ function zoomOutTotal() {
     zoom_set(0);
 }
 
-function setSquelchToAuto() {
-    e("openwebrx-panel-squelch").value = (getLogSmeterValue(smeter_level) + 10).toString();
-    updateSquelch();
-}
-
-function updateSquelch() {
-    var sliderValue = parseInt($("#openwebrx-panel-squelch").val());
-    var demod = $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator();
-    if (demod) demod.setSquelch(sliderValue);
-}
-
 var waterfall_min_level;
 var waterfall_max_level;
 var waterfall_min_level_default;
@@ -189,7 +176,7 @@ function setSmeterRelativeValue(value) {
 }
 
 function setSquelchSliderBackground(val) {
-    var $slider = $('#openwebrx-panel-squelch');
+    var $slider = $('#openwebrx-panel-receiver .openwebrx-squelch-slider');
     var min = Number($slider.attr('min'));
     var max = Number($slider.attr('max'));
     var sliderPosition = $slider.val();
@@ -740,7 +727,8 @@ function on_ws_recv(evt) {
 
                         var initial_demodulator_params = {
                             mod: config['start_mod'],
-                            offset_frequency: config['start_offset_freq']
+                            offset_frequency: config['start_offset_freq'],
+                            squelch_level: Number.isInteger(config['initial_squelch_level']) ? config['initial_squelch_level'] : -150
                         };
 
                         bandwidth = config['samp_rate'];
@@ -752,9 +740,6 @@ function on_ws_recv(evt) {
                         fft_compression = config['fft_compression'];
                         divlog("FFT stream is " + ((fft_compression === "adpcm") ? "compressed" : "uncompressed") + ".");
                         clientProgressBar.setMaxClients(config['max_clients']);
-                        var sql = Number.isInteger(config['initial_squelch_level']) ? config['initial_squelch_level'] : -150;
-                        $("#openwebrx-panel-squelch").val(sql);
-                        updateSquelch();
 
                         waterfall_init();
                         var demodulatorPanel = $('#openwebrx-panel-receiver').demodulatorPanel();
diff --git a/owrx/connection.py b/owrx/connection.py
index 9fbc088..1f15031 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -353,7 +353,8 @@ class OpenWebRxReceiverClient(Client):
                 "modulation": m.modulation,
                 "name": m.name,
                 "type": "digimode" if isinstance(m, DigitalMode) else "analog",
-                "requirements": m.requirements
+                "requirements": m.requirements,
+                "squelch": m.squelch,
             }
             if m.bandpass is not None:
                 res["bandpass"] = {
diff --git a/owrx/modes.py b/owrx/modes.py
index 7617b5f..f455268 100644
--- a/owrx/modes.py
+++ b/owrx/modes.py
@@ -9,18 +9,17 @@ class Bandpass(object):
 
 
 class Mode(object):
-    def __init__(self, modulation, name, bandpass: Bandpass = None, requirements=None, service=False):
+    def __init__(self, modulation, name, bandpass: Bandpass = None, requirements=None, service=False, squelch=True):
         self.modulation = modulation
         self.name = name
         self.requirements = requirements if requirements is not None else []
         self.service = service
         self.bandpass = bandpass
+        self.squelch = squelch
 
     def is_available(self):
         fd = FeatureDetector()
-        return reduce(
-            lambda a, b: a and b, [fd.is_available(r) for r in self.requirements], True
-        )
+        return reduce(lambda a, b: a and b, [fd.is_available(r) for r in self.requirements], True)
 
     def is_service(self):
         return self.service
@@ -31,8 +30,10 @@ class AnalogMode(Mode):
 
 
 class DigitalMode(Mode):
-    def __init__(self, modulation, name, underlying, bandpass: Bandpass = None, requirements=None, service=False):
-        super().__init__(modulation, name, bandpass, requirements, service)
+    def __init__(
+        self, modulation, name, underlying, bandpass: Bandpass = None, requirements=None, service=False, squelch=True
+    ):
+        super().__init__(modulation, name, bandpass, requirements, service, squelch)
         self.underlying = underlying
 
 
@@ -43,20 +44,31 @@ class Modes(object):
         AnalogMode("lsb", "LSB", bandpass=Bandpass(-3000, -300)),
         AnalogMode("usb", "USB", bandpass=Bandpass(300, 3000)),
         AnalogMode("cw", "CW", bandpass=Bandpass(700, 900)),
-        AnalogMode("dmr", "DMR", bandpass=Bandpass(-4000, 4000), requirements=["digital_voice_digiham"]),
-        AnalogMode("dstar", "DStar", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_dsd"]),
-        AnalogMode("nxdn", "NXDN", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_dsd"]),
-        AnalogMode("ysf", "YSF", bandpass=Bandpass(-4000, 4000), requirements=["digital_voice_digiham"]),
+        AnalogMode("dmr", "DMR", bandpass=Bandpass(-4000, 4000), requirements=["digital_voice_digiham"], squelch=False),
+        AnalogMode("dstar", "DStar", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_dsd"], squelch=False),
+        AnalogMode("nxdn", "NXDN", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_dsd"], squelch=False),
+        AnalogMode("ysf", "YSF", bandpass=Bandpass(-4000, 4000), requirements=["digital_voice_digiham"], squelch=False),
         DigitalMode("bpsk31", "BPSK31", underlying=["usb"]),
         DigitalMode("bpsk63", "BPSK63", underlying=["usb"]),
         DigitalMode("ft8", "FT8", underlying=["usb"], requirements=["wsjt-x"], service=True),
         DigitalMode("ft4", "FT4", underlying=["usb"], requirements=["wsjt-x"], service=True),
         DigitalMode("jt65", "JT65", underlying=["usb"], requirements=["wsjt-x"], service=True),
         DigitalMode("jt9", "JT9", underlying=["usb"], requirements=["wsjt-x"], service=True),
-        DigitalMode("wspr", "WSPR", underlying=["usb"], bandpass=Bandpass(1350, 1650), requirements=["wsjt-x"], service=True),
+        DigitalMode(
+            "wspr", "WSPR", underlying=["usb"], bandpass=Bandpass(1350, 1650), requirements=["wsjt-x"], service=True
+        ),
         DigitalMode("js8", "JS8Call", underlying=["usb"], requirements=["js8call"], service=True),
-        DigitalMode("packet", "Packet", underlying=["nfm", "usb", "lsb"], requirements=["packet"], service=True),
-        DigitalMode("pocsag", "Pocsag", underlying=["nfm"], bandpass=Bandpass(-6000, 6000), requirements=["pocsag"])
+        DigitalMode(
+            "packet", "Packet", underlying=["nfm", "usb", "lsb"], requirements=["packet"], service=True, squelch=False
+        ),
+        DigitalMode(
+            "pocsag",
+            "Pocsag",
+            underlying=["nfm"],
+            bandpass=Bandpass(-6000, 6000),
+            requirements=["pocsag"],
+            squelch=False,
+        ),
     ]
 
     @staticmethod
@@ -75,4 +87,4 @@ class Modes(object):
     def findByModulation(modulation):
         modes = [m for m in Modes.getAvailableModes() if m.modulation == modulation]
         if modes:
-            return modes[0]
\ No newline at end of file
+            return modes[0]

From 8e313517d1e5c0812845de2f57b10bc7af09374b Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 21:26:11 +0200
Subject: [PATCH 289/475] initialize frequeny correctly

---
 htdocs/lib/DemodulatorPanel.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index 8a92f2a..bab7c02 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -113,11 +113,13 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
     this.demodulator = new Demodulator(current.offset_frequency, modulation);
     this.demodulator.setSquelch(current.squelch_level);
     var self = this;
-    this.demodulator.on("frequencychange", function(freq) {
+    var updateFrequency = function(freq) {
         self.tuneableFrequencyDisplay.setFrequency(self.center_freq + freq);
         self.updateHash();
-    });
-    updateSquelch = function(squelch) {
+    };
+    this.demodulator.on("frequencychange", updateFrequency);
+    updateFrequency(this.demodulator.get_offset_frequency());
+    var updateSquelch = function(squelch) {
         self.el.find('.openwebrx-squelch-slider').val(squelch);
         self.updateHash();
     };

From 981d3b6673153f3979f1fb8b4f84703960bcac04 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 21:28:37 +0200
Subject: [PATCH 290/475] ignore keyerrors in this case

---
 owrx/connection.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index 1f15031..466adf7 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -264,8 +264,11 @@ class OpenWebRxReceiverClient(Client):
         stack.addLayer(0, self.sdr.getProps())
         stack.addLayer(1, config)
         protected = stack.filter(*keys)
-        for key, value in params.items():
-            protected[key] = value
+        try:
+            for key, value in params.items():
+                protected[key] = value
+        except KeyError:
+            pass
 
     def getDsp(self):
         if self.dsp is None:

From a6a29b70328ea8f55a9c15d2de08dc5eda327b46 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 21:50:40 +0200
Subject: [PATCH 291/475] actually, it's better to catch the exception inside

---
 owrx/connection.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index 466adf7..4ac9386 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -264,11 +264,11 @@ class OpenWebRxReceiverClient(Client):
         stack.addLayer(0, self.sdr.getProps())
         stack.addLayer(1, config)
         protected = stack.filter(*keys)
-        try:
-            for key, value in params.items():
+        for key, value in params.items():
+            try:
                 protected[key] = value
-        except KeyError:
-            pass
+            except KeyError:
+                pass
 
     def getDsp(self):
         if self.dsp is None:

From 93b8f75cc3555f0c16feafa09b3325a44ec034e8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 23:56:22 +0200
Subject: [PATCH 292/475] automatically load modes into bookmark dialog

---
 htdocs/index.html            | 12 +-----------
 htdocs/lib/BookmarkDialog.js | 10 ++++++++++
 htdocs/lib/Modes.js          |  1 +
 owrx/controllers/assets.py   |  1 +
 4 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 htdocs/lib/BookmarkDialog.js

diff --git a/htdocs/index.html b/htdocs/index.html
index abff134..6c1def2 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -211,17 +211,7 @@
             </div>
             <div class="form-field">
                 <label for="modulation">Modulation:</label>
-                <select name="modulation" id="modulation">
-                    <option value="nfm">FM</option>
-                    <option value="am">AM</option>
-                    <option value="usb">USB</option>
-                    <option value="lsb">LSB</option>
-                    <option value="cw">CW</option>
-                    <option value="dmr">DMR</option>
-                    <option value="dstar">D-Star</option>
-                    <option value="nxdn">NXDN</option>
-                    <option value="ysf">YSF</option>
-                </select>
+                <select name="modulation" id="modulation"></select>
             </div>
             <div class="buttons">
                 <div class="openwebrx-button" data-action="cancel">Cancel</div>
diff --git a/htdocs/lib/BookmarkDialog.js b/htdocs/lib/BookmarkDialog.js
new file mode 100644
index 0000000..09bfa1b
--- /dev/null
+++ b/htdocs/lib/BookmarkDialog.js
@@ -0,0 +1,10 @@
+$.fn.bookmarkDialog = function() {
+    var $el = this;
+    return {
+        setModes: function(modes) {
+            $el.find('#modulation').html(modes.map(function(m) {
+                return '<option value="' + m.modulation + '">' + m.name + '</option>';
+            }).join(''));
+        }
+    }
+}
\ No newline at end of file
diff --git a/htdocs/lib/Modes.js b/htdocs/lib/Modes.js
index a33cf4f..c68466a 100644
--- a/htdocs/lib/Modes.js
+++ b/htdocs/lib/Modes.js
@@ -5,6 +5,7 @@ var Modes = {
     setModes:function(json){
         this.modes = json.map(function(m){ return new Mode(m); });
         this.updatePanels();
+        $('#openwebrx-dialog-bookmark').bookmarkDialog().setModes(this.modes);
     },
     getModes:function(){
         return this.modes;
diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index 88563e5..b7b272a 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -72,6 +72,7 @@ class CompiledAssetsController(Controller):
             "lib/Demodulator.js",
             "lib/DemodulatorPanel.js",
             "lib/BookmarkBar.js",
+            "lib/BookmarkDialog.js",
             "lib/AudioEngine.js",
             "lib/ProgressBar.js",
             "lib/Measurement.js",

From e2cacc1fa0c9666d0d22af7b05f1f1ef8ca9b530 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 3 May 2020 23:58:12 +0200
Subject: [PATCH 293/475] only available ones

---
 htdocs/lib/BookmarkDialog.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/htdocs/lib/BookmarkDialog.js b/htdocs/lib/BookmarkDialog.js
index 09bfa1b..6d2f113 100644
--- a/htdocs/lib/BookmarkDialog.js
+++ b/htdocs/lib/BookmarkDialog.js
@@ -2,7 +2,9 @@ $.fn.bookmarkDialog = function() {
     var $el = this;
     return {
         setModes: function(modes) {
-            $el.find('#modulation').html(modes.map(function(m) {
+            $el.find('#modulation').html(modes.filter(function(m){
+                return m.isAvailable();
+            }).map(function(m) {
                 return '<option value="' + m.modulation + '">' + m.name + '</option>';
             }).join(''));
         }

From efa9771ad741d28fd6eb66bf3ad72392b37b2886 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 4 May 2020 00:20:01 +0200
Subject: [PATCH 294/475] let's move some logic to the dialog

---
 htdocs/lib/BookmarkBar.js    | 22 ++++------------------
 htdocs/lib/BookmarkDialog.js | 24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/htdocs/lib/BookmarkBar.js b/htdocs/lib/BookmarkBar.js
index 653eb02..ecae43b 100644
--- a/htdocs/lib/BookmarkBar.js
+++ b/htdocs/lib/BookmarkBar.js
@@ -102,40 +102,26 @@ BookmarkBar.prototype.render = function(){
 };
 
 BookmarkBar.prototype.showEditDialog = function(bookmark) {
-    var $form = this.$dialog.find("form");
     if (!bookmark) {
         bookmark = {
             name: "",
             frequency: center_freq + this.getDemodulator().get_offset_frequency(),
-            modulation: this.getDemodulator().get_modulation()
+            modulation: this.getDemodulator().get_secondary_demod() || this.getDemodulator().get_modulation()
         }
     }
-    ['name', 'frequency', 'modulation'].forEach(function(key){
-        $form.find('#' + key).val(bookmark[key]);
-    });
-    this.$dialog.data('id', bookmark.id);
+    this.$dialog.bookmarkDialog().setValues(bookmark);
     this.$dialog.show();
     this.$dialog.find('#name').focus();
 };
 
 BookmarkBar.prototype.storeBookmark = function() {
     var me = this;
-    var bookmark = {};
-    var valid = true;
-    ['name', 'frequency', 'modulation'].forEach(function(key){
-        var $input = me.$dialog.find('#' + key);
-        valid = valid && $input[0].checkValidity();
-        bookmark[key] = $input.val();
-    });
-    if (!valid) {
-        me.$dialog.find("form :submit").click();
-        return;
-    }
+    var bookmark = this.$dialog.bookmarkDialog().getValues();
+    if (!bookmark) return;
     bookmark.frequency = Number(bookmark.frequency);
 
     var bookmarks = me.localBookmarks.getBookmarks();
 
-    bookmark.id = me.$dialog.data('id');
     if (!bookmark.id) {
         if (bookmarks.length) {
             bookmark.id = 1 + Math.max.apply(Math, bookmarks.map(function(b){ return b.id || 0; }));
diff --git a/htdocs/lib/BookmarkDialog.js b/htdocs/lib/BookmarkDialog.js
index 6d2f113..4a0a184 100644
--- a/htdocs/lib/BookmarkDialog.js
+++ b/htdocs/lib/BookmarkDialog.js
@@ -7,6 +7,30 @@ $.fn.bookmarkDialog = function() {
             }).map(function(m) {
                 return '<option value="' + m.modulation + '">' + m.name + '</option>';
             }).join(''));
+            return this;
+        },
+        setValues: function(bookmark) {
+            var $form = $el.find('form');
+            ['name', 'frequency', 'modulation'].forEach(function(key){
+                $form.find('#' + key).val(bookmark[key]);
+            });
+            $el.data('id', bookmark.id || false);
+            return this;
+        },
+        getValues: function() {
+            var bookmark = {};
+            var valid = true;
+            ['name', 'frequency', 'modulation'].forEach(function(key){
+                var $input = $el.find('#' + key);
+                valid = valid && $input[0].checkValidity();
+                bookmark[key] = $input.val();
+            });
+            if (!valid) {
+                $el.find("form :submit").click();
+                return;
+            }
+            bookmark.id = $el.data('id');
+            return bookmark;
         }
     }
 }
\ No newline at end of file

From eab3bf780e04c388c8340d4e03cc17c7e4d250bd Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 4 May 2020 20:36:17 +0200
Subject: [PATCH 295/475] fix problems with sdr device failover detection

---
 owrx/connection.py | 67 +++++++++++++++++++++++++++-------------------
 owrx/websocket.py  | 10 +++++--
 2 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index 4ac9386..a1c7c82 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -15,6 +15,7 @@ from owrx.modes import Modes, DigitalMode
 from multiprocessing import Queue
 from queue import Full
 from js8py import Js8Frame
+from abc import ABC, abstractmethod
 import json
 import threading
 
@@ -23,7 +24,7 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-class Client(object):
+class Client(ABC):
     def __init__(self, conn):
         self.conn = conn
         self.multiprocessingPipe = Queue(100)
@@ -52,6 +53,7 @@ class Client(object):
         except Full:
             self.close()
 
+    @abstractmethod
     def handleTextMessage(self, conn, message):
         pass
 
@@ -145,8 +147,12 @@ class OpenWebRxReceiverClient(Client):
                         self.startDsp()
 
                     if "params" in message:
-                        params = message["params"]
-                        self.getDsp().setProperties(params)
+                        dsp = self.getDsp()
+                        if dsp is None:
+                            logger.warning("DSP not available; discarding client data")
+                        else:
+                            params = message["params"]
+                            dsp.setProperties(params)
 
                 elif message["type"] == "config":
                     if "params" in message:
@@ -172,27 +178,38 @@ class OpenWebRxReceiverClient(Client):
             logger.warning("message is not json: {0}".format(message))
 
     def setSdr(self, id=None):
-        next = None
-        if id is not None:
-            next = SdrService.getSource(id)
-        if next is None:
-            next = SdrService.getFirstSource()
-        if next is None:
-            # exit condition: no sdrs available
-            self.handleNoSdrsAvailable()
-            return
+        while True:
+            next = None
+            if id is not None:
+                next = SdrService.getSource(id)
+            if next is None:
+                next = SdrService.getFirstSource()
+            if next is None:
+                # exit condition: no sdrs available
+                logger.warning("no more SDR devices available")
+                self.handleNoSdrsAvailable()
+                return
 
-        # exit condition: no change
-        if next == self.sdr:
-            return
+            # exit condition: no change
+            if next == self.sdr:
+                return
 
-        self.stopDsp()
+            self.stopDsp()
 
-        if self.configSub is not None:
-            self.configSub.cancel()
-            self.configSub = None
+            if self.configSub is not None:
+                self.configSub.cancel()
+                self.configSub = None
 
-        self.sdr = next
+            self.sdr = next
+
+            self.getDsp()
+
+            # found a working sdr, exit the loop
+            if self.sdr.getState() != SdrSource.STATE_FAILED:
+                break
+
+            logger.warning('SDR device "%s" has failed, selecing new device', self.sdr.getName())
+            self.write_log_message('SDR device "{0}" has failed, selecting new device'.format(self.sdr.getName()))
 
         # send initial config
         self.getDsp().setProperties(self.connectionProperties)
@@ -227,13 +244,7 @@ class OpenWebRxReceiverClient(Client):
         self.write_sdr_error("No SDR Devices available")
 
     def startDsp(self):
-        while True:
-            self.getDsp().start()
-            if self.sdr.getState() == SdrSource.STATE_FAILED:
-                self.write_log_message('SDR device "{0}" has failed, selecting new device'.format(self.sdr.getName()))
-                self.setSdr()
-            else:
-                break
+        self.getDsp().start()
 
     def close(self):
         self.stopDsp()
@@ -271,7 +282,7 @@ class OpenWebRxReceiverClient(Client):
                 pass
 
     def getDsp(self):
-        if self.dsp is None:
+        if self.dsp is None and self.sdr is not None:
             self.dsp = DspManager(self, self.sdr)
         return self.dsp
 
diff --git a/owrx/websocket.py b/owrx/websocket.py
index a5fb188..fc6462d 100644
--- a/owrx/websocket.py
+++ b/owrx/websocket.py
@@ -199,9 +199,15 @@ class WebSocketConnection(object):
                             data = bytes([b ^ masking_key[index % 4] for (index, b) in enumerate(data)])
                         if opcode == OPCODE_TEXT_MESSAGE:
                             message = data.decode("utf-8")
-                            self.messageHandler.handleTextMessage(self, message)
+                            try:
+                                self.messageHandler.handleTextMessage(self, message)
+                            except Exception:
+                                logger.exception("Exception in websocket handler handleTextMessage()")
                         elif opcode == OPCODE_BINARY_MESSAGE:
-                            self.messageHandler.handleBinaryMessage(self, data)
+                            try:
+                                self.messageHandler.handleBinaryMessage(self, data)
+                            except Exception:
+                                logger.exception("Exception in websocket handler handleBinaryMessage()")
                         elif opcode == OPCODE_PING:
                             self.sendPong()
                         elif opcode == OPCODE_PONG:

From 66a4f299116e6e23344e87477319ba73f2ecd0b6 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 6 May 2020 19:54:55 +0200
Subject: [PATCH 296/475] let's try pre-loading the pipes to improve dsp
 initialization

---
 csdr/csdr.py | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 57cd5cb..9d23978 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -639,8 +639,7 @@ class dsp(object):
     def set_offset_freq(self, offset_freq):
         self.offset_freq = offset_freq
         if self.running:
-            with self.modification_lock:
-                self.pipes["shift_pipe"].write("%g\n" % (-float(self.offset_freq) / self.samp_rate))
+            self.pipes["shift_pipe"].write("%g\n" % (-float(self.offset_freq) / self.samp_rate))
 
     def set_center_freq(self, center_freq):
         # dsp only needs to know this to be able to pass it to decoders in the form of get_operating_freq()
@@ -653,10 +652,9 @@ class dsp(object):
         self.low_cut = low_cut
         self.high_cut = high_cut
         if self.running:
-            with self.modification_lock:
-                self.pipes["bpf_pipe"].write(
-                    "%g %g\n" % (float(self.low_cut) / self.if_samp_rate(), float(self.high_cut) / self.if_samp_rate())
-                )
+            self.pipes["bpf_pipe"].write(
+                "%g %g\n" % (float(self.low_cut) / self.if_samp_rate(), float(self.high_cut) / self.if_samp_rate())
+            )
 
     def get_bpf(self):
         return [self.low_cut, self.high_cut]
@@ -669,8 +667,7 @@ class dsp(object):
         # no squelch required on digital voice modes
         actual_squelch = -150 if self.isDigitalVoice() or self.isPacket() or self.isPocsag() else self.squelch_level
         if self.running:
-            with self.modification_lock:
-                self.pipes["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch)))
+            self.pipes["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch)))
 
     def set_unvoiced_quality(self, q):
         self.unvoiced_quality = q
@@ -743,6 +740,16 @@ class dsp(object):
             # create control pipes for csdr
             self.try_create_pipes(self.pipe_names, command_base)
 
+            # send initial config through the pipes
+            if self.has_pipe("bpf_pipe"):
+                self.set_bpf(self.low_cut, self.high_cut)
+            if self.has_pipe("shift_pipe"):
+                self.set_offset_freq(self.offset_freq)
+            if self.has_pipe("squelch_pipe"):
+                self.set_squelch_level(self.squelch_level)
+            if self.has_pipe("dmr_control_pipe"):
+                self.set_dmr_filter(3)
+
             # run the command
             command = command_base.format(
                 bpf_pipe=self.pipes["bpf_pipe"],
@@ -799,16 +806,6 @@ class dsp(object):
 
             self.start_secondary_demodulator()
 
-        # send initial config through the pipes
-        if self.has_pipe("bpf_pipe"):
-            self.set_bpf(self.low_cut, self.high_cut)
-        if self.has_pipe("shift_pipe"):
-            self.set_offset_freq(self.offset_freq)
-        if self.has_pipe("squelch_pipe"):
-            self.set_squelch_level(self.squelch_level)
-        if self.has_pipe("dmr_control_pipe"):
-            self.set_dmr_filter(3)
-
         if self.has_pipe("smeter_pipe"):
             def read_smeter():
                 raw = self.pipes["smeter_pipe"].readline()

From 7fbd024ed5ba5eec3d7f2c1ae1ea62ee5cb652e7 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 6 May 2020 22:52:48 +0200
Subject: [PATCH 297/475] fix sql=0 parameter

---
 htdocs/lib/DemodulatorPanel.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index bab7c02..a0506a1 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -212,7 +212,7 @@ DemodulatorPanel.prototype.transformHashParams = function(params) {
         mod: params.secondary_mod || params.mod
     };
     if (params.offset_frequency) ret.offset_frequency = params.offset_frequency;
-    if (params.sql) ret.squelch_level = parseInt(params.sql);
+    if (typeof(params.sql) !== 'undefined') ret.squelch_level = parseInt(params.sql);
     return ret;
 };
 
@@ -299,7 +299,7 @@ DemodulatorPanel.prototype.updateHash = function() {
         secondary_mod: demod.get_secondary_demod(),
         sql: demod.getSquelch(),
     }, function(value, key){
-        if (!value) return undefined;
+        if (typeof(value) === 'undefined') return undefined;
         return key + '=' + value;
     }).filter(function(v) {
         return !!v;

From ceafcbf8506d336cedfa3f3e48f814eca0928523 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 6 May 2020 23:00:57 +0200
Subject: [PATCH 298/475] fix secondary demod being false

---
 htdocs/lib/DemodulatorPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index a0506a1..40894e2 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -299,7 +299,7 @@ DemodulatorPanel.prototype.updateHash = function() {
         secondary_mod: demod.get_secondary_demod(),
         sql: demod.getSquelch(),
     }, function(value, key){
-        if (typeof(value) === 'undefined') return undefined;
+        if (typeof(value) === 'undefined' || value === false) return undefined;
         return key + '=' + value;
     }).filter(function(v) {
         return !!v;

From fc7188145b1a828c22e9e315480cc99efa5e0f9d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 8 May 2020 21:18:03 +0200
Subject: [PATCH 299/475] use jquery to store progressbar objects

---
 htdocs/index.html         | 12 ++++++------
 htdocs/lib/ProgressBar.js | 31 +++++++++++++++++++++++++++----
 htdocs/openwebrx.js       | 30 ++++++++++--------------------
 3 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 6c1def2..9f899ae 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -134,12 +134,12 @@
                 </div>
             </div>
             <div class="openwebrx-panel" id="openwebrx-panel-status" data-panel-name="status" style="width: 615px;" data-panel-transparent="true">
-                <div class="openwebrx-progressbar" id="openwebrx-bar-audio-buffer"> <span class="openwebrx-progressbar-text">Audio buffer [0 ms]</span><div class="openwebrx-progressbar-bar"></div></div>
-                <div class="openwebrx-progressbar" id="openwebrx-bar-audio-output"> <span class="openwebrx-progressbar-text">Audio output [0 sps]</span><div class="openwebrx-progressbar-bar"></div></div>
-                <div class="openwebrx-progressbar" id="openwebrx-bar-audio-speed"> <span class="openwebrx-progressbar-text">Audio stream [0 kbps]</span><div class="openwebrx-progressbar-bar"></div></div>
-                <div class="openwebrx-progressbar" id="openwebrx-bar-network-speed"> <span class="openwebrx-progressbar-text">Network usage [0 kbps]</span><div class="openwebrx-progressbar-bar"></div></div>
-                <div class="openwebrx-progressbar" id="openwebrx-bar-server-cpu"> <span class="openwebrx-progressbar-text">Server CPU [0%]</span><div class="openwebrx-progressbar-bar"></div></div>
-                <div class="openwebrx-progressbar" id="openwebrx-bar-clients"> <span class="openwebrx-progressbar-text">Clients [1]</span><div class="openwebrx-progressbar-bar"></div></div>
+                <div class="openwebrx-progressbar" id="openwebrx-bar-audio-buffer" data-type="audiobuffer"> <span class="openwebrx-progressbar-text">Audio buffer [0 ms]</span><div class="openwebrx-progressbar-bar"></div></div>
+                <div class="openwebrx-progressbar" id="openwebrx-bar-audio-output" data-type="audiooutput"> <span class="openwebrx-progressbar-text">Audio output [0 sps]</span><div class="openwebrx-progressbar-bar"></div></div>
+                <div class="openwebrx-progressbar" id="openwebrx-bar-audio-speed" data-type="audiospeed"> <span class="openwebrx-progressbar-text">Audio stream [0 kbps]</span><div class="openwebrx-progressbar-bar"></div></div>
+                <div class="openwebrx-progressbar" id="openwebrx-bar-network-speed" data-type="networkspeed"> <span class="openwebrx-progressbar-text">Network usage [0 kbps]</span><div class="openwebrx-progressbar-bar"></div></div>
+                <div class="openwebrx-progressbar" id="openwebrx-bar-server-cpu" data-type="cpu"> <span class="openwebrx-progressbar-text">Server CPU [0%]</span><div class="openwebrx-progressbar-bar"></div></div>
+                <div class="openwebrx-progressbar" id="openwebrx-bar-clients" data-type="clients"> <span class="openwebrx-progressbar-text">Clients [1]</span><div class="openwebrx-progressbar-bar"></div></div>
             </div>
         </div>
         <div id="openwebrx-panels-container-right">
diff --git a/htdocs/lib/ProgressBar.js b/htdocs/lib/ProgressBar.js
index 9d0736d..0019dc6 100644
--- a/htdocs/lib/ProgressBar.js
+++ b/htdocs/lib/ProgressBar.js
@@ -25,13 +25,16 @@ ProgressBar.prototype.setOver = function(over) {
     this.$innerBar.css('backgroundColor', (over) ? "#ff6262" : "#00aba6");
 };
 
-AudioBufferProgressBar = function(el, sampleRate) {
+AudioBufferProgressBar = function(el) {
     ProgressBar.call(this, el);
-    this.sampleRate = sampleRate;
 };
 
 AudioBufferProgressBar.prototype = new ProgressBar();
 
+AudioBufferProgressBar.prototype.setSampleRate = function(sampleRate) {
+    this.sampleRate = sampleRate;
+};
+
 AudioBufferProgressBar.prototype.setBuffersize = function(buffersize) {
     var audio_buffer_value = buffersize / this.sampleRate;
     var overrun = audio_buffer_value > audio_buffer_maximal_length_sec;
@@ -70,12 +73,15 @@ AudioSpeedProgressBar.prototype.setSpeed = function(speed) {
 
 AudioOutputProgressBar = function(el, sampleRate) {
     ProgressBar.call(this, el);
-    this.maxRate = sampleRate * 1.25;
-    this.minRate = sampleRate * .25;
 };
 
 AudioOutputProgressBar.prototype = new ProgressBar();
 
+AudioOutputProgressBar.prototype.setSampleRate = function(sampleRate) {
+    this.maxRate = sampleRate * 1.25;
+    this.minRate = sampleRate * .25;
+};
+
 AudioOutputProgressBar.prototype.setAudioRate = function(audioRate) {
     this.set(audioRate / this.maxRate, "Audio output [" + (audioRate / 1000).toFixed(1) + " ksps]", audioRate > this.maxRate || audioRate < this.minRate);
 };
@@ -111,3 +117,20 @@ CpuProgressBar.prototype = new ProgressBar();
 CpuProgressBar.prototype.setUsage = function(usage) {
     this.set(usage, "Server CPU [" + Math.round(usage * 100) + "%]", usage > .85);
 };
+
+ProgressBar.types = {
+    cpu: CpuProgressBar,
+    audiobuffer: AudioBufferProgressBar,
+    audiospeed: AudioSpeedProgressBar,
+    audiooutput: AudioOutputProgressBar,
+    clients: ClientsProgressBar,
+    networkspeed: NetworkSpeedProgressBar
+}
+
+$.fn.progressbar = function() {
+    if (!this.data('progressbar')) {
+        var constructor = ProgressBar.types[this.data('type')] || ProgressBar;
+        this.data('progressbar', new constructor(this));
+    }
+    return this.data('progressbar');
+};
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 7b32731..4238ad6 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -739,7 +739,7 @@ function on_ws_recv(evt) {
                         divlog("Audio stream is " + ((audio_compression === "adpcm") ? "compressed" : "uncompressed") + ".");
                         fft_compression = config['fft_compression'];
                         divlog("FFT stream is " + ((fft_compression === "adpcm") ? "compressed" : "uncompressed") + ".");
-                        clientProgressBar.setMaxClients(config['max_clients']);
+                        $('#openwebrx-bar-clients').progressbar().setMaxClients(config['max_clients']);
 
                         waterfall_init();
                         var demodulatorPanel = $('#openwebrx-panel-receiver').demodulatorPanel();
@@ -773,10 +773,10 @@ function on_ws_recv(evt) {
                         setSmeterAbsoluteValue(smeter_level);
                         break;
                     case "cpuusage":
-                        cpuProgressBar.setUsage(json['value']);
+                        $('#openwebrx-bar-server-cpu').progressbar().setUsage(json['value']);
                         break;
                     case "clients":
-                        clientProgressBar.setClients(json['value']);
+                        $('#openwebrx-bar-clients').progressbar().setClients(json['value']);
                         break;
                     case "profiles":
                         var listbox = e("openwebrx-sdr-profiles-listbox");
@@ -1121,7 +1121,7 @@ function on_ws_opened() {
     if (!networkSpeedMeasurement) {
         networkSpeedMeasurement = new Measurement();
         networkSpeedMeasurement.report(60000, 1000, function(rate){
-            networkSpeedProgressBar.setSpeed(rate);
+            $('#openwebrx-bar-network-speed').progressbar().setSpeed(rate);
         });
     } else {
         networkSpeedMeasurement.reset();
@@ -1352,33 +1352,23 @@ function init_header() {
     });
 }
 
-var audioBufferProgressBar;
-var networkSpeedProgressBar;
-var audioSpeedProgressBar;
-var audioOutputProgressBar;
-var clientProgressBar;
-var cpuProgressBar;
-
 function initProgressBars() {
-    audioBufferProgressBar = new AudioBufferProgressBar($('#openwebrx-bar-audio-buffer'), audioEngine.getSampleRate());
-    networkSpeedProgressBar = new NetworkSpeedProgressBar($('#openwebrx-bar-network-speed'));
-    audioSpeedProgressBar = new AudioSpeedProgressBar($('#openwebrx-bar-audio-speed'));
-    audioOutputProgressBar = new AudioOutputProgressBar($('#openwebrx-bar-audio-output'), audioEngine.getSampleRate());
-    clientProgressBar = new ClientsProgressBar($('#openwebrx-bar-clients'));
-    cpuProgressBar = new CpuProgressBar($('#openwebrx-bar-server-cpu'));
+    $('#openwebrx-bar-audio-buffer, #openwebrx-bar-audio-output').each(function() {
+        $(this).progressbar().setSampleRate(audioEngine.getSampleRate());
+    });
 }
 
 function audioReporter(stats) {
     if (typeof(stats.buffersize) !== 'undefined') {
-        audioBufferProgressBar.setBuffersize(stats.buffersize);
+         $('#openwebrx-bar-audio-buffer').progressbar().setBuffersize(stats.buffersize);
     }
 
     if (typeof(stats.audioByteRate) !== 'undefined') {
-        audioSpeedProgressBar.setSpeed(stats.audioByteRate * 8);
+        $('#openwebrx-bar-audio-speed').progressbar().setSpeed(stats.audioByteRate * 8);
     }
 
     if (typeof(stats.audioRate) !== 'undefined') {
-        audioOutputProgressBar.setAudioRate(stats.audioRate);
+        $('#openwebrx-bar-audio-output').progressbar().setAudioRate(stats.audioRate);
     }
 }
 

From 9563adacf72c02c011b13e0d64828a7663722cca Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 8 May 2020 21:35:45 +0200
Subject: [PATCH 300/475] more jquery magic for progressbars

---
 htdocs/index.html         | 12 ++++++------
 htdocs/lib/ProgressBar.js | 33 +++++++++++++++++++++++++++++++--
 htdocs/openwebrx.js       |  9 ++++++---
 3 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 9f899ae..1290402 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -134,12 +134,12 @@
                 </div>
             </div>
             <div class="openwebrx-panel" id="openwebrx-panel-status" data-panel-name="status" style="width: 615px;" data-panel-transparent="true">
-                <div class="openwebrx-progressbar" id="openwebrx-bar-audio-buffer" data-type="audiobuffer"> <span class="openwebrx-progressbar-text">Audio buffer [0 ms]</span><div class="openwebrx-progressbar-bar"></div></div>
-                <div class="openwebrx-progressbar" id="openwebrx-bar-audio-output" data-type="audiooutput"> <span class="openwebrx-progressbar-text">Audio output [0 sps]</span><div class="openwebrx-progressbar-bar"></div></div>
-                <div class="openwebrx-progressbar" id="openwebrx-bar-audio-speed" data-type="audiospeed"> <span class="openwebrx-progressbar-text">Audio stream [0 kbps]</span><div class="openwebrx-progressbar-bar"></div></div>
-                <div class="openwebrx-progressbar" id="openwebrx-bar-network-speed" data-type="networkspeed"> <span class="openwebrx-progressbar-text">Network usage [0 kbps]</span><div class="openwebrx-progressbar-bar"></div></div>
-                <div class="openwebrx-progressbar" id="openwebrx-bar-server-cpu" data-type="cpu"> <span class="openwebrx-progressbar-text">Server CPU [0%]</span><div class="openwebrx-progressbar-bar"></div></div>
-                <div class="openwebrx-progressbar" id="openwebrx-bar-clients" data-type="clients"> <span class="openwebrx-progressbar-text">Clients [1]</span><div class="openwebrx-progressbar-bar"></div></div>
+                <div class="openwebrx-progressbar" id="openwebrx-bar-audio-buffer" data-type="audiobuffer"></div>
+                <div class="openwebrx-progressbar" id="openwebrx-bar-audio-output" data-type="audiooutput"></div>
+                <div class="openwebrx-progressbar" id="openwebrx-bar-audio-speed" data-type="audiospeed"></div>
+                <div class="openwebrx-progressbar" id="openwebrx-bar-network-speed" data-type="networkspeed"></div>
+                <div class="openwebrx-progressbar" id="openwebrx-bar-server-cpu" data-type="cpu"></div>
+                <div class="openwebrx-progressbar" id="openwebrx-bar-clients" data-type="clients"></div>
             </div>
         </div>
         <div id="openwebrx-panels-container-right">
diff --git a/htdocs/lib/ProgressBar.js b/htdocs/lib/ProgressBar.js
index 0019dc6..59d3a91 100644
--- a/htdocs/lib/ProgressBar.js
+++ b/htdocs/lib/ProgressBar.js
@@ -1,10 +1,15 @@
 ProgressBar = function(el) {
     this.$el = $(el);
-    this.$innerText = this.$el.find('.openwebrx-progressbar-text');
-    this.$innerBar = this.$el.find('.openwebrx-progressbar-bar');
+    this.$innerText = $('<span class="openwebrx-progressbar-text">' + this.getDefaultText() + '</span>');
+    this.$innerBar = $('<div class="openwebrx-progressbar-bar"></div>');
+    this.$el.empty().append(this.$innerText, this.$innerBar);
     this.$innerBar.css('width', '0%');
 };
 
+ProgressBar.prototype.getDefaultText = function() {
+    return '';
+}
+
 ProgressBar.prototype.set = function(val, text, over) {
     this.setValue(val);
     this.setText(text);
@@ -31,6 +36,10 @@ AudioBufferProgressBar = function(el) {
 
 AudioBufferProgressBar.prototype = new ProgressBar();
 
+AudioBufferProgressBar.prototype.getDefaultText = function() {
+    return 'Audio buffer [0 ms]';
+};
+
 AudioBufferProgressBar.prototype.setSampleRate = function(sampleRate) {
     this.sampleRate = sampleRate;
 };
@@ -56,6 +65,10 @@ NetworkSpeedProgressBar = function(el) {
 
 NetworkSpeedProgressBar.prototype = new ProgressBar();
 
+NetworkSpeedProgressBar.prototype.getDefaultText = function() {
+    return 'Network usage [0 kbps]';
+};
+
 NetworkSpeedProgressBar.prototype.setSpeed = function(speed) {
     var speedInKilobits = speed * 8 / 1000;
     this.set(speedInKilobits / 2000, "Network usage [" + speedInKilobits.toFixed(1) + " kbps]", false);
@@ -67,6 +80,10 @@ AudioSpeedProgressBar = function(el) {
 
 AudioSpeedProgressBar.prototype = new ProgressBar();
 
+AudioSpeedProgressBar.prototype.getDefaultText = function() {
+    return 'Audio stream [0 kbps]';
+};
+
 AudioSpeedProgressBar.prototype.setSpeed = function(speed) {
     this.set(speed / 500000, "Audio stream [" + (speed / 1000).toFixed(0) + " kbps]", false);
 };
@@ -77,6 +94,10 @@ AudioOutputProgressBar = function(el, sampleRate) {
 
 AudioOutputProgressBar.prototype = new ProgressBar();
 
+AudioOutputProgressBar.prototype.getDefaultText = function() {
+    return 'Audio output [0 sps]';
+};
+
 AudioOutputProgressBar.prototype.setSampleRate = function(sampleRate) {
     this.maxRate = sampleRate * 1.25;
     this.minRate = sampleRate * .25;
@@ -94,6 +115,10 @@ ClientsProgressBar = function(el) {
 
 ClientsProgressBar.prototype = new ProgressBar();
 
+ClientsProgressBar.prototype.getDefaultText = function() {
+    return 'Clients [1]';
+};
+
 ClientsProgressBar.prototype.setClients = function(clients) {
     this.clients = clients;
     this.render();
@@ -114,6 +139,10 @@ CpuProgressBar = function(el) {
 
 CpuProgressBar.prototype = new ProgressBar();
 
+CpuProgressBar.prototype.getDefaultText = function() {
+    return 'Server CPU [0%]';
+};
+
 CpuProgressBar.prototype.setUsage = function(usage) {
     this.set(usage, "Server CPU [" + Math.round(usage * 100) + "%]", usage > .85);
 };
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 4238ad6..8f2ca79 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1353,9 +1353,12 @@ function init_header() {
 }
 
 function initProgressBars() {
-    $('#openwebrx-bar-audio-buffer, #openwebrx-bar-audio-output').each(function() {
-        $(this).progressbar().setSampleRate(audioEngine.getSampleRate());
-    });
+    $(".openwebrx-progressbar").each(function(){
+        var bar = $(this).progressbar();
+        if ('setSampleRate' in bar) {
+            bar.setSampleRate(audioEngine.getSampleRate());
+        }
+    })
 }
 
 function audioReporter(stats) {

From af1cfee754dfaa6fffbdf176d03147b8a532cf12 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 8 May 2020 22:56:02 +0200
Subject: [PATCH 301/475] allow switching underlying modulation (if available)
 refs #95

---
 htdocs/lib/DemodulatorPanel.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index 40894e2..6670c73 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -86,8 +86,8 @@ DemodulatorPanel.prototype.render = function() {
     this.el.find(".openwebrx-modes").html(html);
 };
 
-DemodulatorPanel.prototype.setMode = function(modulation) {
-    var mode = Modes.findByModulation(modulation);
+DemodulatorPanel.prototype.setMode = function(requestedModulation) {
+    var mode = Modes.findByModulation(requestedModulation);
     if (!mode) {
         return;
     }
@@ -101,6 +101,14 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
 
     if (mode.type === 'digimode') {
         modulation = mode.underlying[0];
+    } else {
+        if (this.mode && this.mode.type === 'digimode' && this.mode.underlying.indexOf(requestedModulation) >= 0) {
+            // keep the mode, just switch underlying modulation
+            mode = this.mode;
+            modulation = requestedModulation;
+        } else {
+            modulation = mode.modulation;
+        }
     }
 
     var current = this.collectParams();
@@ -112,6 +120,7 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
     this.stopDemodulator();
     this.demodulator = new Demodulator(current.offset_frequency, modulation);
     this.demodulator.setSquelch(current.squelch_level);
+
     var self = this;
     var updateFrequency = function(freq) {
         self.tuneableFrequencyDisplay.setFrequency(self.center_freq + freq);
@@ -144,6 +153,8 @@ DemodulatorPanel.prototype.setMode = function(modulation) {
 };
 
 DemodulatorPanel.prototype.disableDigiMode = function() {
+    // just a little trick to get out of the digimode
+    delete this.mode;
     this.setMode(this.getDemodulator().get_modulation());
 };
 

From 1f565355eca3463d9840c42fc5e7e2d6b2de10a7 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 8 May 2020 23:34:34 +0200
Subject: [PATCH 302/475] change available mode highlighting, refs #95

---
 htdocs/css/openwebrx.css       |  4 ++--
 htdocs/lib/DemodulatorPanel.js | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index dbc0f14..fd81097 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -453,8 +453,8 @@ input[type=range]:disabled {
 	margin-right: 5px;
 }
 
-.openwebrx-demodulator-button.disabled {
-    color: #B6B6B6;
+.openwebrx-demodulator-button.same-mod {
+    color: #FFC;
 }
 
 .openwebrx-square-button img
diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index 6670c73..bfd3619 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -233,7 +233,7 @@ DemodulatorPanel.prototype.squelchAvailable = function () {
 
 DemodulatorPanel.prototype.updateButtons = function() {
     var $buttons = this.el.find(".openwebrx-demodulator-button");
-    $buttons.removeClass("highlighted").removeClass('disabled');
+    $buttons.removeClass("highlighted").removeClass('same-mod');
     var demod = this.getDemodulator()
     if (!demod) return;
     this.el.find('[data-modulation=' + demod.get_modulation() + ']').addClass("highlighted");
@@ -243,10 +243,12 @@ DemodulatorPanel.prototype.updateButtons = function() {
         this.el.find('.openwebrx-secondary-demod-listbox').val(secondary_demod);
         var mode = Modes.findByModulation(secondary_demod);
         if (mode) {
-            $buttons.filter(function(){
-                var mod = $(this).data('modulation');
-                return mod && mode.underlying.indexOf(mod) < 0;
-            }).addClass('disabled');
+            var self = this;
+            mode.underlying.filter(function(m) {
+                return m !== demod.get_modulation();
+            }).forEach(function(m) {
+                self.el.find('[data-modulation=' + m + ']').addClass('same-mod')
+            });
         }
     } else {
         this.el.find('.openwebrx-secondary-demod-listbox').val('none');

From dba4f91c7712cf5b89cf0a3d2b83f39c9352d05d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 8 May 2020 23:49:02 +0200
Subject: [PATCH 303/475] include homepage

---
 htdocs/index.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 1290402..22f33bb 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -127,7 +127,10 @@
                 <div class="openwebrx-panel-inner nano" id="openwebrx-log-scroll">
                     <div class="nano-content">
                         <div id="openwebrx-client-log-title">OpenWebRX client log</div>
-                        <div>Author contact: <a href="http://www.justjakob.de/" target="_blank">Jakob Ketterl, DD5JFK</a></div>
+                        <div>
+                            Author contact: <a href="http://www.justjakob.de/" target="_blank">Jakob Ketterl, DD5JFK</a> |
+                            <a href="https://www.openwebrx.de" target="_blank">OpenWebRX homepage</a>
+                        </div>
                         <div>Support and information: <a href="https://groups.io/g/openwebrx" target="_blank">Groups.io Mailinglist</a></div>
                         <div id="openwebrx-debugdiv"></div>
                     </div>

From f2288ceb4938c5638abcdc3cbdfb014b349496da Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 8 May 2020 23:53:50 +0200
Subject: [PATCH 304/475] let's work with frame targets

---
 htdocs/include/header.include.html | 2 +-
 htdocs/openwebrx.js                | 6 +++---
 owrx/controllers/template.py       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/include/header.include.html b/htdocs/include/header.include.html
index c86977c..aa2275a 100644
--- a/htdocs/include/header.include.html
+++ b/htdocs/include/header.include.html
@@ -16,7 +16,7 @@
                 <div class="button" data-toggle-panel="openwebrx-panel-status"><img src="static/gfx/openwebrx-panel-status.png" /><br/>Status</div>
                 <div class="button" data-toggle-panel="openwebrx-panel-log"><img  src="static/gfx/openwebrx-panel-log.png" /><br/>Log</div>
                 <div class="button" data-toggle-panel="openwebrx-panel-receiver"><img src="static/gfx/openwebrx-panel-receiver.png" /><br/>Receiver</div>
-                <a class="button" href="map" target="_blank"><img src="static/gfx/openwebrx-panel-map.png" /><br/>Map</a>
+                <a class="button" href="map" target="openwebrx-map"><img src="static/gfx/openwebrx-panel-map.png" /><br/>Map</a>
                 ${settingslink}
             </section>
         </div>
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 8f2ca79..0fa62cd 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -975,14 +975,14 @@ function update_wsjt_panel(msg) {
     if (['FT8', 'JT65', 'JT9', 'FT4'].indexOf(msg['mode']) >= 0) {
         matches = linkedmsg.match(/(.*\s[A-Z0-9]+\s)([A-R]{2}[0-9]{2})$/);
         if (matches && matches[2] !== 'RR73') {
-            linkedmsg = html_escape(matches[1]) + '<a href="map?locator=' + matches[2] + '" target="_blank">' + matches[2] + '</a>';
+            linkedmsg = html_escape(matches[1]) + '<a href="map?locator=' + matches[2] + '" target="openwebrx-map">' + matches[2] + '</a>';
         } else {
             linkedmsg = html_escape(linkedmsg);
         }
     } else if (msg['mode'] === 'WSPR') {
         matches = linkedmsg.match(/([A-Z0-9]*\s)([A-R]{2}[0-9]{2})(\s[0-9]+)/);
         if (matches) {
-            linkedmsg = html_escape(matches[1]) + '<a href="map?locator=' + matches[2] + '" target="_blank">' + matches[2] + '</a>' + html_escape(matches[3]);
+            linkedmsg = html_escape(matches[1]) + '<a href="map?locator=' + matches[2] + '" target="openwebrx-map">' + matches[2] + '</a>' + html_escape(matches[3]);
         } else {
             linkedmsg = html_escape(linkedmsg);
         }
@@ -1068,7 +1068,7 @@ function update_packet_panel(msg) {
         'style="' + stylesToString(styles) + '"'
     ].join(' ');
     if (msg.lat && msg.lon) {
-        link = '<a ' + attrs + ' href="map?callsign=' + source + '" target="_blank">' + overlay + '</a>';
+        link = '<a ' + attrs + ' href="map?callsign=' + source + '" target="openwebrx-map">' + overlay + '</a>';
     } else {
         link = '<div ' + attrs + '>' + overlay + '</div>'
     }
diff --git a/owrx/controllers/template.py b/owrx/controllers/template.py
index 6030fd1..23c1d17 100644
--- a/owrx/controllers/template.py
+++ b/owrx/controllers/template.py
@@ -23,7 +23,7 @@ class WebpageController(TemplateController):
         settingslink = ""
         pm = Config.get()
         if "webadmin_enabled" in pm and pm["webadmin_enabled"]:
-            settingslink = """<a class="button" href="settings" target="_blank"><img src="static/gfx/openwebrx-panel-settings.png" /><br/>Settings</a>"""
+            settingslink = """<a class="button" href="settings" target="openwebrx-settings"><img src="static/gfx/openwebrx-panel-settings.png" /><br/>Settings</a>"""
         header = self.render_template("include/header.include.html", settingslink=settingslink)
         return {"header": header}
 

From 3a455a0452afe6ee1e806023aeb9f16e1a97f416 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 9 May 2020 00:11:20 +0200
Subject: [PATCH 305/475] start collecting header routines

---
 htdocs/lib/Header.js       | 22 ++++++++++++++++++++++
 htdocs/openwebrx.js        | 15 ++-------------
 owrx/controllers/assets.py |  1 +
 3 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 htdocs/lib/Header.js

diff --git a/htdocs/lib/Header.js b/htdocs/lib/Header.js
new file mode 100644
index 0000000..aec4ab7
--- /dev/null
+++ b/htdocs/lib/Header.js
@@ -0,0 +1,22 @@
+function Header(el) {
+    this.el = el;
+
+    this.el.find('#openwebrx-main-buttons').find('[data-toggle-panel]').click(function () {
+        toggle_panel($(this).data('toggle-panel'));
+    });
+};
+
+Header.prototype.setDetails = function(details) {
+    this.el.find('#webrx-rx-title').html(details['receiver_name']);
+    var query = encodeURIComponent(details['receiver_gps']['lat'] + ',' + details['receiver_gps']['lon']);
+    this.el.find('#webrx-rx-desc').html(details['receiver_location'] + ' | Loc: ' + details['locator'] + ', ASL: ' + details['receiver_asl'] + ' m, <a href="https://www.google.com/maps/search/?api=1&query=' + query + '" target="_blank" onclick="dont_toggle_rx_photo();">[maps]</a>');
+    this.el.find('#webrx-rx-photo-title').html(details['photo_title']);
+    this.el.find('#webrx-rx-photo-desc').html(details['photo_desc']);
+};
+
+$.fn.header = function() {
+    if (!this.data('header')) {
+        this.data('header', new Header(this));
+    }
+    return this.data('header');
+};
\ No newline at end of file
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 0fa62cd..fb5586d 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -761,12 +761,7 @@ function on_ws_recv(evt) {
                         secondary_demod_init_canvases();
                         break;
                     case "receiver_details":
-                        var r = json['value'];
-                        e('webrx-rx-title').innerHTML = r['receiver_name'];
-                        var query = encodeURIComponent(r['receiver_gps']['lat'] + ',' + r['receiver_gps']['lon']);
-                        e('webrx-rx-desc').innerHTML = r['receiver_location'] + ' | Loc: ' + r['locator'] + ', ASL: ' + r['receiver_asl'] + ' m, <a href="https://www.google.com/maps/search/?api=1&query=' + query + '" target="_blank" onclick="dont_toggle_rx_photo();">[maps]</a>';
-                        e('webrx-rx-photo-title').innerHTML = r['photo_title'];
-                        e('webrx-rx-photo-desc').innerHTML = r['photo_desc'];
+                        $('#webrx-top-container').header().setDetails(json['value']);
                         break;
                     case "smeter":
                         smeter_level = json['value'];
@@ -1346,12 +1341,6 @@ function openwebrx_resize() {
     resize_scale();
 }
 
-function init_header() {
-    $('#openwebrx-main-buttons').find('[data-toggle-panel]').click(function () {
-        toggle_panel($(this).data('toggle-panel'));
-    });
-}
-
 function initProgressBars() {
     $(".openwebrx-progressbar").each(function(){
         var bar = $(this).progressbar();
@@ -1397,7 +1386,7 @@ function openwebrx_init() {
     $('.webrx-mouse-freq').frequencyDisplay();
     $('#openwebrx-panel-receiver').demodulatorPanel();
     window.addEventListener("resize", openwebrx_resize);
-    init_header();
+    $('#webrx-top-container').header();
     bookmarks = new BookmarkBar();
     initSliders();
 }
diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index b7b272a..f0bf6ac 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -69,6 +69,7 @@ class CompiledAssetsController(Controller):
             "openwebrx.js",
             "lib/jquery-3.2.1.min.js",
             "lib/jquery.nanoscroller.js",
+            "lib/Header.js",
             "lib/Demodulator.js",
             "lib/DemodulatorPanel.js",
             "lib/BookmarkBar.js",

From 3202f48f8e081090651fade75b9316b33c9e25df Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 9 May 2020 00:20:38 +0200
Subject: [PATCH 306/475] header details on map, too

---
 htdocs/map.html    |  1 +
 htdocs/map.js      |  5 +++++
 owrx/connection.py | 55 ++++++++++++++++++++++++----------------------
 3 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/htdocs/map.html b/htdocs/map.html
index 23aabeb..dbfd13d 100644
--- a/htdocs/map.html
+++ b/htdocs/map.html
@@ -7,6 +7,7 @@
     <script src="static/lib/chroma.min.js"></script>
     <script src="static/map.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
+    <script src="static/lib/Header.js"></script>
     <link rel="stylesheet" type="text/css" href="static/css/map.css" />
     <meta charset="utf-8">
 </head>
diff --git a/htdocs/map.js b/htdocs/map.js
index 948e83b..339d1d5 100644
--- a/htdocs/map.js
+++ b/htdocs/map.js
@@ -250,6 +250,11 @@
                     case "update":
                         processUpdates(json.value);
                     break;
+                    case 'receiver_details':
+                        $('#webrx-top-container').header().setDetails(json['value']);
+                    break;
+                    default:
+                        console.warn('received message of unknown type: ' + json['type']);
                 }
             } catch (e) {
                 // don't lose exception
diff --git a/owrx/connection.py b/owrx/connection.py
index a1c7c82..14620fe 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -15,7 +15,7 @@ from owrx.modes import Modes, DigitalMode
 from multiprocessing import Queue
 from queue import Full
 from js8py import Js8Frame
-from abc import ABC, abstractmethod
+from abc import ABC, ABCMeta, abstractmethod
 import json
 import threading
 
@@ -64,7 +64,33 @@ class Client(ABC):
         self.close()
 
 
-class OpenWebRxReceiverClient(Client):
+class OpenWebRxClient(Client, metaclass=ABCMeta):
+    def __init__(self, conn):
+        super().__init__(conn)
+
+        receiver_details = Config.get().filter(
+            "receiver_name",
+            "receiver_location",
+            "receiver_asl",
+            "receiver_gps",
+            "photo_title",
+            "photo_desc",
+        )
+
+        def send_receiver_info(*args):
+            receiver_info = receiver_details.__dict__()
+            receiver_info["locator"] = Locator.fromCoordinates(receiver_info["receiver_gps"])
+            self.write_receiver_details(receiver_info)
+
+        # TODO unsubscribe
+        receiver_details.wire(send_receiver_info)
+        send_receiver_info()
+
+    def write_receiver_details(self, details):
+        self.send({"type": "receiver_details", "value": details})
+
+
+class OpenWebRxReceiverClient(OpenWebRxClient):
     config_keys = [
         "waterfall_colors",
         "waterfall_min_level",
@@ -97,34 +123,14 @@ class OpenWebRxReceiverClient(Client):
             self.close()
             raise
 
-        pm = Config.get()
-
         self.setSdr()
 
-        receiver_details = pm.filter(
-            "receiver_name",
-            "receiver_location",
-            "receiver_asl",
-            "receiver_gps",
-            "photo_title",
-            "photo_desc",
-        )
-
-        def send_receiver_info(*args):
-            receiver_info = receiver_details.__dict__()
-            receiver_info["locator"] = Locator.fromCoordinates(receiver_info["receiver_gps"])
-            self.write_receiver_details(receiver_info)
-
         features = FeatureDetector().feature_availability()
         self.write_features(features)
 
         modes = Modes.getModes()
         self.write_modes(modes)
 
-        # TODO unsubscribe
-        receiver_details.wire(send_receiver_info)
-        send_receiver_info()
-
         self.__sendProfiles()
 
         CpuUsageThread.getSharedInstance().add_client(self)
@@ -314,9 +320,6 @@ class OpenWebRxReceiverClient(Client):
     def write_config(self, cfg):
         self.send({"type": "config", "value": cfg})
 
-    def write_receiver_details(self, details):
-        self.send({"type": "receiver_details", "value": details})
-
     def write_profiles(self, profiles):
         self.send({"type": "profiles", "value": profiles})
 
@@ -382,7 +385,7 @@ class OpenWebRxReceiverClient(Client):
         self.send({"type": "modes", "value": [to_json(m) for m in modes]})
 
 
-class MapConnection(Client):
+class MapConnection(OpenWebRxClient):
     def __init__(self, conn):
         super().__init__(conn)
 

From 3a5e227ab51d3afc94ef29debf39647b1b70920c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 9 May 2020 00:27:42 +0200
Subject: [PATCH 307/475] integrate feature report

---
 htdocs/css/features.css | 4 ++++
 htdocs/features.html    | 1 +
 htdocs/settings.html    | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/htdocs/css/features.css b/htdocs/css/features.css
index 7b0b008..8131da6 100644
--- a/htdocs/css/features.css
+++ b/htdocs/css/features.css
@@ -9,4 +9,8 @@
 h1 {
     text-align: center;
     margin: 50px 0;
+}
+
+.table {
+    color: inherit;
 }
\ No newline at end of file
diff --git a/htdocs/features.html b/htdocs/features.html
index 8e0eb61..8ddc941 100644
--- a/htdocs/features.html
+++ b/htdocs/features.html
@@ -2,6 +2,7 @@
     <TITLE>OpenWebRX Feature report</TITLE>
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
     <link rel="stylesheet" href="static/css/features.css">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/1.9.0/showdown.min.js"></script>
     <script src="static/lib/jquery-3.2.1.min.js"></script>
diff --git a/htdocs/settings.html b/htdocs/settings.html
index 659b660..00fbe9e 100644
--- a/htdocs/settings.html
+++ b/htdocs/settings.html
@@ -22,5 +22,8 @@ ${header}
     <div class="col-12">
         <a href="sdrsettings">SDR device settings</a>
     </div>
+    <div class="col-12">
+        <a href="features">Feature report</a>
+    </div>
 </div>
 </body>
\ No newline at end of file

From 149ad8dcc6fbcfc5e511d1e870260556b17088a6 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 9 May 2020 01:03:43 +0200
Subject: [PATCH 308/475] move rx_photo code to header

---
 htdocs/css/map.css   |  5 ----
 htdocs/lib/Header.js | 55 ++++++++++++++++++++++++++++++++++++++++-
 htdocs/openwebrx.js  | 58 --------------------------------------------
 3 files changed, 54 insertions(+), 64 deletions(-)

diff --git a/htdocs/css/map.css b/htdocs/css/map.css
index 5d478cd..de6ef3e 100644
--- a/htdocs/css/map.css
+++ b/htdocs/css/map.css
@@ -1,11 +1,6 @@
 @import url("openwebrx-header.css");
 @import url("openwebrx-globals.css");
 
-/* expandable photo not implemented on map page */
-#webrx-top-photo-clip {
-    max-height: 67px;
-}
-
 body {
     display: flex;
     flex-direction: column;
diff --git a/htdocs/lib/Header.js b/htdocs/lib/Header.js
index aec4ab7..ebdc5b1 100644
--- a/htdocs/lib/Header.js
+++ b/htdocs/lib/Header.js
@@ -4,16 +4,69 @@ function Header(el) {
     this.el.find('#openwebrx-main-buttons').find('[data-toggle-panel]').click(function () {
         toggle_panel($(this).data('toggle-panel'));
     });
+
+    this.init_rx_photo();
 };
 
 Header.prototype.setDetails = function(details) {
     this.el.find('#webrx-rx-title').html(details['receiver_name']);
     var query = encodeURIComponent(details['receiver_gps']['lat'] + ',' + details['receiver_gps']['lon']);
-    this.el.find('#webrx-rx-desc').html(details['receiver_location'] + ' | Loc: ' + details['locator'] + ', ASL: ' + details['receiver_asl'] + ' m, <a href="https://www.google.com/maps/search/?api=1&query=' + query + '" target="_blank" onclick="dont_toggle_rx_photo();">[maps]</a>');
+    this.el.find('#webrx-rx-desc').html(details['receiver_location'] + ' | Loc: ' + details['locator'] + ', ASL: ' + details['receiver_asl'] + ' m, <a href="https://www.google.com/maps/search/?api=1&query=' + query + '" target="_blank">[maps]</a>');
     this.el.find('#webrx-rx-photo-title').html(details['photo_title']);
     this.el.find('#webrx-rx-photo-desc').html(details['photo_desc']);
 };
 
+Header.prototype.init_rx_photo = function() {
+    var clip = this.el.find("#webrx-top-photo-clip")[0];
+    this.rx_photo_height = clip.clientHeight;
+    clip.style.maxHeight = this.rx_photo_height + "px";
+    this.rx_photo_state = 1;
+
+    $.extend($.easing, {
+        easeOutCubic:function(x) {
+            return 1 - Math.pow( 1 - x, 3 );
+        }
+    });
+
+    window.setTimeout(function () {
+        $('#webrx-rx-photo-title').animate({opacity: 0}, 500);
+    }, 1000);
+    window.setTimeout(function () {
+        $('#webrx-rx-photo-desc').animate({opacity: 0}, 500);
+    }, 1500);
+    window.setTimeout(this.close_rx_photo.bind(this), 2500);
+    $('#webrx-top-container').find('.openwebrx-photo-trigger').click(this.toggle_rx_photo.bind(this));
+};
+
+Header.prototype.close_rx_photo = function() {
+    this.rx_photo_state = 0;
+    this.el.find("#webrx-rx-photo-desc").animate({opacity: 0});
+    this.el.find("#webrx-rx-photo-title").animate({opacity: 0});
+    this.el.find('#webrx-top-photo-clip').animate({maxHeight: 67}, {duration: 1000, easing: 'easeOutCubic'});
+    this.el.find("#openwebrx-rx-details-arrow-down").show();
+    this.el.find("#openwebrx-rx-details-arrow-up").hide();
+}
+
+Header.prototype.open_rx_photo = function() {
+    this.rx_photo_state = 1;
+    this.el.find("#webrx-rx-photo-desc").animate({opacity: 1});
+    this.el.find("#webrx-rx-photo-title").animate({opacity: 1});
+    this.el.find('#webrx-top-photo-clip').animate({maxHeight: this.rx_photo_height}, {duration: 1000, easing: 'easeOutCubic'});
+    this.el.find("#openwebrx-rx-details-arrow-down").hide();
+    this.el.find("#openwebrx-rx-details-arrow-up").show();
+}
+
+Header.prototype.toggle_rx_photo = function(ev) {
+    if (ev && ev.target && ev.target.tagName == 'A') {
+        return;
+    }
+    if (this.rx_photo_state) {
+        this.close_rx_photo();
+    } else {
+        this.open_rx_photo();
+    }
+};
+
 $.fn.header = function() {
     if (!this.data('header')) {
         this.data('header', new Header(this));
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index fb5586d..a6771f8 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -31,68 +31,11 @@ var fft_compression = "none";
 var fft_codec;
 var waterfall_setup_done = 0;
 var secondary_fft_size;
-var rx_photo_state = 1;
 
 function e(what) {
     return document.getElementById(what);
 }
 
-var rx_photo_height;
-
-function init_rx_photo() {
-    var clip = e("webrx-top-photo-clip");
-    rx_photo_height = clip.clientHeight;
-    clip.style.maxHeight = rx_photo_height + "px";
-
-    $.extend($.easing, {
-        easeOutCubic:function(x) {
-            return 1 - Math.pow( 1 - x, 3 );
-        }
-    });
-
-    window.setTimeout(function () {
-        $('#webrx-rx-photo-title').animate({opacity: 0}, 500);
-    }, 1000);
-    window.setTimeout(function () {
-        $('#webrx-rx-photo-desc').animate({opacity: 0}, 500);
-    }, 1500);
-    window.setTimeout(function () {
-        close_rx_photo()
-    }, 2500);
-    $('#webrx-top-container').find('.openwebrx-photo-trigger').click(toggle_rx_photo);
-}
-
-var dont_toggle_rx_photo_flag = 0;
-
-function dont_toggle_rx_photo() {
-    dont_toggle_rx_photo_flag = 1;
-}
-
-function toggle_rx_photo() {
-    if (dont_toggle_rx_photo_flag) {
-        dont_toggle_rx_photo_flag = 0;
-        return;
-    }
-    if (rx_photo_state) close_rx_photo();
-    else open_rx_photo()
-}
-
-function close_rx_photo() {
-    rx_photo_state = 0;
-    $('#webrx-top-photo-clip').animate({maxHeight: 67}, {duration: 1000, easing: 'easeOutCubic'});
-    e("openwebrx-rx-details-arrow-down").style.display = "block";
-    e("openwebrx-rx-details-arrow-up").style.display = "none";
-}
-
-function open_rx_photo() {
-    rx_photo_state = 1;
-    e("webrx-rx-photo-desc").style.opacity = 1;
-    e("webrx-rx-photo-title").style.opacity = 1;
-    $('#webrx-top-photo-clip').animate({maxHeight: rx_photo_height}, {duration: 1000, easing: 'easeOutCubic'});
-    e("openwebrx-rx-details-arrow-down").style.display = "none";
-    e("openwebrx-rx-details-arrow-up").style.display = "block";
-}
-
 function updateVolume() {
     audioEngine.setVolume(parseFloat(e("openwebrx-panel-volume").value) / 100);
 }
@@ -1378,7 +1321,6 @@ function openwebrx_init() {
     }
     fft_codec = new ImaAdpcmCodec();
     initProgressBars();
-    init_rx_photo();
     open_websocket();
     secondary_demod_init();
     digimodes_init();

From 59a7842c6d13e524868a56c0eba937e933786a48 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 9 May 2020 01:18:51 +0200
Subject: [PATCH 309/475] fix map info window popping up after close

---
 htdocs/map.js | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/htdocs/map.js b/htdocs/map.js
index 339d1d5..0d447e2 100644
--- a/htdocs/map.js
+++ b/htdocs/map.js
@@ -135,7 +135,11 @@
                     if (expectedCallsign && expectedCallsign == update.callsign.trim()) {
                         map.panTo(pos);
                         showMarkerInfoWindow(update.callsign, pos);
-                        delete(expectedCallsign);
+                        expectedCallsign = false;
+                    }
+
+                    if (infowindow && infowindow.callsign && infowindow.callsign == update.callsign.trim()) {
+                        showMarkerInfoWindow(infowindow.callsign, pos);
                     }
                 break;
                 case 'locator':
@@ -176,7 +180,11 @@
                     if (expectedLocator && expectedLocator == update.location.locator) {
                         map.panTo(center);
                         showLocatorInfoWindow(expectedLocator, center);
-                        delete(expectedLocator);
+                        expectedLocator = false;
+                    }
+
+                    if (infowindow && infowindow.locator && infowindow.locator == update.location.locator) {
+                        showLocatorInfoWindow(infowindow.locator, center);
                     }
                 break;
             }
@@ -287,9 +295,21 @@
 
     connect();
 
+    var getInfoWindow = function() {
+        if (!infowindow) {
+            infowindow = new google.maps.InfoWindow();
+            google.maps.event.addListener(infowindow, 'closeclick', function() {
+                delete infowindow.locator;
+                delete infowindow.callsign;
+            });
+        }
+        return infowindow;
+    }
+
     var infowindow;
     var showLocatorInfoWindow = function(locator, pos) {
-        if (!infowindow) infowindow = new google.maps.InfoWindow();
+        var infowindow = getInfoWindow();
+        infowindow.locator = locator;
         var inLocator = $.map(rectangles, function(r, callsign) {
             return {callsign: callsign, locator: r.locator, lastseen: r.lastseen, mode: r.mode, band: r.band}
         }).filter(function(d) {
@@ -315,7 +335,8 @@
     };
 
     var showMarkerInfoWindow = function(callsign, pos) {
-        if (!infowindow) infowindow = new google.maps.InfoWindow();
+        var infowindow = getInfoWindow();
+        infowindow.callsign = callsign;
         var marker = markers[callsign];
         var timestring = moment(marker.lastseen).fromNow();
         var commentString = "";

From 56066460649c48e6715052311f1b1f405acb2272 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 10 May 2020 00:03:14 +0200
Subject: [PATCH 310/475] implement basic support for radioberry

---
 owrx/feature.py           | 9 +++++++++
 owrx/source/radioberry.py | 6 ++++++
 2 files changed, 15 insertions(+)
 create mode 100644 owrx/source/radioberry.py

diff --git a/owrx/feature.py b/owrx/feature.py
index 17172a5..6d5b4fa 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -34,6 +34,7 @@ class FeatureDetector(object):
         "soapy_remote": ["soapy_connector", "soapy_remote"],
         "uhd": ["soapy_connector", "soapy_uhd"],
         "red_pitaya": ["soapy_connector", "soapy_red_pitaya"],
+        "radioberry": ["soapy_connector", "soapy_radioberry"],
         # optional features and their requirements
         "digital_voice_digiham": ["digiham", "sox"],
         "digital_voice_dsd": ["dsd", "sox", "digiham"],
@@ -333,6 +334,14 @@ class FeatureDetector(object):
         """
         return self._has_soapy_driver("redpitaya")
 
+    def has_soapy_radioberry(self):
+        """
+        The Radioberry is a SDR hat for the Raspberry Pi.
+
+        You can find more information, along with its SoapySDR module [here](https://github.com/pa3gsb/Radioberry-2.x).
+        """
+        return self._has_soapy_driver("radioberry")
+
     def has_dsd(self):
         """
         The digital voice modes NXDN and D-Star can be decoded by the dsd project. Please note that you need the version
diff --git a/owrx/source/radioberry.py b/owrx/source/radioberry.py
new file mode 100644
index 0000000..5bb95c7
--- /dev/null
+++ b/owrx/source/radioberry.py
@@ -0,0 +1,6 @@
+from .soapy import SoapyConnectorSource
+
+
+class RadioberrySource(SoapyConnectorSource):
+    def getDriver(self):
+        return "radioberry"

From eaa41c3256c811bff57b1e0f6887f073b0889f6e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 10 May 2020 16:07:14 +0200
Subject: [PATCH 311/475] header is now collapsed by default; simpler
 javascript

---
 htdocs/css/openwebrx-header.css    | 13 ++++++-------
 htdocs/include/header.include.html |  2 +-
 htdocs/lib/Header.js               | 14 ++------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/htdocs/css/openwebrx-header.css b/htdocs/css/openwebrx-header.css
index c369fb1..09c1fed 100644
--- a/htdocs/css/openwebrx-header.css
+++ b/htdocs/css/openwebrx-header.css
@@ -2,6 +2,7 @@
 {
     position: relative;
     z-index:1000;
+    background-color: #575757;
 }
 
 #webrx-top-photo
@@ -13,7 +14,8 @@
 #webrx-top-photo-clip
 {
     min-height: 67px;
-    max-height: 350px;
+    max-height: 67px;
+    height: 350px;
     overflow: hidden;
     position: relative;
 }
@@ -101,18 +103,15 @@
     cursor:pointer;
     position: absolute;
     left: 470px;
-    top: 51px;
+    top: 55px;
 }
 
 #openwebrx-rx-details-arrow a
 {
     margin: 0;
     padding: 0;
-}
-
-#openwebrx-rx-details-arrow-down
-{
-    display:none;
+    line-height: 0;
+    display: block;
 }
 
 #openwebrx-main-buttons .button {
diff --git a/htdocs/include/header.include.html b/htdocs/include/header.include.html
index aa2275a..09fafa2 100644
--- a/htdocs/include/header.include.html
+++ b/htdocs/include/header.include.html
@@ -9,7 +9,7 @@
                 <div id="webrx-rx-desc" class="openwebrx-photo-trigger"></div>
             </div>
             <div id="openwebrx-rx-details-arrow">
-                <a id="openwebrx-rx-details-arrow-up" class="openwebrx-photo-trigger"><img src="static/gfx/openwebrx-rx-details-arrow-up.png" /></a>
+                <a id="openwebrx-rx-details-arrow-up" class="openwebrx-photo-trigger" style="display: none;"><img src="static/gfx/openwebrx-rx-details-arrow-up.png" /></a>
                 <a id="openwebrx-rx-details-arrow-down" class="openwebrx-photo-trigger"><img src="static/gfx/openwebrx-rx-details-arrow.png" /></a>
             </div>
             <section id="openwebrx-main-buttons">
diff --git a/htdocs/lib/Header.js b/htdocs/lib/Header.js
index ebdc5b1..a81a682 100644
--- a/htdocs/lib/Header.js
+++ b/htdocs/lib/Header.js
@@ -17,10 +17,7 @@ Header.prototype.setDetails = function(details) {
 };
 
 Header.prototype.init_rx_photo = function() {
-    var clip = this.el.find("#webrx-top-photo-clip")[0];
-    this.rx_photo_height = clip.clientHeight;
-    clip.style.maxHeight = this.rx_photo_height + "px";
-    this.rx_photo_state = 1;
+    this.rx_photo_state = 0;
 
     $.extend($.easing, {
         easeOutCubic:function(x) {
@@ -28,13 +25,6 @@ Header.prototype.init_rx_photo = function() {
         }
     });
 
-    window.setTimeout(function () {
-        $('#webrx-rx-photo-title').animate({opacity: 0}, 500);
-    }, 1000);
-    window.setTimeout(function () {
-        $('#webrx-rx-photo-desc').animate({opacity: 0}, 500);
-    }, 1500);
-    window.setTimeout(this.close_rx_photo.bind(this), 2500);
     $('#webrx-top-container').find('.openwebrx-photo-trigger').click(this.toggle_rx_photo.bind(this));
 };
 
@@ -51,7 +41,7 @@ Header.prototype.open_rx_photo = function() {
     this.rx_photo_state = 1;
     this.el.find("#webrx-rx-photo-desc").animate({opacity: 1});
     this.el.find("#webrx-rx-photo-title").animate({opacity: 1});
-    this.el.find('#webrx-top-photo-clip').animate({maxHeight: this.rx_photo_height}, {duration: 1000, easing: 'easeOutCubic'});
+    this.el.find('#webrx-top-photo-clip').animate({maxHeight: 350}, {duration: 1000, easing: 'easeOutCubic'});
     this.el.find("#openwebrx-rx-details-arrow-down").hide();
     this.el.find("#openwebrx-rx-details-arrow-up").show();
 }

From 4971bee67c6249ca7de9960d5fd23487caddc11b Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 10 May 2020 16:12:37 +0200
Subject: [PATCH 312/475] create a javascript profile for the map, too

---
 htdocs/map.html            | 5 +----
 owrx/controllers/assets.py | 6 ++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/map.html b/htdocs/map.html
index dbfd13d..08e40b4 100644
--- a/htdocs/map.html
+++ b/htdocs/map.html
@@ -3,11 +3,8 @@
 <head>
     <title>OpenWebRX Map</title>
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
-    <script src="static/lib/jquery-3.2.1.min.js"></script>
-    <script src="static/lib/chroma.min.js"></script>
-    <script src="static/map.js"></script>
+    <script src="compiled/map.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
-    <script src="static/lib/Header.js"></script>
     <link rel="stylesheet" type="text/css" href="static/css/map.css" />
     <meta charset="utf-8">
 </head>
diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index f0bf6ac..59a532f 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -81,6 +81,12 @@ class CompiledAssetsController(Controller):
             "lib/Js8Threads.js",
             "lib/Modes.js",
         ],
+        "map.js": [
+            "lib/jquery-3.2.1.min.js",
+            "lib/chroma.min.js",
+            "lib/Header.js",
+            "map.js",
+        ],
     }
 
     def indexAction(self):

From 2c1ec7df74beb3a41ee9fa2c50120bdfe9f1fd7c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 10 May 2020 16:23:05 +0200
Subject: [PATCH 313/475] make the header work on all pages

---
 htdocs/css/admin.css        | 5 -----
 htdocs/css/features.css     | 5 -----
 htdocs/css/login.css        | 6 ------
 htdocs/features.html        | 1 +
 htdocs/generalsettings.html | 1 +
 htdocs/lib/Header.js        | 6 +++++-
 htdocs/login.html           | 2 ++
 htdocs/openwebrx.js         | 1 -
 htdocs/sdrsettings.html     | 2 +-
 htdocs/settings.html        | 2 +-
 10 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/htdocs/css/admin.css b/htdocs/css/admin.css
index fa2b020..4dd3f80 100644
--- a/htdocs/css/admin.css
+++ b/htdocs/css/admin.css
@@ -1,11 +1,6 @@
 @import url("openwebrx-header.css");
 @import url("openwebrx-globals.css");
 
-/* expandable photo not implemented in admin area page */
-#webrx-top-photo-clip {
-    max-height: 67px;
-}
-
 body {
     background-color: #2e2e2e;
     color: #DDD;
diff --git a/htdocs/css/features.css b/htdocs/css/features.css
index 8131da6..d52cae9 100644
--- a/htdocs/css/features.css
+++ b/htdocs/css/features.css
@@ -1,11 +1,6 @@
 @import url("openwebrx-header.css");
 @import url("openwebrx-globals.css");
 
-/* expandable photo not implemented on features page */
-#webrx-top-photo-clip {
-    max-height: 67px;
-}
-
 h1 {
     text-align: center;
     margin: 50px 0;
diff --git a/htdocs/css/login.css b/htdocs/css/login.css
index 84a2430..c50341e 100644
--- a/htdocs/css/login.css
+++ b/htdocs/css/login.css
@@ -1,12 +1,6 @@
 @import url("openwebrx-header.css");
 @import url("openwebrx-globals.css");
 
-/* expandable photo not implemented on login page */
-#webrx-top-photo-clip {
-    max-height: 67px;
-}
-
-
 body {
     background-color: #2e2e2e;
 }
diff --git a/htdocs/features.html b/htdocs/features.html
index 8ddc941..2a97cd1 100644
--- a/htdocs/features.html
+++ b/htdocs/features.html
@@ -6,6 +6,7 @@
     <link rel="stylesheet" href="static/css/features.css">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/1.9.0/showdown.min.js"></script>
     <script src="static/lib/jquery-3.2.1.min.js"></script>
+    <script src="static/lib/Header.js"></script>
     <script src="static/features.js"></script>
 </HEAD><BODY>
     ${header}
diff --git a/htdocs/generalsettings.html b/htdocs/generalsettings.html
index edd52e7..ae0656c 100644
--- a/htdocs/generalsettings.html
+++ b/htdocs/generalsettings.html
@@ -6,6 +6,7 @@
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
     <script src="static/lib/jquery-3.2.1.min.js"></script>
+    <script src="static/lib/Header.js"></script>
     <script src="https://unpkg.com/location-picker/dist/location-picker.min.js"></script>
     <script src="static/settings.js"></script>
     <meta charset="utf-8">
diff --git a/htdocs/lib/Header.js b/htdocs/lib/Header.js
index a81a682..d1c6a30 100644
--- a/htdocs/lib/Header.js
+++ b/htdocs/lib/Header.js
@@ -62,4 +62,8 @@ $.fn.header = function() {
         this.data('header', new Header(this));
     }
     return this.data('header');
-};
\ No newline at end of file
+};
+
+$(function(){
+    $('#webrx-top-container').header();
+});
diff --git a/htdocs/login.html b/htdocs/login.html
index b86efd9..9cbeacc 100644
--- a/htdocs/login.html
+++ b/htdocs/login.html
@@ -5,6 +5,8 @@
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" type="text/css" href="static/css/login.css" />
+    <script src="static/lib/jquery-3.2.1.min.js"></script>
+    <script src="static/lib/Header.js"></script>
     <meta charset="utf-8">
 </head>
 <body>
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index a6771f8..dadd7e3 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1328,7 +1328,6 @@ function openwebrx_init() {
     $('.webrx-mouse-freq').frequencyDisplay();
     $('#openwebrx-panel-receiver').demodulatorPanel();
     window.addEventListener("resize", openwebrx_resize);
-    $('#webrx-top-container').header();
     bookmarks = new BookmarkBar();
     initSliders();
 }
diff --git a/htdocs/sdrsettings.html b/htdocs/sdrsettings.html
index 51de0f0..08664fe 100644
--- a/htdocs/sdrsettings.html
+++ b/htdocs/sdrsettings.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
     <script src="static/lib/jquery-3.2.1.min.js"></script>
-    <script src="https://unpkg.com/location-picker/dist/location-picker.min.js"></script>
+    <script src="static/lib/Header.js"></script>
     <script src="static/settings.js"></script>
     <meta charset="utf-8">
 </head>
diff --git a/htdocs/settings.html b/htdocs/settings.html
index 00fbe9e..6e6bd89 100644
--- a/htdocs/settings.html
+++ b/htdocs/settings.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
     <script src="static/lib/jquery-3.2.1.min.js"></script>
-    <script src="https://unpkg.com/location-picker/dist/location-picker.min.js"></script>
+    <script src="static/lib/Header.js"></script>
     <script src="static/settings.js"></script>
     <meta charset="utf-8">
 </head>

From a37e5ac93f7a966a5b3f184d05441dd77e1fb8c4 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 10 May 2020 16:07:14 +0200
Subject: [PATCH 314/475] header is now collapsed by default; simpler
 javascript

---
 htdocs/css/openwebrx-header.css    | 13 ++++++-------
 htdocs/include/header.include.html |  2 +-
 htdocs/lib/Header.js               | 14 ++------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/htdocs/css/openwebrx-header.css b/htdocs/css/openwebrx-header.css
index c369fb1..09c1fed 100644
--- a/htdocs/css/openwebrx-header.css
+++ b/htdocs/css/openwebrx-header.css
@@ -2,6 +2,7 @@
 {
     position: relative;
     z-index:1000;
+    background-color: #575757;
 }
 
 #webrx-top-photo
@@ -13,7 +14,8 @@
 #webrx-top-photo-clip
 {
     min-height: 67px;
-    max-height: 350px;
+    max-height: 67px;
+    height: 350px;
     overflow: hidden;
     position: relative;
 }
@@ -101,18 +103,15 @@
     cursor:pointer;
     position: absolute;
     left: 470px;
-    top: 51px;
+    top: 55px;
 }
 
 #openwebrx-rx-details-arrow a
 {
     margin: 0;
     padding: 0;
-}
-
-#openwebrx-rx-details-arrow-down
-{
-    display:none;
+    line-height: 0;
+    display: block;
 }
 
 #openwebrx-main-buttons .button {
diff --git a/htdocs/include/header.include.html b/htdocs/include/header.include.html
index aa2275a..09fafa2 100644
--- a/htdocs/include/header.include.html
+++ b/htdocs/include/header.include.html
@@ -9,7 +9,7 @@
                 <div id="webrx-rx-desc" class="openwebrx-photo-trigger"></div>
             </div>
             <div id="openwebrx-rx-details-arrow">
-                <a id="openwebrx-rx-details-arrow-up" class="openwebrx-photo-trigger"><img src="static/gfx/openwebrx-rx-details-arrow-up.png" /></a>
+                <a id="openwebrx-rx-details-arrow-up" class="openwebrx-photo-trigger" style="display: none;"><img src="static/gfx/openwebrx-rx-details-arrow-up.png" /></a>
                 <a id="openwebrx-rx-details-arrow-down" class="openwebrx-photo-trigger"><img src="static/gfx/openwebrx-rx-details-arrow.png" /></a>
             </div>
             <section id="openwebrx-main-buttons">
diff --git a/htdocs/lib/Header.js b/htdocs/lib/Header.js
index ebdc5b1..a81a682 100644
--- a/htdocs/lib/Header.js
+++ b/htdocs/lib/Header.js
@@ -17,10 +17,7 @@ Header.prototype.setDetails = function(details) {
 };
 
 Header.prototype.init_rx_photo = function() {
-    var clip = this.el.find("#webrx-top-photo-clip")[0];
-    this.rx_photo_height = clip.clientHeight;
-    clip.style.maxHeight = this.rx_photo_height + "px";
-    this.rx_photo_state = 1;
+    this.rx_photo_state = 0;
 
     $.extend($.easing, {
         easeOutCubic:function(x) {
@@ -28,13 +25,6 @@ Header.prototype.init_rx_photo = function() {
         }
     });
 
-    window.setTimeout(function () {
-        $('#webrx-rx-photo-title').animate({opacity: 0}, 500);
-    }, 1000);
-    window.setTimeout(function () {
-        $('#webrx-rx-photo-desc').animate({opacity: 0}, 500);
-    }, 1500);
-    window.setTimeout(this.close_rx_photo.bind(this), 2500);
     $('#webrx-top-container').find('.openwebrx-photo-trigger').click(this.toggle_rx_photo.bind(this));
 };
 
@@ -51,7 +41,7 @@ Header.prototype.open_rx_photo = function() {
     this.rx_photo_state = 1;
     this.el.find("#webrx-rx-photo-desc").animate({opacity: 1});
     this.el.find("#webrx-rx-photo-title").animate({opacity: 1});
-    this.el.find('#webrx-top-photo-clip').animate({maxHeight: this.rx_photo_height}, {duration: 1000, easing: 'easeOutCubic'});
+    this.el.find('#webrx-top-photo-clip').animate({maxHeight: 350}, {duration: 1000, easing: 'easeOutCubic'});
     this.el.find("#openwebrx-rx-details-arrow-down").hide();
     this.el.find("#openwebrx-rx-details-arrow-up").show();
 }

From 508ea2cf9627479dcd8fe8100ce50315adc204e3 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 10 May 2020 16:12:37 +0200
Subject: [PATCH 315/475] create a javascript profile for the map, too

---
 htdocs/map.html            | 5 +----
 owrx/controllers/assets.py | 6 ++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/map.html b/htdocs/map.html
index dbfd13d..08e40b4 100644
--- a/htdocs/map.html
+++ b/htdocs/map.html
@@ -3,11 +3,8 @@
 <head>
     <title>OpenWebRX Map</title>
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
-    <script src="static/lib/jquery-3.2.1.min.js"></script>
-    <script src="static/lib/chroma.min.js"></script>
-    <script src="static/map.js"></script>
+    <script src="compiled/map.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.24.0/moment.min.js"></script>
-    <script src="static/lib/Header.js"></script>
     <link rel="stylesheet" type="text/css" href="static/css/map.css" />
     <meta charset="utf-8">
 </head>
diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index f0bf6ac..59a532f 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -81,6 +81,12 @@ class CompiledAssetsController(Controller):
             "lib/Js8Threads.js",
             "lib/Modes.js",
         ],
+        "map.js": [
+            "lib/jquery-3.2.1.min.js",
+            "lib/chroma.min.js",
+            "lib/Header.js",
+            "map.js",
+        ],
     }
 
     def indexAction(self):

From 813474b5d6b6e5678e2040f65fbd5cc3503af7c7 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 10 May 2020 16:23:05 +0200
Subject: [PATCH 316/475] make the header work on all pages

---
 htdocs/css/admin.css        | 5 -----
 htdocs/css/features.css     | 5 -----
 htdocs/css/login.css        | 6 ------
 htdocs/features.html        | 1 +
 htdocs/generalsettings.html | 1 +
 htdocs/lib/Header.js        | 6 +++++-
 htdocs/login.html           | 2 ++
 htdocs/openwebrx.js         | 1 -
 htdocs/sdrsettings.html     | 2 +-
 htdocs/settings.html        | 2 +-
 10 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/htdocs/css/admin.css b/htdocs/css/admin.css
index fa2b020..4dd3f80 100644
--- a/htdocs/css/admin.css
+++ b/htdocs/css/admin.css
@@ -1,11 +1,6 @@
 @import url("openwebrx-header.css");
 @import url("openwebrx-globals.css");
 
-/* expandable photo not implemented in admin area page */
-#webrx-top-photo-clip {
-    max-height: 67px;
-}
-
 body {
     background-color: #2e2e2e;
     color: #DDD;
diff --git a/htdocs/css/features.css b/htdocs/css/features.css
index 8131da6..d52cae9 100644
--- a/htdocs/css/features.css
+++ b/htdocs/css/features.css
@@ -1,11 +1,6 @@
 @import url("openwebrx-header.css");
 @import url("openwebrx-globals.css");
 
-/* expandable photo not implemented on features page */
-#webrx-top-photo-clip {
-    max-height: 67px;
-}
-
 h1 {
     text-align: center;
     margin: 50px 0;
diff --git a/htdocs/css/login.css b/htdocs/css/login.css
index 84a2430..c50341e 100644
--- a/htdocs/css/login.css
+++ b/htdocs/css/login.css
@@ -1,12 +1,6 @@
 @import url("openwebrx-header.css");
 @import url("openwebrx-globals.css");
 
-/* expandable photo not implemented on login page */
-#webrx-top-photo-clip {
-    max-height: 67px;
-}
-
-
 body {
     background-color: #2e2e2e;
 }
diff --git a/htdocs/features.html b/htdocs/features.html
index 8ddc941..2a97cd1 100644
--- a/htdocs/features.html
+++ b/htdocs/features.html
@@ -6,6 +6,7 @@
     <link rel="stylesheet" href="static/css/features.css">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/1.9.0/showdown.min.js"></script>
     <script src="static/lib/jquery-3.2.1.min.js"></script>
+    <script src="static/lib/Header.js"></script>
     <script src="static/features.js"></script>
 </HEAD><BODY>
     ${header}
diff --git a/htdocs/generalsettings.html b/htdocs/generalsettings.html
index edd52e7..ae0656c 100644
--- a/htdocs/generalsettings.html
+++ b/htdocs/generalsettings.html
@@ -6,6 +6,7 @@
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
     <script src="static/lib/jquery-3.2.1.min.js"></script>
+    <script src="static/lib/Header.js"></script>
     <script src="https://unpkg.com/location-picker/dist/location-picker.min.js"></script>
     <script src="static/settings.js"></script>
     <meta charset="utf-8">
diff --git a/htdocs/lib/Header.js b/htdocs/lib/Header.js
index a81a682..d1c6a30 100644
--- a/htdocs/lib/Header.js
+++ b/htdocs/lib/Header.js
@@ -62,4 +62,8 @@ $.fn.header = function() {
         this.data('header', new Header(this));
     }
     return this.data('header');
-};
\ No newline at end of file
+};
+
+$(function(){
+    $('#webrx-top-container').header();
+});
diff --git a/htdocs/login.html b/htdocs/login.html
index b86efd9..9cbeacc 100644
--- a/htdocs/login.html
+++ b/htdocs/login.html
@@ -5,6 +5,8 @@
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" type="text/css" href="static/css/login.css" />
+    <script src="static/lib/jquery-3.2.1.min.js"></script>
+    <script src="static/lib/Header.js"></script>
     <meta charset="utf-8">
 </head>
 <body>
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index a6771f8..dadd7e3 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1328,7 +1328,6 @@ function openwebrx_init() {
     $('.webrx-mouse-freq').frequencyDisplay();
     $('#openwebrx-panel-receiver').demodulatorPanel();
     window.addEventListener("resize", openwebrx_resize);
-    $('#webrx-top-container').header();
     bookmarks = new BookmarkBar();
     initSliders();
 }
diff --git a/htdocs/sdrsettings.html b/htdocs/sdrsettings.html
index 51de0f0..08664fe 100644
--- a/htdocs/sdrsettings.html
+++ b/htdocs/sdrsettings.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
     <script src="static/lib/jquery-3.2.1.min.js"></script>
-    <script src="https://unpkg.com/location-picker/dist/location-picker.min.js"></script>
+    <script src="static/lib/Header.js"></script>
     <script src="static/settings.js"></script>
     <meta charset="utf-8">
 </head>
diff --git a/htdocs/settings.html b/htdocs/settings.html
index 00fbe9e..6e6bd89 100644
--- a/htdocs/settings.html
+++ b/htdocs/settings.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
     <script src="static/lib/jquery-3.2.1.min.js"></script>
-    <script src="https://unpkg.com/location-picker/dist/location-picker.min.js"></script>
+    <script src="static/lib/Header.js"></script>
     <script src="static/settings.js"></script>
     <meta charset="utf-8">
 </head>

From 11cf2a96e240e4d2f68694b0d95f87cd5a339010 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 10 May 2020 17:12:42 +0200
Subject: [PATCH 317/475] create a receiver details route for use in the header

---
 owrx/controllers/api.py | 13 +++++++++++++
 owrx/http.py            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/owrx/controllers/api.py b/owrx/controllers/api.py
index 4e7a966..60bb74f 100644
--- a/owrx/controllers/api.py
+++ b/owrx/controllers/api.py
@@ -1,5 +1,6 @@
 from . import Controller
 from owrx.feature import FeatureDetector
+from owrx.config import Config
 import json
 
 
@@ -7,3 +8,15 @@ class ApiController(Controller):
     def indexAction(self):
         data = json.dumps(FeatureDetector().feature_report())
         self.send_response(data, content_type="application/json")
+
+    def receiverDetails(self):
+        receiver_details = Config.get().filter(
+            "receiver_name",
+            "receiver_location",
+            "receiver_asl",
+            "receiver_gps",
+            "photo_title",
+            "photo_desc",
+        )
+        data = json.dumps(receiver_details.__dict__())
+        self.send_response(data, content_type="application/json")
diff --git a/owrx/http.py b/owrx/http.py
index 39e2bdf..8381646 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -101,6 +101,7 @@ class Router(object):
             StaticRoute("/map", MapController),
             StaticRoute("/features", FeatureController),
             StaticRoute("/api/features", ApiController),
+            StaticRoute("/api/receiverdetails", ApiController, options={"action": "receiverDetails"}),
             StaticRoute("/metrics", MetricsController),
             StaticRoute("/settings", SettingsController),
             StaticRoute("/generalsettings", GeneralSettingsController),

From 8df885b727b15bb25b3c9b42744e1c0a8a248811 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 10 May 2020 17:27:46 +0200
Subject: [PATCH 318/475] download receiver details via rest api

---
 htdocs/lib/Header.js    |  8 ++++++++
 owrx/connection.py      | 12 ++----------
 owrx/controllers/api.py | 11 ++---------
 owrx/details.py         | 21 +++++++++++++++++++++
 4 files changed, 33 insertions(+), 19 deletions(-)
 create mode 100644 owrx/details.py

diff --git a/htdocs/lib/Header.js b/htdocs/lib/Header.js
index d1c6a30..cced6b6 100644
--- a/htdocs/lib/Header.js
+++ b/htdocs/lib/Header.js
@@ -6,6 +6,7 @@ function Header(el) {
     });
 
     this.init_rx_photo();
+    this.download_details();
 };
 
 Header.prototype.setDetails = function(details) {
@@ -57,6 +58,13 @@ Header.prototype.toggle_rx_photo = function(ev) {
     }
 };
 
+Header.prototype.download_details = function() {
+    var self = this;
+    $.ajax('api/receiverdetails').done(function(data){
+        self.setDetails(data);
+    });
+};
+
 $.fn.header = function() {
     if (!this.data('header')) {
         this.data('header', new Header(this));
diff --git a/owrx/connection.py b/owrx/connection.py
index 14620fe..e8f5172 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -1,4 +1,5 @@
 from owrx.config import Config
+from owrx.details import ReceiverDetails
 from owrx.dsp import DspManager
 from owrx.cpu import CpuUsageThread
 from owrx.sdr import SdrService
@@ -9,7 +10,6 @@ from owrx.version import openwebrx_version
 from owrx.bands import Bandplan
 from owrx.bookmarks import Bookmarks
 from owrx.map import Map
-from owrx.locator import Locator
 from owrx.property import PropertyStack
 from owrx.modes import Modes, DigitalMode
 from multiprocessing import Queue
@@ -68,18 +68,10 @@ class OpenWebRxClient(Client, metaclass=ABCMeta):
     def __init__(self, conn):
         super().__init__(conn)
 
-        receiver_details = Config.get().filter(
-            "receiver_name",
-            "receiver_location",
-            "receiver_asl",
-            "receiver_gps",
-            "photo_title",
-            "photo_desc",
-        )
+        receiver_details = ReceiverDetails()
 
         def send_receiver_info(*args):
             receiver_info = receiver_details.__dict__()
-            receiver_info["locator"] = Locator.fromCoordinates(receiver_info["receiver_gps"])
             self.write_receiver_details(receiver_info)
 
         # TODO unsubscribe
diff --git a/owrx/controllers/api.py b/owrx/controllers/api.py
index 60bb74f..4dcde14 100644
--- a/owrx/controllers/api.py
+++ b/owrx/controllers/api.py
@@ -1,6 +1,6 @@
 from . import Controller
 from owrx.feature import FeatureDetector
-from owrx.config import Config
+from owrx.details import ReceiverDetails
 import json
 
 
@@ -10,13 +10,6 @@ class ApiController(Controller):
         self.send_response(data, content_type="application/json")
 
     def receiverDetails(self):
-        receiver_details = Config.get().filter(
-            "receiver_name",
-            "receiver_location",
-            "receiver_asl",
-            "receiver_gps",
-            "photo_title",
-            "photo_desc",
-        )
+        receiver_details = ReceiverDetails()
         data = json.dumps(receiver_details.__dict__())
         self.send_response(data, content_type="application/json")
diff --git a/owrx/details.py b/owrx/details.py
new file mode 100644
index 0000000..5bc7253
--- /dev/null
+++ b/owrx/details.py
@@ -0,0 +1,21 @@
+from owrx.config import Config
+from owrx.locator import Locator
+from owrx.property import PropertyFilter
+
+
+class ReceiverDetails(PropertyFilter):
+    def __init__(self):
+        super().__init__(
+            Config.get(),
+            "receiver_name",
+            "receiver_location",
+            "receiver_asl",
+            "receiver_gps",
+            "photo_title",
+            "photo_desc",
+        )
+
+    def __dict__(self):
+        receiver_info = super().__dict__()
+        receiver_info["locator"] = Locator.fromCoordinates(receiver_info["receiver_gps"])
+        return receiver_info

From 9366d67218299adea181c292fe831fa73975d722 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 10 May 2020 20:18:42 +0200
Subject: [PATCH 319/475] dynamic sdr device settings

---
 htdocs/settings.js           | 62 +++++++++++++++++++++++++++++++++++-
 owrx/controllers/settings.py | 30 ++++++++++-------
 2 files changed, 80 insertions(+), 12 deletions(-)

diff --git a/htdocs/settings.js b/htdocs/settings.js
index 89c3eea..c9cb97f 100644
--- a/htdocs/settings.js
+++ b/htdocs/settings.js
@@ -1,3 +1,61 @@
+function Input(name, value) {
+    this.name = name;
+    this.value = value;
+};
+
+Input.prototype.bootstrapify = function(input, label) {
+    input.addClass('form-control').addClass('form-control-sm');
+    return [
+        '<div class="form-group row">',
+            '<label class="col-form-label col-form-label-sm col-3" for="' + self.name + '">' + this.name + '</label>',
+            '<div class="col-9">',
+                input[0].outerHTML,
+            '</div>',
+        '</div>'
+    ].join('');
+};
+
+function TextInput() {
+    Input.apply(this, arguments);
+};
+
+TextInput.prototype = new Input();
+
+TextInput.prototype.render = function() {
+    return this.bootstrapify($('<input type="text" name="' + this.name + '" value="' + this.value + '">'));
+}
+
+Input.mappings = {
+    "name": TextInput
+};
+
+function SdrDevice(el) {
+    this.el = el;
+    this.data = JSON.parse(decodeURIComponent(el.data('config')));
+    this.inputs = {};
+    this.render();
+};
+
+SdrDevice.prototype.render = function() {
+    var self = this;
+    $.each(this.data, function(key, value) {
+        var inputClass = Input.mappings[key] || TextInput;
+        var input = new inputClass(key, value);
+        self.inputs[key] = input;
+        self.el.append(input.render())
+    });
+};
+
+$.fn.sdrdevice = function() {
+    return this.map(function(){
+        var el = $(this);
+        if (!el.data('sdrdevice')) {
+            el.data('sdrdevice', new SdrDevice(el));
+        }
+        return el.data('sdrdevice');
+    });
+};
+
 $(function(){
     $(".map-input").each(function(el) {
         var $el = $(this);
@@ -19,5 +77,7 @@ $(function(){
                 $lon.val(pos.lng);
             });
         });
-    })
+    });
+
+    console.info($(".sdrdevice").sdrdevice());
 });
\ No newline at end of file
diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 7a219e3..1eaceed 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -13,6 +13,8 @@ from owrx.form import (
     ServicesCheckboxInput,
     Js8ProfileCheckboxInput,
 )
+from urllib.parse import quote
+import json
 import logging
 
 logger = logging.getLogger(__name__)
@@ -55,18 +57,24 @@ class SdrSettingsController(AdminController):
         return variables
 
     def render_devices(self):
-        def render_devicde(device_id, config):
-            return """
-                <div class="card device bg-dark text-white">
-                    <div class="card-header">
-                        {device_name}
-                    </div>
-                    <div class="card-body">
-                        device settings go here
-                    </div>
+        return "".join(self.render_device(key, value) for key, value in Config.get()["sdrs"].items())
+
+    def render_device(self, device_id, config):
+        return """
+            <div class="card device bg-dark text-white">
+                <div class="card-header">
+                    {device_name}
                 </div>
-            """.format(device_name=config["name"])
-        return "".join(render_devicde(key, value) for key, value in Config.get()["sdrs"].items())
+                <div class="card-body">
+                    {form}
+                </div>
+            </div>
+        """.format(device_name=config["name"], form=self.render_form(device_id, config))
+
+    def render_form(self, device_id, config):
+        return """
+            <form class="sdrdevice" data-config="{formdata}"></form>
+        """.format(device_id=device_id, formdata=quote(json.dumps(config)))
 
     def indexAction(self):
         self.serve_template("sdrsettings.html", **self.template_variables())

From 96b1de18560cf0b8c03e7d241baf0753ccb800ed Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 10 May 2020 20:34:34 +0200
Subject: [PATCH 320/475] register different input types

---
 htdocs/settings.js | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/htdocs/settings.js b/htdocs/settings.js
index c9cb97f..732e795 100644
--- a/htdocs/settings.js
+++ b/htdocs/settings.js
@@ -25,8 +25,42 @@ TextInput.prototype.render = function() {
     return this.bootstrapify($('<input type="text" name="' + this.name + '" value="' + this.value + '">'));
 }
 
+function NumberInput() {
+    Input.apply(this, arguments);
+};
+
+NumberInput.prototype = new Input();
+
+NumberInput.prototype.render = function() {
+    return this.bootstrapify($('<input type="number" name="' + this.name + '" value="' + this.value + '">'));
+};
+
+function ProfileInput() {
+    Input.apply(this, arguments);
+};
+
+ProfileInput.prototype = new Input();
+
+ProfileInput.prototype.render = function() {
+    return $('<div><h3>Profiles</h3></div>');
+};
+
+function SchedulerInput() {
+    Input.apply(this, arguments);
+};
+
+SchedulerInput.prototype = new Input();
+
+SchedulerInput.prototype.render = function() {
+    return $('<div><h3>Scheduler</h3></div>');
+};
+
 Input.mappings = {
-    "name": TextInput
+    "name": TextInput,
+    "type": TextInput,
+    "ppm": NumberInput,
+    "profiles": ProfileInput,
+    "scheduler": SchedulerInput
 };
 
 function SdrDevice(el) {

From b0f7fd5d00b7c75c7bce25fe9985fa4761ca702f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 10 May 2020 22:42:09 +0200
Subject: [PATCH 321/475] ability to add more config keys

---
 htdocs/settings.js | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/htdocs/settings.js b/htdocs/settings.js
index 732e795..55abf45 100644
--- a/htdocs/settings.js
+++ b/htdocs/settings.js
@@ -68,16 +68,44 @@ function SdrDevice(el) {
     this.data = JSON.parse(decodeURIComponent(el.data('config')));
     this.inputs = {};
     this.render();
+
+    var self = this;
+    el.on('click', '.fieldselector .btn', function() {
+        var key = el.find('.fieldselector select').val();
+        self.data[key] = false;
+        self.render();
+    });
 };
 
 SdrDevice.prototype.render = function() {
     var self = this;
+    self.el.empty();
     $.each(this.data, function(key, value) {
         var inputClass = Input.mappings[key] || TextInput;
         var input = new inputClass(key, value);
         self.inputs[key] = input;
-        self.el.append(input.render())
+        self.el.append(input.render());
     });
+    self.el.append(this.renderFieldSelector());
+};
+
+SdrDevice.prototype.renderFieldSelector = function() {
+    var self = this;
+    return '<div class="fieldselector">' +
+        '<h3>Add new configuration options<h3>' +
+        '<div class="form-group row">' +
+            '<div class="col-3"><select class="form-control form-control-sm">' +
+                Object.keys(Input.mappings).filter(function(m){
+                    return !(m in self.data);
+                }).map(function(m) {
+                    return '<option name="' + m + '">' + m + '</option>';
+                }).join('') +
+            '</select></div>' +
+            '<div class="col-2">' +
+                '<div class="btn btn-primary">Add to config</div>' +
+            '</div>' +
+        '</div>' +
+    '</div>';
 };
 
 $.fn.sdrdevice = function() {
@@ -113,5 +141,5 @@ $(function(){
         });
     });
 
-    console.info($(".sdrdevice").sdrdevice());
+    $(".sdrdevice").sdrdevice();
 });
\ No newline at end of file

From db7b4f195e8ab90382455531e2a744a64c908ede Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <dd5jfk@darc.de>
Date: Mon, 11 May 2020 15:04:24 +0200
Subject: [PATCH 322/475] fix for offset_freq when demodulator is exactly on
 center_freq

---
 htdocs/lib/DemodulatorPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index bfd3619..439a8e5 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -222,7 +222,7 @@ DemodulatorPanel.prototype.transformHashParams = function(params) {
     var ret = {
         mod: params.secondary_mod || params.mod
     };
-    if (params.offset_frequency) ret.offset_frequency = params.offset_frequency;
+    if (typeof(params.offset_frequency) !== 'undefined') ret.offset_frequency = params.offset_frequency;
     if (typeof(params.sql) !== 'undefined') ret.squelch_level = parseInt(params.sql);
     return ret;
 };

From a94209a2bc69d59929a810aa62ebe19a6e452beb Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 11 May 2020 20:31:21 +0200
Subject: [PATCH 323/475] apply some alt tags to images

---
 htdocs/include/header.include.html | 14 +++++++-------
 owrx/controllers/template.py       |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/htdocs/include/header.include.html b/htdocs/include/header.include.html
index 09fafa2..d4a2b53 100644
--- a/htdocs/include/header.include.html
+++ b/htdocs/include/header.include.html
@@ -1,9 +1,9 @@
 <div id="webrx-top-container">
     <div id="webrx-top-photo-clip">
-        <img src="static/gfx/openwebrx-top-photo.jpg" id="webrx-top-photo"/>
+        <img src="static/gfx/openwebrx-top-photo.jpg" id="webrx-top-photo" alt="Receiver panorama"/>
         <div id="webrx-top-bar" class="webrx-top-bar-parts">
-            <a href="https://www.openwebrx.de/" target="_blank"><img src="static/gfx/openwebrx-top-logo.png" id="webrx-top-logo" /></a>
-            <img id="webrx-rx-avatar" class="openwebrx-photo-trigger" src="static/gfx/openwebrx-avatar.png"/>
+            <a href="https://www.openwebrx.de/" target="_blank"><img src="static/gfx/openwebrx-top-logo.png" id="webrx-top-logo" alt="OpenWebRX Logo"/></a>
+            <img id="webrx-rx-avatar" class="openwebrx-photo-trigger" src="static/gfx/openwebrx-avatar.png" alt="Receiver avatar"/>
             <div id="webrx-rx-texts">
                 <div id="webrx-rx-title" class="openwebrx-photo-trigger"></div>
                 <div id="webrx-rx-desc" class="openwebrx-photo-trigger"></div>
@@ -13,10 +13,10 @@
                 <a id="openwebrx-rx-details-arrow-down" class="openwebrx-photo-trigger"><img src="static/gfx/openwebrx-rx-details-arrow.png" /></a>
             </div>
             <section id="openwebrx-main-buttons">
-                <div class="button" data-toggle-panel="openwebrx-panel-status"><img src="static/gfx/openwebrx-panel-status.png" /><br/>Status</div>
-                <div class="button" data-toggle-panel="openwebrx-panel-log"><img  src="static/gfx/openwebrx-panel-log.png" /><br/>Log</div>
-                <div class="button" data-toggle-panel="openwebrx-panel-receiver"><img src="static/gfx/openwebrx-panel-receiver.png" /><br/>Receiver</div>
-                <a class="button" href="map" target="openwebrx-map"><img src="static/gfx/openwebrx-panel-map.png" /><br/>Map</a>
+                <div class="button" data-toggle-panel="openwebrx-panel-status"><img src="static/gfx/openwebrx-panel-status.png" alt="Status"/><br/>Status</div>
+                <div class="button" data-toggle-panel="openwebrx-panel-log"><img  src="static/gfx/openwebrx-panel-log.png" alt="Log"/><br/>Log</div>
+                <div class="button" data-toggle-panel="openwebrx-panel-receiver"><img src="static/gfx/openwebrx-panel-receiver.png" alt="Receiver"/><br/>Receiver</div>
+                <a class="button" href="map" target="openwebrx-map"><img src="static/gfx/openwebrx-panel-map.png" alt="Map"/><br/>Map</a>
                 ${settingslink}
             </section>
         </div>
diff --git a/owrx/controllers/template.py b/owrx/controllers/template.py
index 23c1d17..3d57861 100644
--- a/owrx/controllers/template.py
+++ b/owrx/controllers/template.py
@@ -23,7 +23,7 @@ class WebpageController(TemplateController):
         settingslink = ""
         pm = Config.get()
         if "webadmin_enabled" in pm and pm["webadmin_enabled"]:
-            settingslink = """<a class="button" href="settings" target="openwebrx-settings"><img src="static/gfx/openwebrx-panel-settings.png" /><br/>Settings</a>"""
+            settingslink = """<a class="button" href="settings" target="openwebrx-settings"><img src="static/gfx/openwebrx-panel-settings.png" alt="Settings"/><br/>Settings</a>"""
         header = self.render_template("include/header.include.html", settingslink=settingslink)
         return {"header": header}
 

From 2483398b0f0eac6f018ffe748700b25631e311c4 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 11 May 2020 23:20:03 +0200
Subject: [PATCH 324/475] clean up .wav files on exception, refs #107

---
 owrx/audio.py | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/owrx/audio.py b/owrx/audio.py
index aa8b5c0..a8c2880 100644
--- a/owrx/audio.py
+++ b/owrx/audio.py
@@ -25,6 +25,12 @@ class QueueJob(object):
     def run(self):
         self.decoder.decode(self)
 
+    def unlink(self):
+        try:
+            os.unlink(self.file)
+        except FileNotFoundError:
+            pass
+
 
 class QueueWorker(threading.Thread):
     def __init__(self, queue):
@@ -40,6 +46,9 @@ class QueueWorker(threading.Thread):
             except Exception:
                 logger.exception("failed to decode job")
                 self.queue.onError()
+            finally:
+                job.unlink()
+
             self.queue.task_done()
 
 
@@ -159,11 +168,12 @@ class AudioWriter(object):
         self.switchingLock.release()
 
         file.close()
+        job = QueueJob(self, filename, self.dsp.get_operating_freq())
         try:
-            DecoderQueue.getSharedInstance().put(QueueJob(self, filename, self.dsp.get_operating_freq()))
+            DecoderQueue.getSharedInstance().put(job)
         except Full:
             logger.warning("decoding queue overflow; dropping one file")
-            os.unlink(filename)
+            job.unlink()
         self._scheduleNextSwitch()
 
     def decode(self, job: QueueJob):
@@ -183,7 +193,6 @@ class AudioWriter(object):
         except subprocess.TimeoutExpired:
             logger.warning("subprocess (pid=%i}) did not terminate correctly; sending kill signal.", decoder.pid)
             decoder.kill()
-        os.unlink(job.file)
 
     def start(self):
         (self.wavefilename, self.wavefile) = self.getWaveFile()

From 7d41fc8b0646406a4e7c5dae88222c88b1eabdae Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 11 May 2020 23:45:44 +0200
Subject: [PATCH 325/475] pass temporary directory to services, too

---
 owrx/service/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/owrx/service/__init__.py b/owrx/service/__init__.py
index d4c97df..b4070a1 100644
--- a/owrx/service/__init__.py
+++ b/owrx/service/__init__.py
@@ -265,6 +265,7 @@ class ServiceHandler(object):
         d.set_secondary_demodulator(mode)
         d.set_audio_compression("none")
         d.set_samp_rate(source.getProps()["samp_rate"])
+        d.set_temporary_directory(Config.get()['temporary_directory'])
         d.set_service()
         d.start()
         return d

From 10d630960860a7ef1a9b707bf36fffc7ed6148ea Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 14 May 2020 21:40:28 +0200
Subject: [PATCH 326/475] add rockprog as a dependency

---
 owrx/feature.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/owrx/feature.py b/owrx/feature.py
index 17172a5..5f09ea6 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -29,7 +29,7 @@ class FeatureDetector(object):
         "airspy": ["soapy_connector", "soapy_airspy"],
         "airspyhf": ["soapy_connector", "soapy_airspyhf"],
         "lime_sdr": ["soapy_connector", "soapy_lime_sdr"],
-        "fifi_sdr": ["alsa"],
+        "fifi_sdr": ["alsa", "rockprog"],
         "pluto_sdr": ["soapy_connector", "soapy_pluto_sdr"],
         "soapy_remote": ["soapy_connector", "soapy_remote"],
         "uhd": ["soapy_connector", "soapy_uhd"],
@@ -387,3 +387,11 @@ class FeatureDetector(object):
         on the Alsa library. It is available as a package for most Linux distributions.
         """
         return self.command_is_runnable("arecord --help")
+
+    def has_rockprog(self):
+        """
+        The "rockprog" executable is required to send commands to your FiFiSDR. It needs to be installed separately.
+
+        You can find instructions and downloads [here](https://o28.sischa.net/fifisdr/trac/wiki/De%3Arockprog).
+        """
+        return self.command_is_runnable("rockprog")

From e557d46c0dd865538492f2ed75a09fd70583dd3a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 14 May 2020 22:31:54 +0200
Subject: [PATCH 327/475] apply darkly theme

---
 htdocs/css/admin.css            |  5 -----
 htdocs/css/bootstrap.min.css    | 12 ++++++++++++
 htdocs/css/features.css         |  4 ----
 htdocs/css/login.css            |  8 --------
 htdocs/css/openwebrx-header.css |  9 +++++++++
 htdocs/features.html            |  2 +-
 htdocs/generalsettings.html     |  2 +-
 htdocs/login.html               |  4 ++--
 htdocs/sdrsettings.html         |  2 +-
 htdocs/settings.html            |  2 +-
 10 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 htdocs/css/bootstrap.min.css

diff --git a/htdocs/css/admin.css b/htdocs/css/admin.css
index 4dd3f80..b6ebcea 100644
--- a/htdocs/css/admin.css
+++ b/htdocs/css/admin.css
@@ -1,11 +1,6 @@
 @import url("openwebrx-header.css");
 @import url("openwebrx-globals.css");
 
-body {
-    background-color: #2e2e2e;
-    color: #DDD;
-}
-
 .buttons {
     text-align: right;
 }
diff --git a/htdocs/css/bootstrap.min.css b/htdocs/css/bootstrap.min.css
new file mode 100644
index 0000000..43d80a0
--- /dev/null
+++ b/htdocs/css/bootstrap.min.css
@@ -0,0 +1,12 @@
+/*!
+ * Bootswatch v4.5.0
+ * Homepage: https://bootswatch.com
+ * Copyright 2012-2020 Thomas Park
+ * Licensed under MIT
+ * Based on Bootstrap
+*//*!
+ * Bootstrap v4.5.0 (https://getbootstrap.com/)
+ * Copyright 2011-2020 The Bootstrap Authors
+ * Copyright 2011-2020 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */@import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic&display=swap");:root{--blue: #375a7f;--indigo: #6610f2;--purple: #6f42c1;--pink: #e83e8c;--red: #E74C3C;--orange: #fd7e14;--yellow: #F39C12;--green: #00bc8c;--teal: #20c997;--cyan: #3498DB;--white: #fff;--gray: #888;--gray-dark: #303030;--primary: #375a7f;--secondary: #444;--success: #00bc8c;--info: #3498DB;--warning: #F39C12;--danger: #E74C3C;--light: #adb5bd;--dark: #303030;--breakpoint-xs: 0;--breakpoint-sm: 576px;--breakpoint-md: 768px;--breakpoint-lg: 992px;--breakpoint-xl: 1200px;--font-family-sans-serif: "Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";--font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace}*,*::before,*::after{-webkit-box-sizing:border-box;box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:rgba(0,0,0,0)}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:"Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";font-size:0.9375rem;font-weight:400;line-height:1.5;color:#fff;text-align:left;background-color:#222}[tabindex="-1"]:focus:not(:focus-visible){outline:0 !important}hr{-webkit-box-sizing:content-box;box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:0.5rem}p{margin-top:0;margin-bottom:1rem}abbr[title],abbr[data-original-title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0;text-decoration-skip-ink:none}address{margin-bottom:1rem;font-style:normal;line-height:inherit}ol,ul,dl{margin-top:0;margin-bottom:1rem}ol ol,ul ul,ol ul,ul ol{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#00bc8c;text-decoration:none;background-color:transparent}a:hover{color:#007053;text-decoration:underline}a:not([href]){color:inherit;text-decoration:none}a:not([href]):hover{color:inherit;text-decoration:none}pre,code,kbd,samp{font-family:SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:0.75rem;padding-bottom:0.75rem;color:#888;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:0.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}input,button,select,optgroup,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[role="button"]{cursor:pointer}select{word-wrap:normal}button,[type="button"],[type="reset"],[type="submit"]{-webkit-appearance:button}button:not(:disabled),[type="button"]:not(:disabled),[type="reset"]:not(:disabled),[type="submit"]:not(:disabled){cursor:pointer}button::-moz-focus-inner,[type="button"]::-moz-focus-inner,[type="reset"]::-moz-focus-inner,[type="submit"]::-moz-focus-inner{padding:0;border-style:none}input[type="radio"],input[type="checkbox"]{-webkit-box-sizing:border-box;box-sizing:border-box;padding:0}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type="number"]::-webkit-inner-spin-button,[type="number"]::-webkit-outer-spin-button{height:auto}[type="search"]{outline-offset:-2px;-webkit-appearance:none}[type="search"]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none !important}h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{margin-bottom:0.5rem;font-weight:500;line-height:1.2}h1,.h1{font-size:3rem}h2,.h2{font-size:2.5rem}h3,.h3{font-size:2rem}h4,.h4{font-size:1.40625rem}h5,.h5{font-size:1.171875rem}h6,.h6{font-size:0.9375rem}.lead{font-size:1.171875rem;font-weight:300}.display-1{font-size:6rem;font-weight:300;line-height:1.2}.display-2{font-size:5.5rem;font-weight:300;line-height:1.2}.display-3{font-size:4.5rem;font-weight:300;line-height:1.2}.display-4{font-size:3.5rem;font-weight:300;line-height:1.2}hr{margin-top:1rem;margin-bottom:1rem;border:0;border-top:1px solid rgba(0,0,0,0.1)}small,.small{font-size:80%;font-weight:400}mark,.mark{padding:0.2em;background-color:#fcf8e3}.list-unstyled{padding-left:0;list-style:none}.list-inline{padding-left:0;list-style:none}.list-inline-item{display:inline-block}.list-inline-item:not(:last-child){margin-right:0.5rem}.initialism{font-size:90%;text-transform:uppercase}.blockquote{margin-bottom:1rem;font-size:1.171875rem}.blockquote-footer{display:block;font-size:80%;color:#888}.blockquote-footer::before{content:"\2014\00A0"}.img-fluid{max-width:100%;height:auto}.img-thumbnail{padding:0.25rem;background-color:#222;border:1px solid #dee2e6;border-radius:0.25rem;max-width:100%;height:auto}.figure{display:inline-block}.figure-img{margin-bottom:0.5rem;line-height:1}.figure-caption{font-size:90%;color:#888}code{font-size:87.5%;color:#e83e8c;word-wrap:break-word}a>code{color:inherit}kbd{padding:0.2rem 0.4rem;font-size:87.5%;color:#fff;background-color:#222;border-radius:0.2rem}kbd kbd{padding:0;font-size:100%;font-weight:700}pre{display:block;font-size:87.5%;color:inherit}pre code{font-size:inherit;color:inherit;word-break:normal}.pre-scrollable{max-height:340px;overflow-y:scroll}.container{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width: 576px){.container{max-width:540px}}@media (min-width: 768px){.container{max-width:720px}}@media (min-width: 992px){.container{max-width:960px}}@media (min-width: 1200px){.container{max-width:1140px}}.container-fluid,.container-sm,.container-md,.container-lg,.container-xl{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}@media (min-width: 576px){.container,.container-sm{max-width:540px}}@media (min-width: 768px){.container,.container-sm,.container-md{max-width:720px}}@media (min-width: 992px){.container,.container-sm,.container-md,.container-lg{max-width:960px}}@media (min-width: 1200px){.container,.container-sm,.container-md,.container-lg,.container-xl{max-width:1140px}}.row{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}.no-gutters{margin-right:0;margin-left:0}.no-gutters>.col,.no-gutters>[class*="col-"]{padding-right:0;padding-left:0}.col-1,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-10,.col-11,.col-12,.col,.col-auto,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm,.col-sm-auto,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-md,.col-md-auto,.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg,.col-lg-auto,.col-xl-1,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl,.col-xl-auto{position:relative;width:100%;padding-right:15px;padding-left:15px}.col{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;min-width:0;max-width:100%}.row-cols-1>*{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-2>*{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-3>*{-webkit-box-flex:0;-ms-flex:0 0 33.3333333333%;flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-4>*{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-5>*{-webkit-box-flex:0;-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-6>*{-webkit-box-flex:0;-ms-flex:0 0 16.6666666667%;flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-1{-webkit-box-flex:0;-ms-flex:0 0 8.3333333333%;flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-2{-webkit-box-flex:0;-ms-flex:0 0 16.6666666667%;flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-4{-webkit-box-flex:0;-ms-flex:0 0 33.3333333333%;flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-5{-webkit-box-flex:0;-ms-flex:0 0 41.6666666667%;flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-7{-webkit-box-flex:0;-ms-flex:0 0 58.3333333333%;flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-8{-webkit-box-flex:0;-ms-flex:0 0 66.6666666667%;flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-10{-webkit-box-flex:0;-ms-flex:0 0 83.3333333333%;flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-11{-webkit-box-flex:0;-ms-flex:0 0 91.6666666667%;flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-1{margin-left:8.3333333333%}.offset-2{margin-left:16.6666666667%}.offset-3{margin-left:25%}.offset-4{margin-left:33.3333333333%}.offset-5{margin-left:41.6666666667%}.offset-6{margin-left:50%}.offset-7{margin-left:58.3333333333%}.offset-8{margin-left:66.6666666667%}.offset-9{margin-left:75%}.offset-10{margin-left:83.3333333333%}.offset-11{margin-left:91.6666666667%}@media (min-width: 576px){.col-sm{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;min-width:0;max-width:100%}.row-cols-sm-1>*{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-sm-2>*{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-sm-3>*{-webkit-box-flex:0;-ms-flex:0 0 33.3333333333%;flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-sm-4>*{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-sm-5>*{-webkit-box-flex:0;-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-sm-6>*{-webkit-box-flex:0;-ms-flex:0 0 16.6666666667%;flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-sm-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-sm-1{-webkit-box-flex:0;-ms-flex:0 0 8.3333333333%;flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-sm-2{-webkit-box-flex:0;-ms-flex:0 0 16.6666666667%;flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-sm-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-sm-4{-webkit-box-flex:0;-ms-flex:0 0 33.3333333333%;flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-sm-5{-webkit-box-flex:0;-ms-flex:0 0 41.6666666667%;flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-sm-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-sm-7{-webkit-box-flex:0;-ms-flex:0 0 58.3333333333%;flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-sm-8{-webkit-box-flex:0;-ms-flex:0 0 66.6666666667%;flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-sm-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-sm-10{-webkit-box-flex:0;-ms-flex:0 0 83.3333333333%;flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-sm-11{-webkit-box-flex:0;-ms-flex:0 0 91.6666666667%;flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-sm-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-sm-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-sm-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-sm-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-sm-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-sm-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-sm-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-sm-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-sm-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-sm-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-sm-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-sm-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-sm-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-sm-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-sm-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-sm-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-sm-0{margin-left:0}.offset-sm-1{margin-left:8.3333333333%}.offset-sm-2{margin-left:16.6666666667%}.offset-sm-3{margin-left:25%}.offset-sm-4{margin-left:33.3333333333%}.offset-sm-5{margin-left:41.6666666667%}.offset-sm-6{margin-left:50%}.offset-sm-7{margin-left:58.3333333333%}.offset-sm-8{margin-left:66.6666666667%}.offset-sm-9{margin-left:75%}.offset-sm-10{margin-left:83.3333333333%}.offset-sm-11{margin-left:91.6666666667%}}@media (min-width: 768px){.col-md{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;min-width:0;max-width:100%}.row-cols-md-1>*{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-md-2>*{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-md-3>*{-webkit-box-flex:0;-ms-flex:0 0 33.3333333333%;flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-md-4>*{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-md-5>*{-webkit-box-flex:0;-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-md-6>*{-webkit-box-flex:0;-ms-flex:0 0 16.6666666667%;flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-md-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-md-1{-webkit-box-flex:0;-ms-flex:0 0 8.3333333333%;flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-md-2{-webkit-box-flex:0;-ms-flex:0 0 16.6666666667%;flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-md-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-md-4{-webkit-box-flex:0;-ms-flex:0 0 33.3333333333%;flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-md-5{-webkit-box-flex:0;-ms-flex:0 0 41.6666666667%;flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-md-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-md-7{-webkit-box-flex:0;-ms-flex:0 0 58.3333333333%;flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-md-8{-webkit-box-flex:0;-ms-flex:0 0 66.6666666667%;flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-md-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-md-10{-webkit-box-flex:0;-ms-flex:0 0 83.3333333333%;flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-md-11{-webkit-box-flex:0;-ms-flex:0 0 91.6666666667%;flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-md-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-md-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-md-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-md-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-md-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-md-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-md-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-md-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-md-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-md-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-md-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-md-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-md-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-md-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-md-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-md-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-md-0{margin-left:0}.offset-md-1{margin-left:8.3333333333%}.offset-md-2{margin-left:16.6666666667%}.offset-md-3{margin-left:25%}.offset-md-4{margin-left:33.3333333333%}.offset-md-5{margin-left:41.6666666667%}.offset-md-6{margin-left:50%}.offset-md-7{margin-left:58.3333333333%}.offset-md-8{margin-left:66.6666666667%}.offset-md-9{margin-left:75%}.offset-md-10{margin-left:83.3333333333%}.offset-md-11{margin-left:91.6666666667%}}@media (min-width: 992px){.col-lg{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;min-width:0;max-width:100%}.row-cols-lg-1>*{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-lg-2>*{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-lg-3>*{-webkit-box-flex:0;-ms-flex:0 0 33.3333333333%;flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-lg-4>*{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-lg-5>*{-webkit-box-flex:0;-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-lg-6>*{-webkit-box-flex:0;-ms-flex:0 0 16.6666666667%;flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-lg-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-lg-1{-webkit-box-flex:0;-ms-flex:0 0 8.3333333333%;flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-lg-2{-webkit-box-flex:0;-ms-flex:0 0 16.6666666667%;flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-lg-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-lg-4{-webkit-box-flex:0;-ms-flex:0 0 33.3333333333%;flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-lg-5{-webkit-box-flex:0;-ms-flex:0 0 41.6666666667%;flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-lg-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-lg-7{-webkit-box-flex:0;-ms-flex:0 0 58.3333333333%;flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-lg-8{-webkit-box-flex:0;-ms-flex:0 0 66.6666666667%;flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-lg-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-lg-10{-webkit-box-flex:0;-ms-flex:0 0 83.3333333333%;flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-lg-11{-webkit-box-flex:0;-ms-flex:0 0 91.6666666667%;flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-lg-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-lg-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-lg-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-lg-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-lg-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-lg-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-lg-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-lg-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-lg-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-lg-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-lg-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-lg-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-lg-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-lg-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-lg-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-lg-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-lg-0{margin-left:0}.offset-lg-1{margin-left:8.3333333333%}.offset-lg-2{margin-left:16.6666666667%}.offset-lg-3{margin-left:25%}.offset-lg-4{margin-left:33.3333333333%}.offset-lg-5{margin-left:41.6666666667%}.offset-lg-6{margin-left:50%}.offset-lg-7{margin-left:58.3333333333%}.offset-lg-8{margin-left:66.6666666667%}.offset-lg-9{margin-left:75%}.offset-lg-10{margin-left:83.3333333333%}.offset-lg-11{margin-left:91.6666666667%}}@media (min-width: 1200px){.col-xl{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;min-width:0;max-width:100%}.row-cols-xl-1>*{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.row-cols-xl-2>*{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.row-cols-xl-3>*{-webkit-box-flex:0;-ms-flex:0 0 33.3333333333%;flex:0 0 33.3333333333%;max-width:33.3333333333%}.row-cols-xl-4>*{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.row-cols-xl-5>*{-webkit-box-flex:0;-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}.row-cols-xl-6>*{-webkit-box-flex:0;-ms-flex:0 0 16.6666666667%;flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-xl-auto{-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}.col-xl-1{-webkit-box-flex:0;-ms-flex:0 0 8.3333333333%;flex:0 0 8.3333333333%;max-width:8.3333333333%}.col-xl-2{-webkit-box-flex:0;-ms-flex:0 0 16.6666666667%;flex:0 0 16.6666666667%;max-width:16.6666666667%}.col-xl-3{-webkit-box-flex:0;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-xl-4{-webkit-box-flex:0;-ms-flex:0 0 33.3333333333%;flex:0 0 33.3333333333%;max-width:33.3333333333%}.col-xl-5{-webkit-box-flex:0;-ms-flex:0 0 41.6666666667%;flex:0 0 41.6666666667%;max-width:41.6666666667%}.col-xl-6{-webkit-box-flex:0;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-xl-7{-webkit-box-flex:0;-ms-flex:0 0 58.3333333333%;flex:0 0 58.3333333333%;max-width:58.3333333333%}.col-xl-8{-webkit-box-flex:0;-ms-flex:0 0 66.6666666667%;flex:0 0 66.6666666667%;max-width:66.6666666667%}.col-xl-9{-webkit-box-flex:0;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-xl-10{-webkit-box-flex:0;-ms-flex:0 0 83.3333333333%;flex:0 0 83.3333333333%;max-width:83.3333333333%}.col-xl-11{-webkit-box-flex:0;-ms-flex:0 0 91.6666666667%;flex:0 0 91.6666666667%;max-width:91.6666666667%}.col-xl-12{-webkit-box-flex:0;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.order-xl-first{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.order-xl-last{-webkit-box-ordinal-group:14;-ms-flex-order:13;order:13}.order-xl-0{-webkit-box-ordinal-group:1;-ms-flex-order:0;order:0}.order-xl-1{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}.order-xl-2{-webkit-box-ordinal-group:3;-ms-flex-order:2;order:2}.order-xl-3{-webkit-box-ordinal-group:4;-ms-flex-order:3;order:3}.order-xl-4{-webkit-box-ordinal-group:5;-ms-flex-order:4;order:4}.order-xl-5{-webkit-box-ordinal-group:6;-ms-flex-order:5;order:5}.order-xl-6{-webkit-box-ordinal-group:7;-ms-flex-order:6;order:6}.order-xl-7{-webkit-box-ordinal-group:8;-ms-flex-order:7;order:7}.order-xl-8{-webkit-box-ordinal-group:9;-ms-flex-order:8;order:8}.order-xl-9{-webkit-box-ordinal-group:10;-ms-flex-order:9;order:9}.order-xl-10{-webkit-box-ordinal-group:11;-ms-flex-order:10;order:10}.order-xl-11{-webkit-box-ordinal-group:12;-ms-flex-order:11;order:11}.order-xl-12{-webkit-box-ordinal-group:13;-ms-flex-order:12;order:12}.offset-xl-0{margin-left:0}.offset-xl-1{margin-left:8.3333333333%}.offset-xl-2{margin-left:16.6666666667%}.offset-xl-3{margin-left:25%}.offset-xl-4{margin-left:33.3333333333%}.offset-xl-5{margin-left:41.6666666667%}.offset-xl-6{margin-left:50%}.offset-xl-7{margin-left:58.3333333333%}.offset-xl-8{margin-left:66.6666666667%}.offset-xl-9{margin-left:75%}.offset-xl-10{margin-left:83.3333333333%}.offset-xl-11{margin-left:91.6666666667%}}.table{width:100%;margin-bottom:1rem;color:#fff}.table th,.table td{padding:0.75rem;vertical-align:top;border-top:1px solid #444}.table thead th{vertical-align:bottom;border-bottom:2px solid #444}.table tbody+tbody{border-top:2px solid #444}.table-sm th,.table-sm td{padding:0.3rem}.table-bordered{border:1px solid #444}.table-bordered th,.table-bordered td{border:1px solid #444}.table-bordered thead th,.table-bordered thead td{border-bottom-width:2px}.table-borderless th,.table-borderless td,.table-borderless thead th,.table-borderless tbody+tbody{border:0}.table-striped tbody tr:nth-of-type(odd){background-color:#303030}.table-hover tbody tr:hover{color:#fff;background-color:rgba(0,0,0,0.075)}.table-primary,.table-primary>th,.table-primary>td{background-color:#c7d1db}.table-primary th,.table-primary td,.table-primary thead th,.table-primary tbody+tbody{border-color:#97a9bc}.table-hover .table-primary:hover{background-color:#b7c4d1}.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#b7c4d1}.table-secondary,.table-secondary>th,.table-secondary>td{background-color:#cbcbcb}.table-secondary th,.table-secondary td,.table-secondary thead th,.table-secondary tbody+tbody{border-color:#9e9e9e}.table-hover .table-secondary:hover{background-color:#bebebe}.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#bebebe}.table-success,.table-success>th,.table-success>td{background-color:#b8ecdf}.table-success th,.table-success td,.table-success thead th,.table-success tbody+tbody{border-color:#7adcc3}.table-hover .table-success:hover{background-color:#a4e7d6}.table-hover .table-success:hover>td,.table-hover .table-success:hover>th{background-color:#a4e7d6}.table-info,.table-info>th,.table-info>td{background-color:#c6e2f5}.table-info th,.table-info td,.table-info thead th,.table-info tbody+tbody{border-color:#95c9ec}.table-hover .table-info:hover{background-color:#b0d7f1}.table-hover .table-info:hover>td,.table-hover .table-info:hover>th{background-color:#b0d7f1}.table-warning,.table-warning>th,.table-warning>td{background-color:#fce3bd}.table-warning th,.table-warning td,.table-warning thead th,.table-warning tbody+tbody{border-color:#f9cc84}.table-hover .table-warning:hover{background-color:#fbd9a5}.table-hover .table-warning:hover>td,.table-hover .table-warning:hover>th{background-color:#fbd9a5}.table-danger,.table-danger>th,.table-danger>td{background-color:#f8cdc8}.table-danger th,.table-danger td,.table-danger thead th,.table-danger tbody+tbody{border-color:#f3a29a}.table-hover .table-danger:hover{background-color:#f5b8b1}.table-hover .table-danger:hover>td,.table-hover .table-danger:hover>th{background-color:#f5b8b1}.table-light,.table-light>th,.table-light>td{background-color:#e8eaed}.table-light th,.table-light td,.table-light thead th,.table-light tbody+tbody{border-color:#d4d9dd}.table-hover .table-light:hover{background-color:#dadde2}.table-hover .table-light:hover>td,.table-hover .table-light:hover>th{background-color:#dadde2}.table-dark,.table-dark>th,.table-dark>td{background-color:#c5c5c5}.table-dark th,.table-dark td,.table-dark thead th,.table-dark tbody+tbody{border-color:#939393}.table-hover .table-dark:hover{background-color:#b8b8b8}.table-hover .table-dark:hover>td,.table-hover .table-dark:hover>th{background-color:#b8b8b8}.table-active,.table-active>th,.table-active>td{background-color:rgba(0,0,0,0.075)}.table-hover .table-active:hover{background-color:rgba(0,0,0,0.075)}.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(0,0,0,0.075)}.table .thead-dark th{color:#fff;background-color:#303030;border-color:#434343}.table .thead-light th{color:#444;background-color:#ebebeb;border-color:#444}.table-dark{color:#fff;background-color:#303030}.table-dark th,.table-dark td,.table-dark thead th{border-color:#434343}.table-dark.table-bordered{border:0}.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:rgba(255,255,255,0.05)}.table-dark.table-hover tbody tr:hover{color:#fff;background-color:rgba(255,255,255,0.075)}@media (max-width: 575.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-sm>.table-bordered{border:0}}@media (max-width: 767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-md>.table-bordered{border:0}}@media (max-width: 991.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-lg>.table-bordered{border:0}}@media (max-width: 1199.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive-xl>.table-bordered{border:0}}.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}.table-responsive>.table-bordered{border:0}.form-control{display:block;width:100%;height:calc(1.5em + 0.75rem + 2px);padding:0.375rem 0.75rem;font-size:0.9375rem;font-weight:400;line-height:1.5;color:#444;background-color:#fff;background-clip:padding-box;border:1px solid #222;border-radius:0.25rem;-webkit-transition:border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;transition:border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out}@media (prefers-reduced-motion: reduce){.form-control{-webkit-transition:none;transition:none}}.form-control::-ms-expand{background-color:transparent;border:0}.form-control:-moz-focusring{color:transparent;text-shadow:0 0 0 #444}.form-control:focus{color:#444;background-color:#fff;border-color:#739ac2;outline:0;-webkit-box-shadow:0 0 0 0.2rem rgba(55,90,127,0.25);box-shadow:0 0 0 0.2rem rgba(55,90,127,0.25)}.form-control::-webkit-input-placeholder{color:#888;opacity:1}.form-control::-ms-input-placeholder{color:#888;opacity:1}.form-control::placeholder{color:#888;opacity:1}.form-control:disabled,.form-control[readonly]{background-color:#ebebeb;opacity:1}input[type="date"].form-control,input[type="time"].form-control,input[type="datetime-local"].form-control,input[type="month"].form-control{-webkit-appearance:none;-moz-appearance:none;appearance:none}select.form-control:focus::-ms-value{color:#444;background-color:#fff}.form-control-file,.form-control-range{display:block;width:100%}.col-form-label{padding-top:calc(0.375rem + 1px);padding-bottom:calc(0.375rem + 1px);margin-bottom:0;font-size:inherit;line-height:1.5}.col-form-label-lg{padding-top:calc(0.5rem + 1px);padding-bottom:calc(0.5rem + 1px);font-size:1.171875rem;line-height:1.5}.col-form-label-sm{padding-top:calc(0.25rem + 1px);padding-bottom:calc(0.25rem + 1px);font-size:0.8203125rem;line-height:1.5}.form-control-plaintext{display:block;width:100%;padding:0.375rem 0;margin-bottom:0;font-size:0.9375rem;line-height:1.5;color:#fff;background-color:transparent;border:solid transparent;border-width:1px 0}.form-control-plaintext.form-control-sm,.form-control-plaintext.form-control-lg{padding-right:0;padding-left:0}.form-control-sm{height:calc(1.5em + 0.5rem + 2px);padding:0.25rem 0.5rem;font-size:0.8203125rem;line-height:1.5;border-radius:0.2rem}.form-control-lg{height:calc(1.5em + 1rem + 2px);padding:0.5rem 1rem;font-size:1.171875rem;line-height:1.5;border-radius:0.3rem}select.form-control[size],select.form-control[multiple]{height:auto}textarea.form-control{height:auto}.form-group{margin-bottom:1rem}.form-text{display:block;margin-top:0.25rem}.form-row{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-5px;margin-left:-5px}.form-row>.col,.form-row>[class*="col-"]{padding-right:5px;padding-left:5px}.form-check{position:relative;display:block;padding-left:1.25rem}.form-check-input{position:absolute;margin-top:0.3rem;margin-left:-1.25rem}.form-check-input[disabled] ~ .form-check-label,.form-check-input:disabled ~ .form-check-label{color:#888}.form-check-label{margin-bottom:0}.form-check-inline{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding-left:0;margin-right:0.75rem}.form-check-inline .form-check-input{position:static;margin-top:0;margin-right:0.3125rem;margin-left:0}.valid-feedback{display:none;width:100%;margin-top:0.25rem;font-size:80%;color:#00bc8c}.valid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:0.25rem 0.5rem;margin-top:.1rem;font-size:0.8203125rem;line-height:1.5;color:#fff;background-color:rgba(0,188,140,0.9);border-radius:0.25rem}.was-validated :valid ~ .valid-feedback,.was-validated :valid ~ .valid-tooltip,.is-valid ~ .valid-feedback,.is-valid ~ .valid-tooltip{display:block}.was-validated .form-control:valid,.form-control.is-valid{border-color:#00bc8c;padding-right:calc(1.5em + 0.75rem);background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2300bc8c' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");background-repeat:no-repeat;background-position:right calc(0.375em + 0.1875rem) center;background-size:calc(0.75em + 0.375rem) calc(0.75em + 0.375rem)}.was-validated .form-control:valid:focus,.form-control.is-valid:focus{border-color:#00bc8c;-webkit-box-shadow:0 0 0 0.2rem rgba(0,188,140,0.25);box-shadow:0 0 0 0.2rem rgba(0,188,140,0.25)}.was-validated textarea.form-control:valid,textarea.form-control.is-valid{padding-right:calc(1.5em + 0.75rem);background-position:top calc(0.375em + 0.1875rem) right calc(0.375em + 0.1875rem)}.was-validated .custom-select:valid,.custom-select.is-valid{border-color:#00bc8c;padding-right:calc(0.75em + 2.3125rem);background:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23303030' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px,url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2300bc8c' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem)}.was-validated .custom-select:valid:focus,.custom-select.is-valid:focus{border-color:#00bc8c;-webkit-box-shadow:0 0 0 0.2rem rgba(0,188,140,0.25);box-shadow:0 0 0 0.2rem rgba(0,188,140,0.25)}.was-validated .form-check-input:valid ~ .form-check-label,.form-check-input.is-valid ~ .form-check-label{color:#00bc8c}.was-validated .form-check-input:valid ~ .valid-feedback,.was-validated .form-check-input:valid ~ .valid-tooltip,.form-check-input.is-valid ~ .valid-feedback,.form-check-input.is-valid ~ .valid-tooltip{display:block}.was-validated .custom-control-input:valid ~ .custom-control-label,.custom-control-input.is-valid ~ .custom-control-label{color:#00bc8c}.was-validated .custom-control-input:valid ~ .custom-control-label::before,.custom-control-input.is-valid ~ .custom-control-label::before{border-color:#00bc8c}.was-validated .custom-control-input:valid:checked ~ .custom-control-label::before,.custom-control-input.is-valid:checked ~ .custom-control-label::before{border-color:#00efb2;background-color:#00efb2}.was-validated .custom-control-input:valid:focus ~ .custom-control-label::before,.custom-control-input.is-valid:focus ~ .custom-control-label::before{-webkit-box-shadow:0 0 0 0.2rem rgba(0,188,140,0.25);box-shadow:0 0 0 0.2rem rgba(0,188,140,0.25)}.was-validated .custom-control-input:valid:focus:not(:checked) ~ .custom-control-label::before,.custom-control-input.is-valid:focus:not(:checked) ~ .custom-control-label::before{border-color:#00bc8c}.was-validated .custom-file-input:valid ~ .custom-file-label,.custom-file-input.is-valid ~ .custom-file-label{border-color:#00bc8c}.was-validated .custom-file-input:valid:focus ~ .custom-file-label,.custom-file-input.is-valid:focus ~ .custom-file-label{border-color:#00bc8c;-webkit-box-shadow:0 0 0 0.2rem rgba(0,188,140,0.25);box-shadow:0 0 0 0.2rem rgba(0,188,140,0.25)}.invalid-feedback{display:none;width:100%;margin-top:0.25rem;font-size:80%;color:#E74C3C}.invalid-tooltip{position:absolute;top:100%;z-index:5;display:none;max-width:100%;padding:0.25rem 0.5rem;margin-top:.1rem;font-size:0.8203125rem;line-height:1.5;color:#fff;background-color:rgba(231,76,60,0.9);border-radius:0.25rem}.was-validated :invalid ~ .invalid-feedback,.was-validated :invalid ~ .invalid-tooltip,.is-invalid ~ .invalid-feedback,.is-invalid ~ .invalid-tooltip{display:block}.was-validated .form-control:invalid,.form-control.is-invalid{border-color:#E74C3C;padding-right:calc(1.5em + 0.75rem);background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23E74C3C' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23E74C3C' stroke='none'/%3e%3c/svg%3e");background-repeat:no-repeat;background-position:right calc(0.375em + 0.1875rem) center;background-size:calc(0.75em + 0.375rem) calc(0.75em + 0.375rem)}.was-validated .form-control:invalid:focus,.form-control.is-invalid:focus{border-color:#E74C3C;-webkit-box-shadow:0 0 0 0.2rem rgba(231,76,60,0.25);box-shadow:0 0 0 0.2rem rgba(231,76,60,0.25)}.was-validated textarea.form-control:invalid,textarea.form-control.is-invalid{padding-right:calc(1.5em + 0.75rem);background-position:top calc(0.375em + 0.1875rem) right calc(0.375em + 0.1875rem)}.was-validated .custom-select:invalid,.custom-select.is-invalid{border-color:#E74C3C;padding-right:calc(0.75em + 2.3125rem);background:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23303030' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px,url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23E74C3C' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23E74C3C' stroke='none'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem)}.was-validated .custom-select:invalid:focus,.custom-select.is-invalid:focus{border-color:#E74C3C;-webkit-box-shadow:0 0 0 0.2rem rgba(231,76,60,0.25);box-shadow:0 0 0 0.2rem rgba(231,76,60,0.25)}.was-validated .form-check-input:invalid ~ .form-check-label,.form-check-input.is-invalid ~ .form-check-label{color:#E74C3C}.was-validated .form-check-input:invalid ~ .invalid-feedback,.was-validated .form-check-input:invalid ~ .invalid-tooltip,.form-check-input.is-invalid ~ .invalid-feedback,.form-check-input.is-invalid ~ .invalid-tooltip{display:block}.was-validated .custom-control-input:invalid ~ .custom-control-label,.custom-control-input.is-invalid ~ .custom-control-label{color:#E74C3C}.was-validated .custom-control-input:invalid ~ .custom-control-label::before,.custom-control-input.is-invalid ~ .custom-control-label::before{border-color:#E74C3C}.was-validated .custom-control-input:invalid:checked ~ .custom-control-label::before,.custom-control-input.is-invalid:checked ~ .custom-control-label::before{border-color:#ed7669;background-color:#ed7669}.was-validated .custom-control-input:invalid:focus ~ .custom-control-label::before,.custom-control-input.is-invalid:focus ~ .custom-control-label::before{-webkit-box-shadow:0 0 0 0.2rem rgba(231,76,60,0.25);box-shadow:0 0 0 0.2rem rgba(231,76,60,0.25)}.was-validated .custom-control-input:invalid:focus:not(:checked) ~ .custom-control-label::before,.custom-control-input.is-invalid:focus:not(:checked) ~ .custom-control-label::before{border-color:#E74C3C}.was-validated .custom-file-input:invalid ~ .custom-file-label,.custom-file-input.is-invalid ~ .custom-file-label{border-color:#E74C3C}.was-validated .custom-file-input:invalid:focus ~ .custom-file-label,.custom-file-input.is-invalid:focus ~ .custom-file-label{border-color:#E74C3C;-webkit-box-shadow:0 0 0 0.2rem rgba(231,76,60,0.25);box-shadow:0 0 0 0.2rem rgba(231,76,60,0.25)}.form-inline{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.form-inline .form-check{width:100%}@media (min-width: 576px){.form-inline label{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;margin-bottom:0}.form-inline .form-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;margin-bottom:0}.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}.form-inline .form-control-plaintext{display:inline-block}.form-inline .input-group,.form-inline .custom-select{width:auto}.form-inline .form-check{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:auto;padding-left:0}.form-inline .form-check-input{position:relative;-ms-flex-negative:0;flex-shrink:0;margin-top:0;margin-right:0.25rem;margin-left:0}.form-inline .custom-control{-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.form-inline .custom-control-label{margin-bottom:0}}.btn{display:inline-block;font-weight:400;color:#fff;text-align:center;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:transparent;border:1px solid transparent;padding:0.375rem 0.75rem;font-size:0.9375rem;line-height:1.5;border-radius:0.25rem;-webkit-transition:color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;transition:color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out}@media (prefers-reduced-motion: reduce){.btn{-webkit-transition:none;transition:none}}.btn:hover{color:#fff;text-decoration:none}.btn:focus,.btn.focus{outline:0;-webkit-box-shadow:0 0 0 0.2rem rgba(55,90,127,0.25);box-shadow:0 0 0 0.2rem rgba(55,90,127,0.25)}.btn.disabled,.btn:disabled{opacity:0.65}.btn:not(:disabled):not(.disabled){cursor:pointer}a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}.btn-primary{color:#fff;background-color:#375a7f;border-color:#375a7f}.btn-primary:hover{color:#fff;background-color:#2b4764;border-color:#28415b}.btn-primary:focus,.btn-primary.focus{color:#fff;background-color:#2b4764;border-color:#28415b;-webkit-box-shadow:0 0 0 0.2rem rgba(85,115,146,0.5);box-shadow:0 0 0 0.2rem rgba(85,115,146,0.5)}.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#375a7f;border-color:#375a7f}.btn-primary:not(:disabled):not(.disabled):active,.btn-primary:not(:disabled):not(.disabled).active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#28415b;border-color:#243a53}.btn-primary:not(:disabled):not(.disabled):active:focus,.btn-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-primary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(85,115,146,0.5);box-shadow:0 0 0 0.2rem rgba(85,115,146,0.5)}.btn-secondary{color:#fff;background-color:#444;border-color:#444}.btn-secondary:hover{color:#fff;background-color:#313131;border-color:#2b2a2a}.btn-secondary:focus,.btn-secondary.focus{color:#fff;background-color:#313131;border-color:#2b2a2a;-webkit-box-shadow:0 0 0 0.2rem rgba(96,96,96,0.5);box-shadow:0 0 0 0.2rem rgba(96,96,96,0.5)}.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#444;border-color:#444}.btn-secondary:not(:disabled):not(.disabled):active,.btn-secondary:not(:disabled):not(.disabled).active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#2b2a2a;border-color:#242424}.btn-secondary:not(:disabled):not(.disabled):active:focus,.btn-secondary:not(:disabled):not(.disabled).active:focus,.show>.btn-secondary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(96,96,96,0.5);box-shadow:0 0 0 0.2rem rgba(96,96,96,0.5)}.btn-success{color:#fff;background-color:#00bc8c;border-color:#00bc8c}.btn-success:hover{color:#fff;background-color:#009670;border-color:#008966}.btn-success:focus,.btn-success.focus{color:#fff;background-color:#009670;border-color:#008966;-webkit-box-shadow:0 0 0 0.2rem rgba(38,198,157,0.5);box-shadow:0 0 0 0.2rem rgba(38,198,157,0.5)}.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#00bc8c;border-color:#00bc8c}.btn-success:not(:disabled):not(.disabled):active,.btn-success:not(:disabled):not(.disabled).active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#008966;border-color:#007c5d}.btn-success:not(:disabled):not(.disabled):active:focus,.btn-success:not(:disabled):not(.disabled).active:focus,.show>.btn-success.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(38,198,157,0.5);box-shadow:0 0 0 0.2rem rgba(38,198,157,0.5)}.btn-info{color:#fff;background-color:#3498DB;border-color:#3498DB}.btn-info:hover{color:#fff;background-color:#2384c6;border-color:#217dbb}.btn-info:focus,.btn-info.focus{color:#fff;background-color:#2384c6;border-color:#217dbb;-webkit-box-shadow:0 0 0 0.2rem rgba(82,167,224,0.5);box-shadow:0 0 0 0.2rem rgba(82,167,224,0.5)}.btn-info.disabled,.btn-info:disabled{color:#fff;background-color:#3498DB;border-color:#3498DB}.btn-info:not(:disabled):not(.disabled):active,.btn-info:not(:disabled):not(.disabled).active,.show>.btn-info.dropdown-toggle{color:#fff;background-color:#217dbb;border-color:#1f76b0}.btn-info:not(:disabled):not(.disabled):active:focus,.btn-info:not(:disabled):not(.disabled).active:focus,.show>.btn-info.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(82,167,224,0.5);box-shadow:0 0 0 0.2rem rgba(82,167,224,0.5)}.btn-warning{color:#fff;background-color:#F39C12;border-color:#F39C12}.btn-warning:hover{color:#fff;background-color:#d4860b;border-color:#c87f0a}.btn-warning:focus,.btn-warning.focus{color:#fff;background-color:#d4860b;border-color:#c87f0a;-webkit-box-shadow:0 0 0 0.2rem rgba(245,171,54,0.5);box-shadow:0 0 0 0.2rem rgba(245,171,54,0.5)}.btn-warning.disabled,.btn-warning:disabled{color:#fff;background-color:#F39C12;border-color:#F39C12}.btn-warning:not(:disabled):not(.disabled):active,.btn-warning:not(:disabled):not(.disabled).active,.show>.btn-warning.dropdown-toggle{color:#fff;background-color:#c87f0a;border-color:#bc770a}.btn-warning:not(:disabled):not(.disabled):active:focus,.btn-warning:not(:disabled):not(.disabled).active:focus,.show>.btn-warning.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(245,171,54,0.5);box-shadow:0 0 0 0.2rem rgba(245,171,54,0.5)}.btn-danger{color:#fff;background-color:#E74C3C;border-color:#E74C3C}.btn-danger:hover{color:#fff;background-color:#e12e1c;border-color:#d62c1a}.btn-danger:focus,.btn-danger.focus{color:#fff;background-color:#e12e1c;border-color:#d62c1a;-webkit-box-shadow:0 0 0 0.2rem rgba(235,103,89,0.5);box-shadow:0 0 0 0.2rem rgba(235,103,89,0.5)}.btn-danger.disabled,.btn-danger:disabled{color:#fff;background-color:#E74C3C;border-color:#E74C3C}.btn-danger:not(:disabled):not(.disabled):active,.btn-danger:not(:disabled):not(.disabled).active,.show>.btn-danger.dropdown-toggle{color:#fff;background-color:#d62c1a;border-color:#ca2a19}.btn-danger:not(:disabled):not(.disabled):active:focus,.btn-danger:not(:disabled):not(.disabled).active:focus,.show>.btn-danger.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(235,103,89,0.5);box-shadow:0 0 0 0.2rem rgba(235,103,89,0.5)}.btn-light{color:#222;background-color:#adb5bd;border-color:#adb5bd}.btn-light:hover{color:#fff;background-color:#98a2ac;border-color:#919ca6}.btn-light:focus,.btn-light.focus{color:#fff;background-color:#98a2ac;border-color:#919ca6;-webkit-box-shadow:0 0 0 0.2rem rgba(152,159,166,0.5);box-shadow:0 0 0 0.2rem rgba(152,159,166,0.5)}.btn-light.disabled,.btn-light:disabled{color:#222;background-color:#adb5bd;border-color:#adb5bd}.btn-light:not(:disabled):not(.disabled):active,.btn-light:not(:disabled):not(.disabled).active,.show>.btn-light.dropdown-toggle{color:#fff;background-color:#919ca6;border-color:#8a95a1}.btn-light:not(:disabled):not(.disabled):active:focus,.btn-light:not(:disabled):not(.disabled).active:focus,.show>.btn-light.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(152,159,166,0.5);box-shadow:0 0 0 0.2rem rgba(152,159,166,0.5)}.btn-dark{color:#fff;background-color:#303030;border-color:#303030}.btn-dark:hover{color:#fff;background-color:#1d1d1d;border-color:#171616}.btn-dark:focus,.btn-dark.focus{color:#fff;background-color:#1d1d1d;border-color:#171616;-webkit-box-shadow:0 0 0 0.2rem rgba(79,79,79,0.5);box-shadow:0 0 0 0.2rem rgba(79,79,79,0.5)}.btn-dark.disabled,.btn-dark:disabled{color:#fff;background-color:#303030;border-color:#303030}.btn-dark:not(:disabled):not(.disabled):active,.btn-dark:not(:disabled):not(.disabled).active,.show>.btn-dark.dropdown-toggle{color:#fff;background-color:#171616;border-color:#101010}.btn-dark:not(:disabled):not(.disabled):active:focus,.btn-dark:not(:disabled):not(.disabled).active:focus,.show>.btn-dark.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(79,79,79,0.5);box-shadow:0 0 0 0.2rem rgba(79,79,79,0.5)}.btn-outline-primary{color:#375a7f;border-color:#375a7f}.btn-outline-primary:hover{color:#fff;background-color:#375a7f;border-color:#375a7f}.btn-outline-primary:focus,.btn-outline-primary.focus{-webkit-box-shadow:0 0 0 0.2rem rgba(55,90,127,0.5);box-shadow:0 0 0 0.2rem rgba(55,90,127,0.5)}.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#375a7f;background-color:transparent}.btn-outline-primary:not(:disabled):not(.disabled):active,.btn-outline-primary:not(:disabled):not(.disabled).active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color:#375a7f;border-color:#375a7f}.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(55,90,127,0.5);box-shadow:0 0 0 0.2rem rgba(55,90,127,0.5)}.btn-outline-secondary{color:#444;border-color:#444}.btn-outline-secondary:hover{color:#fff;background-color:#444;border-color:#444}.btn-outline-secondary:focus,.btn-outline-secondary.focus{-webkit-box-shadow:0 0 0 0.2rem rgba(68,68,68,0.5);box-shadow:0 0 0 0.2rem rgba(68,68,68,0.5)}.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#444;background-color:transparent}.btn-outline-secondary:not(:disabled):not(.disabled):active,.btn-outline-secondary:not(:disabled):not(.disabled).active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#444;border-color:#444}.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(68,68,68,0.5);box-shadow:0 0 0 0.2rem rgba(68,68,68,0.5)}.btn-outline-success{color:#00bc8c;border-color:#00bc8c}.btn-outline-success:hover{color:#fff;background-color:#00bc8c;border-color:#00bc8c}.btn-outline-success:focus,.btn-outline-success.focus{-webkit-box-shadow:0 0 0 0.2rem rgba(0,188,140,0.5);box-shadow:0 0 0 0.2rem rgba(0,188,140,0.5)}.btn-outline-success.disabled,.btn-outline-success:disabled{color:#00bc8c;background-color:transparent}.btn-outline-success:not(:disabled):not(.disabled):active,.btn-outline-success:not(:disabled):not(.disabled).active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color:#00bc8c;border-color:#00bc8c}.btn-outline-success:not(:disabled):not(.disabled):active:focus,.btn-outline-success:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-success.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(0,188,140,0.5);box-shadow:0 0 0 0.2rem rgba(0,188,140,0.5)}.btn-outline-info{color:#3498DB;border-color:#3498DB}.btn-outline-info:hover{color:#fff;background-color:#3498DB;border-color:#3498DB}.btn-outline-info:focus,.btn-outline-info.focus{-webkit-box-shadow:0 0 0 0.2rem rgba(52,152,219,0.5);box-shadow:0 0 0 0.2rem rgba(52,152,219,0.5)}.btn-outline-info.disabled,.btn-outline-info:disabled{color:#3498DB;background-color:transparent}.btn-outline-info:not(:disabled):not(.disabled):active,.btn-outline-info:not(:disabled):not(.disabled).active,.show>.btn-outline-info.dropdown-toggle{color:#fff;background-color:#3498DB;border-color:#3498DB}.btn-outline-info:not(:disabled):not(.disabled):active:focus,.btn-outline-info:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-info.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(52,152,219,0.5);box-shadow:0 0 0 0.2rem rgba(52,152,219,0.5)}.btn-outline-warning{color:#F39C12;border-color:#F39C12}.btn-outline-warning:hover{color:#fff;background-color:#F39C12;border-color:#F39C12}.btn-outline-warning:focus,.btn-outline-warning.focus{-webkit-box-shadow:0 0 0 0.2rem rgba(243,156,18,0.5);box-shadow:0 0 0 0.2rem rgba(243,156,18,0.5)}.btn-outline-warning.disabled,.btn-outline-warning:disabled{color:#F39C12;background-color:transparent}.btn-outline-warning:not(:disabled):not(.disabled):active,.btn-outline-warning:not(:disabled):not(.disabled).active,.show>.btn-outline-warning.dropdown-toggle{color:#fff;background-color:#F39C12;border-color:#F39C12}.btn-outline-warning:not(:disabled):not(.disabled):active:focus,.btn-outline-warning:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-warning.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(243,156,18,0.5);box-shadow:0 0 0 0.2rem rgba(243,156,18,0.5)}.btn-outline-danger{color:#E74C3C;border-color:#E74C3C}.btn-outline-danger:hover{color:#fff;background-color:#E74C3C;border-color:#E74C3C}.btn-outline-danger:focus,.btn-outline-danger.focus{-webkit-box-shadow:0 0 0 0.2rem rgba(231,76,60,0.5);box-shadow:0 0 0 0.2rem rgba(231,76,60,0.5)}.btn-outline-danger.disabled,.btn-outline-danger:disabled{color:#E74C3C;background-color:transparent}.btn-outline-danger:not(:disabled):not(.disabled):active,.btn-outline-danger:not(:disabled):not(.disabled).active,.show>.btn-outline-danger.dropdown-toggle{color:#fff;background-color:#E74C3C;border-color:#E74C3C}.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.btn-outline-danger:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-danger.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(231,76,60,0.5);box-shadow:0 0 0 0.2rem rgba(231,76,60,0.5)}.btn-outline-light{color:#adb5bd;border-color:#adb5bd}.btn-outline-light:hover{color:#222;background-color:#adb5bd;border-color:#adb5bd}.btn-outline-light:focus,.btn-outline-light.focus{-webkit-box-shadow:0 0 0 0.2rem rgba(173,181,189,0.5);box-shadow:0 0 0 0.2rem rgba(173,181,189,0.5)}.btn-outline-light.disabled,.btn-outline-light:disabled{color:#adb5bd;background-color:transparent}.btn-outline-light:not(:disabled):not(.disabled):active,.btn-outline-light:not(:disabled):not(.disabled).active,.show>.btn-outline-light.dropdown-toggle{color:#222;background-color:#adb5bd;border-color:#adb5bd}.btn-outline-light:not(:disabled):not(.disabled):active:focus,.btn-outline-light:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-light.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(173,181,189,0.5);box-shadow:0 0 0 0.2rem rgba(173,181,189,0.5)}.btn-outline-dark{color:#303030;border-color:#303030}.btn-outline-dark:hover{color:#fff;background-color:#303030;border-color:#303030}.btn-outline-dark:focus,.btn-outline-dark.focus{-webkit-box-shadow:0 0 0 0.2rem rgba(48,48,48,0.5);box-shadow:0 0 0 0.2rem rgba(48,48,48,0.5)}.btn-outline-dark.disabled,.btn-outline-dark:disabled{color:#303030;background-color:transparent}.btn-outline-dark:not(:disabled):not(.disabled):active,.btn-outline-dark:not(:disabled):not(.disabled).active,.show>.btn-outline-dark.dropdown-toggle{color:#fff;background-color:#303030;border-color:#303030}.btn-outline-dark:not(:disabled):not(.disabled):active:focus,.btn-outline-dark:not(:disabled):not(.disabled).active:focus,.show>.btn-outline-dark.dropdown-toggle:focus{-webkit-box-shadow:0 0 0 0.2rem rgba(48,48,48,0.5);box-shadow:0 0 0 0.2rem rgba(48,48,48,0.5)}.btn-link{font-weight:400;color:#00bc8c;text-decoration:none}.btn-link:hover{color:#007053;text-decoration:underline}.btn-link:focus,.btn-link.focus{text-decoration:underline}.btn-link:disabled,.btn-link.disabled{color:#888;pointer-events:none}.btn-lg,.btn-group-lg>.btn{padding:0.5rem 1rem;font-size:1.171875rem;line-height:1.5;border-radius:0.3rem}.btn-sm,.btn-group-sm>.btn{padding:0.25rem 0.5rem;font-size:0.8203125rem;line-height:1.5;border-radius:0.2rem}.btn-block{display:block;width:100%}.btn-block+.btn-block{margin-top:0.5rem}input[type="submit"].btn-block,input[type="reset"].btn-block,input[type="button"].btn-block{width:100%}.fade{-webkit-transition:opacity 0.15s linear;transition:opacity 0.15s linear}@media (prefers-reduced-motion: reduce){.fade{-webkit-transition:none;transition:none}}.fade:not(.show){opacity:0}.collapse:not(.show){display:none}.collapsing{position:relative;height:0;overflow:hidden;-webkit-transition:height 0.35s ease;transition:height 0.35s ease}@media (prefers-reduced-motion: reduce){.collapsing{-webkit-transition:none;transition:none}}.dropup,.dropright,.dropdown,.dropleft{position:relative}.dropdown-toggle{white-space:nowrap}.dropdown-toggle::after{display:inline-block;margin-left:0.255em;vertical-align:0.255em;content:"";border-top:0.3em solid;border-right:0.3em solid transparent;border-bottom:0;border-left:0.3em solid transparent}.dropdown-toggle:empty::after{margin-left:0}.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:10rem;padding:0.5rem 0;margin:0.125rem 0 0;font-size:0.9375rem;color:#fff;text-align:left;list-style:none;background-color:#222;background-clip:padding-box;border:1px solid #444;border-radius:0.25rem}.dropdown-menu-left{right:auto;left:0}.dropdown-menu-right{right:0;left:auto}@media (min-width: 576px){.dropdown-menu-sm-left{right:auto;left:0}.dropdown-menu-sm-right{right:0;left:auto}}@media (min-width: 768px){.dropdown-menu-md-left{right:auto;left:0}.dropdown-menu-md-right{right:0;left:auto}}@media (min-width: 992px){.dropdown-menu-lg-left{right:auto;left:0}.dropdown-menu-lg-right{right:0;left:auto}}@media (min-width: 1200px){.dropdown-menu-xl-left{right:auto;left:0}.dropdown-menu-xl-right{right:0;left:auto}}.dropup .dropdown-menu{top:auto;bottom:100%;margin-top:0;margin-bottom:0.125rem}.dropup .dropdown-toggle::after{display:inline-block;margin-left:0.255em;vertical-align:0.255em;content:"";border-top:0;border-right:0.3em solid transparent;border-bottom:0.3em solid;border-left:0.3em solid transparent}.dropup .dropdown-toggle:empty::after{margin-left:0}.dropright .dropdown-menu{top:0;right:auto;left:100%;margin-top:0;margin-left:0.125rem}.dropright .dropdown-toggle::after{display:inline-block;margin-left:0.255em;vertical-align:0.255em;content:"";border-top:0.3em solid transparent;border-right:0;border-bottom:0.3em solid transparent;border-left:0.3em solid}.dropright .dropdown-toggle:empty::after{margin-left:0}.dropright .dropdown-toggle::after{vertical-align:0}.dropleft .dropdown-menu{top:0;right:100%;left:auto;margin-top:0;margin-right:0.125rem}.dropleft .dropdown-toggle::after{display:inline-block;margin-left:0.255em;vertical-align:0.255em;content:""}.dropleft .dropdown-toggle::after{display:none}.dropleft .dropdown-toggle::before{display:inline-block;margin-right:0.255em;vertical-align:0.255em;content:"";border-top:0.3em solid transparent;border-right:0.3em solid;border-bottom:0.3em solid transparent}.dropleft .dropdown-toggle:empty::after{margin-left:0}.dropleft .dropdown-toggle::before{vertical-align:0}.dropdown-menu[x-placement^="top"],.dropdown-menu[x-placement^="right"],.dropdown-menu[x-placement^="bottom"],.dropdown-menu[x-placement^="left"]{right:auto;bottom:auto}.dropdown-divider{height:0;margin:0.5rem 0;overflow:hidden;border-top:1px solid #444}.dropdown-item{display:block;width:100%;padding:0.25rem 1.5rem;clear:both;font-weight:400;color:#fff;text-align:inherit;white-space:nowrap;background-color:transparent;border:0}.dropdown-item:hover,.dropdown-item:focus{color:#fff;text-decoration:none;background-color:#375a7f}.dropdown-item.active,.dropdown-item:active{color:#fff;text-decoration:none;background-color:#375a7f}.dropdown-item.disabled,.dropdown-item:disabled{color:#888;pointer-events:none;background-color:transparent}.dropdown-menu.show{display:block}.dropdown-header{display:block;padding:0.5rem 1.5rem;margin-bottom:0;font-size:0.8203125rem;color:#888;white-space:nowrap}.dropdown-item-text{display:block;padding:0.25rem 1.5rem;color:#fff}.btn-group,.btn-group-vertical{position:relative;display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;vertical-align:middle}.btn-group>.btn,.btn-group-vertical>.btn{position:relative;-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto}.btn-group>.btn:hover,.btn-group-vertical>.btn:hover{z-index:1}.btn-group>.btn:focus,.btn-group>.btn:active,.btn-group>.btn.active,.btn-group-vertical>.btn:focus,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn.active{z-index:1}.btn-toolbar{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btn-toolbar .input-group{width:auto}.btn-group>.btn:not(:first-child),.btn-group>.btn-group:not(:first-child){margin-left:-1px}.btn-group>.btn:not(:last-child):not(.dropdown-toggle),.btn-group>.btn-group:not(:last-child)>.btn{border-top-right-radius:0;border-bottom-right-radius:0}.btn-group>.btn:not(:first-child),.btn-group>.btn-group:not(:first-child)>.btn{border-top-left-radius:0;border-bottom-left-radius:0}.dropdown-toggle-split{padding-right:0.5625rem;padding-left:0.5625rem}.dropdown-toggle-split::after,.dropup .dropdown-toggle-split::after,.dropright .dropdown-toggle-split::after{margin-left:0}.dropleft .dropdown-toggle-split::before{margin-right:0}.btn-sm+.dropdown-toggle-split,.btn-group-sm>.btn+.dropdown-toggle-split{padding-right:0.375rem;padding-left:0.375rem}.btn-lg+.dropdown-toggle-split,.btn-group-lg>.btn+.dropdown-toggle-split{padding-right:0.75rem;padding-left:0.75rem}.btn-group-vertical{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{width:100%}.btn-group-vertical>.btn:not(:first-child),.btn-group-vertical>.btn-group:not(:first-child){margin-top:-1px}.btn-group-vertical>.btn:not(:last-child):not(.dropdown-toggle),.btn-group-vertical>.btn-group:not(:last-child)>.btn{border-bottom-right-radius:0;border-bottom-left-radius:0}.btn-group-vertical>.btn:not(:first-child),.btn-group-vertical>.btn-group:not(:first-child)>.btn{border-top-left-radius:0;border-top-right-radius:0}.btn-group-toggle>.btn,.btn-group-toggle>.btn-group>.btn{margin-bottom:0}.btn-group-toggle>.btn input[type="radio"],.btn-group-toggle>.btn input[type="checkbox"],.btn-group-toggle>.btn-group>.btn input[type="radio"],.btn-group-toggle>.btn-group>.btn input[type="checkbox"]{position:absolute;clip:rect(0, 0, 0, 0);pointer-events:none}.input-group{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:stretch;-ms-flex-align:stretch;align-items:stretch;width:100%}.input-group>.form-control,.input-group>.form-control-plaintext,.input-group>.custom-select,.input-group>.custom-file{position:relative;-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;width:1%;min-width:0;margin-bottom:0}.input-group>.form-control+.form-control,.input-group>.form-control+.custom-select,.input-group>.form-control+.custom-file,.input-group>.form-control-plaintext+.form-control,.input-group>.form-control-plaintext+.custom-select,.input-group>.form-control-plaintext+.custom-file,.input-group>.custom-select+.form-control,.input-group>.custom-select+.custom-select,.input-group>.custom-select+.custom-file,.input-group>.custom-file+.form-control,.input-group>.custom-file+.custom-select,.input-group>.custom-file+.custom-file{margin-left:-1px}.input-group>.form-control:focus,.input-group>.custom-select:focus,.input-group>.custom-file .custom-file-input:focus ~ .custom-file-label{z-index:3}.input-group>.custom-file .custom-file-input:focus{z-index:4}.input-group>.form-control:not(:last-child),.input-group>.custom-select:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.form-control:not(:first-child),.input-group>.custom-select:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.input-group>.custom-file{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.input-group>.custom-file:not(:last-child) .custom-file-label,.input-group>.custom-file:not(:last-child) .custom-file-label::after{border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.custom-file:not(:first-child) .custom-file-label{border-top-left-radius:0;border-bottom-left-radius:0}.input-group-prepend,.input-group-append{display:-webkit-box;display:-ms-flexbox;display:flex}.input-group-prepend .btn,.input-group-append .btn{position:relative;z-index:2}.input-group-prepend .btn:focus,.input-group-append .btn:focus{z-index:3}.input-group-prepend .btn+.btn,.input-group-prepend .btn+.input-group-text,.input-group-prepend .input-group-text+.input-group-text,.input-group-prepend .input-group-text+.btn,.input-group-append .btn+.btn,.input-group-append .btn+.input-group-text,.input-group-append .input-group-text+.input-group-text,.input-group-append .input-group-text+.btn{margin-left:-1px}.input-group-prepend{margin-right:-1px}.input-group-append{margin-left:-1px}.input-group-text{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0.375rem 0.75rem;margin-bottom:0;font-size:0.9375rem;font-weight:400;line-height:1.5;color:#adb5bd;text-align:center;white-space:nowrap;background-color:#444;border:1px solid #222;border-radius:0.25rem}.input-group-text input[type="radio"],.input-group-text input[type="checkbox"]{margin-top:0}.input-group-lg>.form-control:not(textarea),.input-group-lg>.custom-select{height:calc(1.5em + 1rem + 2px)}.input-group-lg>.form-control,.input-group-lg>.custom-select,.input-group-lg>.input-group-prepend>.input-group-text,.input-group-lg>.input-group-append>.input-group-text,.input-group-lg>.input-group-prepend>.btn,.input-group-lg>.input-group-append>.btn{padding:0.5rem 1rem;font-size:1.171875rem;line-height:1.5;border-radius:0.3rem}.input-group-sm>.form-control:not(textarea),.input-group-sm>.custom-select{height:calc(1.5em + 0.5rem + 2px)}.input-group-sm>.form-control,.input-group-sm>.custom-select,.input-group-sm>.input-group-prepend>.input-group-text,.input-group-sm>.input-group-append>.input-group-text,.input-group-sm>.input-group-prepend>.btn,.input-group-sm>.input-group-append>.btn{padding:0.25rem 0.5rem;font-size:0.8203125rem;line-height:1.5;border-radius:0.2rem}.input-group-lg>.custom-select,.input-group-sm>.custom-select{padding-right:1.75rem}.input-group>.input-group-prepend>.btn,.input-group>.input-group-prepend>.input-group-text,.input-group>.input-group-append:not(:last-child)>.btn,.input-group>.input-group-append:not(:last-child)>.input-group-text,.input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group>.input-group-append:last-child>.input-group-text:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.custom-control{position:relative;display:block;min-height:1.40625rem;padding-left:1.5rem}.custom-control-inline{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;margin-right:1rem}.custom-control-input{position:absolute;left:0;z-index:-1;width:1rem;height:1.203125rem;opacity:0}.custom-control-input:checked ~ .custom-control-label::before{color:#fff;border-color:#375a7f;background-color:#375a7f}.custom-control-input:focus ~ .custom-control-label::before{-webkit-box-shadow:0 0 0 0.2rem rgba(55,90,127,0.25);box-shadow:0 0 0 0.2rem rgba(55,90,127,0.25)}.custom-control-input:focus:not(:checked) ~ .custom-control-label::before{border-color:#739ac2}.custom-control-input:not(:disabled):active ~ .custom-control-label::before{color:#fff;background-color:#97b3d2;border-color:#97b3d2}.custom-control-input[disabled] ~ .custom-control-label,.custom-control-input:disabled ~ .custom-control-label{color:#888}.custom-control-input[disabled] ~ .custom-control-label::before,.custom-control-input:disabled ~ .custom-control-label::before{background-color:#ebebeb}.custom-control-label{position:relative;margin-bottom:0;vertical-align:top}.custom-control-label::before{position:absolute;top:0.203125rem;left:-1.5rem;display:block;width:1rem;height:1rem;pointer-events:none;content:"";background-color:#fff;border:#adb5bd solid 1px}.custom-control-label::after{position:absolute;top:0.203125rem;left:-1.5rem;display:block;width:1rem;height:1rem;content:"";background:no-repeat 50% / 50% 50%}.custom-checkbox .custom-control-label::before{border-radius:0.25rem}.custom-checkbox .custom-control-input:checked ~ .custom-control-label::after{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/%3e%3c/svg%3e")}.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before{border-color:#375a7f;background-color:#375a7f}.custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::after{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'%3e%3cpath stroke='%23fff' d='M0 2h4'/%3e%3c/svg%3e")}.custom-checkbox .custom-control-input:disabled:checked ~ .custom-control-label::before{background-color:rgba(55,90,127,0.5)}.custom-checkbox .custom-control-input:disabled:indeterminate ~ .custom-control-label::before{background-color:rgba(55,90,127,0.5)}.custom-radio .custom-control-label::before{border-radius:50%}.custom-radio .custom-control-input:checked ~ .custom-control-label::after{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23fff'/%3e%3c/svg%3e")}.custom-radio .custom-control-input:disabled:checked ~ .custom-control-label::before{background-color:rgba(55,90,127,0.5)}.custom-switch{padding-left:2.25rem}.custom-switch .custom-control-label::before{left:-2.25rem;width:1.75rem;pointer-events:all;border-radius:0.5rem}.custom-switch .custom-control-label::after{top:calc(0.203125rem + 2px);left:calc(-2.25rem + 2px);width:calc(1rem - 4px);height:calc(1rem - 4px);background-color:#adb5bd;border-radius:0.5rem;-webkit-transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-transform 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-transform 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:transform 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;transition:transform 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-transform 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out}@media (prefers-reduced-motion: reduce){.custom-switch .custom-control-label::after{-webkit-transition:none;transition:none}}.custom-switch .custom-control-input:checked ~ .custom-control-label::after{background-color:#fff;-webkit-transform:translateX(0.75rem);transform:translateX(0.75rem)}.custom-switch .custom-control-input:disabled:checked ~ .custom-control-label::before{background-color:rgba(55,90,127,0.5)}.custom-select{display:inline-block;width:100%;height:calc(1.5em + 0.75rem + 2px);padding:0.375rem 1.75rem 0.375rem 0.75rem;font-size:0.9375rem;font-weight:400;line-height:1.5;color:#444;vertical-align:middle;background:#fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23303030' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px;border:1px solid #222;border-radius:0.25rem;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-select:focus{border-color:#739ac2;outline:0;-webkit-box-shadow:0 0 0 0.2rem rgba(55,90,127,0.25);box-shadow:0 0 0 0.2rem rgba(55,90,127,0.25)}.custom-select:focus::-ms-value{color:#444;background-color:#fff}.custom-select[multiple],.custom-select[size]:not([size="1"]){height:auto;padding-right:0.75rem;background-image:none}.custom-select:disabled{color:#888;background-color:#ebebeb}.custom-select::-ms-expand{display:none}.custom-select:-moz-focusring{color:transparent;text-shadow:0 0 0 #444}.custom-select-sm{height:calc(1.5em + 0.5rem + 2px);padding-top:0.25rem;padding-bottom:0.25rem;padding-left:0.5rem;font-size:0.8203125rem}.custom-select-lg{height:calc(1.5em + 1rem + 2px);padding-top:0.5rem;padding-bottom:0.5rem;padding-left:1rem;font-size:1.171875rem}.custom-file{position:relative;display:inline-block;width:100%;height:calc(1.5em + 0.75rem + 2px);margin-bottom:0}.custom-file-input{position:relative;z-index:2;width:100%;height:calc(1.5em + 0.75rem + 2px);margin:0;opacity:0}.custom-file-input:focus ~ .custom-file-label{border-color:#739ac2;-webkit-box-shadow:0 0 0 0.2rem rgba(55,90,127,0.25);box-shadow:0 0 0 0.2rem rgba(55,90,127,0.25)}.custom-file-input[disabled] ~ .custom-file-label,.custom-file-input:disabled ~ .custom-file-label{background-color:#ebebeb}.custom-file-input:lang(en) ~ .custom-file-label::after{content:"Browse"}.custom-file-input ~ .custom-file-label[data-browse]::after{content:attr(data-browse)}.custom-file-label{position:absolute;top:0;right:0;left:0;z-index:1;height:calc(1.5em + 0.75rem + 2px);padding:0.375rem 0.75rem;font-weight:400;line-height:1.5;color:#adb5bd;background-color:#fff;border:1px solid #222;border-radius:0.25rem}.custom-file-label::after{position:absolute;top:0;right:0;bottom:0;z-index:3;display:block;height:calc(1.5em + 0.75rem);padding:0.375rem 0.75rem;line-height:1.5;color:#adb5bd;content:"Browse";background-color:#444;border-left:inherit;border-radius:0 0.25rem 0.25rem 0}.custom-range{width:100%;height:1.4rem;padding:0;background-color:transparent;-webkit-appearance:none;-moz-appearance:none;appearance:none}.custom-range:focus{outline:none}.custom-range:focus::-webkit-slider-thumb{-webkit-box-shadow:0 0 0 1px #222,0 0 0 0.2rem rgba(55,90,127,0.25);box-shadow:0 0 0 1px #222,0 0 0 0.2rem rgba(55,90,127,0.25)}.custom-range:focus::-moz-range-thumb{box-shadow:0 0 0 1px #222,0 0 0 0.2rem rgba(55,90,127,0.25)}.custom-range:focus::-ms-thumb{box-shadow:0 0 0 1px #222,0 0 0 0.2rem rgba(55,90,127,0.25)}.custom-range::-moz-focus-outer{border:0}.custom-range::-webkit-slider-thumb{width:1rem;height:1rem;margin-top:-0.25rem;background-color:#375a7f;border:0;border-radius:1rem;-webkit-transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;-webkit-appearance:none;appearance:none}@media (prefers-reduced-motion: reduce){.custom-range::-webkit-slider-thumb{-webkit-transition:none;transition:none}}.custom-range::-webkit-slider-thumb:active{background-color:#97b3d2}.custom-range::-webkit-slider-runnable-track{width:100%;height:0.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-moz-range-thumb{width:1rem;height:1rem;background-color:#375a7f;border:0;border-radius:1rem;-webkit-transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;-moz-appearance:none;appearance:none}@media (prefers-reduced-motion: reduce){.custom-range::-moz-range-thumb{-webkit-transition:none;transition:none}}.custom-range::-moz-range-thumb:active{background-color:#97b3d2}.custom-range::-moz-range-track{width:100%;height:0.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}.custom-range::-ms-thumb{width:1rem;height:1rem;margin-top:0;margin-right:0.2rem;margin-left:0.2rem;background-color:#375a7f;border:0;border-radius:1rem;-webkit-transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;appearance:none}@media (prefers-reduced-motion: reduce){.custom-range::-ms-thumb{-webkit-transition:none;transition:none}}.custom-range::-ms-thumb:active{background-color:#97b3d2}.custom-range::-ms-track{width:100%;height:0.5rem;color:transparent;cursor:pointer;background-color:transparent;border-color:transparent;border-width:0.5rem}.custom-range::-ms-fill-lower{background-color:#dee2e6;border-radius:1rem}.custom-range::-ms-fill-upper{margin-right:15px;background-color:#dee2e6;border-radius:1rem}.custom-range:disabled::-webkit-slider-thumb{background-color:#adb5bd}.custom-range:disabled::-webkit-slider-runnable-track{cursor:default}.custom-range:disabled::-moz-range-thumb{background-color:#adb5bd}.custom-range:disabled::-moz-range-track{cursor:default}.custom-range:disabled::-ms-thumb{background-color:#adb5bd}.custom-control-label::before,.custom-file-label,.custom-select{-webkit-transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;transition:background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out}@media (prefers-reduced-motion: reduce){.custom-control-label::before,.custom-file-label,.custom-select{-webkit-transition:none;transition:none}}.nav{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}.nav-link{display:block;padding:0.5rem 2rem}.nav-link:hover,.nav-link:focus{text-decoration:none}.nav-link.disabled{color:#adb5bd;pointer-events:none;cursor:default}.nav-tabs{border-bottom:1px solid #444}.nav-tabs .nav-item{margin-bottom:-1px}.nav-tabs .nav-link{border:1px solid transparent;border-top-left-radius:0.25rem;border-top-right-radius:0.25rem}.nav-tabs .nav-link:hover,.nav-tabs .nav-link:focus{border-color:#444 #444 transparent}.nav-tabs .nav-link.disabled{color:#adb5bd;background-color:transparent;border-color:transparent}.nav-tabs .nav-link.active,.nav-tabs .nav-item.show .nav-link{color:#fff;background-color:#222;border-color:#444 #444 transparent}.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}.nav-pills .nav-link{border-radius:0.25rem}.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#375a7f}.nav-fill .nav-item{-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;text-align:center}.nav-justified .nav-item{-ms-flex-preferred-size:0;flex-basis:0;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;text-align:center}.tab-content>.tab-pane{display:none}.tab-content>.active{display:block}.navbar{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding:1rem 1rem}.navbar .container,.navbar .container-fluid,.navbar .container-sm,.navbar .container-md,.navbar .container-lg,.navbar .container-xl{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.navbar-brand{display:inline-block;padding-top:0.32421875rem;padding-bottom:0.32421875rem;margin-right:1rem;font-size:1.171875rem;line-height:inherit;white-space:nowrap}.navbar-brand:hover,.navbar-brand:focus{text-decoration:none}.navbar-nav{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}.navbar-nav .nav-link{padding-right:0;padding-left:0}.navbar-nav .dropdown-menu{position:static;float:none}.navbar-text{display:inline-block;padding-top:0.5rem;padding-bottom:0.5rem}.navbar-collapse{-ms-flex-preferred-size:100%;flex-basis:100%;-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.navbar-toggler{padding:0.25rem 0.75rem;font-size:1.171875rem;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:0.25rem}.navbar-toggler:hover,.navbar-toggler:focus{text-decoration:none}.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:no-repeat center center;background-size:100% 100%}@media (max-width: 575.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-xl{padding-right:0;padding-left:0}}@media (min-width: 576px){.navbar-expand-sm{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-sm .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-sm .navbar-nav .nav-link{padding-right:0.5rem;padding-left:0.5rem}.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-sm .navbar-collapse{display:-webkit-box !important;display:-ms-flexbox !important;display:flex !important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-sm .navbar-toggler{display:none}}@media (max-width: 767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-md,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-xl{padding-right:0;padding-left:0}}@media (min-width: 768px){.navbar-expand-md{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-md .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-md .navbar-nav .nav-link{padding-right:0.5rem;padding-left:0.5rem}.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-md,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-md .navbar-collapse{display:-webkit-box !important;display:-ms-flexbox !important;display:flex !important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-md .navbar-toggler{display:none}}@media (max-width: 991.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-xl{padding-right:0;padding-left:0}}@media (min-width: 992px){.navbar-expand-lg{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-lg .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-lg .navbar-nav .nav-link{padding-right:0.5rem;padding-left:0.5rem}.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-lg .navbar-collapse{display:-webkit-box !important;display:-ms-flexbox !important;display:flex !important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-lg .navbar-toggler{display:none}}@media (max-width: 1199.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-xl{padding-right:0;padding-left:0}}@media (min-width: 1200px){.navbar-expand-xl{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand-xl .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}.navbar-expand-xl .navbar-nav .nav-link{padding-right:0.5rem;padding-left:0.5rem}.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand-xl .navbar-collapse{display:-webkit-box !important;display:-ms-flexbox !important;display:flex !important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand-xl .navbar-toggler{display:none}}.navbar-expand{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row nowrap;flex-flow:row nowrap;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-sm,.navbar-expand>.container-md,.navbar-expand>.container-lg,.navbar-expand>.container-xl{padding-right:0;padding-left:0}.navbar-expand .navbar-nav{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.navbar-expand .navbar-nav .dropdown-menu{position:absolute}.navbar-expand .navbar-nav .nav-link{padding-right:0.5rem;padding-left:0.5rem}.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-sm,.navbar-expand>.container-md,.navbar-expand>.container-lg,.navbar-expand>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}.navbar-expand .navbar-collapse{display:-webkit-box !important;display:-ms-flexbox !important;display:flex !important;-ms-flex-preferred-size:auto;flex-basis:auto}.navbar-expand .navbar-toggler{display:none}.navbar-light .navbar-brand{color:#222}.navbar-light .navbar-brand:hover,.navbar-light .navbar-brand:focus{color:#222}.navbar-light .navbar-nav .nav-link{color:rgba(34,34,34,0.7)}.navbar-light .navbar-nav .nav-link:hover,.navbar-light .navbar-nav .nav-link:focus{color:#222}.navbar-light .navbar-nav .nav-link.disabled{color:rgba(0,0,0,0.3)}.navbar-light .navbar-nav .show>.nav-link,.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .nav-link.active{color:#222}.navbar-light .navbar-toggler{color:rgba(34,34,34,0.7);border-color:rgba(34,34,34,0.1)}.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%2834, 34, 34, 0.7%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e")}.navbar-light .navbar-text{color:rgba(34,34,34,0.7)}.navbar-light .navbar-text a{color:#222}.navbar-light .navbar-text a:hover,.navbar-light .navbar-text a:focus{color:#222}.navbar-dark .navbar-brand{color:#fff}.navbar-dark .navbar-brand:hover,.navbar-dark .navbar-brand:focus{color:#fff}.navbar-dark .navbar-nav .nav-link{color:rgba(255,255,255,0.6)}.navbar-dark .navbar-nav .nav-link:hover,.navbar-dark .navbar-nav .nav-link:focus{color:#fff}.navbar-dark .navbar-nav .nav-link.disabled{color:rgba(255,255,255,0.25)}.navbar-dark .navbar-nav .show>.nav-link,.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .nav-link.active{color:#fff}.navbar-dark .navbar-toggler{color:rgba(255,255,255,0.6);border-color:rgba(255,255,255,0.1)}.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.6%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e")}.navbar-dark .navbar-text{color:rgba(255,255,255,0.6)}.navbar-dark .navbar-text a{color:#fff}.navbar-dark .navbar-text a:hover,.navbar-dark .navbar-text a:focus{color:#fff}.card{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;min-width:0;word-wrap:break-word;background-color:#303030;background-clip:border-box;border:1px solid rgba(0,0,0,0.125);border-radius:0.25rem}.card>hr{margin-right:0;margin-left:0}.card>.list-group{border-top:inherit;border-bottom:inherit}.card>.list-group:first-child{border-top-width:0;border-top-left-radius:calc(0.25rem - 1px);border-top-right-radius:calc(0.25rem - 1px)}.card>.list-group:last-child{border-bottom-width:0;border-bottom-right-radius:calc(0.25rem - 1px);border-bottom-left-radius:calc(0.25rem - 1px)}.card-body{-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;min-height:1px;padding:1.25rem}.card-title{margin-bottom:0.75rem}.card-subtitle{margin-top:-0.375rem;margin-bottom:0}.card-text:last-child{margin-bottom:0}.card-link:hover{text-decoration:none}.card-link+.card-link{margin-left:1.25rem}.card-header{padding:0.75rem 1.25rem;margin-bottom:0;background-color:#444;border-bottom:1px solid rgba(0,0,0,0.125)}.card-header:first-child{border-radius:calc(0.25rem - 1px) calc(0.25rem - 1px) 0 0}.card-header+.list-group .list-group-item:first-child{border-top:0}.card-footer{padding:0.75rem 1.25rem;background-color:#444;border-top:1px solid rgba(0,0,0,0.125)}.card-footer:last-child{border-radius:0 0 calc(0.25rem - 1px) calc(0.25rem - 1px)}.card-header-tabs{margin-right:-0.625rem;margin-bottom:-0.75rem;margin-left:-0.625rem;border-bottom:0}.card-header-pills{margin-right:-0.625rem;margin-left:-0.625rem}.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:1.25rem}.card-img,.card-img-top,.card-img-bottom{-ms-flex-negative:0;flex-shrink:0;width:100%}.card-img,.card-img-top{border-top-left-radius:calc(0.25rem - 1px);border-top-right-radius:calc(0.25rem - 1px)}.card-img,.card-img-bottom{border-bottom-right-radius:calc(0.25rem - 1px);border-bottom-left-radius:calc(0.25rem - 1px)}.card-deck .card{margin-bottom:15px}@media (min-width: 576px){.card-deck{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap;margin-right:-15px;margin-left:-15px}.card-deck .card{-webkit-box-flex:1;-ms-flex:1 0 0%;flex:1 0 0%;margin-right:15px;margin-bottom:0;margin-left:15px}}.card-group>.card{margin-bottom:15px}@media (min-width: 576px){.card-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-flow:row wrap;flex-flow:row wrap}.card-group>.card{-webkit-box-flex:1;-ms-flex:1 0 0%;flex:1 0 0%;margin-bottom:0}.card-group>.card+.card{margin-left:0;border-left:0}.card-group>.card:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}.card-group>.card:not(:last-child) .card-img-top,.card-group>.card:not(:last-child) .card-header{border-top-right-radius:0}.card-group>.card:not(:last-child) .card-img-bottom,.card-group>.card:not(:last-child) .card-footer{border-bottom-right-radius:0}.card-group>.card:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}.card-group>.card:not(:first-child) .card-img-top,.card-group>.card:not(:first-child) .card-header{border-top-left-radius:0}.card-group>.card:not(:first-child) .card-img-bottom,.card-group>.card:not(:first-child) .card-footer{border-bottom-left-radius:0}}.card-columns .card{margin-bottom:0.75rem}@media (min-width: 576px){.card-columns{-webkit-column-count:3;column-count:3;-webkit-column-gap:1.25rem;column-gap:1.25rem;orphans:1;widows:1}.card-columns .card{display:inline-block;width:100%}}.accordion>.card{overflow:hidden}.accordion>.card:not(:last-of-type){border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.accordion>.card:not(:first-of-type){border-top-left-radius:0;border-top-right-radius:0}.accordion>.card>.card-header{border-radius:0;margin-bottom:-1px}.breadcrumb{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:0.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#444;border-radius:0.25rem}.breadcrumb-item{display:-webkit-box;display:-ms-flexbox;display:flex}.breadcrumb-item+.breadcrumb-item{padding-left:0.5rem}.breadcrumb-item+.breadcrumb-item::before{display:inline-block;padding-right:0.5rem;color:#888;content:"/"}.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:underline}.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:none}.breadcrumb-item.active{color:#888}.pagination{display:-webkit-box;display:-ms-flexbox;display:flex;padding-left:0;list-style:none;border-radius:0.25rem}.page-link{position:relative;display:block;padding:0.5rem 0.75rem;margin-left:0;line-height:1.25;color:#fff;background-color:#00bc8c;border:0 solid transparent}.page-link:hover{z-index:2;color:#fff;text-decoration:none;background-color:#00efb2;border-color:transparent}.page-link:focus{z-index:3;outline:0;-webkit-box-shadow:0 0 0 0.2rem rgba(55,90,127,0.25);box-shadow:0 0 0 0.2rem rgba(55,90,127,0.25)}.page-item:first-child .page-link{margin-left:0;border-top-left-radius:0.25rem;border-bottom-left-radius:0.25rem}.page-item:last-child .page-link{border-top-right-radius:0.25rem;border-bottom-right-radius:0.25rem}.page-item.active .page-link{z-index:3;color:#fff;background-color:#00efb2;border-color:transparent}.page-item.disabled .page-link{color:#fff;pointer-events:none;cursor:auto;background-color:#007053;border-color:transparent}.pagination-lg .page-link{padding:0.75rem 1.5rem;font-size:1.171875rem;line-height:1.5}.pagination-lg .page-item:first-child .page-link{border-top-left-radius:0.3rem;border-bottom-left-radius:0.3rem}.pagination-lg .page-item:last-child .page-link{border-top-right-radius:0.3rem;border-bottom-right-radius:0.3rem}.pagination-sm .page-link{padding:0.25rem 0.5rem;font-size:0.8203125rem;line-height:1.5}.pagination-sm .page-item:first-child .page-link{border-top-left-radius:0.2rem;border-bottom-left-radius:0.2rem}.pagination-sm .page-item:last-child .page-link{border-top-right-radius:0.2rem;border-bottom-right-radius:0.2rem}.badge{display:inline-block;padding:0.25em 0.4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:0.25rem;-webkit-transition:color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out;transition:color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;transition:color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out, -webkit-box-shadow 0.15s ease-in-out}@media (prefers-reduced-motion: reduce){.badge{-webkit-transition:none;transition:none}}a.badge:hover,a.badge:focus{text-decoration:none}.badge:empty{display:none}.btn .badge{position:relative;top:-1px}.badge-pill{padding-right:0.6em;padding-left:0.6em;border-radius:10rem}.badge-primary{color:#fff;background-color:#375a7f}a.badge-primary:hover,a.badge-primary:focus{color:#fff;background-color:#28415b}a.badge-primary:focus,a.badge-primary.focus{outline:0;-webkit-box-shadow:0 0 0 0.2rem rgba(55,90,127,0.5);box-shadow:0 0 0 0.2rem rgba(55,90,127,0.5)}.badge-secondary{color:#fff;background-color:#444}a.badge-secondary:hover,a.badge-secondary:focus{color:#fff;background-color:#2b2a2a}a.badge-secondary:focus,a.badge-secondary.focus{outline:0;-webkit-box-shadow:0 0 0 0.2rem rgba(68,68,68,0.5);box-shadow:0 0 0 0.2rem rgba(68,68,68,0.5)}.badge-success{color:#fff;background-color:#00bc8c}a.badge-success:hover,a.badge-success:focus{color:#fff;background-color:#008966}a.badge-success:focus,a.badge-success.focus{outline:0;-webkit-box-shadow:0 0 0 0.2rem rgba(0,188,140,0.5);box-shadow:0 0 0 0.2rem rgba(0,188,140,0.5)}.badge-info{color:#fff;background-color:#3498DB}a.badge-info:hover,a.badge-info:focus{color:#fff;background-color:#217dbb}a.badge-info:focus,a.badge-info.focus{outline:0;-webkit-box-shadow:0 0 0 0.2rem rgba(52,152,219,0.5);box-shadow:0 0 0 0.2rem rgba(52,152,219,0.5)}.badge-warning{color:#fff;background-color:#F39C12}a.badge-warning:hover,a.badge-warning:focus{color:#fff;background-color:#c87f0a}a.badge-warning:focus,a.badge-warning.focus{outline:0;-webkit-box-shadow:0 0 0 0.2rem rgba(243,156,18,0.5);box-shadow:0 0 0 0.2rem rgba(243,156,18,0.5)}.badge-danger{color:#fff;background-color:#E74C3C}a.badge-danger:hover,a.badge-danger:focus{color:#fff;background-color:#d62c1a}a.badge-danger:focus,a.badge-danger.focus{outline:0;-webkit-box-shadow:0 0 0 0.2rem rgba(231,76,60,0.5);box-shadow:0 0 0 0.2rem rgba(231,76,60,0.5)}.badge-light{color:#222;background-color:#adb5bd}a.badge-light:hover,a.badge-light:focus{color:#222;background-color:#919ca6}a.badge-light:focus,a.badge-light.focus{outline:0;-webkit-box-shadow:0 0 0 0.2rem rgba(173,181,189,0.5);box-shadow:0 0 0 0.2rem rgba(173,181,189,0.5)}.badge-dark{color:#fff;background-color:#303030}a.badge-dark:hover,a.badge-dark:focus{color:#fff;background-color:#171616}a.badge-dark:focus,a.badge-dark.focus{outline:0;-webkit-box-shadow:0 0 0 0.2rem rgba(48,48,48,0.5);box-shadow:0 0 0 0.2rem rgba(48,48,48,0.5)}.jumbotron{padding:2rem 1rem;margin-bottom:2rem;background-color:#303030;border-radius:0.3rem}@media (min-width: 576px){.jumbotron{padding:4rem 2rem}}.jumbotron-fluid{padding-right:0;padding-left:0;border-radius:0}.alert{position:relative;padding:0.75rem 1.25rem;margin-bottom:1rem;border:1px solid transparent;border-radius:0.25rem}.alert-heading{color:inherit}.alert-link{font-weight:700}.alert-dismissible{padding-right:3.90625rem}.alert-dismissible .close{position:absolute;top:0;right:0;padding:0.75rem 1.25rem;color:inherit}.alert-primary{color:#1d2f42;background-color:#d7dee5;border-color:#c7d1db}.alert-primary hr{border-top-color:#b7c4d1}.alert-primary .alert-link{color:#0d161f}.alert-secondary{color:#232323;background-color:#dadada;border-color:#cbcbcb}.alert-secondary hr{border-top-color:#bebebe}.alert-secondary .alert-link{color:#0a0909}.alert-success{color:#006249;background-color:#ccf2e8;border-color:#b8ecdf}.alert-success hr{border-top-color:#a4e7d6}.alert-success .alert-link{color:#002f23}.alert-info{color:#1b4f72;background-color:#d6eaf8;border-color:#c6e2f5}.alert-info hr{border-top-color:#b0d7f1}.alert-info .alert-link{color:#113249}.alert-warning{color:#7e5109;background-color:#fdebd0;border-color:#fce3bd}.alert-warning hr{border-top-color:#fbd9a5}.alert-warning .alert-link{color:#4e3206}.alert-danger{color:#78281f;background-color:#fadbd8;border-color:#f8cdc8}.alert-danger hr{border-top-color:#f5b8b1}.alert-danger .alert-link{color:#4f1a15}.alert-light{color:#5a5e62;background-color:#eff0f2;border-color:#e8eaed}.alert-light hr{border-top-color:#dadde2}.alert-light .alert-link{color:#424547}.alert-dark{color:#191919;background-color:#d6d6d6;border-color:#c5c5c5}.alert-dark hr{border-top-color:#b8b8b8}.alert-dark .alert-link{color:black}@-webkit-keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}.progress{display:-webkit-box;display:-ms-flexbox;display:flex;height:1rem;overflow:hidden;line-height:0;font-size:0.703125rem;background-color:#444;border-radius:0.25rem}.progress-bar{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;overflow:hidden;color:#fff;text-align:center;white-space:nowrap;background-color:#375a7f;-webkit-transition:width 0.6s ease;transition:width 0.6s ease}@media (prefers-reduced-motion: reduce){.progress-bar{-webkit-transition:none;transition:none}}.progress-bar-striped{background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-size:1rem 1rem}.progress-bar-animated{-webkit-animation:progress-bar-stripes 1s linear infinite;animation:progress-bar-stripes 1s linear infinite}@media (prefers-reduced-motion: reduce){.progress-bar-animated{-webkit-animation:none;animation:none}}.media{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.media-body{-webkit-box-flex:1;-ms-flex:1;flex:1}.list-group{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0;border-radius:0.25rem}.list-group-item-action{width:100%;color:#444;text-align:inherit}.list-group-item-action:hover,.list-group-item-action:focus{z-index:1;color:#444;text-decoration:none;background-color:#444}.list-group-item-action:active{color:#fff;background-color:#ebebeb}.list-group-item{position:relative;display:block;padding:0.75rem 1.25rem;background-color:#303030;border:1px solid #444}.list-group-item:first-child{border-top-left-radius:inherit;border-top-right-radius:inherit}.list-group-item:last-child{border-bottom-right-radius:inherit;border-bottom-left-radius:inherit}.list-group-item.disabled,.list-group-item:disabled{color:#888;pointer-events:none;background-color:#303030}.list-group-item.active{z-index:2;color:#fff;background-color:#375a7f;border-color:#375a7f}.list-group-item+.list-group-item{border-top-width:0}.list-group-item+.list-group-item.active{margin-top:-1px;border-top-width:1px}.list-group-horizontal{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.list-group-horizontal>.list-group-item:first-child{border-bottom-left-radius:0.25rem;border-top-right-radius:0}.list-group-horizontal>.list-group-item:last-child{border-top-right-radius:0.25rem;border-bottom-left-radius:0}.list-group-horizontal>.list-group-item.active{margin-top:0}.list-group-horizontal>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}@media (min-width: 576px){.list-group-horizontal-sm{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.list-group-horizontal-sm>.list-group-item:first-child{border-bottom-left-radius:0.25rem;border-top-right-radius:0}.list-group-horizontal-sm>.list-group-item:last-child{border-top-right-radius:0.25rem;border-bottom-left-radius:0}.list-group-horizontal-sm>.list-group-item.active{margin-top:0}.list-group-horizontal-sm>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-sm>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media (min-width: 768px){.list-group-horizontal-md{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.list-group-horizontal-md>.list-group-item:first-child{border-bottom-left-radius:0.25rem;border-top-right-radius:0}.list-group-horizontal-md>.list-group-item:last-child{border-top-right-radius:0.25rem;border-bottom-left-radius:0}.list-group-horizontal-md>.list-group-item.active{margin-top:0}.list-group-horizontal-md>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-md>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media (min-width: 992px){.list-group-horizontal-lg{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.list-group-horizontal-lg>.list-group-item:first-child{border-bottom-left-radius:0.25rem;border-top-right-radius:0}.list-group-horizontal-lg>.list-group-item:last-child{border-top-right-radius:0.25rem;border-bottom-left-radius:0}.list-group-horizontal-lg>.list-group-item.active{margin-top:0}.list-group-horizontal-lg>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-lg>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}@media (min-width: 1200px){.list-group-horizontal-xl{-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row}.list-group-horizontal-xl>.list-group-item:first-child{border-bottom-left-radius:0.25rem;border-top-right-radius:0}.list-group-horizontal-xl>.list-group-item:last-child{border-top-right-radius:0.25rem;border-bottom-left-radius:0}.list-group-horizontal-xl>.list-group-item.active{margin-top:0}.list-group-horizontal-xl>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}.list-group-horizontal-xl>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}}.list-group-flush{border-radius:0}.list-group-flush>.list-group-item{border-width:0 0 1px}.list-group-flush>.list-group-item:last-child{border-bottom-width:0}.list-group-item-primary{color:#1d2f42;background-color:#c7d1db}.list-group-item-primary.list-group-item-action:hover,.list-group-item-primary.list-group-item-action:focus{color:#1d2f42;background-color:#b7c4d1}.list-group-item-primary.list-group-item-action.active{color:#fff;background-color:#1d2f42;border-color:#1d2f42}.list-group-item-secondary{color:#232323;background-color:#cbcbcb}.list-group-item-secondary.list-group-item-action:hover,.list-group-item-secondary.list-group-item-action:focus{color:#232323;background-color:#bebebe}.list-group-item-secondary.list-group-item-action.active{color:#fff;background-color:#232323;border-color:#232323}.list-group-item-success{color:#006249;background-color:#b8ecdf}.list-group-item-success.list-group-item-action:hover,.list-group-item-success.list-group-item-action:focus{color:#006249;background-color:#a4e7d6}.list-group-item-success.list-group-item-action.active{color:#fff;background-color:#006249;border-color:#006249}.list-group-item-info{color:#1b4f72;background-color:#c6e2f5}.list-group-item-info.list-group-item-action:hover,.list-group-item-info.list-group-item-action:focus{color:#1b4f72;background-color:#b0d7f1}.list-group-item-info.list-group-item-action.active{color:#fff;background-color:#1b4f72;border-color:#1b4f72}.list-group-item-warning{color:#7e5109;background-color:#fce3bd}.list-group-item-warning.list-group-item-action:hover,.list-group-item-warning.list-group-item-action:focus{color:#7e5109;background-color:#fbd9a5}.list-group-item-warning.list-group-item-action.active{color:#fff;background-color:#7e5109;border-color:#7e5109}.list-group-item-danger{color:#78281f;background-color:#f8cdc8}.list-group-item-danger.list-group-item-action:hover,.list-group-item-danger.list-group-item-action:focus{color:#78281f;background-color:#f5b8b1}.list-group-item-danger.list-group-item-action.active{color:#fff;background-color:#78281f;border-color:#78281f}.list-group-item-light{color:#5a5e62;background-color:#e8eaed}.list-group-item-light.list-group-item-action:hover,.list-group-item-light.list-group-item-action:focus{color:#5a5e62;background-color:#dadde2}.list-group-item-light.list-group-item-action.active{color:#fff;background-color:#5a5e62;border-color:#5a5e62}.list-group-item-dark{color:#191919;background-color:#c5c5c5}.list-group-item-dark.list-group-item-action:hover,.list-group-item-dark.list-group-item-action:focus{color:#191919;background-color:#b8b8b8}.list-group-item-dark.list-group-item-action.active{color:#fff;background-color:#191919;border-color:#191919}.close{float:right;font-size:1.40625rem;font-weight:700;line-height:1;color:#fff;text-shadow:none;opacity:.5}.close:hover{color:#fff;text-decoration:none}.close:not(:disabled):not(.disabled):hover,.close:not(:disabled):not(.disabled):focus{opacity:.75}button.close{padding:0;background-color:transparent;border:0}a.close.disabled{pointer-events:none}.toast{max-width:350px;overflow:hidden;font-size:0.875rem;background-color:#444;background-clip:padding-box;border:1px solid rgba(0,0,0,0.1);-webkit-box-shadow:0 0.25rem 0.75rem rgba(0,0,0,0.1);box-shadow:0 0.25rem 0.75rem rgba(0,0,0,0.1);-webkit-backdrop-filter:blur(10px);backdrop-filter:blur(10px);opacity:0;border-radius:0.25rem}.toast:not(:last-child){margin-bottom:0.75rem}.toast.showing{opacity:1}.toast.show{display:block;opacity:1}.toast.hide{display:none}.toast-header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;padding:0.25rem 0.75rem;color:#888;background-color:#303030;background-clip:padding-box;border-bottom:1px solid rgba(0,0,0,0.05)}.toast-body{padding:0.75rem}.modal-open{overflow:hidden}.modal-open .modal{overflow-x:hidden;overflow-y:auto}.modal{position:fixed;top:0;left:0;z-index:1050;display:none;width:100%;height:100%;overflow:hidden;outline:0}.modal-dialog{position:relative;width:auto;margin:0.5rem;pointer-events:none}.modal.fade .modal-dialog{-webkit-transition:-webkit-transform 0.3s ease-out;transition:-webkit-transform 0.3s ease-out;transition:transform 0.3s ease-out;transition:transform 0.3s ease-out, -webkit-transform 0.3s ease-out;-webkit-transform:translate(0, -50px);transform:translate(0, -50px)}@media (prefers-reduced-motion: reduce){.modal.fade .modal-dialog{-webkit-transition:none;transition:none}}.modal.show .modal-dialog{-webkit-transform:none;transform:none}.modal.modal-static .modal-dialog{-webkit-transform:scale(1.02);transform:scale(1.02)}.modal-dialog-scrollable{display:-webkit-box;display:-ms-flexbox;display:flex;max-height:calc(100% - 1rem)}.modal-dialog-scrollable .modal-content{max-height:calc(100vh - 1rem);overflow:hidden}.modal-dialog-scrollable .modal-header,.modal-dialog-scrollable .modal-footer{-ms-flex-negative:0;flex-shrink:0}.modal-dialog-scrollable .modal-body{overflow-y:auto}.modal-dialog-centered{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;min-height:calc(100% - 1rem)}.modal-dialog-centered::before{display:block;height:calc(100vh - 1rem);height:-webkit-min-content;height:-moz-min-content;height:min-content;content:""}.modal-dialog-centered.modal-dialog-scrollable{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;height:100%}.modal-dialog-centered.modal-dialog-scrollable .modal-content{max-height:none}.modal-dialog-centered.modal-dialog-scrollable::before{content:none}.modal-content{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:100%;pointer-events:auto;background-color:#303030;background-clip:padding-box;border:1px solid #444;border-radius:0.3rem;outline:0}.modal-backdrop{position:fixed;top:0;left:0;z-index:1040;width:100vw;height:100vh;background-color:#000}.modal-backdrop.fade{opacity:0}.modal-backdrop.show{opacity:0.5}.modal-header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;padding:1rem 1rem;border-bottom:1px solid #444;border-top-left-radius:calc(0.3rem - 1px);border-top-right-radius:calc(0.3rem - 1px)}.modal-header .close{padding:1rem 1rem;margin:-1rem -1rem -1rem auto}.modal-title{margin-bottom:0;line-height:1.5}.modal-body{position:relative;-webkit-box-flex:1;-ms-flex:1 1 auto;flex:1 1 auto;padding:1rem}.modal-footer{display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;padding:0.75rem;border-top:1px solid #444;border-bottom-right-radius:calc(0.3rem - 1px);border-bottom-left-radius:calc(0.3rem - 1px)}.modal-footer>*{margin:0.25rem}.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}@media (min-width: 576px){.modal-dialog{max-width:500px;margin:1.75rem auto}.modal-dialog-scrollable{max-height:calc(100% - 3.5rem)}.modal-dialog-scrollable .modal-content{max-height:calc(100vh - 3.5rem)}.modal-dialog-centered{min-height:calc(100% - 3.5rem)}.modal-dialog-centered::before{height:calc(100vh - 3.5rem);height:-webkit-min-content;height:-moz-min-content;height:min-content}.modal-sm{max-width:300px}}@media (min-width: 992px){.modal-lg,.modal-xl{max-width:800px}}@media (min-width: 1200px){.modal-xl{max-width:1140px}}.tooltip{position:absolute;z-index:1070;display:block;margin:0;font-family:"Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:0.8203125rem;word-wrap:break-word;opacity:0}.tooltip.show{opacity:0.9}.tooltip .arrow{position:absolute;display:block;width:0.8rem;height:0.4rem}.tooltip .arrow::before{position:absolute;content:"";border-color:transparent;border-style:solid}.bs-tooltip-top,.bs-tooltip-auto[x-placement^="top"]{padding:0.4rem 0}.bs-tooltip-top .arrow,.bs-tooltip-auto[x-placement^="top"] .arrow{bottom:0}.bs-tooltip-top .arrow::before,.bs-tooltip-auto[x-placement^="top"] .arrow::before{top:0;border-width:0.4rem 0.4rem 0;border-top-color:#000}.bs-tooltip-right,.bs-tooltip-auto[x-placement^="right"]{padding:0 0.4rem}.bs-tooltip-right .arrow,.bs-tooltip-auto[x-placement^="right"] .arrow{left:0;width:0.4rem;height:0.8rem}.bs-tooltip-right .arrow::before,.bs-tooltip-auto[x-placement^="right"] .arrow::before{right:0;border-width:0.4rem 0.4rem 0.4rem 0;border-right-color:#000}.bs-tooltip-bottom,.bs-tooltip-auto[x-placement^="bottom"]{padding:0.4rem 0}.bs-tooltip-bottom .arrow,.bs-tooltip-auto[x-placement^="bottom"] .arrow{top:0}.bs-tooltip-bottom .arrow::before,.bs-tooltip-auto[x-placement^="bottom"] .arrow::before{bottom:0;border-width:0 0.4rem 0.4rem;border-bottom-color:#000}.bs-tooltip-left,.bs-tooltip-auto[x-placement^="left"]{padding:0 0.4rem}.bs-tooltip-left .arrow,.bs-tooltip-auto[x-placement^="left"] .arrow{right:0;width:0.4rem;height:0.8rem}.bs-tooltip-left .arrow::before,.bs-tooltip-auto[x-placement^="left"] .arrow::before{left:0;border-width:0.4rem 0 0.4rem 0.4rem;border-left-color:#000}.tooltip-inner{max-width:200px;padding:0.25rem 0.5rem;color:#fff;text-align:center;background-color:#000;border-radius:0.25rem}.popover{position:absolute;top:0;left:0;z-index:1060;display:block;max-width:276px;font-family:"Lato", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;word-spacing:normal;white-space:normal;line-break:auto;font-size:0.8203125rem;word-wrap:break-word;background-color:#303030;background-clip:padding-box;border:1px solid rgba(0,0,0,0.2);border-radius:0.3rem}.popover .arrow{position:absolute;display:block;width:1rem;height:0.5rem;margin:0 0.3rem}.popover .arrow::before,.popover .arrow::after{position:absolute;display:block;content:"";border-color:transparent;border-style:solid}.bs-popover-top,.bs-popover-auto[x-placement^="top"]{margin-bottom:0.5rem}.bs-popover-top>.arrow,.bs-popover-auto[x-placement^="top"]>.arrow{bottom:calc(-0.5rem - 1px)}.bs-popover-top>.arrow::before,.bs-popover-auto[x-placement^="top"]>.arrow::before{bottom:0;border-width:0.5rem 0.5rem 0;border-top-color:rgba(0,0,0,0.25)}.bs-popover-top>.arrow::after,.bs-popover-auto[x-placement^="top"]>.arrow::after{bottom:1px;border-width:0.5rem 0.5rem 0;border-top-color:#303030}.bs-popover-right,.bs-popover-auto[x-placement^="right"]{margin-left:0.5rem}.bs-popover-right>.arrow,.bs-popover-auto[x-placement^="right"]>.arrow{left:calc(-0.5rem - 1px);width:0.5rem;height:1rem;margin:0.3rem 0}.bs-popover-right>.arrow::before,.bs-popover-auto[x-placement^="right"]>.arrow::before{left:0;border-width:0.5rem 0.5rem 0.5rem 0;border-right-color:rgba(0,0,0,0.25)}.bs-popover-right>.arrow::after,.bs-popover-auto[x-placement^="right"]>.arrow::after{left:1px;border-width:0.5rem 0.5rem 0.5rem 0;border-right-color:#303030}.bs-popover-bottom,.bs-popover-auto[x-placement^="bottom"]{margin-top:0.5rem}.bs-popover-bottom>.arrow,.bs-popover-auto[x-placement^="bottom"]>.arrow{top:calc(-0.5rem - 1px)}.bs-popover-bottom>.arrow::before,.bs-popover-auto[x-placement^="bottom"]>.arrow::before{top:0;border-width:0 0.5rem 0.5rem 0.5rem;border-bottom-color:rgba(0,0,0,0.25)}.bs-popover-bottom>.arrow::after,.bs-popover-auto[x-placement^="bottom"]>.arrow::after{top:1px;border-width:0 0.5rem 0.5rem 0.5rem;border-bottom-color:#303030}.bs-popover-bottom .popover-header::before,.bs-popover-auto[x-placement^="bottom"] .popover-header::before{position:absolute;top:0;left:50%;display:block;width:1rem;margin-left:-0.5rem;content:"";border-bottom:1px solid #444}.bs-popover-left,.bs-popover-auto[x-placement^="left"]{margin-right:0.5rem}.bs-popover-left>.arrow,.bs-popover-auto[x-placement^="left"]>.arrow{right:calc(-0.5rem - 1px);width:0.5rem;height:1rem;margin:0.3rem 0}.bs-popover-left>.arrow::before,.bs-popover-auto[x-placement^="left"]>.arrow::before{right:0;border-width:0.5rem 0 0.5rem 0.5rem;border-left-color:rgba(0,0,0,0.25)}.bs-popover-left>.arrow::after,.bs-popover-auto[x-placement^="left"]>.arrow::after{right:1px;border-width:0.5rem 0 0.5rem 0.5rem;border-left-color:#303030}.popover-header{padding:0.5rem 0.75rem;margin-bottom:0;font-size:0.9375rem;background-color:#444;border-bottom:1px solid #373737;border-top-left-radius:calc(0.3rem - 1px);border-top-right-radius:calc(0.3rem - 1px)}.popover-header:empty{display:none}.popover-body{padding:0.5rem 0.75rem;color:#fff}.carousel{position:relative}.carousel.pointer-event{-ms-touch-action:pan-y;touch-action:pan-y}.carousel-inner{position:relative;width:100%;overflow:hidden}.carousel-inner::after{display:block;clear:both;content:""}.carousel-item{position:relative;display:none;float:left;width:100%;margin-right:-100%;-webkit-backface-visibility:hidden;backface-visibility:hidden;-webkit-transition:-webkit-transform 0.6s ease-in-out;transition:-webkit-transform 0.6s ease-in-out;transition:transform 0.6s ease-in-out;transition:transform 0.6s ease-in-out, -webkit-transform 0.6s ease-in-out}@media (prefers-reduced-motion: reduce){.carousel-item{-webkit-transition:none;transition:none}}.carousel-item.active,.carousel-item-next,.carousel-item-prev{display:block}.carousel-item-next:not(.carousel-item-left),.active.carousel-item-right{-webkit-transform:translateX(100%);transform:translateX(100%)}.carousel-item-prev:not(.carousel-item-right),.active.carousel-item-left{-webkit-transform:translateX(-100%);transform:translateX(-100%)}.carousel-fade .carousel-item{opacity:0;-webkit-transition-property:opacity;transition-property:opacity;-webkit-transform:none;transform:none}.carousel-fade .carousel-item.active,.carousel-fade .carousel-item-next.carousel-item-left,.carousel-fade .carousel-item-prev.carousel-item-right{z-index:1;opacity:1}.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{z-index:0;opacity:0;-webkit-transition:opacity 0s 0.6s;transition:opacity 0s 0.6s}@media (prefers-reduced-motion: reduce){.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{-webkit-transition:none;transition:none}}.carousel-control-prev,.carousel-control-next{position:absolute;top:0;bottom:0;z-index:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:15%;color:#fff;text-align:center;opacity:0.5;-webkit-transition:opacity 0.15s ease;transition:opacity 0.15s ease}@media (prefers-reduced-motion: reduce){.carousel-control-prev,.carousel-control-next{-webkit-transition:none;transition:none}}.carousel-control-prev:hover,.carousel-control-prev:focus,.carousel-control-next:hover,.carousel-control-next:focus{color:#fff;text-decoration:none;outline:0;opacity:0.9}.carousel-control-prev{left:0}.carousel-control-next{right:0}.carousel-control-prev-icon,.carousel-control-next-icon{display:inline-block;width:20px;height:20px;background:no-repeat 50% / 100% 100%}.carousel-control-prev-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M5.25 0l-4 4 4 4 1.5-1.5L4.25 4l2.5-2.5L5.25 0z'/%3e%3c/svg%3e")}.carousel-control-next-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M2.75 0l-1.5 1.5L3.75 4l-2.5 2.5L2.75 8l4-4-4-4z'/%3e%3c/svg%3e")}.carousel-indicators{position:absolute;right:0;bottom:0;left:0;z-index:15;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding-left:0;margin-right:15%;margin-left:15%;list-style:none}.carousel-indicators li{-webkit-box-sizing:content-box;box-sizing:content-box;-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto;width:30px;height:3px;margin-right:3px;margin-left:3px;text-indent:-999px;cursor:pointer;background-color:#fff;background-clip:padding-box;border-top:10px solid transparent;border-bottom:10px solid transparent;opacity:.5;-webkit-transition:opacity 0.6s ease;transition:opacity 0.6s ease}@media (prefers-reduced-motion: reduce){.carousel-indicators li{-webkit-transition:none;transition:none}}.carousel-indicators .active{opacity:1}.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center}@-webkit-keyframes spinner-border{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes spinner-border{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.spinner-border{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;border:0.25em solid currentColor;border-right-color:transparent;border-radius:50%;-webkit-animation:spinner-border .75s linear infinite;animation:spinner-border .75s linear infinite}.spinner-border-sm{width:1rem;height:1rem;border-width:0.2em}@-webkit-keyframes spinner-grow{0%{-webkit-transform:scale(0);transform:scale(0)}50%{opacity:1;-webkit-transform:none;transform:none}}@keyframes spinner-grow{0%{-webkit-transform:scale(0);transform:scale(0)}50%{opacity:1;-webkit-transform:none;transform:none}}.spinner-grow{display:inline-block;width:2rem;height:2rem;vertical-align:text-bottom;background-color:currentColor;border-radius:50%;opacity:0;-webkit-animation:spinner-grow .75s linear infinite;animation:spinner-grow .75s linear infinite}.spinner-grow-sm{width:1rem;height:1rem}.align-baseline{vertical-align:baseline !important}.align-top{vertical-align:top !important}.align-middle{vertical-align:middle !important}.align-bottom{vertical-align:bottom !important}.align-text-bottom{vertical-align:text-bottom !important}.align-text-top{vertical-align:text-top !important}.bg-primary{background-color:#375a7f !important}a.bg-primary:hover,a.bg-primary:focus,button.bg-primary:hover,button.bg-primary:focus{background-color:#28415b !important}.bg-secondary{background-color:#444 !important}a.bg-secondary:hover,a.bg-secondary:focus,button.bg-secondary:hover,button.bg-secondary:focus{background-color:#2b2a2a !important}.bg-success{background-color:#00bc8c !important}a.bg-success:hover,a.bg-success:focus,button.bg-success:hover,button.bg-success:focus{background-color:#008966 !important}.bg-info{background-color:#3498DB !important}a.bg-info:hover,a.bg-info:focus,button.bg-info:hover,button.bg-info:focus{background-color:#217dbb !important}.bg-warning{background-color:#F39C12 !important}a.bg-warning:hover,a.bg-warning:focus,button.bg-warning:hover,button.bg-warning:focus{background-color:#c87f0a !important}.bg-danger{background-color:#E74C3C !important}a.bg-danger:hover,a.bg-danger:focus,button.bg-danger:hover,button.bg-danger:focus{background-color:#d62c1a !important}.bg-light{background-color:#adb5bd !important}a.bg-light:hover,a.bg-light:focus,button.bg-light:hover,button.bg-light:focus{background-color:#919ca6 !important}.bg-dark{background-color:#303030 !important}a.bg-dark:hover,a.bg-dark:focus,button.bg-dark:hover,button.bg-dark:focus{background-color:#171616 !important}.bg-white{background-color:#fff !important}.bg-transparent{background-color:transparent !important}.border{border:1px solid #dee2e6 !important}.border-top{border-top:1px solid #dee2e6 !important}.border-right{border-right:1px solid #dee2e6 !important}.border-bottom{border-bottom:1px solid #dee2e6 !important}.border-left{border-left:1px solid #dee2e6 !important}.border-0{border:0 !important}.border-top-0{border-top:0 !important}.border-right-0{border-right:0 !important}.border-bottom-0{border-bottom:0 !important}.border-left-0{border-left:0 !important}.border-primary{border-color:#375a7f !important}.border-secondary{border-color:#444 !important}.border-success{border-color:#00bc8c !important}.border-info{border-color:#3498DB !important}.border-warning{border-color:#F39C12 !important}.border-danger{border-color:#E74C3C !important}.border-light{border-color:#adb5bd !important}.border-dark{border-color:#303030 !important}.border-white{border-color:#fff !important}.rounded-sm{border-radius:0.2rem !important}.rounded{border-radius:0.25rem !important}.rounded-top{border-top-left-radius:0.25rem !important;border-top-right-radius:0.25rem !important}.rounded-right{border-top-right-radius:0.25rem !important;border-bottom-right-radius:0.25rem !important}.rounded-bottom{border-bottom-right-radius:0.25rem !important;border-bottom-left-radius:0.25rem !important}.rounded-left{border-top-left-radius:0.25rem !important;border-bottom-left-radius:0.25rem !important}.rounded-lg{border-radius:0.3rem !important}.rounded-circle{border-radius:50% !important}.rounded-pill{border-radius:50rem !important}.rounded-0{border-radius:0 !important}.clearfix::after{display:block;clear:both;content:""}.d-none{display:none !important}.d-inline{display:inline !important}.d-inline-block{display:inline-block !important}.d-block{display:block !important}.d-table{display:table !important}.d-table-row{display:table-row !important}.d-table-cell{display:table-cell !important}.d-flex{display:-webkit-box !important;display:-ms-flexbox !important;display:flex !important}.d-inline-flex{display:-webkit-inline-box !important;display:-ms-inline-flexbox !important;display:inline-flex !important}@media (min-width: 576px){.d-sm-none{display:none !important}.d-sm-inline{display:inline !important}.d-sm-inline-block{display:inline-block !important}.d-sm-block{display:block !important}.d-sm-table{display:table !important}.d-sm-table-row{display:table-row !important}.d-sm-table-cell{display:table-cell !important}.d-sm-flex{display:-webkit-box !important;display:-ms-flexbox !important;display:flex !important}.d-sm-inline-flex{display:-webkit-inline-box !important;display:-ms-inline-flexbox !important;display:inline-flex !important}}@media (min-width: 768px){.d-md-none{display:none !important}.d-md-inline{display:inline !important}.d-md-inline-block{display:inline-block !important}.d-md-block{display:block !important}.d-md-table{display:table !important}.d-md-table-row{display:table-row !important}.d-md-table-cell{display:table-cell !important}.d-md-flex{display:-webkit-box !important;display:-ms-flexbox !important;display:flex !important}.d-md-inline-flex{display:-webkit-inline-box !important;display:-ms-inline-flexbox !important;display:inline-flex !important}}@media (min-width: 992px){.d-lg-none{display:none !important}.d-lg-inline{display:inline !important}.d-lg-inline-block{display:inline-block !important}.d-lg-block{display:block !important}.d-lg-table{display:table !important}.d-lg-table-row{display:table-row !important}.d-lg-table-cell{display:table-cell !important}.d-lg-flex{display:-webkit-box !important;display:-ms-flexbox !important;display:flex !important}.d-lg-inline-flex{display:-webkit-inline-box !important;display:-ms-inline-flexbox !important;display:inline-flex !important}}@media (min-width: 1200px){.d-xl-none{display:none !important}.d-xl-inline{display:inline !important}.d-xl-inline-block{display:inline-block !important}.d-xl-block{display:block !important}.d-xl-table{display:table !important}.d-xl-table-row{display:table-row !important}.d-xl-table-cell{display:table-cell !important}.d-xl-flex{display:-webkit-box !important;display:-ms-flexbox !important;display:flex !important}.d-xl-inline-flex{display:-webkit-inline-box !important;display:-ms-inline-flexbox !important;display:inline-flex !important}}@media print{.d-print-none{display:none !important}.d-print-inline{display:inline !important}.d-print-inline-block{display:inline-block !important}.d-print-block{display:block !important}.d-print-table{display:table !important}.d-print-table-row{display:table-row !important}.d-print-table-cell{display:table-cell !important}.d-print-flex{display:-webkit-box !important;display:-ms-flexbox !important;display:flex !important}.d-print-inline-flex{display:-webkit-inline-box !important;display:-ms-inline-flexbox !important;display:inline-flex !important}}.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}.embed-responsive::before{display:block;content:""}.embed-responsive .embed-responsive-item,.embed-responsive iframe,.embed-responsive embed,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9::before{padding-top:42.8571428571%}.embed-responsive-16by9::before{padding-top:56.25%}.embed-responsive-4by3::before{padding-top:75%}.embed-responsive-1by1::before{padding-top:100%}.flex-row{-webkit-box-orient:horizontal !important;-webkit-box-direction:normal !important;-ms-flex-direction:row !important;flex-direction:row !important}.flex-column{-webkit-box-orient:vertical !important;-webkit-box-direction:normal !important;-ms-flex-direction:column !important;flex-direction:column !important}.flex-row-reverse{-webkit-box-orient:horizontal !important;-webkit-box-direction:reverse !important;-ms-flex-direction:row-reverse !important;flex-direction:row-reverse !important}.flex-column-reverse{-webkit-box-orient:vertical !important;-webkit-box-direction:reverse !important;-ms-flex-direction:column-reverse !important;flex-direction:column-reverse !important}.flex-wrap{-ms-flex-wrap:wrap !important;flex-wrap:wrap !important}.flex-nowrap{-ms-flex-wrap:nowrap !important;flex-wrap:nowrap !important}.flex-wrap-reverse{-ms-flex-wrap:wrap-reverse !important;flex-wrap:wrap-reverse !important}.flex-fill{-webkit-box-flex:1 !important;-ms-flex:1 1 auto !important;flex:1 1 auto !important}.flex-grow-0{-webkit-box-flex:0 !important;-ms-flex-positive:0 !important;flex-grow:0 !important}.flex-grow-1{-webkit-box-flex:1 !important;-ms-flex-positive:1 !important;flex-grow:1 !important}.flex-shrink-0{-ms-flex-negative:0 !important;flex-shrink:0 !important}.flex-shrink-1{-ms-flex-negative:1 !important;flex-shrink:1 !important}.justify-content-start{-webkit-box-pack:start !important;-ms-flex-pack:start !important;justify-content:flex-start !important}.justify-content-end{-webkit-box-pack:end !important;-ms-flex-pack:end !important;justify-content:flex-end !important}.justify-content-center{-webkit-box-pack:center !important;-ms-flex-pack:center !important;justify-content:center !important}.justify-content-between{-webkit-box-pack:justify !important;-ms-flex-pack:justify !important;justify-content:space-between !important}.justify-content-around{-ms-flex-pack:distribute !important;justify-content:space-around !important}.align-items-start{-webkit-box-align:start !important;-ms-flex-align:start !important;align-items:flex-start !important}.align-items-end{-webkit-box-align:end !important;-ms-flex-align:end !important;align-items:flex-end !important}.align-items-center{-webkit-box-align:center !important;-ms-flex-align:center !important;align-items:center !important}.align-items-baseline{-webkit-box-align:baseline !important;-ms-flex-align:baseline !important;align-items:baseline !important}.align-items-stretch{-webkit-box-align:stretch !important;-ms-flex-align:stretch !important;align-items:stretch !important}.align-content-start{-ms-flex-line-pack:start !important;align-content:flex-start !important}.align-content-end{-ms-flex-line-pack:end !important;align-content:flex-end !important}.align-content-center{-ms-flex-line-pack:center !important;align-content:center !important}.align-content-between{-ms-flex-line-pack:justify !important;align-content:space-between !important}.align-content-around{-ms-flex-line-pack:distribute !important;align-content:space-around !important}.align-content-stretch{-ms-flex-line-pack:stretch !important;align-content:stretch !important}.align-self-auto{-ms-flex-item-align:auto !important;align-self:auto !important}.align-self-start{-ms-flex-item-align:start !important;align-self:flex-start !important}.align-self-end{-ms-flex-item-align:end !important;align-self:flex-end !important}.align-self-center{-ms-flex-item-align:center !important;align-self:center !important}.align-self-baseline{-ms-flex-item-align:baseline !important;align-self:baseline !important}.align-self-stretch{-ms-flex-item-align:stretch !important;align-self:stretch !important}@media (min-width: 576px){.flex-sm-row{-webkit-box-orient:horizontal !important;-webkit-box-direction:normal !important;-ms-flex-direction:row !important;flex-direction:row !important}.flex-sm-column{-webkit-box-orient:vertical !important;-webkit-box-direction:normal !important;-ms-flex-direction:column !important;flex-direction:column !important}.flex-sm-row-reverse{-webkit-box-orient:horizontal !important;-webkit-box-direction:reverse !important;-ms-flex-direction:row-reverse !important;flex-direction:row-reverse !important}.flex-sm-column-reverse{-webkit-box-orient:vertical !important;-webkit-box-direction:reverse !important;-ms-flex-direction:column-reverse !important;flex-direction:column-reverse !important}.flex-sm-wrap{-ms-flex-wrap:wrap !important;flex-wrap:wrap !important}.flex-sm-nowrap{-ms-flex-wrap:nowrap !important;flex-wrap:nowrap !important}.flex-sm-wrap-reverse{-ms-flex-wrap:wrap-reverse !important;flex-wrap:wrap-reverse !important}.flex-sm-fill{-webkit-box-flex:1 !important;-ms-flex:1 1 auto !important;flex:1 1 auto !important}.flex-sm-grow-0{-webkit-box-flex:0 !important;-ms-flex-positive:0 !important;flex-grow:0 !important}.flex-sm-grow-1{-webkit-box-flex:1 !important;-ms-flex-positive:1 !important;flex-grow:1 !important}.flex-sm-shrink-0{-ms-flex-negative:0 !important;flex-shrink:0 !important}.flex-sm-shrink-1{-ms-flex-negative:1 !important;flex-shrink:1 !important}.justify-content-sm-start{-webkit-box-pack:start !important;-ms-flex-pack:start !important;justify-content:flex-start !important}.justify-content-sm-end{-webkit-box-pack:end !important;-ms-flex-pack:end !important;justify-content:flex-end !important}.justify-content-sm-center{-webkit-box-pack:center !important;-ms-flex-pack:center !important;justify-content:center !important}.justify-content-sm-between{-webkit-box-pack:justify !important;-ms-flex-pack:justify !important;justify-content:space-between !important}.justify-content-sm-around{-ms-flex-pack:distribute !important;justify-content:space-around !important}.align-items-sm-start{-webkit-box-align:start !important;-ms-flex-align:start !important;align-items:flex-start !important}.align-items-sm-end{-webkit-box-align:end !important;-ms-flex-align:end !important;align-items:flex-end !important}.align-items-sm-center{-webkit-box-align:center !important;-ms-flex-align:center !important;align-items:center !important}.align-items-sm-baseline{-webkit-box-align:baseline !important;-ms-flex-align:baseline !important;align-items:baseline !important}.align-items-sm-stretch{-webkit-box-align:stretch !important;-ms-flex-align:stretch !important;align-items:stretch !important}.align-content-sm-start{-ms-flex-line-pack:start !important;align-content:flex-start !important}.align-content-sm-end{-ms-flex-line-pack:end !important;align-content:flex-end !important}.align-content-sm-center{-ms-flex-line-pack:center !important;align-content:center !important}.align-content-sm-between{-ms-flex-line-pack:justify !important;align-content:space-between !important}.align-content-sm-around{-ms-flex-line-pack:distribute !important;align-content:space-around !important}.align-content-sm-stretch{-ms-flex-line-pack:stretch !important;align-content:stretch !important}.align-self-sm-auto{-ms-flex-item-align:auto !important;align-self:auto !important}.align-self-sm-start{-ms-flex-item-align:start !important;align-self:flex-start !important}.align-self-sm-end{-ms-flex-item-align:end !important;align-self:flex-end !important}.align-self-sm-center{-ms-flex-item-align:center !important;align-self:center !important}.align-self-sm-baseline{-ms-flex-item-align:baseline !important;align-self:baseline !important}.align-self-sm-stretch{-ms-flex-item-align:stretch !important;align-self:stretch !important}}@media (min-width: 768px){.flex-md-row{-webkit-box-orient:horizontal !important;-webkit-box-direction:normal !important;-ms-flex-direction:row !important;flex-direction:row !important}.flex-md-column{-webkit-box-orient:vertical !important;-webkit-box-direction:normal !important;-ms-flex-direction:column !important;flex-direction:column !important}.flex-md-row-reverse{-webkit-box-orient:horizontal !important;-webkit-box-direction:reverse !important;-ms-flex-direction:row-reverse !important;flex-direction:row-reverse !important}.flex-md-column-reverse{-webkit-box-orient:vertical !important;-webkit-box-direction:reverse !important;-ms-flex-direction:column-reverse !important;flex-direction:column-reverse !important}.flex-md-wrap{-ms-flex-wrap:wrap !important;flex-wrap:wrap !important}.flex-md-nowrap{-ms-flex-wrap:nowrap !important;flex-wrap:nowrap !important}.flex-md-wrap-reverse{-ms-flex-wrap:wrap-reverse !important;flex-wrap:wrap-reverse !important}.flex-md-fill{-webkit-box-flex:1 !important;-ms-flex:1 1 auto !important;flex:1 1 auto !important}.flex-md-grow-0{-webkit-box-flex:0 !important;-ms-flex-positive:0 !important;flex-grow:0 !important}.flex-md-grow-1{-webkit-box-flex:1 !important;-ms-flex-positive:1 !important;flex-grow:1 !important}.flex-md-shrink-0{-ms-flex-negative:0 !important;flex-shrink:0 !important}.flex-md-shrink-1{-ms-flex-negative:1 !important;flex-shrink:1 !important}.justify-content-md-start{-webkit-box-pack:start !important;-ms-flex-pack:start !important;justify-content:flex-start !important}.justify-content-md-end{-webkit-box-pack:end !important;-ms-flex-pack:end !important;justify-content:flex-end !important}.justify-content-md-center{-webkit-box-pack:center !important;-ms-flex-pack:center !important;justify-content:center !important}.justify-content-md-between{-webkit-box-pack:justify !important;-ms-flex-pack:justify !important;justify-content:space-between !important}.justify-content-md-around{-ms-flex-pack:distribute !important;justify-content:space-around !important}.align-items-md-start{-webkit-box-align:start !important;-ms-flex-align:start !important;align-items:flex-start !important}.align-items-md-end{-webkit-box-align:end !important;-ms-flex-align:end !important;align-items:flex-end !important}.align-items-md-center{-webkit-box-align:center !important;-ms-flex-align:center !important;align-items:center !important}.align-items-md-baseline{-webkit-box-align:baseline !important;-ms-flex-align:baseline !important;align-items:baseline !important}.align-items-md-stretch{-webkit-box-align:stretch !important;-ms-flex-align:stretch !important;align-items:stretch !important}.align-content-md-start{-ms-flex-line-pack:start !important;align-content:flex-start !important}.align-content-md-end{-ms-flex-line-pack:end !important;align-content:flex-end !important}.align-content-md-center{-ms-flex-line-pack:center !important;align-content:center !important}.align-content-md-between{-ms-flex-line-pack:justify !important;align-content:space-between !important}.align-content-md-around{-ms-flex-line-pack:distribute !important;align-content:space-around !important}.align-content-md-stretch{-ms-flex-line-pack:stretch !important;align-content:stretch !important}.align-self-md-auto{-ms-flex-item-align:auto !important;align-self:auto !important}.align-self-md-start{-ms-flex-item-align:start !important;align-self:flex-start !important}.align-self-md-end{-ms-flex-item-align:end !important;align-self:flex-end !important}.align-self-md-center{-ms-flex-item-align:center !important;align-self:center !important}.align-self-md-baseline{-ms-flex-item-align:baseline !important;align-self:baseline !important}.align-self-md-stretch{-ms-flex-item-align:stretch !important;align-self:stretch !important}}@media (min-width: 992px){.flex-lg-row{-webkit-box-orient:horizontal !important;-webkit-box-direction:normal !important;-ms-flex-direction:row !important;flex-direction:row !important}.flex-lg-column{-webkit-box-orient:vertical !important;-webkit-box-direction:normal !important;-ms-flex-direction:column !important;flex-direction:column !important}.flex-lg-row-reverse{-webkit-box-orient:horizontal !important;-webkit-box-direction:reverse !important;-ms-flex-direction:row-reverse !important;flex-direction:row-reverse !important}.flex-lg-column-reverse{-webkit-box-orient:vertical !important;-webkit-box-direction:reverse !important;-ms-flex-direction:column-reverse !important;flex-direction:column-reverse !important}.flex-lg-wrap{-ms-flex-wrap:wrap !important;flex-wrap:wrap !important}.flex-lg-nowrap{-ms-flex-wrap:nowrap !important;flex-wrap:nowrap !important}.flex-lg-wrap-reverse{-ms-flex-wrap:wrap-reverse !important;flex-wrap:wrap-reverse !important}.flex-lg-fill{-webkit-box-flex:1 !important;-ms-flex:1 1 auto !important;flex:1 1 auto !important}.flex-lg-grow-0{-webkit-box-flex:0 !important;-ms-flex-positive:0 !important;flex-grow:0 !important}.flex-lg-grow-1{-webkit-box-flex:1 !important;-ms-flex-positive:1 !important;flex-grow:1 !important}.flex-lg-shrink-0{-ms-flex-negative:0 !important;flex-shrink:0 !important}.flex-lg-shrink-1{-ms-flex-negative:1 !important;flex-shrink:1 !important}.justify-content-lg-start{-webkit-box-pack:start !important;-ms-flex-pack:start !important;justify-content:flex-start !important}.justify-content-lg-end{-webkit-box-pack:end !important;-ms-flex-pack:end !important;justify-content:flex-end !important}.justify-content-lg-center{-webkit-box-pack:center !important;-ms-flex-pack:center !important;justify-content:center !important}.justify-content-lg-between{-webkit-box-pack:justify !important;-ms-flex-pack:justify !important;justify-content:space-between !important}.justify-content-lg-around{-ms-flex-pack:distribute !important;justify-content:space-around !important}.align-items-lg-start{-webkit-box-align:start !important;-ms-flex-align:start !important;align-items:flex-start !important}.align-items-lg-end{-webkit-box-align:end !important;-ms-flex-align:end !important;align-items:flex-end !important}.align-items-lg-center{-webkit-box-align:center !important;-ms-flex-align:center !important;align-items:center !important}.align-items-lg-baseline{-webkit-box-align:baseline !important;-ms-flex-align:baseline !important;align-items:baseline !important}.align-items-lg-stretch{-webkit-box-align:stretch !important;-ms-flex-align:stretch !important;align-items:stretch !important}.align-content-lg-start{-ms-flex-line-pack:start !important;align-content:flex-start !important}.align-content-lg-end{-ms-flex-line-pack:end !important;align-content:flex-end !important}.align-content-lg-center{-ms-flex-line-pack:center !important;align-content:center !important}.align-content-lg-between{-ms-flex-line-pack:justify !important;align-content:space-between !important}.align-content-lg-around{-ms-flex-line-pack:distribute !important;align-content:space-around !important}.align-content-lg-stretch{-ms-flex-line-pack:stretch !important;align-content:stretch !important}.align-self-lg-auto{-ms-flex-item-align:auto !important;align-self:auto !important}.align-self-lg-start{-ms-flex-item-align:start !important;align-self:flex-start !important}.align-self-lg-end{-ms-flex-item-align:end !important;align-self:flex-end !important}.align-self-lg-center{-ms-flex-item-align:center !important;align-self:center !important}.align-self-lg-baseline{-ms-flex-item-align:baseline !important;align-self:baseline !important}.align-self-lg-stretch{-ms-flex-item-align:stretch !important;align-self:stretch !important}}@media (min-width: 1200px){.flex-xl-row{-webkit-box-orient:horizontal !important;-webkit-box-direction:normal !important;-ms-flex-direction:row !important;flex-direction:row !important}.flex-xl-column{-webkit-box-orient:vertical !important;-webkit-box-direction:normal !important;-ms-flex-direction:column !important;flex-direction:column !important}.flex-xl-row-reverse{-webkit-box-orient:horizontal !important;-webkit-box-direction:reverse !important;-ms-flex-direction:row-reverse !important;flex-direction:row-reverse !important}.flex-xl-column-reverse{-webkit-box-orient:vertical !important;-webkit-box-direction:reverse !important;-ms-flex-direction:column-reverse !important;flex-direction:column-reverse !important}.flex-xl-wrap{-ms-flex-wrap:wrap !important;flex-wrap:wrap !important}.flex-xl-nowrap{-ms-flex-wrap:nowrap !important;flex-wrap:nowrap !important}.flex-xl-wrap-reverse{-ms-flex-wrap:wrap-reverse !important;flex-wrap:wrap-reverse !important}.flex-xl-fill{-webkit-box-flex:1 !important;-ms-flex:1 1 auto !important;flex:1 1 auto !important}.flex-xl-grow-0{-webkit-box-flex:0 !important;-ms-flex-positive:0 !important;flex-grow:0 !important}.flex-xl-grow-1{-webkit-box-flex:1 !important;-ms-flex-positive:1 !important;flex-grow:1 !important}.flex-xl-shrink-0{-ms-flex-negative:0 !important;flex-shrink:0 !important}.flex-xl-shrink-1{-ms-flex-negative:1 !important;flex-shrink:1 !important}.justify-content-xl-start{-webkit-box-pack:start !important;-ms-flex-pack:start !important;justify-content:flex-start !important}.justify-content-xl-end{-webkit-box-pack:end !important;-ms-flex-pack:end !important;justify-content:flex-end !important}.justify-content-xl-center{-webkit-box-pack:center !important;-ms-flex-pack:center !important;justify-content:center !important}.justify-content-xl-between{-webkit-box-pack:justify !important;-ms-flex-pack:justify !important;justify-content:space-between !important}.justify-content-xl-around{-ms-flex-pack:distribute !important;justify-content:space-around !important}.align-items-xl-start{-webkit-box-align:start !important;-ms-flex-align:start !important;align-items:flex-start !important}.align-items-xl-end{-webkit-box-align:end !important;-ms-flex-align:end !important;align-items:flex-end !important}.align-items-xl-center{-webkit-box-align:center !important;-ms-flex-align:center !important;align-items:center !important}.align-items-xl-baseline{-webkit-box-align:baseline !important;-ms-flex-align:baseline !important;align-items:baseline !important}.align-items-xl-stretch{-webkit-box-align:stretch !important;-ms-flex-align:stretch !important;align-items:stretch !important}.align-content-xl-start{-ms-flex-line-pack:start !important;align-content:flex-start !important}.align-content-xl-end{-ms-flex-line-pack:end !important;align-content:flex-end !important}.align-content-xl-center{-ms-flex-line-pack:center !important;align-content:center !important}.align-content-xl-between{-ms-flex-line-pack:justify !important;align-content:space-between !important}.align-content-xl-around{-ms-flex-line-pack:distribute !important;align-content:space-around !important}.align-content-xl-stretch{-ms-flex-line-pack:stretch !important;align-content:stretch !important}.align-self-xl-auto{-ms-flex-item-align:auto !important;align-self:auto !important}.align-self-xl-start{-ms-flex-item-align:start !important;align-self:flex-start !important}.align-self-xl-end{-ms-flex-item-align:end !important;align-self:flex-end !important}.align-self-xl-center{-ms-flex-item-align:center !important;align-self:center !important}.align-self-xl-baseline{-ms-flex-item-align:baseline !important;align-self:baseline !important}.align-self-xl-stretch{-ms-flex-item-align:stretch !important;align-self:stretch !important}}.float-left{float:left !important}.float-right{float:right !important}.float-none{float:none !important}@media (min-width: 576px){.float-sm-left{float:left !important}.float-sm-right{float:right !important}.float-sm-none{float:none !important}}@media (min-width: 768px){.float-md-left{float:left !important}.float-md-right{float:right !important}.float-md-none{float:none !important}}@media (min-width: 992px){.float-lg-left{float:left !important}.float-lg-right{float:right !important}.float-lg-none{float:none !important}}@media (min-width: 1200px){.float-xl-left{float:left !important}.float-xl-right{float:right !important}.float-xl-none{float:none !important}}.user-select-all{-webkit-user-select:all !important;-moz-user-select:all !important;-ms-user-select:all !important;user-select:all !important}.user-select-auto{-webkit-user-select:auto !important;-moz-user-select:auto !important;-ms-user-select:auto !important;user-select:auto !important}.user-select-none{-webkit-user-select:none !important;-moz-user-select:none !important;-ms-user-select:none !important;user-select:none !important}.overflow-auto{overflow:auto !important}.overflow-hidden{overflow:hidden !important}.position-static{position:static !important}.position-relative{position:relative !important}.position-absolute{position:absolute !important}.position-fixed{position:fixed !important}.position-sticky{position:-webkit-sticky !important;position:sticky !important}.fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030}.fixed-bottom{position:fixed;right:0;bottom:0;left:0;z-index:1030}@supports (position: -webkit-sticky) or (position: sticky){.sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);white-space:nowrap;border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal}.shadow-sm{-webkit-box-shadow:0 0.125rem 0.25rem rgba(0,0,0,0.075) !important;box-shadow:0 0.125rem 0.25rem rgba(0,0,0,0.075) !important}.shadow{-webkit-box-shadow:0 0.5rem 1rem rgba(0,0,0,0.15) !important;box-shadow:0 0.5rem 1rem rgba(0,0,0,0.15) !important}.shadow-lg{-webkit-box-shadow:0 1rem 3rem rgba(0,0,0,0.175) !important;box-shadow:0 1rem 3rem rgba(0,0,0,0.175) !important}.shadow-none{-webkit-box-shadow:none !important;box-shadow:none !important}.w-25{width:25% !important}.w-50{width:50% !important}.w-75{width:75% !important}.w-100{width:100% !important}.w-auto{width:auto !important}.h-25{height:25% !important}.h-50{height:50% !important}.h-75{height:75% !important}.h-100{height:100% !important}.h-auto{height:auto !important}.mw-100{max-width:100% !important}.mh-100{max-height:100% !important}.min-vw-100{min-width:100vw !important}.min-vh-100{min-height:100vh !important}.vw-100{width:100vw !important}.vh-100{height:100vh !important}.m-0{margin:0 !important}.mt-0,.my-0{margin-top:0 !important}.mr-0,.mx-0{margin-right:0 !important}.mb-0,.my-0{margin-bottom:0 !important}.ml-0,.mx-0{margin-left:0 !important}.m-1{margin:0.25rem !important}.mt-1,.my-1{margin-top:0.25rem !important}.mr-1,.mx-1{margin-right:0.25rem !important}.mb-1,.my-1{margin-bottom:0.25rem !important}.ml-1,.mx-1{margin-left:0.25rem !important}.m-2{margin:0.5rem !important}.mt-2,.my-2{margin-top:0.5rem !important}.mr-2,.mx-2{margin-right:0.5rem !important}.mb-2,.my-2{margin-bottom:0.5rem !important}.ml-2,.mx-2{margin-left:0.5rem !important}.m-3{margin:1rem !important}.mt-3,.my-3{margin-top:1rem !important}.mr-3,.mx-3{margin-right:1rem !important}.mb-3,.my-3{margin-bottom:1rem !important}.ml-3,.mx-3{margin-left:1rem !important}.m-4{margin:1.5rem !important}.mt-4,.my-4{margin-top:1.5rem !important}.mr-4,.mx-4{margin-right:1.5rem !important}.mb-4,.my-4{margin-bottom:1.5rem !important}.ml-4,.mx-4{margin-left:1.5rem !important}.m-5{margin:3rem !important}.mt-5,.my-5{margin-top:3rem !important}.mr-5,.mx-5{margin-right:3rem !important}.mb-5,.my-5{margin-bottom:3rem !important}.ml-5,.mx-5{margin-left:3rem !important}.p-0{padding:0 !important}.pt-0,.py-0{padding-top:0 !important}.pr-0,.px-0{padding-right:0 !important}.pb-0,.py-0{padding-bottom:0 !important}.pl-0,.px-0{padding-left:0 !important}.p-1{padding:0.25rem !important}.pt-1,.py-1{padding-top:0.25rem !important}.pr-1,.px-1{padding-right:0.25rem !important}.pb-1,.py-1{padding-bottom:0.25rem !important}.pl-1,.px-1{padding-left:0.25rem !important}.p-2{padding:0.5rem !important}.pt-2,.py-2{padding-top:0.5rem !important}.pr-2,.px-2{padding-right:0.5rem !important}.pb-2,.py-2{padding-bottom:0.5rem !important}.pl-2,.px-2{padding-left:0.5rem !important}.p-3{padding:1rem !important}.pt-3,.py-3{padding-top:1rem !important}.pr-3,.px-3{padding-right:1rem !important}.pb-3,.py-3{padding-bottom:1rem !important}.pl-3,.px-3{padding-left:1rem !important}.p-4{padding:1.5rem !important}.pt-4,.py-4{padding-top:1.5rem !important}.pr-4,.px-4{padding-right:1.5rem !important}.pb-4,.py-4{padding-bottom:1.5rem !important}.pl-4,.px-4{padding-left:1.5rem !important}.p-5{padding:3rem !important}.pt-5,.py-5{padding-top:3rem !important}.pr-5,.px-5{padding-right:3rem !important}.pb-5,.py-5{padding-bottom:3rem !important}.pl-5,.px-5{padding-left:3rem !important}.m-n1{margin:-0.25rem !important}.mt-n1,.my-n1{margin-top:-0.25rem !important}.mr-n1,.mx-n1{margin-right:-0.25rem !important}.mb-n1,.my-n1{margin-bottom:-0.25rem !important}.ml-n1,.mx-n1{margin-left:-0.25rem !important}.m-n2{margin:-0.5rem !important}.mt-n2,.my-n2{margin-top:-0.5rem !important}.mr-n2,.mx-n2{margin-right:-0.5rem !important}.mb-n2,.my-n2{margin-bottom:-0.5rem !important}.ml-n2,.mx-n2{margin-left:-0.5rem !important}.m-n3{margin:-1rem !important}.mt-n3,.my-n3{margin-top:-1rem !important}.mr-n3,.mx-n3{margin-right:-1rem !important}.mb-n3,.my-n3{margin-bottom:-1rem !important}.ml-n3,.mx-n3{margin-left:-1rem !important}.m-n4{margin:-1.5rem !important}.mt-n4,.my-n4{margin-top:-1.5rem !important}.mr-n4,.mx-n4{margin-right:-1.5rem !important}.mb-n4,.my-n4{margin-bottom:-1.5rem !important}.ml-n4,.mx-n4{margin-left:-1.5rem !important}.m-n5{margin:-3rem !important}.mt-n5,.my-n5{margin-top:-3rem !important}.mr-n5,.mx-n5{margin-right:-3rem !important}.mb-n5,.my-n5{margin-bottom:-3rem !important}.ml-n5,.mx-n5{margin-left:-3rem !important}.m-auto{margin:auto !important}.mt-auto,.my-auto{margin-top:auto !important}.mr-auto,.mx-auto{margin-right:auto !important}.mb-auto,.my-auto{margin-bottom:auto !important}.ml-auto,.mx-auto{margin-left:auto !important}@media (min-width: 576px){.m-sm-0{margin:0 !important}.mt-sm-0,.my-sm-0{margin-top:0 !important}.mr-sm-0,.mx-sm-0{margin-right:0 !important}.mb-sm-0,.my-sm-0{margin-bottom:0 !important}.ml-sm-0,.mx-sm-0{margin-left:0 !important}.m-sm-1{margin:0.25rem !important}.mt-sm-1,.my-sm-1{margin-top:0.25rem !important}.mr-sm-1,.mx-sm-1{margin-right:0.25rem !important}.mb-sm-1,.my-sm-1{margin-bottom:0.25rem !important}.ml-sm-1,.mx-sm-1{margin-left:0.25rem !important}.m-sm-2{margin:0.5rem !important}.mt-sm-2,.my-sm-2{margin-top:0.5rem !important}.mr-sm-2,.mx-sm-2{margin-right:0.5rem !important}.mb-sm-2,.my-sm-2{margin-bottom:0.5rem !important}.ml-sm-2,.mx-sm-2{margin-left:0.5rem !important}.m-sm-3{margin:1rem !important}.mt-sm-3,.my-sm-3{margin-top:1rem !important}.mr-sm-3,.mx-sm-3{margin-right:1rem !important}.mb-sm-3,.my-sm-3{margin-bottom:1rem !important}.ml-sm-3,.mx-sm-3{margin-left:1rem !important}.m-sm-4{margin:1.5rem !important}.mt-sm-4,.my-sm-4{margin-top:1.5rem !important}.mr-sm-4,.mx-sm-4{margin-right:1.5rem !important}.mb-sm-4,.my-sm-4{margin-bottom:1.5rem !important}.ml-sm-4,.mx-sm-4{margin-left:1.5rem !important}.m-sm-5{margin:3rem !important}.mt-sm-5,.my-sm-5{margin-top:3rem !important}.mr-sm-5,.mx-sm-5{margin-right:3rem !important}.mb-sm-5,.my-sm-5{margin-bottom:3rem !important}.ml-sm-5,.mx-sm-5{margin-left:3rem !important}.p-sm-0{padding:0 !important}.pt-sm-0,.py-sm-0{padding-top:0 !important}.pr-sm-0,.px-sm-0{padding-right:0 !important}.pb-sm-0,.py-sm-0{padding-bottom:0 !important}.pl-sm-0,.px-sm-0{padding-left:0 !important}.p-sm-1{padding:0.25rem !important}.pt-sm-1,.py-sm-1{padding-top:0.25rem !important}.pr-sm-1,.px-sm-1{padding-right:0.25rem !important}.pb-sm-1,.py-sm-1{padding-bottom:0.25rem !important}.pl-sm-1,.px-sm-1{padding-left:0.25rem !important}.p-sm-2{padding:0.5rem !important}.pt-sm-2,.py-sm-2{padding-top:0.5rem !important}.pr-sm-2,.px-sm-2{padding-right:0.5rem !important}.pb-sm-2,.py-sm-2{padding-bottom:0.5rem !important}.pl-sm-2,.px-sm-2{padding-left:0.5rem !important}.p-sm-3{padding:1rem !important}.pt-sm-3,.py-sm-3{padding-top:1rem !important}.pr-sm-3,.px-sm-3{padding-right:1rem !important}.pb-sm-3,.py-sm-3{padding-bottom:1rem !important}.pl-sm-3,.px-sm-3{padding-left:1rem !important}.p-sm-4{padding:1.5rem !important}.pt-sm-4,.py-sm-4{padding-top:1.5rem !important}.pr-sm-4,.px-sm-4{padding-right:1.5rem !important}.pb-sm-4,.py-sm-4{padding-bottom:1.5rem !important}.pl-sm-4,.px-sm-4{padding-left:1.5rem !important}.p-sm-5{padding:3rem !important}.pt-sm-5,.py-sm-5{padding-top:3rem !important}.pr-sm-5,.px-sm-5{padding-right:3rem !important}.pb-sm-5,.py-sm-5{padding-bottom:3rem !important}.pl-sm-5,.px-sm-5{padding-left:3rem !important}.m-sm-n1{margin:-0.25rem !important}.mt-sm-n1,.my-sm-n1{margin-top:-0.25rem !important}.mr-sm-n1,.mx-sm-n1{margin-right:-0.25rem !important}.mb-sm-n1,.my-sm-n1{margin-bottom:-0.25rem !important}.ml-sm-n1,.mx-sm-n1{margin-left:-0.25rem !important}.m-sm-n2{margin:-0.5rem !important}.mt-sm-n2,.my-sm-n2{margin-top:-0.5rem !important}.mr-sm-n2,.mx-sm-n2{margin-right:-0.5rem !important}.mb-sm-n2,.my-sm-n2{margin-bottom:-0.5rem !important}.ml-sm-n2,.mx-sm-n2{margin-left:-0.5rem !important}.m-sm-n3{margin:-1rem !important}.mt-sm-n3,.my-sm-n3{margin-top:-1rem !important}.mr-sm-n3,.mx-sm-n3{margin-right:-1rem !important}.mb-sm-n3,.my-sm-n3{margin-bottom:-1rem !important}.ml-sm-n3,.mx-sm-n3{margin-left:-1rem !important}.m-sm-n4{margin:-1.5rem !important}.mt-sm-n4,.my-sm-n4{margin-top:-1.5rem !important}.mr-sm-n4,.mx-sm-n4{margin-right:-1.5rem !important}.mb-sm-n4,.my-sm-n4{margin-bottom:-1.5rem !important}.ml-sm-n4,.mx-sm-n4{margin-left:-1.5rem !important}.m-sm-n5{margin:-3rem !important}.mt-sm-n5,.my-sm-n5{margin-top:-3rem !important}.mr-sm-n5,.mx-sm-n5{margin-right:-3rem !important}.mb-sm-n5,.my-sm-n5{margin-bottom:-3rem !important}.ml-sm-n5,.mx-sm-n5{margin-left:-3rem !important}.m-sm-auto{margin:auto !important}.mt-sm-auto,.my-sm-auto{margin-top:auto !important}.mr-sm-auto,.mx-sm-auto{margin-right:auto !important}.mb-sm-auto,.my-sm-auto{margin-bottom:auto !important}.ml-sm-auto,.mx-sm-auto{margin-left:auto !important}}@media (min-width: 768px){.m-md-0{margin:0 !important}.mt-md-0,.my-md-0{margin-top:0 !important}.mr-md-0,.mx-md-0{margin-right:0 !important}.mb-md-0,.my-md-0{margin-bottom:0 !important}.ml-md-0,.mx-md-0{margin-left:0 !important}.m-md-1{margin:0.25rem !important}.mt-md-1,.my-md-1{margin-top:0.25rem !important}.mr-md-1,.mx-md-1{margin-right:0.25rem !important}.mb-md-1,.my-md-1{margin-bottom:0.25rem !important}.ml-md-1,.mx-md-1{margin-left:0.25rem !important}.m-md-2{margin:0.5rem !important}.mt-md-2,.my-md-2{margin-top:0.5rem !important}.mr-md-2,.mx-md-2{margin-right:0.5rem !important}.mb-md-2,.my-md-2{margin-bottom:0.5rem !important}.ml-md-2,.mx-md-2{margin-left:0.5rem !important}.m-md-3{margin:1rem !important}.mt-md-3,.my-md-3{margin-top:1rem !important}.mr-md-3,.mx-md-3{margin-right:1rem !important}.mb-md-3,.my-md-3{margin-bottom:1rem !important}.ml-md-3,.mx-md-3{margin-left:1rem !important}.m-md-4{margin:1.5rem !important}.mt-md-4,.my-md-4{margin-top:1.5rem !important}.mr-md-4,.mx-md-4{margin-right:1.5rem !important}.mb-md-4,.my-md-4{margin-bottom:1.5rem !important}.ml-md-4,.mx-md-4{margin-left:1.5rem !important}.m-md-5{margin:3rem !important}.mt-md-5,.my-md-5{margin-top:3rem !important}.mr-md-5,.mx-md-5{margin-right:3rem !important}.mb-md-5,.my-md-5{margin-bottom:3rem !important}.ml-md-5,.mx-md-5{margin-left:3rem !important}.p-md-0{padding:0 !important}.pt-md-0,.py-md-0{padding-top:0 !important}.pr-md-0,.px-md-0{padding-right:0 !important}.pb-md-0,.py-md-0{padding-bottom:0 !important}.pl-md-0,.px-md-0{padding-left:0 !important}.p-md-1{padding:0.25rem !important}.pt-md-1,.py-md-1{padding-top:0.25rem !important}.pr-md-1,.px-md-1{padding-right:0.25rem !important}.pb-md-1,.py-md-1{padding-bottom:0.25rem !important}.pl-md-1,.px-md-1{padding-left:0.25rem !important}.p-md-2{padding:0.5rem !important}.pt-md-2,.py-md-2{padding-top:0.5rem !important}.pr-md-2,.px-md-2{padding-right:0.5rem !important}.pb-md-2,.py-md-2{padding-bottom:0.5rem !important}.pl-md-2,.px-md-2{padding-left:0.5rem !important}.p-md-3{padding:1rem !important}.pt-md-3,.py-md-3{padding-top:1rem !important}.pr-md-3,.px-md-3{padding-right:1rem !important}.pb-md-3,.py-md-3{padding-bottom:1rem !important}.pl-md-3,.px-md-3{padding-left:1rem !important}.p-md-4{padding:1.5rem !important}.pt-md-4,.py-md-4{padding-top:1.5rem !important}.pr-md-4,.px-md-4{padding-right:1.5rem !important}.pb-md-4,.py-md-4{padding-bottom:1.5rem !important}.pl-md-4,.px-md-4{padding-left:1.5rem !important}.p-md-5{padding:3rem !important}.pt-md-5,.py-md-5{padding-top:3rem !important}.pr-md-5,.px-md-5{padding-right:3rem !important}.pb-md-5,.py-md-5{padding-bottom:3rem !important}.pl-md-5,.px-md-5{padding-left:3rem !important}.m-md-n1{margin:-0.25rem !important}.mt-md-n1,.my-md-n1{margin-top:-0.25rem !important}.mr-md-n1,.mx-md-n1{margin-right:-0.25rem !important}.mb-md-n1,.my-md-n1{margin-bottom:-0.25rem !important}.ml-md-n1,.mx-md-n1{margin-left:-0.25rem !important}.m-md-n2{margin:-0.5rem !important}.mt-md-n2,.my-md-n2{margin-top:-0.5rem !important}.mr-md-n2,.mx-md-n2{margin-right:-0.5rem !important}.mb-md-n2,.my-md-n2{margin-bottom:-0.5rem !important}.ml-md-n2,.mx-md-n2{margin-left:-0.5rem !important}.m-md-n3{margin:-1rem !important}.mt-md-n3,.my-md-n3{margin-top:-1rem !important}.mr-md-n3,.mx-md-n3{margin-right:-1rem !important}.mb-md-n3,.my-md-n3{margin-bottom:-1rem !important}.ml-md-n3,.mx-md-n3{margin-left:-1rem !important}.m-md-n4{margin:-1.5rem !important}.mt-md-n4,.my-md-n4{margin-top:-1.5rem !important}.mr-md-n4,.mx-md-n4{margin-right:-1.5rem !important}.mb-md-n4,.my-md-n4{margin-bottom:-1.5rem !important}.ml-md-n4,.mx-md-n4{margin-left:-1.5rem !important}.m-md-n5{margin:-3rem !important}.mt-md-n5,.my-md-n5{margin-top:-3rem !important}.mr-md-n5,.mx-md-n5{margin-right:-3rem !important}.mb-md-n5,.my-md-n5{margin-bottom:-3rem !important}.ml-md-n5,.mx-md-n5{margin-left:-3rem !important}.m-md-auto{margin:auto !important}.mt-md-auto,.my-md-auto{margin-top:auto !important}.mr-md-auto,.mx-md-auto{margin-right:auto !important}.mb-md-auto,.my-md-auto{margin-bottom:auto !important}.ml-md-auto,.mx-md-auto{margin-left:auto !important}}@media (min-width: 992px){.m-lg-0{margin:0 !important}.mt-lg-0,.my-lg-0{margin-top:0 !important}.mr-lg-0,.mx-lg-0{margin-right:0 !important}.mb-lg-0,.my-lg-0{margin-bottom:0 !important}.ml-lg-0,.mx-lg-0{margin-left:0 !important}.m-lg-1{margin:0.25rem !important}.mt-lg-1,.my-lg-1{margin-top:0.25rem !important}.mr-lg-1,.mx-lg-1{margin-right:0.25rem !important}.mb-lg-1,.my-lg-1{margin-bottom:0.25rem !important}.ml-lg-1,.mx-lg-1{margin-left:0.25rem !important}.m-lg-2{margin:0.5rem !important}.mt-lg-2,.my-lg-2{margin-top:0.5rem !important}.mr-lg-2,.mx-lg-2{margin-right:0.5rem !important}.mb-lg-2,.my-lg-2{margin-bottom:0.5rem !important}.ml-lg-2,.mx-lg-2{margin-left:0.5rem !important}.m-lg-3{margin:1rem !important}.mt-lg-3,.my-lg-3{margin-top:1rem !important}.mr-lg-3,.mx-lg-3{margin-right:1rem !important}.mb-lg-3,.my-lg-3{margin-bottom:1rem !important}.ml-lg-3,.mx-lg-3{margin-left:1rem !important}.m-lg-4{margin:1.5rem !important}.mt-lg-4,.my-lg-4{margin-top:1.5rem !important}.mr-lg-4,.mx-lg-4{margin-right:1.5rem !important}.mb-lg-4,.my-lg-4{margin-bottom:1.5rem !important}.ml-lg-4,.mx-lg-4{margin-left:1.5rem !important}.m-lg-5{margin:3rem !important}.mt-lg-5,.my-lg-5{margin-top:3rem !important}.mr-lg-5,.mx-lg-5{margin-right:3rem !important}.mb-lg-5,.my-lg-5{margin-bottom:3rem !important}.ml-lg-5,.mx-lg-5{margin-left:3rem !important}.p-lg-0{padding:0 !important}.pt-lg-0,.py-lg-0{padding-top:0 !important}.pr-lg-0,.px-lg-0{padding-right:0 !important}.pb-lg-0,.py-lg-0{padding-bottom:0 !important}.pl-lg-0,.px-lg-0{padding-left:0 !important}.p-lg-1{padding:0.25rem !important}.pt-lg-1,.py-lg-1{padding-top:0.25rem !important}.pr-lg-1,.px-lg-1{padding-right:0.25rem !important}.pb-lg-1,.py-lg-1{padding-bottom:0.25rem !important}.pl-lg-1,.px-lg-1{padding-left:0.25rem !important}.p-lg-2{padding:0.5rem !important}.pt-lg-2,.py-lg-2{padding-top:0.5rem !important}.pr-lg-2,.px-lg-2{padding-right:0.5rem !important}.pb-lg-2,.py-lg-2{padding-bottom:0.5rem !important}.pl-lg-2,.px-lg-2{padding-left:0.5rem !important}.p-lg-3{padding:1rem !important}.pt-lg-3,.py-lg-3{padding-top:1rem !important}.pr-lg-3,.px-lg-3{padding-right:1rem !important}.pb-lg-3,.py-lg-3{padding-bottom:1rem !important}.pl-lg-3,.px-lg-3{padding-left:1rem !important}.p-lg-4{padding:1.5rem !important}.pt-lg-4,.py-lg-4{padding-top:1.5rem !important}.pr-lg-4,.px-lg-4{padding-right:1.5rem !important}.pb-lg-4,.py-lg-4{padding-bottom:1.5rem !important}.pl-lg-4,.px-lg-4{padding-left:1.5rem !important}.p-lg-5{padding:3rem !important}.pt-lg-5,.py-lg-5{padding-top:3rem !important}.pr-lg-5,.px-lg-5{padding-right:3rem !important}.pb-lg-5,.py-lg-5{padding-bottom:3rem !important}.pl-lg-5,.px-lg-5{padding-left:3rem !important}.m-lg-n1{margin:-0.25rem !important}.mt-lg-n1,.my-lg-n1{margin-top:-0.25rem !important}.mr-lg-n1,.mx-lg-n1{margin-right:-0.25rem !important}.mb-lg-n1,.my-lg-n1{margin-bottom:-0.25rem !important}.ml-lg-n1,.mx-lg-n1{margin-left:-0.25rem !important}.m-lg-n2{margin:-0.5rem !important}.mt-lg-n2,.my-lg-n2{margin-top:-0.5rem !important}.mr-lg-n2,.mx-lg-n2{margin-right:-0.5rem !important}.mb-lg-n2,.my-lg-n2{margin-bottom:-0.5rem !important}.ml-lg-n2,.mx-lg-n2{margin-left:-0.5rem !important}.m-lg-n3{margin:-1rem !important}.mt-lg-n3,.my-lg-n3{margin-top:-1rem !important}.mr-lg-n3,.mx-lg-n3{margin-right:-1rem !important}.mb-lg-n3,.my-lg-n3{margin-bottom:-1rem !important}.ml-lg-n3,.mx-lg-n3{margin-left:-1rem !important}.m-lg-n4{margin:-1.5rem !important}.mt-lg-n4,.my-lg-n4{margin-top:-1.5rem !important}.mr-lg-n4,.mx-lg-n4{margin-right:-1.5rem !important}.mb-lg-n4,.my-lg-n4{margin-bottom:-1.5rem !important}.ml-lg-n4,.mx-lg-n4{margin-left:-1.5rem !important}.m-lg-n5{margin:-3rem !important}.mt-lg-n5,.my-lg-n5{margin-top:-3rem !important}.mr-lg-n5,.mx-lg-n5{margin-right:-3rem !important}.mb-lg-n5,.my-lg-n5{margin-bottom:-3rem !important}.ml-lg-n5,.mx-lg-n5{margin-left:-3rem !important}.m-lg-auto{margin:auto !important}.mt-lg-auto,.my-lg-auto{margin-top:auto !important}.mr-lg-auto,.mx-lg-auto{margin-right:auto !important}.mb-lg-auto,.my-lg-auto{margin-bottom:auto !important}.ml-lg-auto,.mx-lg-auto{margin-left:auto !important}}@media (min-width: 1200px){.m-xl-0{margin:0 !important}.mt-xl-0,.my-xl-0{margin-top:0 !important}.mr-xl-0,.mx-xl-0{margin-right:0 !important}.mb-xl-0,.my-xl-0{margin-bottom:0 !important}.ml-xl-0,.mx-xl-0{margin-left:0 !important}.m-xl-1{margin:0.25rem !important}.mt-xl-1,.my-xl-1{margin-top:0.25rem !important}.mr-xl-1,.mx-xl-1{margin-right:0.25rem !important}.mb-xl-1,.my-xl-1{margin-bottom:0.25rem !important}.ml-xl-1,.mx-xl-1{margin-left:0.25rem !important}.m-xl-2{margin:0.5rem !important}.mt-xl-2,.my-xl-2{margin-top:0.5rem !important}.mr-xl-2,.mx-xl-2{margin-right:0.5rem !important}.mb-xl-2,.my-xl-2{margin-bottom:0.5rem !important}.ml-xl-2,.mx-xl-2{margin-left:0.5rem !important}.m-xl-3{margin:1rem !important}.mt-xl-3,.my-xl-3{margin-top:1rem !important}.mr-xl-3,.mx-xl-3{margin-right:1rem !important}.mb-xl-3,.my-xl-3{margin-bottom:1rem !important}.ml-xl-3,.mx-xl-3{margin-left:1rem !important}.m-xl-4{margin:1.5rem !important}.mt-xl-4,.my-xl-4{margin-top:1.5rem !important}.mr-xl-4,.mx-xl-4{margin-right:1.5rem !important}.mb-xl-4,.my-xl-4{margin-bottom:1.5rem !important}.ml-xl-4,.mx-xl-4{margin-left:1.5rem !important}.m-xl-5{margin:3rem !important}.mt-xl-5,.my-xl-5{margin-top:3rem !important}.mr-xl-5,.mx-xl-5{margin-right:3rem !important}.mb-xl-5,.my-xl-5{margin-bottom:3rem !important}.ml-xl-5,.mx-xl-5{margin-left:3rem !important}.p-xl-0{padding:0 !important}.pt-xl-0,.py-xl-0{padding-top:0 !important}.pr-xl-0,.px-xl-0{padding-right:0 !important}.pb-xl-0,.py-xl-0{padding-bottom:0 !important}.pl-xl-0,.px-xl-0{padding-left:0 !important}.p-xl-1{padding:0.25rem !important}.pt-xl-1,.py-xl-1{padding-top:0.25rem !important}.pr-xl-1,.px-xl-1{padding-right:0.25rem !important}.pb-xl-1,.py-xl-1{padding-bottom:0.25rem !important}.pl-xl-1,.px-xl-1{padding-left:0.25rem !important}.p-xl-2{padding:0.5rem !important}.pt-xl-2,.py-xl-2{padding-top:0.5rem !important}.pr-xl-2,.px-xl-2{padding-right:0.5rem !important}.pb-xl-2,.py-xl-2{padding-bottom:0.5rem !important}.pl-xl-2,.px-xl-2{padding-left:0.5rem !important}.p-xl-3{padding:1rem !important}.pt-xl-3,.py-xl-3{padding-top:1rem !important}.pr-xl-3,.px-xl-3{padding-right:1rem !important}.pb-xl-3,.py-xl-3{padding-bottom:1rem !important}.pl-xl-3,.px-xl-3{padding-left:1rem !important}.p-xl-4{padding:1.5rem !important}.pt-xl-4,.py-xl-4{padding-top:1.5rem !important}.pr-xl-4,.px-xl-4{padding-right:1.5rem !important}.pb-xl-4,.py-xl-4{padding-bottom:1.5rem !important}.pl-xl-4,.px-xl-4{padding-left:1.5rem !important}.p-xl-5{padding:3rem !important}.pt-xl-5,.py-xl-5{padding-top:3rem !important}.pr-xl-5,.px-xl-5{padding-right:3rem !important}.pb-xl-5,.py-xl-5{padding-bottom:3rem !important}.pl-xl-5,.px-xl-5{padding-left:3rem !important}.m-xl-n1{margin:-0.25rem !important}.mt-xl-n1,.my-xl-n1{margin-top:-0.25rem !important}.mr-xl-n1,.mx-xl-n1{margin-right:-0.25rem !important}.mb-xl-n1,.my-xl-n1{margin-bottom:-0.25rem !important}.ml-xl-n1,.mx-xl-n1{margin-left:-0.25rem !important}.m-xl-n2{margin:-0.5rem !important}.mt-xl-n2,.my-xl-n2{margin-top:-0.5rem !important}.mr-xl-n2,.mx-xl-n2{margin-right:-0.5rem !important}.mb-xl-n2,.my-xl-n2{margin-bottom:-0.5rem !important}.ml-xl-n2,.mx-xl-n2{margin-left:-0.5rem !important}.m-xl-n3{margin:-1rem !important}.mt-xl-n3,.my-xl-n3{margin-top:-1rem !important}.mr-xl-n3,.mx-xl-n3{margin-right:-1rem !important}.mb-xl-n3,.my-xl-n3{margin-bottom:-1rem !important}.ml-xl-n3,.mx-xl-n3{margin-left:-1rem !important}.m-xl-n4{margin:-1.5rem !important}.mt-xl-n4,.my-xl-n4{margin-top:-1.5rem !important}.mr-xl-n4,.mx-xl-n4{margin-right:-1.5rem !important}.mb-xl-n4,.my-xl-n4{margin-bottom:-1.5rem !important}.ml-xl-n4,.mx-xl-n4{margin-left:-1.5rem !important}.m-xl-n5{margin:-3rem !important}.mt-xl-n5,.my-xl-n5{margin-top:-3rem !important}.mr-xl-n5,.mx-xl-n5{margin-right:-3rem !important}.mb-xl-n5,.my-xl-n5{margin-bottom:-3rem !important}.ml-xl-n5,.mx-xl-n5{margin-left:-3rem !important}.m-xl-auto{margin:auto !important}.mt-xl-auto,.my-xl-auto{margin-top:auto !important}.mr-xl-auto,.mx-xl-auto{margin-right:auto !important}.mb-xl-auto,.my-xl-auto{margin-bottom:auto !important}.ml-xl-auto,.mx-xl-auto{margin-left:auto !important}}.stretched-link::after{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;pointer-events:auto;content:"";background-color:rgba(0,0,0,0)}.text-monospace{font-family:SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !important}.text-justify{text-align:justify !important}.text-wrap{white-space:normal !important}.text-nowrap{white-space:nowrap !important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-left{text-align:left !important}.text-right{text-align:right !important}.text-center{text-align:center !important}@media (min-width: 576px){.text-sm-left{text-align:left !important}.text-sm-right{text-align:right !important}.text-sm-center{text-align:center !important}}@media (min-width: 768px){.text-md-left{text-align:left !important}.text-md-right{text-align:right !important}.text-md-center{text-align:center !important}}@media (min-width: 992px){.text-lg-left{text-align:left !important}.text-lg-right{text-align:right !important}.text-lg-center{text-align:center !important}}@media (min-width: 1200px){.text-xl-left{text-align:left !important}.text-xl-right{text-align:right !important}.text-xl-center{text-align:center !important}}.text-lowercase{text-transform:lowercase !important}.text-uppercase{text-transform:uppercase !important}.text-capitalize{text-transform:capitalize !important}.font-weight-light{font-weight:300 !important}.font-weight-lighter{font-weight:lighter !important}.font-weight-normal{font-weight:400 !important}.font-weight-bold{font-weight:700 !important}.font-weight-bolder{font-weight:bolder !important}.font-italic{font-style:italic !important}.text-white{color:#fff !important}.text-primary{color:#375a7f !important}a.text-primary:hover,a.text-primary:focus{color:#20344a !important}.text-secondary{color:#444 !important}a.text-secondary:hover,a.text-secondary:focus{color:#1e1e1e !important}.text-success{color:#00bc8c !important}a.text-success:hover,a.text-success:focus{color:#007053 !important}.text-info{color:#3498DB !important}a.text-info:hover,a.text-info:focus{color:#1d6fa5 !important}.text-warning{color:#F39C12 !important}a.text-warning:hover,a.text-warning:focus{color:#b06f09 !important}.text-danger{color:#E74C3C !important}a.text-danger:hover,a.text-danger:focus{color:#bf2718 !important}.text-light{color:#adb5bd !important}a.text-light:hover,a.text-light:focus{color:#838f9b !important}.text-dark{color:#303030 !important}a.text-dark:hover,a.text-dark:focus{color:#0a0a0a !important}.text-body{color:#fff !important}.text-muted{color:#888 !important}.text-black-50{color:rgba(0,0,0,0.5) !important}.text-white-50{color:rgba(255,255,255,0.5) !important}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.text-decoration-none{text-decoration:none !important}.text-break{word-wrap:break-word !important}.text-reset{color:inherit !important}.visible{visibility:visible !important}.invisible{visibility:hidden !important}@media print{*,*::before,*::after{text-shadow:none !important;-webkit-box-shadow:none !important;box-shadow:none !important}a:not(.btn){text-decoration:underline}abbr[title]::after{content:" (" attr(title) ")"}pre{white-space:pre-wrap !important}pre,blockquote{border:1px solid #adb5bd;page-break-inside:avoid}thead{display:table-header-group}tr,img{page-break-inside:avoid}p,h2,h3{orphans:3;widows:3}h2,h3{page-break-after:avoid}@page{size:a3}body{min-width:992px !important}.container{min-width:992px !important}.navbar{display:none}.badge{border:1px solid #000}.table{border-collapse:collapse !important}.table td,.table th{background-color:#fff !important}.table-bordered th,.table-bordered td{border:1px solid #dee2e6 !important}.table-dark{color:inherit}.table-dark th,.table-dark td,.table-dark thead th,.table-dark tbody+tbody{border-color:#444}.table .thead-dark th{color:inherit;border-color:#444}}.blockquote-footer{color:#888}.table-primary,.table-primary>th,.table-primary>td{background-color:#375a7f}.table-secondary,.table-secondary>th,.table-secondary>td{background-color:#444}.table-light,.table-light>th,.table-light>td{background-color:#adb5bd}.table-dark,.table-dark>th,.table-dark>td{background-color:#303030}.table-success,.table-success>th,.table-success>td{background-color:#00bc8c}.table-info,.table-info>th,.table-info>td{background-color:#3498DB}.table-danger,.table-danger>th,.table-danger>td{background-color:#E74C3C}.table-warning,.table-warning>th,.table-warning>td{background-color:#F39C12}.table-active,.table-active>th,.table-active>td{background-color:rgba(0,0,0,0.075)}.table-hover .table-primary:hover,.table-hover .table-primary:hover>th,.table-hover .table-primary:hover>td{background-color:#2f4d6d}.table-hover .table-secondary:hover,.table-hover .table-secondary:hover>th,.table-hover .table-secondary:hover>td{background-color:#373737}.table-hover .table-light:hover,.table-hover .table-light:hover>th,.table-hover .table-light:hover>td{background-color:#9fa8b2}.table-hover .table-dark:hover,.table-hover .table-dark:hover>th,.table-hover .table-dark:hover>td{background-color:#232323}.table-hover .table-success:hover,.table-hover .table-success:hover>th,.table-hover .table-success:hover>td{background-color:#00a379}.table-hover .table-info:hover,.table-hover .table-info:hover>th,.table-hover .table-info:hover>td{background-color:#258cd1}.table-hover .table-danger:hover,.table-hover .table-danger:hover>th,.table-hover .table-danger:hover>td{background-color:#e43725}.table-hover .table-warning:hover,.table-hover .table-warning:hover>th,.table-hover .table-warning:hover>td{background-color:#e08e0b}.table-hover .table-active:hover,.table-hover .table-active:hover>th,.table-hover .table-active:hover>td{background-color:rgba(0,0,0,0.075)}.input-group-addon{color:#fff}.nav-tabs .nav-link,.nav-tabs .nav-link.active,.nav-tabs .nav-link.active:focus,.nav-tabs .nav-link.active:hover,.nav-tabs .nav-item.open .nav-link,.nav-tabs .nav-item.open .nav-link:focus,.nav-tabs .nav-item.open .nav-link:hover,.nav-pills .nav-link,.nav-pills .nav-link.active,.nav-pills .nav-link.active:focus,.nav-pills .nav-link.active:hover,.nav-pills .nav-item.open .nav-link,.nav-pills .nav-item.open .nav-link:focus,.nav-pills .nav-item.open .nav-link:hover{color:#fff}.breadcrumb a{color:#fff}.pagination a:hover{text-decoration:none}.close{opacity:0.4}.close:hover,.close:focus{opacity:1}.alert{border:none;color:#fff}.alert a,.alert .alert-link{color:#fff;text-decoration:underline}.alert-primary{background-color:#375a7f}.alert-secondary{background-color:#444}.alert-success{background-color:#00bc8c}.alert-info{background-color:#3498DB}.alert-warning{background-color:#F39C12}.alert-danger{background-color:#E74C3C}.alert-light{background-color:#adb5bd}.alert-dark{background-color:#303030}.list-group-item-action{color:#fff}.list-group-item-action:hover,.list-group-item-action:focus{background-color:#444;color:#fff}.list-group-item-action .list-group-item-heading{color:#fff}
diff --git a/htdocs/css/features.css b/htdocs/css/features.css
index d52cae9..be41fef 100644
--- a/htdocs/css/features.css
+++ b/htdocs/css/features.css
@@ -5,7 +5,3 @@ h1 {
     text-align: center;
     margin: 50px 0;
 }
-
-.table {
-    color: inherit;
-}
\ No newline at end of file
diff --git a/htdocs/css/login.css b/htdocs/css/login.css
index c50341e..5e51dc9 100644
--- a/htdocs/css/login.css
+++ b/htdocs/css/login.css
@@ -1,10 +1,6 @@
 @import url("openwebrx-header.css");
 @import url("openwebrx-globals.css");
 
-body {
-    background-color: #2e2e2e;
-}
-
 .login {
     position: absolute;
     left: 50%;
@@ -13,7 +9,6 @@ body {
 
     width: 500px;
 
-    background-color: #ddd;
     padding: 20px;
     border-radius: 10px;
     border: 1px solid #575757;
@@ -25,8 +20,5 @@ body {
 }
 
 .btn-login {
-    color: #FFF;
-    background-color: #2e2e2e;
-    border-color: #2e2e2e;
     height: 50px;
 }
\ No newline at end of file
diff --git a/htdocs/css/openwebrx-header.css b/htdocs/css/openwebrx-header.css
index 09c1fed..412e104 100644
--- a/htdocs/css/openwebrx-header.css
+++ b/htdocs/css/openwebrx-header.css
@@ -43,6 +43,15 @@
     right: 0;
 }
 
+#webrx-tob-container, #webrx-top-container * {
+    line-height: initial;
+    box-sizing: initial;
+}
+
+#webrx-top-container img {
+    vertical-align: initial;
+}
+
 #webrx-top-logo
 {
     padding: 12px;
diff --git a/htdocs/features.html b/htdocs/features.html
index 2a97cd1..90d156e 100644
--- a/htdocs/features.html
+++ b/htdocs/features.html
@@ -1,7 +1,7 @@
 <HTML><HEAD>
     <TITLE>OpenWebRX Feature report</TITLE>
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link rel="stylesheet" href="static/css/bootstrap.min.css" />
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
     <link rel="stylesheet" href="static/css/features.css">
     <script src="https://cdnjs.cloudflare.com/ajax/libs/showdown/1.9.0/showdown.min.js"></script>
diff --git a/htdocs/generalsettings.html b/htdocs/generalsettings.html
index ae0656c..3367ed8 100644
--- a/htdocs/generalsettings.html
+++ b/htdocs/generalsettings.html
@@ -3,7 +3,7 @@
 <head>
     <title>OpenWebRX Settings</title>
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link rel="stylesheet" href="static/css/bootstrap.min.css" />
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
     <script src="static/lib/jquery-3.2.1.min.js"></script>
     <script src="static/lib/Header.js"></script>
diff --git a/htdocs/login.html b/htdocs/login.html
index 9cbeacc..4f4c554 100644
--- a/htdocs/login.html
+++ b/htdocs/login.html
@@ -3,7 +3,7 @@
 <head>
     <title>OpenWebRX Login</title>
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link rel="stylesheet" href="static/css/bootstrap.min.css" />
     <link rel="stylesheet" type="text/css" href="static/css/login.css" />
     <script src="static/lib/jquery-3.2.1.min.js"></script>
     <script src="static/lib/Header.js"></script>
@@ -21,7 +21,7 @@
                 <label for="password">Password</label>
                 <input type="password" class="form-control" id="password" name="password" placeholder="Password">
             </div>
-            <button type="submit" class="btn btn-login">Login</button>
+            <button type="submit" class="btn btn-secondary btn-login">Login</button>
         </form>
     </div>
 </body>
\ No newline at end of file
diff --git a/htdocs/sdrsettings.html b/htdocs/sdrsettings.html
index 08664fe..89e6a8f 100644
--- a/htdocs/sdrsettings.html
+++ b/htdocs/sdrsettings.html
@@ -3,7 +3,7 @@
 <head>
     <title>OpenWebRX Settings</title>
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link rel="stylesheet" href="static/css/bootstrap.min.css" />
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
     <script src="static/lib/jquery-3.2.1.min.js"></script>
     <script src="static/lib/Header.js"></script>
diff --git a/htdocs/settings.html b/htdocs/settings.html
index 6e6bd89..39cecf9 100644
--- a/htdocs/settings.html
+++ b/htdocs/settings.html
@@ -3,7 +3,7 @@
 <head>
     <title>OpenWebRX Settings</title>
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link rel="stylesheet" href="static/css/bootstrap.min.css" />
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
     <script src="static/lib/jquery-3.2.1.min.js"></script>
     <script src="static/lib/Header.js"></script>

From 048aab682f2343529fa8c851cb7cc7f48cefaaa0 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 14 May 2020 22:56:49 +0200
Subject: [PATCH 328/475] include changed wsjt keys in config migration

---
 owrx/config.py            |  8 ++++++++
 owrx/property/__init__.py | 16 ++++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/owrx/config.py b/owrx/config.py
index 4aa1c8e..bdecd04 100644
--- a/owrx/config.py
+++ b/owrx/config.py
@@ -26,6 +26,11 @@ class ConfigMigrator(ABC):
     def migrate(self, config):
         pass
 
+    def renameKey(self, config, old, new):
+        if old in config and not new in config:
+            config[new] = config[old]
+            del config[old]
+
 
 class ConfigMigratorVersion1(ConfigMigrator):
     def migrate(self, config):
@@ -37,6 +42,9 @@ class ConfigMigratorVersion1(ConfigMigrator):
             levels = config["waterfall_auto_level_margin"]
             config["waterfall_auto_level_margin"] = {"min": levels[0], "max": levels[1]}
 
+        self.renameKey(config, "wsjt_queue_workers", "decoding_queue_workers")
+        self.renameKey(config, "wsjt_queue_length", "decoding_queue_length")
+
         config["version"] = 2
         return config
 
diff --git a/owrx/property/__init__.py b/owrx/property/__init__.py
index 853cca3..f3560fa 100644
--- a/owrx/property/__init__.py
+++ b/owrx/property/__init__.py
@@ -40,6 +40,10 @@ class PropertyManager(ABC):
     def __dict__(self):
         pass
 
+    @abstractmethod
+    def __delitem__(self, key):
+        pass
+
     @abstractmethod
     def keys(self):
         pass
@@ -98,6 +102,9 @@ class PropertyLayer(PropertyManager):
     def __dict__(self):
         return {k: v for k, v in self.properties.items()}
 
+    def __delitem__(self, key):
+        return self.properties.__delitem__(key)
+
     def keys(self):
         return self.properties.keys()
 
@@ -132,6 +139,11 @@ class PropertyFilter(PropertyManager):
     def __dict__(self):
         return {k: v for k, v in self.pm.__dict__().items() if k in self.props}
 
+    def __delitem__(self, key):
+        if key not in self.props:
+            raise KeyError(key)
+        return self.pm.__delitem__(key)
+
     def keys(self):
         return [k for k in self.pm.keys() if k in self.props]
 
@@ -226,5 +238,9 @@ class PropertyStack(PropertyManager):
     def __dict__(self):
         return {k: self.__getitem__(k) for k in self.keys()}
 
+    def __delitem__(self, key):
+        for layer in self.layers:
+            layer["props"].__delitem__(key)
+
     def keys(self):
         return set([key for l in self.layers for key in l["props"].keys()])

From 2b4799591f695be5d4548da4d69bb57f719b2fc1 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 14 May 2020 22:57:09 +0200
Subject: [PATCH 329/475] initialize logging early since there may be messages
 happening in imports

---
 owrx/__main__.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/owrx/__main__.py b/owrx/__main__.py
index 8e082e9..84bca23 100644
--- a/owrx/__main__.py
+++ b/owrx/__main__.py
@@ -1,3 +1,8 @@
+import logging
+
+logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+logger = logging.getLogger(__name__)
+
 from http.server import HTTPServer
 from owrx.http import RequestHandler
 from owrx.config import Config
@@ -10,11 +15,6 @@ from owrx.websocket import WebSocketConnection
 from owrx.pskreporter import PskReporter
 from owrx.version import openwebrx_version
 
-import logging
-
-logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-logger = logging.getLogger(__name__)
-
 
 class ThreadedHttpServer(ThreadingMixIn, HTTPServer):
     pass

From 0a60b505b8fa6ad54f632b33d62d37a76b0f799f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 16 May 2020 19:03:48 +0200
Subject: [PATCH 330/475] update dependencies, refs #38

---
 docker/scripts/install-connectors.sh   | 2 +-
 docker/scripts/install-dependencies.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh
index cc2572d..b848e7a 100755
--- a/docker/scripts/install-connectors.sh
+++ b/docker/scripts/install-connectors.sh
@@ -24,6 +24,6 @@ apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
 
 
 git clone https://github.com/jketterl/owrx_connector.git
-cmakebuild owrx_connector 9d72cf1382ed90735632a6d0ef6f820a4758f733
+cmakebuild owrx_connector 3ffbdcccbe39a5675fd539d959e64885e521eae6
 
 apk del .build-deps
diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index 1f195d7..f416802 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -35,7 +35,7 @@ cmakebuild itpp bb5c7e95f40e8fdb5c3f3d01a84bcbaf76f3676d
 
 git clone https://github.com/jketterl/csdr.git
 cd csdr
-git checkout fe0b042d9cdc2605a817ca7fdd3a23c48bf07563
+git checkout a1424eac3163a8756219608fe509b036bf90b129
 make
 make install
 cd ..

From d22ab2377163d205e511abf641f5316ea50c40a2 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 16 May 2020 21:29:16 +0200
Subject: [PATCH 331/475] set package build flag to disable optimizations

---
 docker/scripts/install-dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index f416802..991d08b 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -36,7 +36,7 @@ cmakebuild itpp bb5c7e95f40e8fdb5c3f3d01a84bcbaf76f3676d
 git clone https://github.com/jketterl/csdr.git
 cd csdr
 git checkout a1424eac3163a8756219608fe509b036bf90b129
-make
+CSDR_PACKAGE_BUILD=1 make
 make install
 cd ..
 rm -rf csdr

From ddbc844954cce4cbb98a4be6e446564fc2c7e6fa Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 17 May 2020 01:38:08 +0200
Subject: [PATCH 332/475] update csdr

---
 docker/scripts/install-dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index 991d08b..90b053d 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -35,7 +35,7 @@ cmakebuild itpp bb5c7e95f40e8fdb5c3f3d01a84bcbaf76f3676d
 
 git clone https://github.com/jketterl/csdr.git
 cd csdr
-git checkout a1424eac3163a8756219608fe509b036bf90b129
+git checkout 29efbfb961a435fc5d81b0da269deb4a116b3f1c
 CSDR_PACKAGE_BUILD=1 make
 make install
 cd ..

From 98cb1a8389ad68085fa09173e6807db85c79e0ef Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 17 May 2020 11:19:22 +0200
Subject: [PATCH 333/475] use the new version without FMV

---
 docker/scripts/install-dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index 90b053d..cfd87df 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -35,7 +35,7 @@ cmakebuild itpp bb5c7e95f40e8fdb5c3f3d01a84bcbaf76f3676d
 
 git clone https://github.com/jketterl/csdr.git
 cd csdr
-git checkout 29efbfb961a435fc5d81b0da269deb4a116b3f1c
+git checkout 973de7b471d043a3434f9eb8b56e38fa281d4623
 CSDR_PACKAGE_BUILD=1 make
 make install
 cd ..

From a03176223acc59cd093ab97e48886aee4270bf37 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 17 May 2020 18:44:26 +0200
Subject: [PATCH 334/475] add a bit more dynamic content

---
 htdocs/settings.js | 133 ++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 113 insertions(+), 20 deletions(-)

diff --git a/htdocs/settings.js b/htdocs/settings.js
index 55abf45..2d21188 100644
--- a/htdocs/settings.js
+++ b/htdocs/settings.js
@@ -1,13 +1,14 @@
-function Input(name, value) {
+function Input(name, value, label) {
     this.name = name;
     this.value = value;
+    this.label = label;
 };
 
-Input.prototype.bootstrapify = function(input, label) {
+Input.prototype.bootstrapify = function(input) {
     input.addClass('form-control').addClass('form-control-sm');
     return [
         '<div class="form-group row">',
-            '<label class="col-form-label col-form-label-sm col-3" for="' + self.name + '">' + this.name + '</label>',
+            '<label class="col-form-label col-form-label-sm col-3" for="' + this.name + '">' + this.label + '</label>',
             '<div class="col-9">',
                 input[0].outerHTML,
             '</div>',
@@ -55,34 +56,104 @@ SchedulerInput.prototype.render = function() {
     return $('<div><h3>Scheduler</h3></div>');
 };
 
-Input.mappings = {
-    "name": TextInput,
-    "type": TextInput,
-    "ppm": NumberInput,
-    "profiles": ProfileInput,
-    "scheduler": SchedulerInput
-};
-
-function SdrDevice(el) {
+function SdrDevice(el, data) {
     this.el = el;
-    this.data = JSON.parse(decodeURIComponent(el.data('config')));
+    this.data = data;
     this.inputs = {};
     this.render();
 
     var self = this;
     el.on('click', '.fieldselector .btn', function() {
         var key = el.find('.fieldselector select').val();
-        self.data[key] = false;
+        self.data[key] = self.getInitialValue(key);
         self.render();
     });
 };
 
+SdrDevice.create = function(el) {
+    var data = JSON.parse(decodeURIComponent(el.data('config')));
+    var type = data.type;
+    var constructor = SdrDevice.types[type] || SdrDevice;
+    return new constructor(el, data);
+};
+
+SdrDevice.prototype.getData = function() {
+    return $.extend(new Object(), this.getDefaults(), this.data);
+};
+
+SdrDevice.prototype.getDefaults = function() {
+    var defaults = {}
+    $.each(this.getMappings(), function(k, v) {
+        if (!v.includeInDefault) return;
+        defaults[k] = 'initialValue' in v ? v['initialValue'] : false;
+    });
+    return defaults;
+};
+
+SdrDevice.prototype.getMappings = function() {
+    return {
+        "name": {
+            constructor: TextInput,
+            label: "Name",
+            initialValue: "",
+            includeInDefault: true
+        },
+        "type": {
+            constructor: TextInput,
+            label: "Type",
+            initialValue: '',
+            includeInDefault: true
+        },
+        "ppm": {
+            constructor: NumberInput,
+            label: "PPM",
+            initialValue: 0
+        },
+        "profiles": {
+            constructor: ProfileInput,
+            label: "Profiles",
+            initialValue: [],
+            includeInDefault: true,
+        },
+        "scheduler": {
+            constructor: SchedulerInput,
+            label: "Scheduler",
+            initialValue: {}
+        },
+        "rf_gain": {
+            constructor: TextInput,
+            label: "Gain",
+            initialValue: 0
+        }
+    };
+};
+
+SdrDevice.prototype.getMapping = function(key) {
+    var mappings = this.getMappings();
+    return mappings[key];
+};
+
+SdrDevice.prototype.getInputClass = function(key) {
+    var mapping = this.getMapping(key);
+    return mapping && mapping.constructor || TextInput;
+};
+
+SdrDevice.prototype.getLabel = function(key) {
+    var mapping = this.getMapping(key);
+    return mapping && mapping.label || key;
+};
+
+SdrDevice.prototype.getInitialValue = function(key) {
+    var mapping = this.getMapping(key);
+    return mapping && ('initialValue' in mapping) ? mapping['initialValue'] : false;
+};
+
 SdrDevice.prototype.render = function() {
     var self = this;
     self.el.empty();
-    $.each(this.data, function(key, value) {
-        var inputClass = Input.mappings[key] || TextInput;
-        var input = new inputClass(key, value);
+    $.each(this.getData(), function(key, value) {
+        var inputClass = self.getInputClass(key);
+        var input = new inputClass(key, value, self.getLabel(key));
         self.inputs[key] = input;
         self.el.append(input.render());
     });
@@ -95,10 +166,10 @@ SdrDevice.prototype.renderFieldSelector = function() {
         '<h3>Add new configuration options<h3>' +
         '<div class="form-group row">' +
             '<div class="col-3"><select class="form-control form-control-sm">' +
-                Object.keys(Input.mappings).filter(function(m){
+                Object.keys(self.getMappings()).filter(function(m){
                     return !(m in self.data);
                 }).map(function(m) {
-                    return '<option name="' + m + '">' + m + '</option>';
+                    return '<option value="' + m + '">' + self.getLabel(m) + '</option>';
                 }).join('') +
             '</select></div>' +
             '<div class="col-2">' +
@@ -108,11 +179,33 @@ SdrDevice.prototype.renderFieldSelector = function() {
     '</div>';
 };
 
+RtlSdrDevice = function(el, data) {
+    SdrDevice.apply(this, arguments);
+};
+
+RtlSdrDevice.prototype = Object.create(SdrDevice.prototype);
+RtlSdrDevice.prototype.constructor = RtlSdrDevice;
+
+RtlSdrDevice.prototype.getMappings = function() {
+    var mappings = SdrDevice.prototype.getMappings.apply(this, arguments);
+    return $.extend(new Object(), mappings, {
+        "device": {
+            constructor: TextInput,
+            label: "Serial Number",
+            initialValue: ""
+        }
+    });
+};
+
+SdrDevice.types = {
+    'rtl_sdr': RtlSdrDevice
+};
+
 $.fn.sdrdevice = function() {
     return this.map(function(){
         var el = $(this);
         if (!el.data('sdrdevice')) {
-            el.data('sdrdevice', new SdrDevice(el));
+            el.data('sdrdevice', SdrDevice.create(el));
         }
         return el.data('sdrdevice');
     });

From b624bef345210ae898a3ebf38b1aebea985f59d1 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 17 May 2020 18:45:01 +0200
Subject: [PATCH 335/475] add broadcast bands

---
 bands.json | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 70 insertions(+)

diff --git a/bands.json b/bands.json
index 1629d4a..608c40f 100644
--- a/bands.json
+++ b/bands.json
@@ -199,5 +199,75 @@
     "name": "3cm",
     "lower_bound": 10000000000,
     "upper_bound": 10500000000
+  },
+  {
+    "name": "120m Broadcast",
+    "lower_bound": 2300000,
+    "upper_bound": 2495000
+  },
+  {
+    "name": "90m Broadcast",
+    "lower_bound": 3200000,
+    "upper_bound": 3400000
+  },
+  {
+    "name": "75m Broadcast",
+    "lower_bound": 3900000,
+    "upper_bound": 4000000
+  },
+  {
+    "name": "60m Broadcast",
+    "lower_bound": 4750000,
+    "upper_bound": 4995000
+  },
+  {
+    "name": "49m Broadcast",
+    "lower_bound": 5900000,
+    "upper_bound": 6200000
+  },
+  {
+    "name": "41m Broadcast",
+    "lower_bound": 7200000,
+    "upper_bound": 7450000
+  },
+  {
+    "name": "31m Broadcast",
+    "lower_bound": 9400000,
+    "upper_bound": 9900000
+  },
+  {
+    "name": "25m Broadcast",
+    "lower_bound": 11600000,
+    "upper_bound": 12100000
+  },
+  {
+    "name": "22m Broadcast",
+    "lower_bound": 13570000,
+    "upper_bound": 13870000
+  },
+  {
+    "name": "19m Broadcast",
+    "lower_bound": 15100000,
+    "upper_bound": 15830000
+  },
+  {
+    "name": "16m Broadcast",
+    "lower_bound": 17480000,
+    "upper_bound": 17900000
+  },
+  {
+    "name": "15m Broadcast",
+    "lower_bound": 18900000,
+    "upper_bound": 19020000
+  },
+  {
+    "name": "13m Broadcast",
+    "lower_bound": 21450000,
+    "upper_bound": 21850000
+  },
+  {
+    "name": "11m Broadcast",
+    "lower_bound": 25670000,
+    "upper_bound": 26100000
   }
 ]
\ No newline at end of file

From 9dd7a7e653f1533a928d6cd3a26a8cde7a539231 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 17 May 2020 18:51:36 +0200
Subject: [PATCH 336/475] remove the remnants of the templating configuration

---
 config_webrx.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index fdde08e..15b96e4 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -49,11 +49,13 @@ receiver_asl = 200
 receiver_admin = "example@example.com"
 receiver_gps = {"lat": 47.000000, "lon": 19.000000}
 photo_title = "Panorama of Budapest from Schönherz Zoltán Dormitory"
+# photo_desc allows you to put pretty much any HTML you like into the receiver description.
+# The lines below should give you some examples of what's possible.
 photo_desc = """
 You can add your own background photo and receiver information.<br />
-Receiver is operated by: <a href="mailto:%[RX_ADMIN]">%[RX_ADMIN]</a><br/>
-Device: %[RX_DEVICE]<br />
-Antenna: %[RX_ANT]<br />
+Receiver is operated by: <a href="mailto:openwebrx@localhost" target="_blank">Receiver Operator</a><br/>
+Device: Receiver Device<br />
+Antenna: Receiver Antenna<br />
 Website: <a href="http://localhost" target="_blank">http://localhost</a>
 """
 

From 63475dda78d68088d86ccdc21c6025ab759eb635 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 17 May 2020 20:25:49 +0200
Subject: [PATCH 337/475] implement field sorting

---
 htdocs/settings.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/htdocs/settings.js b/htdocs/settings.js
index 2d21188..7936176 100644
--- a/htdocs/settings.js
+++ b/htdocs/settings.js
@@ -114,11 +114,13 @@ SdrDevice.prototype.getMappings = function() {
             label: "Profiles",
             initialValue: [],
             includeInDefault: true,
+            position: 100
         },
         "scheduler": {
             constructor: SchedulerInput,
             label: "Scheduler",
-            initialValue: {}
+            initialValue: {},
+            position: 101
         },
         "rf_gain": {
             constructor: TextInput,
@@ -148,10 +150,19 @@ SdrDevice.prototype.getInitialValue = function(key) {
     return mapping && ('initialValue' in mapping) ? mapping['initialValue'] : false;
 };
 
+SdrDevice.prototype.getPosition = function(key) {
+    var mapping = this.getMapping(key);
+    return mapping && mapping.position || 10;
+};
+
 SdrDevice.prototype.render = function() {
     var self = this;
     self.el.empty();
-    $.each(this.getData(), function(key, value) {
+    var data = this.getData();
+    Object.keys(data).sort(function(a, b){
+        return self.getPosition(a) - self.getPosition(b);
+    }).forEach(function(key){
+        var value = data[key];
         var inputClass = self.getInputClass(key);
         var input = new inputClass(key, value, self.getLabel(key));
         self.inputs[key] = input;

From 48b177defad424af2d307f956936221863aa9aa5 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 17 May 2020 21:21:37 +0200
Subject: [PATCH 338/475] provision for a custom gain control

---
 htdocs/settings.js | 106 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 89 insertions(+), 17 deletions(-)

diff --git a/htdocs/settings.js b/htdocs/settings.js
index 7936176..278e1c0 100644
--- a/htdocs/settings.js
+++ b/htdocs/settings.js
@@ -1,7 +1,8 @@
-function Input(name, value, label) {
+function Input(name, value, options) {
     this.name = name;
     this.value = value;
-    this.label = label;
+    this.options = options;
+    this.label = options && options.label || name;
 };
 
 Input.prototype.bootstrapify = function(input) {
@@ -36,6 +37,16 @@ NumberInput.prototype.render = function() {
     return this.bootstrapify($('<input type="number" name="' + this.name + '" value="' + this.value + '">'));
 };
 
+function SoapyGainInput() {
+    Input.apply(this, arguments);
+}
+
+SoapyGainInput.prototype = new Input();
+
+SoapyGainInput.prototype.render = function(){
+    return this.bootstrapify($('<div>Soapy gain settings go here</div>'));
+};
+
 function ProfileInput() {
     Input.apply(this, arguments);
 };
@@ -94,37 +105,49 @@ SdrDevice.prototype.getMappings = function() {
     return {
         "name": {
             constructor: TextInput,
-            label: "Name",
+            inputOptions: {
+                label: "Name"
+            },
             initialValue: "",
             includeInDefault: true
         },
         "type": {
             constructor: TextInput,
-            label: "Type",
+            inputOptions: {
+                label: "Type"
+            },
             initialValue: '',
             includeInDefault: true
         },
         "ppm": {
             constructor: NumberInput,
-            label: "PPM",
+            inputOptions: {
+                label: "PPM"
+            },
             initialValue: 0
         },
         "profiles": {
             constructor: ProfileInput,
-            label: "Profiles",
+            inputOptions: {
+                label: "Profiles"
+            },
             initialValue: [],
             includeInDefault: true,
             position: 100
         },
         "scheduler": {
             constructor: SchedulerInput,
-            label: "Scheduler",
+            inputOptions: {
+                label: "Scheduler",
+            },
             initialValue: {},
             position: 101
         },
         "rf_gain": {
             constructor: TextInput,
-            label: "Gain",
+            inputOptions: {
+                label: "Gain",
+            },
             initialValue: 0
         }
     };
@@ -140,11 +163,6 @@ SdrDevice.prototype.getInputClass = function(key) {
     return mapping && mapping.constructor || TextInput;
 };
 
-SdrDevice.prototype.getLabel = function(key) {
-    var mapping = this.getMapping(key);
-    return mapping && mapping.label || key;
-};
-
 SdrDevice.prototype.getInitialValue = function(key) {
     var mapping = this.getMapping(key);
     return mapping && ('initialValue' in mapping) ? mapping['initialValue'] : false;
@@ -155,6 +173,16 @@ SdrDevice.prototype.getPosition = function(key) {
     return mapping && mapping.position || 10;
 };
 
+SdrDevice.prototype.getInputOptions = function(key) {
+    var mapping = this.getMapping(key);
+    return mapping && mapping.inputOptions || {};
+};
+
+SdrDevice.prototype.getLabel = function(key) {
+    var options = this.getInputOptions(key);
+    return options && options.label || key;
+};
+
 SdrDevice.prototype.render = function() {
     var self = this;
     self.el.empty();
@@ -164,7 +192,7 @@ SdrDevice.prototype.render = function() {
     }).forEach(function(key){
         var value = data[key];
         var inputClass = self.getInputClass(key);
-        var input = new inputClass(key, value, self.getLabel(key));
+        var input = new inputClass(key, value, self.getInputOptions(key));
         self.inputs[key] = input;
         self.el.append(input.render());
     });
@@ -190,7 +218,7 @@ SdrDevice.prototype.renderFieldSelector = function() {
     '</div>';
 };
 
-RtlSdrDevice = function(el, data) {
+RtlSdrDevice = function() {
     SdrDevice.apply(this, arguments);
 };
 
@@ -202,14 +230,58 @@ RtlSdrDevice.prototype.getMappings = function() {
     return $.extend(new Object(), mappings, {
         "device": {
             constructor: TextInput,
-            label: "Serial Number",
+            inputOptions:{
+                label: "Serial number"
+            },
             initialValue: ""
         }
     });
 };
 
+SoapySdrDevice = function() {
+    SdrDevice.apply(this, arguments);
+};
+
+SoapySdrDevice.prototype = Object.create(SdrDevice.prototype);
+SoapySdrDevice.prototype.constructor = SoapySdrDevice;
+
+SoapySdrDevice.prototype.getMappings = function() {
+    var mappings = SdrDevice.prototype.getMappings.apply(this, arguments);
+    return $.extend(new Object(), mappings, {
+        "device": {
+            constructor: TextInput,
+            inputOptions:{
+                label: "Soapy device selector"
+            },
+            initialValue: ""
+        }
+    });
+};
+
+SdrplaySdrDevice = function() {
+    SoapySdrDevice.apply(this, arguments);
+};
+
+SdrplaySdrDevice.prototype = Object.create(SoapySdrDevice.prototype);
+SdrplaySdrDevice.prototype.constructor = SdrplaySdrDevice;
+
+SdrplaySdrDevice.prototype.getMappings = function() {
+    var mappings = SoapySdrDevice.prototype.getMappings.apply(this, arguments);
+    return $.extend(new Object(), mappings, {
+        "rf_gain": {
+            constructor: SoapyGainInput,
+            initialValue: 0,
+            inputOptions: {
+                label: "Gain",
+                gains: ['RFGR', 'IFGR']
+            }
+        }
+    });
+};
+
 SdrDevice.types = {
-    'rtl_sdr': RtlSdrDevice
+    'rtl_sdr': RtlSdrDevice,
+    'sdrplay': SdrplaySdrDevice
 };
 
 $.fn.sdrdevice = function() {

From 1299f5e9ccbf317cf5d0a47d3ebc1d258a74d73a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 22 May 2020 21:25:22 +0200
Subject: [PATCH 339/475] update csdr in docker to the latest version

---
 docker/scripts/install-dependencies.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index cfd87df..1b1c87b 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -19,7 +19,7 @@ function cmakebuild() {
 cd /tmp
 
 STATIC_PACKAGES="sox fftw python3 netcat-openbsd libsndfile lapack libusb qt5-qtbase qt5-qtmultimedia qt5-qtserialport qt5-qttools alsa-lib"
-BUILD_PACKAGES="git libsndfile-dev fftw-dev cmake ca-certificates make gcc musl-dev g++ lapack-dev linux-headers autoconf automake libtool texinfo gfortran libusb-dev qt5-qtbase-dev qt5-qtmultimedia-dev qt5-qtserialport-dev qt5-qttools-dev asciidoctor asciidoc alsa-lib-dev linux-headers"
+BUILD_PACKAGES="git libsndfile-dev fftw-dev cmake ca-certificates make gcc musl-dev g++ lapack-dev linux-headers autoconf automake libtool texinfo gfortran libusb-dev qt5-qtbase-dev qt5-qtmultimedia-dev qt5-qtserialport-dev qt5-qttools-dev asciidoctor asciidoc alsa-lib-dev linux-headers pkgconf"
 
 apk add --no-cache $STATIC_PACKAGES
 apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
@@ -35,8 +35,10 @@ cmakebuild itpp bb5c7e95f40e8fdb5c3f3d01a84bcbaf76f3676d
 
 git clone https://github.com/jketterl/csdr.git
 cd csdr
-git checkout 973de7b471d043a3434f9eb8b56e38fa281d4623
-CSDR_PACKAGE_BUILD=1 make
+git checkout 5c8dfdea5fa6e87fa2e9f754be883086fc5a2bfb
+autoreconf -i
+./configure
+make
 make install
 cd ..
 rm -rf csdr

From cf4f1dce323a0ac340462bf66badd448853ec220 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 23 May 2020 18:06:46 +0200
Subject: [PATCH 340/475] rebuild docker containers with debian, stage 1: base

---
 docker/Dockerfiles/Dockerfile-base     |  12 +-
 docker/scripts/direwolf-1.5.patch      | 241 -------------------------
 docker/scripts/install-dependencies.sh |  36 ++--
 docker/scripts/js8call-hamlib.patch    |  43 +++++
 4 files changed, 67 insertions(+), 265 deletions(-)
 delete mode 100644 docker/scripts/direwolf-1.5.patch
 create mode 100644 docker/scripts/js8call-hamlib.patch

diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index c065768..3ea8aae 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -1,17 +1,11 @@
-FROM alpine:3.10
+FROM debian:buster-slim
 
-RUN apk add --no-cache bash
-
-RUN ln -s /usr/local/lib /usr/local/lib64
-
-ADD docker/scripts/direwolf-1.5.patch /
+ADD docker/scripts/js8call-hamlib.patch /
 ADD docker/scripts/install-dependencies.sh /
 RUN /install-dependencies.sh && \
     rm /install-dependencies.sh
 
-WORKDIR /opt/openwebrx
-
 VOLUME /etc/openwebrx
 
-ENTRYPOINT [ "/opt/openwebrx/docker/scripts/run.sh" ]
+ENTRYPOINT [ "/usr/bin/openwebrx" ]
 EXPOSE 8073
diff --git a/docker/scripts/direwolf-1.5.patch b/docker/scripts/direwolf-1.5.patch
deleted file mode 100644
index 4a63915..0000000
--- a/docker/scripts/direwolf-1.5.patch
+++ /dev/null
@@ -1,241 +0,0 @@
-diff --git a/Makefile.linux b/Makefile.linux
-index 5010833..3f61de9 100644
---- a/Makefile.linux
-+++ b/Makefile.linux
-@@ -585,102 +585,102 @@ install : $(APPS) direwolf.conf tocalls.txt symbols-new.txt symbolsX.txt dw-icon
- # Applications, not installed with package manager, normally go in /usr/local/bin.
- # /usr/bin is used instead when installing from .DEB or .RPM package.
- #
--	$(INSTALL) -D --mode=755 direwolf $(DESTDIR)/bin/direwolf
--	$(INSTALL) -D --mode=755 decode_aprs $(DESTDIR)/bin/decode_aprs
--	$(INSTALL) -D --mode=755 text2tt $(DESTDIR)/bin/text2tt
--	$(INSTALL) -D --mode=755 tt2text $(DESTDIR)/bin/tt2text
--	$(INSTALL) -D --mode=755 ll2utm $(DESTDIR)/bin/ll2utm
--	$(INSTALL) -D --mode=755 utm2ll $(DESTDIR)/bin/utm2ll
--	$(INSTALL) -D --mode=755 aclients $(DESTDIR)/bin/aclients
--	$(INSTALL) -D --mode=755 log2gpx $(DESTDIR)/bin/log2gpx
--	$(INSTALL) -D --mode=755 gen_packets $(DESTDIR)/bin/gen_packets
--	$(INSTALL) -D --mode=755 atest $(DESTDIR)/bin/atest
--	$(INSTALL) -D --mode=755 ttcalc $(DESTDIR)/bin/ttcalc
--	$(INSTALL) -D --mode=755 kissutil $(DESTDIR)/bin/kissutil
--	$(INSTALL) -D --mode=755 cm108 $(DESTDIR)/bin/cm108
--	$(INSTALL) -D --mode=755 dwespeak.sh $(DESTDIR)/bin/dwspeak.sh
-+	$(INSTALL) -D -m=755 direwolf $(DESTDIR)/bin/direwolf
-+	$(INSTALL) -D -m=755 decode_aprs $(DESTDIR)/bin/decode_aprs
-+	$(INSTALL) -D -m=755 text2tt $(DESTDIR)/bin/text2tt
-+	$(INSTALL) -D -m=755 tt2text $(DESTDIR)/bin/tt2text
-+	$(INSTALL) -D -m=755 ll2utm $(DESTDIR)/bin/ll2utm
-+	$(INSTALL) -D -m=755 utm2ll $(DESTDIR)/bin/utm2ll
-+	$(INSTALL) -D -m=755 aclients $(DESTDIR)/bin/aclients
-+	$(INSTALL) -D -m=755 log2gpx $(DESTDIR)/bin/log2gpx
-+	$(INSTALL) -D -m=755 gen_packets $(DESTDIR)/bin/gen_packets
-+	$(INSTALL) -D -m=755 atest $(DESTDIR)/bin/atest
-+	$(INSTALL) -D -m=755 ttcalc $(DESTDIR)/bin/ttcalc
-+	$(INSTALL) -D -m=755 kissutil $(DESTDIR)/bin/kissutil
-+	$(INSTALL) -D -m=755 cm108 $(DESTDIR)/bin/cm108
-+	$(INSTALL) -D -m=755 dwespeak.sh $(DESTDIR)/bin/dwspeak.sh
- #
- # Telemetry Toolkit executables.   Other .conf and .txt files will go into doc directory.
- #
--	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-balloon.pl $(DESTDIR)/bin/telem-balloon.pl
--	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-bits.pl $(DESTDIR)/bin/telem-bits.pl
--	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-data.pl $(DESTDIR)/bin/telem-data.pl
--	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-data91.pl $(DESTDIR)/bin/telem-data91.pl
--	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-eqns.pl $(DESTDIR)/bin/telem-eqns.pl
--	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-parm.pl $(DESTDIR)/bin/telem-parm.pl
--	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-seq.sh $(DESTDIR)/bin/telem-seq.sh
--	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-unit.pl $(DESTDIR)/bin/telem-unit.pl
--	$(INSTALL) -D --mode=755 telemetry-toolkit/telem-volts.py $(DESTDIR)/bin/telem-volts.py
-+	$(INSTALL) -D -m=755 telemetry-toolkit/telem-balloon.pl $(DESTDIR)/bin/telem-balloon.pl
-+	$(INSTALL) -D -m=755 telemetry-toolkit/telem-bits.pl $(DESTDIR)/bin/telem-bits.pl
-+	$(INSTALL) -D -m=755 telemetry-toolkit/telem-data.pl $(DESTDIR)/bin/telem-data.pl
-+	$(INSTALL) -D -m=755 telemetry-toolkit/telem-data91.pl $(DESTDIR)/bin/telem-data91.pl
-+	$(INSTALL) -D -m=755 telemetry-toolkit/telem-eqns.pl $(DESTDIR)/bin/telem-eqns.pl
-+	$(INSTALL) -D -m=755 telemetry-toolkit/telem-parm.pl $(DESTDIR)/bin/telem-parm.pl
-+	$(INSTALL) -D -m=755 telemetry-toolkit/telem-seq.sh $(DESTDIR)/bin/telem-seq.sh
-+	$(INSTALL) -D -m=755 telemetry-toolkit/telem-unit.pl $(DESTDIR)/bin/telem-unit.pl
-+	$(INSTALL) -D -m=755 telemetry-toolkit/telem-volts.py $(DESTDIR)/bin/telem-volts.py
- #
- # Misc. data such as "tocall" to system mapping.
- #
--	$(INSTALL) -D --mode=644 tocalls.txt $(DESTDIR)/share/direwolf/tocalls.txt
--	$(INSTALL) -D --mode=644 symbols-new.txt $(DESTDIR)/share/direwolf/symbols-new.txt
--	$(INSTALL) -D --mode=644 symbolsX.txt $(DESTDIR)/share/direwolf/symbolsX.txt
-+	$(INSTALL) -D -m=644 tocalls.txt $(DESTDIR)/share/direwolf/tocalls.txt
-+	$(INSTALL) -D -m=644 symbols-new.txt $(DESTDIR)/share/direwolf/symbols-new.txt
-+	$(INSTALL) -D -m=644 symbolsX.txt $(DESTDIR)/share/direwolf/symbolsX.txt
- #
- # For desktop icon.
- #
--	$(INSTALL) -D --mode=644 dw-icon.png $(DESTDIR)/share/direwolf/pixmaps/dw-icon.png
--	$(INSTALL) -D --mode=644 direwolf.desktop $(DESTDIR)/share/applications/direwolf.desktop
-+	$(INSTALL) -D -m=644 dw-icon.png $(DESTDIR)/share/direwolf/pixmaps/dw-icon.png
-+	$(INSTALL) -D -m=644 direwolf.desktop $(DESTDIR)/share/applications/direwolf.desktop
- #
- # Documentation.  Various plain text files and PDF.
- #
--	$(INSTALL) -D --mode=644 CHANGES.md $(DESTDIR)/share/doc/direwolf/CHANGES.md
--	$(INSTALL) -D --mode=644 LICENSE-dire-wolf.txt $(DESTDIR)/share/doc/direwolf/LICENSE-dire-wolf.txt
--	$(INSTALL) -D --mode=644 LICENSE-other.txt $(DESTDIR)/share/doc/direwolf/LICENSE-other.txt
-+	$(INSTALL) -D -m=644 CHANGES.md $(DESTDIR)/share/doc/direwolf/CHANGES.md
-+	$(INSTALL) -D -m=644 LICENSE-dire-wolf.txt $(DESTDIR)/share/doc/direwolf/LICENSE-dire-wolf.txt
-+	$(INSTALL) -D -m=644 LICENSE-other.txt $(DESTDIR)/share/doc/direwolf/LICENSE-other.txt
- #
- # ./README.md is an overview for the project main page.
- # Maybe we could stick it in some other place.
- # doc/README.md contains an overview of the PDF file contents and is more useful here.
- #
--	$(INSTALL) -D --mode=644 doc/README.md $(DESTDIR)/share/doc/direwolf/README.md
--	$(INSTALL) -D --mode=644 doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf $(DESTDIR)/share/doc/direwolf/2400-4800-PSK-for-APRS-Packet-Radio.pdf
--	$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(DESTDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
--	$(INSTALL) -D --mode=644 doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(DESTDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
--	$(INSTALL) -D --mode=644 doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf $(DESTDIR)/share/doc/direwolf/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf
--	$(INSTALL) -D --mode=644 doc/APRS-Telemetry-Toolkit.pdf $(DESTDIR)/share/doc/direwolf/APRS-Telemetry-Toolkit.pdf
--	$(INSTALL) -D --mode=644 doc/APRStt-Implementation-Notes.pdf $(DESTDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
--	$(INSTALL) -D --mode=644 doc/APRStt-interface-for-SARTrack.pdf $(DESTDIR)/share/doc/direwolf/APRStt-interface-for-SARTrack.pdf
--	$(INSTALL) -D --mode=644 doc/APRStt-Listening-Example.pdf $(DESTDIR)/share/doc/direwolf/APRStt-Listening-Example.pdf
--	$(INSTALL) -D --mode=644 doc/Bluetooth-KISS-TNC.pdf $(DESTDIR)/share/doc/direwolf/Bluetooth-KISS-TNC.pdf
--	$(INSTALL) -D --mode=644 doc/Going-beyond-9600-baud.pdf $(DESTDIR)/share/doc/direwolf/Going-beyond-9600-baud.pdf
--	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-APRS.pdf
--	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-APRS-Tracker.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
--	$(INSTALL) -D --mode=644 doc/Raspberry-Pi-SDR-IGate.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-SDR-IGate.pdf
--	$(INSTALL) -D --mode=644 doc/Successful-APRS-IGate-Operation.pdf $(DESTDIR)/share/doc/direwolf/Successful-APRS-IGate-Operation.pdf
--	$(INSTALL) -D --mode=644 doc/User-Guide.pdf $(DESTDIR)/share/doc/direwolf/User-Guide.pdf
--	$(INSTALL) -D --mode=644 doc/WA8LMF-TNC-Test-CD-Results.pdf $(DESTDIR)/share/doc/direwolf/WA8LMF-TNC-Test-CD-Results.pdf
-+	$(INSTALL) -D -m=644 doc/README.md $(DESTDIR)/share/doc/direwolf/README.md
-+	$(INSTALL) -D -m=644 doc/2400-4800-PSK-for-APRS-Packet-Radio.pdf $(DESTDIR)/share/doc/direwolf/2400-4800-PSK-for-APRS-Packet-Radio.pdf
-+	$(INSTALL) -D -m=644 doc/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf $(DESTDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-1-1200-baud.pdf
-+	$(INSTALL) -D -m=644 doc/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf $(DESTDIR)/share/doc/direwolf/A-Better-APRS-Packet-Demodulator-Part-2-9600-baud.pdf
-+	$(INSTALL) -D -m=644 doc/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf $(DESTDIR)/share/doc/direwolf/A-Closer-Look-at-the-WA8LMF-TNC-Test-CD.pdf
-+	$(INSTALL) -D -m=644 doc/APRS-Telemetry-Toolkit.pdf $(DESTDIR)/share/doc/direwolf/APRS-Telemetry-Toolkit.pdf
-+	$(INSTALL) -D -m=644 doc/APRStt-Implementation-Notes.pdf $(DESTDIR)/share/doc/direwolf/APRStt-Implementation-Notes.pdf
-+	$(INSTALL) -D -m=644 doc/APRStt-interface-for-SARTrack.pdf $(DESTDIR)/share/doc/direwolf/APRStt-interface-for-SARTrack.pdf
-+	$(INSTALL) -D -m=644 doc/APRStt-Listening-Example.pdf $(DESTDIR)/share/doc/direwolf/APRStt-Listening-Example.pdf
-+	$(INSTALL) -D -m=644 doc/Bluetooth-KISS-TNC.pdf $(DESTDIR)/share/doc/direwolf/Bluetooth-KISS-TNC.pdf
-+	$(INSTALL) -D -m=644 doc/Going-beyond-9600-baud.pdf $(DESTDIR)/share/doc/direwolf/Going-beyond-9600-baud.pdf
-+	$(INSTALL) -D -m=644 doc/Raspberry-Pi-APRS.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-APRS.pdf
-+	$(INSTALL) -D -m=644 doc/Raspberry-Pi-APRS-Tracker.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-APRS-Tracker.pdf
-+	$(INSTALL) -D -m=644 doc/Raspberry-Pi-SDR-IGate.pdf $(DESTDIR)/share/doc/direwolf/Raspberry-Pi-SDR-IGate.pdf
-+	$(INSTALL) -D -m=644 doc/Successful-APRS-IGate-Operation.pdf $(DESTDIR)/share/doc/direwolf/Successful-APRS-IGate-Operation.pdf
-+	$(INSTALL) -D -m=644 doc/User-Guide.pdf $(DESTDIR)/share/doc/direwolf/User-Guide.pdf
-+	$(INSTALL) -D -m=644 doc/WA8LMF-TNC-Test-CD-Results.pdf $(DESTDIR)/share/doc/direwolf/WA8LMF-TNC-Test-CD-Results.pdf
- #
- # Various sample config and other files go into examples under the doc directory.
- # When building from source, these can be put in home directory with "make install-conf".
- # When installed from .DEB or .RPM package, the user will need to copy these to
- # the home directory or other desired location.
- #
--	$(INSTALL) -D --mode=644 direwolf.conf $(DESTDIR)/share/doc/direwolf/examples/direwolf.conf
--	$(INSTALL) -D --mode=755 dw-start.sh $(DESTDIR)/share/doc/direwolf/examples/dw-start.sh
--	$(INSTALL) -D --mode=644 sdr.conf $(DESTDIR)/share/doc/direwolf/examples/sdr.conf
--	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-m0xer-3.txt $(DESTDIR)/share/doc/direwolf/examples/telem-m0xer-3.txt
--	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-balloon.conf $(DESTDIR)/share/doc/direwolf/examples/telem-balloon.conf
--	$(INSTALL) -D --mode=644 telemetry-toolkit/telem-volts.conf $(DESTDIR)/share/doc/direwolf/examples/telem-volts.conf
-+	$(INSTALL) -D -m=644 direwolf.conf $(DESTDIR)/share/doc/direwolf/examples/direwolf.conf
-+	$(INSTALL) -D -m=755 dw-start.sh $(DESTDIR)/share/doc/direwolf/examples/dw-start.sh
-+	$(INSTALL) -D -m=644 sdr.conf $(DESTDIR)/share/doc/direwolf/examples/sdr.conf
-+	$(INSTALL) -D -m=644 telemetry-toolkit/telem-m0xer-3.txt $(DESTDIR)/share/doc/direwolf/examples/telem-m0xer-3.txt
-+	$(INSTALL) -D -m=644 telemetry-toolkit/telem-balloon.conf $(DESTDIR)/share/doc/direwolf/examples/telem-balloon.conf
-+	$(INSTALL) -D -m=644 telemetry-toolkit/telem-volts.conf $(DESTDIR)/share/doc/direwolf/examples/telem-volts.conf
- #
- # "man" pages
- #
--	$(INSTALL) -D --mode=644 man1/aclients.1 $(DESTDIR)/share/man/man1/aclients.1
--	$(INSTALL) -D --mode=644 man1/atest.1 $(DESTDIR)/share/man/man1/atest.1
--	$(INSTALL) -D --mode=644 man1/decode_aprs.1 $(DESTDIR)/share/man/man1/decode_aprs.1
--	$(INSTALL) -D --mode=644 man1/direwolf.1 $(DESTDIR)/share/man/man1/direwolf.1
--	$(INSTALL) -D --mode=644 man1/gen_packets.1 $(DESTDIR)/share/man/man1/gen_packets.1
--	$(INSTALL) -D --mode=644 man1/kissutil.1 $(DESTDIR)/share/man/man1/kissutil.1
--	$(INSTALL) -D --mode=644 man1/ll2utm.1 $(DESTDIR)/share/man/man1/ll2utm.1
--	$(INSTALL) -D --mode=644 man1/log2gpx.1 $(DESTDIR)/share/man/man1/log2gpx.1
--	$(INSTALL) -D --mode=644 man1/text2tt.1 $(DESTDIR)/share/man/man1/text2tt.1
--	$(INSTALL) -D --mode=644 man1/tt2text.1 $(DESTDIR)/share/man/man1/tt2text.1
--	$(INSTALL) -D --mode=644 man1/utm2ll.1 $(DESTDIR)/share/man/man1/utm2ll.1
-+	$(INSTALL) -D -m=644 man1/aclients.1 $(DESTDIR)/share/man/man1/aclients.1
-+	$(INSTALL) -D -m=644 man1/atest.1 $(DESTDIR)/share/man/man1/atest.1
-+	$(INSTALL) -D -m=644 man1/decode_aprs.1 $(DESTDIR)/share/man/man1/decode_aprs.1
-+	$(INSTALL) -D -m=644 man1/direwolf.1 $(DESTDIR)/share/man/man1/direwolf.1
-+	$(INSTALL) -D -m=644 man1/gen_packets.1 $(DESTDIR)/share/man/man1/gen_packets.1
-+	$(INSTALL) -D -m=644 man1/kissutil.1 $(DESTDIR)/share/man/man1/kissutil.1
-+	$(INSTALL) -D -m=644 man1/ll2utm.1 $(DESTDIR)/share/man/man1/ll2utm.1
-+	$(INSTALL) -D -m=644 man1/log2gpx.1 $(DESTDIR)/share/man/man1/log2gpx.1
-+	$(INSTALL) -D -m=644 man1/text2tt.1 $(DESTDIR)/share/man/man1/text2tt.1
-+	$(INSTALL) -D -m=644 man1/tt2text.1 $(DESTDIR)/share/man/man1/tt2text.1
-+	$(INSTALL) -D -m=644 man1/utm2ll.1 $(DESTDIR)/share/man/man1/utm2ll.1
- #
- # Set group and mode of HID devices corresponding to C-Media USB Audio adapters.
- # This will allow us to use the CM108/CM119 GPIO pins for PTT.
- #
--	$(INSTALL) -D --mode=644 99-direwolf-cmedia.rules /etc/udev/rules.d/99-direwolf-cmedia.rules
-+	$(INSTALL) -D -m=644 99-direwolf-cmedia.rules /etc/udev/rules.d/99-direwolf-cmedia.rules
- #
- 	@echo " "
- 	@echo "If this is your first install, not an upgrade, type this to put a copy"
-diff --git a/cdigipeater.c b/cdigipeater.c
-index 9c40d95..94112e9 100644
---- a/cdigipeater.c
-+++ b/cdigipeater.c
-@@ -49,7 +49,7 @@
- #include <stdio.h>
- #include <ctype.h>	/* for isdigit, isupper */
- #include "regex.h"
--#include <sys/unistd.h>
-+#include <unistd.h>
- 
- #include "ax25_pad.h"
- #include "cdigipeater.h"
-diff --git a/decode_aprs.c b/decode_aprs.c
-index 35c186b..a620cb3 100644
---- a/decode_aprs.c
-+++ b/decode_aprs.c
-@@ -3872,11 +3872,7 @@ static void decode_tocall (decode_aprs_t *A, char *dest)
-  * models before getting to the more generic APY.
-  */
- 
--#if defined(__WIN32__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
- 	    qsort (tocalls, num_tocalls, sizeof(struct tocalls_s), tocall_cmp);
--#else
--	    qsort (tocalls, num_tocalls, sizeof(struct tocalls_s), (__compar_fn_t)tocall_cmp);
--#endif
- 	  }
- 	  else {
- 	    if ( ! A->g_quiet) {
-diff --git a/digipeater.c b/digipeater.c
-index 36970d7..5195582 100644
---- a/digipeater.c
-+++ b/digipeater.c
-@@ -62,7 +62,7 @@
- #include <stdio.h>
- #include <ctype.h>	/* for isdigit, isupper */
- #include "regex.h"
--#include <sys/unistd.h>
-+#include <unistd.h>
- 
- #include "ax25_pad.h"
- #include "digipeater.h"
-diff --git a/direwolf.h b/direwolf.h
-index 514bcc5..52f5ae9 100644
---- a/direwolf.h
-+++ b/direwolf.h
-@@ -274,7 +274,7 @@ char *strtok_r(char *str, const char *delim, char **saveptr);
- char *strcasestr(const char *S, const char *FIND);
- 
- 
--#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
-+#if 1
- 
- // strlcpy and strlcat should be in string.h and the C library.
- 
-diff --git a/multi_modem.c b/multi_modem.c
-index 5d96c79..24261b9 100644
---- a/multi_modem.c
-+++ b/multi_modem.c
-@@ -80,7 +80,7 @@
- #include <string.h>
- #include <assert.h>
- #include <stdio.h>
--#include <sys/unistd.h>
-+#include <unistd.h>
- 
- #include "ax25_pad.h"
- #include "textcolor.h"
diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index 1b1c87b..9f18cda 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -18,11 +18,11 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="sox fftw python3 netcat-openbsd libsndfile lapack libusb qt5-qtbase qt5-qtmultimedia qt5-qtserialport qt5-qttools alsa-lib"
-BUILD_PACKAGES="git libsndfile-dev fftw-dev cmake ca-certificates make gcc musl-dev g++ lapack-dev linux-headers autoconf automake libtool texinfo gfortran libusb-dev qt5-qtbase-dev qt5-qtmultimedia-dev qt5-qtserialport-dev qt5-qttools-dev asciidoctor asciidoc alsa-lib-dev linux-headers pkgconf"
+STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0.0 libqt5serialport5 libqt5multimedia5-plugins libqt5widgets5 libqt5sql5-sqlite libqt5core5a libqt5gui5 libqt5multimedia5 libqt5network5 libqt5printsupport5 libqt5serialport5 libqt5sql5 libqt5widgets5 libreadline7 libgfortran4 libgomp1 libasound2 libudev1 libhamlib2 libhamlib2++c2"
+BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake ca-certificates make gcc g++ liblapack-dev autoconf automake libtool texinfo gfortran libusb-1.0.0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev pkg-config libudev-dev libhamlib-dev libhamlib++-dev"
 
-apk add --no-cache $STATIC_PACKAGES
-apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+apt-get update
+apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/jketterl/js8py.git
 pushd js8py
@@ -52,21 +52,26 @@ cmakebuild digiham 95206501be89b38d0267bf6c29a6898e7c65656f
 git clone https://github.com/f4exb/dsd.git
 cmakebuild dsd f6939f9edbbc6f66261833616391a4e59cb2b3d7
 
-git clone https://github.com/Hamlib/Hamlib.git
-pushd Hamlib
-git checkout 301ebb92eaa538dfa75c06821f46715f40dd7673
-./bootstrap
-./configure
-make
-make install
-popd
-rm -rf Hamlib
+#git clone https://github.com/Hamlib/Hamlib.git
+#pushd Hamlib
+#git checkout 301ebb92eaa538dfa75c06821f46715f40dd7673
+#./bootstrap
+#./configure
+#make
+#ake install
+#popd
+#rm -rf Hamlib
 
 JS8CALL_VERSION=2.1.1
 JS8CALL_DIR=js8call-${JS8CALL_VERSION}
 JS8CALL_TGZ=${JS8CALL_DIR}.tgz
 wget http://files.js8call.com/${JS8CALL_VERSION}/${JS8CALL_TGZ}
 tar xfz ${JS8CALL_TGZ}
+#cp ${JS8CALL_DIR}/CMakeLists.txt ./CMakeLists.orig.txt
+#sed "s/set (hamlib_STATIC 1)/set (hamlib_STATIC 0)/" < ./CMakeLists.orig.txt > ${JS8CALL_DIR}/CMakeLists.txt
+#rm ./CMakeLists.orig.txt
+patch -Np1 -d ${JS8CALL_DIR} < /js8call-hamlib.patch
+rm /js8call-hamlib.patch
 CMAKE_ARGS="-D CMAKE_CXX_FLAGS=-DJS8_USE_LEGACY_HAMLIB" cmakebuild ${JS8CALL_DIR}
 rm ${JS8CALL_TGZ}
 
@@ -79,7 +84,6 @@ rm ${WSJT_TGZ}
 
 git clone --depth 1 -b 1.5 https://github.com/wb2osz/direwolf.git
 cd direwolf
-patch -Np1 < /direwolf-1.5.patch
 make
 make install
 cd ..
@@ -90,4 +94,6 @@ pushd /opt/aprs-symbols
 git checkout 5c2abe2658ee4d2563f3c73b90c6f59124839802
 popd
 
-apk del .build-deps
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*
diff --git a/docker/scripts/js8call-hamlib.patch b/docker/scripts/js8call-hamlib.patch
new file mode 100644
index 0000000..68c1e70
--- /dev/null
+++ b/docker/scripts/js8call-hamlib.patch
@@ -0,0 +1,43 @@
+diff -ur js8call-2.1.1-orig/CMake/Modules/Findhamlib.cmake js8call-2.1.1/CMake/Modules/Findhamlib.cmake
+--- js8call-2.1.1-orig/CMake/Modules/Findhamlib.cmake	2020-05-23 15:38:20.730349612 +0000
++++ js8call-2.1.1/CMake/Modules/Findhamlib.cmake	2020-05-23 15:39:28.829772207 +0000
+@@ -78,4 +78,4 @@
+ # Handle the  QUIETLY and REQUIRED  arguments and set  HAMLIB_FOUND to
+ # TRUE if all listed variables are TRUE
+ include (FindPackageHandleStandardArgs)
+-find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES hamlib_LIBRARY_DIRS)
++find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES)
+diff -ur js8call-2.1.1-orig/CMakeLists.txt js8call-2.1.1/CMakeLists.txt
+--- js8call-2.1.1-orig/CMakeLists.txt	2020-05-23 15:38:20.730349612 +0000
++++ js8call-2.1.1/CMakeLists.txt	2020-05-23 15:52:46.103389553 +0000
+@@ -683,7 +683,7 @@
+ #
+ # libhamlib setup
+ #
+-set (hamlib_STATIC 1)
++set (hamlib_STATIC 0)
+ find_package (hamlib 3 REQUIRED)
+ find_program (RIGCTL_EXE rigctl)
+ find_program (RIGCTLD_EXE rigctld)
+@@ -1106,20 +1106,6 @@
+   BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+   )
+ 
+-install (PROGRAMS
+-  ${RIGCTL_EXE}
+-  DESTINATION ${CMAKE_INSTALL_BINDIR}
+-  #COMPONENT runtime
+-  RENAME rigctl-local${CMAKE_EXECUTABLE_SUFFIX}
+-  )
+-
+-install (PROGRAMS
+-  ${RIGCTLD_EXE}
+-  DESTINATION ${CMAKE_INSTALL_BINDIR}
+-  #COMPONENT runtime
+-  RENAME rigctld-local${CMAKE_EXECUTABLE_SUFFIX}
+-  )
+-
+ install (FILES
+   README
+   COPYING
+Only in js8call-2.1.1/: hamlib.patch

From d9292587ec12dddc9c5fc52d6a21c7d4f872bf99 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 23 May 2020 19:59:31 +0200
Subject: [PATCH 341/475] part 2: all the image builds

---
 docker/scripts/install-connectors.sh                | 10 ++++++----
 docker/scripts/install-dependencies-airspy.sh       | 12 +++++++-----
 docker/scripts/install-dependencies-hackrf.sh       | 12 +++++++-----
 docker/scripts/install-dependencies-limesdr.sh      | 12 +++++++-----
 docker/scripts/install-dependencies-perseus.sh      | 12 +++++++-----
 docker/scripts/install-dependencies-plutosdr.sh     | 12 +++++++-----
 docker/scripts/install-dependencies-rtlsdr-soapy.sh | 12 +++++++-----
 docker/scripts/install-dependencies-rtlsdr.sh       | 12 +++++++-----
 docker/scripts/install-dependencies-sdrplay.sh      | 10 ++++++----
 docker/scripts/install-dependencies-soapyremote.sh  | 12 +++++++-----
 docker/scripts/install-dependencies-soapysdr.sh     | 10 ++++++----
 docker/scripts/install-dependencies.sh              |  4 ++--
 12 files changed, 76 insertions(+), 54 deletions(-)

diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh
index b848e7a..5b92f56 100755
--- a/docker/scripts/install-connectors.sh
+++ b/docker/scripts/install-connectors.sh
@@ -18,12 +18,14 @@ function cmakebuild() {
 
 cd /tmp
 
-BUILD_PACKAGES="git cmake make gcc g++ musl-dev"
-
-apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+BUILD_PACKAGES="git cmake make gcc g++"
 
+apt-get update
+apt-get -y install $BUILD_PACKAGES
 
 git clone https://github.com/jketterl/owrx_connector.git
 cmakebuild owrx_connector 3ffbdcccbe39a5675fd539d959e64885e521eae6
 
-apk del .build-deps
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*
diff --git a/docker/scripts/install-dependencies-airspy.sh b/docker/scripts/install-dependencies-airspy.sh
index a7813d3..4b6fb50 100755
--- a/docker/scripts/install-dependencies-airspy.sh
+++ b/docker/scripts/install-dependencies-airspy.sh
@@ -18,11 +18,11 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="libusb"
-BUILD_PACKAGES="git libusb-dev cmake make gcc musl-dev g++ linux-headers"
+STATIC_PACKAGES="libusb-1.0-0"
+BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++ pkg-config"
 
-apk add --no-cache $STATIC_PACKAGES
-apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+apt-get update
+apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/airspy/airspyone_host.git
 cmakebuild airspyone_host bceca18f9e3a5f89cff78c4d949c71771d92dfd3
@@ -36,4 +36,6 @@ cmakebuild airspyhf 613852a2bb64af42690bf9be2201826af69a9475
 git clone https://github.com/pothosware/SoapyAirspyHF.git
 cmakebuild SoapyAirspyHF 81ca737bb044dd930a9de738bced1e4915491f1b
 
-apk del .build-deps
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*
diff --git a/docker/scripts/install-dependencies-hackrf.sh b/docker/scripts/install-dependencies-hackrf.sh
index 0e56119..f0af991 100755
--- a/docker/scripts/install-dependencies-hackrf.sh
+++ b/docker/scripts/install-dependencies-hackrf.sh
@@ -18,11 +18,11 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="libusb fftw udev"
-BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-dev fftw-dev"
+STATIC_PACKAGES="libusb-1.0-0 libfftw3-3 udev"
+BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev libfftw3-dev pkg-config"
 
-apk add --no-cache $STATIC_PACKAGES
-apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+apt-get update
+apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/mossmann/hackrf.git
 cd hackrf
@@ -31,4 +31,6 @@ cmakebuild host
 cd ..
 rm -rf hackrf
 
-apk del .build-deps
+SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*
diff --git a/docker/scripts/install-dependencies-limesdr.sh b/docker/scripts/install-dependencies-limesdr.sh
index 0e5cef5..cc3cbb1 100755
--- a/docker/scripts/install-dependencies-limesdr.sh
+++ b/docker/scripts/install-dependencies-limesdr.sh
@@ -4,11 +4,11 @@ export MAKEFLAGS="-j4"
 
 cd /tmp
 
-STATIC_PACKAGES="libusb"
-BUILD_PACKAGES="git libusb-dev cmake make gcc musl-dev g++ linux-headers"
+STATIC_PACKAGES="libusb-1.0-0"
+BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++"
 
-apk add --no-cache $STATIC_PACKAGES
-apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+apt-get update
+apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/myriadrf/LimeSuite.git
 cd LimeSuite
@@ -21,4 +21,6 @@ make install
 cd ../..
 rm -rf LimeSuite
 
-apk del .build-deps
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*
diff --git a/docker/scripts/install-dependencies-perseus.sh b/docker/scripts/install-dependencies-perseus.sh
index 62a0a71..e0463e0 100755
--- a/docker/scripts/install-dependencies-perseus.sh
+++ b/docker/scripts/install-dependencies-perseus.sh
@@ -4,11 +4,11 @@ export MAKEFLAGS="-j4"
 
 cd /tmp
 
-STATIC_PACKAGES="libusb udev"
-BUILD_PACKAGES="git make gcc autoconf automake libtool musl-dev libusb-dev shadow vim"
+STATIC_PACKAGES="libusb-1.0-0 libudev1"
+BUILD_PACKAGES="git make gcc autoconf automake libtool libusb-1.0-0-dev xxd"
 
-apk add --no-cache $STATIC_PACKAGES
-apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+apt-get update
+apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/Microtelecom/libperseus-sdr.git
 cd libperseus-sdr
@@ -21,4 +21,6 @@ ldconfig /etc/ld.so.conf.d
 cd ..
 rm -rf libperseus-sdr
 
-apk del .build-deps
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*
diff --git a/docker/scripts/install-dependencies-plutosdr.sh b/docker/scripts/install-dependencies-plutosdr.sh
index 50cd353..290ff1f 100755
--- a/docker/scripts/install-dependencies-plutosdr.sh
+++ b/docker/scripts/install-dependencies-plutosdr.sh
@@ -18,11 +18,11 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="libusb libxml2"
-BUILD_PACKAGES="git libusb-dev cmake make gcc musl-dev g++ linux-headers libxml2-dev flex bison"
+STATIC_PACKAGES="libusb-1.0-0 libxml2"
+BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++ libxml2-dev flex bison"
 
-apk add --no-cache $STATIC_PACKAGES
-apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+apt-get update
+apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/analogdevicesinc/libiio.git
 cmakebuild libiio 5f5af2e417129ad8f4e05fc5c1b730f0694dca12 -DCMAKE_INSTALL_PREFIX=/usr/local
@@ -33,4 +33,6 @@ cmakebuild libad9361-iio 8ac95f3325c18c2e34cd9cfd49c7b63d69a0a9d2
 git clone https://github.com/pothosware/SoapyPlutoSDR.git
 cmakebuild SoapyPlutoSDR c88b7f5bac1e5785f212f9a7c6ce8fef64eb719e
 
-apk del .build-deps
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*
diff --git a/docker/scripts/install-dependencies-rtlsdr-soapy.sh b/docker/scripts/install-dependencies-rtlsdr-soapy.sh
index 8a70417..a5dc03d 100755
--- a/docker/scripts/install-dependencies-rtlsdr-soapy.sh
+++ b/docker/scripts/install-dependencies-rtlsdr-soapy.sh
@@ -18,11 +18,11 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="libusb"
-BUILD_PACKAGES="git libusb-dev cmake make gcc musl-dev g++ linux-headers"
+STATIC_PACKAGES="libusb-1.0-0"
+BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++ pkg-config"
 
-apk add --no-cache $STATIC_PACKAGES
-apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+apt-get update
+apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/osmocom/rtl-sdr.git
 cmakebuild rtl-sdr d794155ba65796a76cd0a436f9709f4601509320
@@ -30,4 +30,6 @@ cmakebuild rtl-sdr d794155ba65796a76cd0a436f9709f4601509320
 git clone https://github.com/pothosware/SoapyRTLSDR.git
 cmakebuild SoapyRTLSDR 8ba18f17d64005e43ff2a4e46611f8c710b05007
 
-apk del .build-deps
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*
diff --git a/docker/scripts/install-dependencies-rtlsdr.sh b/docker/scripts/install-dependencies-rtlsdr.sh
index 9c7370b..dee4df4 100755
--- a/docker/scripts/install-dependencies-rtlsdr.sh
+++ b/docker/scripts/install-dependencies-rtlsdr.sh
@@ -18,13 +18,15 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="libusb"
-BUILD_PACKAGES="git libusb-dev cmake make gcc musl-dev g++ linux-headers"
+STATIC_PACKAGES="libusb-1.0.0"
+BUILD_PACKAGES="git libusb-1.0.0-dev cmake make gcc g++ pkg-config"
 
-apk add --no-cache $STATIC_PACKAGES
-apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+apt-get update
+apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/osmocom/rtl-sdr.git
 cmakebuild rtl-sdr d794155ba65796a76cd0a436f9709f4601509320
 
-apk del .build-deps
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*
diff --git a/docker/scripts/install-dependencies-sdrplay.sh b/docker/scripts/install-dependencies-sdrplay.sh
index d127602..c7071ec 100755
--- a/docker/scripts/install-dependencies-sdrplay.sh
+++ b/docker/scripts/install-dependencies-sdrplay.sh
@@ -18,11 +18,11 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="libusb udev"
+STATIC_PACKAGES="libusb-1.0.0 libudev1"
 BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-dev"
 
-apk add --no-cache $STATIC_PACKAGES
-apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+apt-get update
+apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
 
 ARCH=$(uname -m)
 
@@ -51,4 +51,6 @@ rm $BINARY
 git clone https://github.com/pothosware/SoapySDRPlay.git
 cmakebuild SoapySDRPlay 14ec39e4ff0dab7ae7fdf1afbbd2d28b49b0ffae
 
-apk del .build-deps
+SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*
diff --git a/docker/scripts/install-dependencies-soapyremote.sh b/docker/scripts/install-dependencies-soapyremote.sh
index 9b95f09..b1b3800 100755
--- a/docker/scripts/install-dependencies-soapyremote.sh
+++ b/docker/scripts/install-dependencies-soapyremote.sh
@@ -18,13 +18,15 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="avahi"
-BUILD_PACKAGES="git cmake make gcc musl-dev g++ linux-headers avahi-dev"
+STATIC_PACKAGES="avahi-daemon libavahi-client3"
+BUILD_PACKAGES="git cmake make gcc g++ libavahi-client-dev"
 
-apk add --no-cache $STATIC_PACKAGES
-apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+apt-get update
+apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/pothosware/SoapyRemote.git
 cmakebuild SoapyRemote 6d9bd820da470cfe7b27b2e6946af93cfece448f
 
-apk del .build-deps
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*
diff --git a/docker/scripts/install-dependencies-soapysdr.sh b/docker/scripts/install-dependencies-soapysdr.sh
index bfbcd66..da77c76 100755
--- a/docker/scripts/install-dependencies-soapysdr.sh
+++ b/docker/scripts/install-dependencies-soapysdr.sh
@@ -18,13 +18,15 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="udev"
+STATIC_PACKAGES="libudev1"
 BUILD_PACKAGES="git cmake make patch wget sudo gcc g++"
 
-apk add --no-cache $STATIC_PACKAGES
-apk add --no-cache --virtual .build-deps $BUILD_PACKAGES
+apt-get update
+apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/pothosware/SoapySDR
 cmakebuild SoapySDR f722f9ce5b629c3c44401a9bf628b3f8e67a9695
 
-apk del .build-deps
+SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*
diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index 9f18cda..3285ce3 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -18,8 +18,8 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0.0 libqt5serialport5 libqt5multimedia5-plugins libqt5widgets5 libqt5sql5-sqlite libqt5core5a libqt5gui5 libqt5multimedia5 libqt5network5 libqt5printsupport5 libqt5serialport5 libqt5sql5 libqt5widgets5 libreadline7 libgfortran4 libgomp1 libasound2 libudev1 libhamlib2 libhamlib2++c2"
-BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake ca-certificates make gcc g++ liblapack-dev autoconf automake libtool texinfo gfortran libusb-1.0.0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev pkg-config libudev-dev libhamlib-dev libhamlib++-dev"
+STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5serialport5 libqt5multimedia5-plugins libqt5widgets5 libqt5sql5-sqlite libqt5core5a libqt5gui5 libqt5multimedia5 libqt5network5 libqt5printsupport5 libqt5serialport5 libqt5sql5 libqt5widgets5 libreadline7 libgfortran4 libgomp1 libasound2 libudev1 libhamlib2"
+BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake ca-certificates make gcc g++ liblapack-dev autoconf automake libtool texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev pkg-config libudev-dev libhamlib-dev"
 
 apt-get update
 apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES

From 6cac3b4d39fadbdfd809e2b37b7a03bf864bbc45 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 23 May 2020 22:51:46 +0200
Subject: [PATCH 342/475] restore startup

---
 docker/Dockerfiles/Dockerfile-base | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index 3ea8aae..2ac1cd4 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -5,7 +5,9 @@ ADD docker/scripts/install-dependencies.sh /
 RUN /install-dependencies.sh && \
     rm /install-dependencies.sh
 
+WORKDIR /opt/openwebrx
+
 VOLUME /etc/openwebrx
 
-ENTRYPOINT [ "/usr/bin/openwebrx" ]
+ENTRYPOINT [ "/opt/openwebrx/docker/scripts/run.sh" ]
 EXPOSE 8073

From 1fedd0e50f2b930a4c79dd2be5a061463e855a84 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 23 May 2020 22:52:22 +0200
Subject: [PATCH 343/475] limesdr requires libatomic

---
 docker/scripts/install-dependencies-limesdr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/install-dependencies-limesdr.sh b/docker/scripts/install-dependencies-limesdr.sh
index cc3cbb1..bbafb9c 100755
--- a/docker/scripts/install-dependencies-limesdr.sh
+++ b/docker/scripts/install-dependencies-limesdr.sh
@@ -4,7 +4,7 @@ export MAKEFLAGS="-j4"
 
 cd /tmp
 
-STATIC_PACKAGES="libusb-1.0-0"
+STATIC_PACKAGES="libusb-1.0-0 libatomic1"
 BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++"
 
 apt-get update

From 5377087848d1bb0a9a1dd7c26f1319098f8a7300 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 23 May 2020 22:53:12 +0200
Subject: [PATCH 344/475] don't install unnecessary dependencies

---
 docker/scripts/install-connectors.sh          |  2 +-
 docker/scripts/install-dependencies-airspy.sh |  2 +-
 docker/scripts/install-dependencies-hackrf.sh |  2 +-
 .../scripts/install-dependencies-limesdr.sh   |  2 +-
 .../scripts/install-dependencies-perseus.sh   |  2 +-
 .../scripts/install-dependencies-plutosdr.sh  |  2 +-
 .../install-dependencies-rtlsdr-soapy.sh      |  2 +-
 docker/scripts/install-dependencies-rtlsdr.sh |  2 +-
 .../scripts/install-dependencies-sdrplay.sh   |  2 +-
 .../install-dependencies-soapyremote.sh       |  2 +-
 .../scripts/install-dependencies-soapysdr.sh  |  2 +-
 docker/scripts/install-dependencies.sh        | 21 +++++--------------
 12 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh
index 5b92f56..15d61dc 100755
--- a/docker/scripts/install-connectors.sh
+++ b/docker/scripts/install-connectors.sh
@@ -21,7 +21,7 @@ cd /tmp
 BUILD_PACKAGES="git cmake make gcc g++"
 
 apt-get update
-apt-get -y install $BUILD_PACKAGES
+apt-get -y install --no-install-recommends $BUILD_PACKAGES
 
 git clone https://github.com/jketterl/owrx_connector.git
 cmakebuild owrx_connector 3ffbdcccbe39a5675fd539d959e64885e521eae6
diff --git a/docker/scripts/install-dependencies-airspy.sh b/docker/scripts/install-dependencies-airspy.sh
index 4b6fb50..9927842 100755
--- a/docker/scripts/install-dependencies-airspy.sh
+++ b/docker/scripts/install-dependencies-airspy.sh
@@ -22,7 +22,7 @@ STATIC_PACKAGES="libusb-1.0-0"
 BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++ pkg-config"
 
 apt-get update
-apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/airspy/airspyone_host.git
 cmakebuild airspyone_host bceca18f9e3a5f89cff78c4d949c71771d92dfd3
diff --git a/docker/scripts/install-dependencies-hackrf.sh b/docker/scripts/install-dependencies-hackrf.sh
index f0af991..9c6d47b 100755
--- a/docker/scripts/install-dependencies-hackrf.sh
+++ b/docker/scripts/install-dependencies-hackrf.sh
@@ -22,7 +22,7 @@ STATIC_PACKAGES="libusb-1.0-0 libfftw3-3 udev"
 BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev libfftw3-dev pkg-config"
 
 apt-get update
-apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/mossmann/hackrf.git
 cd hackrf
diff --git a/docker/scripts/install-dependencies-limesdr.sh b/docker/scripts/install-dependencies-limesdr.sh
index bbafb9c..abfa393 100755
--- a/docker/scripts/install-dependencies-limesdr.sh
+++ b/docker/scripts/install-dependencies-limesdr.sh
@@ -8,7 +8,7 @@ STATIC_PACKAGES="libusb-1.0-0 libatomic1"
 BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++"
 
 apt-get update
-apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/myriadrf/LimeSuite.git
 cd LimeSuite
diff --git a/docker/scripts/install-dependencies-perseus.sh b/docker/scripts/install-dependencies-perseus.sh
index e0463e0..eba74fe 100755
--- a/docker/scripts/install-dependencies-perseus.sh
+++ b/docker/scripts/install-dependencies-perseus.sh
@@ -8,7 +8,7 @@ STATIC_PACKAGES="libusb-1.0-0 libudev1"
 BUILD_PACKAGES="git make gcc autoconf automake libtool libusb-1.0-0-dev xxd"
 
 apt-get update
-apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/Microtelecom/libperseus-sdr.git
 cd libperseus-sdr
diff --git a/docker/scripts/install-dependencies-plutosdr.sh b/docker/scripts/install-dependencies-plutosdr.sh
index 290ff1f..18df91e 100755
--- a/docker/scripts/install-dependencies-plutosdr.sh
+++ b/docker/scripts/install-dependencies-plutosdr.sh
@@ -22,7 +22,7 @@ STATIC_PACKAGES="libusb-1.0-0 libxml2"
 BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++ libxml2-dev flex bison"
 
 apt-get update
-apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/analogdevicesinc/libiio.git
 cmakebuild libiio 5f5af2e417129ad8f4e05fc5c1b730f0694dca12 -DCMAKE_INSTALL_PREFIX=/usr/local
diff --git a/docker/scripts/install-dependencies-rtlsdr-soapy.sh b/docker/scripts/install-dependencies-rtlsdr-soapy.sh
index a5dc03d..b50921d 100755
--- a/docker/scripts/install-dependencies-rtlsdr-soapy.sh
+++ b/docker/scripts/install-dependencies-rtlsdr-soapy.sh
@@ -22,7 +22,7 @@ STATIC_PACKAGES="libusb-1.0-0"
 BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++ pkg-config"
 
 apt-get update
-apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/osmocom/rtl-sdr.git
 cmakebuild rtl-sdr d794155ba65796a76cd0a436f9709f4601509320
diff --git a/docker/scripts/install-dependencies-rtlsdr.sh b/docker/scripts/install-dependencies-rtlsdr.sh
index dee4df4..b26d432 100755
--- a/docker/scripts/install-dependencies-rtlsdr.sh
+++ b/docker/scripts/install-dependencies-rtlsdr.sh
@@ -22,7 +22,7 @@ STATIC_PACKAGES="libusb-1.0.0"
 BUILD_PACKAGES="git libusb-1.0.0-dev cmake make gcc g++ pkg-config"
 
 apt-get update
-apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/osmocom/rtl-sdr.git
 cmakebuild rtl-sdr d794155ba65796a76cd0a436f9709f4601509320
diff --git a/docker/scripts/install-dependencies-sdrplay.sh b/docker/scripts/install-dependencies-sdrplay.sh
index c7071ec..5e689df 100755
--- a/docker/scripts/install-dependencies-sdrplay.sh
+++ b/docker/scripts/install-dependencies-sdrplay.sh
@@ -22,7 +22,7 @@ STATIC_PACKAGES="libusb-1.0.0 libudev1"
 BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-dev"
 
 apt-get update
-apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 ARCH=$(uname -m)
 
diff --git a/docker/scripts/install-dependencies-soapyremote.sh b/docker/scripts/install-dependencies-soapyremote.sh
index b1b3800..cae7c11 100755
--- a/docker/scripts/install-dependencies-soapyremote.sh
+++ b/docker/scripts/install-dependencies-soapyremote.sh
@@ -22,7 +22,7 @@ STATIC_PACKAGES="avahi-daemon libavahi-client3"
 BUILD_PACKAGES="git cmake make gcc g++ libavahi-client-dev"
 
 apt-get update
-apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/pothosware/SoapyRemote.git
 cmakebuild SoapyRemote 6d9bd820da470cfe7b27b2e6946af93cfece448f
diff --git a/docker/scripts/install-dependencies-soapysdr.sh b/docker/scripts/install-dependencies-soapysdr.sh
index da77c76..5687d44 100755
--- a/docker/scripts/install-dependencies-soapysdr.sh
+++ b/docker/scripts/install-dependencies-soapysdr.sh
@@ -22,7 +22,7 @@ STATIC_PACKAGES="libudev1"
 BUILD_PACKAGES="git cmake make patch wget sudo gcc g++"
 
 apt-get update
-apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/pothosware/SoapySDR
 cmakebuild SoapySDR f722f9ce5b629c3c44401a9bf628b3f8e67a9695
diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index 3285ce3..cee0f14 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -18,17 +18,18 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5serialport5 libqt5multimedia5-plugins libqt5widgets5 libqt5sql5-sqlite libqt5core5a libqt5gui5 libqt5multimedia5 libqt5network5 libqt5printsupport5 libqt5serialport5 libqt5sql5 libqt5widgets5 libreadline7 libgfortran4 libgomp1 libasound2 libudev1 libhamlib2"
-BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake ca-certificates make gcc g++ liblapack-dev autoconf automake libtool texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev pkg-config libudev-dev libhamlib-dev"
+STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5serialport5 libqt5multimedia5-plugins libqt5widgets5 libqt5sql5-sqlite libqt5core5a libqt5multimedia5 libqt5network5 libqt5printsupport5 libqt5serialport5 libqt5sql5 libqt5widgets5 libreadline7 libgfortran4 libgomp1 libasound2 libudev1 libhamlib2 ca-certificates"
+BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev autoconf automake libtool texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev pkg-config libudev-dev libhamlib-dev patch xsltproc"
 
 apt-get update
-apt-get -y install $STATIC_PACKAGES $BUILD_PACKAGES
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/jketterl/js8py.git
 pushd js8py
 git checkout 888e62be375316882ad2b2ac8e396c3bf857b6fc
 python3 setup.py install
 popd
+rm -rf js8py
 
 git clone https://git.code.sf.net/p/itpp/git itpp
 cmakebuild itpp bb5c7e95f40e8fdb5c3f3d01a84bcbaf76f3676d
@@ -52,24 +53,12 @@ cmakebuild digiham 95206501be89b38d0267bf6c29a6898e7c65656f
 git clone https://github.com/f4exb/dsd.git
 cmakebuild dsd f6939f9edbbc6f66261833616391a4e59cb2b3d7
 
-#git clone https://github.com/Hamlib/Hamlib.git
-#pushd Hamlib
-#git checkout 301ebb92eaa538dfa75c06821f46715f40dd7673
-#./bootstrap
-#./configure
-#make
-#ake install
-#popd
-#rm -rf Hamlib
-
 JS8CALL_VERSION=2.1.1
 JS8CALL_DIR=js8call-${JS8CALL_VERSION}
 JS8CALL_TGZ=${JS8CALL_DIR}.tgz
 wget http://files.js8call.com/${JS8CALL_VERSION}/${JS8CALL_TGZ}
 tar xfz ${JS8CALL_TGZ}
-#cp ${JS8CALL_DIR}/CMakeLists.txt ./CMakeLists.orig.txt
-#sed "s/set (hamlib_STATIC 1)/set (hamlib_STATIC 0)/" < ./CMakeLists.orig.txt > ${JS8CALL_DIR}/CMakeLists.txt
-#rm ./CMakeLists.orig.txt
+# patch allows us to build against the packaged hamlib
 patch -Np1 -d ${JS8CALL_DIR} < /js8call-hamlib.patch
 rm /js8call-hamlib.patch
 CMAKE_ARGS="-D CMAKE_CXX_FLAGS=-DJS8_USE_LEGACY_HAMLIB" cmakebuild ${JS8CALL_DIR}

From 4b8ef2977536021d7dc52ed79dd76a8875b5080e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 23 May 2020 22:55:00 +0200
Subject: [PATCH 345/475] add the fmv-optimized owrx_connector in docker, too,
 refs #38

---
 docker/scripts/install-connectors.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh
index 15d61dc..ffd7a97 100755
--- a/docker/scripts/install-connectors.sh
+++ b/docker/scripts/install-connectors.sh
@@ -24,7 +24,7 @@ apt-get update
 apt-get -y install --no-install-recommends $BUILD_PACKAGES
 
 git clone https://github.com/jketterl/owrx_connector.git
-cmakebuild owrx_connector 3ffbdcccbe39a5675fd539d959e64885e521eae6
+cmakebuild owrx_connector dee422ec6bf59e2ed8dc636e92dafaea5d337723
 
 apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean

From 17f4f671a66fcbe2271c5332baf6abc4abb63732 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 24 May 2020 00:41:18 +0200
Subject: [PATCH 346/475] add a changelog entry about docker debian rebuild

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c2046b..81bb8c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,8 @@
   [the js8py library](https://github.com/jketterl/js8py))
 - Reorganization of the frontend demodulator code
 - Improve receiver load time by concatenating javascript assets
+- Docker images migrated to Debian slim images; This was necessary to allow the use of function multiversioning in
+  csdr and owrx_connector to allow the images to run on a wider range of CPUs
 
 **0.18.0**
 - Support for SoapyRemote

From e1f83727b75b315c6671ac968229719a50fd5c78 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 24 May 2020 00:42:47 +0200
Subject: [PATCH 347/475] update csdr to latest

---
 docker/scripts/install-dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index cee0f14..c6d650a 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -36,7 +36,7 @@ cmakebuild itpp bb5c7e95f40e8fdb5c3f3d01a84bcbaf76f3676d
 
 git clone https://github.com/jketterl/csdr.git
 cd csdr
-git checkout 5c8dfdea5fa6e87fa2e9f754be883086fc5a2bfb
+git checkout 3ae997c3508b48b9a854c48a628f714eb30a9275
 autoreconf -i
 ./configure
 make

From 29b3f530d2808c30c8592ba48ae3ab000a92ca65 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 24 May 2020 02:44:55 +0200
Subject: [PATCH 348/475] update again, latest fixes for aarch64

---
 docker/scripts/install-dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index c6d650a..29588d5 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -36,7 +36,7 @@ cmakebuild itpp bb5c7e95f40e8fdb5c3f3d01a84bcbaf76f3676d
 
 git clone https://github.com/jketterl/csdr.git
 cd csdr
-git checkout 3ae997c3508b48b9a854c48a628f714eb30a9275
+git checkout 69c4d74a5b8207b0edf4a36a5a0795fbee39281f
 autoreconf -i
 ./configure
 make

From f1d9a4a28c6c730efc80f1458da94d1e508e1873 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 24 May 2020 03:04:20 +0200
Subject: [PATCH 349/475] switch to shift_addfast_cc for better performance

---
 csdr/csdr.py             | 4 ++--
 owrx/source/resampler.py | 8 +-------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 9d23978..260da7a 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -241,7 +241,7 @@ class dsp(object):
             if self.fft_compression == "adpcm":
                 chain += ["csdr compress_fft_adpcm_f_u8 {fft_size}"]
             return chain
-        chain += ["csdr shift_addition_cc --fifo {shift_pipe}"]
+        chain += ["csdr shift_addfast_cc --fifo {shift_pipe}"]
         if self.decimation > 1:
             chain += ["csdr fir_decimate_cc {decimation} {ddc_transition_bw} HAMMING"]
         chain += ["csdr bandpass_fir_fft_cc --fifo {bpf_pipe} {bpf_transition_bw} HAMMING"]
@@ -331,7 +331,7 @@ class dsp(object):
             return chain
         elif which == "bpsk31" or which == "bpsk63":
             return chain + [
-                "csdr shift_addition_cc --fifo {secondary_shift_pipe}",
+                "csdr shift_addfast_cc --fifo {secondary_shift_pipe}",
                 "csdr bandpass_fir_fft_cc -{secondary_bpf_cutoff} {secondary_bpf_cutoff} {secondary_bpf_cutoff}",
                 "csdr simple_agc_cc 0.001 0.5",
                 "csdr timing_recovery_cc GARDNER {secondary_samples_per_bits} 0.5 2 --add_q",
diff --git a/owrx/source/resampler.py b/owrx/source/resampler.py
index 6afe50c..1f6a4e1 100644
--- a/owrx/source/resampler.py
+++ b/owrx/source/resampler.py
@@ -1,10 +1,4 @@
 from .direct import DirectSource
-from . import SdrSource
-import subprocess
-import threading
-import os
-import socket
-import time
 
 import logging
 
@@ -29,7 +23,7 @@ class Resampler(DirectSource):
     def getCommand(self):
         return [
             "nc -v 127.0.0.1 {nc_port}".format(nc_port=self.sdr.getPort()),
-            "csdr shift_addition_cc {shift}".format(shift=self.shift),
+            "csdr shift_addfast_cc {shift}".format(shift=self.shift),
             "csdr fir_decimate_cc {decimation} {ddc_transition_bw} HAMMING".format(
                 decimation=self.decimation, ddc_transition_bw=self.transition_bw
             ),

From a1da59121849a741e817dd46194a1ebd818799bd Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 24 May 2020 13:50:28 +0200
Subject: [PATCH 350/475] rtl_connector optimization

---
 docker/scripts/install-connectors.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh
index ffd7a97..3f5861b 100755
--- a/docker/scripts/install-connectors.sh
+++ b/docker/scripts/install-connectors.sh
@@ -24,7 +24,7 @@ apt-get update
 apt-get -y install --no-install-recommends $BUILD_PACKAGES
 
 git clone https://github.com/jketterl/owrx_connector.git
-cmakebuild owrx_connector dee422ec6bf59e2ed8dc636e92dafaea5d337723
+cmakebuild owrx_connector 4cb8d14fbe387b1569a5b635d7819266ce1dd42b
 
 apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean

From 3a8256e3bcd5956200df2a528400e4dc0128cb58 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 24 May 2020 14:43:25 +0200
Subject: [PATCH 351/475] update to the sdrplay repository version

---
 owrx/feature.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/owrx/feature.py b/owrx/feature.py
index ae29ced..06eb4f5 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -272,9 +272,9 @@ class FeatureDetector(object):
         """
         The SoapySDR module for sdrplay devices is required for interfacing with SDRPlay devices (RSP1*, RSP2*, RSPDuo)
 
-        You can get it [here](https://github.com/pothosware/SoapySDRPlay/wiki).
+        You can get it [here](https://github.com/SDRplay/SoapySDRPlay).
         """
-        return self._has_soapy_driver("sdrplay") or self._has_soapy_driver("sdrPlay")
+        return self._has_soapy_driver("sdrplay")
 
     def has_soapy_airspy(self):
         """

From d2be712de86ec8479e7f80a1409d3768d8398c64 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 24 May 2020 14:46:17 +0200
Subject: [PATCH 352/475] include sdrplay lib from sdrplay repo

---
 docker/scripts/install-dependencies-sdrplay.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/scripts/install-dependencies-sdrplay.sh b/docker/scripts/install-dependencies-sdrplay.sh
index 8e0a0cd..53cb5ff 100755
--- a/docker/scripts/install-dependencies-sdrplay.sh
+++ b/docker/scripts/install-dependencies-sdrplay.sh
@@ -48,8 +48,8 @@ cd ..
 rm -rf sdrplay
 rm $BINARY
 
-git clone https://github.com/fventuri/SoapySDRPlay.git
-cmakebuild SoapySDRPlay 9746de21d5a3778c444cc5e70da2a61c27cb614a
+git clone https://github.com/SDRplay/SoapySDRPlay.git
+cmakebuild SoapySDRPlay 1c2728a04db5edf8154d02f5cca87e655152d7c1
 
 SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean

From 048210d7da746b07b088a908461b95b012ff419a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 24 May 2020 14:59:11 +0200
Subject: [PATCH 353/475] update to latest versions from the homepage

---
 docker/scripts/install-dependencies-sdrplay.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/scripts/install-dependencies-sdrplay.sh b/docker/scripts/install-dependencies-sdrplay.sh
index 53cb5ff..151c031 100755
--- a/docker/scripts/install-dependencies-sdrplay.sh
+++ b/docker/scripts/install-dependencies-sdrplay.sh
@@ -28,13 +28,13 @@ ARCH=$(uname -m)
 
 case $ARCH in
   x86_64)
-    BINARY=SDRplay_RSP_API-Linux-3.06.1.run
+    BINARY=SDRplay_RSP_API-Linux-3.07.1.run
     ;;
   armv*)
-    BINARY=SDRplay_RSP_API-ARM32-3.06.1.run
+    BINARY=SDRplay_RSP_API-ARM32-3.07.2.run
     ;;
   aarch64)
-    BINARY=SDRplay_RSP_API-ARM64-3.06.1.run
+    BINARY=SDRplay_RSP_API-ARM64-3.07.1.run
     ;;
 esac
 

From 6c307d885ff9ca44b4f91eccfe71ac55d926c928 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 24 May 2020 16:00:36 +0200
Subject: [PATCH 354/475] integrate s6 service layer for sdrplay

---
 docker/Dockerfiles/Dockerfile-base                       | 9 +++++++--
 docker/Dockerfiles/Dockerfile-full                       | 4 +++-
 docker/Dockerfiles/Dockerfile-sdrplay                    | 4 +++-
 docker/{scripts => files/js8call}/js8call-hamlib.patch   | 0
 .../{scripts => files/sdrplay}/install-lib.aarch64.patch | 0
 .../{scripts => files/sdrplay}/install-lib.armv7l.patch  | 0
 .../{scripts => files/sdrplay}/install-lib.x86_64.patch  | 0
 docker/files/services/openwebrx/run                      | 2 ++
 docker/files/services/sdrplay/run                        | 2 ++
 9 files changed, 17 insertions(+), 4 deletions(-)
 rename docker/{scripts => files/js8call}/js8call-hamlib.patch (100%)
 rename docker/{scripts => files/sdrplay}/install-lib.aarch64.patch (100%)
 rename docker/{scripts => files/sdrplay}/install-lib.armv7l.patch (100%)
 rename docker/{scripts => files/sdrplay}/install-lib.x86_64.patch (100%)
 create mode 100755 docker/files/services/openwebrx/run
 create mode 100755 docker/files/services/sdrplay/run

diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index 2ac1cd4..3797cc7 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -1,6 +1,10 @@
 FROM debian:buster-slim
 
-ADD docker/scripts/js8call-hamlib.patch /
+ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz /tmp/
+RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C /
+ENTRYPOINT ["/init"]
+
+ADD docker/files/js8call/js8call-hamlib.patch /
 ADD docker/scripts/install-dependencies.sh /
 RUN /install-dependencies.sh && \
     rm /install-dependencies.sh
@@ -9,5 +13,6 @@ WORKDIR /opt/openwebrx
 
 VOLUME /etc/openwebrx
 
-ENTRYPOINT [ "/opt/openwebrx/docker/scripts/run.sh" ]
+ADD docker/files/services/openwebrx /etc/services.d/openwebrx
+
 EXPOSE 8073
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index 9571428..fbb3bd7 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -2,7 +2,7 @@ ARG ARCHTAG
 FROM openwebrx-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-*.sh /
-ADD docker/scripts/install-lib.*.patch /
+ADD docker/files/sdrplay/install-lib.*.patch /
 
 RUN /install-dependencies-rtlsdr.sh &&\
     /install-dependencies-hackrf.sh &&\
@@ -21,4 +21,6 @@ ADD docker/scripts/install-connectors.sh /
 RUN /install-connectors.sh &&\
     rm /install-connectors.sh
 
+ADD docker/files/services/sdrplay /etc/services.d/sdrplay
+
 ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-sdrplay b/docker/Dockerfiles/Dockerfile-sdrplay
index eb4cf2c..ec649f2 100644
--- a/docker/Dockerfiles/Dockerfile-sdrplay
+++ b/docker/Dockerfiles/Dockerfile-sdrplay
@@ -2,9 +2,11 @@ ARG ARCHTAG
 FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-sdrplay.sh /
-ADD docker/scripts/install-lib.*.patch /
+ADD docker/files/sdrplay/install-lib.*.patch /
 RUN /install-dependencies-sdrplay.sh &&\
     rm /install-dependencies-sdrplay.sh &&\
     rm /install-lib.*.patch
 
+ADD docker/files/services/sdrplay /etc/services.d/sdrplay
+
 ADD . /opt/openwebrx
diff --git a/docker/scripts/js8call-hamlib.patch b/docker/files/js8call/js8call-hamlib.patch
similarity index 100%
rename from docker/scripts/js8call-hamlib.patch
rename to docker/files/js8call/js8call-hamlib.patch
diff --git a/docker/scripts/install-lib.aarch64.patch b/docker/files/sdrplay/install-lib.aarch64.patch
similarity index 100%
rename from docker/scripts/install-lib.aarch64.patch
rename to docker/files/sdrplay/install-lib.aarch64.patch
diff --git a/docker/scripts/install-lib.armv7l.patch b/docker/files/sdrplay/install-lib.armv7l.patch
similarity index 100%
rename from docker/scripts/install-lib.armv7l.patch
rename to docker/files/sdrplay/install-lib.armv7l.patch
diff --git a/docker/scripts/install-lib.x86_64.patch b/docker/files/sdrplay/install-lib.x86_64.patch
similarity index 100%
rename from docker/scripts/install-lib.x86_64.patch
rename to docker/files/sdrplay/install-lib.x86_64.patch
diff --git a/docker/files/services/openwebrx/run b/docker/files/services/openwebrx/run
new file mode 100755
index 0000000..2c2b7fd
--- /dev/null
+++ b/docker/files/services/openwebrx/run
@@ -0,0 +1,2 @@
+#!/usr/bin/execlineb -P
+/opt/openwebrx/docker/scripts/run.sh
\ No newline at end of file
diff --git a/docker/files/services/sdrplay/run b/docker/files/services/sdrplay/run
new file mode 100755
index 0000000..0f31c4c
--- /dev/null
+++ b/docker/files/services/sdrplay/run
@@ -0,0 +1,2 @@
+#!/usr/bin/execlineb -P
+/usr/local/bin/sdrplay_apiService
\ No newline at end of file

From a982c86794fa8e503cc819fd983a0c93dce402ec Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 24 May 2020 17:28:48 +0200
Subject: [PATCH 355/475] update sdrplay patches; fix sdrplay service

---
 docker/Dockerfiles/Dockerfile-base            |  2 +-
 .../files/sdrplay/install-lib.aarch64.patch   | 30 +++--------
 docker/files/sdrplay/install-lib.armv7l.patch | 51 +++++++++----------
 docker/files/sdrplay/install-lib.x86_64.patch | 21 +++++++-
 docker/files/services/openwebrx/run           |  2 -
 .../scripts/install-dependencies-sdrplay.sh   |  4 +-
 6 files changed, 53 insertions(+), 57 deletions(-)
 delete mode 100755 docker/files/services/openwebrx/run

diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index 3797cc7..654bf02 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -13,6 +13,6 @@ WORKDIR /opt/openwebrx
 
 VOLUME /etc/openwebrx
 
-ADD docker/files/services/openwebrx /etc/services.d/openwebrx
+CMD /opt/openwebrx/docker/scripts/run.sh
 
 EXPOSE 8073
diff --git a/docker/files/sdrplay/install-lib.aarch64.patch b/docker/files/sdrplay/install-lib.aarch64.patch
index 6f1323d..1f3dc57 100644
--- a/docker/files/sdrplay/install-lib.aarch64.patch
+++ b/docker/files/sdrplay/install-lib.aarch64.patch
@@ -1,11 +1,12 @@
---- sdrplay/install_lib.sh
-+++ sdrplay/install_lib_patched.sh
-@@ -4,20 +4,7 @@
+diff -ur sdrplay-orig/install_lib.sh sdrplay/install_lib.sh
+--- sdrplay-orig/install_lib.sh	2020-05-24 14:30:06.022483867 +0000
++++ sdrplay/install_lib.sh	2020-05-24 14:30:49.093435726 +0000
+@@ -4,19 +4,6 @@
  export MAJVERS="3"
  
  echo "Installing SDRplay RSP API library ${VERS}..."
 -read -p "Press RETURN to view the license agreement" ret
- 
+-
 -more sdrplay_license.txt
 -
 -while true; do
@@ -17,25 +18,6 @@
 -        * ) echo "Please answer y or n";;
 -    esac
 -done
--
+ 
  export ARCH=`uname -m`
  
- echo "Architecture: ${ARCH}"
-@@ -46,17 +33,6 @@
- 	echo "ERROR: udev rules directory not found, add udev support and run the"
- 	echo "installer again. udev support can be added by running..."
- 	echo "sudo apt-get install libudev-dev"
--	echo " "
--	exit 1
--fi
--
--if /sbin/ldconfig -p | /bin/fgrep -q libusb-1.0; then
--	echo "Libusb found, continuing..."
--else
--	echo " "
--	echo "ERROR: Libusb cannot be found. Please install libusb and then run"
--	echo "the installer again. Libusb can be installed by running..."
--    echo "sudo apt-get install libusb-1.0.0-dev"
- 	echo " "
- 	exit 1
- fi
diff --git a/docker/files/sdrplay/install-lib.armv7l.patch b/docker/files/sdrplay/install-lib.armv7l.patch
index 775ef89..22a78f6 100644
--- a/docker/files/sdrplay/install-lib.armv7l.patch
+++ b/docker/files/sdrplay/install-lib.armv7l.patch
@@ -1,11 +1,12 @@
---- sdrplay/install_lib.sh
-+++ sdrplay/install_lib_patched.sh
-@@ -4,20 +4,7 @@
- export MAJVERS="3"
+diff -ur sdrplay-orig/install_lib.sh sdrplay/install_lib.sh
+--- sdrplay-orig/install_lib.sh	2020-05-24 14:13:04.561271707 +0000
++++ sdrplay/install_lib.sh	2020-05-24 14:16:20.068329040 +0000
+@@ -4,19 +4,6 @@
+ MAJVERS="3"
  
  echo "Installing SDRplay RSP API library ${VERS}..."
 -read -p "Press RETURN to view the license agreement" ret
- 
+-
 -more sdrplay_license.txt
 -
 -while true; do
@@ -17,25 +18,23 @@
 -        * ) echo "Please answer y or n";;
 -    esac
 -done
--
- export ARCH=`uname -m`
  
- echo "Architecture: ${ARCH}"
-@@ -44,17 +31,6 @@
- 	echo "ERROR: udev rules directory not found, add udev support and run the"
- 	echo "installer again. udev support can be added by running..."
- 	echo "sudo apt-get install libudev-dev"
--	echo " "
--	exit 1
--fi
--
--if /sbin/ldconfig -p | /bin/fgrep -q libusb-1.0; then
--	echo "Libusb found, continuing..."
--else
--	echo " "
--	echo "ERROR: Libusb cannot be found. Please install libusb and then run"
--	echo "the installer again. Libusb can be installed by running..."
--    echo "sudo apt-get install libusb-1.0.0-dev"
- 	echo " "
- 	exit 1
- fi
+ ARCH=`uname -m`
+ 
+@@ -141,16 +128,6 @@
+ echo "SDRplay API ${VERS} Installation Finished"
+ echo " "
+ 
+-while true; do
+-    echo "Would you like to add SDRplay USB IDs to the local database for easier
+-"
+-    read -p "identification in applications such as lsusb? [y/n] " yn
+-    case $yn in
+-        [Yy]* ) break;;
+-        [Nn]* ) exit;;
+-        * ) echo "Please answer y or n";;
+-    esac
+-done
+ sudo cp scripts/sdrplay_usbids.sh ${INSTALLBINDIR}/.
+ sudo chmod 755 ${INSTALLBINDIR}/sdrplay_usbids.sh
+ sudo cp scripts/sdrplay_ids.txt ${INSTALLBINDIR}/.
diff --git a/docker/files/sdrplay/install-lib.x86_64.patch b/docker/files/sdrplay/install-lib.x86_64.patch
index 0666bf4..d66023b 100644
--- a/docker/files/sdrplay/install-lib.x86_64.patch
+++ b/docker/files/sdrplay/install-lib.x86_64.patch
@@ -1,5 +1,6 @@
---- sdrplay/install_lib.sh
-+++ sdrplay/install_lib_patched.sh
+diff -ur sdrplay-orig/install_lib.sh sdrplay/install_lib.sh
+--- sdrplay-orig/install_lib.sh	2020-05-24 13:56:56.622000041 +0000
++++ sdrplay/install_lib.sh	2020-05-24 13:58:51.837801559 +0000
 @@ -4,19 +4,6 @@
  MAJVERS="3"
  
@@ -20,3 +21,19 @@
  
  ARCH=`uname -m`
  OSDIST="Unknown"
+@@ -157,15 +144,6 @@
+ echo " "
+ echo "SDRplay API ${VERS} Installation Finished"
+ echo " "
+-while true; do
+-    echo "Would you like to add SDRplay USB IDs to the local database for easier"
+-    read -p "identification in applications such as lsusb? [y/n] " yn
+-    case $yn in
+-        [Yy]* ) break;;
+-        [Nn]* ) exit;;
+-        * ) echo "Please answer y or n";;
+-    esac
+-done
+ sudo cp scripts/sdrplay_usbids.sh ${INSTALLBINDIR}/.
+ sudo chmod 755 ${INSTALLBINDIR}/sdrplay_usbids.sh
+ sudo cp scripts/sdrplay_ids.txt ${INSTALLBINDIR}/.
diff --git a/docker/files/services/openwebrx/run b/docker/files/services/openwebrx/run
deleted file mode 100755
index 2c2b7fd..0000000
--- a/docker/files/services/openwebrx/run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/execlineb -P
-/opt/openwebrx/docker/scripts/run.sh
\ No newline at end of file
diff --git a/docker/scripts/install-dependencies-sdrplay.sh b/docker/scripts/install-dependencies-sdrplay.sh
index 151c031..d18fcc0 100755
--- a/docker/scripts/install-dependencies-sdrplay.sh
+++ b/docker/scripts/install-dependencies-sdrplay.sh
@@ -18,8 +18,8 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="libusb-1.0.0 libudev1"
-BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-dev"
+STATIC_PACKAGES="libusb-1.0.0 udev"
+BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev"
 
 apt-get update
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES

From d64f08490abf44f9ab57f8b823febf33a253b55a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 24 May 2020 18:00:14 +0200
Subject: [PATCH 356/475] use the old syntax

---
 docker/Dockerfiles/Dockerfile-base | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index 654bf02..66642b0 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -13,6 +13,6 @@ WORKDIR /opt/openwebrx
 
 VOLUME /etc/openwebrx
 
-CMD /opt/openwebrx/docker/scripts/run.sh
+CMD [ "/opt/openwebrx/docker/scripts/run.sh" ]
 
 EXPOSE 8073

From d9db693aecf4e9168773bc30c500c09cfb084405 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 24 May 2020 18:02:45 +0200
Subject: [PATCH 357/475] add changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81bb8c7..6bf8754 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - Improve receiver load time by concatenating javascript assets
 - Docker images migrated to Debian slim images; This was necessary to allow the use of function multiversioning in
   csdr and owrx_connector to allow the images to run on a wider range of CPUs
+- Docker containers have been updated to include the SDRplay driver version 3 
 
 **0.18.0**
 - Support for SoapyRemote

From 305adc94facf97a0339b30d707e8b1f85d152ff2 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 24 May 2020 21:45:08 +0200
Subject: [PATCH 358/475] install s6 overlay for the right platform

---
 docker/Dockerfiles/Dockerfile-base |  5 +++--
 docker/scripts/install-s6.sh       | 29 +++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100755 docker/scripts/install-s6.sh

diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index 66642b0..d3d6f21 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -1,7 +1,8 @@
 FROM debian:buster-slim
 
-ADD https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-amd64.tar.gz /tmp/
-RUN tar xzf /tmp/s6-overlay-amd64.tar.gz -C /
+ADD docker/scripts/install-s6.sh /
+RUN /install-s6.sh && \
+    rm /install-s6.sh
 ENTRYPOINT ["/init"]
 
 ADD docker/files/js8call/js8call-hamlib.patch /
diff --git a/docker/scripts/install-s6.sh b/docker/scripts/install-s6.sh
new file mode 100755
index 0000000..a3551e2
--- /dev/null
+++ b/docker/scripts/install-s6.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+set -eux pipefail
+
+BUILD_PACKAGES="wget ca-certificates"
+
+apt-get update
+apt-get -y install --no-install-recommends $BUILD_PACKAGES
+
+case `uname -m` in
+    arm*)
+        PLATFORM=armhf
+        ;;
+    aarch64*)
+        PLATFORM=aarch64
+        ;;
+    x86_64*)
+        PLATFORM=amd64
+        ;;
+esac
+
+pushd /tmp
+wget https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-${PLATFORM}.tar.gz
+tar xzf s6-overlay-${PLATFORM}.tar.gz -C /
+rm s6-overlay-${PLATFORM}.tar.gz
+popd
+
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*

From d24abd436e9b29e6558e99eb65ac564fce2e2663 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 25 May 2020 20:10:03 +0200
Subject: [PATCH 359/475] install s6 overlay during normal dependency setup

---
 docker/Dockerfiles/Dockerfile-base     |  7 ++-----
 docker/scripts/install-dependencies.sh | 18 ++++++++++++++++
 docker/scripts/install-s6.sh           | 29 --------------------------
 3 files changed, 20 insertions(+), 34 deletions(-)
 delete mode 100755 docker/scripts/install-s6.sh

diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index d3d6f21..c86d464 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -1,15 +1,12 @@
 FROM debian:buster-slim
 
-ADD docker/scripts/install-s6.sh /
-RUN /install-s6.sh && \
-    rm /install-s6.sh
-ENTRYPOINT ["/init"]
-
 ADD docker/files/js8call/js8call-hamlib.patch /
 ADD docker/scripts/install-dependencies.sh /
 RUN /install-dependencies.sh && \
     rm /install-dependencies.sh
 
+ENTRYPOINT ["/init"]
+
 WORKDIR /opt/openwebrx
 
 VOLUME /etc/openwebrx
diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index 29588d5..a5684d8 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -24,6 +24,24 @@ BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapa
 apt-get update
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
+case `uname -m` in
+    arm*)
+        PLATFORM=armhf
+        ;;
+    aarch64*)
+        PLATFORM=aarch64
+        ;;
+    x86_64*)
+        PLATFORM=amd64
+        ;;
+esac
+
+pushd /tmp
+wget https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-${PLATFORM}.tar.gz
+tar xzf s6-overlay-${PLATFORM}.tar.gz -C /
+rm s6-overlay-${PLATFORM}.tar.gz
+popd
+
 git clone https://github.com/jketterl/js8py.git
 pushd js8py
 git checkout 888e62be375316882ad2b2ac8e396c3bf857b6fc
diff --git a/docker/scripts/install-s6.sh b/docker/scripts/install-s6.sh
deleted file mode 100755
index a3551e2..0000000
--- a/docker/scripts/install-s6.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-set -eux pipefail
-
-BUILD_PACKAGES="wget ca-certificates"
-
-apt-get update
-apt-get -y install --no-install-recommends $BUILD_PACKAGES
-
-case `uname -m` in
-    arm*)
-        PLATFORM=armhf
-        ;;
-    aarch64*)
-        PLATFORM=aarch64
-        ;;
-    x86_64*)
-        PLATFORM=amd64
-        ;;
-esac
-
-pushd /tmp
-wget https://github.com/just-containers/s6-overlay/releases/download/v1.21.8.0/s6-overlay-${PLATFORM}.tar.gz
-tar xzf s6-overlay-${PLATFORM}.tar.gz -C /
-rm s6-overlay-${PLATFORM}.tar.gz
-popd
-
-apt-get -y purge --autoremove $BUILD_PACKAGES
-apt-get clean
-rm -rf /var/lib/apt/lists/*

From d2a4f2bc464f81c3109e5d6ee17ada6063ea81d8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 25 May 2020 20:30:53 +0200
Subject: [PATCH 360/475] patch wsjt-x to use packaged hamlib, too

---
 docker/Dockerfiles/Dockerfile-base    |  4 ++-
 docker/files/wsjtx/wsjtx-hamlib.patch | 43 +++++++++++++++++++++++
 docker/files/wsjtx/wsjtx.patch        | 49 +++++++++++++++++++++++++++
 3 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 docker/files/wsjtx/wsjtx-hamlib.patch
 create mode 100644 docker/files/wsjtx/wsjtx.patch

diff --git a/docker/Dockerfiles/Dockerfile-base b/docker/Dockerfiles/Dockerfile-base
index c86d464..c044fd7 100644
--- a/docker/Dockerfiles/Dockerfile-base
+++ b/docker/Dockerfiles/Dockerfile-base
@@ -1,9 +1,11 @@
 FROM debian:buster-slim
 
 ADD docker/files/js8call/js8call-hamlib.patch /
+ADD docker/files/wsjtx/*.patch /
 ADD docker/scripts/install-dependencies.sh /
 RUN /install-dependencies.sh && \
-    rm /install-dependencies.sh
+    rm /install-dependencies.sh && \
+    rm /*.patch
 
 ENTRYPOINT ["/init"]
 
diff --git a/docker/files/wsjtx/wsjtx-hamlib.patch b/docker/files/wsjtx/wsjtx-hamlib.patch
new file mode 100644
index 0000000..84f7861
--- /dev/null
+++ b/docker/files/wsjtx/wsjtx-hamlib.patch
@@ -0,0 +1,43 @@
+--- CMakeLists.txt	2020-05-25 19:26:41.423517236 +0200
++++ CMakeLists.txt	2020-05-25 19:11:36.116236231 +0200
+@@ -79,24 +79,6 @@
+ 
+ include (ExternalProject)
+ 
+-
+-#
+-# build and install hamlib locally so it can be referenced by the
+-# WSJT-X build
+-#
+-ExternalProject_Add (hamlib
+-  GIT_REPOSITORY ${hamlib_repo}
+-  GIT_TAG ${hamlib_TAG}
+-  URL ${CMAKE_CURRENT_SOURCE_DIR}/src/hamlib.tgz
+-  URL_HASH MD5=${hamlib_md5sum}
+-  UPDATE_COMMAND ./bootstrap
+-  PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 -N < ${CMAKE_CURRENT_SOURCE_DIR}/hamlib.patch
+-  CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-shared --enable-static --without-cxx-binding ${EXTRA_FLAGS} # LIBUSB_LIBS=${USB_LIBRARY}
+-  BUILD_COMMAND $(MAKE) all V=1 # $(MAKE) is ExternalProject_Add() magic to do recursive make
+-  INSTALL_COMMAND $(MAKE) install-strip V=1 DESTDIR=""
+-  STEP_TARGETS update install
+-  )
+-
+ #
+ # custom target to make a hamlib source tarball
+ #
+@@ -128,7 +110,6 @@
+ # build and optionally install WSJT-X using the hamlib package built
+ # above
+ #
+-ExternalProject_Get_Property (hamlib INSTALL_DIR)
+ ExternalProject_Add (wsjtx
+   GIT_REPOSITORY ${wsjtx_repo}
+   GIT_TAG ${WSJTX_TAG}
+@@ -152,7 +133,6 @@
+   DEPENDEES build
+   )
+ 
+-set_target_properties (hamlib PROPERTIES EXCLUDE_FROM_ALL 1)
+ set_target_properties (wsjtx PROPERTIES EXCLUDE_FROM_ALL 1)
+ 
+ add_dependencies (wsjtx-configure hamlib-install)
diff --git a/docker/files/wsjtx/wsjtx.patch b/docker/files/wsjtx/wsjtx.patch
new file mode 100644
index 0000000..bde05e4
--- /dev/null
+++ b/docker/files/wsjtx/wsjtx.patch
@@ -0,0 +1,49 @@
+diff -ur js8call-2.1.1-orig/CMake/Modules/Findhamlib.cmake js8call-2.1.1/CMake/Modules/Findhamlib.cmake
+--- js8call-2.1.1-orig/CMake/Modules/Findhamlib.cmake	2020-05-23 15:38:20.730349612 +0000
++++ js8call-2.1.1/CMake/Modules/Findhamlib.cmake	2020-05-23 15:39:28.829772207 +0000
+@@ -85,4 +85,4 @@
+ # Handle the  QUIETLY and REQUIRED  arguments and set  HAMLIB_FOUND to
+ # TRUE if all listed variables are TRUE
+ include (FindPackageHandleStandardArgs)
+-find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES hamlib_LIBRARY_DIRS)
++find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES)
+diff -ur js8call-2.1.1-orig/CMakeLists.txt js8call-2.1.1/CMakeLists.txt
+--- js8call-2.1.1-orig/CMakeLists.txt	2020-05-23 15:38:20.730349612 +0000
++++ js8call-2.1.1/CMakeLists.txt	2020-05-23 15:52:46.103389553 +0000
+@@ -869,7 +869,7 @@
+ #
+ # libhamlib setup
+ #
+-set (hamlib_STATIC 1)
++set (hamlib_STATIC 0)
+ find_package (hamlib 3 REQUIRED)
+ find_program (RIGCTL_EXE rigctl)
+ find_program (RIGCTLD_EXE rigctld)
+@@ -1471,27 +1404,6 @@
+   )
+ endif(WSJT_BUILD_UTILS)
+
+-install (PROGRAMS
+-  ${RIGCTL_EXE}
+-  DESTINATION ${CMAKE_INSTALL_BINDIR}
+-  #COMPONENT runtime
+-  RENAME rigctl-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
+-  )
+-
+-install (PROGRAMS
+-  ${RIGCTLD_EXE}
+-  DESTINATION ${CMAKE_INSTALL_BINDIR}
+-  #COMPONENT runtime
+-  RENAME rigctld-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
+-  )
+-
+-install (PROGRAMS
+-  ${RIGCTLCOM_EXE}
+-  DESTINATION ${CMAKE_INSTALL_BINDIR}
+-  #COMPONENT runtime
+-  RENAME rigctlcom-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
+-  )
+-
+ install (FILES
+   README
+   COPYING

From 27d6802dfc9636cf079a4baae9de8e55710df9d5 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 25 May 2020 20:31:42 +0200
Subject: [PATCH 361/475] include wsjt-x patches

---
 docker/scripts/install-dependencies.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index a5684d8..a801ad6 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -86,6 +86,8 @@ WSJT_DIR=wsjtx-2.1.2
 WSJT_TGZ=${WSJT_DIR}.tgz
 wget http://physics.princeton.edu/pulsar/k1jt/${WSJT_TGZ}
 tar xfz ${WSJT_TGZ}
+patch -Np0 -d ${WSJT_DIR} < /wsjtx-hamlib.patch
+mv /wsjtx.patch ${WSJT_DIR}
 cmakebuild ${WSJT_DIR}
 rm ${WSJT_TGZ}
 

From 564c1e26b6c9d46739c9f922bba62d934fd52010 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 25 May 2020 20:38:42 +0200
Subject: [PATCH 362/475] let's try auto-apt-proxy to cut down build times

---
 docker/scripts/install-dependencies.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index a801ad6..206a5e0 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -22,6 +22,7 @@ STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libs
 BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev autoconf automake libtool texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev pkg-config libudev-dev libhamlib-dev patch xsltproc"
 
 apt-get update
+apt-get -y install auto-apt-proxy
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 case `uname -m` in

From e0648d63add24b9bcfc7fcea79c506fc6161c963 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 28 May 2020 00:45:27 +0200
Subject: [PATCH 363/475] reduce image size by excluding wsjt-x and js8call
 frontend binaries

---
 docker/files/js8call/js8call-hamlib.patch | 127 +++++++++++++++++++--
 docker/files/wsjtx/wsjtx.patch            | 129 ++++++++++++++++++++--
 docker/scripts/install-dependencies.sh    |   2 +-
 3 files changed, 236 insertions(+), 22 deletions(-)

diff --git a/docker/files/js8call/js8call-hamlib.patch b/docker/files/js8call/js8call-hamlib.patch
index 68c1e70..2bc6141 100644
--- a/docker/files/js8call/js8call-hamlib.patch
+++ b/docker/files/js8call/js8call-hamlib.patch
@@ -1,15 +1,15 @@
-diff -ur js8call-2.1.1-orig/CMake/Modules/Findhamlib.cmake js8call-2.1.1/CMake/Modules/Findhamlib.cmake
---- js8call-2.1.1-orig/CMake/Modules/Findhamlib.cmake	2020-05-23 15:38:20.730349612 +0000
-+++ js8call-2.1.1/CMake/Modules/Findhamlib.cmake	2020-05-23 15:39:28.829772207 +0000
+diff -ur js8call-orig/CMake/Modules/Findhamlib.cmake js8call/CMake/Modules/Findhamlib.cmake
+--- js8call-orig/CMake/Modules/Findhamlib.cmake	2020-05-28 00:10:13.386429366 +0200
++++ js8call/CMake/Modules/Findhamlib.cmake	2020-05-28 00:10:34.339623106 +0200
 @@ -78,4 +78,4 @@
  # Handle the  QUIETLY and REQUIRED  arguments and set  HAMLIB_FOUND to
  # TRUE if all listed variables are TRUE
  include (FindPackageHandleStandardArgs)
 -find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES hamlib_LIBRARY_DIRS)
 +find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES)
-diff -ur js8call-2.1.1-orig/CMakeLists.txt js8call-2.1.1/CMakeLists.txt
---- js8call-2.1.1-orig/CMakeLists.txt	2020-05-23 15:38:20.730349612 +0000
-+++ js8call-2.1.1/CMakeLists.txt	2020-05-23 15:52:46.103389553 +0000
+diff -ur js8call-orig/CMakeLists.txt js8call/CMakeLists.txt
+--- js8call-orig/CMakeLists.txt	2020-05-28 00:10:13.393095987 +0200
++++ js8call/CMakeLists.txt	2020-05-28 00:12:09.925653037 +0200
 @@ -683,7 +683,7 @@
  #
  # libhamlib setup
@@ -19,7 +19,72 @@ diff -ur js8call-2.1.1-orig/CMakeLists.txt js8call-2.1.1/CMakeLists.txt
  find_package (hamlib 3 REQUIRED)
  find_program (RIGCTL_EXE rigctl)
  find_program (RIGCTLD_EXE rigctld)
-@@ -1106,20 +1106,6 @@
+@@ -1033,55 +1033,6 @@
+   target_link_libraries (js8 wsjt_fort wsjt_cxx Qt5::Core)
+ endif (${OPENMP_FOUND} OR APPLE)
+ 
+-# build the main application
+-add_executable (js8call MACOSX_BUNDLE
+-  ${sqlite3_CSRCS}
+-  ${wsjtx_CXXSRCS}
+-  ${wsjtx_GENUISRCS}
+-  wsjtx.rc
+-  ${WSJTX_ICON_FILE}
+-  ${wsjtx_RESOURCES_RCC}
+-  )
+-
+-if (WSJT_CREATE_WINMAIN)
+-  set_target_properties (js8call PROPERTIES WIN32_EXECUTABLE ON)
+-endif (WSJT_CREATE_WINMAIN)
+-
+-set_target_properties (js8call PROPERTIES
+-  MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Darwin/Info.plist.in"
+-  MACOSX_BUNDLE_INFO_STRING "${WSJTX_DESCRIPTION_SUMMARY}"
+-  MACOSX_BUNDLE_ICON_FILE "${WSJTX_ICON_FILE}"
+-  MACOSX_BUNDLE_BUNDLE_VERSION ${wsjtx_VERSION}
+-  MACOSX_BUNDLE_SHORT_VERSION_STRING "v${wsjtx_VERSION}"
+-  MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${wsjtx_VERSION}"
+-  MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"
+-  MACOSX_BUNDLE_BUNDLE_EXECUTABLE_NAME "${PROJECT_NAME}"
+-  MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT}"
+-  MACOSX_BUNDLE_GUI_IDENTIFIER "org.kn4crd.js8call"
+-  )
+-
+-target_include_directories (js8call PRIVATE ${FFTW3_INCLUDE_DIRS})
+-if (APPLE)
+-  target_link_libraries (js8call wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+-else ()
+-  target_link_libraries (js8call wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+-  if (OpenMP_C_FLAGS)
+-    set_target_properties (js8call PROPERTIES
+-      COMPILE_FLAGS "${OpenMP_C_FLAGS}"
+-      LINK_FLAGS "${OpenMP_C_FLAGS}"
+-      )
+-  endif ()
+-  set_target_properties (js8call PROPERTIES
+-    Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp
+-    )
+-  if (WIN32)
+-    set_target_properties (js8call PROPERTIES
+-      LINK_FLAGS -Wl,--stack,16777216
+-      )
+-  endif ()
+-endif ()
+-qt5_use_modules (js8call SerialPort) # not sure why the interface link library syntax above doesn't work
+-
+ # if (UNIX)
+ #   if (NOT WSJT_SKIP_MANPAGES)
+ #     add_subdirectory (manpages)
+@@ -1097,38 +1048,10 @@
+ #
+ # installation
+ #
+-install (TARGETS js8call
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+-  BUNDLE DESTINATION . COMPONENT runtime
+-  )
+-
+ install (TARGETS js8 RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
    BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
    )
  
@@ -36,8 +101,50 @@ diff -ur js8call-2.1.1-orig/CMakeLists.txt js8call-2.1.1/CMakeLists.txt
 -  #COMPONENT runtime
 -  RENAME rigctld-local${CMAKE_EXECUTABLE_SUFFIX}
 -  )
+-
+-install (FILES
+-  README
+-  COPYING
+-  INSTALL
+-  INSTALL-WSJTX
+-  DESTINATION ${CMAKE_INSTALL_DOCDIR}
+-  #COMPONENT runtime
+-  )
 -
  install (FILES
-   README
-   COPYING
-Only in js8call-2.1.1/: hamlib.patch
+   contrib/Ephemeris/JPLEPH
+   DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
+@@ -1182,32 +1105,6 @@
+   "${CMAKE_CURRENT_BINARY_DIR}/wsjtx_config.h"
+   )
+ 
+-
+-if (NOT WIN32 AND NOT APPLE)
+-  # install a desktop file so js8call appears in the application start
+-  # menu with an icon
+-  install (
+-    FILES js8call.desktop
+-    DESTINATION /usr/share/applications
+-    #COMPONENT runtime
+-    )
+-  install (
+-    FILES icons/Unix/js8call_icon.png
+-    DESTINATION /usr/share/pixmaps
+-    #COMPONENT runtime
+-    )
+-
+-    IF("${CMAKE_INSTALL_PREFIX}" STREQUAL "/opt/js8call")
+-        execute_process(COMMAND ln -s /opt/js8call/bin/js8call ljs8call)
+-
+-        install(FILES
+-            ${CMAKE_BINARY_DIR}/ljs8call DESTINATION /usr/bin/ RENAME js8call
+-            #COMPONENT runtime
+-        )
+-    endif()
+-endif (NOT WIN32 AND NOT APPLE)
+-
+-
+ #
+ # bundle fixup only done in Release or MinSizeRel configurations
+ #
+Only in js8call/: .idea
diff --git a/docker/files/wsjtx/wsjtx.patch b/docker/files/wsjtx/wsjtx.patch
index bde05e4..b7854bb 100644
--- a/docker/files/wsjtx/wsjtx.patch
+++ b/docker/files/wsjtx/wsjtx.patch
@@ -1,15 +1,15 @@
-diff -ur js8call-2.1.1-orig/CMake/Modules/Findhamlib.cmake js8call-2.1.1/CMake/Modules/Findhamlib.cmake
---- js8call-2.1.1-orig/CMake/Modules/Findhamlib.cmake	2020-05-23 15:38:20.730349612 +0000
-+++ js8call-2.1.1/CMake/Modules/Findhamlib.cmake	2020-05-23 15:39:28.829772207 +0000
+diff -ur wsjtx-orig/CMake/Modules/Findhamlib.cmake wsjtx/CMake/Modules/Findhamlib.cmake
+--- wsjtx-orig/CMake/Modules/Findhamlib.cmake	2020-05-27 22:41:57.774855748 +0200
++++ wsjtx/CMake/Modules/Findhamlib.cmake	2020-05-27 22:42:35.267939882 +0200
 @@ -85,4 +85,4 @@
  # Handle the  QUIETLY and REQUIRED  arguments and set  HAMLIB_FOUND to
  # TRUE if all listed variables are TRUE
  include (FindPackageHandleStandardArgs)
 -find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES hamlib_LIBRARY_DIRS)
 +find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES)
-diff -ur js8call-2.1.1-orig/CMakeLists.txt js8call-2.1.1/CMakeLists.txt
---- js8call-2.1.1-orig/CMakeLists.txt	2020-05-23 15:38:20.730349612 +0000
-+++ js8call-2.1.1/CMakeLists.txt	2020-05-23 15:52:46.103389553 +0000
+diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
+--- wsjtx-orig/CMakeLists.txt	2020-05-27 22:41:57.774855748 +0200
++++ wsjtx/CMakeLists.txt	2020-05-27 22:58:18.905001618 +0200
 @@ -869,7 +869,7 @@
  #
  # libhamlib setup
@@ -19,10 +19,104 @@ diff -ur js8call-2.1.1-orig/CMakeLists.txt js8call-2.1.1/CMakeLists.txt
  find_package (hamlib 3 REQUIRED)
  find_program (RIGCTL_EXE rigctl)
  find_program (RIGCTLD_EXE rigctld)
-@@ -1471,27 +1404,6 @@
-   )
+@@ -1326,54 +1326,10 @@
+ 
  endif(WSJT_BUILD_UTILS)
-
+ 
+-# build the main application
+-add_executable (wsjtx MACOSX_BUNDLE
+-  ${wsjtx_CXXSRCS}
+-  ${wsjtx_GENUISRCS}
+-  wsjtx.rc
+-  ${WSJTX_ICON_FILE}
+-  ${wsjtx_RESOURCES_RCC}
+-  )
+-
+ if (WSJT_CREATE_WINMAIN)
+   set_target_properties (wsjtx PROPERTIES WIN32_EXECUTABLE ON)
+ endif (WSJT_CREATE_WINMAIN)
+ 
+-set_target_properties (wsjtx PROPERTIES
+-  MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Darwin/Info.plist.in"
+-  MACOSX_BUNDLE_INFO_STRING "${WSJTX_DESCRIPTION_SUMMARY}"
+-  MACOSX_BUNDLE_ICON_FILE "${WSJTX_ICON_FILE}"
+-  MACOSX_BUNDLE_BUNDLE_VERSION ${wsjtx_VERSION}
+-  MACOSX_BUNDLE_SHORT_VERSION_STRING "v${wsjtx_VERSION}"
+-  MACOSX_BUNDLE_LONG_VERSION_STRING "Version ${wsjtx_VERSION}"
+-  MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}"
+-  MACOSX_BUNDLE_BUNDLE_EXECUTABLE_NAME "${PROJECT_NAME}"
+-  MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT}"
+-  MACOSX_BUNDLE_GUI_IDENTIFIER "org.k1jt.wsjtx"
+-  )
+-
+-target_include_directories (wsjtx PRIVATE ${FFTW3_INCLUDE_DIRS})
+-if (APPLE)
+-  target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+-else ()
+-  target_link_libraries (wsjtx wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+-  if (OpenMP_C_FLAGS)
+-    set_target_properties (wsjtx PROPERTIES
+-      COMPILE_FLAGS "${OpenMP_C_FLAGS}"
+-      LINK_FLAGS "${OpenMP_C_FLAGS}"
+-      )
+-  endif ()
+-  set_target_properties (wsjtx PROPERTIES
+-    Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/fortran_modules_omp
+-    )
+-  if (WIN32)
+-    set_target_properties (wsjtx PROPERTIES
+-      LINK_FLAGS -Wl,--stack,16777216
+-      )
+-  endif ()
+-endif ()
+-qt5_use_modules (wsjtx SerialPort) # not sure why the interface link library syntax above doesn't work
+-
+ # make a library for WSJT-X UDP servers
+ # add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
+ add_library (wsjtx_udp-static STATIC ${UDP_library_CXXSRCS})
+@@ -1417,24 +1373,9 @@
+   set_target_properties (message_aggregator PROPERTIES WIN32_EXECUTABLE ON)
+ endif (WSJT_CREATE_WINMAIN)
+ 
+-if (UNIX)
+-  if (NOT WSJT_SKIP_MANPAGES)
+-    add_subdirectory (manpages)
+-    add_dependencies (wsjtx manpages)
+-  endif (NOT WSJT_SKIP_MANPAGES)
+-  if (NOT APPLE)
+-    add_subdirectory (debian)
+-    add_dependencies (wsjtx debian)
+-  endif (NOT APPLE)
+-endif (UNIX)
+-
+ #
+ # installation
+ #
+-install (TARGETS wsjtx
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+-  BUNDLE DESTINATION . COMPONENT runtime
+-  )
+ 
+ # install (TARGETS wsjtx_udp EXPORT udp
+ #   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+@@ -1453,12 +1394,7 @@
+ #   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wsjtx
+ #   )
+ 
+-install (TARGETS udp_daemon message_aggregator
+-  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+-  BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+-  )
+-
+-install (TARGETS jt9 wsprd fmtave fcal fmeasure
++install (TARGETS jt9 wsprd
+   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+   BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
+   )
+@@ -1471,39 +1407,6 @@
+   )
+ endif(WSJT_BUILD_UTILS)  
+ 
 -install (PROGRAMS
 -  ${RIGCTL_EXE}
 -  DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -43,7 +137,20 @@ diff -ur js8call-2.1.1-orig/CMakeLists.txt js8call-2.1.1/CMakeLists.txt
 -  #COMPONENT runtime
 -  RENAME rigctlcom-wsjtx${CMAKE_EXECUTABLE_SUFFIX}
 -  )
+-
+-install (FILES
+-  README
+-  COPYING
+-  AUTHORS
+-  THANKS
+-  NEWS
+-  INSTALL
+-  BUGS
+-  DESTINATION ${CMAKE_INSTALL_DOCDIR}
+-  #COMPONENT runtime
+-  )
 -
  install (FILES
-   README
-   COPYING
+   contrib/Ephemeris/JPLEPH
+   DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
+Only in wsjtx: .idea
diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index 206a5e0..f977430 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -18,7 +18,7 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5serialport5 libqt5multimedia5-plugins libqt5widgets5 libqt5sql5-sqlite libqt5core5a libqt5multimedia5 libqt5network5 libqt5printsupport5 libqt5serialport5 libqt5sql5 libqt5widgets5 libreadline7 libgfortran4 libgomp1 libasound2 libudev1 libhamlib2 ca-certificates"
+STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5core5a libreadline7 libgfortran4 libgomp1 libasound2 libudev1 ca-certificates"
 BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev autoconf automake libtool texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev pkg-config libudev-dev libhamlib-dev patch xsltproc"
 
 apt-get update

From e90973bcd45b15c44b513de3f3d01d5a36fe9a14 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 30 May 2020 22:58:31 +0200
Subject: [PATCH 364/475] switch hackrf to soapy

---
 CHANGELOG.md          |  3 ++-
 owrx/feature.py       | 30 +++++++++---------------------
 owrx/source/hackrf.py | 23 ++++-------------------
 3 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bf8754..5f77877 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,8 @@
 - Improve receiver load time by concatenating javascript assets
 - Docker images migrated to Debian slim images; This was necessary to allow the use of function multiversioning in
   csdr and owrx_connector to allow the images to run on a wider range of CPUs
-- Docker containers have been updated to include the SDRplay driver version 3 
+- Docker containers have been updated to include the SDRplay driver version 3
+- HackRF support is now based on SoapyHackRF
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/owrx/feature.py b/owrx/feature.py
index 06eb4f5..9b31001 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -24,7 +24,7 @@ class FeatureDetector(object):
         "rtl_sdr": ["rtl_connector"],
         "rtl_sdr_soapy": ["soapy_connector", "soapy_rtl_sdr"],
         "sdrplay": ["soapy_connector", "soapy_sdrplay"],
-        "hackrf": ["hackrf_transfer"],
+        "hackrf": ["soapy_connector", "soapy_hackrf"],
         "perseussdr": ["perseustest"],
         "airspy": ["soapy_connector", "soapy_airspy"],
         "airspyhf": ["soapy_connector", "soapy_airspyhf"],
@@ -127,26 +127,6 @@ class FeatureDetector(object):
         """
         return self.command_is_runnable("nc --help")
 
-    def has_hackrf_transfer(self):
-        """
-        To use a HackRF, compile the HackRF host tools from its "stdout" branch:
-        ```
-         git clone https://github.com/mossmann/hackrf/
-         cd hackrf
-         git fetch
-         git checkout origin/stdout
-         cd host
-         mkdir build
-         cd build
-         cmake .. -DINSTALL_UDEV_RULES=ON
-         make
-         sudo make install
-        ```
-        """
-        # TODO i don't have a hackrf, so somebody doublecheck this.
-        # TODO also check if it has the stdout feature
-        return self.command_is_runnable("hackrf_transfer --help")
-
     def has_perseustest(self):
         """
         To use a Microtelecom Perseus HF receiver, compile and
@@ -333,6 +313,14 @@ class FeatureDetector(object):
         """
         return self._has_soapy_driver("redpitaya")
 
+    def has_soapy_hackrf(self):
+        """
+        The SoapyHackRF allows HackRF to be used with SoapySDR.
+
+        You can get it [here](https://github.com/pothosware/SoapyHackRF/wiki).
+        """
+        return self._has_soapy_driver("hackrf")
+
     def has_dsd(self):
         """
         The digital voice modes NXDN and D-Star can be decoded by the dsd project. Please note that you need the version
diff --git a/owrx/source/hackrf.py b/owrx/source/hackrf.py
index f59a448..02547f7 100644
--- a/owrx/source/hackrf.py
+++ b/owrx/source/hackrf.py
@@ -1,23 +1,8 @@
-from .direct import DirectSource
+from .soapy import SoapyConnectorSource
 from owrx.command import Option
 import time
 
 
-class HackrfSource(DirectSource):
-    def getCommandMapper(self):
-        return super().getCommandMapper().setBase("hackrf_transfer").setMappings(
-            {
-                "samp_rate": Option("-s"),
-                "tuner_freq": Option("-f"),
-                "rf_gain": Option("-g"),
-                "lna_gain": Option("-l"),
-                "rf_amp": Option("-a"),
-                "ppm": Option("-C"),
-            }
-        ).setStatic("-r-")
-
-    def getFormatConversion(self):
-        return ["csdr convert_s8_f"]
-
-    def sleepOnRestart(self):
-        time.sleep(1)
+class HackrfSource(SoapyConnectorSource):
+    def getDriver(self):
+        return "hackrf"
\ No newline at end of file

From bfe6c00f90770fed54344a462dc3f64a86dbc87c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 30 May 2020 22:59:45 +0200
Subject: [PATCH 365/475] add debian changelog entry, too

---
 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/changelog b/debian/changelog
index f8b4c6c..d5a6434 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
     installation of js8call and the js8py library)
   * Reorganization of the frontend demodulator code
   * Improve receiver load time by concatenating javascript assets
+  * HackRF support is now based on SoapyHackRF
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From 3371697e1886d04a47940c0c67a9b3172824ba89 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 30 May 2020 23:03:43 +0200
Subject: [PATCH 366/475] add bias_tee mapping

---
 owrx/source/hackrf.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/owrx/source/hackrf.py b/owrx/source/hackrf.py
index 02547f7..a103218 100644
--- a/owrx/source/hackrf.py
+++ b/owrx/source/hackrf.py
@@ -1,8 +1,11 @@
 from .soapy import SoapyConnectorSource
-from owrx.command import Option
-import time
 
 
 class HackrfSource(SoapyConnectorSource):
+    def getSoapySettingsMappings(self):
+        mappings = super().getSoapySettingsMappings()
+        mappings.update({"bias_tee": "bias_tx"})
+        return mappings
+
     def getDriver(self):
         return "hackrf"
\ No newline at end of file

From 76818302560ff0963f6dd25a1a7f61ec72a251c4 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 30 May 2020 23:41:30 +0200
Subject: [PATCH 367/475] add soapy module for hackrf

---
 docker/Dockerfiles/Dockerfile-full            | 2 +-
 docker/Dockerfiles/Dockerfile-hackrf          | 2 +-
 docker/scripts/install-dependencies-hackrf.sh | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index fbb3bd7..af5007f 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -5,8 +5,8 @@ ADD docker/scripts/install-dependencies-*.sh /
 ADD docker/files/sdrplay/install-lib.*.patch /
 
 RUN /install-dependencies-rtlsdr.sh &&\
-    /install-dependencies-hackrf.sh &&\
     /install-dependencies-soapysdr.sh &&\
+    /install-dependencies-hackrf.sh &&\
     /install-dependencies-sdrplay.sh &&\
     /install-dependencies-airspy.sh &&\
     /install-dependencies-rtlsdr-soapy.sh &&\
diff --git a/docker/Dockerfiles/Dockerfile-hackrf b/docker/Dockerfiles/Dockerfile-hackrf
index 6d5d5e8..93cb35b 100644
--- a/docker/Dockerfiles/Dockerfile-hackrf
+++ b/docker/Dockerfiles/Dockerfile-hackrf
@@ -1,5 +1,5 @@
 ARG ARCHTAG
-FROM openwebrx-base:$ARCHTAG
+FROM openwebrx-soapysdr-base:$ARCHTAG
 
 ADD docker/scripts/install-dependencies-hackrf.sh /
 RUN /install-dependencies-hackrf.sh &&\
diff --git a/docker/scripts/install-dependencies-hackrf.sh b/docker/scripts/install-dependencies-hackrf.sh
index 9c6d47b..d01d009 100755
--- a/docker/scripts/install-dependencies-hackrf.sh
+++ b/docker/scripts/install-dependencies-hackrf.sh
@@ -31,6 +31,9 @@ cmakebuild host
 cd ..
 rm -rf hackrf
 
+git clone https://github.com/pothosware/SoapyHackRF.git
+cmakebuild SoapyHackRF 3c514cecd3dd2fdf4794aebc96c482940c11d7ff
+
 SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean
 rm -rf /var/lib/apt/lists/*

From 063d22f88c4a831902445c36412c7c287d322d99 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 31 May 2020 00:55:21 +0200
Subject: [PATCH 368/475] build with lime SIMD limited to SSE3 for better
 portability, refs #38

---
 docker/scripts/install-dependencies-limesdr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/install-dependencies-limesdr.sh b/docker/scripts/install-dependencies-limesdr.sh
index abfa393..63f1c35 100755
--- a/docker/scripts/install-dependencies-limesdr.sh
+++ b/docker/scripts/install-dependencies-limesdr.sh
@@ -15,7 +15,7 @@ cd LimeSuite
 git checkout 0854a51ec06b30b01f19a562149c39461e92f24d
 mkdir builddir
 cd builddir
-cmake .. -DENABLE_EXAMPLES=OFF -DENABLE_DESKTOP=OFF -DENABLE_LIME_UTIL=OFF -DENABLE_QUICKTEST=OFF -DENABLE_OCTAVE=OFF -DENABLE_GUI=OFF -DCMAKE_CXX_STANDARD_LIBRARIES="-latomic"
+cmake .. -DENABLE_EXAMPLES=OFF -DENABLE_DESKTOP=OFF -DENABLE_LIME_UTIL=OFF -DENABLE_QUICKTEST=OFF -DENABLE_OCTAVE=OFF -DENABLE_GUI=OFF -DCMAKE_CXX_STANDARD_LIBRARIES="-latomic" -DDEFAULT_SIMD_FLAGS=SSE3
 make
 make install
 cd ../..

From 1359da5b14a55580364511a7cf9f6197ef466a8d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 31 May 2020 01:04:57 +0200
Subject: [PATCH 369/475] limit SIMD flags to x86 only

---
 docker/scripts/install-dependencies-limesdr.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker/scripts/install-dependencies-limesdr.sh b/docker/scripts/install-dependencies-limesdr.sh
index 63f1c35..be7533e 100755
--- a/docker/scripts/install-dependencies-limesdr.sh
+++ b/docker/scripts/install-dependencies-limesdr.sh
@@ -10,12 +10,17 @@ BUILD_PACKAGES="git libusb-1.0-0-dev cmake make gcc g++"
 apt-get update
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
+SIMD_FLAGS=""
+if [[ 'x86_64' == `uname -m` ]] ; then
+    SIMD_FLAGS="-DDEFAULT_SIMD_FLAGS=SSE3"
+fi
+
 git clone https://github.com/myriadrf/LimeSuite.git
 cd LimeSuite
 git checkout 0854a51ec06b30b01f19a562149c39461e92f24d
 mkdir builddir
 cd builddir
-cmake .. -DENABLE_EXAMPLES=OFF -DENABLE_DESKTOP=OFF -DENABLE_LIME_UTIL=OFF -DENABLE_QUICKTEST=OFF -DENABLE_OCTAVE=OFF -DENABLE_GUI=OFF -DCMAKE_CXX_STANDARD_LIBRARIES="-latomic" -DDEFAULT_SIMD_FLAGS=SSE3
+cmake .. -DENABLE_EXAMPLES=OFF -DENABLE_DESKTOP=OFF -DENABLE_LIME_UTIL=OFF -DENABLE_QUICKTEST=OFF -DENABLE_OCTAVE=OFF -DENABLE_GUI=OFF -DCMAKE_CXX_STANDARD_LIBRARIES="-latomic" ${SIMD_FLAGS}
 make
 make install
 cd ../..

From 9763f302f3215aa7c4d3428216c8611579f63397 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 31 May 2020 15:04:09 +0200
Subject: [PATCH 370/475] switch to csdr and owrx_connector development
 versions

---
 docker/scripts/install-connectors.sh   | 2 +-
 docker/scripts/install-dependencies.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh
index 3f5861b..d7014e7 100755
--- a/docker/scripts/install-connectors.sh
+++ b/docker/scripts/install-connectors.sh
@@ -24,7 +24,7 @@ apt-get update
 apt-get -y install --no-install-recommends $BUILD_PACKAGES
 
 git clone https://github.com/jketterl/owrx_connector.git
-cmakebuild owrx_connector 4cb8d14fbe387b1569a5b635d7819266ce1dd42b
+cmakebuild owrx_connector 45ec227b38bb763b0a923a1856740f4ddf74216c
 
 apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean
diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index f977430..fc76cfa 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -55,7 +55,7 @@ cmakebuild itpp bb5c7e95f40e8fdb5c3f3d01a84bcbaf76f3676d
 
 git clone https://github.com/jketterl/csdr.git
 cd csdr
-git checkout 69c4d74a5b8207b0edf4a36a5a0795fbee39281f
+git checkout c4d8a8a5590898e8c9e94b88b96a2fdc7cd0493a
 autoreconf -i
 ./configure
 make

From 66b5f17d38ac18bae2f7e88ccfbc8b7fb6b7e19c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 31 May 2020 19:57:20 +0200
Subject: [PATCH 371/475] implement soapy gain input

---
 htdocs/settings.js | 52 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 49 insertions(+), 3 deletions(-)

diff --git a/htdocs/settings.js b/htdocs/settings.js
index 278e1c0..bf9a03c 100644
--- a/htdocs/settings.js
+++ b/htdocs/settings.js
@@ -5,13 +5,19 @@ function Input(name, value, options) {
     this.label = options && options.label || name;
 };
 
+Input.prototype.getClasses = function() {
+    return ['form-control', 'form-control-sm'];
+}
+
 Input.prototype.bootstrapify = function(input) {
-    input.addClass('form-control').addClass('form-control-sm');
+    this.getClasses().forEach(input.addClass.bind(input));
     return [
         '<div class="form-group row">',
             '<label class="col-form-label col-form-label-sm col-3" for="' + this.name + '">' + this.label + '</label>',
             '<div class="col-9">',
-                input[0].outerHTML,
+                $.map(input, function(el) {
+                    return el.outerHTML;
+                }).join(''),
             '</div>',
         '</div>'
     ].join('');
@@ -43,8 +49,48 @@ function SoapyGainInput() {
 
 SoapyGainInput.prototype = new Input();
 
+SoapyGainInput.prototype.getClasses = function() {
+    return [];
+};
+
 SoapyGainInput.prototype.render = function(){
-    return this.bootstrapify($('<div>Soapy gain settings go here</div>'));
+    var markup = $(
+        '<div class="row form-group">' +
+            '<div class="col-4">Gain mode</div>' +
+            '<div class="col-8">' +
+                '<select class="form-control form-control-sm">' +
+                    '<option value="auto">automatic gain</option>' +
+                    '<option value="single">single gain value</option>' +
+                    '<option value="separate">separate gain values</option>' +
+                '</select>' +
+            '</div>' +
+        '</div>' +
+        '<div class="row option form-group gain-mode-single">' +
+            '<div class="col-4">Gain</div>' +
+            '<div class="col-8">' +
+                '<input class="form-control form-control-sm" type="number">' +
+            '</div>' +
+        '</div>' +
+        this.options.gains.map(function(g){
+            return '<div class="row option form-group gain-mode-separate">' +
+                '<div class="col-4">' + g + '</div>' +
+                '<div class="col-8">' +
+                    '<input class="form-control form-control-sm" type="number">' +
+                '</div>' +
+            '</div>';
+        }).join('')
+    );
+    var el = $(this.bootstrapify(markup))
+    var setMode = function(mode){
+        el.find('.option').hide();
+        el.find('.gain-mode-' + mode).show();
+    };
+    el.on('change', 'select', function(){
+        var mode = $(this).val();
+        setMode(mode);
+    });
+    setMode('auto');
+    return el;
 };
 
 function ProfileInput() {

From ac18a76c14e24b463305312a9dbc825af0d52a56 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 31 May 2020 20:25:41 +0200
Subject: [PATCH 372/475] split stuff into separate files

---
 htdocs/generalsettings.html      |   4 +-
 htdocs/lib/settings/Input.js     | 114 +++++++++++
 htdocs/lib/settings/SdrDevice.js | 226 ++++++++++++++++++++
 htdocs/sdrsettings.html          |   4 +-
 htdocs/settings.html             |   4 +-
 htdocs/settings.js               | 342 -------------------------------
 owrx/controllers/assets.py       |   7 +
 7 files changed, 350 insertions(+), 351 deletions(-)
 create mode 100644 htdocs/lib/settings/Input.js
 create mode 100644 htdocs/lib/settings/SdrDevice.js

diff --git a/htdocs/generalsettings.html b/htdocs/generalsettings.html
index 3367ed8..4731a02 100644
--- a/htdocs/generalsettings.html
+++ b/htdocs/generalsettings.html
@@ -5,10 +5,8 @@
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
     <link rel="stylesheet" href="static/css/bootstrap.min.css" />
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
-    <script src="static/lib/jquery-3.2.1.min.js"></script>
-    <script src="static/lib/Header.js"></script>
     <script src="https://unpkg.com/location-picker/dist/location-picker.min.js"></script>
-    <script src="static/settings.js"></script>
+    <script src="compiled/settings.js"></script>
     <meta charset="utf-8">
 </head>
 <body>
diff --git a/htdocs/lib/settings/Input.js b/htdocs/lib/settings/Input.js
new file mode 100644
index 0000000..4686aac
--- /dev/null
+++ b/htdocs/lib/settings/Input.js
@@ -0,0 +1,114 @@
+function Input(name, value, options) {
+    this.name = name;
+    this.value = value;
+    this.options = options;
+    this.label = options && options.label || name;
+};
+
+Input.prototype.getClasses = function() {
+    return ['form-control', 'form-control-sm'];
+}
+
+Input.prototype.bootstrapify = function(input) {
+    this.getClasses().forEach(input.addClass.bind(input));
+    return [
+        '<div class="form-group row">',
+            '<label class="col-form-label col-form-label-sm col-3" for="' + this.name + '">' + this.label + '</label>',
+            '<div class="col-9">',
+                $.map(input, function(el) {
+                    return el.outerHTML;
+                }).join(''),
+            '</div>',
+        '</div>'
+    ].join('');
+};
+
+function TextInput() {
+    Input.apply(this, arguments);
+};
+
+TextInput.prototype = new Input();
+
+TextInput.prototype.render = function() {
+    return this.bootstrapify($('<input type="text" name="' + this.name + '" value="' + this.value + '">'));
+}
+
+function NumberInput() {
+    Input.apply(this, arguments);
+};
+
+NumberInput.prototype = new Input();
+
+NumberInput.prototype.render = function() {
+    return this.bootstrapify($('<input type="number" name="' + this.name + '" value="' + this.value + '">'));
+};
+
+function SoapyGainInput() {
+    Input.apply(this, arguments);
+}
+
+SoapyGainInput.prototype = new Input();
+
+SoapyGainInput.prototype.getClasses = function() {
+    return [];
+};
+
+SoapyGainInput.prototype.render = function(){
+    var markup = $(
+        '<div class="row form-group">' +
+            '<div class="col-4">Gain mode</div>' +
+            '<div class="col-8">' +
+                '<select class="form-control form-control-sm">' +
+                    '<option value="auto">automatic gain</option>' +
+                    '<option value="single">single gain value</option>' +
+                    '<option value="separate">separate gain values</option>' +
+                '</select>' +
+            '</div>' +
+        '</div>' +
+        '<div class="row option form-group gain-mode-single">' +
+            '<div class="col-4">Gain</div>' +
+            '<div class="col-8">' +
+                '<input class="form-control form-control-sm" type="number">' +
+            '</div>' +
+        '</div>' +
+        this.options.gains.map(function(g){
+            return '<div class="row option form-group gain-mode-separate">' +
+                '<div class="col-4">' + g + '</div>' +
+                '<div class="col-8">' +
+                    '<input class="form-control form-control-sm" type="number">' +
+                '</div>' +
+            '</div>';
+        }).join('')
+    );
+    var el = $(this.bootstrapify(markup))
+    var setMode = function(mode){
+        el.find('.option').hide();
+        el.find('.gain-mode-' + mode).show();
+    };
+    el.on('change', 'select', function(){
+        var mode = $(this).val();
+        setMode(mode);
+    });
+    setMode('auto');
+    return el;
+};
+
+function ProfileInput() {
+    Input.apply(this, arguments);
+};
+
+ProfileInput.prototype = new Input();
+
+ProfileInput.prototype.render = function() {
+    return $('<div><h3>Profiles</h3></div>');
+};
+
+function SchedulerInput() {
+    Input.apply(this, arguments);
+};
+
+SchedulerInput.prototype = new Input();
+
+SchedulerInput.prototype.render = function() {
+    return $('<div><h3>Scheduler</h3></div>');
+};
diff --git a/htdocs/lib/settings/SdrDevice.js b/htdocs/lib/settings/SdrDevice.js
new file mode 100644
index 0000000..f8acada
--- /dev/null
+++ b/htdocs/lib/settings/SdrDevice.js
@@ -0,0 +1,226 @@
+function SdrDevice(el, data) {
+    this.el = el;
+    this.data = data;
+    this.inputs = {};
+    this.render();
+
+    var self = this;
+    el.on('click', '.fieldselector .btn', function() {
+        var key = el.find('.fieldselector select').val();
+        self.data[key] = self.getInitialValue(key);
+        self.render();
+    });
+};
+
+SdrDevice.create = function(el) {
+    var data = JSON.parse(decodeURIComponent(el.data('config')));
+    var type = data.type;
+    var constructor = SdrDevice.types[type] || SdrDevice;
+    return new constructor(el, data);
+};
+
+SdrDevice.prototype.getData = function() {
+    return $.extend(new Object(), this.getDefaults(), this.data);
+};
+
+SdrDevice.prototype.getDefaults = function() {
+    var defaults = {}
+    $.each(this.getMappings(), function(k, v) {
+        if (!v.includeInDefault) return;
+        defaults[k] = 'initialValue' in v ? v['initialValue'] : false;
+    });
+    return defaults;
+};
+
+SdrDevice.prototype.getMappings = function() {
+    return {
+        "name": {
+            constructor: TextInput,
+            inputOptions: {
+                label: "Name"
+            },
+            initialValue: "",
+            includeInDefault: true
+        },
+        "type": {
+            constructor: TextInput,
+            inputOptions: {
+                label: "Type"
+            },
+            initialValue: '',
+            includeInDefault: true
+        },
+        "ppm": {
+            constructor: NumberInput,
+            inputOptions: {
+                label: "PPM"
+            },
+            initialValue: 0
+        },
+        "profiles": {
+            constructor: ProfileInput,
+            inputOptions: {
+                label: "Profiles"
+            },
+            initialValue: [],
+            includeInDefault: true,
+            position: 100
+        },
+        "scheduler": {
+            constructor: SchedulerInput,
+            inputOptions: {
+                label: "Scheduler",
+            },
+            initialValue: {},
+            position: 101
+        },
+        "rf_gain": {
+            constructor: TextInput,
+            inputOptions: {
+                label: "Gain",
+            },
+            initialValue: 0
+        }
+    };
+};
+
+SdrDevice.prototype.getMapping = function(key) {
+    var mappings = this.getMappings();
+    return mappings[key];
+};
+
+SdrDevice.prototype.getInputClass = function(key) {
+    var mapping = this.getMapping(key);
+    return mapping && mapping.constructor || TextInput;
+};
+
+SdrDevice.prototype.getInitialValue = function(key) {
+    var mapping = this.getMapping(key);
+    return mapping && ('initialValue' in mapping) ? mapping['initialValue'] : false;
+};
+
+SdrDevice.prototype.getPosition = function(key) {
+    var mapping = this.getMapping(key);
+    return mapping && mapping.position || 10;
+};
+
+SdrDevice.prototype.getInputOptions = function(key) {
+    var mapping = this.getMapping(key);
+    return mapping && mapping.inputOptions || {};
+};
+
+SdrDevice.prototype.getLabel = function(key) {
+    var options = this.getInputOptions(key);
+    return options && options.label || key;
+};
+
+SdrDevice.prototype.render = function() {
+    var self = this;
+    self.el.empty();
+    var data = this.getData();
+    Object.keys(data).sort(function(a, b){
+        return self.getPosition(a) - self.getPosition(b);
+    }).forEach(function(key){
+        var value = data[key];
+        var inputClass = self.getInputClass(key);
+        var input = new inputClass(key, value, self.getInputOptions(key));
+        self.inputs[key] = input;
+        self.el.append(input.render());
+    });
+    self.el.append(this.renderFieldSelector());
+};
+
+SdrDevice.prototype.renderFieldSelector = function() {
+    var self = this;
+    return '<div class="fieldselector">' +
+        '<h3>Add new configuration options<h3>' +
+        '<div class="form-group row">' +
+            '<div class="col-3"><select class="form-control form-control-sm">' +
+                Object.keys(self.getMappings()).filter(function(m){
+                    return !(m in self.data);
+                }).map(function(m) {
+                    return '<option value="' + m + '">' + self.getLabel(m) + '</option>';
+                }).join('') +
+            '</select></div>' +
+            '<div class="col-2">' +
+                '<div class="btn btn-primary">Add to config</div>' +
+            '</div>' +
+        '</div>' +
+    '</div>';
+};
+
+RtlSdrDevice = function() {
+    SdrDevice.apply(this, arguments);
+};
+
+RtlSdrDevice.prototype = Object.create(SdrDevice.prototype);
+RtlSdrDevice.prototype.constructor = RtlSdrDevice;
+
+RtlSdrDevice.prototype.getMappings = function() {
+    var mappings = SdrDevice.prototype.getMappings.apply(this, arguments);
+    return $.extend(new Object(), mappings, {
+        "device": {
+            constructor: TextInput,
+            inputOptions:{
+                label: "Serial number"
+            },
+            initialValue: ""
+        }
+    });
+};
+
+SoapySdrDevice = function() {
+    SdrDevice.apply(this, arguments);
+};
+
+SoapySdrDevice.prototype = Object.create(SdrDevice.prototype);
+SoapySdrDevice.prototype.constructor = SoapySdrDevice;
+
+SoapySdrDevice.prototype.getMappings = function() {
+    var mappings = SdrDevice.prototype.getMappings.apply(this, arguments);
+    return $.extend(new Object(), mappings, {
+        "device": {
+            constructor: TextInput,
+            inputOptions:{
+                label: "Soapy device selector"
+            },
+            initialValue: ""
+        }
+    });
+};
+
+SdrplaySdrDevice = function() {
+    SoapySdrDevice.apply(this, arguments);
+};
+
+SdrplaySdrDevice.prototype = Object.create(SoapySdrDevice.prototype);
+SdrplaySdrDevice.prototype.constructor = SdrplaySdrDevice;
+
+SdrplaySdrDevice.prototype.getMappings = function() {
+    var mappings = SoapySdrDevice.prototype.getMappings.apply(this, arguments);
+    return $.extend(new Object(), mappings, {
+        "rf_gain": {
+            constructor: SoapyGainInput,
+            initialValue: 0,
+            inputOptions: {
+                label: "Gain",
+                gains: ['RFGR', 'IFGR']
+            }
+        }
+    });
+};
+
+SdrDevice.types = {
+    'rtl_sdr': RtlSdrDevice,
+    'sdrplay': SdrplaySdrDevice
+};
+
+$.fn.sdrdevice = function() {
+    return this.map(function(){
+        var el = $(this);
+        if (!el.data('sdrdevice')) {
+            el.data('sdrdevice', SdrDevice.create(el));
+        }
+        return el.data('sdrdevice');
+    });
+};
diff --git a/htdocs/sdrsettings.html b/htdocs/sdrsettings.html
index 89e6a8f..74aa8b7 100644
--- a/htdocs/sdrsettings.html
+++ b/htdocs/sdrsettings.html
@@ -5,9 +5,7 @@
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
     <link rel="stylesheet" href="static/css/bootstrap.min.css" />
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
-    <script src="static/lib/jquery-3.2.1.min.js"></script>
-    <script src="static/lib/Header.js"></script>
-    <script src="static/settings.js"></script>
+    <script src="compiled/settings.js"></script>
     <meta charset="utf-8">
 </head>
 <body>
diff --git a/htdocs/settings.html b/htdocs/settings.html
index 39cecf9..80dce91 100644
--- a/htdocs/settings.html
+++ b/htdocs/settings.html
@@ -5,9 +5,7 @@
     <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico" />
     <link rel="stylesheet" href="static/css/bootstrap.min.css" />
     <link rel="stylesheet" type="text/css" href="static/css/admin.css" />
-    <script src="static/lib/jquery-3.2.1.min.js"></script>
-    <script src="static/lib/Header.js"></script>
-    <script src="static/settings.js"></script>
+    <script src="compiled/settings.js"></script>
     <meta charset="utf-8">
 </head>
 <body>
diff --git a/htdocs/settings.js b/htdocs/settings.js
index bf9a03c..e95e2fe 100644
--- a/htdocs/settings.js
+++ b/htdocs/settings.js
@@ -1,345 +1,3 @@
-function Input(name, value, options) {
-    this.name = name;
-    this.value = value;
-    this.options = options;
-    this.label = options && options.label || name;
-};
-
-Input.prototype.getClasses = function() {
-    return ['form-control', 'form-control-sm'];
-}
-
-Input.prototype.bootstrapify = function(input) {
-    this.getClasses().forEach(input.addClass.bind(input));
-    return [
-        '<div class="form-group row">',
-            '<label class="col-form-label col-form-label-sm col-3" for="' + this.name + '">' + this.label + '</label>',
-            '<div class="col-9">',
-                $.map(input, function(el) {
-                    return el.outerHTML;
-                }).join(''),
-            '</div>',
-        '</div>'
-    ].join('');
-};
-
-function TextInput() {
-    Input.apply(this, arguments);
-};
-
-TextInput.prototype = new Input();
-
-TextInput.prototype.render = function() {
-    return this.bootstrapify($('<input type="text" name="' + this.name + '" value="' + this.value + '">'));
-}
-
-function NumberInput() {
-    Input.apply(this, arguments);
-};
-
-NumberInput.prototype = new Input();
-
-NumberInput.prototype.render = function() {
-    return this.bootstrapify($('<input type="number" name="' + this.name + '" value="' + this.value + '">'));
-};
-
-function SoapyGainInput() {
-    Input.apply(this, arguments);
-}
-
-SoapyGainInput.prototype = new Input();
-
-SoapyGainInput.prototype.getClasses = function() {
-    return [];
-};
-
-SoapyGainInput.prototype.render = function(){
-    var markup = $(
-        '<div class="row form-group">' +
-            '<div class="col-4">Gain mode</div>' +
-            '<div class="col-8">' +
-                '<select class="form-control form-control-sm">' +
-                    '<option value="auto">automatic gain</option>' +
-                    '<option value="single">single gain value</option>' +
-                    '<option value="separate">separate gain values</option>' +
-                '</select>' +
-            '</div>' +
-        '</div>' +
-        '<div class="row option form-group gain-mode-single">' +
-            '<div class="col-4">Gain</div>' +
-            '<div class="col-8">' +
-                '<input class="form-control form-control-sm" type="number">' +
-            '</div>' +
-        '</div>' +
-        this.options.gains.map(function(g){
-            return '<div class="row option form-group gain-mode-separate">' +
-                '<div class="col-4">' + g + '</div>' +
-                '<div class="col-8">' +
-                    '<input class="form-control form-control-sm" type="number">' +
-                '</div>' +
-            '</div>';
-        }).join('')
-    );
-    var el = $(this.bootstrapify(markup))
-    var setMode = function(mode){
-        el.find('.option').hide();
-        el.find('.gain-mode-' + mode).show();
-    };
-    el.on('change', 'select', function(){
-        var mode = $(this).val();
-        setMode(mode);
-    });
-    setMode('auto');
-    return el;
-};
-
-function ProfileInput() {
-    Input.apply(this, arguments);
-};
-
-ProfileInput.prototype = new Input();
-
-ProfileInput.prototype.render = function() {
-    return $('<div><h3>Profiles</h3></div>');
-};
-
-function SchedulerInput() {
-    Input.apply(this, arguments);
-};
-
-SchedulerInput.prototype = new Input();
-
-SchedulerInput.prototype.render = function() {
-    return $('<div><h3>Scheduler</h3></div>');
-};
-
-function SdrDevice(el, data) {
-    this.el = el;
-    this.data = data;
-    this.inputs = {};
-    this.render();
-
-    var self = this;
-    el.on('click', '.fieldselector .btn', function() {
-        var key = el.find('.fieldselector select').val();
-        self.data[key] = self.getInitialValue(key);
-        self.render();
-    });
-};
-
-SdrDevice.create = function(el) {
-    var data = JSON.parse(decodeURIComponent(el.data('config')));
-    var type = data.type;
-    var constructor = SdrDevice.types[type] || SdrDevice;
-    return new constructor(el, data);
-};
-
-SdrDevice.prototype.getData = function() {
-    return $.extend(new Object(), this.getDefaults(), this.data);
-};
-
-SdrDevice.prototype.getDefaults = function() {
-    var defaults = {}
-    $.each(this.getMappings(), function(k, v) {
-        if (!v.includeInDefault) return;
-        defaults[k] = 'initialValue' in v ? v['initialValue'] : false;
-    });
-    return defaults;
-};
-
-SdrDevice.prototype.getMappings = function() {
-    return {
-        "name": {
-            constructor: TextInput,
-            inputOptions: {
-                label: "Name"
-            },
-            initialValue: "",
-            includeInDefault: true
-        },
-        "type": {
-            constructor: TextInput,
-            inputOptions: {
-                label: "Type"
-            },
-            initialValue: '',
-            includeInDefault: true
-        },
-        "ppm": {
-            constructor: NumberInput,
-            inputOptions: {
-                label: "PPM"
-            },
-            initialValue: 0
-        },
-        "profiles": {
-            constructor: ProfileInput,
-            inputOptions: {
-                label: "Profiles"
-            },
-            initialValue: [],
-            includeInDefault: true,
-            position: 100
-        },
-        "scheduler": {
-            constructor: SchedulerInput,
-            inputOptions: {
-                label: "Scheduler",
-            },
-            initialValue: {},
-            position: 101
-        },
-        "rf_gain": {
-            constructor: TextInput,
-            inputOptions: {
-                label: "Gain",
-            },
-            initialValue: 0
-        }
-    };
-};
-
-SdrDevice.prototype.getMapping = function(key) {
-    var mappings = this.getMappings();
-    return mappings[key];
-};
-
-SdrDevice.prototype.getInputClass = function(key) {
-    var mapping = this.getMapping(key);
-    return mapping && mapping.constructor || TextInput;
-};
-
-SdrDevice.prototype.getInitialValue = function(key) {
-    var mapping = this.getMapping(key);
-    return mapping && ('initialValue' in mapping) ? mapping['initialValue'] : false;
-};
-
-SdrDevice.prototype.getPosition = function(key) {
-    var mapping = this.getMapping(key);
-    return mapping && mapping.position || 10;
-};
-
-SdrDevice.prototype.getInputOptions = function(key) {
-    var mapping = this.getMapping(key);
-    return mapping && mapping.inputOptions || {};
-};
-
-SdrDevice.prototype.getLabel = function(key) {
-    var options = this.getInputOptions(key);
-    return options && options.label || key;
-};
-
-SdrDevice.prototype.render = function() {
-    var self = this;
-    self.el.empty();
-    var data = this.getData();
-    Object.keys(data).sort(function(a, b){
-        return self.getPosition(a) - self.getPosition(b);
-    }).forEach(function(key){
-        var value = data[key];
-        var inputClass = self.getInputClass(key);
-        var input = new inputClass(key, value, self.getInputOptions(key));
-        self.inputs[key] = input;
-        self.el.append(input.render());
-    });
-    self.el.append(this.renderFieldSelector());
-};
-
-SdrDevice.prototype.renderFieldSelector = function() {
-    var self = this;
-    return '<div class="fieldselector">' +
-        '<h3>Add new configuration options<h3>' +
-        '<div class="form-group row">' +
-            '<div class="col-3"><select class="form-control form-control-sm">' +
-                Object.keys(self.getMappings()).filter(function(m){
-                    return !(m in self.data);
-                }).map(function(m) {
-                    return '<option value="' + m + '">' + self.getLabel(m) + '</option>';
-                }).join('') +
-            '</select></div>' +
-            '<div class="col-2">' +
-                '<div class="btn btn-primary">Add to config</div>' +
-            '</div>' +
-        '</div>' +
-    '</div>';
-};
-
-RtlSdrDevice = function() {
-    SdrDevice.apply(this, arguments);
-};
-
-RtlSdrDevice.prototype = Object.create(SdrDevice.prototype);
-RtlSdrDevice.prototype.constructor = RtlSdrDevice;
-
-RtlSdrDevice.prototype.getMappings = function() {
-    var mappings = SdrDevice.prototype.getMappings.apply(this, arguments);
-    return $.extend(new Object(), mappings, {
-        "device": {
-            constructor: TextInput,
-            inputOptions:{
-                label: "Serial number"
-            },
-            initialValue: ""
-        }
-    });
-};
-
-SoapySdrDevice = function() {
-    SdrDevice.apply(this, arguments);
-};
-
-SoapySdrDevice.prototype = Object.create(SdrDevice.prototype);
-SoapySdrDevice.prototype.constructor = SoapySdrDevice;
-
-SoapySdrDevice.prototype.getMappings = function() {
-    var mappings = SdrDevice.prototype.getMappings.apply(this, arguments);
-    return $.extend(new Object(), mappings, {
-        "device": {
-            constructor: TextInput,
-            inputOptions:{
-                label: "Soapy device selector"
-            },
-            initialValue: ""
-        }
-    });
-};
-
-SdrplaySdrDevice = function() {
-    SoapySdrDevice.apply(this, arguments);
-};
-
-SdrplaySdrDevice.prototype = Object.create(SoapySdrDevice.prototype);
-SdrplaySdrDevice.prototype.constructor = SdrplaySdrDevice;
-
-SdrplaySdrDevice.prototype.getMappings = function() {
-    var mappings = SoapySdrDevice.prototype.getMappings.apply(this, arguments);
-    return $.extend(new Object(), mappings, {
-        "rf_gain": {
-            constructor: SoapyGainInput,
-            initialValue: 0,
-            inputOptions: {
-                label: "Gain",
-                gains: ['RFGR', 'IFGR']
-            }
-        }
-    });
-};
-
-SdrDevice.types = {
-    'rtl_sdr': RtlSdrDevice,
-    'sdrplay': SdrplaySdrDevice
-};
-
-$.fn.sdrdevice = function() {
-    return this.map(function(){
-        var el = $(this);
-        if (!el.data('sdrdevice')) {
-            el.data('sdrdevice', SdrDevice.create(el));
-        }
-        return el.data('sdrdevice');
-    });
-};
-
 $(function(){
     $(".map-input").each(function(el) {
         var $el = $(this);
diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index 59a532f..a8b9d4e 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -87,6 +87,13 @@ class CompiledAssetsController(Controller):
             "lib/Header.js",
             "map.js",
         ],
+        "settings.js": [
+            "lib/jquery-3.2.1.min.js",
+            "lib/Header.js",
+            "lib/settings/Input.js",
+            "lib/settings/SdrDevice.js",
+            "settings.js",
+        ]
     }
 
     def indexAction(self):

From d3a307850467c6e54470c72660947647da94dbd8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 31 May 2020 20:43:12 +0200
Subject: [PATCH 373/475] soapy gain input box for airspyhf

---
 htdocs/lib/settings/SdrDevice.js | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/htdocs/lib/settings/SdrDevice.js b/htdocs/lib/settings/SdrDevice.js
index f8acada..79c970b 100644
--- a/htdocs/lib/settings/SdrDevice.js
+++ b/htdocs/lib/settings/SdrDevice.js
@@ -210,9 +210,31 @@ SdrplaySdrDevice.prototype.getMappings = function() {
     });
 };
 
+AirspyHfSdrDevice = function() {
+    SoapySdrDevice.apply(this, arguments);
+};
+
+AirspyHfSdrDevice.prototype = Object.create(SoapySdrDevice.prototype);
+AirspyHfSdrDevice.prototype.constructor = AirspyHfSdrDevice;
+
+AirspyHfSdrDevice.prototype.getMappings = function() {
+    var mappings = SoapySdrDevice.prototype.getMappings.apply(this, arguments);
+    return $.extend(new Object(), mappings, {
+        "rf_gain": {
+            constructor: SoapyGainInput,
+            initialValue: 0,
+            inputOptions: {
+                label: "Gain",
+                gains: ['RF', 'VGA']
+            }
+        }
+    });
+};
+
 SdrDevice.types = {
     'rtl_sdr': RtlSdrDevice,
-    'sdrplay': SdrplaySdrDevice
+    'sdrplay': SdrplaySdrDevice,
+    'airspyhf': AirspyHfSdrDevice
 };
 
 $.fn.sdrdevice = function() {

From adcac7b54af4c372efaf15ee4f7e6a4c9e0faeec Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 31 May 2020 20:52:45 +0200
Subject: [PATCH 374/475] hackrf gain settings

---
 htdocs/lib/settings/SdrDevice.js | 54 +++++++++++++++++---------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/htdocs/lib/settings/SdrDevice.js b/htdocs/lib/settings/SdrDevice.js
index 79c970b..25f85c9 100644
--- a/htdocs/lib/settings/SdrDevice.js
+++ b/htdocs/lib/settings/SdrDevice.js
@@ -185,10 +185,22 @@ SoapySdrDevice.prototype.getMappings = function() {
                 label: "Soapy device selector"
             },
             initialValue: ""
+        },
+        "rf_gain": {
+            constructor: SoapyGainInput,
+            initialValue: 0,
+            inputOptions: {
+                label: "Gain",
+                gains: this.getGains()
+            }
         }
     });
 };
 
+SoapySdrDevice.prototype.getGains = function() {
+    return [];
+};
+
 SdrplaySdrDevice = function() {
     SoapySdrDevice.apply(this, arguments);
 };
@@ -196,18 +208,8 @@ SdrplaySdrDevice = function() {
 SdrplaySdrDevice.prototype = Object.create(SoapySdrDevice.prototype);
 SdrplaySdrDevice.prototype.constructor = SdrplaySdrDevice;
 
-SdrplaySdrDevice.prototype.getMappings = function() {
-    var mappings = SoapySdrDevice.prototype.getMappings.apply(this, arguments);
-    return $.extend(new Object(), mappings, {
-        "rf_gain": {
-            constructor: SoapyGainInput,
-            initialValue: 0,
-            inputOptions: {
-                label: "Gain",
-                gains: ['RFGR', 'IFGR']
-            }
-        }
-    });
+SdrplaySdrDevice.prototype.getGains = function() {
+    return ['RFGR', 'IFGR'];
 };
 
 AirspyHfSdrDevice = function() {
@@ -217,24 +219,26 @@ AirspyHfSdrDevice = function() {
 AirspyHfSdrDevice.prototype = Object.create(SoapySdrDevice.prototype);
 AirspyHfSdrDevice.prototype.constructor = AirspyHfSdrDevice;
 
-AirspyHfSdrDevice.prototype.getMappings = function() {
-    var mappings = SoapySdrDevice.prototype.getMappings.apply(this, arguments);
-    return $.extend(new Object(), mappings, {
-        "rf_gain": {
-            constructor: SoapyGainInput,
-            initialValue: 0,
-            inputOptions: {
-                label: "Gain",
-                gains: ['RF', 'VGA']
-            }
-        }
-    });
+AirspyHfSdrDevice.prototype.getGains = function() {
+    return ['RF', 'VGA'];
+};
+
+HackRfSdrDevice = function() {
+    SoapySdrDevice.apply(this, arguments);
+};
+
+HackRfSdrDevice.prototype = Object.create(SoapySdrDevice.prototype);
+HackRfSdrDevice.prototype.constructor = HackRfSdrDevice;
+
+HackRfSdrDevice.prototype.getGains = function() {
+    return ['LNA', 'VGA', 'AMP'];
 };
 
 SdrDevice.types = {
     'rtl_sdr': RtlSdrDevice,
     'sdrplay': SdrplaySdrDevice,
-    'airspyhf': AirspyHfSdrDevice
+    'airspyhf': AirspyHfSdrDevice,
+    'hackrf': HackRfSdrDevice
 };
 
 $.fn.sdrdevice = function() {

From 1019ed5793d495f8316217a08f408ef8aa46ca01 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 31 May 2020 21:24:07 +0200
Subject: [PATCH 375/475] fill gain input with values

---
 htdocs/lib/settings/Input.js | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/htdocs/lib/settings/Input.js b/htdocs/lib/settings/Input.js
index 4686aac..f638257 100644
--- a/htdocs/lib/settings/Input.js
+++ b/htdocs/lib/settings/Input.js
@@ -75,13 +75,14 @@ SoapyGainInput.prototype.render = function(){
             return '<div class="row option form-group gain-mode-separate">' +
                 '<div class="col-4">' + g + '</div>' +
                 '<div class="col-8">' +
-                    '<input class="form-control form-control-sm" type="number">' +
+                    '<input class="form-control form-control-sm" data-gain="' + g + '" type="number">' +
                 '</div>' +
             '</div>';
         }).join('')
     );
     var el = $(this.bootstrapify(markup))
     var setMode = function(mode){
+        el.find('select').val(mode);
         el.find('.option').hide();
         el.find('.gain-mode-' + mode).show();
     };
@@ -89,7 +90,30 @@ SoapyGainInput.prototype.render = function(){
         var mode = $(this).val();
         setMode(mode);
     });
-    setMode('auto');
+    if (typeof(this.value) === 'number') {
+        setMode('single');
+        el.find('.gain-mode-single input').val(this.value);
+    } else if (typeof(this.value) === 'string') {
+        if (this.value === 'auto') {
+            setMode('auto');
+        } else {
+            setMode('separate');
+            values = $.extend.apply($, this.value.split(',').map(function(seg){
+                var split = seg.split('=');
+                if (split.length < 2) return;
+                var res = {};
+                res[split[0]] = parseInt(split[1]);
+                return res;
+            }));
+            el.find('.gain-mode-separate input').each(function(){
+                var $input = $(this);
+                var g = $input.data('gain');
+                $input.val(g in values ? values[g] : 0);
+            });
+        }
+    } else {
+        setMode('auto');
+    }
     return el;
 };
 

From ebd1e04414bc5e492de534ab0611b608f731cf73 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 1 Jun 2020 15:58:15 +0200
Subject: [PATCH 376/475] remove sdr.hu parts

---
 config_webrx.py              |  9 --------
 owrx/__main__.py             |  5 -----
 owrx/controllers/settings.py | 12 ----------
 owrx/sdrhu.py                | 43 ------------------------------------
 sdrhu.py                     | 40 ---------------------------------
 5 files changed, 109 deletions(-)
 delete mode 100644 owrx/sdrhu.py
 delete mode 100755 sdrhu.py

diff --git a/config_webrx.py b/config_webrx.py
index 15b96e4..c379749 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -59,15 +59,6 @@ Antenna: Receiver Antenna<br />
 Website: <a href="http://localhost" target="_blank">http://localhost</a>
 """
 
-# ==== sdr.hu listing ====
-# If you want your ham receiver to be listed publicly on sdr.hu, then take the following steps:
-# 1. Register at: http://sdr.hu/register
-# 2. You will get an unique key by email. Copy it and paste here:
-sdrhu_key = ""
-# 3. Set this setting to True to enable listing:
-sdrhu_public_listing = False
-server_hostname = "localhost"
-
 # ==== DSP/RX settings ====
 fft_fps = 9
 fft_size = 4096  # Should be power of 2
diff --git a/owrx/__main__.py b/owrx/__main__.py
index 84bca23..2bf3ec9 100644
--- a/owrx/__main__.py
+++ b/owrx/__main__.py
@@ -9,7 +9,6 @@ from owrx.config import Config
 from owrx.feature import FeatureDetector
 from owrx.sdr import SdrService
 from socketserver import ThreadingMixIn
-from owrx.sdrhu import SdrHuUpdater
 from owrx.service import Services
 from owrx.websocket import WebSocketConnection
 from owrx.pskreporter import PskReporter
@@ -59,10 +58,6 @@ Support and info:       https://groups.io/g/openwebrx
     # Get error messages about unknown / unavailable features as soon as possible
     SdrService.loadProps()
 
-    if "sdrhu_key" in pm and pm["sdrhu_public_listing"]:
-        updater = SdrHuUpdater()
-        updater.start()
-
     Services.start()
 
     try:
diff --git a/owrx/controllers/settings.py b/owrx/controllers/settings.py
index 1eaceed..368a167 100644
--- a/owrx/controllers/settings.py
+++ b/owrx/controllers/settings.py
@@ -244,18 +244,6 @@ class GeneralSettingsController(AdminController):
                 infotext="This callsign will be used to send spots to pskreporter.info",
             ),
         ),
-        Section(
-            "sdr.hu",
-            TextInput(
-                "sdrhu_key",
-                "sdr.hu key",
-                infotext='Please obtain your personal key on <a href="https://sdr.hu" target="_blank">sdr.hu</a>',
-            ),
-            CheckboxInput(
-                "sdrhu_public_listing", "List on sdr.hu", "List my receiver on sdr.hu"
-            ),
-            TextInput("server_hostname", "Hostname"),
-        ),
     ]
 
     def render_sections(self):
diff --git a/owrx/sdrhu.py b/owrx/sdrhu.py
deleted file mode 100644
index 193399f..0000000
--- a/owrx/sdrhu.py
+++ /dev/null
@@ -1,43 +0,0 @@
-import threading
-import time
-from owrx.config import Config
-from urllib import request, parse
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-
-class SdrHuUpdater(threading.Thread):
-    def __init__(self):
-        self.doRun = True
-        super().__init__(daemon=True)
-
-    def update(self):
-        pm = Config.get().filter("server_hostname", "web_port", "sdrhu_key")
-        data = parse.urlencode({
-            "url": "http://{server_hostname}:{web_port}".format(**pm.__dict__()),
-            "apikey": pm["sdrhu_key"]
-        }).encode()
-
-        res = request.urlopen("https://sdr.hu/update", data=data)
-        if res.getcode() < 200 or res.getcode() >= 300:
-            logger.warning('sdr.hu update failed with error code %i', res.getcode())
-            return 2
-
-        returned = res.read().decode("utf-8")
-        if "UPDATE:" not in returned:
-            logger.warning("Update failed, your receiver cannot be listed on sdr.hu!")
-            return 2
-
-        value = returned.split("UPDATE:")[1].split("\n", 1)[0]
-        if value.startswith("SUCCESS"):
-            logger.info("Update succeeded!")
-        else:
-            logger.warning("Update failed, your receiver cannot be listed on sdr.hu! Reason: %s", value)
-        return 20
-
-    def run(self):
-        while self.doRun:
-            retrytime_mins = self.update()
-            time.sleep(60 * retrytime_mins)
diff --git a/sdrhu.py b/sdrhu.py
deleted file mode 100755
index 9678a9b..0000000
--- a/sdrhu.py
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/python3
-"""
-
-    This file is part of OpenWebRX, 
-    an open-source SDR receiver software with a web UI.
-    Copyright (c) 2013-2015 by Andras Retzler <randras@sdr.hu>
-    Copyright (c) 2019-2020 by Jakob Ketterl <dd5jfk@darc.de>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as
-    published by the Free Software Foundation, either version 3 of the
-    License, or (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-"""
-
-from owrx.sdrhu import SdrHuUpdater
-from owrx.config import Config
-
-import logging
-logging.basicConfig(level=logging.DEBUG, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-logger = logging.getLogger(__name__)
-
-if __name__ == "__main__":
-    pm = Config.get()
-
-    if "sdrhu_public_listing" not in pm or not pm["sdrhu_public_listing"]:
-        logger.error('Public listing on sdr.hu is not activated. Please check "sdrhu_public_listing" in your config.')
-        exit(1)
-    if "sdrhu_key" not in pm or pm["sdrhu_key"] is None or pm["sdrhu_key"] == "":
-        logger.error('Missing "sdrhu_key" in your config. Aborting')
-        exit(1)
-    SdrHuUpdater().update()

From c87cfed525d2dc245f7740b5bb0d6b47e083bbae Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 1 Jun 2020 16:03:22 +0200
Subject: [PATCH 377/475] remove old status urls

---
 owrx/controllers/status.py | 22 +---------------------
 owrx/http.py               |  5 +----
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/owrx/controllers/status.py b/owrx/controllers/status.py
index 61f7102..beded28 100644
--- a/owrx/controllers/status.py
+++ b/owrx/controllers/status.py
@@ -9,26 +9,6 @@ import pkg_resources
 
 
 class StatusController(Controller):
-    def indexAction(self):
-        pm = Config.get()
-        # convert to old format
-        gps = (pm["receiver_gps"]["lat"], pm["receiver_gps"]["lon"])
-        avatar_path = pkg_resources.resource_filename("htdocs", "gfx/openwebrx-avatar.png")
-        # TODO keys that have been left out since they are no longer simple strings: sdr_hw, bands, antenna
-        vars = {
-            "status": "active",
-            "name": pm["receiver_name"],
-            "op_email": pm["receiver_admin"],
-            "users": ClientRegistry.getSharedInstance().clientCount(),
-            "users_max": pm["max_clients"],
-            "gps": gps,
-            "asl": pm["receiver_asl"],
-            "loc": pm["receiver_location"],
-            "sw_version": openwebrx_version,
-            "avatar_ctime": os.path.getctime(avatar_path),
-        }
-        self.send_response("\n".join(["{key}={value}".format(key=key, value=value) for key, value in vars.items()]))
-
     def getProfileStats(self, profile):
         return {
             "name": profile["name"],
@@ -45,7 +25,7 @@ class StatusController(Controller):
         }
         return stats
 
-    def jsonAction(self):
+    def indexAction(self):
         pm = Config.get()
 
         status = {
diff --git a/owrx/http.py b/owrx/http.py
index 8381646..812bec0 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -89,15 +89,12 @@ class Router(object):
     def __init__(self):
         self.routes = [
             StaticRoute("/", IndexController),
-            StaticRoute("/status", StatusController),
-            StaticRoute("/status.json", StatusController, options={"action": "jsonAction"}),
+            StaticRoute("/status.json", StatusController),
             RegexRoute("/static/(.+)", OwrxAssetsController),
             RegexRoute("/compiled/(.+)", CompiledAssetsController),
             RegexRoute("/aprs-symbols/(.+)", AprsSymbolsController),
             StaticRoute("/ws/", WebSocketController),
             RegexRoute("(/favicon.ico)", OwrxAssetsController),
-            # backwards compatibility for the sdr.hu portal
-            RegexRoute("(/gfx/openwebrx-avatar.png)", OwrxAssetsController),
             StaticRoute("/map", MapController),
             StaticRoute("/features", FeatureController),
             StaticRoute("/api/features", ApiController),

From 835501a5f4b439709cbd7b4cc8b6eb58538c0ded Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 1 Jun 2020 18:15:03 +0200
Subject: [PATCH 378/475] update changelog

---
 CHANGELOG.md     | 1 +
 debian/changelog | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f77877..972be94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
   csdr and owrx_connector to allow the images to run on a wider range of CPUs
 - Docker containers have been updated to include the SDRplay driver version 3
 - HackRF support is now based on SoapyHackRF
+- Removed sdr.hu server listing support since the site has been shut down
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index d5a6434..d44716a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
   * Reorganization of the frontend demodulator code
   * Improve receiver load time by concatenating javascript assets
   * HackRF support is now based on SoapyHackRF
+  * Removed sdr.hu server listing support since the site has been shut down
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From ea65ef010092f4f3fca727371af8a19d79b08da2 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 1 Jun 2020 18:34:54 +0200
Subject: [PATCH 379/475] update changelog

---
 CHANGELOG.md     | 1 +
 debian/changelog | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 972be94..7fd020d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - Docker containers have been updated to include the SDRplay driver version 3
 - HackRF support is now based on SoapyHackRF
 - Removed sdr.hu server listing support since the site has been shut down
+- Added support for Radioberry 2 Rasbperry Pi SDR Cape
 
 **0.18.0**
 - Support for SoapyRemote
diff --git a/debian/changelog b/debian/changelog
index d44716a..bb4363d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
   * Improve receiver load time by concatenating javascript assets
   * HackRF support is now based on SoapyHackRF
   * Removed sdr.hu server listing support since the site has been shut down
+  * Added support for Radioberry 2 Rasbperry Pi SDR Cape
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
 

From 16c59c324598c20078bf443ffb1eb79eacc62435 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 1 Jun 2020 19:05:09 +0200
Subject: [PATCH 380/475] release versions

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb4363d..ead4569 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openwebrx (0.19.0) UNRELEASED; urgency=low
+openwebrx (0.19.0) buster focal; urgency=low
   * Fix direwolf connection setup by implementing a retry loop
   * Pass direct sampling mode changes for rtl_sdr_soapy to owrx_connector
   * OSM maps instead of Google when google_maps_api_key is not set (thanks
@@ -27,7 +27,7 @@ openwebrx (0.19.0) UNRELEASED; urgency=low
   * Removed sdr.hu server listing support since the site has been shut down
   * Added support for Radioberry 2 Rasbperry Pi SDR Cape
 
- -- Jakob Ketterl <jakob.ketterl@gmx.de>  Thu, 20 Feb 2020 21:01:00 +0000
+ -- Jakob Ketterl <jakob.ketterl@gmx.de>  Mon, 01 Jun 2020 17:02:00 +0000
 
 openwebrx (0.18.0) buster; urgency=low
 

From ae295d72ae1755a0b2ae9aa2954bab1be4707d26 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 1 Jun 2020 19:41:38 +0200
Subject: [PATCH 381/475] remove "under construction" notice

---
 htdocs/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 22f33bb..f0b2360 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -45,10 +45,6 @@
     </div>
     <div id="openwebrx-panels-container">
         <div id="openwebrx-panels-container-left">
-            <div class="openwebrx-panel" data-panel-name="client-under-devel" style="width: 245px; background-color: Red;">
-                <span style="font-size: 15pt; font-weight: bold;">Under construction</span>
-                <br />We're working on the code right now, so the application might fail.
-            </div>
             <div class="openwebrx-panel" id="openwebrx-panel-digimodes" style="display: none; width: 619px;" data-panel-name="digimodes">
                 <div id="openwebrx-digimode-canvas-container">
                     <div id="openwebrx-digimode-select-channel"></div>

From 09caae2fcc836dfa1f91241bc4dbba45a10fd1bc Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 1 Jun 2020 21:44:02 +0200
Subject: [PATCH 382/475] update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fd020d..67f3876 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-**unreleased**
+**0.19.0**
 - Fix direwolf connection setup by implementing a retry loop
 - Pass direct sampling mode changes for rtl_sdr_soapy to owrx_connector
 - OSM maps instead of Google when google_maps_api_key is not set (thanks @jquagga)

From 017ad818efd123a969cbcd84108c1ade1779c6da Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 1 Jun 2020 22:43:58 +0200
Subject: [PATCH 383/475] fix up default configuration

---
 config_webrx.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index c379749..58db861 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -164,14 +164,14 @@ sdrs = {
                 "center_freq": 7100000,
                 "samp_rate": 256000,
                 "start_freq": 7070000,
-                "start_mod": "usb",
+                "start_mod": "lsb",
             },
             "80m": {
                 "name": "80m",
                 "center_freq": 3650000,
                 "samp_rate": 768000,
                 "start_freq": 3570000,
-                "start_mod": "usb",
+                "start_mod": "lsb",
             },
             "49m": {
                 "name": "49m Broadcast",
@@ -186,6 +186,7 @@ sdrs = {
         "name": "SDRPlay RSP2",
         "type": "sdrplay",
         "ppm": 0,
+        "antenna": "Antenna A",
         "profiles": {
             "20m": {
                 "name": "20m",
@@ -194,7 +195,6 @@ sdrs = {
                 "samp_rate": 500000,
                 "start_freq": 14070000,
                 "start_mod": "usb",
-                "antenna": "Antenna A",
             },
             "30m": {
                 "name": "30m",
@@ -210,8 +210,7 @@ sdrs = {
                 "rf_gain": 0,
                 "samp_rate": 500000,
                 "start_freq": 7070000,
-                "start_mod": "usb",
-                "antenna": "Antenna A",
+                "start_mod": "lsb",
             },
             "80m": {
                 "name": "80m",
@@ -219,8 +218,7 @@ sdrs = {
                 "rf_gain": 0,
                 "samp_rate": 500000,
                 "start_freq": 3570000,
-                "start_mod": "usb",
-                "antenna": "Antenna A",
+                "start_mod": "lsb",
             },
             "49m": {
                 "name": "49m Broadcast",
@@ -229,7 +227,6 @@ sdrs = {
                 "samp_rate": 500000,
                 "start_freq": 6070000,
                 "start_mod": "am",
-                "antenna": "Antenna A",
             },
         },
     },

From 3479148b8604f59f620e15d551e5bc6840941dd8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 1 Jun 2020 22:52:35 +0200
Subject: [PATCH 384/475] more tuning of the default configuration

---
 config_webrx.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index 58db861..9d05494 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -148,7 +148,7 @@ sdrs = {
             "20m": {
                 "name": "20m",
                 "center_freq": 14150000,
-                "samp_rate": 768000,
+                "samp_rate": 384000,
                 "start_freq": 14070000,
                 "start_mod": "usb",
             },
@@ -169,14 +169,14 @@ sdrs = {
             "80m": {
                 "name": "80m",
                 "center_freq": 3650000,
-                "samp_rate": 768000,
+                "samp_rate": 384000,
                 "start_freq": 3570000,
                 "start_mod": "lsb",
             },
             "49m": {
                 "name": "49m Broadcast",
-                "center_freq": 6000000,
-                "samp_rate": 768000,
+                "center_freq": 6050000,
+                "samp_rate": 384000,
                 "start_freq": 6070000,
                 "start_mod": "am",
             },

From 1e84ced9a9775527f6a0462c775ca97d8cdb477c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 2 Jun 2020 21:12:25 +0200
Subject: [PATCH 385/475] resture "under construction" notice

---
 htdocs/index.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/htdocs/index.html b/htdocs/index.html
index f0b2360..22f33bb 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -45,6 +45,10 @@
     </div>
     <div id="openwebrx-panels-container">
         <div id="openwebrx-panels-container-left">
+            <div class="openwebrx-panel" data-panel-name="client-under-devel" style="width: 245px; background-color: Red;">
+                <span style="font-size: 15pt; font-weight: bold;">Under construction</span>
+                <br />We're working on the code right now, so the application might fail.
+            </div>
             <div class="openwebrx-panel" id="openwebrx-panel-digimodes" style="display: none; width: 619px;" data-panel-name="digimodes">
                 <div id="openwebrx-digimode-canvas-container">
                     <div id="openwebrx-digimode-select-channel"></div>

From 81465d69cc496de2e93969997f2a68e75407bf6f Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 2 Jun 2020 21:18:05 +0200
Subject: [PATCH 386/475] introduce next version to develop branch

---
 CHANGELOG.md     | 2 ++
 debian/changelog | 4 ++++
 owrx/version.py  | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67f3876..65273f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+**unreleased**
+
 **0.19.0**
 - Fix direwolf connection setup by implementing a retry loop
 - Pass direct sampling mode changes for rtl_sdr_soapy to owrx_connector
diff --git a/debian/changelog b/debian/changelog
index ead4569..1212c7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,7 @@
+openwebrx (0.20.0) UNRELEASED; urgency=low
+
+ -- Jakob Ketterl <jakob.ketterl@gmx.de>  Tue, Jun 02 2020 19:16:00 +0000
+
 openwebrx (0.19.0) buster focal; urgency=low
   * Fix direwolf connection setup by implementing a retry loop
   * Pass direct sampling mode changes for rtl_sdr_soapy to owrx_connector
diff --git a/owrx/version.py b/owrx/version.py
index 285f9f2..03ac1e5 100644
--- a/owrx/version.py
+++ b/owrx/version.py
@@ -1,5 +1,5 @@
 from distutils.version import StrictVersion
 
-_versionstring = "0.19.0"
+_versionstring = "0.20.0"
 strictversion = StrictVersion(_versionstring)
 openwebrx_version = "v{0}".format(strictversion)

From c0f447ca2009d3da586acf1f023bbb609a432a23 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 7 Jun 2020 22:53:31 +0200
Subject: [PATCH 387/475] fix rockprog integration

---
 owrx/source/fifi_sdr.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/owrx/source/fifi_sdr.py b/owrx/source/fifi_sdr.py
index fa97d89..69babf4 100644
--- a/owrx/source/fifi_sdr.py
+++ b/owrx/source/fifi_sdr.py
@@ -17,10 +17,10 @@ class FifiSdrSource(DirectSource):
         return super().getEventNames() + ["device"]
 
     def getFormatConversion(self):
-        return ["csdr convert_s16_f", "csdr gain_ff 30"]
+        return ["csdr convert_s16_f", "csdr gain_ff 5"]
 
     def sendRockProgFrequency(self, frequency):
-        process = Popen(["rockprog", "--vco", "-w", "--", "freq={}".format(frequency / 1E6)])
+        process = Popen(["rockprog", "--vco", "-w", "--freq={}".format(frequency / 1E6)])
         process.communicate()
         rc = process.wait()
         if rc != 0:

From 61d03b38b9667719e654ec37917cdc485b5199ad Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 10 Jun 2020 20:09:40 +0200
Subject: [PATCH 388/475] receiver receiverid challenge and find corresponding
 key

---
 owrx/controllers/status.py | 14 ++++++---
 owrx/http.py               | 22 +++++++------
 owrx/receiverid.py         | 63 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+), 14 deletions(-)
 create mode 100644 owrx/receiverid.py

diff --git a/owrx/controllers/status.py b/owrx/controllers/status.py
index beded28..05baece 100644
--- a/owrx/controllers/status.py
+++ b/owrx/controllers/status.py
@@ -1,11 +1,13 @@
 from . import Controller
-from owrx.client import ClientRegistry
 from owrx.version import openwebrx_version
 from owrx.sdr import SdrService
 from owrx.config import Config
-import os
+from owrx.receiverid import ReceiverId, KeyException
 import json
-import pkg_resources
+
+import logging
+
+logger = logging.getLogger(__name__)
 
 
 class StatusController(Controller):
@@ -27,7 +29,11 @@ class StatusController(Controller):
 
     def indexAction(self):
         pm = Config.get()
-
+        if "Authorization" in self.request.headers:
+            try:
+                ReceiverId.getResponseHeader(self.request.headers["Authorization"])
+            except KeyException:
+                logger.exception("error processing authorization header")
         status = {
             "receiver": {
                 "name": pm["receiver_name"],
diff --git a/owrx/http.py b/owrx/http.py
index 812bec0..538bec9 100644
--- a/owrx/http.py
+++ b/owrx/http.py
@@ -35,19 +35,26 @@ class RequestHandler(BaseHTTPRequestHandler):
         logger.debug("%s - - [%s] %s", self.address_string(), self.log_date_time_string(), format % args)
 
     def do_GET(self):
-        self.router.route(self, "GET")
+        self.router.route(self, self.get_request("GET"))
 
     def do_POST(self):
-        self.router.route(self, "POST")
+        self.router.route(self, self.get_request("POST"))
+
+    def get_request(self, method):
+        url = urlparse(self.path)
+        return Request(url, method, self.headers)
 
 
 class Request(object):
-    def __init__(self, url, method, cookies):
+    def __init__(self, url, method, headers):
         self.path = url.path
         self.query = parse_qs(url.query)
         self.matches = None
         self.method = method
-        self.cookies = cookies
+        self.headers = headers
+        self.cookies = SimpleCookie()
+        if "Cookie" in headers:
+            self.cookies.load(headers["Cookie"])
 
     def setMatches(self, matches):
         self.matches = matches
@@ -114,12 +121,7 @@ class Router(object):
             if r.matches(request):
                 return r
 
-    def route(self, handler, method):
-        url = urlparse(handler.path)
-        cookies = SimpleCookie()
-        if "Cookie" in handler.headers:
-            cookies.load(handler.headers["Cookie"])
-        request = Request(url, method, cookies)
+    def route(self, handler, request):
         route = self.find_route(request)
         if route is not None:
             controller = route.controller
diff --git a/owrx/receiverid.py b/owrx/receiverid.py
new file mode 100644
index 0000000..f2d9efe
--- /dev/null
+++ b/owrx/receiverid.py
@@ -0,0 +1,63 @@
+import re
+import logging
+from owrx.config import Config
+
+logger = logging.getLogger(__name__)
+
+
+keyRegex = re.compile("^([a-zA-Z]+)-([0-9a-f]{32})-([0-9a-f]{64})$")
+keyChallengeRegex = re.compile("^([a-zA-Z]+)-([0-9a-f]{32})-([0-9a-f]{32})$")
+headerRegex = re.compile("^ReceiverId (.*)$")
+
+
+class KeyException(Exception):
+    pass
+
+
+class Key(object):
+    def __init__(self, keyString):
+        matches = keyRegex.match(keyString)
+        if not matches:
+            raise KeyException("invalid key format")
+        self.source = matches.group(1)
+        self.id = matches.group(2)
+        self.secret = matches.group(3)
+
+
+class KeyChallenge(object):
+    def __init__(self, challengeString):
+        matches = keyChallengeRegex.match(challengeString)
+        if not matches:
+            raise KeyException("invalid key challenge format")
+        self.source = matches.group(1)
+        self.id = matches.group(2)
+        self.challenge = matches.group(3)
+
+
+class KeyResponse(object):
+    def __str__(self):
+        return "TODO"
+
+
+class ReceiverId(object):
+    @staticmethod
+    def getResponseHeader(requestHeader):
+        matches = headerRegex.match(requestHeader)
+        if not matches:
+            raise KeyException("invalid authorization header")
+        challenge = KeyChallenge(matches.group(1))
+        key = ReceiverId.findKey(challenge)
+        # TODO sign challenge and respond
+
+    @staticmethod
+    def findKey(challenge):
+        def parseKey(keyString):
+            try:
+                return Key(keyString)
+            except KeyError as e:
+                logger.error(e)
+        keys = [key for key in (parseKey(keyString) for keyString in Config.get()['receiver_keys']) if key is not None]
+        matching_keys = [key for key in keys if key.source == challenge.source and key.id == challenge.id]
+        if matching_keys:
+            return matching_keys[0]
+        return None

From eebe33f8961e4fe8437c2520606a13b790c39d77 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 10 Jun 2020 22:50:16 +0200
Subject: [PATCH 389/475] implement signature algorithm

---
 owrx/controllers/__init__.py | 12 ++++++++----
 owrx/controllers/status.py   |  5 +++--
 owrx/receiverid.py           | 16 +++++++++++++++-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/owrx/controllers/__init__.py b/owrx/controllers/__init__.py
index f668c6e..fede537 100644
--- a/owrx/controllers/__init__.py
+++ b/owrx/controllers/__init__.py
@@ -7,14 +7,18 @@ class Controller(object):
         self.request = request
         self.options = options
 
-    def send_response(self, content, code=200, content_type="text/html", last_modified: datetime = None, max_age=None):
+    def send_response(self, content, code=200, content_type="text/html", last_modified: datetime = None, max_age=None, headers=None):
         self.handler.send_response(code)
+        if headers is None:
+            headers = {}
         if content_type is not None:
-            self.handler.send_header("Content-Type", content_type)
+            headers["Content-Type"] = content_type
         if last_modified is not None:
-            self.handler.send_header("Last-Modified", last_modified.strftime("%a, %d %b %Y %H:%M:%S GMT"))
+            headers["Last-Modified"] = last_modified.strftime("%a, %d %b %Y %H:%M:%S GMT")
         if max_age is not None:
-            self.handler.send_header("Cache-Control", "max-age: {0}".format(max_age))
+            headers["Cache-Control"] = "max-age: {0}".format(max_age)
+        for key, value in headers.items():
+            self.handler.send_header(key, value)
         self.handler.end_headers()
         if type(content) == str:
             content = content.encode()
diff --git a/owrx/controllers/status.py b/owrx/controllers/status.py
index 05baece..c3100de 100644
--- a/owrx/controllers/status.py
+++ b/owrx/controllers/status.py
@@ -29,9 +29,10 @@ class StatusController(Controller):
 
     def indexAction(self):
         pm = Config.get()
+        headers = None
         if "Authorization" in self.request.headers:
             try:
-                ReceiverId.getResponseHeader(self.request.headers["Authorization"])
+                headers = ReceiverId.getResponseHeader(self.request.headers["Authorization"])
             except KeyException:
                 logger.exception("error processing authorization header")
         status = {
@@ -46,4 +47,4 @@ class StatusController(Controller):
             "version": openwebrx_version,
             "sdrs": [self.getReceiverStats(r) for r in SdrService.getSources().values()]
         }
-        self.send_response(json.dumps(status), content_type="application/json")
+        self.send_response(json.dumps(status), content_type="application/json", headers=headers)
diff --git a/owrx/receiverid.py b/owrx/receiverid.py
index f2d9efe..782e90f 100644
--- a/owrx/receiverid.py
+++ b/owrx/receiverid.py
@@ -1,5 +1,7 @@
 import re
 import logging
+import hashlib
+from datetime import datetime
 from owrx.config import Config
 
 logger = logging.getLogger(__name__)
@@ -47,7 +49,11 @@ class ReceiverId(object):
             raise KeyException("invalid authorization header")
         challenge = KeyChallenge(matches.group(1))
         key = ReceiverId.findKey(challenge)
-        # TODO sign challenge and respond
+        time, signature = ReceiverId.signChallenge(challenge, key)
+        return {
+            "Signature": signature,
+            "Time": time,
+        }
 
     @staticmethod
     def findKey(challenge):
@@ -61,3 +67,11 @@ class ReceiverId(object):
         if matching_keys:
             return matching_keys[0]
         return None
+
+    @staticmethod
+    def signChallenge(challenge, key):
+        now = datetime.utcnow().isoformat()
+        signString = "{challenge}:{time}".format(challenge=challenge.challenge, time=now)
+        m = hashlib.sha256()
+        m.update(signString.encode())
+        return now, m.hexdigest()

From 8278ece803cddf53754d02fd0a546936bb8c0d50 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 10 Jun 2020 23:34:09 +0200
Subject: [PATCH 390/475] add receiver keys to configuration

---
 config_webrx.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/config_webrx.py b/config_webrx.py
index 9d05494..c3f0e40 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -59,6 +59,19 @@ Antenna: Receiver Antenna<br />
 Website: <a href="http://localhost" target="_blank">http://localhost</a>
 """
 
+# ==== Public receiver listings ====
+# You can publish your receiver on online receiver directories, like https://www.receiverbook.de
+# You will receive a receiver key from the directory that will authenticate you as the operator of this receiver.
+# Please note that you not share your receiver keys publicly since anyone that obtains your receiver key can take over
+# your public listing.
+# Your receiver keys should be placed into this array:
+receiver_keys = []
+# You can list your receiver on multiple sites, you can place all your keys into the array above, or you can append
+# more keys like this:
+# receiver_keys += "my-receiver-key"
+
+# If you're not sure, simply copy & paste the code you received from your listing site below this line:
+
 # ==== DSP/RX settings ====
 fft_fps = 9
 fft_size = 4096  # Should be power of 2

From 0e4f772c69bc0e8028d60a332edf344fba0d714e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 11 Jun 2020 00:00:16 +0200
Subject: [PATCH 391/475] perform actual hmac signature

---
 owrx/receiverid.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/owrx/receiverid.py b/owrx/receiverid.py
index 782e90f..f27bd95 100644
--- a/owrx/receiverid.py
+++ b/owrx/receiverid.py
@@ -1,6 +1,7 @@
 import re
 import logging
 import hashlib
+import hmac
 from datetime import datetime
 from owrx.config import Config
 
@@ -49,6 +50,8 @@ class ReceiverId(object):
             raise KeyException("invalid authorization header")
         challenge = KeyChallenge(matches.group(1))
         key = ReceiverId.findKey(challenge)
+        if key is None:
+            return {}
         time, signature = ReceiverId.signChallenge(challenge, key)
         return {
             "Signature": signature,
@@ -60,9 +63,10 @@ class ReceiverId(object):
         def parseKey(keyString):
             try:
                 return Key(keyString)
-            except KeyError as e:
+            except KeyException as e:
                 logger.error(e)
-        keys = [key for key in (parseKey(keyString) for keyString in Config.get()['receiver_keys']) if key is not None]
+        keys = [parseKey(keyString) for keyString in Config.get()['receiver_keys']]
+        keys = [key for key in keys if key is not None]
         matching_keys = [key for key in keys if key.source == challenge.source and key.id == challenge.id]
         if matching_keys:
             return matching_keys[0]
@@ -72,6 +76,5 @@ class ReceiverId(object):
     def signChallenge(challenge, key):
         now = datetime.utcnow().isoformat()
         signString = "{challenge}:{time}".format(challenge=challenge.challenge, time=now)
-        m = hashlib.sha256()
-        m.update(signString.encode())
+        m = hmac.new(bytes.fromhex(key.secret), msg=signString.encode('utf8'), digestmod=hashlib.sha256)
         return now, m.hexdigest()

From 5a888568251adff396008b80d1b7ebf3c5463fc1 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 11 Jun 2020 00:01:47 +0200
Subject: [PATCH 392/475] fix array syntax

---
 config_webrx.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index c3f0e40..30e6cb9 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -66,9 +66,9 @@ Website: <a href="http://localhost" target="_blank">http://localhost</a>
 # your public listing.
 # Your receiver keys should be placed into this array:
 receiver_keys = []
-# You can list your receiver on multiple sites, you can place all your keys into the array above, or you can append
-# more keys like this:
-# receiver_keys += "my-receiver-key"
+# If you list your receiver on multiple sites, you can place all your keys into the array above, or you can append
+# keys to the arraylike this:
+# receiver_keys += ["my-receiver-key"]
 
 # If you're not sure, simply copy & paste the code you received from your listing site below this line:
 

From 9a61f90fecab15fcdb09e47b7e9fc9c417ed185a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 11 Jun 2020 20:55:05 +0200
Subject: [PATCH 393/475] parse hex string for hmac

---
 owrx/receiverid.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/owrx/receiverid.py b/owrx/receiverid.py
index f27bd95..bae2728 100644
--- a/owrx/receiverid.py
+++ b/owrx/receiverid.py
@@ -75,6 +75,7 @@ class ReceiverId(object):
     @staticmethod
     def signChallenge(challenge, key):
         now = datetime.utcnow().isoformat()
-        signString = "{challenge}:{time}".format(challenge=challenge.challenge, time=now)
-        m = hmac.new(bytes.fromhex(key.secret), msg=signString.encode('utf8'), digestmod=hashlib.sha256)
+        m = hmac.new(bytes.fromhex(key.secret), digestmod=hashlib.sha256)
+        m.update(bytes.fromhex(challenge.challenge))
+        m.update(now.encode('utf8'))
         return now, m.hexdigest()

From 0f20f1fcdc0838cd1d0fa107951ba1d4d3eea217 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 13 Jun 2020 18:21:22 +0200
Subject: [PATCH 394/475] update changelog

---
 CHANGELOG.md     | 1 +
 debian/changelog | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65273f6..f125365 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 **unreleased**
+- Added ability to authenticate receivers with listing sites using "receiver id" tokens
 
 **0.19.0**
 - Fix direwolf connection setup by implementing a retry loop
diff --git a/debian/changelog b/debian/changelog
index 1212c7a..3366b62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 openwebrx (0.20.0) UNRELEASED; urgency=low
 
+  * Added ability to authenticate receivers with listing sites using
+    "receiver id" tokens
+
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Tue, Jun 02 2020 19:16:00 +0000
 
 openwebrx (0.19.0) buster focal; urgency=low

From 0a2a28cb34f0513a510a245a8c434929f017d480 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 13 Jun 2020 18:26:27 +0200
Subject: [PATCH 395/475] remove debugging

---
 owrx/connection.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index e8f5172..8e3407d 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -138,7 +138,6 @@ class OpenWebRxReceiverClient(OpenWebRxClient):
     def handleTextMessage(self, conn, message):
         try:
             message = json.loads(message)
-            logger.debug(message)
             if "type" in message:
                 if message["type"] == "dspcontrol":
                     if "action" in message and message["action"] == "start":

From a696cc4ed8c0b42123a06dd033bcf7c2c8846161 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 13 Jun 2020 18:31:49 +0200
Subject: [PATCH 396/475] next release version

---
 htdocs/index.html | 4 ----
 owrx/version.py   | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/htdocs/index.html b/htdocs/index.html
index 22f33bb..f0b2360 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -45,10 +45,6 @@
     </div>
     <div id="openwebrx-panels-container">
         <div id="openwebrx-panels-container-left">
-            <div class="openwebrx-panel" data-panel-name="client-under-devel" style="width: 245px; background-color: Red;">
-                <span style="font-size: 15pt; font-weight: bold;">Under construction</span>
-                <br />We're working on the code right now, so the application might fail.
-            </div>
             <div class="openwebrx-panel" id="openwebrx-panel-digimodes" style="display: none; width: 619px;" data-panel-name="digimodes">
                 <div id="openwebrx-digimode-canvas-container">
                     <div id="openwebrx-digimode-select-channel"></div>
diff --git a/owrx/version.py b/owrx/version.py
index 03ac1e5..7e671c0 100644
--- a/owrx/version.py
+++ b/owrx/version.py
@@ -1,5 +1,5 @@
 from distutils.version import StrictVersion
 
-_versionstring = "0.20.0"
+_versionstring = "0.19.1"
 strictversion = StrictVersion(_versionstring)
 openwebrx_version = "v{0}".format(strictversion)

From 8ca068c98f29c640612d0a495da6046fa51703b8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 13 Jun 2020 18:47:17 +0200
Subject: [PATCH 397/475] update changelogs to reflect release

---
 CHANGELOG.md     | 2 +-
 debian/changelog | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f125365..2eb697d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-**unreleased**
+**0.19.1**
 - Added ability to authenticate receivers with listing sites using "receiver id" tokens
 
 **0.19.0**
diff --git a/debian/changelog b/debian/changelog
index 3366b62..c229065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-openwebrx (0.20.0) UNRELEASED; urgency=low
+openwebrx (0.19.1) UNRELEASED; urgency=low
 
   * Added ability to authenticate receivers with listing sites using
     "receiver id" tokens
 
- -- Jakob Ketterl <jakob.ketterl@gmx.de>  Tue, Jun 02 2020 19:16:00 +0000
+ -- Jakob Ketterl <jakob.ketterl@gmx.de>  Sat, Jun 13 2020 16:46:00 +0000
 
 openwebrx (0.19.0) buster focal; urgency=low
   * Fix direwolf connection setup by implementing a retry loop

From bf171bbfdafd48bf08e3590243c608d0ec8815f2 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 13 Jun 2020 18:48:18 +0200
Subject: [PATCH 398/475] add release targets

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c229065..147875e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-openwebrx (0.19.1) UNRELEASED; urgency=low
+openwebrx (0.19.1) buster focal; urgency=low
 
   * Added ability to authenticate receivers with listing sites using
     "receiver id" tokens

From bead51db69da459a3949339e747838019e939bd3 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 13 Jun 2020 18:51:01 +0200
Subject: [PATCH 399/475] fix the date

---
 debian/changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 147875e..57701f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ openwebrx (0.19.1) buster focal; urgency=low
   * Added ability to authenticate receivers with listing sites using
     "receiver id" tokens
 
- -- Jakob Ketterl <jakob.ketterl@gmx.de>  Sat, Jun 13 2020 16:46:00 +0000
+ -- Jakob Ketterl <jakob.ketterl@gmx.de>  Sat, 13 Jun 2020 16:46:00 +0000
 
 openwebrx (0.19.0) buster focal; urgency=low
   * Fix direwolf connection setup by implementing a retry loop

From 83ff417f4da3e534661339900e9ec13e2b3d50d4 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 13 Jun 2020 19:25:15 +0200
Subject: [PATCH 400/475] post-release cleanup

---
 CHANGELOG.md      | 2 ++
 debian/changelog  | 4 ++++
 htdocs/index.html | 4 ++++
 owrx/version.py   | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2eb697d..9b06148 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+**unreleased**
+
 **0.19.1**
 - Added ability to authenticate receivers with listing sites using "receiver id" tokens
 
diff --git a/debian/changelog b/debian/changelog
index 57701f2..b1ae784 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,7 @@
+openwebrx (0.20.0) UNRELEASED; urgency=low
+
+ -- Jakob Ketterl <jakob.ketterl@gmx.de>  Sat, 13 Jun 2020 17:22:00 +0000
+
 openwebrx (0.19.1) buster focal; urgency=low
 
   * Added ability to authenticate receivers with listing sites using
diff --git a/htdocs/index.html b/htdocs/index.html
index f0b2360..22f33bb 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -45,6 +45,10 @@
     </div>
     <div id="openwebrx-panels-container">
         <div id="openwebrx-panels-container-left">
+            <div class="openwebrx-panel" data-panel-name="client-under-devel" style="width: 245px; background-color: Red;">
+                <span style="font-size: 15pt; font-weight: bold;">Under construction</span>
+                <br />We're working on the code right now, so the application might fail.
+            </div>
             <div class="openwebrx-panel" id="openwebrx-panel-digimodes" style="display: none; width: 619px;" data-panel-name="digimodes">
                 <div id="openwebrx-digimode-canvas-container">
                     <div id="openwebrx-digimode-select-channel"></div>
diff --git a/owrx/version.py b/owrx/version.py
index 7e671c0..03ac1e5 100644
--- a/owrx/version.py
+++ b/owrx/version.py
@@ -1,5 +1,5 @@
 from distutils.version import StrictVersion
 
-_versionstring = "0.19.1"
+_versionstring = "0.20.0"
 strictversion = StrictVersion(_versionstring)
 openwebrx_version = "v{0}".format(strictversion)

From b930bb432d5997a0ebb47cebbeabb06895749971 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 14 Jun 2020 21:58:35 +0200
Subject: [PATCH 401/475] add -dev flag to clearly distinguish development
 versions

---
 owrx/version.py | 8 ++++----
 setup.py        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/owrx/version.py b/owrx/version.py
index 03ac1e5..60a4954 100644
--- a/owrx/version.py
+++ b/owrx/version.py
@@ -1,5 +1,5 @@
-from distutils.version import StrictVersion
+from distutils.version import LooseVersion
 
-_versionstring = "0.20.0"
-strictversion = StrictVersion(_versionstring)
-openwebrx_version = "v{0}".format(strictversion)
+_versionstring = "0.20.0-dev"
+looseversion = LooseVersion(_versionstring)
+openwebrx_version = "v{0}".format(looseversion)
diff --git a/setup.py b/setup.py
index c29fdda..e8d7524 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from glob import glob
 from setuptools import setup
-from owrx.version import strictversion
+from owrx.version import looseversion
 
 try:
     from setuptools import find_namespace_packages
@@ -10,7 +10,7 @@ except ImportError:
 
 setup(
     name="OpenWebRX",
-    version=str(strictversion),
+    version=str(looseversion),
     packages=find_namespace_packages(include=["owrx", "owrx.source", "owrx.service", "owrx.controllers", "owrx.property", "owrx.form", "csdr", "htdocs"]),
     package_data={"htdocs": [f[len("htdocs/") :] for f in glob("htdocs/**/*", recursive=True)]},
     entry_points={"console_scripts": ["openwebrx=owrx.__main__:main"]},

From 2eece08d274a4a31eea8637eac1b939243b9d918 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 21 Jun 2020 21:42:32 +0200
Subject: [PATCH 402/475] correct timezone for last-modified header

---
 owrx/controllers/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/owrx/controllers/__init__.py b/owrx/controllers/__init__.py
index fede537..c00eebd 100644
--- a/owrx/controllers/__init__.py
+++ b/owrx/controllers/__init__.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 
 
 class Controller(object):
@@ -14,7 +14,7 @@ class Controller(object):
         if content_type is not None:
             headers["Content-Type"] = content_type
         if last_modified is not None:
-            headers["Last-Modified"] = last_modified.strftime("%a, %d %b %Y %H:%M:%S GMT")
+            headers["Last-Modified"] = last_modified.astimezone(tz=timezone.utc).strftime("%a, %d %b %Y %H:%M:%S GMT")
         if max_age is not None:
             headers["Cache-Control"] = "max-age: {0}".format(max_age)
         for key, value in headers.items():

From 75f4f0bfe032eb0d4737a08a546c088ff32b72ce Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 21 Jun 2020 22:35:40 +0200
Subject: [PATCH 403/475] fix timezones in all places

---
 owrx/controllers/assets.py | 47 ++++++++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index a8b9d4e..5c4bb61 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -1,13 +1,34 @@
 from . import Controller
 from owrx.config import Config
-from datetime import datetime
+from datetime import datetime, timezone
 import mimetypes
 import os
 import pkg_resources
 from abc import ABCMeta, abstractmethod
 
 
-class AssetsController(Controller, metaclass=ABCMeta):
+class ModificationAwaraController(Controller, metaclass=ABCMeta):
+    @abstractmethod
+    def getModified(self, file):
+        pass
+    
+    def wasModified(self, file):
+        try:
+            modified = self.getModified(file).astimezone(timezone.utc).replace(microsecond=0)
+    
+            if modified is not None and "If-Modified-Since" in self.handler.headers:
+                client_modified = datetime.strptime(
+                    self.handler.headers["If-Modified-Since"], "%a, %d %b %Y %H:%M:%S %Z"
+                ).replace(tzinfo=timezone.utc)
+                if modified <= client_modified:
+                    return False
+        except FileNotFoundError:
+            pass
+        
+        return True
+
+
+class AssetsController(ModificationAwaraController, metaclass=ABCMeta):
     def getModified(self, file):
         return datetime.fromtimestamp(os.path.getmtime(self.getFilePath(file)))
 
@@ -22,13 +43,9 @@ class AssetsController(Controller, metaclass=ABCMeta):
         try:
             modified = self.getModified(file)
 
-            if modified is not None and "If-Modified-Since" in self.handler.headers:
-                client_modified = datetime.strptime(
-                    self.handler.headers["If-Modified-Since"], "%a, %d %b %Y %H:%M:%S %Z"
-                )
-                if modified <= client_modified:
-                    self.send_response("", code=304)
-                    return
+            if not self.wasModified(file):
+                self.send_response("", code=304)
+                return
 
             f = self.openFile(file)
             data = f.read()
@@ -63,7 +80,7 @@ class AprsSymbolsController(AssetsController):
         return self.path + file
 
 
-class CompiledAssetsController(Controller):
+class CompiledAssetsController(ModificationAwaraController):
     profiles = {
         "receiver.js": [
             "openwebrx.js",
@@ -107,13 +124,9 @@ class CompiledAssetsController(Controller):
 
         modified = self.getModified(files)
 
-        if modified is not None and "If-Modified-Since" in self.handler.headers:
-            client_modified = datetime.strptime(
-                self.handler.headers["If-Modified-Since"], "%a, %d %b %Y %H:%M:%S %Z"
-            )
-            if modified <= client_modified:
-                self.send_response("", code=304)
-                return
+        if not self.wasModified(files):
+            self.send_response("", code=304)
+            return
 
         contents = [self.getContents(f) for f in files]
 

From 9e323a08ffa5cd076d9e322402b9b8f0963ec7cb Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 22 Jun 2020 00:07:16 +0200
Subject: [PATCH 404/475] remove duplicate css declaration

---
 htdocs/css/openwebrx-header.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/htdocs/css/openwebrx-header.css b/htdocs/css/openwebrx-header.css
index 412e104..8c43360 100644
--- a/htdocs/css/openwebrx-header.css
+++ b/htdocs/css/openwebrx-header.css
@@ -61,7 +61,6 @@
 #webrx-rx-avatar
 {
     background-color: rgba(154, 154, 154, .5);
-    border-radius: 7px;
     float: left;
     margin: 7px;
 

From 480b728c060a8d23c7c91bac0108617fba3f9001 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 23 Jun 2020 00:08:59 +0200
Subject: [PATCH 405/475] move metrics initialization to have initial metrics

---
 owrx/client.py  | 2 --
 owrx/metrics.py | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/owrx/client.py b/owrx/client.py
index 6241a01..f992e45 100644
--- a/owrx/client.py
+++ b/owrx/client.py
@@ -1,5 +1,4 @@
 from owrx.config import Config
-from owrx.metrics import Metrics, DirectMetric
 import threading
 
 import logging
@@ -24,7 +23,6 @@ class ClientRegistry(object):
 
     def __init__(self):
         self.clients = []
-        Metrics.getSharedInstance().addMetric("openwebrx.users", DirectMetric(self.clientCount))
         super().__init__()
 
     def broadcast(self):
diff --git a/owrx/metrics.py b/owrx/metrics.py
index 7055449..48e0db0 100644
--- a/owrx/metrics.py
+++ b/owrx/metrics.py
@@ -1,4 +1,5 @@
 import threading
+from owrx.client import ClientRegistry
 
 
 class Metric(object):
@@ -38,6 +39,7 @@ class Metrics(object):
 
     def __init__(self):
         self.metrics = {}
+        self.addMetric("openwebrx.users", DirectMetric(ClientRegistry.getSharedInstance().clientCount))
 
     def addMetric(self, name, metric):
         self.metrics[name] = metric

From d6512e0a86fa7f938cb29c25d9e60fb61bb72004 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 23 Jun 2020 19:39:26 +0200
Subject: [PATCH 406/475] prevent debian packaging from modifying png files

---
 debian/rules | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/debian/rules b/debian/rules
index 5ed154e..cf8f103 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,3 +3,6 @@ export PYBUILD_NAME=openwebrx
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild --with systemd
+
+override_dh_strip_nondeterminism:
+    dh_strip_nondeterminism -X.png

From 929cf5e2305863022ae39448a6e78714f19fb8a2 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 23 Jun 2020 19:48:00 +0200
Subject: [PATCH 407/475] makefiles use tabs... weird

---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index cf8f103..3b7418e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,4 +5,4 @@ export PYBUILD_NAME=openwebrx
 	dh $@ --with python3 --buildsystem=pybuild --with systemd
 
 override_dh_strip_nondeterminism:
-    dh_strip_nondeterminism -X.png
+	dh_strip_nondeterminism -X.png

From e0129fd0f772e35af516e7f78c34044312f8f81e Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 1 Jul 2020 19:10:46 +0200
Subject: [PATCH 408/475] move timezone to initialization instead of implicit
 localization

---
 owrx/controllers/assets.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/owrx/controllers/assets.py b/owrx/controllers/assets.py
index 5c4bb61..b15ff64 100644
--- a/owrx/controllers/assets.py
+++ b/owrx/controllers/assets.py
@@ -14,7 +14,7 @@ class ModificationAwaraController(Controller, metaclass=ABCMeta):
     
     def wasModified(self, file):
         try:
-            modified = self.getModified(file).astimezone(timezone.utc).replace(microsecond=0)
+            modified = self.getModified(file).replace(microsecond=0)
     
             if modified is not None and "If-Modified-Since" in self.handler.headers:
                 client_modified = datetime.strptime(
@@ -30,7 +30,7 @@ class ModificationAwaraController(Controller, metaclass=ABCMeta):
 
 class AssetsController(ModificationAwaraController, metaclass=ABCMeta):
     def getModified(self, file):
-        return datetime.fromtimestamp(os.path.getmtime(self.getFilePath(file)))
+        return datetime.fromtimestamp(os.path.getmtime(self.getFilePath(file)), timezone.utc)
 
     def openFile(self, file):
         return open(self.getFilePath(file), "rb")
@@ -138,5 +138,5 @@ class CompiledAssetsController(ModificationAwaraController):
             return f.read()
 
     def getModified(self, files):
-        modified = [datetime.fromtimestamp(os.path.getmtime(f)) for f in files]
-        return max(*modified)
+        modified = [os.path.getmtime(f) for f in files]
+        return datetime.fromtimestamp(max(*modified), timezone.utc)

From 0e6518915d038f1845bfb866adeda83ca55f1e53 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 4 Jul 2020 21:47:56 +0200
Subject: [PATCH 409/475] * refactor receiverid into a separate controller base
 * allow multiple headers to prepare for checking multiple claims

---
 owrx/controllers/__init__.py   |  6 +++++-
 owrx/controllers/receiverid.py | 21 +++++++++++++++++++++
 owrx/controllers/status.py     | 13 +++----------
 owrx/receiverid.py             | 21 ++++++++++++++-------
 4 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 owrx/controllers/receiverid.py

diff --git a/owrx/controllers/__init__.py b/owrx/controllers/__init__.py
index c00eebd..6839741 100644
--- a/owrx/controllers/__init__.py
+++ b/owrx/controllers/__init__.py
@@ -18,7 +18,11 @@ class Controller(object):
         if max_age is not None:
             headers["Cache-Control"] = "max-age: {0}".format(max_age)
         for key, value in headers.items():
-            self.handler.send_header(key, value)
+            if isinstance(value, list):
+                for v in value:
+                    self.handler.send_header(key, v)
+            else:
+                self.handler.send_header(key, value)
         self.handler.end_headers()
         if type(content) == str:
             content = content.encode()
diff --git a/owrx/controllers/receiverid.py b/owrx/controllers/receiverid.py
new file mode 100644
index 0000000..6489340
--- /dev/null
+++ b/owrx/controllers/receiverid.py
@@ -0,0 +1,21 @@
+from owrx.controllers import Controller
+from owrx.receiverid import ReceiverId
+from datetime import datetime
+
+
+class ReceiverIdController(Controller):
+    def __init__(self, handler, request, options):
+        super().__init__(handler, request, options)
+        self.authHeaders = []
+
+    def send_response(self, content, code=200, content_type="text/html", last_modified: datetime = None, max_age=None, headers=None):
+        if headers is None:
+            headers = {}
+        headers['Authorization'] = self.authHeaders
+        super().send_response(content, code=code, content_type=content_type, last_modified=last_modified, max_age=max_age, headers=headers)
+        pass
+
+    def handle_request(self):
+        headers = self.request.headers.get_all("Authorization", [])
+        self.authHeaders = [ReceiverId.getResponseHeader(h) for h in headers]
+        super().handle_request()
diff --git a/owrx/controllers/status.py b/owrx/controllers/status.py
index c3100de..9e6a820 100644
--- a/owrx/controllers/status.py
+++ b/owrx/controllers/status.py
@@ -1,8 +1,7 @@
-from . import Controller
+from .receiverid import ReceiverIdController
 from owrx.version import openwebrx_version
 from owrx.sdr import SdrService
 from owrx.config import Config
-from owrx.receiverid import ReceiverId, KeyException
 import json
 
 import logging
@@ -10,7 +9,7 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-class StatusController(Controller):
+class StatusController(ReceiverIdController):
     def getProfileStats(self, profile):
         return {
             "name": profile["name"],
@@ -29,12 +28,6 @@ class StatusController(Controller):
 
     def indexAction(self):
         pm = Config.get()
-        headers = None
-        if "Authorization" in self.request.headers:
-            try:
-                headers = ReceiverId.getResponseHeader(self.request.headers["Authorization"])
-            except KeyException:
-                logger.exception("error processing authorization header")
         status = {
             "receiver": {
                 "name": pm["receiver_name"],
@@ -47,4 +40,4 @@ class StatusController(Controller):
             "version": openwebrx_version,
             "sdrs": [self.getReceiverStats(r) for r in SdrService.getSources().values()]
         }
-        self.send_response(json.dumps(status), content_type="application/json", headers=headers)
+        self.send_response(json.dumps(status), content_type="application/json")
diff --git a/owrx/receiverid.py b/owrx/receiverid.py
index bae2728..33c62f0 100644
--- a/owrx/receiverid.py
+++ b/owrx/receiverid.py
@@ -38,8 +38,19 @@ class KeyChallenge(object):
 
 
 class KeyResponse(object):
+    def __init__(self, source, id, time: datetime, signature):
+        self.source = source
+        self.id = id
+        self.time = time
+        self.signature = signature
+
     def __str__(self):
-        return "TODO"
+        return "Time={time}, Response={source}-{id}-{signature}".format(
+            source=self.source,
+            id=self.id,
+            signature=self.signature,
+            time=self.time
+        )
 
 
 class ReceiverId(object):
@@ -52,11 +63,7 @@ class ReceiverId(object):
         key = ReceiverId.findKey(challenge)
         if key is None:
             return {}
-        time, signature = ReceiverId.signChallenge(challenge, key)
-        return {
-            "Signature": signature,
-            "Time": time,
-        }
+        return ReceiverId.signChallenge(challenge, key)
 
     @staticmethod
     def findKey(challenge):
@@ -78,4 +85,4 @@ class ReceiverId(object):
         m = hmac.new(bytes.fromhex(key.secret), digestmod=hashlib.sha256)
         m.update(bytes.fromhex(challenge.challenge))
         m.update(now.encode('utf8'))
-        return now, m.hexdigest()
+        return KeyResponse(challenge.source, challenge.id, now, m.hexdigest())

From 7eb0a8cf7e9712699f29186eab04c9a75281b93c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 9 Jul 2020 15:39:33 +0200
Subject: [PATCH 410/475] add fcdpp support

---
 owrx/feature.py      | 9 +++++++++
 owrx/source/fcdpp.py | 6 ++++++
 2 files changed, 15 insertions(+)
 create mode 100644 owrx/source/fcdpp.py

diff --git a/owrx/feature.py b/owrx/feature.py
index b6d83b8..a9c44f2 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -35,6 +35,7 @@ class FeatureDetector(object):
         "uhd": ["soapy_connector", "soapy_uhd"],
         "red_pitaya": ["soapy_connector", "soapy_red_pitaya"],
         "radioberry": ["soapy_connector", "soapy_radioberry"],
+        "fcdpp": ["soapy_connector", "soapy_fcdpp"],
         # optional features and their requirements
         "digital_voice_digiham": ["digiham", "sox"],
         "digital_voice_dsd": ["dsd", "sox", "digiham"],
@@ -330,6 +331,14 @@ class FeatureDetector(object):
         """
         return self._has_soapy_driver("hackrf")
 
+    def has_soapy_fcdpp(self):
+        """
+        The SoapyFCDPP module allows the use of the Funcube Dongle Pro+.
+
+        You can get it [here](https://github.com/pothosware/SoapyFCDPP).
+        """
+        return self._has_soapy_driver("fcdpp")
+
     def has_dsd(self):
         """
         The digital voice modes NXDN and D-Star can be decoded by the dsd project. Please note that you need the version
diff --git a/owrx/source/fcdpp.py b/owrx/source/fcdpp.py
new file mode 100644
index 0000000..bb121ee
--- /dev/null
+++ b/owrx/source/fcdpp.py
@@ -0,0 +1,6 @@
+from owrx.source.soapy import SoapyConnectorSource
+
+
+class FcdppSource(SoapyConnectorSource):
+    def getDriver(self):
+        return "fcdpp"

From e53f1f60eb23d7f3d870fcde2b2bf14da2073086 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 9 Jul 2020 21:32:57 +0200
Subject: [PATCH 411/475] multi-key signing implementation

---
 owrx/controllers/__init__.py   |  6 +-----
 owrx/controllers/receiverid.py | 13 +++++++------
 owrx/receiverid.py             | 30 ++++++++++++++++++------------
 3 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/owrx/controllers/__init__.py b/owrx/controllers/__init__.py
index 6839741..c00eebd 100644
--- a/owrx/controllers/__init__.py
+++ b/owrx/controllers/__init__.py
@@ -18,11 +18,7 @@ class Controller(object):
         if max_age is not None:
             headers["Cache-Control"] = "max-age: {0}".format(max_age)
         for key, value in headers.items():
-            if isinstance(value, list):
-                for v in value:
-                    self.handler.send_header(key, v)
-            else:
-                self.handler.send_header(key, value)
+            self.handler.send_header(key, value)
         self.handler.end_headers()
         if type(content) == str:
             content = content.encode()
diff --git a/owrx/controllers/receiverid.py b/owrx/controllers/receiverid.py
index 6489340..667c6be 100644
--- a/owrx/controllers/receiverid.py
+++ b/owrx/controllers/receiverid.py
@@ -6,16 +6,17 @@ from datetime import datetime
 class ReceiverIdController(Controller):
     def __init__(self, handler, request, options):
         super().__init__(handler, request, options)
-        self.authHeaders = []
+        self.authHeader = None
 
     def send_response(self, content, code=200, content_type="text/html", last_modified: datetime = None, max_age=None, headers=None):
-        if headers is None:
-            headers = {}
-        headers['Authorization'] = self.authHeaders
+        if self.authHeader is not None:
+            if headers is None:
+                headers = {}
+            headers['Authorization'] = self.authHeader
         super().send_response(content, code=code, content_type=content_type, last_modified=last_modified, max_age=max_age, headers=headers)
         pass
 
     def handle_request(self):
-        headers = self.request.headers.get_all("Authorization", [])
-        self.authHeaders = [ReceiverId.getResponseHeader(h) for h in headers]
+        if "Authorization" in self.request.headers:
+            self.authHeader = ReceiverId.getResponseHeader(self.request.headers['Authorization'])
         super().handle_request()
diff --git a/owrx/receiverid.py b/owrx/receiverid.py
index 33c62f0..847bb34 100644
--- a/owrx/receiverid.py
+++ b/owrx/receiverid.py
@@ -2,7 +2,7 @@ import re
 import logging
 import hashlib
 import hmac
-from datetime import datetime
+from datetime import datetime, timezone
 from owrx.config import Config
 
 logger = logging.getLogger(__name__)
@@ -38,18 +38,18 @@ class KeyChallenge(object):
 
 
 class KeyResponse(object):
-    def __init__(self, source, id, time: datetime, signature):
+    def __init__(self, source, id, time, signature):
         self.source = source
         self.id = id
         self.time = time
         self.signature = signature
 
     def __str__(self):
-        return "Time={time}, Response={source}-{id}-{signature}".format(
+        return "{source}-{id}-{time}-{signature}".format(
             source=self.source,
             id=self.id,
+            time=self.time,
             signature=self.signature,
-            time=self.time
         )
 
 
@@ -59,11 +59,16 @@ class ReceiverId(object):
         matches = headerRegex.match(requestHeader)
         if not matches:
             raise KeyException("invalid authorization header")
-        challenge = KeyChallenge(matches.group(1))
-        key = ReceiverId.findKey(challenge)
-        if key is None:
-            return {}
-        return ReceiverId.signChallenge(challenge, key)
+        challenges = [KeyChallenge(i) for i in matches.group(1).split(",")]
+
+        def signChallenge(challenge):
+            key = ReceiverId.findKey(challenge)
+            if key is None:
+                return
+            return ReceiverId.signChallenge(challenge, key)
+
+        responses = [signChallenge(c) for c in challenges]
+        return ",".join(str(r) for r in responses if r is not None)
 
     @staticmethod
     def findKey(challenge):
@@ -81,8 +86,9 @@ class ReceiverId(object):
 
     @staticmethod
     def signChallenge(challenge, key):
-        now = datetime.utcnow().isoformat()
+        now = datetime.utcnow().replace(microsecond=0, tzinfo=timezone.utc)
+        now_bytes = int(now.timestamp()).to_bytes(4, byteorder="big")
         m = hmac.new(bytes.fromhex(key.secret), digestmod=hashlib.sha256)
         m.update(bytes.fromhex(challenge.challenge))
-        m.update(now.encode('utf8'))
-        return KeyResponse(challenge.source, challenge.id, now, m.hexdigest())
+        m.update(now_bytes)
+        return KeyResponse(challenge.source, challenge.id, now_bytes.hex(), m.hexdigest())

From 174e9afa7b5fa2fce4f6eddf64e2747a508fc2df Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 18 Jul 2020 20:00:49 +0200
Subject: [PATCH 412/475] correctly close iqtee / iqtee2 pipes

---
 csdr/csdr.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 260da7a..832d442 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -95,10 +95,9 @@ class Pipe(object):
         self.file = open(self.path, self.direction, encoding=self.encoding)
 
     def close(self):
-        if self.file is None:
-            return
         try:
-            self.file.close()
+            if self.file is not None:
+                self.file.close()
             os.unlink(self.path)
         except FileNotFoundError:
             # it seems like we keep calling this twice. no idea why, but we don't need the resulting error.
@@ -685,6 +684,9 @@ class dsp(object):
 
     def try_create_pipes(self, pipe_names, command_base):
         for pipe_name, pipe_type in pipe_names.items():
+            if self.has_pipe(pipe_name):
+                logger.warning("{pipe_name} is still in use", pipe_name=pipe_name)
+                self.pipes[pipe_name].close()
             if "{" + pipe_name + "}" in command_base:
                 p = self.pipe_base_path + pipe_name
                 encoding = None

From c54f19282a9fc214e1eea3bbc80d572cbe93cef3 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 19 Jul 2020 19:00:26 +0200
Subject: [PATCH 413/475] improved error handling, refs #146 #22

---
 owrx/audio.py      | 2 +-
 owrx/connection.py | 5 ++++-
 owrx/websocket.py  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/owrx/audio.py b/owrx/audio.py
index a8c2880..b77ad7c 100644
--- a/owrx/audio.py
+++ b/owrx/audio.py
@@ -240,5 +240,5 @@ class AudioChopper(threading.Thread, metaclass=ABCMeta):
         try:
             readers = wait([w.outputReader for w in self.writers])
             return [r.recv() for r in readers]
-        except EOFError:
+        except (EOFError, OSError):
             return None
diff --git a/owrx/connection.py b/owrx/connection.py
index 8e3407d..f3e951e 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -41,7 +41,10 @@ class Client(ABC):
         threading.Thread(target=mp_passthru).start()
 
     def send(self, data):
-        self.conn.send(data)
+        try:
+            self.conn.send(data)
+        except IOError:
+            self.close()
 
     def close(self):
         self.conn.close()
diff --git a/owrx/websocket.py b/owrx/websocket.py
index fc6462d..de34141 100644
--- a/owrx/websocket.py
+++ b/owrx/websocket.py
@@ -16,7 +16,7 @@ OPCODE_PING = 0x09
 OPCODE_PONG = 0x0A
 
 
-class WebSocketException(Exception):
+class WebSocketException(IOError):
     pass
 
 

From 369a61ec593265b49ba91037254d7dcfec7436b3 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 19 Jul 2020 19:42:18 +0200
Subject: [PATCH 414/475] shut down pipes correctly, refs #146

---
 owrx/websocket.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/owrx/websocket.py b/owrx/websocket.py
index de34141..4908e72 100644
--- a/owrx/websocket.py
+++ b/owrx/websocket.py
@@ -146,6 +146,9 @@ class WebSocketConnection(object):
             self.close()
 
     def interrupt(self):
+        if self.interruptPipeSend is None:
+            logger.debug("interrupt with closed pipe")
+            return
         self.interruptPipeSend.send(bytes(0x00))
 
     def handle(self):
@@ -227,6 +230,18 @@ class WebSocketConnection(object):
                         logger.exception("OSError while reading data; closing connection")
                         self.open = False
 
+        self.interruptPipeSend.close()
+        self.interruptPipeSend = None
+        # drain messages left in the queue so that the queue can be successfully closed
+        # this is necessary since python keeps the file descriptors open otherwise
+        try:
+            while True:
+                self.interruptPipeRecv.recv()
+        except EOFError:
+            pass
+        self.interruptPipeRecv.close()
+        self.interruptPipeRecv = None
+
     def close(self):
         self.open = False
         self.interrupt()

From d9bc03d1fc73248ea09eff563b21b18a41011fbb Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 20 Jul 2020 23:08:19 +0200
Subject: [PATCH 415/475] clear the multiprocessing queue to get rid of more
 file descriptors, refs #146

---
 owrx/connection.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/owrx/connection.py b/owrx/connection.py
index f3e951e..ac9c35c 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -37,6 +37,11 @@ class Client(ABC):
                     self.send(data)
                 except (EOFError, OSError):
                     run = False
+                except Exception:
+                    logger.exception("Exception on client multiprocessing queue")
+
+            # unset the queue object to free shared memory file descriptors
+            self.multiprocessingPipe = None
 
         threading.Thread(target=mp_passthru).start()
 

From 1f8b2f7909360cc193a5e41fd61fa33acf0c9b4d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 21 Jul 2020 19:57:23 +0200
Subject: [PATCH 416/475] always send busy state event, even when always-on,
 closes #147

---
 owrx/source/__init__.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index 407f0bc..a55f0ee 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -251,13 +251,14 @@ class SdrSource(ABC):
         except ValueError:
             pass
 
+        hasUsers = self.hasClients(SdrSource.CLIENT_USER)
+        self.setBusyState(SdrSource.BUSYSTATE_BUSY if hasUsers else SdrSource.BUSYSTATE_IDLE)
+
         # no need to check for users if we are always-on
         if self.isAlwaysOn():
             return
 
-        hasUsers = self.hasClients(SdrSource.CLIENT_USER)
         hasBackgroundTasks = self.hasClients(SdrSource.CLIENT_BACKGROUND)
-        self.setBusyState(SdrSource.BUSYSTATE_BUSY if hasUsers else SdrSource.BUSYSTATE_IDLE)
         if not hasUsers and not hasBackgroundTasks:
             self.stop()
 

From de67d36cd6371d9f877a19aafbea720a83146568 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 21 Jul 2020 20:03:33 +0200
Subject: [PATCH 417/475] update changelog

---
 CHANGELOG.md     | 5 +++++
 debian/changelog | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b06148..fa103a5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
 **unreleased**
+- Added the ability to sign multiple keys in a single request, thus enabling multiple users to claim a single receiver
+  on receiverbook.de
+- Fixed file descriptor leaks to prevent "too many open files" errors
+- New devices supported:
+  - FunCube Dongle Pro+ (`"type": "fcdpp"`)
 
 **0.19.1**
 - Added ability to authenticate receivers with listing sites using "receiver id" tokens
diff --git a/debian/changelog b/debian/changelog
index b1ae784..ab47e13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
 openwebrx (0.20.0) UNRELEASED; urgency=low
 
+  * Added the ability to sign multiple keys in a single request, thus enabling multiple users to claim a single receiver
+    on receiverbook.de
+  * Fixed file descriptor leaks to prevent "too many open files" errors
+  * New devices supported:
+    - FunCube Dongle Pro+ (`"type": "fcdpp"`)
+
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Sat, 13 Jun 2020 17:22:00 +0000
 
 openwebrx (0.19.1) buster focal; urgency=low

From 11fd918d6266b059993566626682f14639b6b248 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 21 Jul 2020 20:33:48 +0200
Subject: [PATCH 418/475] handle more errors the right way, refs #144

---
 owrx/connection.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index ac9c35c..3712b64 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -35,7 +35,7 @@ class Client(ABC):
                 try:
                     data = self.multiprocessingPipe.get()
                     self.send(data)
-                except (EOFError, OSError):
+                except (EOFError, OSError, ValueError):
                     run = False
                 except Exception:
                     logger.exception("Exception on client multiprocessing queue")
@@ -53,9 +53,12 @@ class Client(ABC):
 
     def close(self):
         self.conn.close()
-        self.multiprocessingPipe.close()
+        if self.multiprocessingPipe is not None:
+            self.multiprocessingPipe.close()
 
     def mp_send(self, data):
+        if self.multiprocessingPipe is None:
+            return
         try:
             self.multiprocessingPipe.put(data, block=False)
         except Full:

From 660301a43b7c9508349b36278fc4fff5f1b1b17c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 21 Jul 2020 22:51:12 +0200
Subject: [PATCH 419/475] update to wsjt-x 2.2.2

---
 docker/files/wsjtx/wsjtx-hamlib.patch  | 14 +++++++-------
 docker/files/wsjtx/wsjtx.patch         | 23 +++++++++++------------
 docker/scripts/install-dependencies.sh |  4 ++--
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/docker/files/wsjtx/wsjtx-hamlib.patch b/docker/files/wsjtx/wsjtx-hamlib.patch
index 84f7861..09a8a88 100644
--- a/docker/files/wsjtx/wsjtx-hamlib.patch
+++ b/docker/files/wsjtx/wsjtx-hamlib.patch
@@ -1,6 +1,6 @@
---- CMakeLists.txt	2020-05-25 19:26:41.423517236 +0200
-+++ CMakeLists.txt	2020-05-25 19:11:36.116236231 +0200
-@@ -79,24 +79,6 @@
+--- CMakeLists.txt.orig	2020-07-21 20:59:55.982026645 +0200
++++ CMakeLists.txt	2020-07-21 21:01:25.444836112 +0200
+@@ -80,24 +80,6 @@
  
  include (ExternalProject)
  
@@ -12,9 +12,9 @@
 -ExternalProject_Add (hamlib
 -  GIT_REPOSITORY ${hamlib_repo}
 -  GIT_TAG ${hamlib_TAG}
--  URL ${CMAKE_CURRENT_SOURCE_DIR}/src/hamlib.tgz
+-  URL ${CMAKE_CURRENT_SOURCE_DIR}/src/${__hamlib_upstream}
 -  URL_HASH MD5=${hamlib_md5sum}
--  UPDATE_COMMAND ./bootstrap
+-  #UPDATE_COMMAND ${CMAKE_COMMAND} -E env "[ -f ./bootstrap ] && ./bootstrap"
 -  PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 -N < ${CMAKE_CURRENT_SOURCE_DIR}/hamlib.patch
 -  CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-shared --enable-static --without-cxx-binding ${EXTRA_FLAGS} # LIBUSB_LIBS=${USB_LIBRARY}
 -  BUILD_COMMAND $(MAKE) all V=1 # $(MAKE) is ExternalProject_Add() magic to do recursive make
@@ -25,7 +25,7 @@
  #
  # custom target to make a hamlib source tarball
  #
-@@ -128,7 +110,6 @@
+@@ -136,7 +118,6 @@
  # build and optionally install WSJT-X using the hamlib package built
  # above
  #
@@ -33,7 +33,7 @@
  ExternalProject_Add (wsjtx
    GIT_REPOSITORY ${wsjtx_repo}
    GIT_TAG ${WSJTX_TAG}
-@@ -152,7 +133,6 @@
+@@ -160,7 +141,6 @@
    DEPENDEES build
    )
  
diff --git a/docker/files/wsjtx/wsjtx.patch b/docker/files/wsjtx/wsjtx.patch
index b7854bb..59ac6b7 100644
--- a/docker/files/wsjtx/wsjtx.patch
+++ b/docker/files/wsjtx/wsjtx.patch
@@ -1,6 +1,6 @@
 diff -ur wsjtx-orig/CMake/Modules/Findhamlib.cmake wsjtx/CMake/Modules/Findhamlib.cmake
---- wsjtx-orig/CMake/Modules/Findhamlib.cmake	2020-05-27 22:41:57.774855748 +0200
-+++ wsjtx/CMake/Modules/Findhamlib.cmake	2020-05-27 22:42:35.267939882 +0200
+--- wsjtx-orig/CMake/Modules/Findhamlib.cmake	2020-07-21 21:10:43.124810140 +0200
++++ wsjtx/CMake/Modules/Findhamlib.cmake	2020-07-21 21:11:03.368019114 +0200
 @@ -85,4 +85,4 @@
  # Handle the  QUIETLY and REQUIRED  arguments and set  HAMLIB_FOUND to
  # TRUE if all listed variables are TRUE
@@ -8,9 +8,9 @@ diff -ur wsjtx-orig/CMake/Modules/Findhamlib.cmake wsjtx/CMake/Modules/Findhamli
 -find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES hamlib_LIBRARY_DIRS)
 +find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES)
 diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
---- wsjtx-orig/CMakeLists.txt	2020-05-27 22:41:57.774855748 +0200
-+++ wsjtx/CMakeLists.txt	2020-05-27 22:58:18.905001618 +0200
-@@ -869,7 +869,7 @@
+--- wsjtx-orig/CMakeLists.txt	2020-07-21 21:10:43.124810140 +0200
++++ wsjtx/CMakeLists.txt	2020-07-21 22:14:04.454639589 +0200
+@@ -871,7 +871,7 @@
  #
  # libhamlib setup
  #
@@ -19,7 +19,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
  find_package (hamlib 3 REQUIRED)
  find_program (RIGCTL_EXE rigctl)
  find_program (RIGCTLD_EXE rigctld)
-@@ -1326,54 +1326,10 @@
+@@ -1348,53 +1348,10 @@
  
  endif(WSJT_BUILD_UTILS)
  
@@ -51,9 +51,9 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 -
 -target_include_directories (wsjtx PRIVATE ${FFTW3_INCLUDE_DIRS})
 -if (APPLE)
--  target_link_libraries (wsjtx wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+-  target_link_libraries (wsjtx Qt5::SerialPort wsjt_fort wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
 -else ()
--  target_link_libraries (wsjtx wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
+-  target_link_libraries (wsjtx Qt5::SerialPort wsjt_fort_omp wsjt_cxx wsjt_qt wsjt_qtmm ${hamlib_LIBRARIES} ${FFTW3_LIBRARIES})
 -  if (OpenMP_C_FLAGS)
 -    set_target_properties (wsjtx PROPERTIES
 -      COMPILE_FLAGS "${OpenMP_C_FLAGS}"
@@ -69,12 +69,11 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
 -      )
 -  endif ()
 -endif ()
--qt5_use_modules (wsjtx SerialPort) # not sure why the interface link library syntax above doesn't work
 -
  # make a library for WSJT-X UDP servers
  # add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
  add_library (wsjtx_udp-static STATIC ${UDP_library_CXXSRCS})
-@@ -1417,24 +1373,9 @@
+@@ -1437,24 +1394,9 @@
    set_target_properties (message_aggregator PROPERTIES WIN32_EXECUTABLE ON)
  endif (WSJT_CREATE_WINMAIN)
  
@@ -99,7 +98,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
  
  # install (TARGETS wsjtx_udp EXPORT udp
  #   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-@@ -1453,12 +1394,7 @@
+@@ -1473,12 +1415,7 @@
  #   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/wsjtx
  #   )
  
@@ -113,7 +112,7 @@ diff -ur wsjtx-orig/CMakeLists.txt wsjtx/CMakeLists.txt
    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
    BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
    )
-@@ -1471,39 +1407,6 @@
+@@ -1491,39 +1428,6 @@
    )
  endif(WSJT_BUILD_UTILS)  
  
diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index fc76cfa..cf7bbb8 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -18,7 +18,7 @@ function cmakebuild() {
 
 cd /tmp
 
-STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5core5a libreadline7 libgfortran4 libgomp1 libasound2 libudev1 ca-certificates"
+STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5core5a libreadline7 libgfortran4 libgomp1 libasound2 libudev1 ca-certificates libqt5gui5 libqt5sql5 libqt5printsupport5"
 BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev autoconf automake libtool texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev pkg-config libudev-dev libhamlib-dev patch xsltproc"
 
 apt-get update
@@ -83,7 +83,7 @@ rm /js8call-hamlib.patch
 CMAKE_ARGS="-D CMAKE_CXX_FLAGS=-DJS8_USE_LEGACY_HAMLIB" cmakebuild ${JS8CALL_DIR}
 rm ${JS8CALL_TGZ}
 
-WSJT_DIR=wsjtx-2.1.2
+WSJT_DIR=wsjtx-2.2.2
 WSJT_TGZ=${WSJT_DIR}.tgz
 wget http://physics.princeton.edu/pulsar/k1jt/${WSJT_TGZ}
 tar xfz ${WSJT_TGZ}

From 9efc839128763ee4ef7eb5f2fb4ee4a33dbb0579 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 22 Jul 2020 18:45:13 +0200
Subject: [PATCH 420/475] update to js8call 2.2.0

---
 docker/files/js8call/js8call-hamlib.patch | 17 +++++++++--------
 docker/scripts/install-dependencies.sh    |  8 ++++----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/docker/files/js8call/js8call-hamlib.patch b/docker/files/js8call/js8call-hamlib.patch
index 2bc6141..899f83e 100644
--- a/docker/files/js8call/js8call-hamlib.patch
+++ b/docker/files/js8call/js8call-hamlib.patch
@@ -1,6 +1,6 @@
 diff -ur js8call-orig/CMake/Modules/Findhamlib.cmake js8call/CMake/Modules/Findhamlib.cmake
---- js8call-orig/CMake/Modules/Findhamlib.cmake	2020-05-28 00:10:13.386429366 +0200
-+++ js8call/CMake/Modules/Findhamlib.cmake	2020-05-28 00:10:34.339623106 +0200
+--- js8call-orig/CMake/Modules/Findhamlib.cmake	2020-07-22 18:14:18.014499840 +0200
++++ js8call/CMake/Modules/Findhamlib.cmake	2020-07-22 18:16:07.200375473 +0200
 @@ -78,4 +78,4 @@
  # Handle the  QUIETLY and REQUIRED  arguments and set  HAMLIB_FOUND to
  # TRUE if all listed variables are TRUE
@@ -8,9 +8,9 @@ diff -ur js8call-orig/CMake/Modules/Findhamlib.cmake js8call/CMake/Modules/Findh
 -find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES hamlib_LIBRARY_DIRS)
 +find_package_handle_standard_args (hamlib DEFAULT_MSG hamlib_INCLUDE_DIRS hamlib_LIBRARIES)
 diff -ur js8call-orig/CMakeLists.txt js8call/CMakeLists.txt
---- js8call-orig/CMakeLists.txt	2020-05-28 00:10:13.393095987 +0200
-+++ js8call/CMakeLists.txt	2020-05-28 00:12:09.925653037 +0200
-@@ -683,7 +683,7 @@
+--- js8call-orig/CMakeLists.txt	2020-07-22 18:14:18.014499840 +0200
++++ js8call/CMakeLists.txt	2020-07-22 18:17:55.629633825 +0200
+@@ -558,7 +558,7 @@
  #
  # libhamlib setup
  #
@@ -19,7 +19,7 @@ diff -ur js8call-orig/CMakeLists.txt js8call/CMakeLists.txt
  find_package (hamlib 3 REQUIRED)
  find_program (RIGCTL_EXE rigctl)
  find_program (RIGCTLD_EXE rigctld)
-@@ -1033,55 +1033,6 @@
+@@ -911,56 +911,6 @@
    target_link_libraries (js8 wsjt_fort wsjt_cxx Qt5::Core)
  endif (${OPENMP_FOUND} OR APPLE)
  
@@ -31,6 +31,7 @@ diff -ur js8call-orig/CMakeLists.txt js8call/CMakeLists.txt
 -  wsjtx.rc
 -  ${WSJTX_ICON_FILE}
 -  ${wsjtx_RESOURCES_RCC}
+-  images.qrc
 -  )
 -
 -if (WSJT_CREATE_WINMAIN)
@@ -75,7 +76,7 @@ diff -ur js8call-orig/CMakeLists.txt js8call/CMakeLists.txt
  # if (UNIX)
  #   if (NOT WSJT_SKIP_MANPAGES)
  #     add_subdirectory (manpages)
-@@ -1097,38 +1048,10 @@
+@@ -976,38 +926,10 @@
  #
  # installation
  #
@@ -114,7 +115,7 @@ diff -ur js8call-orig/CMakeLists.txt js8call/CMakeLists.txt
  install (FILES
    contrib/Ephemeris/JPLEPH
    DESTINATION ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}
-@@ -1182,32 +1105,6 @@
+@@ -1061,32 +983,6 @@
    "${CMAKE_CURRENT_BINARY_DIR}/wsjtx_config.h"
    )
  
diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index cf7bbb8..f2b9a81 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -72,15 +72,15 @@ cmakebuild digiham 95206501be89b38d0267bf6c29a6898e7c65656f
 git clone https://github.com/f4exb/dsd.git
 cmakebuild dsd f6939f9edbbc6f66261833616391a4e59cb2b3d7
 
-JS8CALL_VERSION=2.1.1
-JS8CALL_DIR=js8call-${JS8CALL_VERSION}
-JS8CALL_TGZ=${JS8CALL_DIR}.tgz
+JS8CALL_VERSION=2.2.0
+JS8CALL_DIR=js8call
+JS8CALL_TGZ=js8call-${JS8CALL_VERSION}.tgz
 wget http://files.js8call.com/${JS8CALL_VERSION}/${JS8CALL_TGZ}
 tar xfz ${JS8CALL_TGZ}
 # patch allows us to build against the packaged hamlib
 patch -Np1 -d ${JS8CALL_DIR} < /js8call-hamlib.patch
 rm /js8call-hamlib.patch
-CMAKE_ARGS="-D CMAKE_CXX_FLAGS=-DJS8_USE_LEGACY_HAMLIB" cmakebuild ${JS8CALL_DIR}
+CMAKE_ARGS="-D CMAKE_CXX_FLAGS=-DJS8_USE_HAMLIB_THREE" cmakebuild ${JS8CALL_DIR}
 rm ${JS8CALL_TGZ}
 
 WSJT_DIR=wsjtx-2.2.2

From 77ae13723d66ff3df4d43dfa71b19366e5f5fe2c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 27 Jul 2020 20:27:25 +0200
Subject: [PATCH 421/475] remove link to outdated instructions, closes #157

---
 config_webrx.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index 30e6cb9..f4c560d 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -247,8 +247,6 @@ sdrs = {
 
 # ==== Color themes ====
 
-# A guide is available to help you set these values: https://github.com/simonyiszk/openwebrx/wiki/Calibrating-waterfall-display-levels
-
 ### default theme by teejez:
 waterfall_colors = [0x000000FF, 0x0000FFFF, 0x00FFFFFF, 0x00FF00FF, 0xFFFF00FF, 0xFF0000FF, 0xFF00FFFF, 0xFFFFFFFF]
 waterfall_min_level = -88  # in dB

From 9b187140ff2fe9da044208c0fc6299c13c4eb3d4 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Mon, 27 Jul 2020 21:18:24 +0200
Subject: [PATCH 422/475] catch exception and replace with a debug message,
 refs #22

---
 owrx/audio.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/owrx/audio.py b/owrx/audio.py
index b77ad7c..76505bf 100644
--- a/owrx/audio.py
+++ b/owrx/audio.py
@@ -183,9 +183,14 @@ class AudioWriter(object):
             stdout=subprocess.PIPE,
             cwd=self.tmp_dir,
             close_fds=True,
-            )
-        for line in decoder.stdout:
-            self.outputWriter.send((job.freq, line))
+        )
+        try:
+            for line in decoder.stdout:
+                self.outputWriter.send((job.freq, line))
+        except OSError:
+            decoder.stdout.flush()
+            # TODO uncouple parsing from the output so that decodes can still go to the map and the spotters
+            logger.debug("output has gone away while decoding job.")
         try:
             rc = decoder.wait(timeout=10)
             if rc != 0:

From 7e5409160ec1530cae6f07814b65d2db2c04ab79 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 28 Jul 2020 00:28:20 +0200
Subject: [PATCH 423/475] initial work on freedv / codec2 support, refs #126

---
 csdr/csdr.py    | 13 ++++++++++++-
 owrx/feature.py |  4 ++++
 owrx/modes.py   |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 832d442..07be0f3 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -301,6 +301,15 @@ class dsp(object):
             chain += ["csdr amdemod_cf", "csdr fastdcblock_ff"]
             chain += last_decimation_block
             chain += ["csdr agc_ff", "csdr limit_ff", "csdr convert_f_s16"]
+        elif which == "freedv":
+            chain += ["csdr realpart_cf"]
+            chain += last_decimation_block
+            chain += [
+                "csdr agc_ff",
+                "csdr convert_f_s16",
+                "freedv_rx 1600 - -",
+                "sox -t raw -r 8000 -e signed-integer -b 16 -c 1 --buffer 32 - -t raw -r {output_rate} -e signed-integer -b 16 -c 1 - ",
+            ]
         elif which == "ssb":
             chain += ["csdr realpart_cf"]
             chain += last_decimation_block
@@ -571,6 +580,8 @@ class dsp(object):
             return 48000
         elif self.isWsjtMode() or self.isJs8():
             return 12000
+        elif self.get_demodulator() == "freedv":
+            return 8000
         return self.get_output_rate()
 
     def isDigitalVoice(self, demodulator=None):
@@ -664,7 +675,7 @@ class dsp(object):
     def set_squelch_level(self, squelch_level):
         self.squelch_level = squelch_level
         # no squelch required on digital voice modes
-        actual_squelch = -150 if self.isDigitalVoice() or self.isPacket() or self.isPocsag() else self.squelch_level
+        actual_squelch = -150 if self.isDigitalVoice() or self.isPacket() or self.isPocsag() or self.get_demodulator() == "freedv" else self.squelch_level
         if self.running:
             self.pipes["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch)))
 
diff --git a/owrx/feature.py b/owrx/feature.py
index a9c44f2..abb98a0 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -39,6 +39,7 @@ class FeatureDetector(object):
         # optional features and their requirements
         "digital_voice_digiham": ["digiham", "sox"],
         "digital_voice_dsd": ["dsd", "sox", "digiham"],
+        "digital_voice_freedv": ["freedv_rx", "sox"],
         "wsjt-x": ["wsjtx", "sox"],
         "packet": ["direwolf", "sox"],
         "pocsag": ["digiham", "sox"],
@@ -401,3 +402,6 @@ class FeatureDetector(object):
         You can find instructions and downloads [here](https://o28.sischa.net/fifisdr/trac/wiki/De%3Arockprog).
         """
         return self.command_is_runnable("rockprog")
+
+    def has_freedv_rx(self):
+        return self.command_is_runnable("freedv_rx")
diff --git a/owrx/modes.py b/owrx/modes.py
index f455268..bd930b8 100644
--- a/owrx/modes.py
+++ b/owrx/modes.py
@@ -48,6 +48,7 @@ class Modes(object):
         AnalogMode("dstar", "DStar", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_dsd"], squelch=False),
         AnalogMode("nxdn", "NXDN", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_dsd"], squelch=False),
         AnalogMode("ysf", "YSF", bandpass=Bandpass(-4000, 4000), requirements=["digital_voice_digiham"], squelch=False),
+        AnalogMode("freedv", "FDV", bandpass=Bandpass(300, 3000), requirements=["digital_voice_freedv"], squelch=False),
         DigitalMode("bpsk31", "BPSK31", underlying=["usb"]),
         DigitalMode("bpsk63", "BPSK63", underlying=["usb"]),
         DigitalMode("ft8", "FT8", underlying=["usb"], requirements=["wsjt-x"], service=True),

From 2252547fc1cb4c039d02054e1f42f898cf6cc721 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 29 Jul 2020 21:44:10 +0200
Subject: [PATCH 424/475] add freedv to docker container

---
 docker/scripts/install-dependencies.sh | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index f2b9a81..cf4f632 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -99,6 +99,18 @@ make install
 cd ..
 rm -rf direwolf
 
+git clone https://github.com/drowe67/codec2.git
+cd codec2
+git checkout v0.9.2
+mkdir build
+cd build
+cmake ..
+make
+make install
+install -m 0755 src/freedv_rx /usr/local/bin
+cd ../..
+rm -rf codec2
+
 git clone https://github.com/hessu/aprs-symbols /opt/aprs-symbols
 pushd /opt/aprs-symbols
 git checkout 5c2abe2658ee4d2563f3c73b90c6f59124839802

From 780d51286a815ee2ca04e9f8bb8150b0523058e1 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 29 Jul 2020 21:45:24 +0200
Subject: [PATCH 425/475] update changelog

---
 CHANGELOG.md     | 1 +
 debian/changelog | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa103a5..8cff203 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 - Added the ability to sign multiple keys in a single request, thus enabling multiple users to claim a single receiver
   on receiverbook.de
 - Fixed file descriptor leaks to prevent "too many open files" errors
+- Add new demodulator chain for FreeDV
 - New devices supported:
   - FunCube Dongle Pro+ (`"type": "fcdpp"`)
 
diff --git a/debian/changelog b/debian/changelog
index ab47e13..3391e9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ openwebrx (0.20.0) UNRELEASED; urgency=low
   * Added the ability to sign multiple keys in a single request, thus enabling multiple users to claim a single receiver
     on receiverbook.de
   * Fixed file descriptor leaks to prevent "too many open files" errors
+  * Add new demodulator chain for FreeDV
   * New devices supported:
     - FunCube Dongle Pro+ (`"type": "fcdpp"`)
 

From c8e5b4f82282b3369bb92ee0d9e81e5fc1888580 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 30 Jul 2020 18:05:56 +0200
Subject: [PATCH 426/475] let's try this again with a more recent version...

---
 docker/scripts/install-dependencies.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index cf4f632..479db9c 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -101,7 +101,8 @@ rm -rf direwolf
 
 git clone https://github.com/drowe67/codec2.git
 cd codec2
-git checkout v0.9.2
+# latest commit from master as of 2020-07-30
+git checkout 1edc22e43f77fbb971429f9f7d4d8d909a7e12cb
 mkdir build
 cd build
 cmake ..

From 7ea8c8f7c65d35e6aa50f55f46acb00cc543651c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 30 Jul 2020 21:35:31 +0200
Subject: [PATCH 427/475] use better locking for the service startup/shutdown

---
 owrx/service/__init__.py | 46 +++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

diff --git a/owrx/service/__init__.py b/owrx/service/__init__.py
index b4070a1..96a3ff1 100644
--- a/owrx/service/__init__.py
+++ b/owrx/service/__init__.py
@@ -61,7 +61,7 @@ class Js8ServiceOutput(ServiceOutput):
 
 class ServiceHandler(object):
     def __init__(self, source):
-        self.lock = threading.Lock()
+        self.lock = threading.RLock()
         self.services = []
         self.source = source
         self.startupTimer = None
@@ -124,30 +124,28 @@ class ServiceHandler(object):
         self.startupTimer.start()
 
     def updateServices(self):
-        logger.debug("re-scheduling services due to sdr changes")
-        self.stopServices()
-        if not self.source.isAvailable():
-            logger.debug("sdr source is unavailable")
-            return
-        cf = self.source.getProps()["center_freq"]
-        sr = self.source.getProps()["samp_rate"]
-        srh = sr / 2
-        frequency_range = (cf - srh, cf + srh)
-
-        dials = [
-            dial
-            for dial in Bandplan.getSharedInstance().collectDialFrequencies(
-                frequency_range
-            )
-            if self.isSupported(dial["mode"])
-        ]
-
-        if not dials:
-            logger.debug("no services available")
-            return
-
         with self.lock:
-            self.services = []
+            logger.debug("re-scheduling services due to sdr changes")
+            self.stopServices()
+            if not self.source.isAvailable():
+                logger.debug("sdr source is unavailable")
+                return
+            cf = self.source.getProps()["center_freq"]
+            sr = self.source.getProps()["samp_rate"]
+            srh = sr / 2
+            frequency_range = (cf - srh, cf + srh)
+
+            dials = [
+                dial
+                for dial in Bandplan.getSharedInstance().collectDialFrequencies(
+                    frequency_range
+                )
+                if self.isSupported(dial["mode"])
+            ]
+
+            if not dials:
+                logger.debug("no services available")
+                return
 
             groups = self.optimizeResampling(dials, sr)
             if groups is None:

From 7234ff43093048393bb18fde0ab8a50c9b4cd426 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 5 Aug 2020 19:07:55 +0200
Subject: [PATCH 428/475] use normal queue since we're not even multiprocessing

---
 owrx/connection.py | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index 3712b64..5673703 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -12,8 +12,7 @@ from owrx.bookmarks import Bookmarks
 from owrx.map import Map
 from owrx.property import PropertyStack
 from owrx.modes import Modes, DigitalMode
-from multiprocessing import Queue
-from queue import Full
+from queue import Queue, Full
 from js8py import Js8Frame
 from abc import ABC, ABCMeta, abstractmethod
 import json
@@ -27,21 +26,21 @@ logger = logging.getLogger(__name__)
 class Client(ABC):
     def __init__(self, conn):
         self.conn = conn
-        self.multiprocessingPipe = Queue(100)
+        self.multithreadingPipe = Queue(100)
 
         def mp_passthru():
             run = True
             while run:
                 try:
-                    data = self.multiprocessingPipe.get()
+                    data = self.multithreadingPipe.get()
                     self.send(data)
                 except (EOFError, OSError, ValueError):
                     run = False
                 except Exception:
-                    logger.exception("Exception on client multiprocessing queue")
+                    logger.exception("Exception on client multithreading queue")
 
             # unset the queue object to free shared memory file descriptors
-            self.multiprocessingPipe = None
+            self.multithreadingPipe = None
 
         threading.Thread(target=mp_passthru).start()
 
@@ -53,14 +52,12 @@ class Client(ABC):
 
     def close(self):
         self.conn.close()
-        if self.multiprocessingPipe is not None:
-            self.multiprocessingPipe.close()
 
     def mp_send(self, data):
-        if self.multiprocessingPipe is None:
+        if self.multithreadingPipe is None:
             return
         try:
-            self.multiprocessingPipe.put(data, block=False)
+            self.multithreadingPipe.put(data, block=False)
         except Full:
             self.close()
 

From a77108dd0c92de0a548cb0f795b3e9207e1d05dc Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 5 Aug 2020 20:01:57 +0200
Subject: [PATCH 429/475] drain subprocess pipes to free up file descriptors,
 refs #146

---
 csdr/csdr.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 07be0f3..52e369f 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -504,12 +504,18 @@ class dsp(object):
         if self.secondary_process_fft:
             try:
                 os.killpg(os.getpgid(self.secondary_process_fft.pid), signal.SIGTERM)
+                # drain any leftover data to free file descriptors
+                self.secondary_process_fft.communicate()
+                self.secondary_process_fft = None
             except ProcessLookupError:
                 # been killed by something else, ignore
                 pass
         if self.secondary_process_demod:
             try:
                 os.killpg(os.getpgid(self.secondary_process_demod.pid), signal.SIGTERM)
+                # drain any leftover data to free file descriptors
+                self.secondary_process_demod.communicate()
+                self.secondary_process_demod = None
             except ProcessLookupError:
                 # been killed by something else, ignore
                 pass
@@ -848,6 +854,8 @@ class dsp(object):
             if self.process is not None:
                 try:
                     os.killpg(os.getpgid(self.process.pid), signal.SIGTERM)
+                    # drain any leftover data to free file descriptors
+                    self.process.communicate()
                     self.process = None
                 except ProcessLookupError:
                     # been killed by something else, ignore

From a65fd7916e69a4b399d553e39bd447cc78a2ad5c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 5 Aug 2020 20:03:38 +0200
Subject: [PATCH 430/475] drain connections, close wave files refs #146

---
 owrx/audio.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/owrx/audio.py b/owrx/audio.py
index 76505bf..35fac28 100644
--- a/owrx/audio.py
+++ b/owrx/audio.py
@@ -209,13 +209,30 @@ class AudioWriter(object):
         self.switchingLock.release()
 
     def stop(self):
-        self.outputReader.close()
         self.outputWriter.close()
+        self.outputWriter = None
+
+        # drain messages left in the queue so that the queue can be successfully closed
+        # this is necessary since python keeps the file descriptors open otherwise
+        try:
+            while True:
+                self.outputReader.recv()
+        except EOFError:
+            pass
+        self.outputReader.close()
+        self.outputReader = None
+
         self.cancelTimer()
+        try:
+            self.wavefile.close()
+        except Exception:
+            logger.exception("error closing wave file")
         try:
             os.unlink(self.wavefilename)
         except Exception:
             logger.exception("error removing undecoded file")
+        self.wavefile = None
+        self.wavefilename = None
 
 
 class AudioChopper(threading.Thread, metaclass=ABCMeta):

From 0518ff93582bd16af6770c13fdd9913d538939b9 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 5 Aug 2020 20:04:41 +0200
Subject: [PATCH 431/475] provide information to the queue which entries are
 done

---
 owrx/connection.py | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index 5673703..dd8cc27 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -26,21 +26,23 @@ logger = logging.getLogger(__name__)
 class Client(ABC):
     def __init__(self, conn):
         self.conn = conn
-        self.multithreadingPipe = Queue(100)
+        self.multithreadingQueue = Queue(100)
 
         def mp_passthru():
             run = True
             while run:
                 try:
-                    data = self.multithreadingPipe.get()
+                    data = self.multithreadingQueue.get()
                     self.send(data)
                 except (EOFError, OSError, ValueError):
                     run = False
                 except Exception:
                     logger.exception("Exception on client multithreading queue")
+                finally:
+                    self.multithreadingQueue.task_done()
 
             # unset the queue object to free shared memory file descriptors
-            self.multithreadingPipe = None
+            self.multithreadingQueue = None
 
         threading.Thread(target=mp_passthru).start()
 
@@ -54,10 +56,10 @@ class Client(ABC):
         self.conn.close()
 
     def mp_send(self, data):
-        if self.multithreadingPipe is None:
+        if self.multithreadingQueue is None:
             return
         try:
-            self.multithreadingPipe.put(data, block=False)
+            self.multithreadingQueue.put(data, block=False)
         except Full:
             self.close()
 

From 645ace75c3a979c807ed16d118da85a90bbaf640 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 6 Aug 2020 20:06:04 +0200
Subject: [PATCH 432/475] protect against erroneous reads

---
 owrx/audio.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/owrx/audio.py b/owrx/audio.py
index 35fac28..330b88b 100644
--- a/owrx/audio.py
+++ b/owrx/audio.py
@@ -247,7 +247,11 @@ class AudioChopper(threading.Thread, metaclass=ABCMeta):
         for w in self.writers:
             w.start()
         while self.doRun:
-            data = self.source.read(256)
+            data = None
+            try:
+                data = self.source.read(256)
+            except ValueError:
+                pass
             if data is None or (isinstance(data, bytes) and len(data) == 0):
                 self.doRun = False
             else:

From b068fb57561825893d07fec8b0126e5c02584317 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 7 Aug 2020 17:07:09 +0200
Subject: [PATCH 433/475] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..b62c3d3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,26 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Installation method**
+How did you install OpenWebRX? (Raspberry Pi SD card image, Debian / Ubuntu packages, Docker image, manually?)
+
+**Versions**
+What version of OpenWebRX are you running? (Check on startup, or see `owrx/version.py`. If a `-dev` version is used, ideally state the commit the issue is appearing on)
+
+**Additional context**
+Add any other context about the problem here.

From 20f0a5cd6cae92054abeb561b0fd632ffe7b2f61 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 7 Aug 2020 19:23:35 +0200
Subject: [PATCH 434/475] Update issue templates

---
 .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..c33cd0f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: feature
+assignees: ''
+
+---
+
+Before posting a new feature request, please check if a similar idea has already been listed
+* on the issue tracker
+* on the [OpenWebRX github project](https://github.com/users/jketterl/projects/1).
+
+In the latter case, please only proceed if you have additional information about the feature, and please let us know that there's already a card there.
+
+**Feature description**
+Please describe in plain words what functionality you'd like to see in OpenWebRX, and why you think it's useful.
+
+**Target audience**
+Please let us know if you think that this feature is of particular interest for a particular group of users (e.g. hams, SWLs, DXers, ...)

From 03b2f83981e8527f5070119196e9da3079f88da8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 7 Aug 2020 19:43:04 +0200
Subject: [PATCH 435/475] add groups.io link

---
 .github/ISSUE_TEMPLATE/config.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..e1c0030
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Groups.io Mailing list
+    url: https://groups.io/g/openwebrx
+    about: Community mailing list for general user support and other project-related questions and requests
\ No newline at end of file

From 62ee2ca44585f7be6c8ce2bf0f7b5c6269000882 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 7 Aug 2020 22:58:24 +0200
Subject: [PATCH 436/475] add documentation about freedv_rx

---
 owrx/feature.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/owrx/feature.py b/owrx/feature.py
index abb98a0..a675823 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -404,4 +404,11 @@ class FeatureDetector(object):
         return self.command_is_runnable("rockprog")
 
     def has_freedv_rx(self):
+        """
+        The "freedv\_rx" executable is required to demodulate FreeDV digital transmissions. It comes together with the
+        codec2 library, but it's only a supplemental part and not installed by default or contained in its packages.
+        To install it, you will need to compile codec2 from source and manually install freedv\_rx.
+
+        You can find the codec2 source code [here](https://github.com/drowe67/codec2).
+        """
         return self.command_is_runnable("freedv_rx")

From b54be3384d1eae7b25ae6adf5044ad8709743c58 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 7 Aug 2020 23:28:36 +0200
Subject: [PATCH 437/475] add docker build for funcube

---
 docker/Dockerfiles/Dockerfile-fcdpp          |  8 +++++
 docker/Dockerfiles/Dockerfile-full           |  1 +
 docker/env                                   |  2 +-
 docker/scripts/install-dependencies-fcdpp.sh | 32 ++++++++++++++++++++
 4 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 docker/Dockerfiles/Dockerfile-fcdpp
 create mode 100755 docker/scripts/install-dependencies-fcdpp.sh

diff --git a/docker/Dockerfiles/Dockerfile-fcdpp b/docker/Dockerfiles/Dockerfile-fcdpp
new file mode 100644
index 0000000..d9ad1fc
--- /dev/null
+++ b/docker/Dockerfiles/Dockerfile-fcdpp
@@ -0,0 +1,8 @@
+ARG ARCHTAG
+FROM openwebrx-soapysdr-base:$ARCHTAG
+
+ADD docker/scripts/install-dependencies-fcdpp.sh /
+RUN /install-dependencies-fcdpp.sh &&\
+    rm /install-dependencies-fcdpp.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index af5007f..cd8700b 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -14,6 +14,7 @@ RUN /install-dependencies-rtlsdr.sh &&\
     /install-dependencies-limesdr.sh &&\
     /install-dependencies-soapyremote.sh &&\
     /install-dependencies-perseus.sh &&\
+    /install-dependencies-fcdpp.sh &&\
     rm /install-dependencies-*.sh &&\
     rm /install-lib.*.patch
 
diff --git a/docker/env b/docker/env
index 18c5220..55d1586 100644
--- a/docker/env
+++ b/docker/env
@@ -1,5 +1,5 @@
 ARCH=$(uname -m)
-IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-perseus openwebrx-full openwebrx"
+IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-perseus openwebrx-fcdpp openwebrx-full openwebrx"
 ALL_ARCHS="x86_64 armv7l aarch64"
 TAG=${TAG:-"latest"}
 ARCHTAG="$TAG-$ARCH"
diff --git a/docker/scripts/install-dependencies-fcdpp.sh b/docker/scripts/install-dependencies-fcdpp.sh
new file mode 100755
index 0000000..49f1439
--- /dev/null
+++ b/docker/scripts/install-dependencies-fcdpp.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+set -euxo pipefail
+export MAKEFLAGS="-j4"
+
+function cmakebuild() {
+  cd $1
+  if [[ ! -z "${2:-}" ]]; then
+    git checkout $2
+  fi
+  mkdir build
+  cd build
+  cmake ..
+  make
+  make install
+  cd ../..
+  rm -rf $1
+}
+
+cd /tmp
+
+STATIC_PACKAGES="libhidapi-hidraw0 libhidapi-libusb0 libasound2"
+BUILD_PACKAGES="git cmake make gcc g++ libhidapi-dev libasound2-dev"
+
+apt-get update
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
+
+git clone https://github.com/pothosware/SoapyFCDPP.git
+cmakebuild SoapyFCDPP soapy-fcdpp-0.1.1
+
+apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*

From c6ec21747bccb1096f0a95f619172aedd4d1455c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Aug 2020 00:11:11 +0200
Subject: [PATCH 438/475] add log to issue template

---
 .github/ISSUE_TEMPLATE/bug_report.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b62c3d3..b0b9cf0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -22,5 +22,8 @@ How did you install OpenWebRX? (Raspberry Pi SD card image, Debian / Ubuntu pack
 **Versions**
 What version of OpenWebRX are you running? (Check on startup, or see `owrx/version.py`. If a `-dev` version is used, ideally state the commit the issue is appearing on)
 
+**Log messages**
+Are there any relevant messages relating to the bug in the output / log of OpenWebRX? (On most installations, the log should be available using the command `sudo journalctl -u openwebrx`)
+
 **Additional context**
 Add any other context about the problem here.

From 031c937c0ccac39912e0331d7cd11d054d005ca3 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Aug 2020 00:11:44 +0200
Subject: [PATCH 439/475] actually build fcdpp image

---
 build.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.sh b/build.sh
index d91df81..3fccffa 100755
--- a/build.sh
+++ b/build.sh
@@ -13,4 +13,5 @@ docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-plutosdr:$ARCHTA
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-limesdr:$ARCHTAG -f docker/Dockerfiles/Dockerfile-limesdr .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-soapyremote:$ARCHTAG -f docker/Dockerfiles/Dockerfile-soapyremote .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-perseus:$ARCHTAG -f docker/Dockerfiles/Dockerfile-perseus .
+docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-fcdpp:$ARCHTAG -f docker/Dockerfiles/Dockerfile-fcdpp .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-full:$ARCHTAG -t jketterl/openwebrx:$ARCHTAG -f docker/Dockerfiles/Dockerfile-full .

From ef2ec1e1c59f5c32192517a8bcca428a1749ceaf Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Aug 2020 20:43:29 +0200
Subject: [PATCH 440/475] catch exception on closed inputs

---
 csdr/csdr.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 52e369f..6e25ac8 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -54,7 +54,11 @@ class output(object):
         def copy():
             run = True
             while run:
-                data = read()
+                data = None
+                try:
+                    data = read()
+                except ValueError:
+                    pass
                 if data is None or (isinstance(data, bytes) and len(data) == 0):
                     run = False
                 else:

From da3f59fb9bd2eb2690bb087c57d68188221f4300 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Aug 2020 20:45:03 +0200
Subject: [PATCH 441/475] determine hd audio rate and send it to the server

---
 htdocs/lib/AudioEngine.js | 49 ++++++++++++++++++++++++++++-----------
 htdocs/openwebrx.js       |  5 +++-
 owrx/dsp.py               |  1 +
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/htdocs/lib/AudioEngine.js b/htdocs/lib/AudioEngine.js
index 7e67042..b82b9de 100644
--- a/htdocs/lib/AudioEngine.js
+++ b/htdocs/lib/AudioEngine.js
@@ -19,6 +19,7 @@ function AudioEngine(maxBufferLength, audioReporter) {
 
     this.setupResampling();
     this.resampler = new Interpolator(this.resamplingFactor);
+    this.hdResampler = new Interpolator(this.hdResamplingFactor);
 
     this.maxBufferSize = maxBufferLength * this.getSampleRate();
 }
@@ -165,30 +166,52 @@ AudioEngine.prototype.resetStats = function() {
 };
 
 AudioEngine.prototype.setupResampling = function() { //both at the server and the client
-    var output_range_max = 12000;
-    var output_range_min = 8000;
+    var audio_params = this.findRate(8000, 12000);
+    if (!audio_params) {
+        this.resamplingFactor = 0;
+        this.outputRate = 0;
+        divlog('Your audio card sampling rate (' + targetRate + ') is not supported.<br />Please change your operating system default settings in order to fix this.', 1);
+    } else {
+        this.resamplingFactor = audio_params.resamplingFactor;
+        this.outputRate = audio_params.outputRate;
+    }
+
+    var hd_audio_params = this.findRate(36000, 48000);
+    if (!hd_audio_params) {
+        this.hdResamplingFactor = 0;
+        this.hdOutputRate = 0;
+        divlog('Your audio card sampling rate (' + targetRate + ') is not supported for HD audio<br />Please change your operating system default settings in order to fix this.', 1);
+    } else {
+        this.hdResamplingFactor = hd_audio_params.resamplingFactor;
+        this.hdOutputRate = hd_audio_params.outputRate;
+    }
+};
+
+AudioEngine.prototype.findRate = function(low, high) {
     var targetRate = this.audioContext.sampleRate;
     var i = 1;
     while (true) {
         var audio_server_output_rate = Math.floor(targetRate / i);
-        if (audio_server_output_rate < output_range_min) {
-            this.resamplingFactor = 0;
-            this.outputRate = 0;
-            divlog('Your audio card sampling rate (' + targetRate + ') is not supported.<br />Please change your operating system default settings in order to fix this.', 1);
-            break;
-        } else if (audio_server_output_rate >= output_range_min && audio_server_output_rate <= output_range_max) {
-            this.resamplingFactor = i;
-            this.outputRate = audio_server_output_rate;
-            break; //okay, we're done
+        if (audio_server_output_rate < low) {
+            return;
+        } else if (audio_server_output_rate >= low && audio_server_output_rate <= high) {
+            return {
+                resamplingFactor: i,
+                outputRate: audio_server_output_rate
+            }
         }
         i++;
-    }
-};
+    };
+}
 
 AudioEngine.prototype.getOutputRate = function() {
     return this.outputRate;
 };
 
+AudioEngine.prototype.getHdOutputRate = function() {
+    return this.hdOutputRate;
+}
+
 AudioEngine.prototype.getSampleRate = function() {
     return this.audioContext.sampleRate;
 };
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index dadd7e3..9d17f3b 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1067,7 +1067,10 @@ function on_ws_opened() {
     reconnect_timeout = false;
     ws.send(JSON.stringify({
         "type": "connectionproperties",
-        "params": {"output_rate": audioEngine.getOutputRate()}
+        "params": {
+            "output_rate": audioEngine.getOutputRate(),
+            "hd_output_rate": audioEngine.getHdOutputRate()
+        }
     }));
 }
 
diff --git a/owrx/dsp.py b/owrx/dsp.py
index cc94097..1bbf1f8 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -30,6 +30,7 @@ class DspManager(csdr.output):
         # local demodulator properties not forwarded to the sdr
         self.props.addLayer(0, PropertyLayer().filter(
             "output_rate",
+            "hd_output_rate",
             "squelch_level",
             "secondary_mod",
             "low_cut",

From 448e2660970a3c00174e5a4a46612257083af3ad Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Aug 2020 21:29:25 +0200
Subject: [PATCH 442/475] implement wfm demodulator chain

---
 csdr/csdr.py              | 40 ++++++++++++++++++++++++++++++++++-----
 htdocs/lib/AudioEngine.js | 22 +++++++++++++++++++++
 htdocs/openwebrx.js       |  4 ++++
 owrx/connection.py        |  3 +++
 owrx/dsp.py               |  2 ++
 owrx/modes.py             |  1 +
 6 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 6e25ac8..8ea941c 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -165,6 +165,7 @@ class dsp(object):
     def __init__(self, output):
         self.samp_rate = 250000
         self.output_rate = 11025
+        self.hd_output_rate = 44100
         self.fft_size = 1024
         self.fft_fps = 5
         self.center_freq = 0
@@ -273,6 +274,13 @@ class dsp(object):
                 ]
             else:
                 chain += ["csdr convert_f_s16"]
+        elif which == "wfm":
+            chain += ["csdr fmdemod_quadri_cf", "csdr limit_ff"]
+            chain += last_decimation_block
+            chain += [
+                "csdr deemphasis_wfm_ff {audio_rate} 50e-6",
+                "csdr convert_f_s16"
+            ]
         elif self.isDigitalVoice(which):
             chain += ["csdr fmdemod_quadri_cf", "dc_block "]
             chain += last_decimation_block
@@ -305,7 +313,7 @@ class dsp(object):
             chain += ["csdr amdemod_cf", "csdr fastdcblock_ff"]
             chain += last_decimation_block
             chain += ["csdr agc_ff", "csdr limit_ff", "csdr convert_f_s16"]
-        elif which == "freedv":
+        elif self.isFreeDV(which):
             chain += ["csdr realpart_cf"]
             chain += last_decimation_block
             chain += [
@@ -585,13 +593,18 @@ class dsp(object):
     def get_output_rate(self):
         return self.output_rate
 
+    def get_hd_output_rate(self):
+        return self.hd_output_rate
+
     def get_audio_rate(self):
         if self.isDigitalVoice() or self.isPacket() or self.isPocsag():
             return 48000
         elif self.isWsjtMode() or self.isJs8():
             return 12000
-        elif self.get_demodulator() == "freedv":
+        elif self.isFreeDV():
             return 8000
+        elif self.isHdAudio():
+            return self.get_hd_output_rate()
         return self.get_output_rate()
 
     def isDigitalVoice(self, demodulator=None):
@@ -619,6 +632,16 @@ class dsp(object):
             demodulator = self.get_secondary_demodulator()
         return demodulator == "pocsag"
 
+    def isFreeDV(self, demodulator=None):
+        if demodulator is None:
+            demodulator = self.get_demodulator()
+        return demodulator == "freedv"
+
+    def isHdAudio(self, demodulator=None):
+        if demodulator is None:
+            demodulator = self.get_demodulator()
+        return demodulator == "wfm"
+
     def set_output_rate(self, output_rate):
         if self.output_rate == output_rate:
             return
@@ -626,6 +649,12 @@ class dsp(object):
         self.calculate_decimation()
         self.restart()
 
+    def set_hd_output_rate(self, hd_output_rate):
+        if self.hd_output_rate == hd_output_rate:
+            return
+        self.hd_output_rate = hd_output_rate
+        self.restart()
+
     def set_demodulator(self, demodulator):
         if demodulator in ["usb", "lsb", "cw"]:
             demodulator = "ssb"
@@ -685,7 +714,7 @@ class dsp(object):
     def set_squelch_level(self, squelch_level):
         self.squelch_level = squelch_level
         # no squelch required on digital voice modes
-        actual_squelch = -150 if self.isDigitalVoice() or self.isPacket() or self.isPocsag() or self.get_demodulator() == "freedv" else self.squelch_level
+        actual_squelch = -150 if self.isDigitalVoice() or self.isPacket() or self.isPocsag() or self.isFreeDV() else self.squelch_level
         if self.running:
             self.pipes["squelch_pipe"].write("%g\n" % (self.convertToLinear(actual_squelch)))
 
@@ -818,9 +847,10 @@ class dsp(object):
 
             threading.Thread(target=watch_thread).start()
 
-            if self.output.supports_type("audio"):
+            audio_type = "hd_audio" if self.isHdAudio() else "audio"
+            if self.output.supports_type(audio_type):
                 self.output.send_output(
-                    "audio",
+                    audio_type,
                     partial(
                         self.process.stdout.read,
                         self.get_fft_bytes_to_read() if self.demodulator == "fft" else self.get_audio_bytes_to_read(),
diff --git a/htdocs/lib/AudioEngine.js b/htdocs/lib/AudioEngine.js
index b82b9de..a4cffae 100644
--- a/htdocs/lib/AudioEngine.js
+++ b/htdocs/lib/AudioEngine.js
@@ -238,6 +238,28 @@ AudioEngine.prototype.pushAudio = function(data) {
     }
 };
 
+AudioEngine.prototype.pushHdAudio = function(data) {
+    if (!this.audioNode) return;
+    this.audioBytes.add(data.byteLength);
+    var buffer;
+    if (this.compression === "adpcm") {
+        //resampling & ADPCM
+        buffer = this.audioCodec.decode(new Uint8Array(data));
+    } else {
+        buffer = new Int16Array(data);
+    }
+    buffer = this.hdResampler.process(buffer);
+    if (this.audioNode.port) {
+        // AudioWorklets supported
+        this.audioNode.port.postMessage(buffer);
+    } else {
+        // silently drop excess samples
+        if (this.getBuffersize() + buffer.length <= this.maxBufferSize) {
+            this.audioBuffers.push(buffer);
+        }
+    }
+}
+
 AudioEngine.prototype.setCompression = function(compression) {
     this.compression = compression;
 };
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 9d17f3b..7c24a23 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -829,6 +829,10 @@ function on_ws_recv(evt) {
                     secondary_demod_waterfall_add(waterfall_f32);
                 }
                 break;
+            case 4:
+                // hd audio data
+                audioEngine.pushHdAudio(data);
+                break;
             default:
                 console.warn('unknown type of binary message: ' + type)
         }
diff --git a/owrx/connection.py b/owrx/connection.py
index dd8cc27..6d43579 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -299,6 +299,9 @@ class OpenWebRxReceiverClient(OpenWebRxClient):
     def write_dsp_data(self, data):
         self.send(bytes([0x02]) + data)
 
+    def write_hd_audio(self, data):
+        self.send(bytes([0x04]) + data)
+
     def write_s_meter_level(self, level):
         self.send({"type": "smeter", "value": level})
 
diff --git a/owrx/dsp.py b/owrx/dsp.py
index 1bbf1f8..4343564 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -95,6 +95,7 @@ class DspManager(csdr.output):
             self.props.wireProperty("digimodes_fft_size", self.dsp.set_secondary_fft_size),
             self.props.wireProperty("samp_rate", self.dsp.set_samp_rate),
             self.props.wireProperty("output_rate", self.dsp.set_output_rate),
+            self.props.wireProperty("hd_output_rate", self.dsp.set_hd_output_rate),
             self.props.wireProperty("offset_freq", self.dsp.set_offset_freq),
             self.props.wireProperty("center_freq", self.dsp.set_center_freq),
             self.props.wireProperty("squelch_level", self.dsp.set_squelch_level),
@@ -147,6 +148,7 @@ class DspManager(csdr.output):
         logger.debug("adding new output of type %s", t)
         writers = {
             "audio": self.handler.write_dsp_data,
+            "hd_audio": self.handler.write_hd_audio,
             "smeter": self.handler.write_s_meter_level,
             "secondary_fft": self.handler.write_secondary_fft,
             "secondary_demod": self.handler.write_secondary_demod,
diff --git a/owrx/modes.py b/owrx/modes.py
index bd930b8..fca97cf 100644
--- a/owrx/modes.py
+++ b/owrx/modes.py
@@ -40,6 +40,7 @@ class DigitalMode(Mode):
 class Modes(object):
     mappings = [
         AnalogMode("nfm", "FM", bandpass=Bandpass(-4000, 4000)),
+        AnalogMode("wfm", "WFM", bandpass=Bandpass(-16000, 16000)),
         AnalogMode("am", "AM", bandpass=Bandpass(-4000, 4000)),
         AnalogMode("lsb", "LSB", bandpass=Bandpass(-3000, -300)),
         AnalogMode("usb", "USB", bandpass=Bandpass(300, 3000)),

From 5a938b8c0b116973d30100615173ee1803c67d58 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Aug 2020 21:35:15 +0200
Subject: [PATCH 443/475] simplify

---
 htdocs/lib/AudioEngine.js | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/htdocs/lib/AudioEngine.js b/htdocs/lib/AudioEngine.js
index a4cffae..b3a9e6c 100644
--- a/htdocs/lib/AudioEngine.js
+++ b/htdocs/lib/AudioEngine.js
@@ -216,7 +216,7 @@ AudioEngine.prototype.getSampleRate = function() {
     return this.audioContext.sampleRate;
 };
 
-AudioEngine.prototype.pushAudio = function(data) {
+AudioEngine.prototype.processAudio = function(data, resampler) {
     if (!this.audioNode) return;
     this.audioBytes.add(data.byteLength);
     var buffer;
@@ -226,7 +226,7 @@ AudioEngine.prototype.pushAudio = function(data) {
     } else {
         buffer = new Int16Array(data);
     }
-    buffer = this.resampler.process(buffer);
+    buffer = resampler.process(buffer);
     if (this.audioNode.port) {
         // AudioWorklets supported
         this.audioNode.port.postMessage(buffer);
@@ -236,28 +236,14 @@ AudioEngine.prototype.pushAudio = function(data) {
             this.audioBuffers.push(buffer);
         }
     }
+}
+
+AudioEngine.prototype.pushAudio = function(data) {
+    this.processAudio(data, this.resampler);
 };
 
 AudioEngine.prototype.pushHdAudio = function(data) {
-    if (!this.audioNode) return;
-    this.audioBytes.add(data.byteLength);
-    var buffer;
-    if (this.compression === "adpcm") {
-        //resampling & ADPCM
-        buffer = this.audioCodec.decode(new Uint8Array(data));
-    } else {
-        buffer = new Int16Array(data);
-    }
-    buffer = this.hdResampler.process(buffer);
-    if (this.audioNode.port) {
-        // AudioWorklets supported
-        this.audioNode.port.postMessage(buffer);
-    } else {
-        // silently drop excess samples
-        if (this.getBuffersize() + buffer.length <= this.maxBufferSize) {
-            this.audioBuffers.push(buffer);
-        }
-    }
+    this.processAudio(data, this.hdResampler);
 }
 
 AudioEngine.prototype.setCompression = function(compression) {

From 8c5a7a087f459c9df5ff516088af802774ebc963 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Aug 2020 21:56:35 +0200
Subject: [PATCH 444/475] compensate WFM frequency deviation, at least
 preliminary

---
 csdr/csdr.py  | 13 ++++++++++++-
 owrx/modes.py |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 8ea941c..2945ca2 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -578,7 +578,17 @@ class dsp(object):
 
     def get_decimation(self, input_rate, output_rate):
         decimation = 1
-        while input_rate / (decimation + 1) >= output_rate:
+        correction = 1
+        # wideband fm has a much higher frequency deviation (75kHz).
+        # we cannot cover this if we immediately decimate to the sample rate the audio will have later on, so we need
+        # to compensate here.
+        # the factor of 5 is by experimentation only, with a minimum audio rate of 36kHz (enforced by the client)
+        # this allows us to cover at least +/- 80kHz of frequency spectrum (may be higher, but that's the worst case).
+        # the correction factor is automatically compensated for by the secondary decimation stage, which comes
+        # after the demodulator.
+        if self.get_demodulator() == "wfm":
+            correction = 5
+        while input_rate / (decimation + 1) >= output_rate * correction:
             decimation += 1
         fraction = float(input_rate / decimation) / output_rate
         intermediate_rate = input_rate / decimation
@@ -653,6 +663,7 @@ class dsp(object):
         if self.hd_output_rate == hd_output_rate:
             return
         self.hd_output_rate = hd_output_rate
+        self.calculate_decimation()
         self.restart()
 
     def set_demodulator(self, demodulator):
diff --git a/owrx/modes.py b/owrx/modes.py
index fca97cf..f00a75c 100644
--- a/owrx/modes.py
+++ b/owrx/modes.py
@@ -40,7 +40,7 @@ class DigitalMode(Mode):
 class Modes(object):
     mappings = [
         AnalogMode("nfm", "FM", bandpass=Bandpass(-4000, 4000)),
-        AnalogMode("wfm", "WFM", bandpass=Bandpass(-16000, 16000)),
+        AnalogMode("wfm", "WFM", bandpass=Bandpass(-80000, 80000)),
         AnalogMode("am", "AM", bandpass=Bandpass(-4000, 4000)),
         AnalogMode("lsb", "LSB", bandpass=Bandpass(-3000, -300)),
         AnalogMode("usb", "USB", bandpass=Bandpass(300, 3000)),

From 69a12650d2e619ec598a047ae66e7fc10be73917 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Aug 2020 22:04:10 +0200
Subject: [PATCH 445/475] permit increased bandwidth for WFM

---
 htdocs/lib/Demodulator.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/htdocs/lib/Demodulator.js b/htdocs/lib/Demodulator.js
index 1c47560..2216f7e 100644
--- a/htdocs/lib/Demodulator.js
+++ b/htdocs/lib/Demodulator.js
@@ -7,6 +7,8 @@ Filter.prototype.getLimits = function() {
     var max_bw;
     if (this.demodulator.get_secondary_demod() === 'pocsag') {
         max_bw = 12500;
+    } else if (this.demodulator.get_modulation() === 'wfm') {
+        max_bw = 80000;
     } else {
         max_bw = (audioEngine.getOutputRate() / 2) - 1;
     }

From f4c43ffab634f94d7c59c97e566aa07fed5e7af5 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Aug 2020 22:04:28 +0200
Subject: [PATCH 446/475] fine-tune

---
 owrx/modes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/owrx/modes.py b/owrx/modes.py
index f00a75c..15a3ac3 100644
--- a/owrx/modes.py
+++ b/owrx/modes.py
@@ -40,7 +40,7 @@ class DigitalMode(Mode):
 class Modes(object):
     mappings = [
         AnalogMode("nfm", "FM", bandpass=Bandpass(-4000, 4000)),
-        AnalogMode("wfm", "WFM", bandpass=Bandpass(-80000, 80000)),
+        AnalogMode("wfm", "WFM", bandpass=Bandpass(-50000, 50000)),
         AnalogMode("am", "AM", bandpass=Bandpass(-4000, 4000)),
         AnalogMode("lsb", "LSB", bandpass=Bandpass(-3000, -300)),
         AnalogMode("usb", "USB", bandpass=Bandpass(300, 3000)),

From e51dbac2c5b082f53c2b0a8fafbf84225bf44479 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Aug 2020 22:06:33 +0200
Subject: [PATCH 447/475] update changelog

---
 CHANGELOG.md     | 1 +
 debian/changelog | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8cff203..47764a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
   on receiverbook.de
 - Fixed file descriptor leaks to prevent "too many open files" errors
 - Add new demodulator chain for FreeDV
+- Added new HD audio streaming mode along with a new WFM demodulator
 - New devices supported:
   - FunCube Dongle Pro+ (`"type": "fcdpp"`)
 
diff --git a/debian/changelog b/debian/changelog
index 3391e9e..3c738a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ openwebrx (0.20.0) UNRELEASED; urgency=low
     on receiverbook.de
   * Fixed file descriptor leaks to prevent "too many open files" errors
   * Add new demodulator chain for FreeDV
+  * Added new HD audio streaming mode along with a new WFM demodulator
   * New devices supported:
     - FunCube Dongle Pro+ (`"type": "fcdpp"`)
 

From f0b3a50c23dd3223cf15709a90a044df4f39bc83 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Aug 2020 22:23:34 +0200
Subject: [PATCH 448/475] increase maximum audio speed indication (uncompressed
 hd is about 700kbps)

---
 htdocs/lib/ProgressBar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/lib/ProgressBar.js b/htdocs/lib/ProgressBar.js
index 59d3a91..691d2ff 100644
--- a/htdocs/lib/ProgressBar.js
+++ b/htdocs/lib/ProgressBar.js
@@ -85,7 +85,7 @@ AudioSpeedProgressBar.prototype.getDefaultText = function() {
 };
 
 AudioSpeedProgressBar.prototype.setSpeed = function(speed) {
-    this.set(speed / 500000, "Audio stream [" + (speed / 1000).toFixed(0) + " kbps]", false);
+    this.set(speed / 1000000, "Audio stream [" + (speed / 1000).toFixed(0) + " kbps]", false);
 };
 
 AudioOutputProgressBar = function(el, sampleRate) {

From 7f57e4f45c3ec172b8a41d62c94b5e08992ed3fc Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 8 Aug 2020 22:51:03 +0200
Subject: [PATCH 449/475] compensate oversampling with the prefilter of csdr

---
 csdr/csdr.py | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 2945ca2..82e3f48 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -261,9 +261,12 @@ class dsp(object):
             if not self.output.supports_type("audio"):
                 return chain
         # safe some cpu cycles... no need to decimate if decimation factor is 1
-        last_decimation_block = (
-            ["csdr fractional_decimator_ff {last_decimation}"] if self.last_decimation != 1.0 else []
-        )
+        last_decimation_block = []
+        if self.last_decimation >= 2.0:
+            # activate prefilter if signal has been oversampled, e.g. WFM
+            last_decimation_block = ["csdr fractional_decimator_ff {last_decimation} 12 --prefilter"]
+        elif self.last_decimation >= 1.0:
+            last_decimation_block = ["csdr fractional_decimator_ff {last_decimation}"]
         if which == "nfm":
             chain += ["csdr fmdemod_quadri_cf", "csdr limit_ff"]
             chain += last_decimation_block
@@ -275,7 +278,10 @@ class dsp(object):
             else:
                 chain += ["csdr convert_f_s16"]
         elif which == "wfm":
-            chain += ["csdr fmdemod_quadri_cf", "csdr limit_ff"]
+            chain += [
+                "csdr fmdemod_quadri_cf",
+                "csdr limit_ff",
+            ]
             chain += last_decimation_block
             chain += [
                 "csdr deemphasis_wfm_ff {audio_rate} 50e-6",

From 08ba0c7b0240904df78f2e6102e2d68e111e7bff Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Tue, 11 Aug 2020 22:14:36 +0200
Subject: [PATCH 450/475] shut down multiprocessing queue explicitly using a
 poison pill

---
 owrx/connection.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/owrx/connection.py b/owrx/connection.py
index 6d43579..ceef8c5 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -22,6 +22,8 @@ import logging
 
 logger = logging.getLogger(__name__)
 
+PoisonPill = object()
+
 
 class Client(ABC):
     def __init__(self, conn):
@@ -33,13 +35,15 @@ class Client(ABC):
             while run:
                 try:
                     data = self.multithreadingQueue.get()
-                    self.send(data)
+                    if data is PoisonPill:
+                        run = False
+                    else:
+                        self.send(data)
+                    self.multithreadingQueue.task_done()
                 except (EOFError, OSError, ValueError):
                     run = False
                 except Exception:
                     logger.exception("Exception on client multithreading queue")
-                finally:
-                    self.multithreadingQueue.task_done()
 
             # unset the queue object to free shared memory file descriptors
             self.multithreadingQueue = None
@@ -53,6 +57,8 @@ class Client(ABC):
             self.close()
 
     def close(self):
+        if self.multithreadingQueue is not None:
+            self.multithreadingQueue.put(PoisonPill)
         self.conn.close()
 
     def mp_send(self, data):

From ccb322016e645ef6ebe7072f13cb856dce2e7143 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 12 Aug 2020 19:44:33 +0200
Subject: [PATCH 451/475] re-arrange demodulator buttons in a dynamic grid

---
 htdocs/css/openwebrx.css       | 14 +++++++++++++-
 htdocs/lib/DemodulatorPanel.js | 16 +++-------------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index fd81097..caf5b44 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -445,7 +445,7 @@ input[type=range]:disabled {
 
 .openwebrx-demodulator-button
 {
-	width: 38px;
+	min-width: 38px;
 	height: 19px;
 	font-size: 12pt;
 	text-align: center;
@@ -620,6 +620,18 @@ img.openwebrx-mirror-img
     padding-top: 0;
 }
 
+.openwebrx-modes-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(60px, 1fr));
+    grid-gap: 5px;
+}
+
+.openwebrx-modes-grid .openwebrx-demodulator-button {
+    margin: 0;
+    overflow: hidden;
+    white-space: nowrap;
+}
+
 #openwebrx-smeter-outer
 {
 	border-color: #888;
diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index 439a8e5..c276392 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -57,19 +57,9 @@ DemodulatorPanel.prototype.render = function() {
         );
     });
 
-    var index = 0;
-    var arrayLength = buttons.length;
-    var chunks = [];
-
-    for (index = 0; index < arrayLength; index += 5) {
-        chunks.push(buttons.slice(index, index + 5));
-    }
-
-    html.push.apply(html, chunks.map(function(chunk){
-        $line = $('<div class="openwebrx-panel-line openwebrx-panel-flex-line"></div>');
-        $line.append.apply($line, chunk);
-        return $line
-    }));
+    var $modegrid = $('<div class="openwebrx-modes-grid"></div>');
+    $modegrid.append.apply($modegrid, buttons);
+    html.push($modegrid);
 
     html.push($(
         '<div class="openwebrx-panel-line openwebrx-panel-flex-line">' +

From 80c25f459cdc295905b85819a314ef719162699d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 12 Aug 2020 21:41:06 +0200
Subject: [PATCH 452/475] use the space, modes!

---
 owrx/modes.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/owrx/modes.py b/owrx/modes.py
index 15a3ac3..2b70b39 100644
--- a/owrx/modes.py
+++ b/owrx/modes.py
@@ -46,10 +46,10 @@ class Modes(object):
         AnalogMode("usb", "USB", bandpass=Bandpass(300, 3000)),
         AnalogMode("cw", "CW", bandpass=Bandpass(700, 900)),
         AnalogMode("dmr", "DMR", bandpass=Bandpass(-4000, 4000), requirements=["digital_voice_digiham"], squelch=False),
-        AnalogMode("dstar", "DStar", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_dsd"], squelch=False),
+        AnalogMode("dstar", "D-Star", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_dsd"], squelch=False),
         AnalogMode("nxdn", "NXDN", bandpass=Bandpass(-3250, 3250), requirements=["digital_voice_dsd"], squelch=False),
         AnalogMode("ysf", "YSF", bandpass=Bandpass(-4000, 4000), requirements=["digital_voice_digiham"], squelch=False),
-        AnalogMode("freedv", "FDV", bandpass=Bandpass(300, 3000), requirements=["digital_voice_freedv"], squelch=False),
+        AnalogMode("freedv", "FreeDV", bandpass=Bandpass(300, 3000), requirements=["digital_voice_freedv"], squelch=False),
         DigitalMode("bpsk31", "BPSK31", underlying=["usb"]),
         DigitalMode("bpsk63", "BPSK63", underlying=["usb"]),
         DigitalMode("ft8", "FT8", underlying=["usb"], requirements=["wsjt-x"], service=True),

From de34856d5769b30caa200ad291bfee2cf6f5e1bb Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Wed, 12 Aug 2020 22:14:02 +0200
Subject: [PATCH 453/475] let's stick with flexbox, but use native wrapping

---
 htdocs/css/openwebrx.css | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index caf5b44..1ac09ee 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -445,7 +445,6 @@ input[type=range]:disabled {
 
 .openwebrx-demodulator-button
 {
-	min-width: 38px;
 	height: 19px;
 	font-size: 12pt;
 	text-align: center;
@@ -621,15 +620,16 @@ img.openwebrx-mirror-img
 }
 
 .openwebrx-modes-grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(60px, 1fr));
-    grid-gap: 5px;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+    gap: 5px;
 }
 
 .openwebrx-modes-grid .openwebrx-demodulator-button {
     margin: 0;
-    overflow: hidden;
     white-space: nowrap;
+    flex: 1 0 38px;
 }
 
 #openwebrx-smeter-outer

From 56debcd08a8a4b1b0da0ec77ef71baccdb53e542 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 13 Aug 2020 19:39:56 +0200
Subject: [PATCH 454/475] provide a fallback for browsers not supporting css
 gaps

---
 htdocs/css/openwebrx.css | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css
index 1ac09ee..554d88d 100644
--- a/htdocs/css/openwebrx.css
+++ b/htdocs/css/openwebrx.css
@@ -623,13 +623,25 @@ img.openwebrx-mirror-img
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
-    gap: 5px;
+    margin: -5px -5px 0 0;
 }
 
 .openwebrx-modes-grid .openwebrx-demodulator-button {
     margin: 0;
     white-space: nowrap;
     flex: 1 0 38px;
+    margin: 5px 5px 0 0;
+}
+
+@supports(gap: 5px) {
+    .openwebrx-modes-grid {
+        margin: 0;
+        gap: 5px;
+    }
+
+    .openwebrx-modes-grid .openwebrx-demodulator-button {
+        margin: 0;
+    }
 }
 
 #openwebrx-smeter-outer

From ddb5fe51b3f007a9ce70df475b51a5dd2fcf6dca Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 13 Aug 2020 23:35:49 +0200
Subject: [PATCH 455/475] open pipes in non-blocking loops, preventing thread
 leaks

---
 csdr/csdr.py | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 82e3f48..d8dd6ed 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -26,6 +26,7 @@ import os
 import signal
 import threading
 import math
+import time
 from functools import partial
 
 from owrx.kiss import KissClient, DirewolfConfig
@@ -85,6 +86,7 @@ class Pipe(object):
             return Pipe(path, None, encoding=encoding)
 
     def __init__(self, path, direction, encoding=None):
+        self.doOpen = True
         self.path = path
         self.direction = direction
         self.encoding = encoding
@@ -99,6 +101,7 @@ class Pipe(object):
         self.file = open(self.path, self.direction, encoding=self.encoding)
 
     def close(self):
+        self.doOpen = False
         try:
             if self.file is not None:
                 self.file.close()
@@ -121,7 +124,30 @@ class WritingPipe(Pipe):
         self.open()
 
     def open_and_dequeue(self):
-        super().open()
+        retries = 0
+
+        def opener(path, flags):
+            fd = os.open(path, flags | os.O_NONBLOCK)
+            os.set_blocking(fd, True)
+            return fd
+
+        while self.file is None and self.doOpen and retries < 10:
+            try:
+                self.file = open(self.path, self.direction, encoding=self.encoding, opener=opener)
+            except OSError as error:
+                # ENXIO = FIFO has not been opened for reading
+                if error.errno == 6:
+                    time.sleep(.1)
+                    retries += 1
+                else:
+                    raise
+
+        # if doOpen is false, opening has been canceled, so no warning in that case.
+        if self.file is None:
+            if self.doOpen:
+                logger.warning("could not open FIFO %s", self.path)
+            return
+
         with self.queueLock:
             for i in self.queue:
                 self.file.write(i)
@@ -140,11 +166,6 @@ class WritingPipe(Pipe):
         self.file.flush()
         return r
 
-    def close(self):
-        if self.file is None:
-            logger.warning("queue %s never successfully opened - thread leak!", self.path)
-        super().close()
-
 
 class ReadingPipe(Pipe):
     def __init__(self, path, encoding=None):

From 5bc69b6fa43838f4bc52b4718e2056bd26f89b5d Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 13 Aug 2020 23:51:11 +0200
Subject: [PATCH 456/475] use id of pipe to avoid file system collisions

---
 csdr/csdr.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index d8dd6ed..1b16320 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -87,15 +87,11 @@ class Pipe(object):
 
     def __init__(self, path, direction, encoding=None):
         self.doOpen = True
-        self.path = path
+        self.path = "{base}_{myid}".format(base=path, myid=id(self))
         self.direction = direction
         self.encoding = encoding
         self.file = None
-        try:
-            os.unlink(path)
-        except Exception:
-            pass
-        os.mkfifo(path)
+        os.mkfifo(self.path)
 
     def open(self):
         self.file = open(self.path, self.direction, encoding=self.encoding)
@@ -247,7 +243,7 @@ class dsp(object):
 
     def set_temporary_directory(self, what):
         self.temporary_directory = what
-        self.pipe_base_path = "{tmp_dir}/openwebrx_pipe_{myid}_".format(tmp_dir=self.temporary_directory, myid=id(self))
+        self.pipe_base_path = "{tmp_dir}/openwebrx_pipe_".format(tmp_dir=self.temporary_directory)
 
     def chain(self, which):
         chain = ["nc -v 127.0.0.1 {nc_port}"]

From 0cd0a1085ab4e2e157db61abeb1fd25b94e8c17c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 14 Aug 2020 00:17:09 +0200
Subject: [PATCH 457/475] uncouple reading pipes, too, and select makes the
 threads time out

---
 csdr/csdr.py | 50 +++++++++++++++++++++++++++++---------------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index 1b16320..a720a2b 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -27,6 +27,7 @@ import signal
 import threading
 import math
 import time
+import select
 from functools import partial
 
 from owrx.kiss import KissClient, DirewolfConfig
@@ -94,7 +95,27 @@ class Pipe(object):
         os.mkfifo(self.path)
 
     def open(self):
-        self.file = open(self.path, self.direction, encoding=self.encoding)
+        retries = 0
+
+        def opener(path, flags):
+            fd = os.open(path, flags | os.O_NONBLOCK)
+            os.set_blocking(fd, True)
+            return fd
+
+        while self.file is None and self.doOpen and retries < 10:
+            try:
+                self.file = open(self.path, self.direction, encoding=self.encoding, opener=opener)
+            except OSError as error:
+                # ENXIO = FIFO has not been opened for reading
+                if error.errno == 6:
+                    time.sleep(.1)
+                    retries += 1
+                else:
+                    raise
+
+        # if doOpen is false, opening has been canceled, so no warning in that case.
+        if self.file is None and self.doOpen:
+            logger.warning("could not open FIFO %s", self.path)
 
     def close(self):
         self.doOpen = False
@@ -120,28 +141,9 @@ class WritingPipe(Pipe):
         self.open()
 
     def open_and_dequeue(self):
-        retries = 0
+        super().open()
 
-        def opener(path, flags):
-            fd = os.open(path, flags | os.O_NONBLOCK)
-            os.set_blocking(fd, True)
-            return fd
-
-        while self.file is None and self.doOpen and retries < 10:
-            try:
-                self.file = open(self.path, self.direction, encoding=self.encoding, opener=opener)
-            except OSError as error:
-                # ENXIO = FIFO has not been opened for reading
-                if error.errno == 6:
-                    time.sleep(.1)
-                    retries += 1
-                else:
-                    raise
-
-        # if doOpen is false, opening has been canceled, so no warning in that case.
         if self.file is None:
-            if self.doOpen:
-                logger.warning("could not open FIFO %s", self.path)
             return
 
         with self.queueLock:
@@ -167,6 +169,12 @@ class ReadingPipe(Pipe):
     def __init__(self, path, encoding=None):
         super().__init__(path, "r", encoding=encoding)
 
+    def open(self):
+        if not self.doOpen:
+            return
+        super().open()
+        select.select([self.file], [], [], 10)
+
     def read(self):
         if self.file is None:
             self.open()

From 49383e757f14cac996ebc2d7dacd06922b1fd230 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 14 Aug 2020 19:54:07 +0200
Subject: [PATCH 458/475] extract pipes to separate file

---
 csdr/csdr.py | 118 +------------------------------------------------
 csdr/pipe.py | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+), 116 deletions(-)
 create mode 100644 csdr/pipe.py

diff --git a/csdr/csdr.py b/csdr/csdr.py
index a720a2b..ccd9776 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -26,8 +26,6 @@ import os
 import signal
 import threading
 import math
-import time
-import select
 from functools import partial
 
 from owrx.kiss import KissClient, DirewolfConfig
@@ -35,6 +33,8 @@ from owrx.wsjt import Ft8Profile, WsprProfile, Jt9Profile, Jt65Profile, Ft4Profi
 from owrx.js8 import Js8Profiles
 from owrx.audio import AudioChopper
 
+from csdr.pipe import Pipe
+
 import logging
 
 logger = logging.getLogger(__name__)
@@ -72,120 +72,6 @@ class output(object):
         return True
 
 
-class Pipe(object):
-    READ = "r"
-    WRITE = "w"
-    NONE = None
-
-    @staticmethod
-    def create(path, t, encoding=None):
-        if t == Pipe.READ:
-            return ReadingPipe(path, encoding=encoding)
-        elif t == Pipe.WRITE:
-            return WritingPipe(path, encoding=encoding)
-        elif t == Pipe.NONE:
-            return Pipe(path, None, encoding=encoding)
-
-    def __init__(self, path, direction, encoding=None):
-        self.doOpen = True
-        self.path = "{base}_{myid}".format(base=path, myid=id(self))
-        self.direction = direction
-        self.encoding = encoding
-        self.file = None
-        os.mkfifo(self.path)
-
-    def open(self):
-        retries = 0
-
-        def opener(path, flags):
-            fd = os.open(path, flags | os.O_NONBLOCK)
-            os.set_blocking(fd, True)
-            return fd
-
-        while self.file is None and self.doOpen and retries < 10:
-            try:
-                self.file = open(self.path, self.direction, encoding=self.encoding, opener=opener)
-            except OSError as error:
-                # ENXIO = FIFO has not been opened for reading
-                if error.errno == 6:
-                    time.sleep(.1)
-                    retries += 1
-                else:
-                    raise
-
-        # if doOpen is false, opening has been canceled, so no warning in that case.
-        if self.file is None and self.doOpen:
-            logger.warning("could not open FIFO %s", self.path)
-
-    def close(self):
-        self.doOpen = False
-        try:
-            if self.file is not None:
-                self.file.close()
-            os.unlink(self.path)
-        except FileNotFoundError:
-            # it seems like we keep calling this twice. no idea why, but we don't need the resulting error.
-            pass
-        except Exception:
-            logger.exception("Pipe.close()")
-
-    def __str__(self):
-        return self.path
-
-
-class WritingPipe(Pipe):
-    def __init__(self, path, encoding=None):
-        self.queue = []
-        self.queueLock = threading.Lock()
-        super().__init__(path, "w", encoding=encoding)
-        self.open()
-
-    def open_and_dequeue(self):
-        super().open()
-
-        if self.file is None:
-            return
-
-        with self.queueLock:
-            for i in self.queue:
-                self.file.write(i)
-            self.file.flush()
-            self.queue = None
-
-    def open(self):
-        threading.Thread(target=self.open_and_dequeue).start()
-
-    def write(self, data):
-        if self.file is None:
-            with self.queueLock:
-                self.queue.append(data)
-            return
-        r = self.file.write(data)
-        self.file.flush()
-        return r
-
-
-class ReadingPipe(Pipe):
-    def __init__(self, path, encoding=None):
-        super().__init__(path, "r", encoding=encoding)
-
-    def open(self):
-        if not self.doOpen:
-            return
-        super().open()
-        select.select([self.file], [], [], 10)
-
-    def read(self):
-        if self.file is None:
-            self.open()
-        return self.file.read()
-
-    def readline(self):
-        if self.file is None:
-            self.open()
-        return self.file.readline()
-
-
 class dsp(object):
     def __init__(self, output):
         self.samp_rate = 250000
diff --git a/csdr/pipe.py b/csdr/pipe.py
new file mode 100644
index 0000000..3cc354a
--- /dev/null
+++ b/csdr/pipe.py
@@ -0,0 +1,122 @@
+import os
+import select
+import time
+import threading
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class Pipe(object):
+    READ = "r"
+    WRITE = "w"
+    NONE = None
+
+    @staticmethod
+    def create(path, t, encoding=None):
+        if t == Pipe.READ:
+            return ReadingPipe(path, encoding=encoding)
+        elif t == Pipe.WRITE:
+            return WritingPipe(path, encoding=encoding)
+        elif t == Pipe.NONE:
+            return Pipe(path, None, encoding=encoding)
+
+    def __init__(self, path, direction, encoding=None):
+        self.doOpen = True
+        self.path = "{base}_{myid}".format(base=path, myid=id(self))
+        self.direction = direction
+        self.encoding = encoding
+        self.file = None
+        os.mkfifo(self.path)
+
+    def open(self):
+        retries = 0
+
+        def opener(path, flags):
+            fd = os.open(path, flags | os.O_NONBLOCK)
+            os.set_blocking(fd, True)
+            return fd
+
+        while self.file is None and self.doOpen and retries < 10:
+            try:
+                self.file = open(self.path, self.direction, encoding=self.encoding, opener=opener)
+            except OSError as error:
+                # ENXIO = FIFO has not been opened for reading
+                if error.errno == 6:
+                    time.sleep(.1)
+                    retries += 1
+                else:
+                    raise
+
+        # if doOpen is false, opening has been canceled, so no warning in that case.
+        if self.file is None and self.doOpen:
+            logger.warning("could not open FIFO %s", self.path)
+
+    def close(self):
+        self.doOpen = False
+        try:
+            if self.file is not None:
+                self.file.close()
+            os.unlink(self.path)
+        except FileNotFoundError:
+            # it seems like we keep calling this twice. no idea why, but we don't need the resulting error.
+            pass
+        except Exception:
+            logger.exception("Pipe.close()")
+
+    def __str__(self):
+        return self.path
+
+
+class WritingPipe(Pipe):
+    def __init__(self, path, encoding=None):
+        self.queue = []
+        self.queueLock = threading.Lock()
+        super().__init__(path, "w", encoding=encoding)
+        self.open()
+
+    def open_and_dequeue(self):
+        super().open()
+
+        if self.file is None:
+            return
+
+        with self.queueLock:
+            for i in self.queue:
+                self.file.write(i)
+            self.file.flush()
+            self.queue = None
+
+    def open(self):
+        threading.Thread(target=self.open_and_dequeue).start()
+
+    def write(self, data):
+        if self.file is None:
+            with self.queueLock:
+                self.queue.append(data)
+            return
+        r = self.file.write(data)
+        self.file.flush()
+        return r
+
+
+class ReadingPipe(Pipe):
+    def __init__(self, path, encoding=None):
+        super().__init__(path, "r", encoding=encoding)
+
+    def open(self):
+        if not self.doOpen:
+            return
+        super().open()
+        select.select([self.file], [], [], 10)
+
+    def read(self):
+        if self.file is None:
+            self.open()
+        return self.file.read()
+
+    def readline(self):
+        if self.file is None:
+            self.open()
+        return self.file.readline()

From 7e5ea6e0655ca8e288f66f9ca73f9327b419df57 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 14 Aug 2020 20:20:07 +0200
Subject: [PATCH 459/475] improve read pipe opening

---
 csdr/pipe.py | 67 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 50 insertions(+), 17 deletions(-)

diff --git a/csdr/pipe.py b/csdr/pipe.py
index 3cc354a..bbf9a67 100644
--- a/csdr/pipe.py
+++ b/csdr/pipe.py
@@ -31,27 +31,23 @@ class Pipe(object):
         os.mkfifo(self.path)
 
     def open(self):
-        retries = 0
+        """
+        this method opens the file descriptor with an added O_NONBLOCK flag. This gives us a special behaviour for
+        FIFOS, when they are not opened by the opposing side:
 
+         - opening a pipe for writing will throw an OSError with errno = 6 (ENXIO). This is handled specially in the
+           WritingPipe class.
+         - opening a pipe for reading will pass through this method instantly, even if the opposing end has not been
+           opened yet, but the resulting file descriptor will behave as if O_NONBLOCK is set (even if we remove it
+           immediately here), resulting in empty reads until data is available. This is handled specially in the
+           ReadingPipe class.
+        """
         def opener(path, flags):
             fd = os.open(path, flags | os.O_NONBLOCK)
             os.set_blocking(fd, True)
             return fd
 
-        while self.file is None and self.doOpen and retries < 10:
-            try:
-                self.file = open(self.path, self.direction, encoding=self.encoding, opener=opener)
-            except OSError as error:
-                # ENXIO = FIFO has not been opened for reading
-                if error.errno == 6:
-                    time.sleep(.1)
-                    retries += 1
-                else:
-                    raise
-
-        # if doOpen is false, opening has been canceled, so no warning in that case.
-        if self.file is None and self.doOpen:
-            logger.warning("could not open FIFO %s", self.path)
+        self.file = open(self.path, self.direction, encoding=self.encoding, opener=opener)
 
     def close(self):
         self.doOpen = False
@@ -77,9 +73,30 @@ class WritingPipe(Pipe):
         self.open()
 
     def open_and_dequeue(self):
-        super().open()
+        """
+        This method implements a retry loop that can be interrupted in case the Pipe gets shutdown before actually
+        being connected.
 
+        After the pipe is opened successfully, all data that has been queued is sent in the order it was passed into
+        write().
+        """
+        retries = 0
+
+        while self.file is None and self.doOpen and retries < 10:
+            try:
+                super().open()
+            except OSError as error:
+                # ENXIO = FIFO has not been opened for reading
+                if error.errno == 6:
+                    time.sleep(.1)
+                    retries += 1
+                else:
+                    raise
+
+        # if doOpen is false, opening has been canceled, so no warning in that case.
         if self.file is None:
+            if self.doOpen:
+                logger.warning("could not open FIFO %s", self.path)
             return
 
         with self.queueLock:
@@ -89,9 +106,17 @@ class WritingPipe(Pipe):
             self.queue = None
 
     def open(self):
+        """
+        This sends the opening operation off to a background thread. If we were to block the thread here, another pipe
+        may be waiting in the queue to be opened on the opposing side, resulting in a deadlock
+        """
         threading.Thread(target=self.open_and_dequeue).start()
 
     def write(self, data):
+        """
+        This method queues all data to be written until the file is actually opened. As soon as a file is available,
+        it becomes a passthrough.
+        """
         if self.file is None:
             with self.queueLock:
                 self.queue.append(data)
@@ -106,10 +131,18 @@ class ReadingPipe(Pipe):
         super().__init__(path, "r", encoding=encoding)
 
     def open(self):
+        """
+        This method implements an interruptible loop that waits for the file descriptor to be opened and the first
+        batch of data coming in using repeated select() calls.
+        :return:
+        """
         if not self.doOpen:
             return
         super().open()
-        select.select([self.file], [], [], 10)
+        while self.doOpen:
+            (read, _, _) = select.select([self.file], [], [], 1)
+            if self.file in read:
+                break
 
     def read(self):
         if self.file is None:

From 0030c6d6567f04b7d581d922d973585f96a8e3a5 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 14 Aug 2020 20:22:25 +0200
Subject: [PATCH 460/475] thread names to aid debugging

---
 csdr/csdr.py             | 4 ++--
 csdr/pipe.py             | 2 +-
 owrx/connection.py       | 2 +-
 owrx/dsp.py              | 2 +-
 owrx/map.py              | 2 +-
 owrx/service/__init__.py | 2 +-
 owrx/source/__init__.py  | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/csdr/csdr.py b/csdr/csdr.py
index ccd9776..dbfc5b5 100644
--- a/csdr/csdr.py
+++ b/csdr/csdr.py
@@ -45,7 +45,7 @@ class output(object):
         if not self.supports_type(t):
             # TODO rewrite the output mechanism in a way that avoids producing unnecessary data
             logger.warning("dumping output of type %s since it is not supported.", t)
-            threading.Thread(target=self.pump(read_fn, lambda x: None)).start()
+            threading.Thread(target=self.pump(read_fn, lambda x: None), name="csdr_pump_thread").start()
             return
         self.receive_output(t, read_fn)
 
@@ -773,7 +773,7 @@ class dsp(object):
                     logger.debug("restarting since rc = 0, self.running = true, and no modification")
                     self.restart()
 
-            threading.Thread(target=watch_thread).start()
+            threading.Thread(target=watch_thread, name="csdr_watch_thread").start()
 
             audio_type = "hd_audio" if self.isHdAudio() else "audio"
             if self.output.supports_type(audio_type):
diff --git a/csdr/pipe.py b/csdr/pipe.py
index bbf9a67..f915aef 100644
--- a/csdr/pipe.py
+++ b/csdr/pipe.py
@@ -110,7 +110,7 @@ class WritingPipe(Pipe):
         This sends the opening operation off to a background thread. If we were to block the thread here, another pipe
         may be waiting in the queue to be opened on the opposing side, resulting in a deadlock
         """
-        threading.Thread(target=self.open_and_dequeue).start()
+        threading.Thread(target=self.open_and_dequeue, name="csdr_pipe_thread").start()
 
     def write(self, data):
         """
diff --git a/owrx/connection.py b/owrx/connection.py
index ceef8c5..7bfd805 100644
--- a/owrx/connection.py
+++ b/owrx/connection.py
@@ -48,7 +48,7 @@ class Client(ABC):
             # unset the queue object to free shared memory file descriptors
             self.multithreadingQueue = None
 
-        threading.Thread(target=mp_passthru).start()
+        threading.Thread(target=mp_passthru, name="connection_mp_passthru").start()
 
     def send(self, data):
         try:
diff --git a/owrx/dsp.py b/owrx/dsp.py
index 4343564..eabe244 100644
--- a/owrx/dsp.py
+++ b/owrx/dsp.py
@@ -158,7 +158,7 @@ class DspManager(csdr.output):
 
         write = writers[t]
 
-        threading.Thread(target=self.pump(read_fn, write)).start()
+        threading.Thread(target=self.pump(read_fn, write), name="dsp_pump_{}".format(t)).start()
 
     def stop(self):
         self.dsp.stop()
diff --git a/owrx/map.py b/owrx/map.py
index 779696b..8c95ea5 100644
--- a/owrx/map.py
+++ b/owrx/map.py
@@ -49,7 +49,7 @@ class Map(object):
                     loops = 0
                 time.sleep(60)
 
-        threading.Thread(target=removeLoop, daemon=True).start()
+        threading.Thread(target=removeLoop, daemon=True, name="map_removeloop").start()
         super().__init__()
 
     def broadcast(self, update):
diff --git a/owrx/service/__init__.py b/owrx/service/__init__.py
index 96a3ff1..a8e60d8 100644
--- a/owrx/service/__init__.py
+++ b/owrx/service/__init__.py
@@ -32,7 +32,7 @@ class ServiceOutput(output, metaclass=ABCMeta):
         parser = self.getParser()
         parser.setDialFrequency(self.frequency)
         target = self.pump(read_fn, parser.parse)
-        threading.Thread(target=target).start()
+        threading.Thread(target=target, name="service_output_receive").start()
 
 
 class WsjtServiceOutput(ServiceOutput):
diff --git a/owrx/source/__init__.py b/owrx/source/__init__.py
index a55f0ee..8720882 100644
--- a/owrx/source/__init__.py
+++ b/owrx/source/__init__.py
@@ -171,7 +171,7 @@ class SdrSource(ABC):
                 logger.debug("shut down with RC={0}".format(rc))
                 self.monitor = None
 
-            self.monitor = threading.Thread(target=wait_for_process_to_end)
+            self.monitor = threading.Thread(target=wait_for_process_to_end, name="source_monitor")
             self.monitor.start()
 
             retries = 1000

From 1c2125f969d89c3d6550348b782e80632457084a Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Fri, 14 Aug 2020 21:08:35 +0200
Subject: [PATCH 461/475] prevent direwolf from using hamlib, refs #164

---
 docker/scripts/install-dependencies.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docker/scripts/install-dependencies.sh b/docker/scripts/install-dependencies.sh
index 479db9c..04af411 100755
--- a/docker/scripts/install-dependencies.sh
+++ b/docker/scripts/install-dependencies.sh
@@ -20,7 +20,6 @@ cd /tmp
 
 STATIC_PACKAGES="sox libfftw3-bin python3 python3-setuptools netcat-openbsd libsndfile1 liblapack3 libusb-1.0-0 libqt5core5a libreadline7 libgfortran4 libgomp1 libasound2 libudev1 ca-certificates libqt5gui5 libqt5sql5 libqt5printsupport5"
 BUILD_PACKAGES="wget git libsndfile1-dev libfftw3-dev cmake make gcc g++ liblapack-dev autoconf automake libtool texinfo gfortran libusb-1.0-0-dev qtbase5-dev qtmultimedia5-dev qttools5-dev libqt5serialport5-dev qttools5-dev-tools asciidoctor asciidoc libasound2-dev pkg-config libudev-dev libhamlib-dev patch xsltproc"
-
 apt-get update
 apt-get -y install auto-apt-proxy
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
@@ -94,7 +93,9 @@ rm ${WSJT_TGZ}
 
 git clone --depth 1 -b 1.5 https://github.com/wb2osz/direwolf.git
 cd direwolf
-make
+# hamlib is present (necessary for the wsjt-x and js8call builds) and would be used, but there's no real need.
+# by setting enable_hamlib we prevent direwolf from linking to it, and it can be stripped at the end of the script.
+make enable_hamlib=
 make install
 cd ..
 rm -rf direwolf

From 6f8c8a3b66d5c035c9ce3d6cf34f3ecf4ab71d7b Mon Sep 17 00:00:00 2001
From: pa3gsb <pa3gsb@gmail.com>
Date: Sat, 15 Aug 2020 14:02:20 +0200
Subject: [PATCH 462/475] radioberry added to docker setup

---
 build.sh                                      |  1 +
 docker/Dockerfiles/Dockerfile-radioberry      |  8 +++++
 docker/env                                    |  2 +-
 .../install-dependencies-radioberry.sh        | 35 +++++++++++++++++++
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 docker/Dockerfiles/Dockerfile-radioberry
 create mode 100644 docker/scripts/install-dependencies-radioberry.sh

diff --git a/build.sh b/build.sh
index 3fccffa..84a543c 100755
--- a/build.sh
+++ b/build.sh
@@ -14,4 +14,5 @@ docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-limesdr:$ARCHTAG
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-soapyremote:$ARCHTAG -f docker/Dockerfiles/Dockerfile-soapyremote .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-perseus:$ARCHTAG -f docker/Dockerfiles/Dockerfile-perseus .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-fcdpp:$ARCHTAG -f docker/Dockerfiles/Dockerfile-fcdpp .
+docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-radioberry:$ARCHTAG -f docker/Dockerfiles/Dockerfile-radioberry .
 docker build --build-arg ARCHTAG=$ARCHTAG -t jketterl/openwebrx-full:$ARCHTAG -t jketterl/openwebrx:$ARCHTAG -f docker/Dockerfiles/Dockerfile-full .
diff --git a/docker/Dockerfiles/Dockerfile-radioberry b/docker/Dockerfiles/Dockerfile-radioberry
new file mode 100644
index 0000000..9eabed8
--- /dev/null
+++ b/docker/Dockerfiles/Dockerfile-radioberry
@@ -0,0 +1,8 @@
+ARG ARCHTAG
+FROM openwebrx-soapysdr-base:$ARCHTAG
+
+ADD docker/scripts/install-dependencies-radioberry.sh /
+RUN /install-dependencies-radioberry.sh &&\
+    rm /install-dependencies-radioberry.sh
+
+ADD . /opt/openwebrx
diff --git a/docker/env b/docker/env
index 55d1586..daa5e10 100644
--- a/docker/env
+++ b/docker/env
@@ -1,5 +1,5 @@
 ARCH=$(uname -m)
-IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-perseus openwebrx-fcdpp openwebrx-full openwebrx"
+IMAGES="openwebrx-rtlsdr openwebrx-sdrplay openwebrx-hackrf openwebrx-airspy openwebrx-rtlsdr-soapy openwebrx-plutosdr openwebrx-limesdr openwebrx-soapyremote openwebrx-perseus openwebrx-fcdpp openwebrx-radioberry openwebrx-full openwebrx"
 ALL_ARCHS="x86_64 armv7l aarch64"
 TAG=${TAG:-"latest"}
 ARCHTAG="$TAG-$ARCH"
diff --git a/docker/scripts/install-dependencies-radioberry.sh b/docker/scripts/install-dependencies-radioberry.sh
new file mode 100644
index 0000000..3ace195
--- /dev/null
+++ b/docker/scripts/install-dependencies-radioberry.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+set -euxo pipefail
+export MAKEFLAGS="-j4"
+
+function cmakebuild() {
+  cd $1
+  if [[ ! -z "${2:-}" ]]; then
+    git checkout $2
+  fi
+  mkdir build
+  cd build
+  cmake .. 
+  make MAKEFLAGS
+  make install
+  cd ../..
+  rm -rf $1
+}
+
+cd /tmp
+
+STATIC_PACKAGES="libusb-1.0-0 libfftw3-3 udev"
+BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev libfftw3-dev pkg-config"
+
+apt-get update
+apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
+
+cd Radioberry-2.x\SBC\rpi-4\
+
+cmakebuild SoapyRadioberrySDR
+cd ../../..
+rm -rf Radioberry-2.x
+
+SUDO_FORCE_REMOVE=yes apt-get -y purge --autoremove $BUILD_PACKAGES
+apt-get clean
+rm -rf /var/lib/apt/lists/*

From cfc3f926fe9eacc55e18702033d5333ee7b085ae Mon Sep 17 00:00:00 2001
From: pa3gsb <pa3gsb@gmail.com>
Date: Sat, 15 Aug 2020 14:24:48 +0200
Subject: [PATCH 463/475] clone added

---
 docker/scripts/install-dependencies-radioberry.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/scripts/install-dependencies-radioberry.sh b/docker/scripts/install-dependencies-radioberry.sh
index 3ace195..4e8db54 100644
--- a/docker/scripts/install-dependencies-radioberry.sh
+++ b/docker/scripts/install-dependencies-radioberry.sh
@@ -24,6 +24,7 @@ BUILD_PACKAGES="git cmake make patch wget sudo gcc g++ libusb-1.0-0-dev libfftw3
 apt-get update
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
+git clone https://github.com/pa3gsb/Radioberry-2.x
 cd Radioberry-2.x\SBC\rpi-4\
 
 cmakebuild SoapyRadioberrySDR

From dd3bf121c1918a71c1ee14f0ba420475a9d5841c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 15 Aug 2020 16:05:50 +0200
Subject: [PATCH 464/475] fix start_freq not working on neighboring profiles

---
 htdocs/lib/DemodulatorPanel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index c276392..421487c 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -276,7 +276,7 @@ DemodulatorPanel.prototype.validateHash = function(params) {
     var self = this;
     params = Object.keys(params).filter(function(key) {
         if (key == 'freq' || key == 'mod' || key == 'secondary_mod' || key == 'sql') {
-            return params.freq && Math.abs(params.freq - self.center_freq) < bandwidth;
+            return params.freq && Math.abs(params.freq - self.center_freq) < bandwidth / 2;
         }
         return true;
     }).reduce(function(p, key) {

From 18d8b81f70fb998469c701e7fcf5a2d5cb5ccaff Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 15 Aug 2020 16:46:16 +0200
Subject: [PATCH 465/475] add git revision

---
 docker/scripts/install-dependencies-radioberry.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/scripts/install-dependencies-radioberry.sh b/docker/scripts/install-dependencies-radioberry.sh
index 4e8db54..d0b3e0a 100644
--- a/docker/scripts/install-dependencies-radioberry.sh
+++ b/docker/scripts/install-dependencies-radioberry.sh
@@ -27,7 +27,8 @@ apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 git clone https://github.com/pa3gsb/Radioberry-2.x
 cd Radioberry-2.x\SBC\rpi-4\
 
-cmakebuild SoapyRadioberrySDR
+# latest commit on master as of 2020-08-15
+cmakebuild SoapyRadioberrySDR ed8cbfd17b6d1e657a54a677b87479cf28dd77e8
 cd ../../..
 rm -rf Radioberry-2.x
 

From 0066b4dbfd3682e2911b84aa7d594bf0326a7fbf Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 15 Aug 2020 16:52:55 +0200
Subject: [PATCH 466/475] make script executable

---
 docker/scripts/install-dependencies-radioberry.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 docker/scripts/install-dependencies-radioberry.sh

diff --git a/docker/scripts/install-dependencies-radioberry.sh b/docker/scripts/install-dependencies-radioberry.sh
old mode 100644
new mode 100755

From 66703cb5e1325156eeb0ffdd4636ae54026e9aed Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 15 Aug 2020 16:53:10 +0200
Subject: [PATCH 467/475] include radioberry in full build

---
 docker/Dockerfiles/Dockerfile-full | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker/Dockerfiles/Dockerfile-full b/docker/Dockerfiles/Dockerfile-full
index cd8700b..6a8a1e6 100644
--- a/docker/Dockerfiles/Dockerfile-full
+++ b/docker/Dockerfiles/Dockerfile-full
@@ -15,6 +15,7 @@ RUN /install-dependencies-rtlsdr.sh &&\
     /install-dependencies-soapyremote.sh &&\
     /install-dependencies-perseus.sh &&\
     /install-dependencies-fcdpp.sh &&\
+    /install-dependencies-radioberry.sh &&\
     rm /install-dependencies-*.sh &&\
     rm /install-lib.*.patch
 

From 47da9a9d7019aa3242765393df0484d13b8f37b8 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 15 Aug 2020 17:01:32 +0200
Subject: [PATCH 468/475] use unix dir separators

---
 docker/scripts/install-dependencies-radioberry.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/install-dependencies-radioberry.sh b/docker/scripts/install-dependencies-radioberry.sh
index d0b3e0a..a7ab3d4 100755
--- a/docker/scripts/install-dependencies-radioberry.sh
+++ b/docker/scripts/install-dependencies-radioberry.sh
@@ -25,7 +25,7 @@ apt-get update
 apt-get -y install --no-install-recommends $STATIC_PACKAGES $BUILD_PACKAGES
 
 git clone https://github.com/pa3gsb/Radioberry-2.x
-cd Radioberry-2.x\SBC\rpi-4\
+cd Radioberry-2.x/SBC/rpi-4
 
 # latest commit on master as of 2020-08-15
 cmakebuild SoapyRadioberrySDR ed8cbfd17b6d1e657a54a677b87479cf28dd77e8

From bc000451ccc8b534771a8e24d555380b58e42ea3 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 15 Aug 2020 17:39:13 +0200
Subject: [PATCH 469/475] update make call

---
 docker/scripts/install-dependencies-radioberry.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/scripts/install-dependencies-radioberry.sh b/docker/scripts/install-dependencies-radioberry.sh
index a7ab3d4..84c0cfc 100755
--- a/docker/scripts/install-dependencies-radioberry.sh
+++ b/docker/scripts/install-dependencies-radioberry.sh
@@ -10,7 +10,7 @@ function cmakebuild() {
   mkdir build
   cd build
   cmake .. 
-  make MAKEFLAGS
+  make
   make install
   cd ../..
   rm -rf $1

From c9dd33ba570aaee21989f374fffd03223174f703 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 16 Aug 2020 21:49:52 +0200
Subject: [PATCH 470/475] add a new source for rtl_tcp and rtl_tcp_connector

---
 CHANGELOG.md           |  1 +
 debian/changelog       |  1 +
 owrx/feature.py        | 12 +++++++++++-
 owrx/source/rtl_tcp.py | 12 ++++++++++++
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 owrx/source/rtl_tcp.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 47764a3..2e3a4d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@
 - Added new HD audio streaming mode along with a new WFM demodulator
 - New devices supported:
   - FunCube Dongle Pro+ (`"type": "fcdpp"`)
+  - Support for connections to rtl_tcp
 
 **0.19.1**
 - Added ability to authenticate receivers with listing sites using "receiver id" tokens
diff --git a/debian/changelog b/debian/changelog
index 3c738a9..ccb485b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ openwebrx (0.20.0) UNRELEASED; urgency=low
   * Added new HD audio streaming mode along with a new WFM demodulator
   * New devices supported:
     - FunCube Dongle Pro+ (`"type": "fcdpp"`)
+    - Support for connections to rtl_tcp
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Sat, 13 Jun 2020 17:22:00 +0000
 
diff --git a/owrx/feature.py b/owrx/feature.py
index a675823..73f05a6 100644
--- a/owrx/feature.py
+++ b/owrx/feature.py
@@ -23,6 +23,7 @@ class FeatureDetector(object):
         # different types of sdrs and their requirements
         "rtl_sdr": ["rtl_connector"],
         "rtl_sdr_soapy": ["soapy_connector", "soapy_rtl_sdr"],
+        "rtl_tcp": ["rtl_tcp_connector"],
         "sdrplay": ["soapy_connector", "soapy_sdrplay"],
         "hackrf": ["soapy_connector", "soapy_hackrf"],
         "perseussdr": ["perseustest"],
@@ -194,7 +195,7 @@ class FeatureDetector(object):
         )
 
     def _check_connector(self, command):
-        required_version = LooseVersion("0.2")
+        required_version = LooseVersion("0.3")
 
         owrx_connector_version_regex = re.compile("^owrx-connector version (.*)$")
 
@@ -218,6 +219,15 @@ class FeatureDetector(object):
         """
         return self._check_connector("rtl_connector")
 
+    def has_rtl_tcp_connector(self):
+        """
+        The owrx_connector package offers direct interfacing between your hardware and openwebrx. It allows quicker
+        frequency switching, uses less CPU and can even provide more stability in some cases.
+
+        You can get it [here](https://github.com/jketterl/owrx_connector).
+        """
+        return self._check_connector("rtl_tcp_connector")
+
     def has_soapy_connector(self):
         """
         The owrx_connector package offers direct interfacing between your hardware and openwebrx. It allows quicker
diff --git a/owrx/source/rtl_tcp.py b/owrx/source/rtl_tcp.py
new file mode 100644
index 0000000..fcf719e
--- /dev/null
+++ b/owrx/source/rtl_tcp.py
@@ -0,0 +1,12 @@
+from .connector import ConnectorSource
+from owrx.command import Flag, Option
+
+
+class RtlTcpSource(ConnectorSource):
+    def getCommandMapper(self):
+        return (
+            super()
+            .getCommandMapper()
+            .setBase("rtl_tcp_connector")
+            .setMappings({"bias_tee": Flag("-b"), "direct_sampling": Option("-e")})
+        )

From b158e0d17d6db64d3a68df4f594966158125da77 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 16 Aug 2020 23:19:37 +0200
Subject: [PATCH 471/475] add the ability to add literal command-line arguments

---
 owrx/command.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/owrx/command.py b/owrx/command.py
index 871e414..87ae711 100644
--- a/owrx/command.py
+++ b/owrx/command.py
@@ -72,3 +72,8 @@ class Option(CommandMapping):
     def setSpacer(self, spacer):
         self.spacer = spacer
         return self
+
+
+class Argument(CommandMapping):
+    def map(self, value):
+        return value

From 23c69fb5a3529069109ed1b52410d90fb9f61af9 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 16 Aug 2020 23:22:46 +0200
Subject: [PATCH 472/475] add "remote" mapping

---
 owrx/source/rtl_tcp.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/owrx/source/rtl_tcp.py b/owrx/source/rtl_tcp.py
index fcf719e..03c3109 100644
--- a/owrx/source/rtl_tcp.py
+++ b/owrx/source/rtl_tcp.py
@@ -1,5 +1,5 @@
 from .connector import ConnectorSource
-from owrx.command import Flag, Option
+from owrx.command import Flag, Option, Argument
 
 
 class RtlTcpSource(ConnectorSource):
@@ -8,5 +8,9 @@ class RtlTcpSource(ConnectorSource):
             super()
             .getCommandMapper()
             .setBase("rtl_tcp_connector")
-            .setMappings({"bias_tee": Flag("-b"), "direct_sampling": Option("-e")})
+            .setMappings({
+                "bias_tee": Flag("-b"),
+                "direct_sampling": Option("-e"),
+                "remote": Argument(),
+            })
         )

From 1bff6d1289b25f03d61ed5cf85cf82ab6050d639 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <dd5jfk@darc.de>
Date: Thu, 20 Aug 2020 11:50:27 +0200
Subject: [PATCH 473/475] update connectors to latest version

---
 docker/scripts/install-connectors.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docker/scripts/install-connectors.sh b/docker/scripts/install-connectors.sh
index d7014e7..9a1902d 100755
--- a/docker/scripts/install-connectors.sh
+++ b/docker/scripts/install-connectors.sh
@@ -24,7 +24,8 @@ apt-get update
 apt-get -y install --no-install-recommends $BUILD_PACKAGES
 
 git clone https://github.com/jketterl/owrx_connector.git
-cmakebuild owrx_connector 45ec227b38bb763b0a923a1856740f4ddf74216c
+# this is the latest development version as of 2020-08-20 (includes rtl_tcp_connector)
+cmakebuild owrx_connector a5a4d78ff7f029d2b86e9ddbc30187ced1c3ecf7
 
 apt-get -y purge --autoremove $BUILD_PACKAGES
 apt-get clean

From 6aa25760c5702d7c94563c852e440614ce7e346c Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sat, 22 Aug 2020 18:07:54 +0200
Subject: [PATCH 474/475] update the issues page wordings

---
 .github/ISSUE_TEMPLATE/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index e1c0030..5ddf151 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,5 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Groups.io Mailing list
+  - name: General support or other project-relasted question
     url: https://groups.io/g/openwebrx
-    about: Community mailing list for general user support and other project-related questions and requests
\ No newline at end of file
+    about: Request help on the community mailing list

From 9e41d49d4600b2e2471a430e5786a80178497a94 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Sun, 23 Aug 2020 17:56:13 +0200
Subject: [PATCH 475/475] refactor audio startup so it will autostart on
 firefox, if allowed

---
 htdocs/lib/AudioEngine.js | 213 +++++++++++++++++++++-----------------
 htdocs/openwebrx.js       |  15 +--
 2 files changed, 127 insertions(+), 101 deletions(-)

diff --git a/htdocs/lib/AudioEngine.js b/htdocs/lib/AudioEngine.js
index b3a9e6c..c907409 100644
--- a/htdocs/lib/AudioEngine.js
+++ b/htdocs/lib/AudioEngine.js
@@ -10,9 +10,16 @@ function AudioEngine(maxBufferLength, audioReporter) {
     if (!ctx) {
         return;
     }
-    this.audioContext = new ctx();
-    this.allowed = this.audioContext.state === 'running';
+
+    this.onStartCallbacks = [];
+
     this.started = false;
+    this.audioContext = new ctx();
+    var me = this;
+    this.audioContext.onstatechange = function() {
+        if (me.audioContext.state !== 'running') return;
+        me._start();
+    }
 
     this.audioCodec = new ImaAdpcmCodec();
     this.compression = 'none';
@@ -24,112 +31,130 @@ function AudioEngine(maxBufferLength, audioReporter) {
     this.maxBufferSize = maxBufferLength * this.getSampleRate();
 }
 
-AudioEngine.prototype.start = function(callback) {
+AudioEngine.prototype.resume = function(){
+    this.audioContext.resume();
+}
+
+AudioEngine.prototype._start = function() {
     var me = this;
-    if (me.resamplingFactor === 0) return; //if failed to find a valid resampling factor...
+
+    // if failed to find a valid resampling factor...
+    if (me.resamplingFactor === 0) {
+         return;
+    }
+
+    // been started before?
     if (me.started) {
-        if (callback) callback(false);
         return;
     }
 
-    me.audioContext.resume().then(function(){
-        me.allowed = me.audioContext.state === 'running';
-        if (!me.allowed) {
-            if (callback) callback(false);
-            return;
-        }
-        me.started = true;
+    // are we allowed to play audio?
+    if (!me.isAllowed()) {
+        return;
+    }
+    me.started = true;
 
-        me.gainNode = me.audioContext.createGain();
-        me.gainNode.connect(me.audioContext.destination);
+    me.gainNode = me.audioContext.createGain();
+    me.gainNode.connect(me.audioContext.destination);
 
-        if (useAudioWorklets && me.audioContext.audioWorklet) {
-            me.audioContext.audioWorklet.addModule('static/lib/AudioProcessor.js').then(function(){
-                me.audioNode = new AudioWorkletNode(me.audioContext, 'openwebrx-audio-processor', {
-                    numberOfInputs: 0,
-                    numberOfOutputs: 1,
-                    outputChannelCount: [1],
-                    processorOptions: {
-                        maxBufferSize: me.maxBufferSize
-                    }
-                });
-                me.audioNode.connect(me.gainNode);
-                me.audioNode.port.addEventListener('message', function(m){
-                    var json = JSON.parse(m.data);
-                    if (typeof(json.buffersize) !== 'undefined') {
-                        me.audioReporter({
-                            buffersize: json.buffersize
-                        });
-                    }
-                    if (typeof(json.samplesProcessed) !== 'undefined') {
-                        me.audioSamples.add(json.samplesProcessed);
-                    }
-                });
-                me.audioNode.port.start();
-                if (callback) callback(true, 'AudioWorklet');
+    if (useAudioWorklets && me.audioContext.audioWorklet) {
+        me.audioContext.audioWorklet.addModule('static/lib/AudioProcessor.js').then(function(){
+            me.audioNode = new AudioWorkletNode(me.audioContext, 'openwebrx-audio-processor', {
+                numberOfInputs: 0,
+                numberOfOutputs: 1,
+                outputChannelCount: [1],
+                processorOptions: {
+                    maxBufferSize: me.maxBufferSize
+                }
             });
-        } else {
-            me.audioBuffers = [];
-
-            if (!AudioBuffer.prototype.copyToChannel) { //Chrome 36 does not have it, Firefox does
-                AudioBuffer.prototype.copyToChannel = function (input, channel) //input is Float32Array
-                {
-                    var cd = this.getChannelData(channel);
-                    for (var i = 0; i < input.length; i++) cd[i] = input[i];
-                }
-            }
-
-            var bufferSize;
-            if (me.audioContext.sampleRate < 44100 * 2)
-                bufferSize = 4096;
-            else if (me.audioContext.sampleRate >= 44100 * 2 && me.audioContext.sampleRate < 44100 * 4)
-                bufferSize = 4096 * 2;
-            else if (me.audioContext.sampleRate > 44100 * 4)
-                bufferSize = 4096 * 4;
-
-
-            function audio_onprocess(e) {
-                var total = 0;
-                var out = new Float32Array(bufferSize);
-                while (me.audioBuffers.length) {
-                    var b = me.audioBuffers.shift();
-                    // not enough space to fit all data, so splice and put back in the queue
-                    if (total + b.length > bufferSize) {
-                        var spaceLeft  = bufferSize - total;
-                        var tokeep = b.subarray(0, spaceLeft);
-                        out.set(tokeep, total);
-                        var tobuffer = b.subarray(spaceLeft, b.length);
-                        me.audioBuffers.unshift(tobuffer);
-                        total += spaceLeft;
-                        break;
-                    } else {
-                        out.set(b, total);
-                        total += b.length;
-                    }
-                }
-
-                e.outputBuffer.copyToChannel(out, 0);
-                me.audioSamples.add(total);
-
-            }
-
-            //on Chrome v36, createJavaScriptNode has been replaced by createScriptProcessor
-            var method = 'createScriptProcessor';
-            if (me.audioContext.createJavaScriptNode) {
-                method = 'createJavaScriptNode';
-            }
-            me.audioNode = me.audioContext[method](bufferSize, 0, 1);
-            me.audioNode.onaudioprocess = audio_onprocess;
             me.audioNode.connect(me.gainNode);
-            if (callback) callback(true, 'ScriptProcessorNode');
+            me.audioNode.port.addEventListener('message', function(m){
+                var json = JSON.parse(m.data);
+                if (typeof(json.buffersize) !== 'undefined') {
+                    me.audioReporter({
+                        buffersize: json.buffersize
+                    });
+                }
+                if (typeof(json.samplesProcessed) !== 'undefined') {
+                    me.audioSamples.add(json.samplesProcessed);
+                }
+            });
+            me.audioNode.port.start();
+            me.workletType = 'AudioWorklet';
+        });
+    } else {
+        me.audioBuffers = [];
+
+        if (!AudioBuffer.prototype.copyToChannel) { //Chrome 36 does not have it, Firefox does
+            AudioBuffer.prototype.copyToChannel = function (input, channel) //input is Float32Array
+            {
+                var cd = this.getChannelData(channel);
+                for (var i = 0; i < input.length; i++) cd[i] = input[i];
+            }
         }
 
-        setInterval(me.reportStats.bind(me), 1000);
-    });
+        var bufferSize;
+        if (me.audioContext.sampleRate < 44100 * 2)
+            bufferSize = 4096;
+        else if (me.audioContext.sampleRate >= 44100 * 2 && me.audioContext.sampleRate < 44100 * 4)
+            bufferSize = 4096 * 2;
+        else if (me.audioContext.sampleRate > 44100 * 4)
+            bufferSize = 4096 * 4;
+
+
+        function audio_onprocess(e) {
+            var total = 0;
+            var out = new Float32Array(bufferSize);
+            while (me.audioBuffers.length) {
+                var b = me.audioBuffers.shift();
+                // not enough space to fit all data, so splice and put back in the queue
+                if (total + b.length > bufferSize) {
+                    var spaceLeft  = bufferSize - total;
+                    var tokeep = b.subarray(0, spaceLeft);
+                    out.set(tokeep, total);
+                    var tobuffer = b.subarray(spaceLeft, b.length);
+                    me.audioBuffers.unshift(tobuffer);
+                    total += spaceLeft;
+                    break;
+                } else {
+                    out.set(b, total);
+                    total += b.length;
+                }
+            }
+
+            e.outputBuffer.copyToChannel(out, 0);
+            me.audioSamples.add(total);
+
+        }
+
+        //on Chrome v36, createJavaScriptNode has been replaced by createScriptProcessor
+        var method = 'createScriptProcessor';
+        if (me.audioContext.createJavaScriptNode) {
+            method = 'createJavaScriptNode';
+        }
+        me.audioNode = me.audioContext[method](bufferSize, 0, 1);
+        me.audioNode.onaudioprocess = audio_onprocess;
+        me.audioNode.connect(me.gainNode);
+        me.workletType = 'ScriptProcessorNode';
+    }
+
+    setInterval(me.reportStats.bind(me), 1000);
+
+    var callbacks = this.onStartCallbacks;
+    this.onStartCallbacks = false;
+    callbacks.forEach(function(c) { c(me.workletType); });
+};
+
+AudioEngine.prototype.onStart = function(callback) {
+    if (this.onStartCallbacks) {
+        this.onStartCallbacks.push(callback);
+    } else {
+        callback();
+    }
 };
 
 AudioEngine.prototype.isAllowed = function() {
-    return this.allowed;
+    return this.audioContext.state === 'running';
 };
 
 AudioEngine.prototype.reportStats = function() {
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 7c24a23..36ab5ea 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1099,9 +1099,11 @@ var mute = false;
 // Optimalise these if audio lags or is choppy:
 var audio_buffer_maximal_length_sec = 1; //actual number of samples are calculated from sample rate
 
-function onAudioStart(success, apiType){
+function onAudioStart(apiType){
     divlog('Web Audio API succesfully initialized, using ' + apiType  + ' API, sample rate: ' + audioEngine.getSampleRate() + " Hz");
 
+    hideOverlay();
+
     // canvas_container is set after waterfall_init() has been called. we cannot initialize before.
     //if (canvas_container) synchronize_demodulator_init();
 
@@ -1320,11 +1322,12 @@ var audioEngine;
 function openwebrx_init() {
     audioEngine = new AudioEngine(audio_buffer_maximal_length_sec, audioReporter);
     $overlay = $('#openwebrx-autoplay-overlay');
-    $overlay.on('click', playButtonClick);
+    $overlay.on('click', function(){
+        audioEngine.resume();
+    });
+    audioEngine.onStart(onAudioStart);
     if (!audioEngine.isAllowed()) {
         $overlay.show();
-    } else {
-        audioEngine.start(onAudioStart);
     }
     fft_codec = new ImaAdpcmCodec();
     initProgressBars();
@@ -1370,9 +1373,7 @@ function update_dmr_timeslot_filtering() {
     $('#openwebrx-panel-receiver').demodulatorPanel().getDemodulator().setDmrFilter(filter);
 }
 
-function playButtonClick() {
-    //On iOS, we can only start audio from a click or touch event.
-    audioEngine.start(onAudioStart);
+function hideOverlay() {
     var $overlay = $('#openwebrx-autoplay-overlay');
     $overlay.css('opacity', 0);
     $overlay.on('transitionend', function() {