Skip to content
Snippets Groups Projects
Commit ed98fe79 authored by Sergey Musikhin's avatar Sergey Musikhin
Browse files

trigger parameters to ctor

parent 41757e6f
Branches
No related tags found
No related merge requests found
...@@ -172,6 +172,13 @@ templates: ...@@ -172,6 +172,13 @@ templates:
+ ",out_clk=" + str(${'$'}{out_clk}) + ",out_clk=" + str(${'$'}{out_clk})
+ ",dac=" + str(${'$'}{dac}) + ",dac=" + str(${'$'}{dac})
+ ",xb200=" + '${'$'}{xb200}' + ",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}) self.${'$'}{id}.set_sample_rate(${'$'}{sample_rate})
% for n in range(max_nchan): % for n in range(max_nchan):
...@@ -382,7 +389,7 @@ PARAMS_TMPL = """ ...@@ -382,7 +389,7 @@ PARAMS_TMPL = """
hide: ${'$'}{ 'part' if (nchan > ${n}) else 'all'} hide: ${'$'}{ 'part' if (nchan > ${n}) else 'all'}
- id: trigger_signal${n} - id: trigger_signal${n}
label: Trigger role label: Trigger signal
category: 'Channel ${n}' category: 'Channel ${n}'
dtype: enum dtype: enum
default: 'J51_1' default: 'J51_1'
......
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
#define INCLUDED_BLADERF_SINK_H #define INCLUDED_BLADERF_SINK_H
#include <bladeRF/api.h> #include <bladeRF/api.h>
#include <gnuradio/hier_block2.h>
#include "ranges.h" #include "ranges.h"
#include "time_spec.h" #include "time_spec.h"
#include "common_hier_block.h"
namespace gr { namespace gr {
namespace bladeRF { namespace bladeRF {
...@@ -15,7 +15,7 @@ namespace gr { ...@@ -15,7 +15,7 @@ namespace gr {
* \ingroup bladeRF * \ingroup bladeRF
* *
*/ */
class BLADERF_API sink : virtual public gr::hier_block2 class BLADERF_API sink : virtual public common_hier_block
{ {
public: public:
typedef std::shared_ptr<sink> sptr; typedef std::shared_ptr<sink> sptr;
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <gnuradio/hier_block2.h> #include <gnuradio/hier_block2.h>
#include "ranges.h" #include "ranges.h"
#include "time_spec.h" #include "time_spec.h"
#include "common_hier_block.h"
namespace gr { namespace gr {
namespace bladeRF { namespace bladeRF {
...@@ -21,7 +22,7 @@ namespace gr { ...@@ -21,7 +22,7 @@ namespace gr {
* \ingroup bladeRF * \ingroup bladeRF
* *
*/ */
class BLADERF_API source : virtual public gr::hier_block2 class BLADERF_API source : virtual public common_hier_block
{ {
public: public:
typedef std::shared_ptr<source> sptr; typedef std::shared_ptr<source> sptr;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment