Add option for using the fsk_demod chain for iMet-54 sondes.

pull/404/head
Mark Jessop 2021-03-13 13:38:14 +10:30
rodzic 4a0522c926
commit 8d2074e66f
5 zmienionych plików z 22 dodań i 7 usunięć

Wyświetl plik

@ -524,6 +524,16 @@ def read_auto_rx_config(filename, no_sdr_test=False):
)
auto_rx_config["experimental_decoders"]["MRZ"] = False
try:
auto_rx_config["experimental_decoders"]["IMET5"] = config.getboolean(
"advanced", "imet54_experimental"
)
except:
logging.warning(
"Config - Did not find iMet-54 decoder experimental decoder setting, using default (disabled)."
)
auto_rx_config["experimental_decoders"]["IMET5"] = False
# If we are being called as part of a unit test, just return the config now.
if no_sdr_test:
return auto_rx_config

Wyświetl plik

@ -467,10 +467,12 @@ rs41_experimental = True
rs92_experimental = True
dfm_experimental = True
m10_experimental = True
mrz_experimental = False
# 400 MHz LMS6 sondes decode best with the fsk_demod decode chain, so we use this by default.
lms6-400_experimental = True
# Note: As iMet sondes use AFSK, using fsk_demod does not give any advantage, so there is no experimental decoder for them.
# MRZ and imet54 sondes have not yet been tested with the fsk_demod flowgraph in the wild.
mrz_experimental = False
imet54_experimental = False
# Note: As iMet-4 sondes use AFSK, using fsk_demod does not give any advantage, so there is no experimental decoder for them.
# Optimize 1680 MHz Scanning for RS92-NGP Sondes

Wyświetl plik

@ -44,7 +44,7 @@ SAMPLES = [
['imet4_96k_float.bin', 1200, -10.0, 96000], # 1200 baud, but AFSK, so we expect 7-8 dB worse performance than the other sondes.
['imet54_96k_float.bin', 4800, -10.0, 96000], # 4800 baud GMSK
['rsngp_96k_float.bin', 2400, -100.0, 96000], # RS92-NGP - wider bandwidth.
['lms6-400_96k_float.bin', 4800, -100, 96000] # LMS6, 400 MHz variant. Continuous signal.
['lms6-400_96k_float.bin', 4800, -100, 96000], # LMS6, 400 MHz variant. Continuous signal.
['mrz_96k_float.bin', 2400, -100, 96000] # MRZ Continuous signal.
]

Wyświetl plik

@ -32,9 +32,12 @@ CSV_DIR = "./results/"
sonde_types = {
'RS41': {'csv':'rs41_fsk_demod_soft.txt', 'packets': 118, 'color': 'C0'},
'RS92': {'csv':'rs92_fsk_demod_soft.txt', 'packets': 120, 'color': 'C1'},
'DFM09': {'csv':'dfm_fsk_demod_soft.txt', 'packets': 96, 'color': 'C2'},
'M10': {'csv':'m10_fsk_demod_soft.txt', 'packets': 120, 'color': 'C3'},
'LMS6-400': {'csv':'lms6-400_fsk_demod_soft.txt', 'packets': 120, 'color': 'C4'},
'RS92-NGP': {'csv':'rs92ngp_fsk_demod_soft.txt', 'packets': 120, 'color': 'C2'},
'DFM09': {'csv':'dfm_fsk_demod_soft.txt', 'packets': 96, 'color': 'C3'},
'M10': {'csv':'m10_fsk_demod_soft.txt', 'packets': 120, 'color': 'C4'},
'LMS6-400': {'csv':'lms6-400_fsk_demod_soft.txt', 'packets': 120, 'color': 'C5'},
'MRZ': {'csv':'mrz_fsk_demod_soft.txt', 'packets': 105, 'color': 'C6'},
'iMet-54': {'csv':'imet54_fsk_demod_soft.txt', 'packets': 240, 'color': 'C7'},
}

Wyświetl plik

@ -743,7 +743,7 @@ if __name__ == "__main__":
sys.exit(1)
batch_modes = ['dfm_fsk_demod_soft', 'rs41_fsk_demod_soft', 'm10_fsk_demod_soft', 'rs92_fsk_demod_soft', 'lms6-400_fsk_demod_soft', 'imet4_rtlfm']
batch_modes = ['dfm_fsk_demod_soft', 'rs41_fsk_demod_soft', 'm10_fsk_demod_soft', 'rs92_fsk_demod_soft', 'rs92ngp_fsk_demod_soft', 'lms6-400_fsk_demod_soft', 'imet4_rtlfm', 'mrz_fsk_demod_soft', 'imet54_fsk_demod_soft']
if args.batch:
for _mode in batch_modes: