[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next
From: |
git |
Subject: |
[Commit-gnuradio] [gnuradio] 01/01: Merge branch 'master' into next |
Date: |
Sat, 24 Sep 2016 17:48:10 +0000 (UTC) |
This is an automated email from the git hooks/post-receive script.
jcorgan pushed a commit to branch next
in repository gnuradio.
commit cb6386b2378ce269fb17970a800aafb38df86215
Merge: 43112fe 7217c6c
Author: Johnathan Corgan <address@hidden>
Date: Sat Sep 24 10:35:17 2016 -0700
Merge branch 'master' into next
Conflicts:
gr-fcd/lib/hid/hid-libusb.c
gr-fcd/lib/hid/hidapi.h
gr-fcd/lib/hid/hidmac.c
gr-fcd/lib/hid/hidwin.c
gr-uhd/lib/usrp_source_impl.cc | 19 +++++++++----------
gr-uhd/lib/usrp_source_impl.h | 3 ++-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --cc gr-uhd/lib/usrp_source_impl.cc
index ab1e84b,b48b151..0c624bf
--- a/gr-uhd/lib/usrp_source_impl.cc
+++ b/gr-uhd/lib/usrp_source_impl.cc
@@@ -66,10 -66,11 +66,11 @@@ namespace gr
usrp_source_impl::usrp_source_impl(const ::uhd::device_addr_t
&device_addr,
const ::uhd::stream_args_t
&stream_args,
const bool issue_stream_cmd_on_start):
- usrp_block("gr uhd usrp source",
- io_signature::make(0, 0, 0),
- args_to_io_sig(stream_args)),
+ usrp_block("usrp_source",
+ io_signature::make(0, 0, 0),
+ args_to_io_sig(stream_args)),
usrp_block_impl(device_addr, stream_args, ""),
+ _recv_timeout(0.1), // seconds
_tag_now(false),
_issue_stream_cmd_on_start(issue_stream_cmd_on_start)
{