From cabdafcb55423b54b63b711c942d4438b6af1a65 Mon Sep 17 00:00:00 2001
From: Tom Rondeau <trondeau@vt.edu>
Date: Sun, 17 Mar 2013 21:31:47 -0400
Subject: cleaning up, converting examples, etc.
---
gr-blocks/examples/ctrlport/pfb_sync_test-qt.grc | 103 +++++++----
gr-blocks/examples/ctrlport/pfb_sync_test.grc | 48 ++---
gr-blocks/examples/metadata/file_metadata_sink.grc | 202 ++++++++++-----------
gr-blocks/examples/msg_passing/strobe.grc | 172 +++++++++---------
gr-blocks/examples/tags/test_file_tags.py | 2 +-
5 files changed, 275 insertions(+), 252 deletions(-)
(limited to 'gr-blocks/examples')
diff --git a/gr-blocks/examples/ctrlport/pfb_sync_test-qt.grc b/gr-blocks/examples/ctrlport/pfb_sync_test-qt.grc
index 0d245089a5..c28ed6d71a 100644
--- a/gr-blocks/examples/ctrlport/pfb_sync_test-qt.grc
+++ b/gr-blocks/examples/ctrlport/pfb_sync_test-qt.grc
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Sun Mar 17 17:11:21 2013</timestamp>
+ <timestamp>Sun Mar 17 21:00:28 2013</timestamp>
<block>
<key>options</key>
<param>
@@ -129,45 +129,6 @@
<value>0</value>
</param>
</block>
- <block>
- <key>blocks_vector_source_x</key>
- <param>
- <key>id</key>
- <value>blocks_vector_source_x_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>type</key>
- <value>byte</value>
- </param>
- <param>
- <key>vector</key>
- <value>0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50</value>
- </param>
- <param>
- <key>tags</key>
- <value>[]</value>
- </param>
- <param>
- <key>repeat</key>
- <value>True</value>
- </param>
- <param>
- <key>vlen</key>
- <value>1</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(190, 71)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
<block>
<key>blocks_packed_to_unpacked_xx</key>
<param>
@@ -756,6 +717,68 @@
<value>0</value>
</param>
</block>
+ <block>
+ <key>blocks_vector_source_x</key>
+ <param>
+ <key>id</key>
+ <value>blocks_vector_source_x_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>type</key>
+ <value>byte</value>
+ </param>
+ <param>
+ <key>vector</key>
+ <value>(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50)</value>
+ </param>
+ <param>
+ <key>tags</key>
+ <value>[]</value>
+ </param>
+ <param>
+ <key>repeat</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>vlen</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(190, 71)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
+ <block>
+ <key>blocks_ctrlport_monitor</key>
+ <param>
+ <key>id</key>
+ <value>blocks_ctrlport_monitor_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>en</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(193, 7)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
<connection>
<source_block_id>blocks_throttle_0</source_block_id>
<sink_block_id>digital_psk_mod_0</sink_block_id>
diff --git a/gr-blocks/examples/ctrlport/pfb_sync_test.grc b/gr-blocks/examples/ctrlport/pfb_sync_test.grc
index da63b4f5b3..06692aad46 100644
--- a/gr-blocks/examples/ctrlport/pfb_sync_test.grc
+++ b/gr-blocks/examples/ctrlport/pfb_sync_test.grc
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Thu Feb 21 19:08:39 2013</timestamp>
+ <timestamp>Sun Mar 17 21:01:36 2013</timestamp>
<block>
<key>options</key>
<param>
@@ -499,29 +499,6 @@
<value>0</value>
</param>
</block>
- <block>
- <key>ctrlport_monitor</key>
- <param>
- <key>id</key>
- <value>ctrlport_monitor_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>en</key>
- <value>True</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(228, 5)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
<block>
<key>blocks_file_source</key>
<param>
@@ -623,6 +600,29 @@
<value>0</value>
</param>
</block>
+ <block>
+ <key>blocks_ctrlport_monitor</key>
+ <param>
+ <key>id</key>
+ <value>blocks_ctrlport_monitor_0</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>en</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(229, 7)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
<connection>
<source_block_id>blocks_throttle_0</source_block_id>
<sink_block_id>digital_psk_mod_0</sink_block_id>
diff --git a/gr-blocks/examples/metadata/file_metadata_sink.grc b/gr-blocks/examples/metadata/file_metadata_sink.grc
index 1328fb7978..4cda1eba39 100644
--- a/gr-blocks/examples/metadata/file_metadata_sink.grc
+++ b/gr-blocks/examples/metadata/file_metadata_sink.grc
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Fri Dec 14 17:09:06 2012</timestamp>
+ <timestamp>Sun Mar 17 20:44:09 2013</timestamp>
<block>
<key>options</key>
<param>
@@ -61,42 +61,77 @@
</param>
</block>
<block>
- <key>gr_sig_source_x</key>
+ <key>variable_qtgui_range</key>
<param>
<key>id</key>
- <value>gr_sig_source_x_0</value>
+ <value>qt_samp_rate</value>
</param>
<param>
<key>_enabled</key>
- <value>False</value>
+ <value>True</value>
</param>
<param>
- <key>type</key>
- <value>complex</value>
+ <key>label</key>
+ <value></value>
</param>
<param>
- <key>samp_rate</key>
+ <key>value</key>
<value>samp_rate</value>
</param>
<param>
- <key>waveform</key>
- <value>gr.GR_COS_WAVE</value>
+ <key>start</key>
+ <value>200000</value>
</param>
<param>
- <key>freq</key>
- <value>1000</value>
+ <key>stop</key>
+ <value>5000000</value>
</param>
<param>
- <key>amp</key>
- <value>1</value>
+ <key>step</key>
+ <value>200000</value>
</param>
<param>
- <key>offset</key>
+ <key>widget</key>
+ <value>counter_slider</value>
+ </param>
+ <param>
+ <key>orient</key>
+ <value>Qt.Horizontal</value>
+ </param>
+ <param>
+ <key>min_len</key>
+ <value>200</value>
+ </param>
+ <param>
+ <key>gui_hint</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(330, 259)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
<value>0</value>
</param>
+ </block>
+ <block>
+ <key>variable</key>
+ <param>
+ <key>id</key>
+ <value>samp_rate</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>200000</value>
+ </param>
<param>
<key>_coordinate</key>
- <value>(57, 140)</value>
+ <value>(208, 11)</value>
</param>
<param>
<key>_rotation</key>
@@ -104,54 +139,54 @@
</param>
</block>
<block>
- <key>variable_qtgui_range</key>
+ <key>blocks_file_meta_sink</key>
<param>
<key>id</key>
- <value>qt_samp_rate</value>
+ <value>blocks_file_meta_sink_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>label</key>
- <value></value>
+ <key>file</key>
+ <value>/tmp/metadat_file.out</value>
</param>
<param>
- <key>value</key>
- <value>samp_rate</value>
+ <key>type</key>
+ <value>complex</value>
</param>
<param>
- <key>start</key>
- <value>200000</value>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
</param>
<param>
- <key>stop</key>
- <value>5000000</value>
+ <key>rel_rate</key>
+ <value>1</value>
</param>
<param>
- <key>step</key>
- <value>200000</value>
+ <key>vlen</key>
+ <value>1</value>
</param>
<param>
- <key>widget</key>
- <value>counter_slider</value>
+ <key>max_seg_size</key>
+ <value>1000000</value>
</param>
<param>
- <key>orient</key>
- <value>Qt.Horizontal</value>
+ <key>extra_dict</key>
+ <value>""</value>
</param>
<param>
- <key>min_len</key>
- <value>200</value>
+ <key>detached</key>
+ <value>True</value>
</param>
<param>
- <key>gui_hint</key>
- <value></value>
+ <key>unbuffered</key>
+ <value>False</value>
</param>
<param>
<key>_coordinate</key>
- <value>(330, 259)</value>
+ <value>(569, 124)</value>
</param>
<param>
<key>_rotation</key>
@@ -159,22 +194,30 @@
</param>
</block>
<block>
- <key>variable</key>
+ <key>blocks_head</key>
<param>
<key>id</key>
- <value>samp_rate</value>
+ <value>blocks_head_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>value</key>
- <value>200000</value>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>num_items</key>
+ <value>20000000</value>
+ </param>
+ <param>
+ <key>vlen</key>
+ <value>1</value>
</param>
<param>
<key>_coordinate</key>
- <value>(208, 11)</value>
+ <value>(309, 172)</value>
</param>
<param>
<key>_rotation</key>
@@ -189,7 +232,7 @@
</param>
<param>
<key>_enabled</key>
- <value>True</value>
+ <value>False</value>
</param>
<param>
<key>type</key>
@@ -845,10 +888,10 @@
</param>
</block>
<block>
- <key>blocks_head</key>
+ <key>analog_sig_source_x</key>
<param>
<key>id</key>
- <value>blocks_head_0</value>
+ <value>analog_sig_source_x_0</value>
</param>
<param>
<key>_enabled</key>
@@ -858,72 +901,29 @@
<key>type</key>
<value>complex</value>
</param>
- <param>
- <key>num_items</key>
- <value>20000000</value>
- </param>
- <param>
- <key>vlen</key>
- <value>1</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(309, 172)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
- <key>blocks_file_meta_sink</key>
- <param>
- <key>id</key>
- <value>blocks_file_meta_sink_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>file</key>
- <value>/tmp/metadat_file.out</value>
- </param>
- <param>
- <key>type</key>
- <value>complex</value>
- </param>
<param>
<key>samp_rate</key>
<value>samp_rate</value>
</param>
<param>
- <key>rel_rate</key>
- <value>1</value>
- </param>
- <param>
- <key>vlen</key>
- <value>1</value>
- </param>
- <param>
- <key>max_seg_size</key>
- <value>1000000</value>
+ <key>waveform</key>
+ <value>analog.GR_COS_WAVE</value>
</param>
<param>
- <key>extra_dict</key>
- <value>""</value>
+ <key>freq</key>
+ <value>1000</value>
</param>
<param>
- <key>detached</key>
- <value>True</value>
+ <key>amp</key>
+ <value>1</value>
</param>
<param>
- <key>unbuffered</key>
- <value>False</value>
+ <key>offset</key>
+ <value>0</value>
</param>
<param>
<key>_coordinate</key>
- <value>(569, 124)</value>
+ <value>(48, 115)</value>
</param>
<param>
<key>_rotation</key>
@@ -931,20 +931,20 @@
</param>
</block>
<connection>
- <source_block_id>gr_sig_source_x_0</source_block_id>
+ <source_block_id>uhd_usrp_source_0</source_block_id>
<sink_block_id>blocks_head_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>uhd_usrp_source_0</source_block_id>
- <sink_block_id>blocks_head_0</sink_block_id>
+ <source_block_id>blocks_head_0</source_block_id>
+ <sink_block_id>blocks_file_meta_sink_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>blocks_head_0</source_block_id>
- <sink_block_id>blocks_file_meta_sink_0</sink_block_id>
+ <source_block_id>analog_sig_source_x_0</source_block_id>
+ <sink_block_id>blocks_head_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
diff --git a/gr-blocks/examples/msg_passing/strobe.grc b/gr-blocks/examples/msg_passing/strobe.grc
index a918332ce8..e5001a4262 100644
--- a/gr-blocks/examples/msg_passing/strobe.grc
+++ b/gr-blocks/examples/msg_passing/strobe.grc
@@ -1,46 +1,59 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Thu Dec 6 11:33:08 2012</timestamp>
+ <timestamp>Sun Mar 17 20:42:59 2013</timestamp>
<block>
- <key>variable</key>
+ <key>options</key>
<param>
<key>id</key>
- <value>samp_rate</value>
+ <value>strobe</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>value</key>
- <value>32000</value>
+ <key>title</key>
+ <value></value>
</param>
<param>
- <key>_coordinate</key>
- <value>(10, 170)</value>
+ <key>author</key>
+ <value></value>
</param>
<param>
- <key>_rotation</key>
- <value>0</value>
+ <key>description</key>
+ <value></value>
</param>
- </block>
- <block>
- <key>gr_pdu_to_tagged_stream</key>
<param>
- <key>id</key>
- <value>gr_pdu_to_tagged_stream_0</value>
+ <key>window_size</key>
+ <value>1280, 1024</value>
</param>
<param>
- <key>_enabled</key>
+ <key>generate_options</key>
+ <value>no_gui</value>
+ </param>
+ <param>
+ <key>category</key>
+ <value>Custom</value>
+ </param>
+ <param>
+ <key>run_options</key>
+ <value>prompt</value>
+ </param>
+ <param>
+ <key>run</key>
<value>True</value>
</param>
<param>
- <key>type</key>
- <value>byte</value>
+ <key>max_nouts</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>realtime_scheduling</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(443, 89)</value>
+ <value>(10, 10)</value>
</param>
<param>
<key>_rotation</key>
@@ -48,18 +61,22 @@
</param>
</block>
<block>
- <key>blocks_message_debug</key>
+ <key>variable</key>
<param>
<key>id</key>
- <value>blocks_message_debug_0</value>
+ <value>samp_rate</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
+ <param>
+ <key>value</key>
+ <value>32000</value>
+ </param>
<param>
<key>_coordinate</key>
- <value>(1049, 176)</value>
+ <value>(10, 170)</value>
</param>
<param>
<key>_rotation</key>
@@ -67,22 +84,18 @@
</param>
</block>
<block>
- <key>gr_tagged_stream_to_pdu</key>
+ <key>blocks_message_debug</key>
<param>
<key>id</key>
- <value>gr_tagged_stream_to_pdu_0</value>
+ <value>blocks_message_debug_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
- <param>
- <key>type</key>
- <value>byte</value>
- </param>
<param>
<key>_coordinate</key>
- <value>(870, 89)</value>
+ <value>(1049, 176)</value>
</param>
<param>
<key>_rotation</key>
@@ -90,10 +103,10 @@
</param>
</block>
<block>
- <key>blocks_copy</key>
+ <key>blocks_pdu_to_tagged_stream</key>
<param>
<key>id</key>
- <value>blocks_copy_0</value>
+ <value>blocks_pdu_to_tagged_stream_0</value>
</param>
<param>
<key>_enabled</key>
@@ -103,17 +116,9 @@
<key>type</key>
<value>byte</value>
</param>
- <param>
- <key>num_ports</key>
- <value>1</value>
- </param>
- <param>
- <key>vlen</key>
- <value>1</value>
- </param>
<param>
<key>_coordinate</key>
- <value>(686, 89)</value>
+ <value>(388, 85)</value>
</param>
<param>
<key>_rotation</key>
@@ -124,7 +129,7 @@
<key>blocks_message_strobe</key>
<param>
<key>id</key>
- <value>blocks_message_strobe_0</value>
+ <value>blocks_message_strobe_0_0</value>
</param>
<param>
<key>_enabled</key>
@@ -132,15 +137,15 @@
</param>
<param>
<key>msg</key>
- <value>pmt.intern("TEST")</value>
+ <value>pmt.cons( pmt.PMT_NIL, pmt.make_u8vector(512,0) )</value>
</param>
<param>
<key>period</key>
- <value>1000</value>
+ <value>750</value>
</param>
<param>
<key>_coordinate</key>
- <value>(423, 177)</value>
+ <value>(95, 95)</value>
</param>
<param>
<key>_rotation</key>
@@ -148,26 +153,30 @@
</param>
</block>
<block>
- <key>blocks_message_strobe</key>
+ <key>blocks_copy</key>
<param>
<key>id</key>
- <value>blocks_message_strobe_0_0</value>
+ <value>blocks_copy_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>msg</key>
- <value>pmt.cons( pmt.PMT_NIL, pmt.make_u8vector(512,0) )</value>
+ <key>type</key>
+ <value>byte</value>
</param>
<param>
- <key>period</key>
- <value>750</value>
+ <key>enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>vlen</key>
+ <value>1</value>
</param>
<param>
<key>_coordinate</key>
- <value>(99, 85)</value>
+ <value>(629, 81)</value>
</param>
<param>
<key>_rotation</key>
@@ -175,58 +184,49 @@
</param>
</block>
<block>
- <key>options</key>
+ <key>blocks_tagged_stream_to_pdu</key>
<param>
<key>id</key>
- <value>strobe</value>
+ <value>blocks_tagged_stream_to_pdu_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>title</key>
- <value></value>
- </param>
- <param>
- <key>author</key>
- <value></value>
- </param>
- <param>
- <key>description</key>
- <value></value>
- </param>
- <param>
- <key>window_size</key>
- <value>1280, 1024</value>
+ <key>type</key>
+ <value>byte</value>
</param>
<param>
- <key>generate_options</key>
- <value>no_gui</value>
+ <key>_coordinate</key>
+ <value>(837, 47)</value>
</param>
<param>
- <key>category</key>
- <value>Custom</value>
+ <key>_rotation</key>
+ <value>0</value>
</param>
+ </block>
+ <block>
+ <key>blocks_message_strobe</key>
<param>
- <key>run_options</key>
- <value>prompt</value>
+ <key>id</key>
+ <value>blocks_message_strobe_0</value>
</param>
<param>
- <key>run</key>
+ <key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>max_nouts</key>
- <value>0</value>
+ <key>msg</key>
+ <value>pmt.intern("TEST")</value>
</param>
<param>
- <key>realtime_scheduling</key>
- <value></value>
+ <key>period</key>
+ <value>1000</value>
</param>
<param>
<key>_coordinate</key>
- <value>(10, 10)</value>
+ <value>(423, 164)</value>
</param>
<param>
<key>_rotation</key>
@@ -234,31 +234,31 @@
</param>
</block>
<connection>
- <source_block_id>blocks_message_strobe_0_0</source_block_id>
- <sink_block_id>gr_pdu_to_tagged_stream_0</sink_block_id>
+ <source_block_id>blocks_message_strobe_0</source_block_id>
+ <sink_block_id>blocks_message_debug_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>blocks_message_strobe_0</source_block_id>
- <sink_block_id>blocks_message_debug_0</sink_block_id>
+ <source_block_id>blocks_message_strobe_0_0</source_block_id>
+ <sink_block_id>blocks_pdu_to_tagged_stream_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_tagged_stream_to_pdu_0</source_block_id>
+ <source_block_id>blocks_tagged_stream_to_pdu_0</source_block_id>
<sink_block_id>blocks_message_debug_0</sink_block_id>
<source_key>0</source_key>
- <sink_key>0</sink_key>
+ <sink_key>2</sink_key>
</connection>
<connection>
<source_block_id>blocks_copy_0</source_block_id>
- <sink_block_id>gr_tagged_stream_to_pdu_0</sink_block_id>
+ <sink_block_id>blocks_tagged_stream_to_pdu_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_pdu_to_tagged_stream_0</source_block_id>
+ <source_block_id>blocks_pdu_to_tagged_stream_0</source_block_id>
<sink_block_id>blocks_copy_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
diff --git a/gr-blocks/examples/tags/test_file_tags.py b/gr-blocks/examples/tags/test_file_tags.py
index 758623de98..cc11cf594e 100755
--- a/gr-blocks/examples/tags/test_file_tags.py
+++ b/gr-blocks/examples/tags/test_file_tags.py
@@ -39,7 +39,7 @@ def main():
thr = blocks.throttle(gr.sizeof_short, 10e3)
ann = blocks.annotator_alltoall(1000000, gr.sizeof_short)
- tagger = blocks..burst_tagger(gr.sizeof_short)
+ tagger = blocks.burst_tagger(gr.sizeof_short)
fsnk = blocks.tagged_file_sink(gr.sizeof_short, 1)
--
cgit v1.2.3