[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: |
Fri, 16 May 2014 19:37:18 +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 027eae4192271f82b61291b9aff28696c0d132cd
Merge: 9806694 5974a3e
Author: Johnathan Corgan <address@hidden>
Date: Fri May 16 12:34:16 2014 -0700
Merge branch 'master' into next
CMakeLists.txt | 1 +
cmake/Modules/FindZeroMQ.cmake | 26 ++
gnuradio-runtime/python/gnuradio/__init__.py | 1 +
gr-zeromq/CMakeLists.txt | 111 ++++++
gr-zeromq/docs/CMakeLists.txt | 23 ++
gr-zeromq/docs/README.zeromq | 12 +
gr-zeromq/examples/CMakeLists.txt | 29 ++
gr-zeromq/examples/python/README | 71 ++++
gr-zeromq/examples/python/client.py | 117 ++++++
gr-zeromq/examples/python/fixui4py.sh | 2 +
gr-zeromq/examples/python/gui.py | 164 ++++++++
gr-zeromq/examples/python/main_window.ui | 199 ++++++++++
gr-zeromq/examples/python/run_app.sh | 4 +
gr-zeromq/examples/python/server.py | 126 ++++++
gr-zeromq/examples/zeromq_pubsub.grc | 477 +++++++++++++++++++++++
gr-zeromq/examples/zeromq_pushpull.grc | 477 +++++++++++++++++++++++
gr-zeromq/examples/zeromq_reqrep.grc | 477 +++++++++++++++++++++++
gr-zeromq/gnuradio-zeromq.pc.in | 11 +
gr-zeromq/grc/CMakeLists.txt | 31 ++
gr-zeromq/grc/zeromq_pub_sink.xml | 66 ++++
gr-zeromq/grc/zeromq_pull_source.xml | 66 ++++
gr-zeromq/grc/zeromq_push_sink.xml | 66 ++++
gr-zeromq/grc/zeromq_rep_sink.xml | 66 ++++
gr-zeromq/grc/zeromq_req_source.xml | 66 ++++
gr-zeromq/grc/zeromq_sub_source.xml | 66 ++++
gr-zeromq/include/gnuradio/zeromq/CMakeLists.txt | 34 ++
gr-zeromq/include/gnuradio/zeromq/api.h | 33 ++
gr-zeromq/include/gnuradio/zeromq/pub_sink.h | 62 +++
gr-zeromq/include/gnuradio/zeromq/pull_source.h | 60 +++
gr-zeromq/include/gnuradio/zeromq/push_sink.h | 64 +++
gr-zeromq/include/gnuradio/zeromq/rep_sink.h | 62 +++
gr-zeromq/include/gnuradio/zeromq/req_source.h | 61 +++
gr-zeromq/include/gnuradio/zeromq/sub_source.h | 60 +++
gr-zeromq/lib/CMakeLists.txt | 71 ++++
gr-zeromq/lib/gnuradio-zeromq.rc.in | 55 +++
gr-zeromq/lib/pub_sink_impl.cc | 81 ++++
gr-zeromq/lib/pub_sink_impl.h | 53 +++
gr-zeromq/lib/pull_source_impl.cc | 102 +++++
gr-zeromq/lib/pull_source_impl.h | 53 +++
gr-zeromq/lib/push_sink_impl.cc | 90 +++++
gr-zeromq/lib/push_sink_impl.h | 53 +++
gr-zeromq/lib/rep_sink_impl.cc | 102 +++++
gr-zeromq/lib/rep_sink_impl.h | 53 +++
gr-zeromq/lib/req_source_impl.cc | 101 +++++
gr-zeromq/lib/req_source_impl.h | 53 +++
gr-zeromq/lib/sub_source_impl.cc | 102 +++++
gr-zeromq/lib/sub_source_impl.h | 54 +++
gr-zeromq/python/zeromq/CMakeLists.txt | 56 +++
gr-zeromq/python/zeromq/__init__.py | 36 ++
gr-zeromq/python/zeromq/probe_manager.py | 50 +++
gr-zeromq/python/zeromq/qa_zeromq_pub.py | 54 +++
gr-zeromq/python/zeromq/qa_zeromq_pushpull.py | 50 +++
gr-zeromq/python/zeromq/qa_zeromq_reqrep.py | 53 +++
gr-zeromq/python/zeromq/rpc_manager.py | 101 +++++
gr-zeromq/swig/CMakeLists.txt | 57 +++
gr-zeromq/swig/zeromq_swig.i | 51 +++
56 files changed, 4722 insertions(+)