kopia lustrzana https://github.com/projecthorus/radiosonde_auto_rx
Add batch test option, add test results directory.
Mark Jessop
rodzic
106b722569
commit
a126f4a5dd
|
|
@ -19,7 +19,7 @@ import subprocess
|
|||
|
||||
processing_type = {
|
||||
# RS41 Decoding
|
||||
'rs41_csdr_fm_decode': {
|
||||
'rs41_csdr': {
|
||||
# Decode a RS41 using a CSDR processing chain to do FM demodulation
|
||||
# Decimate to 48 khz, filter, then demodulate.
|
||||
#'demod' : "| csdr fir_decimate_cc 2 0.005 HAMMING 2>/dev/null | csdr bandpass_fir_fft_cc -0.08 0.08 0.05 2>/dev/null | csdr fmdemod_quadri_cf | csdr limit_ff | csdr convert_f_s16 | sox -t raw -r 48k -e signed-integer -b 16 -c 1 - -r 48000 -b 8 -t wav - 2>/dev/null| ",
|
||||
|
|
@ -31,10 +31,11 @@ processing_type = {
|
|||
# Remove --ecc to see how much work the RS decoding is doing!
|
||||
'decode': "../rs41ecc --ptu --crc --ecc 2>/dev/null",
|
||||
# Count the number of telemetry lines that have no bit errors
|
||||
"post_process" : " | grep 00000 | wc -l"
|
||||
"post_process" : " | grep 00000 | wc -l",
|
||||
'files' : "./generated/rs41*.bin"
|
||||
},
|
||||
# RS92 Decoding
|
||||
'rs92_csdr_fm_decode': {
|
||||
'rs92_csdr': {
|
||||
# Decode a RS92 using a CSDR processing chain to do FM demodulation
|
||||
# Decimate to 48 khz, filter to +/-4.8kHz, then demodulate. - WORKS BEST
|
||||
'demod' : "| csdr fir_decimate_cc 2 0.005 HAMMING 2>/dev/null | csdr bandpass_fir_fft_cc -0.10 0.10 0.05 2>/dev/null | csdr fmdemod_quadri_cf | csdr limit_ff | csdr convert_f_s16 | sox -t raw -r 48k -e signed-integer -b 16 -c 1 - -r 48000 -b 8 -t wav - 2>/dev/null| ",
|
||||
|
|
@ -45,10 +46,11 @@ processing_type = {
|
|||
# Decode using rs92ecc
|
||||
'decode': "../rs92ecc -vx -v --crc --ecc --vel 2>/dev/null",
|
||||
# Count the number of telemetry lines.
|
||||
"post_process" : " | grep M2513116 | wc -l"
|
||||
"post_process" : " | grep M2513116 | wc -l",
|
||||
'files' : "./generated/rs92*.bin"
|
||||
},
|
||||
# DFM Decoding
|
||||
'dfm_csdr_fm_decode': {
|
||||
'dfm_csdr': {
|
||||
# Decode a DFM using a CSDR processing chain to do FM demodulation
|
||||
# Decimate to 48 khz, filter to +/-6kHz, then demodulate.
|
||||
#'demod' : "| csdr fir_decimate_cc 2 0.005 HAMMING 2>/dev/null | csdr bandpass_fir_fft_cc -0.12 0.12 0.05 2>/dev/null | csdr fmdemod_quadri_cf | csdr limit_ff | csdr convert_f_s16 | sox -t raw -r 48k -e signed-integer -b 16 -c 1 - -r 48000 -b 8 -t wav - 2>/dev/null| ",
|
||||
|
|
@ -59,10 +61,11 @@ processing_type = {
|
|||
# Decode using rs41ecc
|
||||
'decode': "../dfm09ecc -vv --ecc --json --dist --auto 2>/dev/null",
|
||||
# Count the number of telemetry lines.
|
||||
"post_process" : " | grep frame | wc -l"
|
||||
"post_process" : " | grep frame | wc -l",
|
||||
'files' : "./generated/dfm*.bin"
|
||||
},
|
||||
# M10 Radiosonde decoding.
|
||||
'm10_csdr_fm_decode': {
|
||||
'm10_csdr': {
|
||||
# M10 Decoding
|
||||
# Use a CSDR processing chain to do FM demodulation
|
||||
# Decimate to 48 khz, filter, then demodulate. - WORKS BEST
|
||||
|
|
@ -72,13 +75,14 @@ processing_type = {
|
|||
# Decode using rs41ecc
|
||||
'decode': "../m10 -b -b2 2>/dev/null",
|
||||
# Count the number of telemetry lines.
|
||||
"post_process" : "| wc -l"
|
||||
"post_process" : "| wc -l",
|
||||
'files' : "./generated/m10*.bin"
|
||||
},
|
||||
# rs_detect - Sonde Detection.
|
||||
# Current approach in auto_rx uses rtl_fm with a 22 khz sample rate (channel bw?) setting,
|
||||
# then resamples up to 48 khz sampes to feed into rs_detect.
|
||||
#
|
||||
'csdr_fm_rsdetect': {
|
||||
'rs_detect_csdr': {
|
||||
# Use a CSDR processing chain to do FM demodulation
|
||||
# Using a ~22kHz wide filter, and 20 Hz high-pass
|
||||
# Decimate to 48 khz, filter to ~22 kHz BW, then demod.
|
||||
|
|
@ -89,11 +93,12 @@ processing_type = {
|
|||
# Decode using rs41ecc
|
||||
'decode': "../rs_detect -z -t 8 2> /dev/null",
|
||||
# Grep out the line containing the detected sonde type.
|
||||
"post_process" : " | grep found"
|
||||
"post_process" : " | grep found",
|
||||
'files' : "./generated/*.bin"
|
||||
},
|
||||
# dft_detect - Sonde detection using DFT correlation
|
||||
#
|
||||
'csdr_fm_dftdetect': {
|
||||
'dft_detect_csdr': {
|
||||
# Use a CSDR processing chain to do FM demodulation
|
||||
# Filter to 22 khz channel bandwidth, then demodulate.
|
||||
#'demod' : "| csdr fir_decimate_cc 2 0.005 HAMMING 2>/dev/null | csdr bandpass_fir_fft_cc -0.23 0.23 0.05 2>/dev/null | csdr fmdemod_quadri_cf | csdr limit_ff | csdr convert_f_s16 | sox -t raw -r 48k -e signed-integer -b 16 -c 1 - -r 48000 -t wav - 2>/dev/null| ",
|
||||
|
|
@ -102,41 +107,45 @@ processing_type = {
|
|||
# Decode using rs41ecc
|
||||
'decode': "../dft_detect 2>/dev/null",
|
||||
# Grep out the line containing the detected sonde type.
|
||||
"post_process" : " | grep \:"
|
||||
"post_process" : " | grep \:",
|
||||
'files' : "./generated/*.bin"
|
||||
},
|
||||
|
||||
#
|
||||
# FSK-DEMOD DECODING
|
||||
#
|
||||
# RS41 Decoding
|
||||
'rs41_fsk_demod': {
|
||||
# Shift up to ~24 khz, and then pass into fsk_demod.
|
||||
'demod' : "| csdr shift_addition_cc 0.25 2>/dev/null | csdr convert_f_s16 | ../bin/fsk_demod --cs16 -b 1 -u 45000 2 96000 4800 - - 2>/dev/null | python ../bin/bit_to_samples.py 48000 4800 | sox -t raw -r 48k -e unsigned-integer -b 8 -c 1 - -r 48000 -b 8 -t wav - 2>/dev/null| ",
|
||||
# #
|
||||
# # FSK-DEMOD DECODING
|
||||
# #
|
||||
# # RS41 Decoding
|
||||
# 'rs41_fsk_demod': {
|
||||
# # Shift up to ~24 khz, and then pass into fsk_demod.
|
||||
# 'demod' : "| csdr shift_addition_cc 0.25 2>/dev/null | csdr convert_f_s16 | ../bin/fsk_demod --cs16 -b 1 -u 45000 2 96000 4800 - - 2>/dev/null | python ../bin/bit_to_samples.py 48000 4800 | sox -t raw -r 48k -e unsigned-integer -b 8 -c 1 - -r 48000 -b 8 -t wav - 2>/dev/null| ",
|
||||
|
||||
# Decode using rs41ecc
|
||||
'decode': "../rs41ecc --ecc --ptu --crc 2>/dev/null",
|
||||
# Count the number of telemetry lines.
|
||||
"post_process" : " | grep 00000 | wc -l"
|
||||
},
|
||||
# RS92 Decoding
|
||||
'rs92_fsk_demod': {
|
||||
# Not currently working - need to resolve segfault in dfk_demod when using 96 kHz Fs ans 2400 Rb
|
||||
# Shift up to ~24 khz, and then pass into fsk_demod.
|
||||
'demod' : "| csdr shift_addition_cc 0.25 2>/dev/null | csdr convert_f_s16 | ../bin/fsk_demod --cs16 -b 1 -u 45000 2 96000 2400 - - 2>/dev/null | python ../bin/bit_to_samples.py 48000 2400 | sox -t raw -r 48k -e unsigned-integer -b 8 -c 1 - -r 48000 -b 8 -t wav - 2>/dev/null| ",
|
||||
# # Decode using rs41ecc
|
||||
# 'decode': "../rs41ecc --ecc --ptu --crc 2>/dev/null",
|
||||
# # Count the number of telemetry lines.
|
||||
# "post_process" : " | grep 00000 | wc -l",
|
||||
# 'files' : "./generated/rs41*"
|
||||
# },
|
||||
# # RS92 Decoding
|
||||
# 'rs92_fsk_demod': {
|
||||
# # Not currently working - need to resolve segfault in dfk_demod when using 96 kHz Fs ans 2400 Rb
|
||||
# # Shift up to ~24 khz, and then pass into fsk_demod.
|
||||
# 'demod' : "| csdr shift_addition_cc 0.25 2>/dev/null | csdr convert_f_s16 | ../bin/fsk_demod --cs16 -b 1 -u 45000 2 96000 2400 - - 2>/dev/null | python ../bin/bit_to_samples.py 48000 2400 | sox -t raw -r 48k -e unsigned-integer -b 8 -c 1 - -r 48000 -b 8 -t wav - 2>/dev/null| ",
|
||||
|
||||
# Decode using rs41ecc
|
||||
'decode': ".../rs92ecc -vx -v --crc --ecc --vel 2>/dev/null",
|
||||
# Count the number of telemetry lines.
|
||||
"post_process" : " | grep M2513116 | wc -l"
|
||||
},
|
||||
'm10_fsk_demod': {
|
||||
# Not currently working due to weird baud rate (9614). Doesnt work even with fractional resampling (slow down signal to make it appear to be 9600 baud).
|
||||
# Shift up to ~24 khz, and then pass into fsk_demod.
|
||||
'demod' : "| csdr shift_addition_cc 0.25 2>/dev/null | csdr convert_f_s16 | ../bin/tsrc - - 0.99854 -c | ../bin/fsk_demod --cs16 -b 1 -u 45000 2 96000 9600 - - 2>/dev/null | python ../bin/bit_to_samples.py 48000 9600 | sox -t raw -r 48k -e unsigned-integer -b 8 -c 1 - -r 48000 -b 8 -t wav - 2>/dev/null| ",
|
||||
'decode': "../m10 -b -b2 2>/dev/null",
|
||||
# Count the number of telemetry lines.
|
||||
"post_process" : "| wc -l"
|
||||
},
|
||||
# # Decode using rs41ecc
|
||||
# 'decode': ".../rs92ecc -vx -v --crc --ecc --vel 2>/dev/null",
|
||||
# # Count the number of telemetry lines.
|
||||
# "post_process" : " | grep M2513116 | wc -l",
|
||||
# 'files' : "./generated/rs92*"
|
||||
# },
|
||||
# 'm10_fsk_demod': {
|
||||
# # Not currently working due to weird baud rate (9614). Doesnt work even with fractional resampling (slow down signal to make it appear to be 9600 baud).
|
||||
# # Shift up to ~24 khz, and then pass into fsk_demod.
|
||||
# 'demod' : "| csdr shift_addition_cc 0.25 2>/dev/null | csdr convert_f_s16 | ../bin/tsrc - - 0.99854 -c | ../bin/fsk_demod --cs16 -b 1 -u 45000 2 96000 9600 - - 2>/dev/null | python ../bin/bit_to_samples.py 48000 9600 | sox -t raw -r 48k -e unsigned-integer -b 8 -c 1 - -r 48000 -b 8 -t wav - 2>/dev/null| ",
|
||||
# 'decode': "../m10 -b -b2 2>/dev/null",
|
||||
# # Count the number of telemetry lines.
|
||||
# "post_process" : "| wc -l",
|
||||
# 'files' : "./generated/m10"
|
||||
# },
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -182,14 +191,15 @@ _demod_command = "| %s csdr shift_addition_cc %.5f 2>/dev/null | csdr convert_f_
|
|||
_demod_command += " timeout %d ./rtl_fm_stdin -M fm -f 401000000 -F9 -s %d 2>/dev/null|" % (_decode_timeout, int(_fm_rate))
|
||||
_demod_command += " sox -t raw -r %d -e s -b 16 -c 1 - -r 48000 -b 8 -t wav - lowpass 2600 2>/dev/null |" % int(_fm_rate)
|
||||
|
||||
processing_type['rs41_rtlfm_demod'] = {
|
||||
processing_type['rs41_rtlfm'] = {
|
||||
# Shift signal to -30 kHz, resample to 120 kHz, (8x 15 khz output rate), then convert to u8 before passing into rtl_fm_stdin.
|
||||
# Currently using a timeout to kill rtl_fm as it doesnt notice the end of the incoming samples.
|
||||
'demod': _demod_command,
|
||||
# Decode using rs41ecc
|
||||
'decode': "../rs41ecc --ptu --crc --ecc 2>/dev/null",
|
||||
# Count the number of telemetry lines.
|
||||
"post_process" : " | grep 00000 | wc -l"
|
||||
"post_process" : " | grep 00000 | wc -l",
|
||||
'files' : "./generated/rs41*.bin"
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -214,12 +224,13 @@ _demod_command += " timeout %d ./rtl_fm_stdin -M fm -f 401000000 -F9 -s %d 2>/d
|
|||
_demod_command += " sox -t raw -r %d -e s -b 16 -c 1 - -r 48000 -b 8 -t wav - lowpass 2500 highpass 20 2>/dev/null |" % int(_fm_rate)
|
||||
|
||||
|
||||
processing_type['rs92_rtlfm_demod'] = {
|
||||
processing_type['rs92_rtlfm'] = {
|
||||
'demod': _demod_command,
|
||||
# Decode using rs92ecc
|
||||
'decode': "../rs92ecc -vx -v --crc --ecc --vel 2>/dev/null",
|
||||
# Count the number of telemetry lines.
|
||||
"post_process" : " | grep M2513116 | wc -l"
|
||||
"post_process" : " | grep M2513116 | wc -l",
|
||||
'files' : "./generated/rs92*.bin"
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -243,11 +254,12 @@ _demod_command = "| csdr gain_ff 0.90 | %s csdr shift_addition_cc %.5f 2>/dev/nu
|
|||
_demod_command += " timeout %d ./rtl_fm_stdin -M fm -f 401000000 -F9 -s %d 2>/dev/null|" % (_decode_timeout, int(_fm_rate))
|
||||
_demod_command += " sox -t raw -r %d -e s -b 16 -c 1 - -r 48000 -b 8 -t wav - highpass 20 lowpass 2000 2>/dev/null |" % int(_fm_rate)
|
||||
|
||||
processing_type['dfm_rtlfm_demod'] = {
|
||||
processing_type['dfm_rtlfm'] = {
|
||||
'demod': _demod_command,
|
||||
'decode': "../dfm09ecc -vv --ecc --json --dist --auto 2>/dev/null",
|
||||
# Count the number of telemetry lines.
|
||||
"post_process" : " | grep frame | wc -l"
|
||||
"post_process" : " | grep frame | wc -l",
|
||||
'files' : "./generated/dfm*.bin"
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -271,11 +283,12 @@ _demod_command = "| %s csdr shift_addition_cc %.5f 2>/dev/null | csdr convert_f_
|
|||
_demod_command += " timeout %d ./rtl_fm_stdin -M fm -f 401000000 -F9 -s %d 2>/dev/null|" % (_decode_timeout, int(_fm_rate))
|
||||
_demod_command += " sox -t raw -r %d -e s -b 16 -c 1 - -r 48000 -b 8 -t wav - highpass 20 2>/dev/null |" % int(_fm_rate)
|
||||
|
||||
processing_type['m10_rtlfm_demod'] = {
|
||||
processing_type['m10_rtlfm'] = {
|
||||
'demod': _demod_command,
|
||||
'decode': "../m10 -b -b2 2>/dev/null",
|
||||
# Count the number of telemetry lines.
|
||||
"post_process" : "| wc -l"
|
||||
"post_process" : "| wc -l",
|
||||
'files' : "./generated/m10*.bin"
|
||||
}
|
||||
|
||||
# RS_Detect
|
||||
|
|
@ -298,11 +311,12 @@ _demod_command = "| %s csdr shift_addition_cc %.5f 2>/dev/null | csdr convert_f_
|
|||
_demod_command += " timeout %d ./rtl_fm_stdin -M fm -f 401000000 -F9 -s %d 2>/dev/null|" % (_decode_timeout, int(_fm_rate))
|
||||
_demod_command += " sox -t raw -r %d -e s -b 16 -c 1 - -r 48000 -b 8 -t wav - highpass 20 2>/dev/null |" % int(_fm_rate)
|
||||
|
||||
processing_type['rs_detect_rtlfm_demod'] = {
|
||||
processing_type['rs_detect_rtlfm'] = {
|
||||
'demod': _demod_command,
|
||||
'decode': "../rs_detect -z -t 8 2> /dev/null",
|
||||
# Grep out the line containing the detected sonde type.
|
||||
"post_process" : " | grep found"
|
||||
"post_process" : " | grep found",
|
||||
'files' : "./generated/*.bin"
|
||||
}
|
||||
|
||||
# DFT_Detect
|
||||
|
|
@ -325,25 +339,43 @@ _demod_command = "| %s csdr shift_addition_cc %.5f 2>/dev/null | csdr convert_f_
|
|||
_demod_command += " timeout %d ./rtl_fm_stdin -M fm -f 401000000 -F9 -s %d 2>/dev/null|" % (_decode_timeout, int(_fm_rate))
|
||||
_demod_command += " sox -t raw -r %d -e s -b 16 -c 1 - -r 48000 -b 8 -t wav - highpass 20 2>/dev/null |" % int(_fm_rate)
|
||||
|
||||
processing_type['dft_detect_rtlfm_demod'] = {
|
||||
processing_type['dft_detect_rtlfm'] = {
|
||||
'demod': _demod_command,
|
||||
'decode': "../dft_detect 2>/dev/null",
|
||||
# Grep out the line containing the detected sonde type.
|
||||
"post_process" : " | grep \:"
|
||||
"post_process" : " | grep \:",
|
||||
'files' : "./generated/*.bin"
|
||||
}
|
||||
|
||||
|
||||
def run_analysis(mode, file_list, shift=0.0, verbose=False):
|
||||
def run_analysis(mode, file_mask=None, shift=0.0, verbose=False, log_output = None):
|
||||
|
||||
|
||||
_mode = processing_type[mode]
|
||||
|
||||
# If we are not supplied with a file mask, use the defaults.
|
||||
if file_mask is None:
|
||||
file_mask = _mode['files']
|
||||
|
||||
# Get the list of files.
|
||||
_file_list = glob.glob(file_mask)
|
||||
if len(_file_list) == 0:
|
||||
print("No files found matching supplied path.")
|
||||
return
|
||||
|
||||
# Sort the list of files.
|
||||
_file_list.sort()
|
||||
|
||||
_first = True
|
||||
|
||||
# Calculate the frequency offset to apply, if defined.
|
||||
_shiftcmd = "| csdr shift_addition_cc %.5f 2>/dev/null" % (shift/96000.0)
|
||||
|
||||
if log_output is not None:
|
||||
_log = open(log_output,'w')
|
||||
|
||||
# Iterate over the files in the supplied list.
|
||||
for _file in file_list:
|
||||
for _file in _file_list:
|
||||
|
||||
# Generate the command to run.
|
||||
_cmd = "cat %s "%_file
|
||||
|
|
@ -369,20 +401,28 @@ def run_analysis(mode, file_list, shift=0.0, verbose=False):
|
|||
|
||||
_runtime = time.time() - _start
|
||||
|
||||
print("%s, %s" % (os.path.basename(_file), _output.strip()))
|
||||
_result = "%s, %s" % (os.path.basename(_file), _output.strip())
|
||||
|
||||
print(_result)
|
||||
if log_output is not None:
|
||||
_log.write(_result + '\n')
|
||||
|
||||
if verbose:
|
||||
print("Runtime: %.1d" % _runtime)
|
||||
|
||||
if log_output is not None:
|
||||
_log.close()
|
||||
|
||||
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument("-m", "--mode", type=str, default="rs41_csdr_fm_decode", help="Operation mode.")
|
||||
parser.add_argument("-f", "--files", type=str, default="./generated/*.bin", help="Glob-path to files to run over.")
|
||||
parser.add_argument("-m", "--mode", type=str, default="rs41_csdr", help="Operation mode.")
|
||||
parser.add_argument("-f", "--files", type=str, default=None, help="Glob-path to files to run over.")
|
||||
parser.add_argument("-v", "--verbose", action='store_true', default=False, help="Show additional debug info.")
|
||||
parser.add_argument("--shift", type=float, default=0.0, help="Shift the signal-under test by x Hz. Default is 0.")
|
||||
parser.add_argument("--batch", action='store_true', default=False, help="Run all tests, write results to results directory.")
|
||||
args = parser.parse_args()
|
||||
|
||||
# Check the mode is valid.
|
||||
|
|
@ -392,13 +432,9 @@ if __name__ == "__main__":
|
|||
sys.exit(1)
|
||||
|
||||
|
||||
# Get the list of files.
|
||||
_file_list = glob.glob(args.files)
|
||||
if len(_file_list) == 0:
|
||||
print("No files found matching supplied path.")
|
||||
sys.exit(1)
|
||||
|
||||
# Sort the list of files.
|
||||
_file_list.sort()
|
||||
|
||||
run_analysis(args.mode, _file_list, shift=args.shift, verbose=args.verbose)
|
||||
if args.batch:
|
||||
for _mode in processing_type:
|
||||
_log_name = "./results/" + _mode + ".txt"
|
||||
run_analysis(_mode, file_mask=None, shift=args.shift, verbose=args.verbose, log_output=_log_name)
|
||||
else:
|
||||
run_analysis(args.mode, args.files, shift=args.shift, verbose=args.verbose)
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue