diff --git a/auto_rx/auto_rx.py b/auto_rx/auto_rx.py index 2c0a9ee..2185ab5 100644 --- a/auto_rx/auto_rx.py +++ b/auto_rx/auto_rx.py @@ -633,7 +633,8 @@ def main(): _ozimux = OziUploader( ozimux_port = _ozi_port, payload_summary_port = _summary_port, - update_rate = config['ozi_update_rate']) + update_rate = config['ozi_update_rate'], + station=config['habitat_uploader_callsign']) exporter_objects.append(_ozimux) exporter_functions.append(_ozimux.add) diff --git a/auto_rx/autorx/ozimux.py b/auto_rx/autorx/ozimux.py index 7aa01fc..333c372 100644 --- a/auto_rx/autorx/ozimux.py +++ b/auto_rx/autorx/ozimux.py @@ -43,7 +43,8 @@ class OziUploader(object): def __init__(self, ozimux_port = None, payload_summary_port = None, - update_rate = 5 + update_rate = 5, + station = "auto_rx" ): """ Initialise an OziUploader Object. @@ -56,6 +57,7 @@ class OziUploader(object): self.ozimux_port = ozimux_port self.payload_summary_port = payload_summary_port self.update_rate = update_rate + self.station = station # Input Queue. self.input_queue = Queue() @@ -131,6 +133,7 @@ class OziUploader(object): packet = { 'type' : 'PAYLOAD_SUMMARY', + 'station': self.station, 'callsign' : telemetry['id'], 'latitude' : telemetry['lat'], 'longitude' : telemetry['lon'], @@ -142,7 +145,7 @@ class OziUploader(object): # Additional fields specifically for radiosondes 'model': telemetry['type'], 'freq': telemetry['freq'], - 'temp': telemetry['temp'] + 'temp': telemetry['temp'], } # Add in any extra fields we may care about. diff --git a/auto_rx/station.cfg.example b/auto_rx/station.cfg.example index d9fca76..904da81 100644 --- a/auto_rx/station.cfg.example +++ b/auto_rx/station.cfg.example @@ -90,6 +90,7 @@ station_alt = 0.0 # If you know the WMO number of the launch site, then this would be a good value to use. # Otherwise the ICAO Code of the airport nearest to the launch site would also work. # If you are not expecting to RX iMet sondes, then this can be left at its default. +# NOTE: Only change this if you are 100% sure you will only be receiving sondes from a single launch location! station_code = SONDE @@ -201,14 +202,13 @@ station_beacon_icon = /` ########################### # Settings for pushing data into Chasemapper and/or OziPlotter # Oziplotter receives data via a basic CSV format, via UDP. -# Chasemapper can receive data in either the basic CSV format, or in a more descriptive JSON format. -# WARNING - This should not be enabled in a multi-SDR configuration, as OziExplorer currently has no way of differentiating -# between sonde IDs. +# Chasemapper can receive data in either the basic CSV format, or in the more descriptive 'payload summary' JSON format. [oziplotter] # How often to output data (seconds) ozi_update_rate = 5 # Enable the 'OziMux' basic CSV output +# Note - this cannot be enabled in a multi-SDR configuration. ozi_enabled = False # OziMux UDP Broadcast output port.