Merge branch 'develop' into rf103

CHANGELOG.md

@@ -1,5 +1,6 @@
 **unreleased**
 - Introduced `squelch_auto_margin` config option that allows configuring the auto squelch level
+- Removed `port` configuration option; `rtltcp_compat` takes the port number with the new connectors
 
 **0.20.0**
 - Added the ability to sign multiple keys in a single request, thus enabling multiple users to claim a single receiver

debian/changelog

@@ -1,6 +1,8 @@
 openwebrx (0.21.0) UNRELEASED; urgency=low
   * Introduced `squelch_auto_margin` config option that allows configuring the
     auto squelch level
+  * Removed `port` configuration option; `rtltcp_compat` takes the port number
+    with the new connectors
 
  -- Jakob Ketterl <jakob.ketterl@gmx.de>  Sun, 11 Oct 2020 21:12:00 +0000
 

owrx/source/__init__.py

@@ -59,10 +59,7 @@ class SdrSource(ABC):
         self.activateProfile()
         self.wireEvents()
 
-        if "port" in props and props["port"] is not None:
+        self.port = getAvailablePort()
-            self.port = props["port"]
-        else:
-            self.port = getAvailablePort()
         self.monitor = None
         self.clients = []
         self.spectrumClients = []

owrx/source/connector.py

@@ -23,7 +23,7 @@ class ConnectorSource(SdrSource):
                 "controlPort": Option("-c"),
                 "device": Option("-d"),
                 "iqswap": Flag("-i"),
-                "rtltcp_compat": Flag("-r"),
+                "rtltcp_compat": Option("-r"),
                 "ppm": Option("-P"),
                 "rf_gain": Option("-g"),
             }