diff options
| author | Tom Rondeau | 2013-02-12 19:09:36 -0500 |
|---|---|---|
| committer | Tom Rondeau | 2013-02-12 19:09:36 -0500 |
| commit | 5e98721cb56d10d38ea65aa405399e2f9c4e6056 (patch) | |
| tree | 8544eef0286dea201d9e34b8a6f0e7e95dcefba4 /gr-analog | |
| parent | 37f297f892b9f1248915e119119a6ba3237f571f (diff) | |
| parent | 600c04a799627b882e8760f131a189bbad616540 (diff) | |
| download | gnuradio-5e98721cb56d10d38ea65aa405399e2f9c4e6056.tar.gz gnuradio-5e98721cb56d10d38ea65aa405399e2f9c4e6056.tar.bz2 gnuradio-5e98721cb56d10d38ea65aa405399e2f9c4e6056.zip | |
Merge branch 'maint'
Diffstat (limited to 'gr-analog')
| -rw-r--r-- | gr-analog/include/analog/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | gr-analog/lib/ctcss_squelch_ff_impl.cc | 7 | ||||
| -rw-r--r-- | gr-analog/swig/CMakeLists.txt | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/gr-analog/include/analog/CMakeLists.txt b/gr-analog/include/analog/CMakeLists.txt index 4de94a88b..b113dacc4 100644 --- a/gr-analog/include/analog/CMakeLists.txt +++ b/gr-analog/include/analog/CMakeLists.txt @@ -75,11 +75,12 @@ add_custom_target(analog_generated_includes DEPENDS # Install header files ######################################################################## install(FILES - ${analog_generated_includes} + ${generated_includes} api.h cpm.h agc.h agc2.h + noise_type.h squelch_base_ff.h agc_cc.h agc_ff.h diff --git a/gr-analog/lib/ctcss_squelch_ff_impl.cc b/gr-analog/lib/ctcss_squelch_ff_impl.cc index db49b4f6e..60cd94fdb 100644 --- a/gr-analog/lib/ctcss_squelch_ff_impl.cc +++ b/gr-analog/lib/ctcss_squelch_ff_impl.cc @@ -115,11 +115,12 @@ namespace gr { d_goertzel_c.input(in); d_goertzel_r.input(in); + float rounder = 100000; float d_out_l, d_out_c, d_out_r; if(d_goertzel_c.ready()) { - d_out_l = abs(d_goertzel_l.output()); - d_out_c = abs(d_goertzel_c.output()); - d_out_r = abs(d_goertzel_r.output()); + d_out_l = floor(rounder*abs(d_goertzel_l.output()))/rounder; + d_out_c = floor(rounder*abs(d_goertzel_c.output()))/rounder; + d_out_r = floor(rounder*abs(d_goertzel_r.output()))/rounder; //printf("d_out_l=%f d_out_c=%f d_out_r=%f\n", d_out_l, d_out_c, d_out_r); d_mute = (d_out_c < d_level || d_out_c < d_out_l || d_out_c < d_out_r); diff --git a/gr-analog/swig/CMakeLists.txt b/gr-analog/swig/CMakeLists.txt index 9ed82e267..4391e5e09 100644 --- a/gr-analog/swig/CMakeLists.txt +++ b/gr-analog/swig/CMakeLists.txt @@ -33,7 +33,7 @@ set(GR_SWIG_INCLUDE_DIRS set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/analog_swig_doc.i) set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib) - +set(GR_SWIG_TARGET_DEPS analog_generated_includes) set(GR_SWIG_LIBRARIES gnuradio-analog gnuradio-filter) GR_SWIG_MAKE(analog_swig analog_swig.i) |