Merge pull request #596 from projecthorus/testing

v1.5.8 release - M20 PTU Support, iMet-4 fixes

Author: darksidelemm

README.md

@@ -20,12 +20,12 @@ Vaisala | RS92-SGP/NGP | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_
 Vaisala | RS41-SG/SGP/SGM | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: (for -SGP)
 Graw | DFM06/09/17 | :heavy_check_mark: | :heavy_check_mark: | :x: | :x:
 Meteomodem | M10 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Not Sent
-Meteomodem | M20 | :heavy_check_mark: | :x: | :x: | Not Sent
+Meteomodem | M20 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: (For some models)
 Intermet Systems | iMet-4 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Not Sent
 Intermet Systems | iMet-54 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Not Sent
 Lockheed Martin | LMS6-400/1680 | :heavy_check_mark: | :x: | :x: | :x:
 Meisei | iMS-100 | :heavy_check_mark: | :x: | :x: | :x:
-Meteo-Radiy | MRZ (400 MHz) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:
+Meteo-Radiy | MRZ-H1 (400 MHz) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x:
 
 Support for other radiosondes may be added as required - please send us sondes to test with! If you have any information about telemetry formats, we'd love to hear from you (see our contact details below).
 

auto_rx/autorx/__init__.py

@@ -17,7 +17,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.5.7"
+__version__ = "1.5.8"
 
 
 # Global Variables

auto_rx/autorx/decode.py

@@ -203,7 +203,12 @@ def __init__(
         # which don't necessarily have a consistent packet count to time increment ratio.
         # This is a tradeoff between being able to handle multiple iMet sondes on a single frequency, and
         # not flooding the various databases with sonde IDs in the case of a bad sonde.
-        self.imet_id = None
+
+        # iMet ID store v2
+        # Now instead of just latching onto an ID, we allow up to 4 new IDs to be created per decoder.
+        # This should hopefully handle a few iMets on the same frequency in a graceful manner.
+        self.imet_max_ids = 4
+        self.imet_id = []
 
         # This will become our decoder thread.
         self.decoder = None
@@ -876,7 +881,7 @@ def generate_decoder_command_experimental(self):
             )
 
             # M20 decoder
-            decode_cmd = f"./mXXmod --json --ptu -vvv --softin -i {self.raw_file_option} 2>/dev/null"
+            decode_cmd = f"./m20mod --json --ptu -vvv --softin -i {self.raw_file_option} 2>/dev/null"
 
             # M20 sondes transmit in short, irregular pulses - average over the last 2 frames, and use a peak hold
             demod_stats = FSKDemodStats(averaging_time=2.0, peak_hold=True)
@@ -1315,16 +1320,30 @@ def handle_decoder_line(self, data):
 
                 # Fix up the time.
                 _telemetry["datetime_dt"] = fix_datetime(_telemetry["datetime"])
-                # Generate a unique ID based on the power-on time and frequency, as iMet sondes don't send one.
-                # Latch this ID and re-use it for the entire decode run.
-                if self.imet_id == None:
-                    self.imet_id = imet_unique_id(_telemetry)
+
+                # Generate a unique ID based on the power-on time and frequency, as iMet sonde telemetry is painful
+                # and doesn't send any ID. 
+                _new_imet_id = imet_unique_id(_telemetry)
+
+                # If we have seen this ID before, keep using it.
+                if _new_imet_id in self.imet_id:
+                    _telemetry["id"] = _new_imet_id
+                else:
+                    # We have seen less than 4 different IDs while this decoder has been runing.
+                    # Accept that this may be a new iMet sonde, and add the ID to the iMet ID list.
+                    if len(self.imet_id) < self.imet_max_ids:
+                        self.imet_id.append(_new_imet_id)
+                        _telemetry["id"] = _new_imet_id
+                    else:
+                        # We have seen see many IDs this decode run, suspect this is likely an old iMet-1
+                        # Which doesn't have a useful frame counter.
+                        self.log_error("Exceeded maximum number of iMet sonde IDs for a decoder (4) - discarding this frame.")
+                        return False
 
                 # Re-generate the datetime string.
                 _telemetry["datetime"] = _telemetry["datetime_dt"].strftime(
                     "%Y-%m-%dT%H:%M:%SZ"
                 )
-                _telemetry["id"] = self.imet_id
 
             # iMet-5x Specific Actions
             if self.sonde_type == "IMET5":

