Merge pull request #805 from projecthorus/testing

v1.7.0 Release

.gitignore

@@ -53,6 +53,7 @@ auto_rx/imet54mod
 auto_rx/mXXmod
 auto_rx/mp3h1mod
 auto_rx/mts01mod
+auto_rx/weathex301d
 
 m10
 meisei100mod
@@ -82,3 +83,4 @@ rs_module/rs41mod
 rs_module/rs92mod
 scan/reset_usb
 scan/rs_detect
+weathex/weathex301d

Makefile

@@ -13,6 +13,7 @@ SUBDIRS := \
 	mk2a \
 	scan \
 	utils \
+	weathex \
 
 all: $(SUBDIRS)
 

auto_rx/auto_rx.py

@@ -181,6 +181,7 @@ def start_scanner():
             ppm=autorx.sdr_list[_device_idx]["ppm"],
             bias=autorx.sdr_list[_device_idx]["bias"],
             save_detection_audio=config["save_detection_audio"],
+            wideband_sondes=config["wideband_sondes"],
             temporary_block_list=temporary_block_list,
             temporary_block_time=config["temporary_block_time"],
         )
@@ -272,7 +273,8 @@ def start_decoder(freq, sonde_type, continuous=False):
             rs92_ephemeris=rs92_ephemeris,
             rs41_drift_tweak=config["rs41_drift_tweak"],
             experimental_decoder=config["experimental_decoders"][_exp_sonde_type],
-            save_raw_hex=config["save_raw_hex"]
+            save_raw_hex=config["save_raw_hex"],
+            wideband_sondes=config["wideband_sondes"]
         )
         autorx.sdr_list[_device_idx]["task"] = autorx.task_list[freq]["task"]
 
@@ -651,6 +653,7 @@ def telemetry_filter(telemetry):
         or ("LMS" in telemetry["type"])
         or ("IMET" in telemetry["type"])
         or ("MTS01" in telemetry["type"])
+        or ("WXR" in telemetry["type"])
     ):
         return "OK"
     else:
@@ -818,8 +821,8 @@ def main():
     logging.getLogger("geventwebsocket").setLevel(logging.ERROR)
 
     # Check all the RS utilities exist.
-    logging.debug("Checking if utils exist")
-    if not check_rs_utils():
+    logging.debug("Checking if required binaries exist")
+    if not check_rs_utils(config):
         sys.exit(1)
 
     # Attempt to read in config file
@@ -832,6 +835,7 @@ def main():
         config = _temp_cfg
         autorx.sdr_list = config["sdr_settings"]
 
+
     # Apply any logging changes based on configuration file settings.
     if config["save_system_log"]:
         # Enable system logging.

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.6.2"
+__version__ = "1.7.0"
 
 
 # Global Variables

auto_rx/autorx/config.py

@@ -175,6 +175,7 @@ def read_auto_rx_config(filename, no_sdr_test=False):
         "sondehub_enabled": True,
         "sondehub_upload_rate": 30,
         # "sondehub_contact_email": "[email protected]" # Commented out to ensure a warning message is shown on startup
+        "wideband_sondes": False, # Wideband sonde detection / decoding
     }
 
     try:
@@ -455,27 +456,30 @@ def read_auto_rx_config(filename, no_sdr_test=False):
             "MEISEI": True,
             "MTS01": False, # Until we test it
             "MRZ": False,  # .... except for the MRZ, until we know it works.
+            "WXR301": True, # No fsk_demod chain for this yet.
             "UDP": False,
         }
 
         auto_rx_config["decoder_spacing_limit"] = config.getint(
             "advanced", "decoder_spacing_limit"
         )
-        auto_rx_config["experimental_decoders"]["RS41"] = config.getboolean(
-            "advanced", "rs41_experimental"
-        )
-        auto_rx_config["experimental_decoders"]["RS92"] = config.getboolean(
-            "advanced", "rs92_experimental"
-        )
-        auto_rx_config["experimental_decoders"]["M10"] = config.getboolean(
-            "advanced", "m10_experimental"
-        )
-        auto_rx_config["experimental_decoders"]["DFM"] = config.getboolean(
-            "advanced", "dfm_experimental"
-        )
-        auto_rx_config["experimental_decoders"]["LMS6"] = config.getboolean(
-            "advanced", "lms6-400_experimental"
-        )
+        # Use 'experimental' (not really, anymore!) decoders for RS41, RS92, M10, DFM and LMS6-400.
+        # Don't allow overriding to the FM based decoders.
+        # auto_rx_config["experimental_decoders"]["RS41"] = config.getboolean(
+        #     "advanced", "rs41_experimental"
+        # )
+        # auto_rx_config["experimental_decoders"]["RS92"] = config.getboolean(
+        #     "advanced", "rs92_experimental"
+        # )
+        # auto_rx_config["experimental_decoders"]["M10"] = config.getboolean(
+        #     "advanced", "m10_experimental"
+        # )
+        # auto_rx_config["experimental_decoders"]["DFM"] = config.getboolean(
+        #     "advanced", "dfm_experimental"
+        # )
+        # auto_rx_config["experimental_decoders"]["LMS6"] = config.getboolean(
+        #     "advanced", "lms6-400_experimental"
+        # )
 
         try:
             auto_rx_config["web_control"] = config.getboolean("web", "web_control")
@@ -760,6 +764,17 @@ def read_auto_rx_config(filename, no_sdr_test=False):
             auto_rx_config["email_encrypted_sonde_notifications"] = True
 
 
+        # 1.6.3 - Weathex WXR301d support
+        try:
+            auto_rx_config["wideband_sondes"] = config.getboolean(
+                "advanced", "wideband_sondes"
+            )
+        except:
+            logging.warning(
+                "Config - Missing wideband_sondes option (new in v1.6.3), using default (False)"
+            )
+            auto_rx_config["wideband_sondes"] = 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