summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Ettus2009-10-06 17:56:20 -0700
committerMatt Ettus2009-10-06 17:56:20 -0700
commitd3c44ab5ea730c973588e5a590543df01372109c (patch)
treeecc0bd47f5ec5795846ff602baa0577ec8c45dc2
parentd887d011b17c10da0ba1513bfbd7067146ac2a33 (diff)
downloadgnuradio-d3c44ab5ea730c973588e5a590543df01372109c.tar.gz
gnuradio-d3c44ab5ea730c973588e5a590543df01372109c.tar.bz2
gnuradio-d3c44ab5ea730c973588e5a590543df01372109c.zip
added more ports
-rw-r--r--gnuradio-examples/grc/pam_timing.grc261
-rw-r--r--grc/blocks/gr_pfb_clock_sync.xml10
2 files changed, 158 insertions, 113 deletions
diff --git a/gnuradio-examples/grc/pam_timing.grc b/gnuradio-examples/grc/pam_timing.grc
index d357a1b55..45fcbc0ec 100644
--- a/gnuradio-examples/grc/pam_timing.grc
+++ b/gnuradio-examples/grc/pam_timing.grc
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Tue Oct 6 17:40:15 2009</timestamp>
+ <timestamp>Tue Oct 6 17:50:59 2009</timestamp>
<block>
<key>options</key>
<param>
@@ -123,37 +123,6 @@
</param>
</block>
<block>
- <key>gr_add_xx</key>
- <param>
- <key>id</key>
- <value>gr_add_xx_0</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>type</key>
- <value>float</value>
- </param>
- <param>
- <key>num_inputs</key>
- <value>2</value>
- </param>
- <param>
- <key>vlen</key>
- <value>1</value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(505, 128)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
<key>variable_slider</key>
<param>
<key>id</key>
@@ -453,54 +422,80 @@
</param>
</block>
<block>
- <key>variable_slider</key>
+ <key>gr_uchar_to_float</key>
<param>
<key>id</key>
- <value>gain</value>
+ <value>gr_uchar_to_float_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>label</key>
- <value>Gain</value>
+ <key>_coordinate</key>
+ <value>(261, 107)</value>
</param>
<param>
- <key>value</key>
+ <key>_rotation</key>
<value>0</value>
</param>
+ </block>
+ <block>
+ <key>gr_float_to_complex</key>
<param>
- <key>min</key>
- <value>0</value>
+ <key>id</key>
+ <value>gr_float_to_complex_0</value>
</param>
<param>
- <key>max</key>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>vlen</key>
<value>1</value>
</param>
<param>
- <key>num_steps</key>
- <value>1000</value>
+ <key>_coordinate</key>
+ <value>(380, 553)</value>
</param>
<param>
- <key>style</key>
- <value>wx.SL_HORIZONTAL</value>
+ <key>_rotation</key>
+ <value>0</value>
</param>
+ </block>
+ <block>
+ <key>gr_pfb_clock_sync_ccf</key>
<param>
- <key>converver</key>
- <value>float_converter</value>
+ <key>id</key>
+ <value>gr_pfb_clock_sync_ccf_0</value>
</param>
<param>
- <key>grid_pos</key>
- <value></value>
+ <key>_enabled</key>
+ <value>True</value>
</param>
<param>
- <key>notebook</key>
- <value></value>
+ <key>sps</key>
+ <value>spb</value>
+ </param>
+ <param>
+ <key>gain</key>
+ <value>gain</value>
+ </param>
+ <param>
+ <key>taps</key>
+ <value>rrctaps</value>
+ </param>
+ <param>
+ <key>filter_size</key>
+ <value>nfilts</value>
+ </param>
+ <param>
+ <key>init_phase</key>
+ <value>14</value>
</param>
<param>
<key>_coordinate</key>
- <value>(537, 278)</value>
+ <value>(341, 777)</value>
</param>
<param>
<key>_rotation</key>
@@ -508,18 +503,53 @@
</param>
</block>
<block>
- <key>gr_uchar_to_float</key>
+ <key>gr_fractional_interpolator_xx</key>
<param>
<key>id</key>
- <value>gr_uchar_to_float_0</value>
+ <value>gr_fractional_interpolator_xx_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
+ <key>type</key>
+ <value>complex</value>
+ </param>
+ <param>
+ <key>phase_shift</key>
+ <value>0.5</value>
+ </param>
+ <param>
+ <key>interp_ratio</key>
+ <value>1</value>
+ </param>
+ <param>
<key>_coordinate</key>
- <value>(261, 107)</value>
+ <value>(349, 662)</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>320000</value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(128, 9)</value>
</param>
<param>
<key>_rotation</key>
@@ -578,7 +608,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(750, 128)</value>
+ <value>(789, 258)</value>
</param>
<param>
<key>_rotation</key>
@@ -586,46 +616,42 @@
</param>
</block>
<block>
- <key>wxgui_scopesink2</key>
+ <key>variable_slider</key>
<param>
<key>id</key>
- <value>wxgui_scopesink2_0_0</value>
+ <value>gain</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>type</key>
- <value>float</value>
- </param>
- <param>
- <key>title</key>
- <value>Scope Plot</value>
+ <key>label</key>
+ <value>Gain</value>
</param>
<param>
- <key>samp_rate</key>
- <value>samp_rate</value>
+ <key>value</key>
+ <value>0</value>
</param>
<param>
- <key>v_scale</key>
+ <key>min</key>
<value>0</value>
</param>
<param>
- <key>t_scale</key>
- <value>0</value>
+ <key>max</key>
+ <value>1</value>
</param>
<param>
- <key>ac_couple</key>
- <value>False</value>
+ <key>num_steps</key>
+ <value>1000</value>
</param>
<param>
- <key>xy_mode</key>
- <value>False</value>
+ <key>style</key>
+ <value>wx.SL_HORIZONTAL</value>
</param>
<param>
- <key>num_inputs</key>
- <value>1</value>
+ <key>converver</key>
+ <value>float_converter</value>
</param>
<param>
<key>grid_pos</key>
@@ -637,7 +663,7 @@
</param>
<param>
<key>_coordinate</key>
- <value>(643, 853)</value>
+ <value>(757, -1)</value>
</param>
<param>
<key>_rotation</key>
@@ -645,22 +671,30 @@
</param>
</block>
<block>
- <key>gr_float_to_complex</key>
+ <key>gr_add_xx</key>
<param>
<key>id</key>
- <value>gr_float_to_complex_0</value>
+ <value>gr_add_xx_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
+ <key>type</key>
+ <value>float</value>
+ </param>
+ <param>
+ <key>num_inputs</key>
+ <value>2</value>
+ </param>
+ <param>
<key>vlen</key>
<value>1</value>
</param>
<param>
<key>_coordinate</key>
- <value>(380, 553)</value>
+ <value>(482, 130)</value>
</param>
<param>
<key>_rotation</key>
@@ -668,38 +702,34 @@
</param>
</block>
<block>
- <key>gr_pfb_clock_sync_ccf</key>
+ <key>notebook</key>
<param>
<key>id</key>
- <value>gr_pfb_clock_sync_ccf_0</value>
+ <value>notebook_0</value>
</param>
<param>
<key>_enabled</key>
<value>True</value>
</param>
<param>
- <key>sps</key>
- <value>spb</value>
- </param>
- <param>
- <key>gain</key>
- <value>gain</value>
+ <key>style</key>
+ <value>wx.NB_TOP</value>
</param>
<param>
- <key>taps</key>
- <value>rrctaps</value>
+ <key>labels</key>
+ <value>['error', 'phase', 'freq']</value>
</param>
<param>
- <key>filter_size</key>
- <value>nfilts</value>
+ <key>grid_pos</key>
+ <value></value>
</param>
<param>
- <key>init_phase</key>
- <value>14</value>
+ <key>notebook</key>
+ <value></value>
</param>
<param>
<key>_coordinate</key>
- <value>(341, 777)</value>
+ <value>(851, 531)</value>
</param>
<param>
<key>_rotation</key>
@@ -707,10 +737,10 @@
</param>
</block>
<block>
- <key>gr_fractional_interpolator_xx</key>
+ <key>wxgui_scopesink2</key>
<param>
<key>id</key>
- <value>gr_fractional_interpolator_xx_0</value>
+ <value>wxgui_scopesink2_0_0</value>
</param>
<param>
<key>_enabled</key>
@@ -718,42 +748,47 @@
</param>
<param>
<key>type</key>
- <value>complex</value>
+ <value>float</value>
</param>
<param>
- <key>phase_shift</key>
- <value>0.5</value>
+ <key>title</key>
+ <value>Scope Plot</value>
</param>
<param>
- <key>interp_ratio</key>
- <value>1</value>
+ <key>samp_rate</key>
+ <value>samp_rate</value>
</param>
<param>
- <key>_coordinate</key>
- <value>(349, 662)</value>
+ <key>v_scale</key>
+ <value>0</value>
</param>
<param>
- <key>_rotation</key>
+ <key>t_scale</key>
<value>0</value>
</param>
- </block>
- <block>
- <key>variable</key>
<param>
- <key>id</key>
- <value>samp_rate</value>
+ <key>ac_couple</key>
+ <value>False</value>
</param>
<param>
- <key>_enabled</key>
- <value>True</value>
+ <key>xy_mode</key>
+ <value>False</value>
</param>
<param>
- <key>value</key>
- <value>320000</value>
+ <key>num_inputs</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>notebook</key>
+ <value>notebook_0,0</value>
</param>
<param>
<key>_coordinate</key>
- <value>(128, 9)</value>
+ <value>(724, 796)</value>
</param>
<param>
<key>_rotation</key>
diff --git a/grc/blocks/gr_pfb_clock_sync.xml b/grc/blocks/gr_pfb_clock_sync.xml
index 9e2f3fa9c..3a066c23c 100644
--- a/grc/blocks/gr_pfb_clock_sync.xml
+++ b/grc/blocks/gr_pfb_clock_sync.xml
@@ -50,4 +50,14 @@
<type>float</type>
<optional>1</optional>
</source>
+ <source>
+ <name>rate</name>
+ <type>float</type>
+ <optional>1</optional>
+ </source>
+ <source>
+ <name>phase</name>
+ <type>float</type>
+ <optional>1</optional>
+ </source>
</block>