kopia lustrzana https://github.com/projecthorus/radiosonde_auto_rx
Add IMS100 and MTS01 to strip_sonde_serial
rodzic
fae9796460
commit
2be4708345
|
@ -732,9 +732,9 @@ def read_auto_rx_config(filename, no_sdr_test=False):
|
|||
)
|
||||
except:
|
||||
logging.warning(
|
||||
"Config - Did not find meisei_experimental setting, using default (disabled)"
|
||||
"Config - Did not find meisei_experimental setting, using default (enabled)"
|
||||
)
|
||||
auto_rx_config["experimental_decoders"]["MEISEI"] = False
|
||||
auto_rx_config["experimental_decoders"]["MEISEI"] = True
|
||||
|
||||
try:
|
||||
auto_rx_config["save_system_log"] = config.getboolean(
|
||||
|
|
|
@ -141,7 +141,7 @@ def strip_sonde_serial(serial):
|
|||
""" Strip off any leading sonde type that may be present in a serial number """
|
||||
|
||||
# Look for serials with prefixes matching the following known sonde types.
|
||||
_re = re.compile("^(DFM|M10|M20|IMET|IMET5|IMET54|MRZ|LMS6)-")
|
||||
_re = re.compile("^(DFM|M10|M20|IMET|IMET5|IMET54|MRZ|LMS6|IMS100|MTS01)-")
|
||||
|
||||
# If we have a match, return the trailing part of the serial, re-adding
|
||||
# any - separators if they exist.
|
||||
|
@ -183,6 +183,8 @@ def short_type_lookup(type_name):
|
|||
return "Meisei iMS-100/RS-11"
|
||||
elif type_name == "MRZ":
|
||||
return "Meteo-Radiy MRZ"
|
||||
elif type_name == "MTS01":
|
||||
return "Meteosis MTS01"
|
||||
else:
|
||||
return "Unknown"
|
||||
|
||||
|
@ -217,6 +219,8 @@ def short_short_type_lookup(type_name):
|
|||
return "iMS-100"
|
||||
elif type_name == "MRZ":
|
||||
return "MRZ"
|
||||
elif type_name == "MTS01":
|
||||
return "MTS01"
|
||||
else:
|
||||
return "Unknown"
|
||||
|
||||
|
|
|
@ -14,14 +14,47 @@
|
|||
################
|
||||
[sdr]
|
||||
|
||||
# Number of RTLSDRs to use.
|
||||
#
|
||||
# SDR Type
|
||||
#
|
||||
# RTLSDR - Use one or more RTLSDRs
|
||||
#
|
||||
# EXPERIMENTAL / NOT IMPLEMENTED options:
|
||||
# SpyServer - Use an Airspy SpyServer
|
||||
# KA9Q - Use a KA9Q SDR Server (Not yet implemented)
|
||||
# WARNING: These are still under development and may not work.
|
||||
#
|
||||
sdr_type = RTLSDR
|
||||
|
||||
|
||||
#
|
||||
# Number of SDRs or SDR Connection Threads to use
|
||||
#
|
||||
# If SDR type is set to RTLSDR above, then this number is the number of individual RTLSDRs
|
||||
# that will be used, eith each RTLSDR allocated a scan or decode task.
|
||||
# If more than one RTLSDR is in use, multiple [sdr_X] sections must be populated below
|
||||
#
|
||||
# If SDR type is either KA9Q or SpyServer, this defines the maximum number of parallel
|
||||
# decoding/scan tasks. On a RPi 4, ~5 tasks are possible.
|
||||
#
|
||||
sdr_quantity = 1
|
||||
|
||||
|
||||
#
|
||||
# Network SDR Connection Details
|
||||
#
|
||||
# If using either a KA9Q or SpyServer network server, the hostname and port
|
||||
# of the server needs to be defined below. Usually this will be running on the
|
||||
# same machine as auto_rx, so the defaults are usually fine.
|
||||
#
|
||||
sdr_hostname = localhost
|
||||
sdr_port = 5555
|
||||
|
||||
#
|
||||
# Individual RTLSDR Settings
|
||||
#
|
||||
# Provide details of your RTLSDRs here, e.g. device numbers, gain settings, and PPM offsets.
|
||||
# If using a Network SDR, do not modify any of these settings.
|
||||
#
|
||||
[sdr_1]
|
||||
# Device Index / Serial
|
||||
|
@ -99,7 +132,7 @@ always_scan = []
|
|||
|
||||
# always_decode - Always-running decoders. Only possible in a multi-SDR (or network-based SDR) system.
|
||||
# List must be in the form: [[401.5,"RS41"], [402.5,"DFM"], [400.5,"M10"], [400.5,"IMET"]]
|
||||
# Valid sonde types: RS41, RS92, DFM, M10, M20, IMET, IMET5, MK2LMS, LMS6, MEISEI, MRZ
|
||||
# Valid sonde types: RS41, RS92, DFM, M10, M20, IMET, IMET5, MK2LMS, LMS6, MEISEI, MRZ, MTS01
|
||||
always_decode = []
|
||||
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
# KA9Q - Use a KA9Q SDR Server (Not yet implemented)
|
||||
# WARNING: These are still under development and may not work.
|
||||
#
|
||||
sdr_type = RTLSDR
|
||||
sdr_type = SpyServer
|
||||
|
||||
|
||||
#
|
||||
|
@ -38,7 +38,7 @@ sdr_type = RTLSDR
|
|||
# If SDR type is either KA9Q or SpyServer, this defines the maximum number of parallel
|
||||
# decoding/scan tasks. On a RPi 4, ~5 tasks are possible.
|
||||
#
|
||||
sdr_quantity = 1
|
||||
sdr_quantity = 5
|
||||
|
||||
|
||||
#
|
||||
|
@ -55,6 +55,7 @@ sdr_port = 5555
|
|||
# Individual RTLSDR Settings
|
||||
#
|
||||
# Provide details of your RTLSDRs here, e.g. device numbers, gain settings, and PPM offsets.
|
||||
# If using a Network SDR, do not modify any of these settings.
|
||||
#
|
||||
[sdr_1]
|
||||
# Device Index / Serial
|
||||
|
@ -133,7 +134,7 @@ always_scan = []
|
|||
|
||||
# always_decode - Always-running decoders. Only possible in a multi-SDR (or network-based SDR) system.
|
||||
# List must be in the form: [[401.5,"RS41"], [402.5,"DFM"], [400.5,"M10"], [400.5,"IMET"]]
|
||||
# Valid sonde types: RS41, RS92, DFM, M10, M20, IMET, IMET5, MK2LMS, LMS6, MEISEI, MRZ
|
||||
# Valid sonde types: RS41, RS92, DFM, M10, M20, IMET, IMET5, MK2LMS, LMS6, MEISEI, MRZ, MTS01
|
||||
always_decode = []
|
||||
|
||||
####################
|
||||
|
|
Ładowanie…
Reference in New Issue