Merge branch 'dr-sinusoidal' of github.com:drowe67/codec2 into dr-sinusoidal

Author: drowe67

stm32/CMakeLists.txt

@@ -188,7 +188,7 @@ ${CODEC2_SRC}/phi0.c
 ${CODEC2_SRC}/HRAb_396_504.c
 codebook.c
 codebookd.c
-codebookjvm.c
+codebookjmv.c
 codebookge.c
 codebooknewamp1_energy.c
 codebooknewamp1.c

stm32/cmake/gencodebooks.cmake

@@ -34,10 +34,10 @@ set(CODEBOOKSD
     ${D}/dlsp10.txt
 )
 
-set(CODEBOOKSJVM
-    ${D}/lspjvm1.txt
-    ${D}/lspjvm2.txt
-    ${D}/lspjvm3.txt
+set(CODEBOOKSJMV
+    ${D}/lspjmv1.txt
+    ${D}/lspjmv2.txt
+    ${D}/lspjmv3.txt
 )
 
 set(CODEBOOKSMEL
@@ -114,11 +114,11 @@ add_custom_command(
     DEPENDS generate_codebook ${CODEBOOKSD}
 )
 
-# codebookjvm.c
+# codebookjmv.c
 add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebookjvm.c
-    COMMAND generate_codebook lsp_cbjvm ${CODEBOOKSJVM} > ${CMAKE_CURRENT_BINARY_DIR}/codebookjvm.c
-    DEPENDS generate_codebook ${CODEBOOKSJVM}
+    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/codebookjmv.c
+    COMMAND generate_codebook lsp_cbjmv ${CODEBOOKSJMV} > ${CMAKE_CURRENT_BINARY_DIR}/codebookjmv.c
+    DEPENDS generate_codebook ${CODEBOOKSJMV}
 )
 
 

stm32/unittest/scripts/tst_api_demod_setup

@@ -49,7 +49,7 @@ case "${TEST_OPT}" in
 		> setup.log 2>&1
 	freedv_tx 700D spch_in.raw mod_bits.raw --testframes --txbpf 0 \
 		  >> setup.log 2>&1
-	cohpsk_ch mod_bits.raw stm_in.raw -20 --Fs 8000 -f -5  2>&1 | tee setup.log
+	ch mod_bits.raw stm_in.raw --No -20 -f -5 2>&1 | tee setup.log
 
         # Reference: - When the OFDM modem initially syncs, it often
 	#              has residual freq offset that causes abnormally
@@ -80,7 +80,7 @@ case "${TEST_OPT}" in
 		>> setup.log 2>&1
 	#
         # Reference - give it a hard time with some noise to exercise the LDPC codec and get us to max CPU
-	cohpsk_ch mod_bits.raw stm_in.raw -20 --Fs 8000 -f -5  2>&1 | tee setup.log
+	ch mod_bits.raw stm_in.raw -20 -f -5 2>&1 | tee setup.log
         freedv_rx 700D stm_in.raw ref_demod.raw -v \
 		> ref_gen.log 2>&1
 	;;
@@ -109,7 +109,7 @@ case "${TEST_OPT}" in
 		> setup.log 2>&1
 	freedv_tx 700E spch_in.raw mod_bits.raw --testframes --txbpf 1 \
 		  >> setup.log 2>&1
-	cohpsk_ch mod_bits.raw stm_in.raw -22 --Fs 8000 -f -5  2>&1 | tee setup.log
+	ch mod_bits.raw stm_in.raw --No -22 -f -5  2>&1 | tee setup.log
 
         freedv_rx 700E stm_in.raw ref_demod.raw -v --testframes  2>&1 --discard | tee ref_gen.log
 	;;
@@ -125,7 +125,7 @@ case "${TEST_OPT}" in
 		>> setup.log 2>&1
 	#
         # Reference - give it a hard time with some noise to exercise the LDPC codec and get us to max CPU
-	cohpsk_ch mod_bits.raw stm_in.raw -20 --Fs 8000 -f -5  2>&1 | tee setup.log
+	ch mod_bits.raw stm_in.raw --No -20 -f -5  2>&1 | tee setup.log
         freedv_rx 700E stm_in.raw ref_demod.raw -v \
 		> ref_gen.log 2>&1
 	;;

stm32/unittest/scripts/tst_ofdm_demod_setup

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -x
 #
 # tst_ofdm_demod_setup
 #
@@ -54,7 +54,7 @@ case "${TEST_OPT}" in
     	# Config is <verbose>, <testframes>, <ldpc_en>, <log_payload_syms> <profile>
     	echo "11000000" > stm_cfg.txt
 	ofdm_mod --in /dev/zero --out mod_bits.raw --testframes 60 > setup.log 2>&1
-        cohpsk_ch mod_bits.raw stm_in.raw -24.5 --Fs 8000 -f -10 --mpp \
+        ch mod_bits.raw stm_in.raw --No -24.5 -f -10 --mpp \
 	    --fading_dir ${CODEC2_BASE}/build_linux/unittest >> setup.log 2>&1
         ofdm_demod --in stm_in.raw --out ref_demod_out.raw --log ofdm_demod_ref_log.txt \
         	--testframes --verbose 1 > ref_gen_log.txt 2>&1
@@ -64,7 +64,7 @@ case "${TEST_OPT}" in
     	# Config is <verbose>, <testframes>, <ldpc_en>, <log_payload_syms> <profile>
     	echo "00001000" > stm_cfg.txt
 	ofdm_mod --in /dev/zero --out mod_bits.raw --testframes 100 > setup.log 2>&1
-        cohpsk_ch mod_bits.raw stm_in.raw -20 --Fs 8000 -f -10 --mpp \
+        ch mod_bits.raw stm_in.raw --No -20 -f -10 --mpp \
 	    --fading_dir ${CODEC2_BASE}/build_linux/unittest >> setup.log 2>&1
         ofdm_demod --in stm_in.raw --out ref_demod_out.raw --log ofdm_demod_ref_log.txt \
         	--testframes --verbose 1 > ref_gen_log.txt 2>&1
@@ -82,7 +82,7 @@ case "${TEST_OPT}" in
     	# Config is <verbose>, <testframes>, <ldpc_en>, <log_payload_syms> <profile>
     	echo "01110000" > stm_cfg.txt
 	ofdm_mod --in /dev/zero --out mod_bits.raw --testframes 30 --ldpc 1 > setup.log 2>&1
-        cohpsk_ch mod_bits.raw stm_in.raw -20 --Fs 8000 -f -10 >> setup.log 2>&1
+        ch mod_bits.raw stm_in.raw --No -20 -f -10 >> setup.log 2>&1
         ofdm_demod --in stm_in.raw --out ref_demod_out.raw --log ofdm_demod_ref_log.txt \
         	--testframes --ldpc 1 --verbose 1 > ref_gen_log.txt 2>&1
 	;;
@@ -91,7 +91,7 @@ case "${TEST_OPT}" in
     	# Config is <verbose>, <testframes>, <ldpc_en>, <log_payload_syms> <profile>
     	echo "01110000" > stm_cfg.txt
 	ofdm_mod --in /dev/zero --out mod_bits.raw --testframes 120 --ldpc 1 > setup.log 2>&1
-        cohpsk_ch mod_bits.raw stm_in.raw -30 --Fs 8000 -f -10 --mpp \
+        ch mod_bits.raw stm_in.raw --No -30 -f -10 --mpp \
 	    --fading_dir ${CODEC2_BASE}/build_linux/unittest >> setup.log 2>&1
         ofdm_demod --in stm_in.raw --out ref_demod_out.raw --log ofdm_demod_ref_log.txt \
         	   --testframes --ldpc 1 --verbose 1 > ref_gen_log.txt 2>&1;