From 08d137fcdb392f7436647593c41f137c129afae3 Mon Sep 17 00:00:00 2001 From: Mark Jessop Date: Sun, 29 Dec 2024 14:24:06 +1030 Subject: [PATCH 1/3] Comment out lsusb parsing errors --- auto_rx/autorx/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/auto_rx/autorx/utils.py b/auto_rx/autorx/utils.py index b7b7f7a9..175a9581 100644 --- a/auto_rx/autorx/utils.py +++ b/auto_rx/autorx/utils.py @@ -718,7 +718,7 @@ def lsusb(): depth = 1 + len(indent_match.group(1)) / 2 if depth > len(depth_stack): - logging.debug('lsusb parsing error: unexpected indentation: "%s"', line) + #logging.debug('lsusb parsing error: unexpected indentation: "%s"', line) continue while depth < len(depth_stack): @@ -743,7 +743,7 @@ def lsusb(): depth_stack.append(new_entry) continue - logging.debug('lsusb parsing error: unrecognized line: "%s"', line) + #logging.debug('lsusb parsing error: unrecognized line: "%s"', line) if device: devices.append(device) From 85307edfa0e96769175e9da97a50577296bf9f6e Mon Sep 17 00:00:00 2001 From: Mark Jessop Date: Wed, 1 Jan 2025 10:27:30 +1030 Subject: [PATCH 2/3] Testing some more decoder tweaks --- auto_rx/test/test_demod.py | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/auto_rx/test/test_demod.py b/auto_rx/test/test_demod.py index b09998b3..d3db3a71 100644 --- a/auto_rx/test/test_demod.py +++ b/auto_rx/test/test_demod.py @@ -209,7 +209,7 @@ }, 'rs41_fsk_demod_soft_centre': { # Keep signal centred. - 'demod' : "| csdr convert_f_s16 | ./tsrc - - 0.500 | ../fsk_demod --cs16 -b -10000 -u 10000 -s --stats=5 2 48000 4800 - - 2>stats.txt |", + 'demod' : "| csdr convert_f_s16 | ./tsrc - - 0.500 | ../fsk_demod --cs16 -b -10000 -u 10000 -s --mask 4800 --stats=5 2 48000 4800 - - 2>stats.txt |", # Decode using rs41ecc 'decode': "../rs41mod --ecc --ptu --crc --softin -i --json 2>/dev/null", @@ -275,6 +275,32 @@ "post_process" : "| grep aprsid | wc -l", 'files' : "./generated/m10*" }, + 'm10_fsk_demod_soft_centre_48000': { + # Shift up to ~24 khz, and then pass into fsk_demod. + 'demod' : "| csdr convert_f_s16 | ../tsrc - - 0.500 -c | ../fsk_demod --cs16 -b -10000 -p 5 -u 10000 -s --stats=5 2 48000 9600 - - 2>stats.txt |", + 'decode': "../m10mod --json --softin -i -vvv 2>/dev/null", + # Count the number of telemetry lines. + "post_process" : "| grep aprsid | wc -l", + 'files' : "./generated/m10*" + }, + + 'm10_fsk_demod_soft_centre_48000_2': { + # Shift up to ~24 khz, and then pass into fsk_demod. + 'demod' : "| csdr convert_f_s16 | ../tsrc - - 0.500 -c | ../fsk_demod --cs16 -b -10000 -p 5 -u 10000 -s --stats=5 2 48080 9616 - - 2>stats.txt |", + 'decode': "../m10mod --json --softin -i -vvv 2>/dev/null", + # Count the number of telemetry lines. + "post_process" : "| grep aprsid | wc -l", + 'files' : "./generated/m10*" + }, + + 'm10_fsk_demod_soft_centre_96200': { + # Shift up to ~24 khz, and then pass into fsk_demod. + 'demod' : "| csdr convert_f_s16 | ../tsrc - - 1.0020833333333334 -c | ../fsk_demod --cs16 -b -10000 -p 10 -u 10000 -s --stats=5 2 96200 9620 - - 2>stats.txt |", + 'decode': "../m10mod --json --softin -i -vvv 2>/dev/null", + # Count the number of telemetry lines. + "post_process" : "| grep aprsid | wc -l", + 'files' : "./generated/m10*" + }, 'm20_fsk_demod_soft_centre': { # Shift up to ~24 khz, and then pass into fsk_demod. 'demod' : "| csdr convert_f_s16 | ./tsrc - - 0.500 | ../fsk_demod --cs16 -p 5 -b -10000 -u 10000 -s --stats=5 2 48000 9600 - - 2>stats.txt |", From cbd4b55b7bad5e7f10d6138f5b2c2b890cc8b44c Mon Sep 17 00:00:00 2001 From: Mark Jessop Date: Wed, 1 Jan 2025 10:47:09 +1030 Subject: [PATCH 3/3] Bump testing version --- auto_rx/autorx/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto_rx/autorx/__init__.py b/auto_rx/autorx/__init__.py index 4d768701..d5d41938 100644 --- a/auto_rx/autorx/__init__.py +++ b/auto_rx/autorx/__init__.py @@ -12,7 +12,7 @@ # 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.1-beta3" +__version__ = "1.8.1-beta4" # Global Variables