[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8082 - in grc/branches/grc_reloaded/src/grc_gnuradio:
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8082 - in grc/branches/grc_reloaded/src/grc_gnuradio: blks2 blocks/filters blocks/misc blocks/operators blocks/sinks blocks/sources data |
|
Date: |
Sun, 23 Mar 2008 17:55:38 -0600 (MDT) |
Author: jblum
Date: 2008-03-23 17:55:37 -0600 (Sun, 23 Mar 2008)
New Revision: 8082
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_agc2_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_agc_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_feedforward_agc_cc.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_fft_vxx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_keep_one_in_n.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_pwr_squelch_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_rms_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_simple_squelch_cc.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/blks2_selector.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/blks2_valve.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_delay.xml
Removed:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/selector.xml
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blks2/__init__.py
grc/branches/grc_reloaded/src/grc_gnuradio/blks2/selector.py
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_head.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_kludge_copy.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_nop.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_skiphead.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_throttle.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_const_vxx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_vxx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_multiply_const_vxx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_multiply_vxx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_file_sink.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_null_sink.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_udp_sink.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_file_source.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_null_source.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_udp_source.xml
grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
Log:
more filters and misc
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blks2/__init__.py
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blks2/__init__.py
2008-03-23 20:23:28 UTC (rev 8081)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blks2/__init__.py
2008-03-23 23:55:37 UTC (rev 8082)
@@ -20,6 +20,6 @@
#Package for external gnuradio blocks.
address@hidden Josh Blum
-from selector import selector
+from selector import selector, valve
from packet import packet_mod, packet_demod
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blks2/selector.py
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blks2/selector.py
2008-03-23 20:23:28 UTC (rev 8081)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blks2/selector.py
2008-03-23 23:55:37 UTC (rev 8082)
@@ -21,7 +21,7 @@
#
from gnuradio import gr
-
+
class selector(gr.hier_block2):
"""A hier2 block with N inputs and M outputs, where data is only
forwarded through input n to output m."""
def __init__(self, item_size, num_inputs, num_outputs, input_index,
output_index):
@@ -109,3 +109,25 @@
self._connect_current()
self.unlock()
+class valve(selector):
+ """Wrapper for selector with 1 input and 1 output."""
+
+ def __init__(self, item_size, open):
+ """!
+ Constructor for valve.
+ @param item_size the size of the gr data stream in bytes
+ @param open true if initial valve state is open
+ """
+ if open: output_index = -1
+ else: output_index = 0
+ selector.__init__(self, item_size, 1, 1, 0, output_index)
+
+ def set_open(open):
+ """!
+ Callback to set open state.
+ @param open true to set valve state to open
+ """
+ if open: output_index = -1
+ else: output_index = 0
+ self.set_output_index(output_index)
+
Added: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_agc2_xx.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_agc2_xx.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_agc2_xx.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##AGC2
+###################################################
+ -->
+<block>
+ <name>AGC2</name>
+ <key>gr_agc2_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.agc2_$(type.fcn)($attack_rate, $decay_rate, $reference, $gain,
$max_gain)</make>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:cc</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:ff</opt>
+ </option>
+ </param>
+ <param>
+ <name>Attack Rate</name>
+ <key>attack_rate</key>
+ <value>1e-1</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Decay Rate</name>
+ <key>decay_rate</key>
+ <value>1e-2</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Reference</name>
+ <key>reference</key>
+ <value>1.0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Gain</name>
+ <key>gain</key>
+ <value>1.0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Max Gain</name>
+ <key>max_gain</key>
+ <value>0.0</value>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ </source>
+</block>
Added: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_agc_xx.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_agc_xx.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_agc_xx.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##AGC
+###################################################
+ -->
+<block>
+ <name>AGC</name>
+ <key>gr_agc_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.agc_$(type.fcn)($rate, $reference, $gain, $max_gain)</make>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:cc</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:ff</opt>
+ </option>
+ </param>
+ <param>
+ <name>Rate</name>
+ <key>rate</key>
+ <value>1e-4</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Reference</name>
+ <key>reference</key>
+ <value>1.0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Gain</name>
+ <key>gain</key>
+ <value>1.0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Max Gain</name>
+ <key>max_gain</key>
+ <value>0.0</value>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_feedforward_agc_cc.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_feedforward_agc_cc.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_feedforward_agc_cc.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Feed Forward AGC
+###################################################
+ -->
+<block>
+ <name>Feed Forward AGC</name>
+ <key>gr_feedforward_agc_cc</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.feedforward_agc_cc($num_samples, $reference)</make>
+ <param>
+ <name>Num Samples</name>
+ <key>num_samples</key>
+ <value>1024</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Reference</name>
+ <key>reference</key>
+ <value>1.0</value>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ </source>
+</block>
Added: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_fft_vxx.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_fft_vxx.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_fft_vxx.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -0,0 +1,80 @@
+<?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>
+ <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>
+ <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>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_keep_one_in_n.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_keep_one_in_n.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_keep_one_in_n.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -0,0 +1,68 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Keep 1 in N
+###################################################
+ -->
+<block>
+ <name>Keep 1 in N</name>
+ <key>gr_keep_one_in_n</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.keep_one_in_n($type.size*$vlen, $n)</make>
+ <callback>set_n($n)</callback>
+ <param>
+ <name>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>N</name>
+ <key>n</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$n > 0</check>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_pwr_squelch_xx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_pwr_squelch_xx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_pwr_squelch_xx.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Power Squelch
+###################################################
+ -->
+<block>
+ <name>Power Squelch</name>
+ <key>gr_pwr_squelch_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.pwr_squelch_$(type.fcn)($threshold, $alpha, $ramp,
$gate)</make>
+ <callback>set_threshold($threshold)</callback>
+ <callback>set_alpha($alpha)</callback>
+ <param>
+ <name>Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:cc</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:ff</opt>
+ </option>
+ </param>
+ <param>
+ <name>Threshold (dB)</name>
+ <key>threshold</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Alpha</name>
+ <key>alpha</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Ramp</name>
+ <key>ramp</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Gate</name>
+ <key>gate</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>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ </source>
+</block>
Added: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_rms_xx.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_rms_xx.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_rms_xx.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##RMS
+###################################################
+ -->
+<block>
+ <name>RMS</name>
+ <key>gr_rms_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.rms_$(type.fcn)f($alpha)</make>
+ <callback>set_alpha($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>Alpha</name>
+ <key>alpha</key>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_simple_squelch_cc.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_simple_squelch_cc.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_simple_squelch_cc.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Simple Squelch
+###################################################
+ -->
+<block>
+ <name>Simple Squelch</name>
+ <key>gr_simple_squelch_cc</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.simple_squelch_cc($threshold, $alpha)</make>
+ <callback>set_threshold($threshold)</callback>
+ <callback>set_alpha($alpha)</callback>
+ <param>
+ <name>Threshold (dB)</name>
+ <key>threshold</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Alpha</name>
+ <key>alpha</key>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ </source>
+</block>
Copied:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/blks2_selector.xml (from
rev 8076, grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/selector.xml)
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/blks2_selector.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/blks2_selector.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -0,0 +1,98 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Selector:
+## Custom blks2 block
+###################################################
+ -->
+<block>
+ <name>Selector</name>
+ <key>blks2_selector</key>
+ <import>from grc_gnuradio import blks2 as grc_blks2</import>
+ <make>grc_blks2.selector(
+ item_size=$type.size*$vlen,
+ num_inputs=$num_inputs,
+ num_outputs=$num_outputs,
+ input_index=$input_index,
+ output_index=$output_index,
+)</make>
+ <callback>set_input_index($input_index)</callback>
+ <callback>set_output_index($output_index)</callback>
+ <param>
+ <name>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>Num Inputs</name>
+ <key>num_inputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Num Outputs</name>
+ <key>num_outputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Input Index</name>
+ <key>input_index</key>
+ <value>0</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Output Index</name>
+ <key>output_index</key>
+ <value>0</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_inputs</nports>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_outputs</nports>
+ </source>
+ <doc>
+Connect the sink at input index to the source at output index. Leave all other
ports disconnected.
+ </doc>
+</block>
Added: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/blks2_valve.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/blks2_valve.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/blks2_valve.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Valve:
+## Custom blks2 block
+###################################################
+ -->
+<block>
+ <name>Valve</name>
+ <key>blks2_valve</key>
+ <import>from grc_gnuradio import blks2 as grc_blks2</import>
+ <make>grc_blks2.valve(item_size=$type.size*$vlen,
open=bool($open))</make>
+ <callback>set_open(bool($open))</callback>
+ <param>
+ <name>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>Open</name>
+ <key>open</key>
+ <value>0</value>
+ <type>raw</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_inputs</nports>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_outputs</nports>
+ </source>
+ <doc>
+Connect output to input when valve is closed (not open).
+ </doc>
+</block>
Added: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_delay.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_delay.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_delay.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -0,0 +1,66 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Delay
+###################################################
+ -->
+<block>
+ <name>Delay</name>
+ <key>gr_delay</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.head($type.size*$vlen, $delay)</make>
+ <param>
+ <name>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>Delay</name>
+ <key>delay</key>
+ <value>0</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_head.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_head.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_head.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -52,7 +52,7 @@
<value>1</value>
<type>int</type>
</param>
- <check>$vlen >= 1</check>
+ <check>$vlen > 0</check>
<sink>
<name>in</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_kludge_copy.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_kludge_copy.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_kludge_copy.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -46,7 +46,7 @@
<value>1</value>
<type>int</type>
</param>
- <check>$vlen >= 1</check>
+ <check>$vlen > 0</check>
<sink>
<name>in</name>
<type>$type</type>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_nop.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_nop.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_nop.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -46,7 +46,7 @@
<value>1</value>
<type>int</type>
</param>
- <check>$vlen >= 1</check>
+ <check>$vlen > 0</check>
<sink>
<name>in</name>
<type>$type</type>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_skiphead.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_skiphead.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_skiphead.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -52,7 +52,7 @@
<value>1</value>
<type>int</type>
</param>
- <check>$vlen >= 1</check>
+ <check>$vlen > 0</check>
<sink>
<name>in</name>
<type>$type</type>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_throttle.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_throttle.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_throttle.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -52,7 +52,7 @@
<value>1</value>
<type>int</type>
</param>
- <check>$vlen >= 1</check>
+ <check>$vlen > 0</check>
<sink>
<name>in</name>
<type>$type</type>
Deleted: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/selector.xml
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_const_vxx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_const_vxx.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_const_vxx.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -54,7 +54,7 @@
<type>int</type>
</param>
<check>len($const) == $vec_len</check>
- <check>$vec_len >= 1</check>
+ <check>$vlen > 0</check>
<sink>
<name>in</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_vxx.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_vxx.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_add_vxx.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -48,8 +48,8 @@
<value>1</value>
<type>int</type>
</param>
- <check>$num_inputs >= 2</check>
- <check>$vlen >= 1</check>
+ <check>$num_inputs > 1</check>
+ <check>$vlen > 0</check>
<sink>
<name>in</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_multiply_const_vxx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_multiply_const_vxx.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_multiply_const_vxx.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -54,7 +54,7 @@
<type>int</type>
</param>
<check>len($const) == $vec_len</check>
- <check>$vec_len >= 1</check>
+ <check>$vlen > 0</check>
<sink>
<name>in</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_multiply_vxx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_multiply_vxx.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_multiply_vxx.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -48,8 +48,8 @@
<value>1</value>
<type>int</type>
</param>
- <check>$num_inputs >= 2</check>
- <check>$vlen >= 1</check>
+ <check>$num_inputs > 1</check>
+ <check>$vlen > 0</check>
<sink>
<name>in</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_file_sink.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_file_sink.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_file_sink.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -52,7 +52,7 @@
<value>1</value>
<type>int</type>
</param>
- <check>$vlen >= 1</check>
+ <check>$vlen > 0</check>
<sink>
<name>in</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_null_sink.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_null_sink.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_null_sink.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -46,7 +46,7 @@
<value>1</value>
<type>int</type>
</param>
- <check>$vlen >= 1</check>
+ <check>$vlen > 0</check>
<sink>
<name>in</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_udp_sink.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_udp_sink.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sinks/gr_udp_sink.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -77,7 +77,7 @@
<value>1</value>
<type>int</type>
</param>
- <check>$vlen >= 1</check>
+ <check>$vlen > 0</check>
<sink>
<name>in</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_file_source.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_file_source.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_file_source.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -66,7 +66,7 @@
<value>1</value>
<type>int</type>
</param>
- <check>$vlen >= 1</check>
+ <check>$vlen > 0</check>
<source>
<name>out</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_null_source.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_null_source.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_null_source.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -46,7 +46,7 @@
<value>1</value>
<type>int</type>
</param>
- <check>$vlen >= 1</check>
+ <check>$vlen > 0</check>
<source>
<name>out</name>
<type>$type</type>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_udp_source.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_udp_source.xml
2008-03-23 20:23:28 UTC (rev 8081)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/sources/gr_udp_source.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -65,7 +65,7 @@
<value>1</value>
<type>int</type>
</param>
- <check>$vlen >= 1</check>
+ <check>$vlen > 0</check>
<source>
<name>out</name>
<type>$type</type>
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 20:23:28 UTC (rev 8081)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-03-23 23:55:37 UTC (rev 8082)
@@ -109,30 +109,33 @@
<block>gr_iir_filter_ffd</block>
<block>gr_filter_delay_fc</block>
<block>blks2_channel_model</block>
+ <block>gr_fft_vxx</block>
</cat>
<cat>
<name>Filters</name>
<block>gr_single_pole_iir_filter_xx</block>
<block>gr_hilbert_fc</block>
<block>gr_goertzel_fc</block>
- <block>gr_cma_equalizer_cc</block>
- <block>power_squelch</block>
- <block>gr_fractional_interpolator_xx</block>
- <block>agc</block>
- <block>agc2</block>
- <block>rms</block>
- <block>feed_forward_agc</block>
- <block>clock_recovery</block>
- <block>fft</block>
- <block>ifft</block>
+ <block>gr_cma_equalizer_cc</block>
+ <block>gr_fractional_interpolator_xx</block>
+ <block>gr_keep_one_in_n</block>
+
+ <block>gr_agc_xx</block>
+ <block>gr_agc2_xx</block>
+ <block>gr_feedforward_agc_cc</block>
+
+ <block>gr_simple_squelch_cc</block>
+ <block>gr_pwr_squelch_xx</block>
<block>gr_threshold_ff</block>
+ <block>gr_rms_xx</block>
</cat>
<cat>
<name>Modulators</name>
<block>frequency_modulator</block>
<block>phase_modulator</block>
<block>quadrature_demodulator</block>
- <block>costas_loop</block>
+ <block>costas_loop</block>
+ <block>clock_recovery</block>
<block>vco</block>
<block>pll</block>
@@ -187,14 +190,17 @@
<name>Misc</name>
<block>import</block>
<block>gr_throttle</block>
+ <block>gr_delay</block>
<block>gr_mute_xx</block>
- <block>valve</block>
- <block>selector</block>
+
+ <block>blks2_selector</block>
+ <block>blks2_valve</block>
+
<block>gr_head</block>
<block>gr_skiphead</block>
- <block>input_terminator</block>
- <block>gr_kludge_copy</block>
- <block>tun_tap</block>
+
+
+ <block>gr_kludge_copy</block>
<block>gr_nop</block>
</cat>
</block_tree>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8082 - in grc/branches/grc_reloaded/src/grc_gnuradio: blks2 blocks/filters blocks/misc blocks/operators blocks/sinks blocks/sources data,
jblum <=