Remove gain function call from ofdm.c

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

diff --git a/codec2-dev/src/codec2_ofdm.h b/codec2-dev/src/codec2_ofdm.h
index eeb26e0e3d24e8e5ee3c157bab725327bd44ac0d..9abd1a3a8e86b712de9f6b1b83d37d86fe291fc6 100644 (file)
--- a/codec2-dev/src/codec2_ofdm.h
+++ b/codec2-dev/src/codec2_ofdm.h
@@ -59,7 +59,6 @@ void ofdm_set_verbose(struct OFDM *, int);
 void ofdm_set_timing_enable(struct OFDM *, bool);
 void ofdm_set_foff_est_enable(struct OFDM *, bool);
 void ofdm_set_phase_est_enable(struct OFDM *, bool);
-void ofdm_set_foff_est_gain(struct OFDM *, float);
 void ofdm_set_off_est_hz(struct OFDM *, float);
 
 #ifdef __cplusplus

diff --git a/codec2-dev/src/ofdm.c b/codec2-dev/src/ofdm.c
index 23a36eb1df11d8ea731b29f5e416d54b0445461e..4637ef039d13304b7f02ecdae1e345ba7694aab7 100644 (file)
--- a/codec2-dev/src/ofdm.c
+++ b/codec2-dev/src/ofdm.c
@@ -315,9 +315,9 @@ struct OFDM *ofdm_create() {
     /* default settings of options and states */
 
     ofdm->verbose = 0;
-    ofdm->timing_en = false;
-    ofdm->foff_est_en = false;
-    ofdm->phase_est_en = false;
+    ofdm->timing_en = true;
+    ofdm->foff_est_en = true;
+    ofdm->phase_est_en = true;
 
     ofdm->foff_est_gain = 0.01f;
     ofdm->foff_est_hz = 0.0f;
@@ -382,10 +382,6 @@ void ofdm_set_phase_est_enable(struct OFDM *ofdm, bool val) {
     ofdm->phase_est_en = val;
 }
 
-void ofdm_set_foff_est_gain(struct OFDM *ofdm, float val) {
-    ofdm->foff_est_gain = val;
-}
-
 void ofdm_set_off_est_hz(struct OFDM *ofdm, float val) {
     ofdm->foff_est_hz = val;
 }
@@ -448,8 +444,6 @@ void ofdm_mod(struct OFDM *ofdm, COMP result[OFDM_SAMPLESPERFRAME], const int *t
  *         ^
  */
 
-// UNTESTED
-
 void ofdm_demod(struct OFDM *ofdm, int *rx_bits, COMP *rxbuf_in) {
     complex float aphase_est_pilot_rect;
     float aphase_est_pilot[OFDM_NC + 2];