tweaks to display of C demod variables

git-svn-id: https://svn.code.sf.net/p/freetel/code@389 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/codec2-dev/octave/README_fdmdv.txt b/codec2-dev/octave/README_fdmdv.txt
index 2f874672079eaf4825cd23a369b9ced2e8c6b9cd..e9e45202df40cac5d4ac4271601bc48446b7cc0a 100644 (file)
--- a/codec2-dev/octave/README_fdmdv.txt
+++ b/codec2-dev/octave/README_fdmdv.txt
@@ -52,6 +52,10 @@ TODO
     Count errors in two seconds of test frame data:
        $ ./fdmdv_get_test_bits - 2800 | ./fdmdv_put_test_bits -
 
+    Ten sconds of modem simulation with testframes;
+
+       $  ./fdmdv_get_test_bits - 14000 | ./fdmdv_mod - - | ./fdmdv_demod - - demod_dump.txt | ./fdmdv_put_test_bits -
+
 [ ] PAPR idea
     + automatically weak phases to reduce PAPR, e.g. slow variations in freq...
 

diff --git a/codec2-dev/octave/fdmdv_demod_c.m b/codec2-dev/octave/fdmdv_demod_c.m
index 05f1fc17133cd197aeb0a7fb7bc678020a8b379d..09b7e82f208af9a07685eff6f74b84db6481d18c 100644 (file)
--- a/codec2-dev/octave/fdmdv_demod_c.m
+++ b/codec2-dev/octave/fdmdv_demod_c.m
@@ -25,7 +25,7 @@ function fdmdv_demod_c(dumpfilename, bits)
 
   figure(1)
   clf;
-  plot(real(rx_symbols_log_c(1:Nc+1,30:frames)),imag(rx_symbols_log_c(1:Nc+1,30:frames)),'+')
+  plot(real(rx_symbols_log_c(1:Nc+1,15:frames)),imag(rx_symbols_log_c(1:Nc+1,15:frames)),'+')
   axis([-2 2 -2 2]);
   title('Scatter Diagram');
 

diff --git a/codec2-dev/src/fdmdv.c b/codec2-dev/src/fdmdv.c
index 8c30a02d7ddea2214549144f5ba1bbbd02d8eb35..096dbd8c1f08c69d01cae23746f8bf2afe34edc5 100644 (file)
--- a/codec2-dev/src/fdmdv.c
+++ b/codec2-dev/src/fdmdv.c
@@ -1131,12 +1131,8 @@ void fdmdv_demod(struct FDMDV *fdmdv, int rx_bits[], int *sync_bit, float rx_fdm
 
 void fdmdv_get_demod_stats(struct FDMDV *fdmdv, struct FDMDV_STATS *fdmdv_stats)
 {
-    COMP  pi_on_4;
     int   c;
 
-    pi_on_4.real = cos(PI/4.0);
-    pi_on_4.imag = sin(PI/4.0);
-
     fdmdv_stats->snr = 0.0; /* TODO - implement SNR estimation */
     fdmdv_stats->fest_coarse_fine = fdmdv->coarse_fine;
     fdmdv_stats->foff = fdmdv->foff;