kopia lustrzana https://github.com/projecthorus/radiosonde_auto_rx
				
				
				
			Merge pull request #550 from darksidelemm/testing
Wrap aprsid generation code in try/except, bump testing versionpull/551/head
						commit
						3c2bcdf24f
					
				| 
						 | 
				
			
			@ -17,7 +17,7 @@ except ImportError:
 | 
			
		|||
# 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.5.5-beta2"
 | 
			
		||||
__version__ = "1.5.5-beta3"
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
# Global Variables
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1326,7 +1326,13 @@ class SondeDecoder(object):
 | 
			
		|||
 | 
			
		||||
            # Try and generate an APRS callsign for this sonde.
 | 
			
		||||
            # Doing this calculation here allows us to pass it to the web interface to generate an appropriate link
 | 
			
		||||
            try:
 | 
			
		||||
                _telemetry["aprsid"] = generate_aprs_id(_telemetry)
 | 
			
		||||
            except Exception as e:
 | 
			
		||||
                self.log_debug(
 | 
			
		||||
                    f"Couldn't generate APRS ID for {_telemetry['id']}"
 | 
			
		||||
                )
 | 
			
		||||
                _telemetry["aprsid"] = None
 | 
			
		||||
 | 
			
		||||
            # If we have been provided a telemetry filter function, pass the telemetry data
 | 
			
		||||
            # through the filter, and return the response
 | 
			
		||||
| 
						 | 
				
			
			@ -1348,6 +1354,7 @@ class SondeDecoder(object):
 | 
			
		|||
                self.decoder_running = False
 | 
			
		||||
                return False
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
            # If the telemetry is OK, send to the exporter functions (if we have any).
 | 
			
		||||
            if self.exporters is None:
 | 
			
		||||
                return
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -191,7 +191,27 @@ aprs_server = radiosondy.info
 | 
			
		|||
# For all other APRS-IS servers (licensed amateur radio operators only!), use port 14580.
 | 
			
		||||
aprs_port = 14590
 | 
			
		||||
 | 
			
		||||
# Custom Object name / Callsign to be used when uploading to APRS-IS (Max 9 chars)
 | 
			
		||||
# APRS Station Location Beaconing
 | 
			
		||||
# If enabled, you will show up on APRS using the aprs_user callsign set above.
 | 
			
		||||
# This also requires your station location to be set in the above [location] section.
 | 
			
		||||
station_beacon_enabled = False
 | 
			
		||||
 | 
			
		||||
# Station beaconing rate, in minutes.
 | 
			
		||||
station_beacon_rate = 30
 | 
			
		||||
 | 
			
		||||
# Station beacon comment.
 | 
			
		||||
# <version> will be replaced with the current auto_rx version number
 | 
			
		||||
station_beacon_comment = radiosonde_auto_rx SondeGate v<version>
 | 
			
		||||
 | 
			
		||||
# Station Beacon Icon
 | 
			
		||||
# The APRS icon to use, as defined in http://www.aprs.org/symbols.html
 | 
			
		||||
# Note that the two characters that define the icon need to be concatenated. Examples:
 | 
			
		||||
# Antenna Tower = /r
 | 
			
		||||
# House with Yagi = /y
 | 
			
		||||
# Satellite Dish = /`    (This is required if you want to show up on radiosondy.info's station list.)
 | 
			
		||||
station_beacon_icon = /`
 | 
			
		||||
 | 
			
		||||
# Custom Object name / Callsign to be used when uploading telemetry to APRS-IS (Max 9 chars)
 | 
			
		||||
# WARNING: THIS SHOULD BE LEFT AT THE DEFAULT OF <id> UNLESS YOU HAVE A VERY GOOD REASON
 | 
			
		||||
# TO CHANGE IT!
 | 
			
		||||
#
 | 
			
		||||
| 
						 | 
				
			
			@ -215,7 +235,7 @@ aprs_use_custom_object_id = False
 | 
			
		|||
# False = Upload position as an Object, sourced from <aprs_user>
 | 
			
		||||
# True = Position Report (with emulated iGating via <aprs_user>)
 | 
			
		||||
# Note that if using Position Reports with aprs_object_id set to <id>, then non-AX.25 compatible callsigns will be generated.
 | 
			
		||||
# If in doubt, leave this at False.
 | 
			
		||||
# THIS SHOULD BE LEFT AT FALSE UNLESS YOU HAVE A VERY SPECIFIC REASON OTHERWISE.
 | 
			
		||||
aprs_position_report = False
 | 
			
		||||
 | 
			
		||||
# The APRS-IS beacon comment. The following fields can be included:
 | 
			
		||||
| 
						 | 
				
			
			@ -231,26 +251,6 @@ aprs_position_report = False
 | 
			
		|||
# if absolutely necessary.
 | 
			
		||||
aprs_custom_comment = Clb=<vel_v> t=<temp> h=<humidity> p=<pressure> <freq> Type=<type> Radiosonde
 | 
			
		||||
 | 
			
		||||
# APRS Station Location Beaconing
 | 
			
		||||
# If enabled, you will show up on APRS using the aprs_user callsign set above.
 | 
			
		||||
# This also requires your station location to be set in the above [location] section.
 | 
			
		||||
station_beacon_enabled = False
 | 
			
		||||
 | 
			
		||||
# Station beaconing rate, in minutes.
 | 
			
		||||
station_beacon_rate = 30
 | 
			
		||||
 | 
			
		||||
# Station beacon comment.
 | 
			
		||||
# <version> will be replaced with the current auto_rx version number
 | 
			
		||||
station_beacon_comment = radiosonde_auto_rx SondeGate v<version>
 | 
			
		||||
 | 
			
		||||
# Station Beacon Icon
 | 
			
		||||
# The APRS icon to use, as defined in http://www.aprs.org/symbols.html
 | 
			
		||||
# Note that the two characters that define the icon need to be concatenated. Examples:
 | 
			
		||||
# Antenna Tower = /r
 | 
			
		||||
# House with Yagi = /y
 | 
			
		||||
# Satellite Dish = /`    (This is required if you want to show up on radiosondy.info's station list.)
 | 
			
		||||
station_beacon_icon = /`
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
###########################
 | 
			
		||||
# CHASEMAPPER DATA OUTPUT #
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Ładowanie…
	
		Reference in New Issue