[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, 17 Oct 2015 17:26:55 +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 1ae4db2cd676a027cc146015851ab57810ba84c0
Merge: de3f86e 83da789
Author: Johnathan Corgan <address@hidden>
Date: Sat Oct 17 10:19:36 2015 -0700
Merge branch 'master' into next
.../include/gnuradio/rpccallbackregister_base.h | 3 +
.../include/gnuradio/rpcregisterhelpers.h | 120 +-
.../include/gnuradio/rpcserver_aggregator.h | 29 +
gnuradio-runtime/include/gnuradio/rpcserver_base.h | 5 +
.../include/gnuradio/rpcserver_thrift.h | 71 +-
.../include/gnuradio/thrift_server_template.h | 1 -
.../lib/controlport/rpcserver_aggregator.cc | 19 +
.../lib/controlport/thrift/gnuradio.thrift | 1 +
.../lib/controlport/thrift/rpcserver_thrift.cc | 74 +
.../python/gnuradio/ctrlport/RPCConnection.py | 3 +
.../gnuradio/ctrlport/RPCConnectionThrift.py | 17 +
gr-blocks/examples/ctrlport/CMakeLists.txt | 16 +-
gr-blocks/examples/ctrlport/simple_copy.grc | 772 ++++++++
.../examples/ctrlport/simple_copy_controller.py | 25 +
.../examples/ctrlport/usrp_source_control.grc | 1837 ++++++++++++++++++++
.../examples/ctrlport/usrp_source_controller.py | 29 +
gr-blocks/include/gnuradio/blocks/CMakeLists.txt | 6 +-
.../blocks/{add_const_XX.h.t => add_const_bb.h} | 24 +-
.../blocks/{add_const_XX.h.t => add_const_cc.h} | 24 +-
.../blocks/{add_const_XX.h.t => add_const_ff.h} | 24 +-
.../blocks/{add_const_XX.h.t => add_const_ii.h} | 24 +-
.../blocks/{add_const_XX.h.t => add_const_ss.h} | 24 +-
gr-blocks/lib/CMakeLists.txt | 6 +-
gr-blocks/lib/add_const_XX_impl.cc.t | 77 -
gr-blocks/lib/add_const_bb_impl.cc | 107 ++
.../{add_const_XX_impl.h.t => add_const_bb_impl.h} | 26 +-
gr-blocks/lib/add_const_cc_impl.cc | 103 ++
.../{add_const_XX_impl.h.t => add_const_cc_impl.h} | 25 +-
gr-blocks/lib/add_const_ff_impl.cc | 103 ++
...ultiply_const_ff_impl.h => add_const_ff_impl.h} | 20 +-
gr-blocks/lib/add_const_ii_impl.cc | 103 ++
.../{add_const_XX_impl.h.t => add_const_ii_impl.h} | 25 +-
gr-blocks/lib/add_const_ss_impl.cc | 107 ++
.../{add_const_XX_impl.h.t => add_const_ss_impl.h} | 26 +-
gr-blocks/lib/copy_impl.cc | 13 +
gr-blocks/lib/copy_impl.h | 2 +
gr-blocks/lib/multiply_const_cc_impl.cc | 10 +-
gr-blocks/lib/multiply_const_ff_impl.cc | 24 +-
gr-blocks/lib/multiply_const_ff_impl.h | 2 +
gr-blocks/lib/multiply_const_vcc_impl.cc | 30 +-
gr-blocks/lib/multiply_const_vcc_impl.h | 2 +
gr-blocks/lib/multiply_const_vff_impl.cc | 26 +-
gr-blocks/lib/multiply_const_vff_impl.h | 2 +
.../lib/freq_xlating_fir_filter_XXX_impl.cc.t | 8 +-
gr-uhd/apps/uhd_rx_nogui | 3 +-
gr-uhd/lib/CMakeLists.txt | 10 -
gr-uhd/lib/usrp_source_impl.cc | 12 +
gr-uhd/lib/usrp_source_impl.h | 2 +
grc/gui/DrawingArea.py | 8 +
grc/python/Generator.py | 3 +-
grc/python/flow_graph.tmpl | 1 +
51 files changed, 3799 insertions(+), 235 deletions(-)