summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom2009-10-06 19:44:58 -0700
committerTom2009-10-06 19:44:58 -0700
commitda451d5d8b85cde797658415f0186d248f2f53dd (patch)
tree74178594a6ef58ee3609d03921af5ae9d1da227f
parent45286cd769e42c325b7c65a2f0a96757e2e97b97 (diff)
downloadgnuradio-da451d5d8b85cde797658415f0186d248f2f53dd.tar.gz
gnuradio-da451d5d8b85cde797658415f0186d248f2f53dd.tar.bz2
gnuradio-da451d5d8b85cde797658415f0186d248f2f53dd.zip
Fixing previous checkin
-rw-r--r--gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h2
-rw-r--r--gnuradio-examples/grc/demod/pam_timing.grc112
-rw-r--r--grc/blocks/gr_pfb_clock_sync.xml3
3 files changed, 59 insertions, 58 deletions
diff --git a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
index 5a6061931..14e958691 100644
--- a/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
+++ b/gnuradio-core/src/lib/filter/gr_pfb_clock_sync_ccf.h
@@ -99,7 +99,7 @@ public:
void print_diff_taps();
void set_alpha(float alpha)
- {
+ {
d_alpha = alpha;
}
void set_beta(float beta)
diff --git a/gnuradio-examples/grc/demod/pam_timing.grc b/gnuradio-examples/grc/demod/pam_timing.grc
index 4152d79a9..fae16841d 100644
--- a/gnuradio-examples/grc/demod/pam_timing.grc
+++ b/gnuradio-examples/grc/demod/pam_timing.grc
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='ASCII'?>
<flow_graph>
- <timestamp>Tue Oct 6 19:23:45 2009</timestamp>
+ <timestamp>Tue Oct 6 19:43:52 2009</timestamp>
<block>
<key>options</key>
<param>
@@ -666,61 +666,6 @@
</param>
</block>
<block>
- <key>variable_slider</key>
- <param>
- <key>id</key>
- <value>interpratio</value>
- </param>
- <param>
- <key>_enabled</key>
- <value>True</value>
- </param>
- <param>
- <key>label</key>
- <value></value>
- </param>
- <param>
- <key>value</key>
- <value>1</value>
- </param>
- <param>
- <key>min</key>
- <value>0</value>
- </param>
- <param>
- <key>max</key>
- <value>2</value>
- </param>
- <param>
- <key>num_steps</key>
- <value>1000</value>
- </param>
- <param>
- <key>style</key>
- <value>wx.SL_HORIZONTAL</value>
- </param>
- <param>
- <key>converver</key>
- <value>float_converter</value>
- </param>
- <param>
- <key>grid_pos</key>
- <value></value>
- </param>
- <param>
- <key>notebook</key>
- <value></value>
- </param>
- <param>
- <key>_coordinate</key>
- <value>(232, 921)</value>
- </param>
- <param>
- <key>_rotation</key>
- <value>0</value>
- </param>
- </block>
- <block>
<key>wxgui_scopesink2</key>
<param>
<key>id</key>
@@ -1050,6 +995,61 @@
<value>0</value>
</param>
</block>
+ <block>
+ <key>variable_slider</key>
+ <param>
+ <key>id</key>
+ <value>interpratio</value>
+ </param>
+ <param>
+ <key>_enabled</key>
+ <value>True</value>
+ </param>
+ <param>
+ <key>label</key>
+ <value></value>
+ </param>
+ <param>
+ <key>value</key>
+ <value>1</value>
+ </param>
+ <param>
+ <key>min</key>
+ <value>0</value>
+ </param>
+ <param>
+ <key>max</key>
+ <value>2</value>
+ </param>
+ <param>
+ <key>num_steps</key>
+ <value>1000</value>
+ </param>
+ <param>
+ <key>style</key>
+ <value>wx.SL_HORIZONTAL</value>
+ </param>
+ <param>
+ <key>converver</key>
+ <value>float_converter</value>
+ </param>
+ <param>
+ <key>grid_pos</key>
+ <value></value>
+ </param>
+ <param>
+ <key>notebook</key>
+ <value></value>
+ </param>
+ <param>
+ <key>_coordinate</key>
+ <value>(232, 921)</value>
+ </param>
+ <param>
+ <key>_rotation</key>
+ <value>0</value>
+ </param>
+ </block>
<connection>
<source_block_id>random_source_x_0</source_block_id>
<sink_block_id>gr_uchar_to_float_0</sink_block_id>
diff --git a/grc/blocks/gr_pfb_clock_sync.xml b/grc/blocks/gr_pfb_clock_sync.xml
index c9487f52c..e62ab84a3 100644
--- a/grc/blocks/gr_pfb_clock_sync.xml
+++ b/grc/blocks/gr_pfb_clock_sync.xml
@@ -10,7 +10,8 @@
<import>from gnuradio import gr</import>
<make>gr.pfb_clock_sync_ccf($sps, $alpha, $taps, $filter_size, $init_phase)</make>
<callback>set_taps($taps)</callback>
- <callback>set_gain($gain)</callback>
+ <callback>set_alpha($alpha)</callback>
+ <callback>set_beta($beta)</callback>
<param>
<name>Samples/Symbol</name>