diff options
| author | Tom Rondeau <tom@trondeau.com> | 2015-05-06 17:28:08 -0400 |
|---|---|---|
| committer | Tom Rondeau <tom@trondeau.com> | 2015-05-06 17:28:08 -0400 |
| commit | f6e23b145f6a9dd529feb1cac33e6562fd7c0dc7 (patch) | |
| tree | 33750dd8a1c493d47810fe4781a22a471643aa46 /gr-uhd/lib/usrp_source_impl.cc | |
| parent | 7ef4258ceaf5fa9fa242138c0abc9572a72c3d6f (diff) | |
| parent | a693941515339f77dde55e356381e7039eb7c02c (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'gr-uhd/lib/usrp_source_impl.cc')
| -rw-r--r-- | gr-uhd/lib/usrp_source_impl.cc | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/gr-uhd/lib/usrp_source_impl.cc b/gr-uhd/lib/usrp_source_impl.cc index dfb38f6eb8..de91c3a828 100644 --- a/gr-uhd/lib/usrp_source_impl.cc +++ b/gr-uhd/lib/usrp_source_impl.cc @@ -71,6 +71,12 @@ namespace gr { std::stringstream str; str << name() << unique_id(); _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; +#endif } usrp_source_impl::~usrp_source_impl() @@ -139,19 +145,7 @@ namespace gr { return res; } - ::uhd::tune_result_t - usrp_source_impl::_set_center_freq_from_internals(size_t chan) - { - _chans_to_tune[chan] = false; - if (_curr_lo_offset[chan] == 0.0) { - return _dev->set_rx_freq(_curr_freq[chan], _stream_args.channels[chan]); - } else { - return _dev->set_rx_freq( - ::uhd::tune_request_t(_curr_freq[chan], _curr_lo_offset[chan]), - _stream_args.channels[chan] - ); - } - } + SET_CENTER_FREQ_FROM_INTERNALS(usrp_source_impl, set_rx_freq); double usrp_source_impl::get_center_freq(size_t chan) |