Merge pull request #781 from darksidelemm/testing

Breakout of scan loop faster

auto_rx/autorx/__init__.py

@@ -12,7 +12,7 @@ from queue import Queue
 # MINOR - New sonde type support, other fairly big changes that may result in telemetry or config file incompatability issus.
 # PATCH - Small changes, or minor feature additions.
 
-__version__ = "1.6.2-beta3"
+__version__ = "1.6.2-beta4"
 
 
 # Global Variables

auto_rx/autorx/config.py

@@ -683,8 +683,8 @@ def read_auto_rx_config(filename, no_sdr_test=False):
         # that this goes against the wishes of the radiosonde_auto_rx developers to not be part
         # of the bigger problem of APRS-IS congestion. 
 
-        ALLOWED_APRS_SERVERS = ["radiosondy.info", "localhost"]
-        ALLOWED_APRS_PORTS = [14590]
+        ALLOWED_APRS_SERVERS = ["radiosondy.info", "wettersonde.net", "localhost"]
+        ALLOWED_APRS_PORTS = [14580, 14590]
 
         if auto_rx_config["aprs_server"] not in ALLOWED_APRS_SERVERS:
             logging.warning(

auto_rx/autorx/scan.py

@@ -866,7 +866,11 @@ class SondeScanner(object):
                 self.error_retries = 0
 
             # Sleep before starting the next scan.
-            time.sleep(self.scan_delay)
+            for i in range(self.scan_delay):
+                time.sleep(1)
+                if self.sonde_scanner_running == False:
+                    self.log_debug("Breaking out of scan loop.")
+                    break
 
         self.log_info("Scanner Thread Closed.")
         self.sonde_scanner_running = False

auto_rx/station.cfg.example

@@ -200,6 +200,9 @@ sondehub_enabled = True
 # How often to push data to the SondeHub Database. (seconds)
 # All received positions are cached and uploaded every X seconds. 
 # Uploads are gzip compressed, so don't require much data transfer.
+# Users receiving Graw DFM sondes may want to set this to 30 to improve
+# the chances of uploads not being rejected by our Z-check.
+# (Refer: https://github.com/projecthorus/sondehub-infra/wiki/DFM-radiosonde-above-1000-and-not-enough-data-to-perform-z-check )
 sondehub_upload_rate = 15
 
 # An optional contact e-mail address.

auto_rx/station.cfg.example.network

@@ -201,6 +201,9 @@ sondehub_enabled = True
 # How often to push data to the SondeHub Database. (seconds)
 # All received positions are cached and uploaded every X seconds. 
 # Uploads are gzip compressed, so don't require much data transfer.
+# Users receiving Graw DFM sondes may want to set this to 30 to improve
+# the chances of uploads not being rejected by our Z-check.
+# (Refer: https://github.com/projecthorus/sondehub-infra/wiki/DFM-radiosonde-above-1000-and-not-enough-data-to-perform-z-check )
 sondehub_upload_rate = 15
 
 # An optional contact e-mail address.