diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 17:38:06 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-03-18 17:38:06 -0400 |
| commit | 04682315bf151fb2c7c24673676cd8e07ab5fe2e (patch) | |
| tree | bfa4a5157719b134adc5f6f3783f790220ae2f6b /gnuradio-core | |
| parent | 78527080d5cfcc611646d4694ecb9a026b343652 (diff) | |
| parent | 3206f12930a131914ca2c0d15969c54d8dee5775 (diff) | |
Merge branch 'next' of gnuradio.org:gnuradio into next
Conflicts:
gr-digital/examples/ofdm/ofdm_bugsquatch.py
gr-digital/include/digital/scale_tags.h
gr-digital/include/digital/tagged_stream_check.h
gr-digital/include/digital/ts_insert_zeros_cc.h
gr-digital/python/qa_ofdm_sync_sc_cfb.py
gr-digital/python/qa_scale_tags.py
gr-digital/python/qa_ts_insert_zeros.py
gr-digital/swig/digital_swig.i
Diffstat (limited to 'gnuradio-core')
| -rw-r--r-- | gnuradio-core/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/gr_logger.h | 2 | ||||
| -rw-r--r-- | gnuradio-core/src/lib/runtime/pycallback_object.h | 17 |
3 files changed, 17 insertions, 4 deletions
diff --git a/gnuradio-core/CMakeLists.txt b/gnuradio-core/CMakeLists.txt index 154a078826..3dcffa2184 100644 --- a/gnuradio-core/CMakeLists.txt +++ b/gnuradio-core/CMakeLists.txt @@ -55,6 +55,7 @@ GR_SET_GLOBAL(GNURADIO_CORE_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/src/lib/swig ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/hier + ${CMAKE_BINARY_DIR} ) list(APPEND GNURADIO_CORE_INCLUDE_DIRS ${CMAKE_BINARY_DIR}) @@ -64,6 +65,7 @@ GR_SET_GLOBAL(GNURADIO_CORE_SWIG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/swig ${CMAKE_SOURCE_DIR}/gruel/src/swig ${CMAKE_BINARY_DIR}/gruel/src/swig + ${CMAKE_BINARY_DIR} ) ######################################################################## diff --git a/gnuradio-core/src/lib/runtime/gr_logger.h b/gnuradio-core/src/lib/runtime/gr_logger.h index 13f31d60b8..2ccd498822 100644 --- a/gnuradio-core/src/lib/runtime/gr_logger.h +++ b/gnuradio-core/src/lib/runtime/gr_logger.h @@ -530,7 +530,7 @@ typedef void* gr_logger_ptr; #define GR_GET_LEVEL(name, level) #define GR_LOG_GET_LEVEL(logger, level) #define GR_ADD_CONSOLE_APPENDER(logger,target,pattern) -#define GR_LOG_ADD_CONSOLE_APPENDER(logger,,target,pattern) +#define GR_LOG_ADD_CONSOLE_APPENDER(logger,target,pattern) #define GR_ADD_FILE_APPENDER(name,filename,append,pattern) #define GR_LOG_ADD_FILE_APPENDER(logger,filename,append,pattern) #define GR_ADD_ROLLINGFILE_APPENDER(name,filename,filesize,bkup_index,append,mode,pattern) diff --git a/gnuradio-core/src/lib/runtime/pycallback_object.h b/gnuradio-core/src/lib/runtime/pycallback_object.h index f6247c0c6d..f2cd085641 100644 --- a/gnuradio-core/src/lib/runtime/pycallback_object.h +++ b/gnuradio-core/src/lib/runtime/pycallback_object.h @@ -25,6 +25,7 @@ #include <ice_application_base.h> #include <IcePy_Communicator.h> #include <pythread.h> +#include <boost/format.hpp> enum pyport_t { PYPORT_STRING, @@ -78,11 +79,17 @@ public: DisplayType dtype) : d_callback(NULL), d_functionbase(functionbase), d_units(units), d_desc(desc), - d_min(min), d_max(max), d_deflt(deflt), d_dtype(dtype) + d_min(min), d_max(max), d_deflt(deflt), d_dtype(dtype), + d_name(name), d_id(pycallback_object_count++) { d_callback = NULL; } - + + void add_rpc_variable(rpcbasic_sptr s) + { + d_rpc_vars.push_back(s); + } + myType get() { myType rVal; if(d_callback == NULL) { @@ -123,7 +130,7 @@ public: #ifdef GR_CTRLPORT add_rpc_variable( rpcbasic_sptr(new rpcbasic_register_get<pycallback_object, myType>( - alias(), d_functionbase.c_str(), + (boost::format("%s%d") % d_name % d_id).str() , d_functionbase.c_str(), &pycallback_object::get, pmt_assist<myType>::make(d_min), pmt_assist<myType>::make(d_max), pmt_assist<myType>::make(d_deflt), d_units.c_str(), d_desc.c_str(), RPC_PRIVLVL_MIN, d_dtype))); @@ -140,6 +147,10 @@ private: printf("TYPE NOT IMPLEMENTED!\n"); assert(0); }; + std::vector<boost::any> d_rpc_vars; // container for all RPC variables + std::string d_name; + int d_id; + }; |