diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-12-03 22:55:21 -0500 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-12-03 22:55:21 -0500 |
| commit | 1e8588a330d7ea3a0632f2919b1de4811b22f800 (patch) | |
| tree | 5ea0b8ddb9e461f65eca87ce46cbda16dd590635 | |
| parent | 76906d9a6bab589abaa96e0dc115c45927f4570f (diff) | |
| parent | ef74b48c155bfcec2f560c9a4a23592814699eda (diff) | |
Merge branch 'master' into next
| -rw-r--r-- | gr-analog/lib/fmdet_cf_impl.cc | 10 | ||||
| -rw-r--r-- | gr-atsc/src/lib/qa_atsci_single_viterbi.cc | 2 | ||||
| -rw-r--r-- | gr-fcd/lib/fcd_source_c_impl.cc | 2 | ||||
| -rw-r--r-- | gr-pager/lib/pager_flex_parse.cc | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/gr-analog/lib/fmdet_cf_impl.cc b/gr-analog/lib/fmdet_cf_impl.cc index d3a58966b6..c92ea28896 100644 --- a/gr-analog/lib/fmdet_cf_impl.cc +++ b/gr-analog/lib/fmdet_cf_impl.cc @@ -49,11 +49,11 @@ namespace gr { d_S1(0.1), d_S2(0.1), d_S3(0.1), d_S4(0.1) { - const float h[] = { 0.003118678733, -0.012139843428, 0.027270898036, - -0.051318579352, 0.090406910552, -0.162926865366, - 0.361885392563, 0.000000000000, -0.361885392563, - 0.162926865366, -0.090406910552, 0.051318579352, - -0.027270898036, 0.012139843428, -0.003118678733}; + //const float h[] = { 0.003118678733, -0.012139843428, 0.027270898036, + // -0.051318579352, 0.090406910552, -0.162926865366, + // 0.361885392563, 0.000000000000, -0.361885392563, + // 0.162926865366, -0.090406910552, 0.051318579352, + // -0.027270898036, 0.012139843428, -0.003118678733}; //std::vector<float> taps(15); diff --git a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc index ca0cf74647..699dce9526 100644 --- a/gr-atsc/src/lib/qa_atsci_single_viterbi.cc +++ b/gr-atsc/src/lib/qa_atsci_single_viterbi.cc @@ -236,7 +236,7 @@ qa_atsci_single_viterbi::t1 () // FIXME, should we be able to tell how many errs too? if (differs) { - const int ERRTOL = 12; /* Or relate to delay? */ + //const int ERRTOL = 12; /* Or relate to delay? */ int shouldfix = 1; //int lasti = -ERRTOL; diff --git a/gr-fcd/lib/fcd_source_c_impl.cc b/gr-fcd/lib/fcd_source_c_impl.cc index 34a2218273..81ccee092d 100644 --- a/gr-fcd/lib/fcd_source_c_impl.cc +++ b/gr-fcd/lib/fcd_source_c_impl.cc @@ -176,7 +176,7 @@ void fcd_source_c_impl::set_lna_gain(float gain) // Set mixer gain void fcd_source_c_impl::set_mixer_gain(float gain) { - FCD_MODE_ENUM fme; + __GR_ATTR_UNUSED FCD_MODE_ENUM fme; unsigned char g; if ( gain > 4.0 ) { diff --git a/gr-pager/lib/pager_flex_parse.cc b/gr-pager/lib/pager_flex_parse.cc index 9418c44613..d7c308ddb6 100644 --- a/gr-pager/lib/pager_flex_parse.cc +++ b/gr-pager/lib/pager_flex_parse.cc @@ -156,16 +156,16 @@ void pager_flex_parse::parse_data() void pager_flex_parse::parse_alphanumeric(int mw1, int mw2, int j) { int frag; - bool cont; + //bool cont; if (!d_laddr) { frag = (d_datawords[mw1] >> 11) & 0x03; - cont = (d_datawords[mw1] >> 10) & 0x01; + //cont = (d_datawords[mw1] >> 10) & 0x01; mw1++; } else { frag = (d_datawords[j+1] >> 11) & 0x03; - cont = (d_datawords[j+1] >> 10) & 0x01; + //cont = (d_datawords[j+1] >> 10) & 0x01; mw2--; } |