diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2017-10-05 16:09:55 -0700 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2017-10-05 16:36:29 -0700 |
| commit | 3c63f7334d6de70d655aa97fcccbfb950645f4d4 (patch) | |
| tree | ac06cdb228d00e02fcab9a47852bfc57b5957d0c /gr-uhd/lib/usrp_source_impl.h | |
| parent | 8fe518ce740ae728f658c1854a7ffa074e800e9d (diff) | |
| parent | a0adcd3347c7ffd6ef3c42ce7705a23978774d3b (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/examples/CMakeLists.txt
gr-uhd/lib/usrp_source_impl.cc
gr-uhd/lib/usrp_source_impl.h
Diffstat (limited to 'gr-uhd/lib/usrp_source_impl.h')
| -rw-r--r-- | gr-uhd/lib/usrp_source_impl.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gr-uhd/lib/usrp_source_impl.h b/gr-uhd/lib/usrp_source_impl.h index 2e5c1d31de..6a592aa887 100644 --- a/gr-uhd/lib/usrp_source_impl.h +++ b/gr-uhd/lib/usrp_source_impl.h @@ -99,6 +99,7 @@ namespace gr { double set_lo_freq(double freq, const std::string &name, size_t chan); void issue_stream_cmd(const ::uhd::stream_cmd_t &cmd); + void set_recv_timeout(const double timeout, const bool one_packet); void flush(void); bool start(void); bool stop(void); @@ -112,12 +113,16 @@ namespace gr { private: //! Like set_center_freq(), but uses _curr_freq and _curr_lo_offset - ::uhd::tune_result_t _set_center_freq_from_internals(size_t chan); + ::uhd::tune_result_t _set_center_freq_from_internals(size_t chan, pmt::pmt_t direction); void _cmd_handler_tag(const pmt::pmt_t &tag); ::uhd::rx_streamer::sptr _rx_stream; size_t _samps_per_packet; + //! Timeout value for UHD's recv() call. Lower values mean lower latency. double _recv_timeout; + //! one_packet value for UHD's recv() call. 'true' is lower latency. + bool _recv_one_packet; + bool _tag_now; ::uhd::rx_metadata_t _metadata; pmt::pmt_t _id; |