From 9988664127b367fa8fee4409f8460673d6f265e1 Mon Sep 17 00:00:00 2001
From: jblum
Date: Tue, 23 Jun 2009 20:38:18 +0000
Subject: Merging r11186:11273 from grc branch. Fixes, features, and
 reorganization for grc. Minor fixes and features for wxgui forms.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11274 221aa14e-8319-0410-a670-987f0aec2ac5
---
 grc/blocks/gr_pll_carriertracking_cc.xml | 40 ++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 grc/blocks/gr_pll_carriertracking_cc.xml

(limited to 'grc/blocks/gr_pll_carriertracking_cc.xml')

diff --git a/grc/blocks/gr_pll_carriertracking_cc.xml b/grc/blocks/gr_pll_carriertracking_cc.xml
new file mode 100644
index 000000000..5b876b259
--- /dev/null
+++ b/grc/blocks/gr_pll_carriertracking_cc.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##PLL Carrier Tracking
+###################################################
+ -->
+<block>
+	<name>PLL Carrier Tracking</name>
+	<key>gr_pll_carriertracking_cc</key>
+	<import>from gnuradio import gr</import>
+	<make>gr.pll_carriertracking_cc($alpha, $beta, $max_freq, $min_freq)</make>
+	<param>
+		<name>Alpha</name>
+		<key>alpha</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Beta</name>
+		<key>beta</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Max Freq</name>
+		<key>max_freq</key>
+		<type>real</type>
+	</param>
+	<param>
+		<name>Min Freq</name>
+		<key>min_freq</key>
+		<type>real</type>
+	</param>
+	<sink>
+		<name>in</name>
+		<type>complex</type>
+	</sink>
+	<source>
+		<name>out</name>
+		<type>complex</type>
+	</source>
+</block>
-- 
cgit 


From 194cb7f405858fdcd76f8e7595d4970f4a2da984 Mon Sep 17 00:00:00 2001
From: Tom Rondeau
Date: Thu, 1 Sep 2011 15:35:12 -0400
Subject: Fixing GRC files for new API to loop blocks.

---
 grc/blocks/gr_pll_carriertracking_cc.xml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'grc/blocks/gr_pll_carriertracking_cc.xml')

diff --git a/grc/blocks/gr_pll_carriertracking_cc.xml b/grc/blocks/gr_pll_carriertracking_cc.xml
index 5b876b259..27e673248 100644
--- a/grc/blocks/gr_pll_carriertracking_cc.xml
+++ b/grc/blocks/gr_pll_carriertracking_cc.xml
@@ -8,15 +8,11 @@
 	<name>PLL Carrier Tracking</name>
 	<key>gr_pll_carriertracking_cc</key>
 	<import>from gnuradio import gr</import>
-	<make>gr.pll_carriertracking_cc($alpha, $beta, $max_freq, $min_freq)</make>
+	<make>gr.pll_carriertracking_cc($w, $max_freq, $min_freq)</make>
+	<callback>set_loop_bandwidth($w)</callback>
 	<param>
-		<name>Alpha</name>
-		<key>alpha</key>
-		<type>real</type>
-	</param>
-	<param>
-		<name>Beta</name>
-		<key>beta</key>
+		<name>Loop Bandwidth</name>
+		<key>w</key>
 		<type>real</type>
 	</param>
 	<param>
-- 
cgit