Merge pull request #972 from darksidelemm/testing

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

auto_rx/autorx/__init__.py

@@ -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.1-beta3"
+__version__ = "1.8.1-beta4"
 
 # Global Variables
 

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)

auto_rx/test/test_demod.py

@@ -209,7 +209,7 @@ processing_type = {
     },
     '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 @@ processing_type = {
         "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 |",