Merge remote-tracking branch 'upstream/testing' into testing

.gitignore

@@ -43,7 +43,6 @@ auto_rx/fsk_demod
 auto_rx/imet1rs_dft
 auto_rx/iq_dec
 auto_rx/lms6Xmod
-auto_rx/lms6mod
 auto_rx/m10mod
 auto_rx/m20mod
 auto_rx/mk2a1680mod
@@ -61,7 +60,6 @@ mk2a_lms1680
 demod/dfm09ecc
 demod/mod/dfm09mod
 demod/mod/lms6Xmod
-demod/mod/lms6mod
 demod/mod/meisei100mod
 demod/mod/rs41mod
 demod/mod/rs92mod

auto_rx/autorx/__init__.py

@@ -14,7 +14,6 @@
 
 __version__ = "1.7.5-beta2"
 
-
 # Global Variables
 
 # RTLSDR Usage Register - This dictionary holds information about each SDR and its currently running Decoder / Scanner

auto_rx/build.sh

@@ -2,6 +2,8 @@
 #
 # Auto Sonde Decoder build script.
 
+set -e
+
 # Get the auto-rx version.
 AUTO_RX_VERSION="\"$(python3 -m autorx.version 2>/dev/null || python -m autorx.version)\""
 

auto_rx/test/test_demod.py

@@ -612,38 +612,6 @@
 }
 
 
-# LMS6 - 400 MHz version
-_fm_rate = 22000
-# Calculate the necessary conversions
-_rtlfm_oversampling = 8.0 # Viproz's hacked rtl_fm oversamples by 8x.
-_shift = -2.0*_fm_rate/_sample_fs # rtl_fm tunes 'up' by rate*2, so we need to shift the signal down by this amount.
-
-_resample = (_fm_rate*_rtlfm_oversampling)/_sample_fs
-
-if _resample != 1.0:
-    # We will need to resample.
-    _resample_command = "csdr convert_f_s16 | ./tsrc - - %.4f | csdr convert_s16_f |" % _resample
-    _shift = (-2.0*_fm_rate)/(_sample_fs*_resample)
-else:
-    _resample_command = ""
-
-_demod_command = "| %s csdr shift_addition_cc %.5f 2>/dev/null | csdr convert_f_u8 |" % (_resample_command, _shift)
-_demod_command += " ./rtl_fm_stdin -M fm -f 401000000 -F9 -s %d  2>/dev/null|" % (int(_fm_rate))
-_demod_command += " sox -t raw -r %d -e s -b 16 -c 1 - -r 48000 -b 8 -t wav - highpass 20 2>/dev/null |" % int(_fm_rate)
-
-
-processing_type['lms6-400_rtlfm'] = {
-    'demod': _demod_command,
-    # Decode using rs92ecc
-    'decode': "../lms6mod  2>/dev/null",
-    #'decode': "../rs92ecc -vx -v --crc --ecc -r --vel 2>/dev/null", # For measuring No-ECC performance
-    # Count the number of telemetry lines.
-    "post_process" : " | wc -l",
-    #"post_process" : " | grep \"errors: 0\" | wc -l",
-    'files' : "./generated/lms6-400*.bin" 
-}
-
-
 # # LMS6 - 1680
 _fm_rate = 200000
 _sample_fs = 480000

demod/mod/Makefile

@@ -1,6 +1,6 @@
 LDLIBS = -lm
 
-PROGRAMS := rs41mod dfm09mod rs92mod lms6mod lms6Xmod meisei100mod m10mod m20mod imet54mod mp3h1mod mts01mod iq_dec
+PROGRAMS := rs41mod dfm09mod rs92mod lms6Xmod meisei100mod m10mod m20mod imet54mod mp3h1mod mts01mod iq_dec
 
 all: $(PROGRAMS)
 
@@ -10,8 +10,6 @@ dfm09mod: dfm09mod.o demod_mod.o
 
 rs92mod: rs92mod.o demod_mod.o bch_ecc_mod.o
 
-lms6mod: lms6mod.o demod_mod.o bch_ecc_mod.o
-
 lms6Xmod: lms6Xmod.o demod_mod.o bch_ecc_mod.o
 
 meisei100mod: meisei100mod.o demod_mod.o bch_ecc_mod.o
@@ -35,4 +33,4 @@ iq_dec: CFLAGS += -Ofast
 iq_dec: iq_dec.o
 
 clean:
-	$(RM) $(PROGRAMS) $(PROGRAMS:=.o) demod_mod.o bch_ecc_mod.o
+	$(RM) $(PROGRAMS) $(PROGRAMS:=.o) demod_mod.o bch_ecc_mod.o

demod/mod/README.md

@@ -6,7 +6,7 @@ alternative decoders using cross-correlation for better header-synchronization
 #### Files
 
   * `demod_mod.c`, `demod_mod.h`, <br />
-    `rs41mod.c`, `rs92mod.c`, `dfm09mod.c`, `m10mod.c`, `lms6mod.c`, `lms6Xmod.c`, `meisei100mod.c`, <br />
+    `rs41mod.c`, `rs92mod.c`, `dfm09mod.c`, `m10mod.c`, `lms6Xmod.c`, `meisei100mod.c`, <br />
     `bch_ecc_mod.c`, `bch_ecc_mod.h`
 
 #### Compile