diff options
| author | n4hy | 2009-07-20 18:47:24 +0000 |
|---|---|---|
| committer | n4hy | 2009-07-20 18:47:24 +0000 |
| commit | 2ce8c910b9e315539ec45a8b4f4d92e0d329523a (patch) | |
| tree | 4a3e8adb8e7416c3fd33bfdc2c9a3c04467120d7 /gnuradio-core/src | |
| parent | c3f8495917cf178d8085d4b4af3c52c60e51ba95 (diff) | |
| download | gnuradio-2ce8c910b9e315539ec45a8b4f4d92e0d329523a.tar.gz gnuradio-2ce8c910b9e315539ec45a8b4f4d92e0d329523a.tar.bz2 gnuradio-2ce8c910b9e315539ec45a8b4f4d92e0d329523a.zip | |
last changes here to gr_fmdet until pfb trondeau pfb branch is folded in
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11464 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gnuradio-core/src')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_fmdet_cf.cc | 3 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_fmdet_cf.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gnuradio-core/src/lib/general/gr_fmdet_cf.cc b/gnuradio-core/src/lib/general/gr_fmdet_cf.cc index 9a8a6a48a..e2c7e7a7f 100644 --- a/gnuradio-core/src/lib/general/gr_fmdet_cf.cc +++ b/gnuradio-core/src/lib/general/gr_fmdet_cf.cc @@ -62,6 +62,7 @@ gr_fmdet_cf::gr_fmdet_cf (float samplerate, float freq_low, float freq_high, flo d_scl = scl; d_bias = 0.5*scl*(d_freqhi+d_freqlo)/delta; for (int i=0;i<15;i++) taps[i] = h[i]; + // d_filter = gr_fir_util::create_gr_fir_ccf(taps); } @@ -72,7 +73,7 @@ gr_fmdet_cf::work (int noutput_items, { const gr_complex *iptr = (gr_complex *) input_items[0]; float *optr = (float *) output_items[0]; - const gr_complex *scaleiptr = (gr_complex *) input_items[0]; + // const gr_complex *scaleiptr = (gr_complex *) input_items[0]; int size = noutput_items; diff --git a/gnuradio-core/src/lib/general/gr_fmdet_cf.h b/gnuradio-core/src/lib/general/gr_fmdet_cf.h index 7e8be31b1..792646bef 100644 --- a/gnuradio-core/src/lib/general/gr_fmdet_cf.h +++ b/gnuradio-core/src/lib/general/gr_fmdet_cf.h @@ -30,6 +30,9 @@ typedef boost::shared_ptr<gr_fmdet_cf> gr_fmdet_cf_sptr; gr_fmdet_cf_sptr gr_make_fmdet_cf (float samplerate, float freq_low, float freq_high, float scl); +class gr_fir_ccf; + + /*! * \brief Implements an IQ slope detector * @@ -47,6 +50,7 @@ class gr_fmdet_cf : public gr_sync_block gr_complex d_S1,d_S2,d_S3,d_S4; float d_freq,d_freqlo,d_freqhi,d_scl,d_bias; + gr_fir_ccf* d_filter; gr_fmdet_cf (float samplerate, float freq_low, float freq_high, float scl); int work (int noutput_items, |