Merge pull request #620 from projecthorus/fix/aprs-performance

Fix/aprs performance

auto_rx/auto_rx.py

@@ -876,7 +876,6 @@ def main():
             position_report=config["aprs_position_report"],
             aprsis_host=config["aprs_server"],
             aprsis_port=config["aprs_port"],
-            synchronous_upload_time=config["aprs_upload_rate"],
             callsign_validity_threshold=config["payload_id_valid"],
             station_beacon=config["station_beacon_enabled"],
             station_beacon_rate=config["station_beacon_rate"],

auto_rx/autorx/aprs.py

@@ -89,8 +89,8 @@ def telemetry_to_aprs_position(
 
     # TODO: RS41 Burst Timer
 
-    # Add on auto_rx version
-    _aprs_comment += " auto_rx v" + auto_rx_version
+    # Add on auto_rx at the end
+    _aprs_comment += " auto_rx"
 
     # Convert float latitude to APRS format (DDMM.MM)
     lat = float(sonde_data["lat"])
@@ -308,7 +308,7 @@ class APRSUploader(object):
         station_beacon_position=(0.0, 0.0, 0.0),
         station_beacon_comment="radiosonde_auto_rx SondeGate v<version>",
         station_beacon_icon="/r",
-        synchronous_upload_time=30,
+        upload_time=60,
         callsign_validity_threshold=5,
         upload_queue_size=16,
         upload_timeout=5,
@@ -339,9 +339,7 @@ class APRSUploader(object):
             station_beacon_comment (str): Comment field for the station beacon. <version> will be replaced with the current auto_rx version.
             station_beacon_icon (str): The APRS icon to be used, as the two characters (symbol table, symbol index), as per http://www.aprs.org/symbols.html
 
-            synchronous_upload_time (int): Upload the most recent telemetry when time.time()%synchronous_upload_time == 0
-                This is done in an attempt to get multiple stations uploading the same telemetry sentence simultaneously,
-                and also acts as decimation on the number of sentences uploaded to APRS-IS.
+            upload_time (int): Upload the most recent telemetry after this time is up.
 
             callsign_validity_threshold (int): Only upload telemetry data if the callsign has been observed more than N times. Default = 5
 
@@ -362,7 +360,8 @@ class APRSUploader(object):
         self.aprsis_reconnect = aprsis_reconnect
         self.upload_timeout = upload_timeout
         self.upload_queue_size = upload_queue_size
-        self.synchronous_upload_time = synchronous_upload_time
+        self.upload_time = upload_time
+        self.next_upload = datetime.datetime.now() + datetime.timedelta(seconds=upload_time)
         self.callsign_validity_threshold = callsign_validity_threshold
         self.inhibit = inhibit
 
@@ -653,7 +652,7 @@ class APRSUploader(object):
         """ Add packets to the aprs upload queue if it is time for us to upload. """
 
         while self.timer_thread_running:
-            if int(time.time()) % self.synchronous_upload_time == 0:
+            if datetime.datetime.now() > self.next_upload:
                 # Time to upload!
                 for _id in self.observed_payloads.keys():
                     # If no data, continue...
@@ -677,6 +676,9 @@ class APRSUploader(object):
 
                 # Flush APRS-IS RX buffer
                 self.flush_rx()
+
+                # Reset upload timer
+                self.next_upload = datetime.datetime.now() + datetime.timedelta(seconds=self.upload_time)
             else:
                 # Not yet time to upload, wait for a bit.
                 time.sleep(0.1)

auto_rx/autorx/config.py

@@ -36,7 +36,7 @@ except ImportError:
 # Fixed minimum update rates for APRS & Habitat
 # These are set to avoid congestion on the APRS-IS network, and on the Habitat server
 # Please respect other users of these networks and leave these settings as they are.
-MINIMUM_APRS_UPDATE_RATE = 30
+MINIMUM_APRS_UPDATE_RATE = 60
 MINIMUM_HABITAT_UPDATE_RATE = 30
 
 

auto_rx/station.cfg.example

@@ -176,7 +176,7 @@ aprs_pass = 00000
 # This has a lower limit of 30 seconds, to avoid flooding the APRS-IS network.
 # Please be respectful of other uses of the APRS-IS network, and do not attempt
 # to upload faster than this. 
-upload_rate = 30
+upload_rate = 60
 
 # APRS-IS server to upload to.
 # Default to radiosondy.info for now, to allow stats to show up on http://radiosondy.info