From f42ef36d60348965936ede158886c1847670f774 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Thu, 21 Feb 2013 18:24:02 -0500 Subject: blocks: converting blocks to v3.7 style in gr-blocks. delay, rms, unpacked_to_packed, packed_to_unpacked --- gr-blocks/grc/blocks_block_tree.xml | 6 ++- gr-blocks/grc/blocks_delay.xml | 75 ++++++++++++++++++++++++++ gr-blocks/grc/blocks_packed_to_unpacked_xx.xml | 68 +++++++++++++++++++++++ gr-blocks/grc/blocks_rms_xx.xml | 42 +++++++++++++++ gr-blocks/grc/blocks_unpacked_to_packed_xx.xml | 68 +++++++++++++++++++++++ 5 files changed, 258 insertions(+), 1 deletion(-) create mode 100644 gr-blocks/grc/blocks_delay.xml create mode 100644 gr-blocks/grc/blocks_packed_to_unpacked_xx.xml create mode 100644 gr-blocks/grc/blocks_rms_xx.xml create mode 100644 gr-blocks/grc/blocks_unpacked_to_packed_xx.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 797b3dbc5..6b17078cd 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -49,6 +49,7 @@ blocks_conjugate_cc blocks_integrate_xx blocks_nlog10_ff + blocks_rms_xx Boolean Operations (New) @@ -82,7 +83,10 @@ Stream Operations (New) - blocks_deinterleave + blocks_delay + blocks_packed_to_unpacked_xx + blocks_unpacked_to_packed_xx + blocks_deinterleave blocks_interleave blocks_keep_m_in_n blocks_keep_one_in_n diff --git a/gr-blocks/grc/blocks_delay.xml b/gr-blocks/grc/blocks_delay.xml new file mode 100644 index 000000000..a7c48c4dc --- /dev/null +++ b/gr-blocks/grc/blocks_delay.xml @@ -0,0 +1,75 @@ + + + + Delay + blocks_delay + from gnuradio import blocks + blocks.delay($type.size*$vlen, $delay) + set_dly($delay) + + Type + type + enum + + + + + + + + Delay + delay + 0 + int + + + Num Ports + num_ports + 1 + int + + + Vec Length + vlen + 1 + int + + $num_ports > 0 + $vlen > 0 + + in + $type + $vlen + $num_ports + + + out + $type + $vlen + $num_ports + + diff --git a/gr-blocks/grc/blocks_packed_to_unpacked_xx.xml b/gr-blocks/grc/blocks_packed_to_unpacked_xx.xml new file mode 100644 index 000000000..b236a38db --- /dev/null +++ b/gr-blocks/grc/blocks_packed_to_unpacked_xx.xml @@ -0,0 +1,68 @@ + + + + Packed to Unpacked + blocks_packed_to_unpacked_xx + from gnuradio import blocks + blocks.packed_to_unpacked_$(type.fcn)($bits_per_chunk, $endianness) + + Type + type + enum + + + + + + Bits per Chunk + bits_per_chunk + 2 + int + + + Endianness + endianness + int + + + + + Num Ports + num_ports + 1 + int + + $num_ports > 0 + + in + $type + $num_ports + + + out + $type + $num_ports + + diff --git a/gr-blocks/grc/blocks_rms_xx.xml b/gr-blocks/grc/blocks_rms_xx.xml new file mode 100644 index 000000000..0ae09139a --- /dev/null +++ b/gr-blocks/grc/blocks_rms_xx.xml @@ -0,0 +1,42 @@ + + + + RMS + blocks_rms_xx + from gnuradio import blocks + blocks.rms_$(type.fcn)f($alpha) + set_alpha($alpha) + + Input Type + type + enum + + + + + Alpha + alpha + 0.0001 + real + + + in + $type + + + out + float + + diff --git a/gr-blocks/grc/blocks_unpacked_to_packed_xx.xml b/gr-blocks/grc/blocks_unpacked_to_packed_xx.xml new file mode 100644 index 000000000..d27dc9bfc --- /dev/null +++ b/gr-blocks/grc/blocks_unpacked_to_packed_xx.xml @@ -0,0 +1,68 @@ + + + + Unpacked to Packed + blocks_unpacked_to_packed_xx + from gnuradio import blocks + blocks.unpacked_to_packed_$(type.fcn)($bits_per_chunk, $endianness) + + Type + type + enum + + + + + + Bits per Chunk + bits_per_chunk + 2 + int + + + Endianness + endianness + int + + + + + Num Ports + num_ports + 1 + int + + $num_ports > 0 + + in + $type + $num_ports + + + out + $type + $num_ports + + -- cgit From ffcaa3436cc8e608cb51bad78ca669b90bd110f2 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 24 Feb 2013 14:15:05 -0500 Subject: blocks: converted peak_detector2 and regenerate to v3.7. --- gr-blocks/grc/blocks_peak_detector2_fb.xml | 41 ++++++++++++++++++++++++++++++ gr-blocks/grc/blocks_regenerate_bb.xml | 34 +++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 gr-blocks/grc/blocks_peak_detector2_fb.xml create mode 100644 gr-blocks/grc/blocks_regenerate_bb.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_peak_detector2_fb.xml b/gr-blocks/grc/blocks_peak_detector2_fb.xml new file mode 100644 index 000000000..584e7a1fb --- /dev/null +++ b/gr-blocks/grc/blocks_peak_detector2_fb.xml @@ -0,0 +1,41 @@ + + + + Peak Detector2 + blocks_peak_detector2_fb + from gnuradio import blocks + blocks.peak_detector2_fb($threshold_factor_rise, $look_ahead, $alpha) + set_threshold_factor_rise($threshold_factor_rise) + set_look_ahead($look_ahead) + set_alpha($alpha) + + TH Factor Rise + threshold_factor_rise + 7 + real + + + Look Ahead + look_ahead + 1000 + int + + + Alpha + alpha + 0.001 + real + + + in + float + + + out + byte + + diff --git a/gr-blocks/grc/blocks_regenerate_bb.xml b/gr-blocks/grc/blocks_regenerate_bb.xml new file mode 100644 index 000000000..6e6f46188 --- /dev/null +++ b/gr-blocks/grc/blocks_regenerate_bb.xml @@ -0,0 +1,34 @@ + + + + Regenerate + blocks_regenerate_bb + from gnuradio import blocks + blocks.regenerate_bb($period, $max_regen) + + Period + period + int + + + Max Regen Count + max_regen + 500 + int + + + in + byte + $vlen + + + out + byte + $vlen + + -- cgit From a54dc5bab6cc38513e9732be9f5c2670145b160f Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Sun, 24 Feb 2013 18:55:04 -0500 Subject: blocks: adding threshold, strech, and throttle to gr-blocks. --- gr-blocks/grc/blocks_block_tree.xml | 8 ++++ gr-blocks/grc/blocks_regenerate_bb.xml | 2 - gr-blocks/grc/blocks_stretch_ff.xml | 34 +++++++++++++++++ gr-blocks/grc/blocks_threshold_ff.xml | 40 ++++++++++++++++++++ gr-blocks/grc/blocks_throttle.xml | 67 ++++++++++++++++++++++++++++++++++ 5 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 gr-blocks/grc/blocks_stretch_ff.xml create mode 100644 gr-blocks/grc/blocks_threshold_ff.xml create mode 100644 gr-blocks/grc/blocks_throttle.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 6b17078cd..6ab84c94e 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -98,5 +98,13 @@ blocks_streams_to_vector blocks_vector_to_stream blocks_vector_to_streams + blocks_peak_detector2_fb + blocks_regenerate_bb + blocks_stretch_ff + blocks_threadhold_ff + + + Misc (New) + blocks_throttle diff --git a/gr-blocks/grc/blocks_regenerate_bb.xml b/gr-blocks/grc/blocks_regenerate_bb.xml index 6e6f46188..bbee53387 100644 --- a/gr-blocks/grc/blocks_regenerate_bb.xml +++ b/gr-blocks/grc/blocks_regenerate_bb.xml @@ -24,11 +24,9 @@ in byte - $vlen out byte - $vlen diff --git a/gr-blocks/grc/blocks_stretch_ff.xml b/gr-blocks/grc/blocks_stretch_ff.xml new file mode 100644 index 000000000..00a67602b --- /dev/null +++ b/gr-blocks/grc/blocks_stretch_ff.xml @@ -0,0 +1,34 @@ + + + + Stretch + blocks_stretch_ff + from gnuradio import blocks + blocks.stretch_ff($lo, $vlen) + + Low + lo + real + + + Vec. Length + vlen + 1 + int + + + in + float + $vlen + + + out + float + $vlen + + diff --git a/gr-blocks/grc/blocks_threshold_ff.xml b/gr-blocks/grc/blocks_threshold_ff.xml new file mode 100644 index 000000000..0da4157fc --- /dev/null +++ b/gr-blocks/grc/blocks_threshold_ff.xml @@ -0,0 +1,40 @@ + + + + Threshold + blocks_threshold_ff + from gnuradio import blocks + blocks.threshold_ff($low, $high, $init) + set_hi($high) + set_lo($low) + + Low + low + -100 + real + + + High + high + 100 + real + + + Initial State + init + 0 + real + + + in + float + + + out + float + + diff --git a/gr-blocks/grc/blocks_throttle.xml b/gr-blocks/grc/blocks_throttle.xml new file mode 100644 index 000000000..8293cbde9 --- /dev/null +++ b/gr-blocks/grc/blocks_throttle.xml @@ -0,0 +1,67 @@ + + + + Throttle + blocks_throttle + 1 + from gnuradio import blocks + blocks.throttle($type.size*$vlen, $samples_per_second) + set_sample_rate($samples_per_second) + + Type + type + enum + + + + + + + + Sample Rate + samples_per_second + samp_rate + real + + + Vec Length + vlen + 1 + int + + $vlen > 0 + + in + $type + $vlen + + + out + $type + $vlen + + -- cgit From 5c7b8118d4d0f8413d64933cabec84b18cdaf193 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Mon, 25 Feb 2013 21:16:19 -0500 Subject: blocks: moved transcendental block to gr-blocks. --- gr-blocks/grc/blocks_block_tree.xml | 1 + gr-blocks/grc/blocks_transcendental.xml | 41 +++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 gr-blocks/grc/blocks_transcendental.xml (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 6ab84c94e..5e304d3c3 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -50,6 +50,7 @@ blocks_integrate_xx blocks_nlog10_ff blocks_rms_xx + blocks_transcendental Boolean Operations (New) diff --git a/gr-blocks/grc/blocks_transcendental.xml b/gr-blocks/grc/blocks_transcendental.xml new file mode 100644 index 000000000..a883a2eef --- /dev/null +++ b/gr-blocks/grc/blocks_transcendental.xml @@ -0,0 +1,41 @@ + + + + Transcendental + blocks_transcendental + from gnuradio import blocks + blocks.transcendental($name, "$type") + + Type + type + enum + + + + + Function Name + name + cos + string + + + in + $type.type + + + out + $type.type + + -- cgit From fa00fcc1dda7586024aebbf4caaf6347d3b56ef5 Mon Sep 17 00:00:00 2001 From: Tom Rondeau Date: Tue, 26 Feb 2013 10:44:50 -0500 Subject: blocks: fixed typo. --- gr-blocks/grc/blocks_block_tree.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gr-blocks/grc') diff --git a/gr-blocks/grc/blocks_block_tree.xml b/gr-blocks/grc/blocks_block_tree.xml index 5e304d3c3..0077ec948 100644 --- a/gr-blocks/grc/blocks_block_tree.xml +++ b/gr-blocks/grc/blocks_block_tree.xml @@ -102,7 +102,7 @@ blocks_peak_detector2_fb blocks_regenerate_bb blocks_stretch_ff - blocks_threadhold_ff + blocks_threshold_ff Misc (New) -- cgit