diff --git a/auto_rx/autorx/decode.py b/auto_rx/autorx/decode.py index ac7989b..507e1ff 100644 --- a/auto_rx/autorx/decode.py +++ b/auto_rx/autorx/decode.py @@ -711,7 +711,7 @@ class SondeDecoder(object): decode_cmd += " tee decode_%s.raw |" % str(self.rtl_device_idx) # Meteosis MTS01 decoder - decode_cmd += f"./meteosis_mod --json --IQ 0.0 --lpIQ --dc - {_sample_rate} 16 2>/dev/null" + decode_cmd += f"./mts01mod --json --IQ 0.0 --lpIQ --dc - {_sample_rate} 16 2>/dev/null" elif self.sonde_type == "UDP": # UDP Input Mode. diff --git a/auto_rx/autorx/utils.py b/auto_rx/autorx/utils.py index 56fc221..29c7c7e 100644 --- a/auto_rx/autorx/utils.py +++ b/auto_rx/autorx/utils.py @@ -41,7 +41,7 @@ REQUIRED_RS_UTILS = [ "mp3h1mod", "m20mod", "imet4iq", - "meteosis_mod" + "mts01mod" ] diff --git a/auto_rx/build.sh b/auto_rx/build.sh index 6356c05..6273b80 100755 --- a/auto_rx/build.sh +++ b/auto_rx/build.sh @@ -36,6 +36,6 @@ mv ../demod/mod/lms6Xmod . mv ../demod/mod/meisei100mod . mv ../demod/mod/imet54mod . mv ../demod/mod/mp3h1mod . -mv ../demod/mod/meteosis_mod . +mv ../demod/mod/mts01mod . echo "Done!" diff --git a/auto_rx/clean.sh b/auto_rx/clean.sh index ae5971b..c21bb8c 100755 --- a/auto_rx/clean.sh +++ b/auto_rx/clean.sh @@ -23,7 +23,7 @@ rm lms6Xmod rm meisei100mod rm mp3h1mod rm imet54mod -rm meteosis_mod +rm mts01mod echo "Done!" diff --git a/auto_rx/test/test_demod.py b/auto_rx/test/test_demod.py index 6098761..e51d16f 100644 --- a/auto_rx/test/test_demod.py +++ b/auto_rx/test/test_demod.py @@ -377,7 +377,7 @@ processing_type = { #../dfm09ecc -vv --json --dist --auto 'demod': '| csdr convert_f_s16 | ../tsrc - - 0.500|', # ../fsk_demod --cs16 -b -10000 -u 10000 -s --stats=5 2 48000 1200 - - 2>stats.txt |',#' python ./bit_to_samples.py 50000 2500 | sox -t raw -r 50k -e unsigned-integer -b 8 -c 1 - -r 50000 -b 8 -t wav - 2>/dev/null| ', - 'decode': '../meteosis_mod --json --IQ 0.0 --lpIQ --dc - 48000 16 2>/dev/null', + 'decode': '../mts01mod --json --IQ 0.0 --lpIQ --dc - 48000 16 2>/dev/null', "post_process" : " | grep frame | wc -l", # ECC #"post_process" : "| grep -o '\[OK\]' | wc -l", # No ECC 'files' : "./generated/mts01*.bin" diff --git a/demod/mod/Makefile b/demod/mod/Makefile index f438e24..6f74c11 100644 --- a/demod/mod/Makefile +++ b/demod/mod/Makefile @@ -1,6 +1,6 @@ LDLIBS = -lm -PROGRAMS := rs41mod dfm09mod rs92mod lms6mod lms6Xmod meisei100mod m10mod m20mod imet54mod mp3h1mod meteosis_mod +PROGRAMS := rs41mod dfm09mod rs92mod lms6mod lms6Xmod meisei100mod m10mod m20mod imet54mod mp3h1mod mts01mod all: $(PROGRAMS) @@ -24,7 +24,7 @@ imet54mod: imet54mod.o demod_mod.o mp3h1mod: mp3h1mod.o demod_mod.o -meteosis_mod: meteosis_mod.o demod_mod.o +mts01mod: mts01mod.o demod_mod.o bch_ecc_mod.o: bch_ecc_mod.h diff --git a/demod/mod/meteosis_mod.c b/demod/mod/mts01mod.c similarity index 98% rename from demod/mod/meteosis_mod.c rename to demod/mod/mts01mod.c index 5f35045..9275b00 100644 --- a/demod/mod/meteosis_mod.c +++ b/demod/mod/mts01mod.c @@ -2,9 +2,9 @@ /* Meteosis MTS01 ? - files: demod_mod.c, demod_mod.h, meteosis_mod.c + files: demod_mod.c, demod_mod.h, mts01mod.c gcc -O3 -c demod_mod.c - gcc meteosis_mod.c demod_mod.o -lm -o meteosis_mod + gcc mts01mod.c demod_mod.o -lm -o mts01mod */ #include @@ -225,8 +225,8 @@ static int print_frame(gpx_t *gpx, int pos) { } // Reference time/position - //printf(", \"ref_datetime\": \"%s\"", "UTC" ); // {"GPS", "UTC"} GPS-UTC=leap_sec ? - //printf(", \"ref_position\": \"%s\"", "GPS" ); // {"GPS", "MSL"} GPS=ellipsoid , MSL=geoid ? + printf(", \"ref_datetime\": \"%s\"", "UTC" ); // {"GPS", "UTC"} GPS-UTC=leap_sec ? + printf(", \"ref_position\": \"%s\"", "MSL" ); // {"GPS", "MSL"} GPS=ellipsoid , MSL=geoid ? #ifdef VER_JSN_STR ver_jsn = VER_JSN_STR;