rename and make output optional

diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 0ee9be6ca2b2f082cd97209995342ac76a99c684..7c769c4b45da03f7c8657c9abc6595d4d542e276 100644 (file)
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -144,7 +144,7 @@ dist_ourdata_DATA = \
        gr_packed_to_unpacked_xx.xml \
        gr_peak_detector2_fb.xml \
        gr_peak_detector_xb.xml \
-       gr_pfb_clock_recovery.xml \
+       gr_pfb_clock_sync.xml \
        gr_phase_modulator_fc.xml \
        gr_pll_carriertracking_cc.xml \
        gr_pll_freqdet_cf.xml \

diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 5b10d1f12c43d848df5cb9f2d88588b9ff80f085..509956d3bc1a322ad3160f8b245b11045bfaf6a8 100644 (file)
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -124,7 +124,7 @@
        <cat>
                <name>Synchronizers</name>
                <block>gr_clock_recovery_mm_xx</block>
-               <block>gr_pfb_clock_recovery_ccf</block>
+               <block>gr_pfb_clock_sync_ccf</block>
 
                <block>gr_costas_loop_cc</block>
                <block>gr_dd_mpsk_sync_cc</block>

diff --git a/grc/blocks/gr_pfb_clock_recovery.xml b/grc/blocks/gr_pfb_clock_recovery.xml
deleted file mode 100644 (file)
index 90ecfcf..0000000
--- a/grc/blocks/gr_pfb_clock_recovery.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-## Polyphase Filter based Clock Recovery
-###################################################
- -->
-<block>
-       <name>Polyphase Clock Recovery</name>
-       <key>gr_pfb_clock_recovery_ccf</key>
-       <import>from gnuradio import gr</import>
-       <make>gr.pfb_clock_recovery_ccf($sps, $gain, $taps, $filter_size, $init_phase)</make>
-       <callback>set_taps($taps)</callback>
-       <callback>set_gain($gain)</callback>
-
-       <param>
-               <name>Samples/Symbol</name>
-               <key>sps</key>
-               <type>real</type>
-       </param>
-       <param>
-               <name>Gain</name>
-               <key>gain</key>
-               <type>real</type>
-       </param>
-       <param>
-               <name>Taps</name>
-               <key>taps</key>
-               <type>real_vector</type>
-       </param>
-       <param>
-               <name>Filter Size</name>
-               <key>filter_size</key>
-               <type>int</type>
-       </param>
-       <param>
-               <name>Initial Phase</name>
-               <key>init_phase</key>
-               <type>real</type>
-       </param>
-       <sink>
-               <name>in</name>
-               <type>complex</type>
-       </sink>
-       <source>
-               <name>out</name>
-               <type>complex</type>
-       </source>
-       <source>
-               <name>err</name>
-               <type>float</type>
-       </source>
-</block>

diff --git a/grc/blocks/gr_pfb_clock_sync.xml b/grc/blocks/gr_pfb_clock_sync.xml
new file mode 100644 (file)
index 0000000..9e2f3fa
--- /dev/null
+++ b/grc/blocks/gr_pfb_clock_sync.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+## Polyphase Filter based Clock Sync
+###################################################
+ -->
+<block>
+       <name>Polyphase Clock Sync</name>
+       <key>gr_pfb_clock_sync_ccf</key>
+       <import>from gnuradio import gr</import>
+       <make>gr.pfb_clock_sync_ccf($sps, $gain, $taps, $filter_size, $init_phase)</make>
+       <callback>set_taps($taps)</callback>
+       <callback>set_gain($gain)</callback>
+
+       <param>
+               <name>Samples/Symbol</name>
+               <key>sps</key>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Gain</name>
+               <key>gain</key>
+               <type>real</type>
+       </param>
+       <param>
+               <name>Taps</name>
+               <key>taps</key>
+               <type>real_vector</type>
+       </param>
+       <param>
+               <name>Filter Size</name>
+               <key>filter_size</key>
+               <type>int</type>
+       </param>
+       <param>
+               <name>Initial Phase</name>
+               <key>init_phase</key>
+               <type>real</type>
+       </param>
+       <sink>
+               <name>in</name>
+               <type>complex</type>
+       </sink>
+       <source>
+               <name>out</name>
+               <type>complex</type>
+       </source>
+       <source>
+               <name>err</name>
+               <type>float</type>
+               <optional>1</optional>
+       </source>
+</block>