Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.8.1-beta4 - New KA9Q-Radio version required #972

Merged
merged 4 commits into from
Jan 1, 2025
+30 −4
Merged

v1.8.1-beta4 - New KA9Q-Radio version required #972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
08d137f
Comment out lsusb parsing errors
Dec 29, 2024
85307ed
Testing some more decoder tweaks
Dec 31, 2024
45af5cb
Merge remote-tracking branch 'upstream/testing' into testing
Jan 1, 2025
cbd4b55
Bump testing version
Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion auto_rx/autorx/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions auto_rx/autorx/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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)
Expand Down
28 changes: 27 additions & 1 deletion auto_rx/test/test_demod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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 |",
Expand Down
Loading