[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8807 - in grc/trunk/src/grc_gnuradio: blocks/conversi
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8807 - in grc/trunk/src/grc_gnuradio: blocks/conversions blocks/filters blocks/operators data |
|
Date: |
Sat, 5 Jul 2008 20:38:06 -0600 (MDT) |
Author: jblum
Date: 2008-07-05 20:38:05 -0600 (Sat, 05 Jul 2008)
New Revision: 8807
Added:
grc/trunk/src/grc_gnuradio/blocks/conversions/blks2_stream_to_vector_decimator.xml
grc/trunk/src/grc_gnuradio/blocks/operators/blks2_logpwrfft_x.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_fft_vxx.xml
Removed:
grc/trunk/src/grc_gnuradio/blocks/filters/gr_fft_vxx.xml
Modified:
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_stream_to_vector.xml
grc/trunk/src/grc_gnuradio/data/block_tree.xml
Log:
new blks2 blocks
Added:
grc/trunk/src/grc_gnuradio/blocks/conversions/blks2_stream_to_vector_decimator.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/conversions/blks2_stream_to_vector_decimator.xml
(rev 0)
+++
grc/trunk/src/grc_gnuradio/blocks/conversions/blks2_stream_to_vector_decimator.xml
2008-07-06 02:38:05 UTC (rev 8807)
@@ -0,0 +1,78 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Stream to Vector Decimator
+###################################################
+ -->
+<block>
+ <name>Stream to Vec Decim</name>
+ <key>blks2_stream_to_vector_decimator</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.stream_to_vector_decimator(
+ item_size=$type.size,
+ sample_rate=$sample_rate,
+ vec_rate=$vec_rate,
+ vec_len=$vlen,
+)</make>
+ <callback>set_sample_rate($sample_rate)</callback>
+ <callback>set_vec_rate($vec_rate)</callback>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>size:gr.sizeof_gr_complex</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>size:gr.sizeof_float</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>size:gr.sizeof_int</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>size:gr.sizeof_short</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>size:gr.sizeof_char</opt>
+ </option>
+ </param>
+ <param>
+ <name>Sample Rate</name>
+ <key>sample_rate</key>
+ <value>samp_rate</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Vec Rate</name>
+ <key>vec_rate</key>
+ <value>30</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1024</value>
+ <type>int</type>
+ </param>
+ <check>$vlen >= 1</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_stream_to_vector.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_stream_to_vector.xml
2008-07-05 21:40:37 UTC (rev 8806)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_stream_to_vector.xml
2008-07-06 02:38:05 UTC (rev 8807)
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Stream to Vector
###################################################
@@ -17,40 +17,40 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>Num Items</name>
<key>num_items</key>
<value>2</value>
- <type>int</type>
- </param>
+ <type>int</type>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_items > 0</check>
<check>$vlen >= 1</check>
Deleted: grc/trunk/src/grc_gnuradio/blocks/filters/gr_fft_vxx.xml
Added: grc/trunk/src/grc_gnuradio/blocks/operators/blks2_logpwrfft_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/blks2_logpwrfft_x.xml
(rev 0)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/blks2_logpwrfft_x.xml
2008-07-06 02:38:05 UTC (rev 8807)
@@ -0,0 +1,90 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Log Power FFT
+###################################################
+ -->
+<block>
+ <name>Log Power FFT</name>
+ <key>blks2_logpwrfft_x</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.logpwrfft_$(type.fcn)(
+ sample_rate=$sample_rate,
+ fft_size=$fft_size,
+ ref_scale=$ref_scale,
+ frame_rate=$frame_rate,
+ avg_alpha=$avg_alpha,
+ average=$average,
+)</make>
+ <callback>set_sample_rate($sample_rate)</callback>
+ <callback>set_avg_alpha($avg_alpha)</callback>
+ <param>
+ <name>Input Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:c</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:f</opt>
+ </option>
+ </param>
+ <param>
+ <name>Sample Rate</name>
+ <key>sample_rate</key>
+ <value>samp_rate</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>FFT Size</name>
+ <key>fft_size</key>
+ <value>1024</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Reference Scale</name>
+ <key>ref_scale</key>
+ <value>2</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Frame Rate</name>
+ <key>frame_rate</key>
+ <value>30</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Average Alpha</name>
+ <key>avg_alpha</key>
+ <value>1.0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Average</name>
+ <key>average</key>
+ <value>False</value>
+ <type>enum</type>
+ <option>
+ <name>On</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>Off</name>
+ <key>False</key>
+ </option>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ <vlen>$fft_size</vlen>
+ </source>
+</block>
Copied: grc/trunk/src/grc_gnuradio/blocks/operators/gr_fft_vxx.xml (from rev
8806, grc/trunk/src/grc_gnuradio/blocks/filters/gr_fft_vxx.xml)
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_fft_vxx.xml
(rev 0)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_fft_vxx.xml 2008-07-06
02:38:05 UTC (rev 8807)
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##FFT
+###################################################
+ -->
+<block>
+ <name>FFT</name>
+ <key>gr_fft_vxx</key>
+ <import>from gnuradio import gr</import>
+ <import>from gnuradio import window</import>
+ <make>#if $type.eval == "complex"
+gr.fft_vcc($fft_size, $forward, $window, $shift)
+#else
+gr.fft_vfc($fft_size, $forward, $window)
+#end if</make>
+ <param>
+ <name>Input Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ </option>
+ </param>
+ <param>
+ <name>FFT Size</name>
+ <key>fft_size</key>
+ <value>1024</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Forward/Reverse</name>
+ <key>forward</key>
+ <type>enum</type>
+ <option>
+ <name>Forward</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>Reverse</name>
+ <key>False</key>
+ </option>
+ </param>
+ <param>
+ <name>Window</name>
+ <key>window</key>
+ <value>window.blackmanharris(1024)</value>
+ <type>real_vector</type>
+ </param>
+ <param>
+ <name>Shift</name>
+ <key>shift</key>
+ <type>enum</type>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$fft_size</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ <vlen>$fft_size</vlen>
+ </source>
+ <doc>
+The shift option only applies when using complex input.
+ </doc>
+</block>
Modified: grc/trunk/src/grc_gnuradio/data/block_tree.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/data/block_tree.xml 2008-07-05 21:40:37 UTC
(rev 8806)
+++ grc/trunk/src/grc_gnuradio/data/block_tree.xml 2008-07-06 02:38:05 UTC
(rev 8807)
@@ -59,6 +59,9 @@
<block>gr_integrate_xx</block>
<block>gr_conjugate_cc</block>
+
+ <block>gr_fft_vxx</block>
+ <block>blks2_logpwrfft_x</block>
</cat>
<cat>
<name>Type Conversions</name>
@@ -96,6 +99,8 @@
<block>gr_stream_to_vector</block>
<block>gr_vector_to_stream</block>
+
+ <block>blks2_stream_to_vector_decimator</block>
</cat>
<cat>
<name>Misc Conversions</name>
@@ -109,12 +114,12 @@
<cat>
<name>Synchronizers</name>
<block>gr_clock_recovery_mm_xx</block>
-
+
<block>gr_costas_loop_cc</block>
<block>gr_dd_mpsk_sync_cc</block>
<block>gr_mpsk_sync_cc</block>
<block>gr_mpsk_receiver_cc</block>
-
+
<block>gr_pll_carriertracking_cc</block>
<block>gr_pll_freqdet_cf</block>
<block>gr_pll_refout_cc</block>
@@ -156,7 +161,6 @@
<block>gr_iir_filter_ffd</block>
<block>gr_filter_delay_fc</block>
<block>blks2_channel_model</block>
- <block>gr_fft_vxx</block>
<!-- Other filters -->
<block>gr_single_pole_iir_filter_xx</block>
<block>gr_hilbert_fc</block>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8807 - in grc/trunk/src/grc_gnuradio: blocks/conversions blocks/filters blocks/operators data,
jblum <=