diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-08 10:01:37 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-08 10:01:37 -0500 |
| commit | fe70fa72ea22a133874337da2d03d30611e5ab1c (patch) | |
| tree | 720a9e4e289e9a029fb363c635675daf91e5f77b /gr-atsc | |
| parent | 0970c7eaa165c6dc7d70be55dbf3d272b88fc109 (diff) | |
blocks: removed all nco/vco and fxpt stuff from core; now in gr-blocks.
Moved the nco/vco tests to gr-blocks/test and enabled them.
Diffstat (limited to 'gr-atsc')
| -rw-r--r-- | gr-atsc/src/lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gr-atsc/src/lib/atsc_fpll.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/gr-atsc/src/lib/CMakeLists.txt b/gr-atsc/src/lib/CMakeLists.txt index 1041fe52e6..30e78d709a 100644 --- a/gr-atsc/src/lib/CMakeLists.txt +++ b/gr-atsc/src/lib/CMakeLists.txt @@ -25,6 +25,7 @@ include_directories( ${GR_FILTER_INCLUDE_DIRS} ${GR_ANALOG_INCLUDE_DIRS} ${GR_FEC_INCLUDE_DIRS} + ${GR_BLOCKS_INCLUDE_DIRS} ${GNURADIO_CORE_INCLUDE_DIRS} ${GRUEL_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} @@ -119,6 +120,7 @@ list(APPEND atsc_libs gnuradio-analog gnuradio-core gnuradio-fec + gnuradio-blocks ${Boost_LIBRARIES} ${LOG4CXX_LIBRARIES} ) diff --git a/gr-atsc/src/lib/atsc_fpll.h b/gr-atsc/src/lib/atsc_fpll.h index 13099b045d..28912df37d 100644 --- a/gr-atsc/src/lib/atsc_fpll.h +++ b/gr-atsc/src/lib/atsc_fpll.h @@ -24,7 +24,7 @@ #include <atsc_api.h> #include <gr_sync_block.h> -#include <gr_nco.h> +#include <blocks/nco.h> #include <filter/single_pole_iir.h> #include <analog/agc.h> #include <stdio.h> @@ -69,7 +69,7 @@ public: double initial_freq; double initial_phase; bool debug_no_update; - gr_nco<float,float> nco; + blocks::nco<float,float> nco; analog::kernel::agc_ff agc; // automatic gain control filter::single_pole_iir<float,float,float> afci; filter::single_pole_iir<float,float,float> afcq; |