diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-09 18:08:12 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-09 18:08:12 -0500 |
| commit | 0b1d665833530ff9120f55e132f95aa8013cefa2 (patch) | |
| tree | f3df6b8deccb7c1a1c8fd66be908cea6893d7b33 /gr-fcd/examples | |
| parent | 2553961b6e6a2543a81463b9a1ad2a44bf11bdf6 (diff) | |
analog: fixed a few build issues against gr-analog.
Diffstat (limited to 'gr-fcd/examples')
| -rw-r--r-- | gr-fcd/examples/c++/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-fcd/examples/c++/fcd_nfm_rx.cc | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/gr-fcd/examples/c++/CMakeLists.txt b/gr-fcd/examples/c++/CMakeLists.txt index adad7338cf..1bbeb5953e 100644 --- a/gr-fcd/examples/c++/CMakeLists.txt +++ b/gr-fcd/examples/c++/CMakeLists.txt @@ -21,9 +21,10 @@ include_directories(${GR_FCD_INCLUDE_DIRS}) include_directories(${GNURADIO_CORE_INCLUDE_DIRS}) include_directories(${GR_FILTER_INCLUDE_DIRS}) include_directories(${GR_AUDIO_INCLUDE_DIRS}) +include_directories(${GR_ANALOG_INCLUDE_DIRS}) add_executable(fcd_nfm_rx fcd_nfm_rx.cc) -target_link_libraries(fcd_nfm_rx gnuradio-fcd gnuradio-filter) +target_link_libraries(fcd_nfm_rx gnuradio-fcd gnuradio-filter gnuradio-analog) INSTALL(TARGETS fcd_nfm_rx diff --git a/gr-fcd/examples/c++/fcd_nfm_rx.cc b/gr-fcd/examples/c++/fcd_nfm_rx.cc index 5101121b0b..a0eee134d0 100644 --- a/gr-fcd/examples/c++/fcd_nfm_rx.cc +++ b/gr-fcd/examples/c++/fcd_nfm_rx.cc @@ -43,7 +43,7 @@ #include <iostream> #include <boost/program_options.hpp> - +using namespace gr; namespace po = boost::program_options; int main(int argc, char **argv) @@ -85,12 +85,13 @@ int main(int argc, char **argv) fcd->set_lna_gain(gain); // Low pass filter - std::vector<float> taps = gr::filter::firdes::low_pass(1.0, 96000, 5000.0, 1000.0); - gr::filter::fir_filter_ccf::sptr filter = gr::filter::fir_filter_ccf::make (2, taps); + std::vector<float> taps = filter::firdes::low_pass(1.0, 96000, 5000.0, 1000.0); + filter::fir_filter_ccf::sptr filter = filter::fir_filter_ccf::make (2, taps); // FM demodulator // gain = sample_rate / (2*pi*max_dev) - analog::quadrature_demod_cf::sptr demod = analog::quadrature_demod_cf::make(rate/(2.0*pi*5000.0)); + analog::quadrature_demod_cf::sptr demod = \ + analog::quadrature_demod_cf::make(rate/(2.0*pi*5000.0)); // Audio sink audio_sink::sptr sink = audio_make_sink(rate); |