diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2012-11-28 15:01:30 -0800 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2012-11-28 15:01:30 -0800 |
| commit | 12e279660e7300f42cbe993f89c8ad5ef6a3ea0a (patch) | |
| tree | 080b6fab83c1f8add762b0e01385bd0483a135a7 /gr-digital | |
| parent | e5929906700f3d6fa474fc5d9a8650b1fafbc2a1 (diff) | |
| parent | fbef82839ef85bfd7837f8534af2a3a74018930a (diff) | |
Merge branch 'master' into next
Conflicts:
gr-digital/examples/demod/digital_freq_lock.grc
gr-digital/examples/demod/pam_sync.grc
gr-digital/examples/demod/pam_timing.grc
gr-utils/src/python/CMakeLists.txt
Diffstat (limited to 'gr-digital')
| -rw-r--r-- | gr-digital/examples/demod/ber_simulation.grc | 2 | ||||
| -rw-r--r-- | gr-digital/examples/demod/digital_freq_lock.grc | 61 | ||||
| -rw-r--r-- | gr-digital/examples/demod/pam_sync.grc | 59 | ||||
| -rw-r--r-- | gr-digital/examples/demod/pam_timing.grc | 61 |
4 files changed, 180 insertions, 3 deletions
diff --git a/gr-digital/examples/demod/ber_simulation.grc b/gr-digital/examples/demod/ber_simulation.grc index 3097aa8fa5..2a3e27a496 100644 --- a/gr-digital/examples/demod/ber_simulation.grc +++ b/gr-digital/examples/demod/ber_simulation.grc @@ -5,7 +5,7 @@ <key>options</key> <param> <key>id</key> - <value>ber_sim</value> + <value>ber_simulation</value> </param> <param> <key>_enabled</key> diff --git a/gr-digital/examples/demod/digital_freq_lock.grc b/gr-digital/examples/demod/digital_freq_lock.grc index 17d3296ddb..c08251b8bc 100644 --- a/gr-digital/examples/demod/digital_freq_lock.grc +++ b/gr-digital/examples/demod/digital_freq_lock.grc @@ -2,7 +2,66 @@ <flow_graph> <timestamp>Mon Jul 16 21:25:18 2012</timestamp> <block> - <key>variable</key> + <key>options</key> + <param> + <key>id</key> + <value>digital_freq_lock</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>title</key> + <value></value> + </param> + <param> + <key>author</key> + <value></value> + </param> + <param> + <key>description</key> + <value></value> + </param> + <param> + <key>window_size</key> + <value>1280, 1024</value> + </param> + <param> + <key>generate_options</key> + <value>wx_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(-1, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>random_source_x</key> <param> <key>id</key> <value>sps</value> diff --git a/gr-digital/examples/demod/pam_sync.grc b/gr-digital/examples/demod/pam_sync.grc index 9c73777585..11c625467b 100644 --- a/gr-digital/examples/demod/pam_sync.grc +++ b/gr-digital/examples/demod/pam_sync.grc @@ -2,6 +2,65 @@ <flow_graph> <timestamp>Mon Jul 16 21:25:28 2012</timestamp> <block> + <key>options</key> + <param> + <key>id</key> + <value>pam_sync</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>title</key> + <value></value> + </param> + <param> + <key>author</key> + <value></value> + </param> + <param> + <key>description</key> + <value></value> + </param> + <param> + <key>window_size</key> + <value>1280, 1024</value> + </param> + <param> + <key>generate_options</key> + <value>wx_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(-1, 0)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> <key>variable</key> <param> <key>id</key> diff --git a/gr-digital/examples/demod/pam_timing.grc b/gr-digital/examples/demod/pam_timing.grc index 17ab0fb8ca..6465d25fd0 100644 --- a/gr-digital/examples/demod/pam_timing.grc +++ b/gr-digital/examples/demod/pam_timing.grc @@ -1,6 +1,65 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Mon Jul 16 21:25:37 2012</timestamp> + <timestamp>Thu Jul 5 17:55:51 2012</timestamp> + <block> + <key>options</key> + <param> + <key>id</key> + <value>pam_timing</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>title</key> + <value></value> + </param> + <param> + <key>author</key> + <value></value> + </param> + <param> + <key>description</key> + <value></value> + </param> + <param> + <key>window_size</key> + <value>1280, 1024</value> + </param> + <param> + <key>generate_options</key> + <value>wx_gui</value> + </param> + <param> + <key>category</key> + <value>Custom</value> + </param> + <param> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> + <value>True</value> + </param> + <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> + <key>realtime_scheduling</key> + <value></value> + </param> + <param> + <key>_coordinate</key> + <value>(10, 10)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <block> <key>gr_uchar_to_float</key> <param> |