stm32 ctests working with new cohpsk_ch --fading_dir argument

Author: drowe67

stm32/unittest/scripts/tst_ofdm_demod_setup

@@ -45,8 +45,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 10 > setup.log 2>&1
-        cohpsk_ch mod_bits.raw stm_in.raw -20 --Fs 8000 -f -5 \
-	    --raw_dir ${CODEC2_BASE}/raw >> setup.log 2>&1
+        cohpsk_ch mod_bits.raw stm_in.raw -20 --Fs 8000 -f -5 >> 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
 	;;
@@ -56,7 +55,7 @@ case "${TEST_OPT}" in
     	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 \
-	    --raw_dir ${CODEC2_BASE}/raw >> setup.log 2>&1
+	    --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
 	;;
@@ -65,8 +64,8 @@ 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 --fast \
-	    --raw_dir ${CODEC2_BASE}/raw >> setup.log 2>&1
+        cohpsk_ch mod_bits.raw stm_in.raw -20 --Fs 8000 -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
 	;;
@@ -83,8 +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 \
-	    --raw_dir ${CODEC2_BASE}/raw >> setup.log 2>&1
+        cohpsk_ch mod_bits.raw stm_in.raw -20 --Fs 8000 -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
 	;;
@@ -94,7 +92,7 @@ case "${TEST_OPT}" in
     	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 \
-	    --raw_dir ${CODEC2_BASE}/raw >> setup.log 2>&1
+	    --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;
 	;;

stm32/unittest/src/tst_ofdm_demod.c

@@ -385,7 +385,7 @@ int main(int argc, char *argv[]) {
             fprintf(stderr, " euw: %2d %1d f: %5.1f eraw: %3d ecdd: %3d iter: %3d pcc: %3d\n",
                 ofdm->uw_errors, ofdm->sync_counter,
                 (double)ofdm->foff_est_hz,
-                Nerrs_raw, Nerrs_coded, iter, parityCheckCount);
+                Nerrs, Nerrs_coded, iter, parityCheckCount);
         }
 
         if (config_log_payload_syms) {