From 02a14678e889b09d41eaf903962733c47791c9cb Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 25 Sep 2009 00:24:48 -0700
Subject: Added a run options to the "no gui" generate options. The user can
select between run to completion and prompt for exit.
Also fixed the props dialog is changed function to have better hashes.
Now we hash a tuple of all "relevant" items which is "order aware".
Since xoring the individual hashes proved faulty when 2 params alternated hiding.
(cherry picked from commit fd37328c778ea8014e9ea9d932e61e5d229dd012)
---
grc/blocks/options.xml | 29 +++++++++++++++++++++++------
1 file changed, 23 insertions(+), 6 deletions(-)
(limited to 'grc/blocks')
diff --git a/grc/blocks/options.xml b/grc/blocks/options.xml
index 1798a69f8..4d0dd2899 100644
--- a/grc/blocks/options.xml
+++ b/grc/blocks/options.xml
@@ -77,20 +77,37 @@ else: self.stop(); self.wait()
string
#if $generate_options() == 'hb' then 'none' else 'all'#
+
+ Run Options
+ run_options
+ prompt
+ enum
+ #if $generate_options() == 'no_gui' then 'none' else 'all'#
+
+ Run to Completion
+ run
+
+
+ Prompt for Exit
+ prompt
+
+
Run
run
True
bool
- #if $generate_options() == 'wx_gui'
- #if str($run) == 'True'
-part#slurp
+
+#if $generate_options() == 'wx_gui'
+ #if $run()
+ part
#else
-none#slurp
+ none
#end if
#else
-all#slurp
-#end if
+ all
+#end if
+
Autostart
True
--
cgit
From 3159eba60cbf3a8ed2fee798e2bc0c557a284984 Mon Sep 17 00:00:00 2001
From: Johnathan Corgan
Date: Tue, 6 Oct 2009 14:56:43 -0700
Subject: Add gr.pfb_clock_recovery to GRC
---
grc/blocks/Makefile.am | 1 +
grc/blocks/block_tree.xml | 5 ++--
grc/blocks/gr_pfb_clock_recovery.xml | 52 ++++++++++++++++++++++++++++++++++++
3 files changed, 56 insertions(+), 2 deletions(-)
create mode 100644 grc/blocks/gr_pfb_clock_recovery.xml
(limited to 'grc/blocks')
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 617a3bf60..0ee9be6ca 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -144,6 +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_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 296f0ee91..5b10d1f12 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -124,6 +124,7 @@
Synchronizers
gr_clock_recovery_mm_xx
+ gr_pfb_clock_recovery_ccf
gr_costas_loop_cc
gr_dd_mpsk_sync_cc
@@ -167,7 +168,7 @@
band_pass_filter
band_reject_filter
root_raised_cosine_filter
-
+
gr_fir_filter_xxx
gr_interp_fir_filter_xxx
gr_fft_filter_xxx
@@ -178,7 +179,7 @@
blks2_synthesis_filterbank
blks2_analysis_filterbank
-
+
blks2_pfb_arb_resampler_ccf
gr_single_pole_iir_filter_xx
diff --git a/grc/blocks/gr_pfb_clock_recovery.xml b/grc/blocks/gr_pfb_clock_recovery.xml
new file mode 100644
index 000000000..90ecfcf41
--- /dev/null
+++ b/grc/blocks/gr_pfb_clock_recovery.xml
@@ -0,0 +1,52 @@
+
+
+
+ Polyphase Clock Recovery
+ gr_pfb_clock_recovery_ccf
+ from gnuradio import gr
+ gr.pfb_clock_recovery_ccf($sps, $gain, $taps, $filter_size, $init_phase)
+ set_taps($taps)
+ set_gain($gain)
+
+
+ Samples/Symbol
+ sps
+ real
+
+
+ Gain
+ gain
+ real
+
+
+ Taps
+ taps
+ real_vector
+
+
+ Filter Size
+ filter_size
+ int
+
+
+ Initial Phase
+ init_phase
+ real
+
+
+ in
+ complex
+
+
+ out
+ complex
+
+
+ err
+ float
+
+
--
cgit
From 2d93968cd63aa89cbd218f7d70ed2ae44393bab1 Mon Sep 17 00:00:00 2001
From: Matt Ettus
Date: Tue, 6 Oct 2009 15:37:30 -0700
Subject: rename and make output optional
---
grc/blocks/Makefile.am | 2 +-
grc/blocks/block_tree.xml | 2 +-
grc/blocks/gr_pfb_clock_recovery.xml | 52 -----------------------------------
grc/blocks/gr_pfb_clock_sync.xml | 53 ++++++++++++++++++++++++++++++++++++
4 files changed, 55 insertions(+), 54 deletions(-)
delete mode 100644 grc/blocks/gr_pfb_clock_recovery.xml
create mode 100644 grc/blocks/gr_pfb_clock_sync.xml
(limited to 'grc/blocks')
diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 0ee9be6ca..7c769c4b4 100644
--- 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 5b10d1f12..509956d3b 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -124,7 +124,7 @@
Synchronizers
gr_clock_recovery_mm_xx
- gr_pfb_clock_recovery_ccf
+ gr_pfb_clock_sync_ccf
gr_costas_loop_cc
gr_dd_mpsk_sync_cc
diff --git a/grc/blocks/gr_pfb_clock_recovery.xml b/grc/blocks/gr_pfb_clock_recovery.xml
deleted file mode 100644
index 90ecfcf41..000000000
--- a/grc/blocks/gr_pfb_clock_recovery.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
- Polyphase Clock Recovery
- gr_pfb_clock_recovery_ccf
- from gnuradio import gr
- gr.pfb_clock_recovery_ccf($sps, $gain, $taps, $filter_size, $init_phase)
- set_taps($taps)
- set_gain($gain)
-
-
- Samples/Symbol
- sps
- real
-
-
- Gain
- gain
- real
-
-
- Taps
- taps
- real_vector
-
-
- Filter Size
- filter_size
- int
-
-
- Initial Phase
- init_phase
- real
-
-
- in
- complex
-
-
- out
- complex
-
-
- err
- float
-
-
diff --git a/grc/blocks/gr_pfb_clock_sync.xml b/grc/blocks/gr_pfb_clock_sync.xml
new file mode 100644
index 000000000..9e2f3fa9c
--- /dev/null
+++ b/grc/blocks/gr_pfb_clock_sync.xml
@@ -0,0 +1,53 @@
+
+
+
+ Polyphase Clock Sync
+ gr_pfb_clock_sync_ccf
+ from gnuradio import gr
+ gr.pfb_clock_sync_ccf($sps, $gain, $taps, $filter_size, $init_phase)
+ set_taps($taps)
+ set_gain($gain)
+
+
+ Samples/Symbol
+ sps
+ real
+
+
+ Gain
+ gain
+ real
+
+
+ Taps
+ taps
+ real_vector
+
+
+ Filter Size
+ filter_size
+ int
+
+
+ Initial Phase
+ init_phase
+ real
+
+
+ in
+ complex
+
+
+ out
+ complex
+
+
+ err
+ float
+ 1
+
+
--
cgit