diff --git a/grc/gen_bladerf_blocks.py b/grc/gen_bladerf_blocks.py index ee1ffffe632d6d55277f9d0fc20303f3f3c65232..db317c8b88203fb65007ff9a48d6b915b5328db8 100644 --- a/grc/gen_bladerf_blocks.py +++ b/grc/gen_bladerf_blocks.py @@ -158,7 +158,7 @@ templates: imports: |- import bladeRF import time - make: | + make: | bladeRF.${sourk}( args="numchan=" + str(${'$'}{nchan}) + ",type=" + '${'$'}{type}' @@ -172,6 +172,13 @@ templates: + ",out_clk=" + str(${'$'}{out_clk}) + ",dac=" + str(${'$'}{dac}) + ",xb200=" + '${'$'}{xb200}' + + ",trigger0="+'${'$'}{trigger0}' + + ",trigger_role0="+'${'$'}{trigger_role0}' + + ",trigger_signal0="+'${'$'}{trigger_signal0}' + + ",trigger1="+'${'$'}{trigger1}' + + ",trigger_role1="+'${'$'}{trigger_role1}' + + ",trigger_signal1="+'${'$'}{trigger_signal1}' + ) self.${'$'}{id}.set_sample_rate(${'$'}{sample_rate}) % for n in range(max_nchan): @@ -382,7 +389,7 @@ PARAMS_TMPL = """ hide: ${'$'}{ 'part' if (nchan > ${n}) else 'all'} - id: trigger_signal${n} - label: Trigger role + label: Trigger signal category: 'Channel ${n}' dtype: enum default: 'J51_1' diff --git a/include/bladeRF/sink.h b/include/bladeRF/sink.h index 9c3f2c486531c256865e978e0c0149b1c3ad4217..e3b5e9957307e87b2faf5000c0cb2a4fa7638fa9 100644 --- a/include/bladeRF/sink.h +++ b/include/bladeRF/sink.h @@ -3,9 +3,9 @@ #define INCLUDED_BLADERF_SINK_H #include <bladeRF/api.h> -#include <gnuradio/hier_block2.h> #include "ranges.h" #include "time_spec.h" +#include "common_hier_block.h" namespace gr { namespace bladeRF { @@ -15,7 +15,7 @@ namespace gr { * \ingroup bladeRF * */ - class BLADERF_API sink : virtual public gr::hier_block2 + class BLADERF_API sink : virtual public common_hier_block { public: typedef std::shared_ptr<sink> sptr; diff --git a/include/bladeRF/source.h b/include/bladeRF/source.h index fff492921f63666a8a4314b39581eb536b99f31b..3743c58d1e699b2cfdb7056a7f28102316e096e2 100644 --- a/include/bladeRF/source.h +++ b/include/bladeRF/source.h @@ -12,6 +12,7 @@ #include <gnuradio/hier_block2.h> #include "ranges.h" #include "time_spec.h" +#include "common_hier_block.h" namespace gr { namespace bladeRF { @@ -21,7 +22,7 @@ namespace gr { * \ingroup bladeRF * */ - class BLADERF_API source : virtual public gr::hier_block2 + class BLADERF_API source : virtual public common_hier_block { public: typedef std::shared_ptr<source> sptr;