Merge pull request #995 from darksidelemm/testing

Add IMETWIDE sonde type
pull/1010/head
Mark Jessop 2025-03-08 14:30:31 +10:30 zatwierdzone przez GitHub
commit d9bdb30389
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: B5690EEEBB952194
7 zmienionych plików z 38 dodań i 6 usunięć

Wyświetl plik

@ -738,7 +738,7 @@ def main():
"--type",
type=str,
default=None,
help="Immediately start a decoder for a provided sonde type (Valid Types: RS41, RS92, DFM, M10, M20, IMET, IMET5, LMS6, MK2LMS, MEISEI, MRZ)",
help="Immediately start a decoder for a provided sonde type (Valid Types: RS41, RS92, DFM, M10, M20, IMET, IMETWIDE, IMET5, LMS6, MK2LMS, MEISEI, MRZ)",
)
parser.add_argument(
"-t",

Wyświetl plik

@ -12,7 +12,7 @@ from queue import Queue
# 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.8.2-beta1"
__version__ = "1.8.2-beta2"
# Global Variables

Wyświetl plik

@ -433,6 +433,7 @@ def read_auto_rx_config(filename, no_sdr_test=False):
"MRZ": False, # .... except for the MRZ, until we know it works.
"WXR301": True,
"WXRPN9": True,
"IMETWIDE": False,
"UDP": False,
}

Wyświetl plik

@ -41,7 +41,8 @@ VALID_SONDE_TYPES = [
"MTS01",
"UDP",
"WXR301",
"WXRPN9"
"WXRPN9",
"IMETWIDE"
]
# Known 'Drifty' Radiosonde types
@ -122,7 +123,8 @@ class SondeDecoder(object):
"MTS01",
"UDP",
"WXR301",
"WXRPN9"
"WXRPN9",
"IMETWIDE"
]
def __init__(
@ -562,6 +564,34 @@ class SondeDecoder(object):
# iMet-4 (IMET1RS) decoder
decode_cmd += f"./imet4iq --iq 0.0 --lpIQ --dc - {_sample_rate} 16 --json {_wideband} 2>/dev/null"
elif self.sonde_type == "IMETWIDE":
# iMet-1/ 4 Sondes, Forced wideband decode version.
# Set sonde type back to IMET so other iMet-specific handling actions work.
self.sonde_type = "IMET"
_sample_rate = 96000
decode_cmd = get_sdr_iq_cmd(
sdr_type = self.sdr_type,
frequency = self.sonde_freq,
sample_rate = _sample_rate,
sdr_hostname = self.sdr_hostname,
sdr_port = self.sdr_port,
ss_iq_path = self.ss_iq_path,
rtl_device_idx = self.rtl_device_idx,
ppm = self.ppm,
gain = self.gain,
bias = self.bias
)
# Add in tee command to save audio to disk if debugging is enabled.
if self.save_decode_iq:
decode_cmd += f" tee {self.save_decode_iq_path} |"
# iMet-4 (IMET1RS) decoder
decode_cmd += f"./imet4iq --iq 0.0 --lpIQ --dc - {_sample_rate} 16 --json --imet1 2>/dev/null"
elif self.sonde_type == "IMET5":
# iMet-54 Sondes

Wyświetl plik

@ -1639,6 +1639,7 @@
<option value="LMS6">LMS6 (400 MHz)</option>
<option value="MK2LMS">LMS6 (1680 MHz)</option>
<option value="IMET">iMet-4</option>
<option value="IMETWIDE">iMet-1/4 Wideband</option>
<option value="IMET5">iMet-50/54</option>
<option value="MEISEI">iMS-100</option>
<option value="MRZ">MRZ-H1</option>

Wyświetl plik

@ -131,7 +131,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, MTS01
# Valid sonde types: RS41, RS92, DFM, M10, M20, IMET, IMETWIDE, IMET5, MK2LMS, LMS6, MEISEI, MRZ, MTS01
always_decode = []

Wyświetl plik

@ -133,7 +133,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, MTS01
# Valid sonde types: RS41, RS92, DFM, M10, M20, IMET, IMETWIDE, IMET5, MK2LMS, LMS6, MEISEI, MRZ, MTS01
always_decode = []
####################