[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8108 - in grc/branches/grc_reloaded: . src/grc_gnurad
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8108 - in grc/branches/grc_reloaded: . src/grc_gnuradio/blks2 src/grc_gnuradio/blocks src/grc_gnuradio/blocks/conversions src/grc_gnuradio/blocks/filters src/grc_gnuradio/blocks/level_controls src/grc_gnuradio/blocks/misc src/grc_gnuradio/blocks/operators src/grc_gnuradio/data src/grc_gnuradio/wxgui |
|
Date: |
Mon, 24 Mar 2008 13:16:58 -0600 (MDT) |
Author: jblum
Date: 2008-03-24 13:16:58 -0600 (Mon, 24 Mar 2008)
New Revision: 8108
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_arg.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_imag.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag_squared.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_real.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_agc2_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_agc_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_feedforward_agc_cc.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_mute_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_pwr_squelch_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_simple_squelch_cc.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_threshold_ff.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_conjugate_cc.xml
Removed:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_components.xml
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_pwr_squelch_xx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_simple_squelch_cc.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_threshold_ff.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_mute_xx.xml
Modified:
grc/branches/grc_reloaded/setup.py
grc/branches/grc_reloaded/src/grc_gnuradio/blks2/selector.py
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_float.xml
grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/Controls.py
Log:
split up complex components, new categories
Modified: grc/branches/grc_reloaded/setup.py
===================================================================
--- grc/branches/grc_reloaded/setup.py 2008-03-24 17:50:53 UTC (rev 8107)
+++ grc/branches/grc_reloaded/setup.py 2008-03-24 19:16:58 UTC (rev 8108)
@@ -50,6 +50,7 @@
'blocks/operators/*.xml',
'blocks/conversions/*.xml',
'blocks/filters/*.xml',
+ 'blocks/level_controls/*.xml',
'blocks/variables/*.xml',
'blocks/misc/*.xml',
'blocks/usrp/*.xml',
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/blks2/selector.py
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blks2/selector.py
2008-03-24 17:50:53 UTC (rev 8107)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blks2/selector.py
2008-03-24 19:16:58 UTC (rev 8108)
@@ -122,7 +122,7 @@
else: output_index = 0
selector.__init__(self, item_size, 1, 1, 0, output_index)
- def set_open(open):
+ def set_open(self, open):
"""!
Callback to set open state.
@param open true to set valve state to open
Deleted:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_components.xml
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_arg.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_arg.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_arg.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Complex to Arg
+###################################################
+ -->
+<block>
+ <name>Complex to Arg</name>
+ <key>gr_complex_to_arg</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.complex_to_arg($vlen)</make>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_float.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_float.xml
2008-03-24 17:50:53 UTC (rev 8107)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_float.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -17,7 +17,7 @@
<value>1</value>
<type>int</type>
</param>
- <check>$vlen >= 1</check>
+ <check>$vlen > 0</check>
<sink>
<name>in</name>
<type>complex</type>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_imag.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_imag.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_imag.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Complex to Imaginary
+###################################################
+ -->
+<block>
+ <name>Complex to Imag</name>
+ <key>gr_complex_to_imag</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.complex_to_imag($vlen)</make>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Complex to Magnitude
+###################################################
+ -->
+<block>
+ <name>Complex to Mag</name>
+ <key>gr_complex_to_mag</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.complex_to_mag($vlen)</make>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag_squared.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag_squared.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag_squared.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Complex to Magnitude Squared
+###################################################
+ -->
+<block>
+ <name>Complex to Mag^2</name>
+ <key>gr_complex_to_mag_squared</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.complex_to_mag_squared($vlen)</make>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_real.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_real.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/conversions/gr_complex_to_real.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Complex to Real
+###################################################
+ -->
+<block>
+ <name>Complex to Real</name>
+ <key>gr_complex_to_real</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.complex_to_real($vlen)</make>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ <vlen>$vlen</vlen>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Deleted:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_agc2_xx.xml
Deleted: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_agc_xx.xml
Deleted:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_feedforward_agc_cc.xml
Deleted:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_pwr_squelch_xx.xml
Deleted:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_simple_squelch_cc.xml
Deleted:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_threshold_ff.xml
Copied:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_agc2_xx.xml
(from rev 8106,
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_agc2_xx.xml)
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_agc2_xx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_agc2_xx.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -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>
Copied:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_agc_xx.xml
(from rev 8106,
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_agc_xx.xml)
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_agc_xx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_agc_xx.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -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>
Copied:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_feedforward_agc_cc.xml
(from rev 8106,
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_feedforward_agc_cc.xml)
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_feedforward_agc_cc.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_feedforward_agc_cc.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -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>
Copied:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_mute_xx.xml
(from rev 8106,
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_mute_xx.xml)
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_mute_xx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_mute_xx.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -0,0 +1,54 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Mute Block:
+## Cast input to bool.
+###################################################
+ -->
+<block>
+ <name>Mute</name>
+ <key>gr_mute_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.mute_$(type.fcn)(bool($mute))</make>
+ <callback>set_mute(bool($mute))</callback>
+ <param>
+ <name>IO 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>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:ii</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:ss</opt>
+ </option>
+ </param>
+ <param>
+ <name>Mute</name>
+ <key>mute</key>
+ <value>False</value>
+ <type>raw</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ </source>
+</block>
Copied:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_pwr_squelch_xx.xml
(from rev 8106,
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_pwr_squelch_xx.xml)
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_pwr_squelch_xx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_pwr_squelch_xx.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -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>
Copied:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_simple_squelch_cc.xml
(from rev 8106,
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_simple_squelch_cc.xml)
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_simple_squelch_cc.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_simple_squelch_cc.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -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/level_controls/gr_threshold_ff.xml
(from rev 8106,
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_threshold_ff.xml)
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_threshold_ff.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_threshold_ff.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -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>
Deleted: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/misc/gr_mute_xx.xml
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_conjugate_cc.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_conjugate_cc.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/operators/gr_conjugate_cc.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Complex Conjugate
+###################################################
+ -->
+<block>
+ <name>Complex Conjugate</name>
+ <key>gr_conjugate_cc</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.conjugate_cc()</make>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ </source>
+</block>
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-24 17:50:53 UTC (rev 8107)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-03-24 19:16:58 UTC (rev 8108)
@@ -56,10 +56,17 @@
<block>gr_max_xx</block>
<block>gr_argmax_xx</block>
+ <block>gr_rms_xx</block>
+
+ <block>gr_conjugate_cc</block>
</cat>
<cat>
<name>Type Conversions</name>
- <block>gr_complex_components</block>
+ <block>gr_complex_to_arg</block>
+ <block>gr_complex_to_mag</block>
+ <block>gr_complex_to_mag_squared</block>
+ <block>gr_complex_to_real</block>
+ <block>gr_complex_to_imag</block>
<block>gr_complex_to_float</block>
<block>gr_float_to_complex</block>
@@ -100,7 +107,24 @@
<block>gr_map_bb</block>
</cat>
<cat>
- <name>Generic Filters</name>
+ <name>Synchronizers</name>
+
+ </cat>
+ <cat>
+ <name>Level Controls</name>
+ <block>gr_mute_xx</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>
+ </cat>
+ <cat>
+ <name>Filters</name>
+ <!-- Filters that take taps as aruments -->
<block>gr_fir_filter_xxx</block>
<block>gr_interp_fir_filter_xxx</block>
<block>gr_fft_filter_xxx</block>
@@ -110,24 +134,13 @@
<block>gr_filter_delay_fc</block>
<block>blks2_channel_model</block>
<block>gr_fft_vxx</block>
- </cat>
- <cat>
- <name>Filters</name>
+ <!-- Other filters -->
<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>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>
@@ -191,7 +204,6 @@
<block>import</block>
<block>gr_throttle</block>
<block>gr_delay</block>
- <block>gr_mute_xx</block>
<block>blks2_selector</block>
<block>blks2_valve</block>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/Controls.py
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/Controls.py
2008-03-24 17:50:53 UTC (rev 8107)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/Controls.py
2008-03-24 19:16:58 UTC (rev 8108)
@@ -21,6 +21,7 @@
address@hidden Josh Blum
import wx
+import sys
MAX_STR_LEN = 23
def trim(s): return str(s)[0:MAX_STR_LEN].title()
@@ -77,7 +78,7 @@
self.state = not self.state
self._set_button_label()
try: self.call()
- except Exception, e: print 'Error in handle change: "%s".'%e
+ except Exception, e: print >> sys.stderr, 'Error in handle
change: "%s".'%e
def _set_button_label(self):
"""!
@@ -137,7 +138,7 @@
A change is detected. Call the callback.
"""
try: self.call()
- except Exception, e: print 'Error in handle change: "%s".'%e
+ except Exception, e: print >> sys.stderr, 'Error in handle
change: "%s".'%e
def get_value(self):
"""!
@@ -220,7 +221,7 @@
self._set_slider_value(new_value)
self.text_box.SetValue(new_value)
try: self.call()
- except Exception, e: print 'Error in handle scroll: "%s".'%e
+ except Exception, e: print >> sys.stderr, 'Error in handle
scroll: "%s".'%e
def _handle_enter(self, event=None):
"""!
@@ -230,5 +231,5 @@
self._set_slider_value(new_value)
self.text_box.SetValue(new_value)
try: self.call()
- except Exception, e: print 'Error in handle enter: "%s".'%e
+ except Exception, e: print >> sys.stderr, 'Error in handle
enter: "%s".'%e
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8108 - in grc/branches/grc_reloaded: . src/grc_gnuradio/blks2 src/grc_gnuradio/blocks src/grc_gnuradio/blocks/conversions src/grc_gnuradio/blocks/filters src/grc_gnuradio/blocks/level_controls src/grc_gnuradio/blocks/misc src/grc_gnuradio/blocks/operators src/grc_gnuradio/data src/grc_gnuradio/wxgui,
jblum <=