diff options
| author | eb | 2006-09-27 05:14:03 +0000 |
|---|---|---|
| committer | eb | 2006-09-27 05:14:03 +0000 |
| commit | f1c41f807cb29472d0924149e39d6ec8ad90e6a2 (patch) | |
| tree | 47e42f8cdfc83aaa3b706e06862c3efa4ba16745 /gr-atsc/src/lib | |
| parent | 04bb51ec4f1539c51c861b7fcad2ca8047a872a3 (diff) | |
| download | gnuradio-f1c41f807cb29472d0924149e39d6ec8ad90e6a2.tar.gz gnuradio-f1c41f807cb29472d0924149e39d6ec8ad90e6a2.tar.bz2 gnuradio-f1c41f807cb29472d0924149e39d6ec8ad90e6a2.zip | |
Merged changes from eb/digital-wip into trunk.
This includes:
* renaming gnuradio-examples/python/gmsk2 to gnuradio-examples/python/digital
* refactoring the digital data tx and rx test code into benchmark_tx
and benchmark_rx. These accept a -m <modulation> argument.
<modulation> can currently be selected from gmsk, dbpsk, dqpsk
* Two new AGC blocks: gr_agc2: separate attack and delay rates;
gr_feedforward_agc: FIR-ish compressor. Normalizes to peak envelope.
* Working DBPSK mod/demod (works fine)
* Working DQPSK mod/demod (works, but still needs more work)
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@3662 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'gr-atsc/src/lib')
| -rw-r--r-- | gr-atsc/src/lib/atsc_fpll.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gr-atsc/src/lib/atsc_fpll.h b/gr-atsc/src/lib/atsc_fpll.h index ae00c051f..f62b78b40 100644 --- a/gr-atsc/src/lib/atsc_fpll.h +++ b/gr-atsc/src/lib/atsc_fpll.h @@ -25,7 +25,7 @@ #include <gr_sync_block.h> #include <gr_nco.h> #include <gr_single_pole_iir.h> -#include <gri_agc.h> +#include <gri_agc_ff.h> #include <stdio.h> #include <atsci_diag_output.h> @@ -67,7 +67,7 @@ public: double initial_phase; bool debug_no_update; gr_nco<float,float> nco; - gri_agc agc; // automatic gain control + gri_agc_ff agc; // automatic gain control gr_single_pole_iir<float,float,float> afci; gr_single_pole_iir<float,float,float> afcq; |