Merge pull request #734 from darksidelemm/testing

Better handling of meisei sonde types

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.6.0-beta22"
+__version__ = "1.6.0-beta23"
 
 
 # Global Variables

auto_rx/autorx/decode.py

@@ -1457,8 +1457,6 @@ class SondeDecoder(object):
                         _telemetry["type"] = "DFM"
                         _telemetry["subtype"] = "DFM"
 
-
-
                     # Check frame ID here to ensure we are on dfm09mod version with the frame number fixes (2020-12).
                     if _telemetry["frame"] < 256:
                         self.log_error(
@@ -1466,6 +1464,10 @@ class SondeDecoder(object):
                         )
                         return False
 
+                elif self.sonde_type == "MEISEI":
+                    # For meisei sondes, we are provided a subtype that distinguishes iMS-100 and RS11G sondes.
+                    _telemetry["type"] = _telemetry["subtype"]
+
                 else:
                     # For other sonde types, we leave the type field as it is, even if we are provided
                     # a subtype field. (This shouldn't happen)

auto_rx/autorx/sondehub.py

@@ -204,6 +204,16 @@ class SondehubUploader(object):
             _output["type"] = telemetry["subtype"]
             _output["serial"] = telemetry["id"].split("-")[1]
 
+        elif telemetry["type"] == "IMS100":
+            _output["manufacturer"] = "Meisei"
+            _output["type"] = "iMS-100"
+            _output["serial"] = telemetry["id"].split("-")[1]
+
+        elif telemetry["type"] == "RS11G":
+            _output["manufacturer"] = "Meisei"
+            _output["type"] = "RS-11G"
+            _output["serial"] = telemetry["id"].split("-")[1]
+
         elif telemetry["type"] == "MRZ":
             _output["manufacturer"] = "Meteo-Radiy"
             _output["type"] = "MRZ"

auto_rx/autorx/templates/index.html

@@ -1668,6 +1668,7 @@
                 <option value="IMET5">iMet-50/54</option>
                 <option value="MEISEI">iMS-100</option>
                 <option value="MRZ">MRZ-H1</option>
+                <option value="MTS01">MTS01</option>
             </select>
             <div style="display:inline;vertical-align:middle;">
                 <button id="start-decoder" onclick="start_decoder();">Start</button>

auto_rx/autorx/utils.py

@@ -181,6 +181,10 @@ def short_type_lookup(type_name):
         return "Intermet Systems iMet-5x"
     elif type_name == "MEISEI":
         return "Meisei iMS-100/RS-11"
+    elif type_name == "IMS100":
+        return "Meisei iMS-100"
+    elif type_name == "RS11G":
+        return "Meisei RS-11G"
     elif type_name == "MRZ":
         return "Meteo-Radiy MRZ"
     elif type_name == "MTS01":
@@ -217,6 +221,10 @@ def short_short_type_lookup(type_name):
         return "iMet-5x"
     elif type_name == "MEISEI":
         return "iMS-100"
+    elif type_name == "IMS100":
+        return "iMS-100"
+    elif type_name == "RS11G":
+        return "RS-11G"
     elif type_name == "MRZ":
         return "MRZ"
     elif type_name == "MTS01":