kopia lustrzana https://github.com/projecthorus/radiosonde_auto_rx
Disable Habitat uploader
Mark Jessop
rodzic
31e2a5bba4
commit
7d191f31d0
|
|
@ -9,7 +9,7 @@ and uploading of
|
|||
[Radiosonde](https://en.wikipedia.org/wiki/Radiosonde) telemetry to
|
||||
multiple services, including:
|
||||
|
||||
* The [Habitat High-Altitude Balloon Tracker](https://tracker.sondehub.org)
|
||||
* The [SondeHub Radiosonde Tracker](https://tracker.sondehub.org) - a tracking website specifically designed for tracking radiosondes!
|
||||
|
||||
* APRS-IS (for display on sites such as [radiosondy.info](https://radiosondy.info) and [aprs.fi](https://aprs.fi)
|
||||
|
||||
|
|
@ -64,7 +64,7 @@ instructions](https://github.com/projecthorus/radiosonde_auto_rx/wiki).
|
|||
### Licensing Information
|
||||
All software within this repository is licensed under the GNU General Public License v3. Refer this repositories LICENSE file for the full license text.
|
||||
|
||||
Radiosonde telemetry data captured via this software and uploaded into the [Habitat](https://habitat.habhub.org/) and [Sondehub](https://sondehub.org/) Database systems is licensed under [Creative Commons BY-SA v2.0](https://creativecommons.org/licenses/by-sa/2.0/).
|
||||
Radiosonde telemetry data captured via this software and uploaded into the [Sondehub](https://sondehub.org/) Database system is licensed under [Creative Commons BY-SA v2.0](https://creativecommons.org/licenses/by-sa/2.0/).
|
||||
Telemetry data uploaded into the APRS-IS network is generally considered to be released into the public domain.
|
||||
|
||||
By uploading data into these systems (by enabling the relevant uploaders within the `station.cfg` file) you as the user agree for your data to be made available under these licenses. Note that uploading to Sondehub and Habitat is enabled by default.
|
||||
|
|
|
|||
|
|
@ -828,29 +828,29 @@ def main():
|
|||
exporter_objects.append(_email_notification)
|
||||
exporter_functions.append(_email_notification.add)
|
||||
|
||||
# Habitat Uploader
|
||||
if config["habitat_enabled"]:
|
||||
# Habitat Uploader - DEPRECATED - Sondehub DB now in use (>1.5.0)
|
||||
# if config["habitat_enabled"]:
|
||||
|
||||
if config["habitat_upload_listener_position"] is False:
|
||||
_habitat_station_position = None
|
||||
else:
|
||||
_habitat_station_position = (
|
||||
config["station_lat"],
|
||||
config["station_lon"],
|
||||
config["station_alt"],
|
||||
)
|
||||
# if config["habitat_upload_listener_position"] is False:
|
||||
# _habitat_station_position = None
|
||||
# else:
|
||||
# _habitat_station_position = (
|
||||
# config["station_lat"],
|
||||
# config["station_lon"],
|
||||
# config["station_alt"],
|
||||
# )
|
||||
|
||||
_habitat = HabitatUploader(
|
||||
user_callsign=config["habitat_uploader_callsign"],
|
||||
user_antenna=config["habitat_uploader_antenna"],
|
||||
station_position=_habitat_station_position,
|
||||
synchronous_upload_time=config["habitat_upload_rate"],
|
||||
callsign_validity_threshold=config["payload_id_valid"],
|
||||
url=config["habitat_url"],
|
||||
)
|
||||
# _habitat = HabitatUploader(
|
||||
# user_callsign=config["habitat_uploader_callsign"],
|
||||
# user_antenna=config["habitat_uploader_antenna"],
|
||||
# station_position=_habitat_station_position,
|
||||
# synchronous_upload_time=config["habitat_upload_rate"],
|
||||
# callsign_validity_threshold=config["payload_id_valid"],
|
||||
# url=config["habitat_url"],
|
||||
# )
|
||||
|
||||
exporter_objects.append(_habitat)
|
||||
exporter_functions.append(_habitat.add)
|
||||
# exporter_objects.append(_habitat)
|
||||
# exporter_functions.append(_habitat.add)
|
||||
|
||||
# APRS Uploader
|
||||
if config["aprs_enabled"]:
|
||||
|
|
@ -931,6 +931,7 @@ def main():
|
|||
exporter_objects.append(_rotator)
|
||||
exporter_functions.append(_rotator.add)
|
||||
|
||||
# Sondehub v2 Database
|
||||
if config["sondehub_enabled"]:
|
||||
if config["habitat_upload_listener_position"] is False:
|
||||
_sondehub_station_position = None
|
||||
|
|
|
|||
|
|
@ -245,9 +245,10 @@ def read_auto_rx_config(filename, no_sdr_test=False):
|
|||
auto_rx_config["max_radius_km"] = config.getint("filtering", "max_radius_km")
|
||||
|
||||
# Habitat Settings
|
||||
auto_rx_config["habitat_enabled"] = config.getboolean(
|
||||
"habitat", "habitat_enabled"
|
||||
)
|
||||
# Deprecated from v1.5.0
|
||||
# auto_rx_config["habitat_enabled"] = config.getboolean(
|
||||
# "habitat", "habitat_enabled"
|
||||
# )
|
||||
auto_rx_config["habitat_upload_rate"] = config.getint("habitat", "upload_rate")
|
||||
auto_rx_config["habitat_uploader_callsign"] = config.get(
|
||||
"habitat", "uploader_callsign"
|
||||
|
|
@ -258,17 +259,19 @@ def read_auto_rx_config(filename, no_sdr_test=False):
|
|||
auto_rx_config["habitat_uploader_antenna"] = config.get(
|
||||
"habitat", "uploader_antenna"
|
||||
).strip()
|
||||
try: # Use the default configuration if not found
|
||||
auto_rx_config["habitat_url"] = config.get("habitat", "url")
|
||||
except:
|
||||
pass
|
||||
|
||||
# try: # Use the default configuration if not found
|
||||
# auto_rx_config["habitat_url"] = config.get("habitat", "url")
|
||||
# except:
|
||||
# pass
|
||||
|
||||
if auto_rx_config["habitat_upload_rate"] < MINIMUM_HABITAT_UPDATE_RATE:
|
||||
logging.warning(
|
||||
"Config - Habitat Update Rate clipped to minimum of %d seconds. Please be respectful of other users of Habitat."
|
||||
% MINIMUM_HABITAT_UPDATE_RATE
|
||||
)
|
||||
auto_rx_config["habitat_upload_rate"] = MINIMUM_HABITAT_UPDATE_RATE
|
||||
# Deprecated from v1.5.0
|
||||
# if auto_rx_config["habitat_upload_rate"] < MINIMUM_HABITAT_UPDATE_RATE:
|
||||
# logging.warning(
|
||||
# "Config - Habitat Update Rate clipped to minimum of %d seconds. Please be respectful of other users of Habitat."
|
||||
# % MINIMUM_HABITAT_UPDATE_RATE
|
||||
# )
|
||||
# auto_rx_config["habitat_upload_rate"] = MINIMUM_HABITAT_UPDATE_RATE
|
||||
|
||||
# APRS Settings
|
||||
auto_rx_config["aprs_enabled"] = config.getboolean("aprs", "aprs_enabled")
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ greylist = []
|
|||
####################
|
||||
# STATION LOCATION #
|
||||
####################
|
||||
# Used by the Habitat/Sondehub Uploaders, APRS Uploader, and by Rotator Control
|
||||
# Used by the Sondehub Uploader, APRS Uploader, and by Rotator Control
|
||||
# Lat/Lon in decimal degrees, altitude in metres.
|
||||
# Note: You do not need to specify your home station accurately if you don't want to!
|
||||
# Feel free to use a position somewhere near your general area, that doesn't identify your home location.
|
||||
|
|
@ -107,6 +107,8 @@ station_alt = 0.0
|
|||
# NOTE: This feature is intended to make life slightly easier when using an auto_rx station in a portable
|
||||
# capacity, in particular when using a rotator. For the web interface to start up correctly, a lat/lon still
|
||||
# needs to be entered above.
|
||||
# If you are operating a stationary auto_rx station, please just set a fixed position above rather than using GPSD.
|
||||
#
|
||||
# If you are doing mobile balloon chasing, please use chasemapper ( https://github.com/projecthorus/chasemapper )
|
||||
# which is far beter suited than auto_rx by itself...
|
||||
gpsd_enabled = False
|
||||
|
|
@ -114,50 +116,29 @@ gpsd_host = localhost
|
|||
gpsd_port = 2947
|
||||
|
||||
|
||||
###########################
|
||||
# HABITAT UPLOAD SETTINGS #
|
||||
###########################
|
||||
# Settings for uploading to the Habitat HAB tracking database ( https://tracker.habhub.org/ )
|
||||
# Note that the habitat upload will use a fixed string format of:
|
||||
# `$$RS_<sonde_serial>,<sequence number>,<time>,<lat>,<lon>,<alt>,<speed>,<temp>,<humidity>,<comment>*<CRC16>`
|
||||
###################################################
|
||||
# SONDEHUB / HABITAT (deprecated) UPLOAD SETTINGS #
|
||||
###################################################
|
||||
#
|
||||
# NOTE: These settings will eventually be merged with the SondeHub settings below.
|
||||
# For now, the uploader callsign and upload_listener_position and uploader_antenna fields are
|
||||
# shared between Habitat and Sondehub uploaders.
|
||||
# Settings relating to uploads to the SondeHub v2 Database and tracker,
|
||||
# available at https://tracker.sondehub.org/
|
||||
#
|
||||
|
||||
|
||||
# Note that uploads to the Habitat (amateur HAB) database are now disabled,
|
||||
# and any references to Habitat in this config are for legacy reasons only.
|
||||
[habitat]
|
||||
habitat_enabled = True
|
||||
|
||||
# Uploader callsign, as shown above. PLEASE CHANGE THIS TO SOMETHING UNIQUE.
|
||||
# Uploader callsign. PLEASE CHANGE THIS TO SOMETHING UNIQUE.
|
||||
uploader_callsign = CHANGEME_AUTO_RX
|
||||
|
||||
# Upload listener position to Habitat? (So you show up on the map)
|
||||
# Note that if GPSD is used, this is overriden.
|
||||
# Upload listener position to Sondehub? (So you show up on the map)
|
||||
# Note that if GPSD is used, this is overriden and enabled.
|
||||
upload_listener_position = True
|
||||
|
||||
# Uploader Antenna Description.
|
||||
# If upload_listener_position is enabled, this information will show up in your station description on the habhub map.
|
||||
uploader_antenna = 1/4 wave monopole
|
||||
|
||||
# Habitat Upload Rate - Upload a packet every X seconds.
|
||||
# IMPORTANT NOTE: Please remember that the use of Habitat for tracking radiosondes is secondary to its primary purpose of
|
||||
# tracking amateur high-altitude balloon flights. It is STRONGLY RECOMMENDED that the update rate is not set to anything
|
||||
# lower than 30 seconds, to avoid congesting the system and causing higher processing latencies. If this becomes a problem,
|
||||
# then we may have to implement server-side rate-limiting to avoid affecting performance.
|
||||
upload_rate = 30
|
||||
|
||||
|
||||
#################################
|
||||
# SONDEHUB v2 DATABASE SETTINGS #
|
||||
#################################
|
||||
# Settings for uploading to the new Sondehub v2 database.
|
||||
#
|
||||
# Please ensure you have set the uploader callsign and antenna detail settings in the
|
||||
# Habitat section above, as these are also used by Sondehub v2.
|
||||
[sondehub]
|
||||
|
||||
# Enable uploading to Sondehub v2 - please leave this enabled!
|
||||
sondehub_enabled = True
|
||||
|
||||
|
|
@ -400,7 +381,7 @@ archive_age = 120
|
|||
# USERS ENABLE THIS AT THEIR OWN RISK!!
|
||||
web_control = False
|
||||
|
||||
# Password for controls on the web interface. The main interface will still be publically available.
|
||||
# Password for controls on the web interface. The main interface will still be publicly available.
|
||||
# Note that as the web interface is HTTP-only, this password will be sent over the internet in the clear,
|
||||
# so don't re-use passwords!
|
||||
web_password = none
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue