[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8078 - in grc/branches/grc_reloaded: . src/grc_gnurad
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8078 - in grc/branches/grc_reloaded: . src/grc_gnuradio/blocks src/grc_gnuradio/blocks/conversions src/grc_gnuradio/blocks/filters src/grc_gnuradio/blocks/sources src/grc_gnuradio/data |
|
Date: |
Sun, 23 Mar 2008 01:52:22 -0600 (MDT) |
Author: jblum
Date: 2008-03-23 01:52:21 -0600 (Sun, 23 Mar 2008)
New Revision: 8078
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_binary_slicer_fb.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_map_bb.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_unpack_k_bits_bb.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_fft_filter_xxx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_fir_filter_xxx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_threshold_ff.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_glfsr_source_x.xml
Removed:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/random_source_x.xml
Modified:
grc/branches/grc_reloaded/setup.py
grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
Log:
some filters, finish misc conversions
Modified: grc/branches/grc_reloaded/setup.py
===================================================================
--- grc/branches/grc_reloaded/setup.py 2008-03-23 06:39:17 UTC (rev 8077)
+++ grc/branches/grc_reloaded/setup.py 2008-03-23 07:52:21 UTC (rev 8078)
@@ -49,6 +49,7 @@
'blocks/graphical_sinks/*.xml',
'blocks/operators/*.xml',
'blocks/conversions/*.xml',
+ 'blocks/filters/*.xml',
'blocks/variables/*.xml',
'blocks/misc/*.xml',
'blocks/usrp/*.xml',
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_binary_slicer_fb.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_binary_slicer_fb.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_binary_slicer_fb.xml
2008-03-23 07:52:21 UTC (rev 8078)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Binary Slicer
+###################################################
+ -->
+<block>
+ <name>Binary Slicer</name>
+ <key>gr_binary_slicer_fb</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.binary_slicer_fb()</make>
+ <sink>
+ <name>in</name>
+ <type>float</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>byte</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_map_bb.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_map_bb.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_map_bb.xml
2008-03-23 07:52:21 UTC (rev 8078)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Map
+###################################################
+ -->
+<block>
+ <name>Map</name>
+ <key>gr_map_bb</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.map_bb($map)</make>
+ <param>
+ <name>Map</name>
+ <key>map</key>
+ <type>int_vector</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>byte</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>byte</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_unpack_k_bits_bb.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_unpack_k_bits_bb.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_unpack_k_bits_bb.xml
2008-03-23 07:52:21 UTC (rev 8078)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Unpack K Bits
+###################################################
+ -->
+<block>
+ <name>Unpack K Bits</name>
+ <key>gr_unpack_k_bits_bb</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.unpack_k_bits_bb($k)</make>
+ <param>
+ <name>K</name>
+ <key>k</key>
+ <type>int</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>byte</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>byte</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_fft_filter_xxx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_fft_filter_xxx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_fft_filter_xxx.xml
2008-03-23 07:52:21 UTC (rev 8078)
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##FFT Filter
+###################################################
+ -->
+<block>
+ <name>FFT Filter</name>
+ <key>gr_fft_filter_xxx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.fft_filter_$(type)($decim, $taps)</make>
+ <callback>set_taps($taps)</callback>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex->Complex (Complex Taps)</name>
+ <key>ccc</key>
+ <opt>input:complex</opt>
+ <opt>output:complex</opt>
+ <opt>taps:complex_vector</opt>
+ </option>
+ <option>
+ <name>Float->Float (Real Taps)</name>
+ <key>fff</key>
+ <opt>input:float</opt>
+ <opt>output:float</opt>
+ <opt>taps:real_vector</opt>
+ </option>
+ </param>
+ <param>
+ <name>Decimation</name>
+ <key>decim</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Taps</name>
+ <key>taps</key>
+ <type>$type.taps</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type.input</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type.output</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_fir_filter_xxx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_fir_filter_xxx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_fir_filter_xxx.xml
2008-03-23 07:52:21 UTC (rev 8078)
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##FIR Filter
+###################################################
+ -->
+<block>
+ <name>FIR Filter</name>
+ <key>gr_fir_filter_xxx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.fir_filter_$(type)($decim, $taps)</make>
+ <callback>set_taps($taps)</callback>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex->Complex (Complex Taps)</name>
+ <key>ccc</key>
+ <opt>input:complex</opt>
+ <opt>output:complex</opt>
+ <opt>taps:complex_vector</opt>
+ </option>
+ <option>
+ <name>Complex->Complex (Real Taps)</name>
+ <key>ccf</key>
+ <opt>input:complex</opt>
+ <opt>output:complex</opt>
+ <opt>taps:real_vector</opt>
+ </option>
+ <option>
+ <name>Float->Complex (Complex Taps)</name>
+ <key>fcc</key>
+ <opt>input:float</opt>
+ <opt>output:complex</opt>
+ <opt>taps:complex_vector</opt>
+ </option>
+ <option>
+ <name>Float->Float (Real Taps)</name>
+ <key>fff</key>
+ <opt>input:float</opt>
+ <opt>output:float</opt>
+ <opt>taps:real_vector</opt>
+ </option>
+ <option>
+ <name>Float->Short (Real Taps)</name>
+ <key>fsf</key>
+ <opt>input:float</opt>
+ <opt>output:short</opt>
+ <opt>taps:real_vector</opt>
+ </option>
+ <option>
+ <name>Short->Complex (Complex Taps)</name>
+ <key>scc</key>
+ <opt>input:short</opt>
+ <opt>output:complex</opt>
+ <opt>taps:complex_vector</opt>
+ </option>
+ </param>
+ <param>
+ <name>Decimation</name>
+ <key>decim</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Taps</name>
+ <key>taps</key>
+ <type>$type.taps</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type.input</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type.output</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_threshold_ff.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_threshold_ff.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_threshold_ff.xml
2008-03-23 07:52:21 UTC (rev 8078)
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Threshold
+###################################################
+ -->
+<block>
+ <name>Threshold</name>
+ <key>gr_threshold_ff</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.threshold_ff($low, $high, $init)</make>
+ <param>
+ <name>Low</name>
+ <key>low</key>
+ <value>-100</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>High</name>
+ <key>high</key>
+ <value>100</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Initial State</name>
+ <key>init</key>
+ <value>0</value>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>float</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_glfsr_source_x.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_glfsr_source_x.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_glfsr_source_x.xml
2008-03-23 07:52:21 UTC (rev 8078)
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##GLFSR Source
+###################################################
+ -->
+<block>
+ <name>GLFSR Source</name>
+ <key>gr_glfsr_source_x</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.glfsr_source_$(type.fcn)($degree, $repeat, $mask, $seed)</make>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:f</opt>
+ </option>
+ <option>
+ <name>Byte</name>
+ <key>byte</key>
+ <opt>fcn:b</opt>
+ </option>
+ </param>
+ <param>
+ <name>Degree</name>
+ <key>degree</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Repeat</name>
+ <key>repeat</key>
+ <type>enum</type>
+ <option>
+ <name>Yes</name>
+ <key>True</key>
+ </option>
+ <option>
+ <name>No</name>
+ <key>False</key>
+ </option>
+ </param>
+ <param>
+ <name>Mask</name>
+ <key>mask</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Seed</name>
+ <key>seed</key>
+ <type>int</type>
+ </param>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ </source>
+</block>
Deleted:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/random_source_x.xml
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-03-23 06:39:17 UTC (rev 8077)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-03-23 07:52:21 UTC (rev 8078)
@@ -10,8 +10,8 @@
<name>Sources</name>
<block>gr_sig_source_x</block>
<block>gr_noise_source_x</block>
- <block>gr_vector_source_x</block>
- <block>random_source_x</block>
+ <block>gr_vector_source_x</block>
+ <block>gr_glfsr_source_x</block>
<block>gr_null_source</block>
<block>gr_file_source</block>
<block>gr_udp_source</block>
@@ -94,15 +94,15 @@
<name>Misc Conversions</name>
<block>gr_unpacked_to_packed_xx</block>
<block>gr_packed_to_unpacked_xx</block>
- <block>unpack_kbits</block>
- <block>binary_slicer</block>
+ <block>gr_unpack_k_bits_bb</block>
+ <block>gr_binary_slicer_fb</block>
<block>gr_chunks_to_symbols_xx</block>
- <block>map</block>
+ <block>gr_map_bb</block>
</cat>
<cat>
<name>Generic Filters</name>
- <block>fir_filter</block>
- <block>fft_filter</block>
+ <block>gr_fir_filter_xxx</block>
+ <block>gr_fft_filter_xxx</block>
<block>freq_xlating_fir_filter</block>
<block>rational_resampler</block>
<block>iir_filter</block>
@@ -133,6 +133,7 @@
<block>clock_recovery</block>
<block>fft</block>
<block>ifft</block>
+ <block>gr_threshold_ff</block>
</cat>
<cat>
<name>Modulators</name>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8078 - in grc/branches/grc_reloaded: . src/grc_gnuradio/blocks src/grc_gnuradio/blocks/conversions src/grc_gnuradio/blocks/filters src/grc_gnuradio/blocks/sources src/grc_gnuradio/data,
jblum <=