auto_rx/autorx/utils.py

@@ -46,6 +46,7 @@
     "meisei100mod",
     "imet54mod",
     "mp3h1mod",
+    "m20mod",
 ]
 
 
@@ -70,8 +71,8 @@ def get_autorx_version(version_url=AUTORX_MAIN_VERSION_URL):
     try:
         _r = requests.get(version_url, timeout=5)
     except Exception as e:
-        logging.exception(
-            f"Version - Error determining version from URL {version_url}", e
+        logging.error(
+            f"Version - Error determining version from URL {version_url}: {str(e)}"
         )
         return None
 
@@ -83,8 +84,8 @@ def get_autorx_version(version_url=AUTORX_MAIN_VERSION_URL):
                 return _main_version
 
     except Exception as e:
-        logging.exception(
-            f"Version - Error extracting version from url {version_url}.", e
+        logging.error(
+            f"Version - Error extracting version from url {version_url}: {str(e)}."
         )
         return None
 

auto_rx/build.sh

@@ -14,6 +14,7 @@ echo "Building for radiosonde_auto_rx version: $AUTO_RX_VERSION"
 
 VERS_FLAG="-DVER_JSN_STR=$AUTO_RX_VERSION"
 
+
 # Build rs_detect.
 echo "Building dft_detect"
 cd ../scan/
@@ -38,7 +39,7 @@ gcc meisei100mod.c demod_mod.o bch_ecc_mod.o -lm -O3 -o meisei100mod -w $VERS_FL
 echo "Building M10 demod."
 gcc m10mod.c demod_mod.o -lm -O3 -o m10mod -w $VERS_FLAG
 echo "Building M20 demod."
-gcc mXXmod.c demod_mod.o -lm -O3 -o mXXmod -w $VERS_FLAG
+gcc m20mod.c demod_mod.o -lm -O3 -o m20mod -w $VERS_FLAG
 echo "Building iMet-54 demod."
 gcc imet54mod.c demod_mod.o -lm -O3 -o imet54mod -w $VERS_FLAG
 echo "Building MRZ demod."
@@ -74,7 +75,7 @@ cp ../mk2a/mk2mod .
 cp ../demod/mod/rs41mod .
 cp ../demod/mod/dfm09mod .
 cp ../demod/mod/m10mod .
-cp ../demod/mod/mXXmod .
+cp ../demod/mod/m20mod .
 cp ../demod/mod/rs92mod .
 cp ../demod/mod/lms6Xmod .
 cp ../demod/mod/meisei100mod .

auto_rx/clean.sh

@@ -24,7 +24,10 @@ rm lms6mod
 rm lms6Xmod
 rm meisei100mod
 rm m10mod
+rm m20mod
 rm mXXmod
+rm mp3h1mod
+rm imet54mod
 
 # LMS6-1680 Decoder
 echo "Cleaning LMS6-1680 Demodulator."
@@ -56,8 +59,11 @@ rm rs92mod
 rm dfm09mod
 rm m10mod
 rm mXXmod
+rm m20mod
 rm lms6Xmod
 rm meisei100mod
+rm mp3h1mod
+rm imet54mod
 
 
 echo "Done!"

demod/mod/Makefile

@@ -8,7 +8,7 @@ AUTO_RX_VERSION := $(shell PYTHONPATH=../../auto_rx python -m autorx.version)
 CFLAGS = -O3 -Wall -Wno-unused-variable -DVER_JSN_STR=\"$(AUTO_RX_VERSION)\"
 LDLIBS = -lm
 
-PROGRAMS := rs41mod dfm09mod rs92mod lms6mod lms6Xmod meisei100mod m10mod mXXmod imet54mod
+PROGRAMS := rs41mod dfm09mod rs92mod lms6mod lms6Xmod meisei100mod m10mod m20mod imet54mod
 
 all: $(PROGRAMS)
 
@@ -26,9 +26,11 @@ meisei100mod: meisei100mod.o demod_mod.o bch_ecc_mod.o
 
 m10mod: m10mod.o demod_mod.o
 
-mXXmod: mXXmod.o demod_mod.o
+m20mod: m20mod.o demod_mod.o
 
 imet54mod: imet54mod.o demod_mod.o
 
+mp3h1mod: mp3h1mod.o demod_mod.o
+
 clean:
 	$(RM) $(PROGRAMS) $(PROGRAMS:=.o) demod_mod.o bch_ecc_mod.o