diff options
author | piotr <Piotr Krysik pkrysik@elka.pw.edu.pl> | 2014-08-06 20:12:24 +0200 |
---|---|---|
committer | piotr <Piotr Krysik pkrysik@elka.pw.edu.pl> | 2014-08-06 20:12:24 +0200 |
commit | 4a4704606a68a0a6cbf22a0d02f52ec1b8a98aa4 (patch) | |
tree | 2159a7b507a4632fe70e5412e3f4dd958d72723b | |
parent | 62b15126eaebed0cb61f9e02788889001e473e74 (diff) |
Changed name of message input in clock offset corrector
-rw-r--r-- | grc/gsm_clock_offset_corrector.xml | 2 | ||||
-rw-r--r-- | hier_blocks/clock_offset_corrector.grc | 74 | ||||
-rw-r--r-- | python/clock_offset_corrector.py | 6 |
3 files changed, 41 insertions, 41 deletions
diff --git a/grc/gsm_clock_offset_corrector.xml b/grc/gsm_clock_offset_corrector.xml index d1953e7..f84f96d 100644 --- a/grc/gsm_clock_offset_corrector.xml +++ b/grc/gsm_clock_offset_corrector.xml @@ -32,7 +32,7 @@ <vlen>1</vlen> </sink> <sink> - <name>ppm_msg</name> + <name>ppm</name> <type>message</type> <optional>True</optional> </sink> diff --git a/hier_blocks/clock_offset_corrector.grc b/hier_blocks/clock_offset_corrector.grc index 56a70d7..97dde85 100644 --- a/hier_blocks/clock_offset_corrector.grc +++ b/hier_blocks/clock_offset_corrector.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Wed Aug 6 13:47:37 2014</timestamp> + <timestamp>Wed Aug 6 19:56:28 2014</timestamp> <block> <key>options</key> <param> @@ -475,38 +475,38 @@ </param> </block> <block> - <key>pad_source</key> + <key>gsm_controlled_const_source_f</key> <param> <key>id</key> - <value>ppm_msg</value> + <value>gsm_controlled_const_source_f_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>label</key> - <value>ppm_msg</value> + <key>constant</key> + <value>ppm</value> </param> <param> - <key>type</key> - <value>message</value> + <key>alias</key> + <value></value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>affinity</key> + <value></value> </param> <param> - <key>num_streams</key> - <value>1</value> + <key>minoutbuf</key> + <value>0</value> </param> <param> - <key>optional</key> - <value>True</value> + <key>maxoutbuf</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(15, 217)</value> + <value>(183, 217)</value> </param> <param> <key>_rotation</key> @@ -514,18 +514,22 @@ </param> </block> <block> - <key>gsm_controlled_const_source_f</key> + <key>gsm_controlled_rotator_cc</key> <param> <key>id</key> - <value>gsm_controlled_const_source_f_0</value> + <value>gsm_controlled_rotator_cc_0</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>constant</key> - <value>ppm</value> + <key>phase_inc</key> + <value>0</value> + </param> + <param> + <key>samp_rate</key> + <value>samp_rate</value> </param> <param> <key>alias</key> @@ -545,7 +549,7 @@ </param> <param> <key>_coordinate</key> - <value>(183, 217)</value> + <value>(759, 305)</value> </param> <param> <key>_rotation</key> @@ -553,42 +557,38 @@ </param> </block> <block> - <key>gsm_controlled_rotator_cc</key> + <key>pad_source</key> <param> <key>id</key> - <value>gsm_controlled_rotator_cc_0</value> + <value>ppm</value> </param> <param> <key>_enabled</key> <value>True</value> </param> <param> - <key>phase_inc</key> - <value>0</value> - </param> - <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>label</key> + <value>ppm</value> </param> <param> - <key>alias</key> - <value></value> + <key>type</key> + <value>message</value> </param> <param> - <key>affinity</key> - <value></value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>minoutbuf</key> - <value>0</value> + <key>num_streams</key> + <value>1</value> </param> <param> - <key>maxoutbuf</key> - <value>0</value> + <key>optional</key> + <value>True</value> </param> <param> <key>_coordinate</key> - <value>(759, 305)</value> + <value>(15, 217)</value> </param> <param> <key>_rotation</key> @@ -644,7 +644,7 @@ <sink_key>0</sink_key> </connection> <connection> - <source_block_id>ppm_msg</source_block_id> + <source_block_id>ppm</source_block_id> <sink_block_id>gsm_controlled_const_source_f_0</sink_block_id> <source_key>0</source_key> <sink_key>constant_msg</sink_key> diff --git a/python/clock_offset_corrector.py b/python/clock_offset_corrector.py index df97cca..4bfd773 100644 --- a/python/clock_offset_corrector.py +++ b/python/clock_offset_corrector.py @@ -3,7 +3,7 @@ # Gnuradio Python Flow Graph # Title: Clock offset corrector # Author: Piotr Krysik -# Generated: Wed Aug 6 13:47:38 2014 +# Generated: Wed Aug 6 15:49:59 2014 ################################################## from gnuradio import blocks @@ -32,7 +32,7 @@ class clock_offset_corrector(gr.hier_block2): ################################################## # Blocks ################################################## - self.ppm_msg = None;self.message_port_register_hier_out("ppm_msg") + self.ppm_msg = None;self.message_port_register_hier_out("ppm") self.gsm_controlled_rotator_cc_0 = gsm.controlled_rotator_cc(0,samp_rate) self.gsm_controlled_const_source_f_0 = gsm.controlled_const_source_f(ppm) self.fractional_resampler_xx_0 = filter.fractional_resampler_cc(0, 1) @@ -55,7 +55,7 @@ class clock_offset_corrector(gr.hier_block2): ################################################## # Asynch Message Connections ################################################## - self.msg_connect(self, "ppm_msg", self.gsm_controlled_const_source_f_0, "constant_msg") + self.msg_connect(self, "ppm", self.gsm_controlled_const_source_f_0, "constant_msg") def get_ppm(self): |