diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-05 18:56:18 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-03-05 18:56:18 -0800 |
| commit | 3c8c1ab15467a07e90725fd204338ed88e52624a (patch) | |
| tree | 35fa3820c9904a5f78b87882b0d8837155ba2b50 /gr-uhd/lib | |
| parent | 41e3327bbe3418ff8e3c880710e3bc033572edb6 (diff) | |
| parent | d2ca98006962d8b0f38d94be8641d17fa93718dd (diff) | |
Merge branch 'master' into next
Conflicts:
gr-uhd/lib/usrp_source_impl.cc
Diffstat (limited to 'gr-uhd/lib')
| -rw-r--r-- | gr-uhd/lib/usrp_source_impl.cc | 6 | ||||
| -rw-r--r-- | gr-uhd/lib/usrp_source_impl.h | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc index 8cdaebc4ca..2a16b37c06 100644 --- a/gr-uhd/lib/usrp_source_impl.cc +++ b/gr-uhd/lib/usrp_source_impl.cc @@ -59,7 +59,7 @@ namespace gr { _id = pmt::string_to_symbol(str.str()); _samp_rate = this->get_samp_rate(); - _center_freq = this->get_center_freq(0); +#ifdef GR_UHD_USE_STREAM_API _samps_per_packet = 1; register_msg_cmd_handler(CMD_TAG_KEY, boost::bind(&usrp_source_impl::_cmd_handler_tag, this, _1)); } @@ -114,10 +114,8 @@ namespace gr { usrp_source_impl::set_center_freq(const ::uhd::tune_request_t tune_request, size_t chan) { - const size_t user_chan = chan; chan = _stream_args.channels[chan]; const ::uhd::tune_result_t res = _dev->set_rx_freq(tune_request, chan); - _center_freq = this->get_center_freq(user_chan); _tag_now = true; return res; } @@ -589,7 +587,7 @@ namespace gr { this->add_item_tag(i, nitems_written(0), RATE_KEY, pmt::from_double(_samp_rate), _id); this->add_item_tag(i, nitems_written(0), FREQ_KEY, - pmt::from_double(_center_freq), _id); + pmt::from_double(this->get_center_freq(i)), _id); } } break; diff --git a/gr-uhd/lib/usrp_source_impl.h b/gr-uhd/lib/usrp_source_impl.h index c1566e18d0..2e5c1d31de 100644 --- a/gr-uhd/lib/usrp_source_impl.h +++ b/gr-uhd/lib/usrp_source_impl.h @@ -125,7 +125,6 @@ namespace gr { //tag shadows double _samp_rate; - double _center_freq; boost::recursive_mutex d_mutex; }; |