[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8117 - in grc/branches/grc_reloaded: . src/grc_gnurad
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8117 - in grc/branches/grc_reloaded: . src/grc_gnuradio/blks2 src/grc_gnuradio/blocks src/grc_gnuradio/blocks/filters src/grc_gnuradio/blocks/level_controls src/grc_gnuradio/blocks/modulators src/grc_gnuradio/blocks/variables src/grc_gnuradio/data src/grc_gnuradio/wxgui |
|
Date: |
Wed, 26 Mar 2008 15:21:53 -0600 (MDT) |
Author: jblum
Date: 2008-03-26 15:21:52 -0600 (Wed, 26 Mar 2008)
New Revision: 8117
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/blks2_rational_resampler_xxx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/blks2_standard_squelch.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_dpll_bb.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_am_demod_cf.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_fm_deemph.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_fm_demod_cf.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_fm_preemph.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_nbfm_rx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_nbfm_tx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv_pll.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_wfm_tx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_frequency_modulator_fc.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_phase_modulator_fc.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_quadrature_demod_cf.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_vco_f.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/filters/gr_rational_resampler_base_xxx.xml
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/variables/variable_chooser.xml
grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
grc/branches/grc_reloaded/src/grc_gnuradio/data/wx_gui.tmpl
grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/Controls.py
Log:
modulators + blks2 stuff, wxgui improvements
Modified: grc/branches/grc_reloaded/setup.py
===================================================================
--- grc/branches/grc_reloaded/setup.py 2008-03-26 06:43:27 UTC (rev 8116)
+++ grc/branches/grc_reloaded/setup.py 2008-03-26 21:21:52 UTC (rev 8117)
@@ -52,6 +52,7 @@
'blocks/filters/*.xml',
'blocks/level_controls/*.xml',
'blocks/synchronizers/*.xml',
+ 'blocks/modulators/*.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-26 06:43:27 UTC (rev 8116)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blks2/selector.py
2008-03-26 21:21:52 UTC (rev 8117)
@@ -39,8 +39,8 @@
gr.io_signature(num_outputs, num_outputs, item_size),
)
#terminator blocks for unused inputs and outputs
- self.input_terminators = [gr.null_sink(item_size) for i in
range(num_inputs)]
- self.output_terminators = [gr.head(item_size, 0) for i in
range(num_outputs)]
+ self.input_terminators = [gr.null_sink(item_size)] * num_inputs
+ self.output_terminators = [gr.head(item_size, 0)] * num_outputs
self.copy = None
#connections
for i in range(num_inputs): self.connect((self, i),
self.input_terminators[i])
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/blks2_rational_resampler_xxx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/blks2_rational_resampler_xxx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/blks2_rational_resampler_xxx.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Rational Resampler
+###################################################
+ -->
+<block>
+ <name>Rational Resampler</name>
+ <key>blks2_rational_resampler_xxx</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.rational_resampler_$(type)(
+ interpolation=$interp,
+ decimation=$decim,
+#if $taps.eval
+ taps=$taps,
+#else
+ taps=None,
+#end if
+#if $fractional_bw.eval != 0
+ fractional_bw=$fractional_bw,
+#else
+ fractional_bw=None,
+#end if
+)</make>
+ <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->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>Interpolation</name>
+ <key>interp</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Taps</name>
+ <key>taps</key>
+ <value>[]</value>
+ <type>$type.taps</type>
+ </param>
+ <param>
+ <name>Fractional BW</name>
+ <key>fractional_bw</key>
+ <value>0</value>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>$type.input</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type.output</type>
+ </source>
+ <doc>
+Leave taps empty for automatic value.
+Leave fractional bandwidth 0 for automatic value.
+ </doc>
+</block>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_rational_resampler_base_xxx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_rational_resampler_base_xxx.xml
2008-03-26 06:43:27 UTC (rev 8116)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/filters/gr_rational_resampler_base_xxx.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -9,7 +9,7 @@
<name>Rational Resampler Base</name>
<key>gr_rational_resampler_base_xxx</key>
<import>from gnuradio import gr</import>
- <make>gr.rational_resampler_base_$(type)($decim, $interp, $taps)</make>
+ <make>gr.rational_resampler_base_$(type)($interp, $decim, $taps)</make>
<callback>set_taps($taps)</callback>
<param>
<name>Type</name>
@@ -59,14 +59,14 @@
</option>
</param>
<param>
- <name>Decimation</name>
- <key>decim</key>
+ <name>Interpolation</name>
+ <key>interp</key>
<value>1</value>
<type>int</type>
</param>
<param>
- <name>Interpolation</name>
- <key>interp</key>
+ <name>Decimation</name>
+ <key>decim</key>
<value>1</value>
<type>int</type>
</param>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/blks2_standard_squelch.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/blks2_standard_squelch.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/blks2_standard_squelch.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Standard Squelch
+###################################################
+ -->
+<block>
+ <name>Standard Squelch</name>
+ <key>blks2_standard_squelch</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.standard_squelch(audio_rate=$audio_rate)
+$id.set_threshold($threshold)</make>
+ <callback>set_threshold($threshold)</callback>
+ <param>
+ <name>Audio Rate</name>
+ <key>audio_rate</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Threshold</name>
+ <key>threshold</key>
+ <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/level_controls/gr_dpll_bb.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_dpll_bb.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/level_controls/gr_dpll_bb.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Detect Peak
+###################################################
+ -->
+<block>
+ <name>Detect Peak</name>
+ <key>gr_dpll_bb</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.dpll_bb($period, $gain)</make>
+ <param>
+ <name>Period</name>
+ <key>period</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Gain</name>
+ <key>gain</key>
+ <type>real</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/modulators/blks2_am_demod_cf.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_am_demod_cf.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_am_demod_cf.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##AM Demod
+###################################################
+ -->
+<block>
+ <name>AM Demod</name>
+ <key>blks2_am_demod_cf</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.am_demod_cf(
+ channel_rate=$chan_rate,
+ audio_decim=$audio_decim,
+ audio_pass=$audio_pass,
+ audio_stop=$audio_stop,
+)</make>
+ <param>
+ <name>Channel Rate</name>
+ <key>chan_rate</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Audio Decimation</name>
+ <key>audio_decim</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Audio Pass</name>
+ <key>audio_pass</key>
+ <value>5000</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Audio Stop</name>
+ <key>audio_stop</key>
+ <value>5500</value>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_fm_deemph.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_fm_deemph.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_fm_deemph.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##FM Deemphasis
+###################################################
+ -->
+<block>
+ <name>FM Deemphasis</name>
+ <key>blks2_fm_deemph</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.fm_deemph(fs=$samp_rate, tau=$tau)</make>
+ <param>
+ <name>Sample Rate</name>
+ <key>samp_rate</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Tau</name>
+ <key>tau</key>
+ <value>75e-6</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/modulators/blks2_fm_demod_cf.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_fm_demod_cf.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_fm_demod_cf.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,69 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##FM Demod
+###################################################
+ -->
+<block>
+ <name>FM Demod</name>
+ <key>blks2_fm_demod_cf</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.fm_demod_cf(
+ channel_rate=$chan_rate,
+ audio_decim=$audio_decim,
+ deviation=$deviation,
+ audio_pass=$audio_pass,
+ audio_stop=$audio_stop,
+ gain=$gain,
+ tau=$tau,
+)</make>
+ <param>
+ <name>Channel Rate</name>
+ <key>chan_rate</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Audio Decimation</name>
+ <key>audio_decim</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Deviation</name>
+ <key>deviation</key>
+ <value>75000</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Audio Pass</name>
+ <key>audio_pass</key>
+ <value>15000</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Audio Stop</name>
+ <key>audio_stop</key>
+ <value>16000</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Gain</name>
+ <key>gain</key>
+ <value>1.0</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Tau</name>
+ <key>tau</key>
+ <value>75e-6</value>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_fm_preemph.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_fm_preemph.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_fm_preemph.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##FM Preemphasis
+###################################################
+ -->
+<block>
+ <name>FM Preemphasis</name>
+ <key>blks2_fm_preemph</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.fm_preemph(fs=$samp_rate, tau=$tau)</make>
+ <param>
+ <name>Sample Rate</name>
+ <key>samp_rate</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Tau</name>
+ <key>tau</key>
+ <value>75e-6</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/modulators/blks2_nbfm_rx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_nbfm_rx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_nbfm_rx.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##NBFM Receive
+###################################################
+ -->
+<block>
+ <name>NBFM Receive</name>
+ <key>blks2_nbfm_rx</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.nbfm_rx(
+ audio_rate=$audio_rate,
+ quad_rate=$quad_rate,
+ tau=$tau,
+ max_dev=$max_dev,
+)</make>
+ <param>
+ <name>Audio Rate</name>
+ <key>audio_rate</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Quadrature Rate</name>
+ <key>quad_rate</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Tau</name>
+ <key>tau</key>
+ <value>75e-6</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Max Deviation</name>
+ <key>max_dev</key>
+ <value>5e3</value>
+ <type>real</type>
+ </param>
+ <check>$quad_rate%$audio_rate == 0</check>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_nbfm_tx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_nbfm_tx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_nbfm_tx.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##NBFM Transmit
+###################################################
+ -->
+<block>
+ <name>NBFM Transmit</name>
+ <key>blks2_nbfm_tx</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.nbfm_tx(
+ audio_rate=$audio_rate,
+ quad_rate=$quad_rate,
+ tau=$tau,
+ max_dev=$max_dev,
+)</make>
+ <param>
+ <name>Audio Rate</name>
+ <key>audio_rate</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Quadrature Rate</name>
+ <key>quad_rate</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Tau</name>
+ <key>tau</key>
+ <value>75e-6</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Max Deviation</name>
+ <key>max_dev</key>
+ <value>5e3</value>
+ <type>real</type>
+ </param>
+ <check>$quad_rate%$audio_rate == 0</check>
+ <sink>
+ <name>in</name>
+ <type>float</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##WBFM Receive
+###################################################
+ -->
+<block>
+ <name>WBFM Receive</name>
+ <key>blks2_wfm_rcv</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.wfm_rcv(
+ quad_rate=$quad_rate,
+ audio_decimation=$audio_decimation,
+)</make>
+ <param>
+ <name>Quadrature Rate</name>
+ <key>quad_rate</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Audio Decimation</name>
+ <key>audio_decimation</key>
+ <type>int</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv_pll.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv_pll.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv_pll.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##WBFM Receive PLL
+###################################################
+ -->
+<block>
+ <name>WBFM Receive PLL</name>
+ <key>blks2_wfm_rcv_pll</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.wfm_rcv_pll(
+ demod_rate=$quad_rate,
+ audio_decimation=$audio_decimation,
+)</make>
+ <param>
+ <name>Quadrature Rate</name>
+ <key>quad_rate</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Audio Decimation</name>
+ <key>audio_decimation</key>
+ <type>int</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_wfm_tx.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_wfm_tx.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/blks2_wfm_tx.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,49 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##WBFM Transmit
+###################################################
+ -->
+<block>
+ <name>WBFM Transmit</name>
+ <key>blks2_wfm_tx</key>
+ <import>from gnuradio import blks2</import>
+ <make>blks2.wfm_tx(
+ audio_rate=$audio_rate,
+ quad_rate=$quad_rate,
+ tau=$tau,
+ max_dev=$max_dev,
+)</make>
+ <param>
+ <name>Audio Rate</name>
+ <key>audio_rate</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Quadrature Rate</name>
+ <key>quad_rate</key>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Tau</name>
+ <key>tau</key>
+ <value>75e-6</value>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Max Deviation</name>
+ <key>max_dev</key>
+ <value>75e3</value>
+ <type>real</type>
+ </param>
+ <check>$quad_rate%$audio_rate == 0</check>
+ <sink>
+ <name>in</name>
+ <type>float</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_frequency_modulator_fc.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_frequency_modulator_fc.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_frequency_modulator_fc.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Frequency Modulator
+###################################################
+ -->
+<block>
+ <name>Frequency Mod</name>
+ <key>gr_frequency_modulator_fc</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.frequency_modulator_fc($sensitivity)</make>
+ <param>
+ <name>Sensitivity</name>
+ <key>sensitivity</key>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>float</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_phase_modulator_fc.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_phase_modulator_fc.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_phase_modulator_fc.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Phase Modulator
+###################################################
+ -->
+<block>
+ <name>Phase Mod</name>
+ <key>gr_phase_modulator_fc</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.phase_modulator_fc($sensitivity)</make>
+ <param>
+ <name>Sensitivity</name>
+ <key>sensitivity</key>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>float</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>complex</type>
+ </source>
+</block>
Added:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_quadrature_demod_cf.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_quadrature_demod_cf.xml
(rev 0)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_quadrature_demod_cf.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##Quadrature Demodulator
+###################################################
+ -->
+<block>
+ <name>Quadrature Demod</name>
+ <key>gr_quadrature_demod_cf</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.quadrature_demod_cf($gain)</make>
+ <param>
+ <name>Gain</name>
+ <key>gain</key>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>complex</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ </source>
+</block>
Added: grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_vco_f.xml
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_vco_f.xml
(rev 0)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/blocks/modulators/gr_vco_f.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!DOCTYPE block SYSTEM "../block.dtd">
+<!--
+###################################################
+##VCO
+###################################################
+ -->
+<block>
+ <name>VCO</name>
+ <key>gr_vco_f</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.vco_f($samp_rate, $sensitivity, $amplitude)</make>
+ <param>
+ <name>Sample Rate</name>
+ <key>samp_rate</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Sensitivity</name>
+ <key>sensitivity</key>
+ <type>real</type>
+ </param>
+ <param>
+ <name>Amplitude</name>
+ <key>amplitude</key>
+ <type>real</type>
+ </param>
+ <sink>
+ <name>in</name>
+ <type>float</type>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>float</type>
+ </source>
+</block>
Modified:
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/variables/variable_chooser.xml
===================================================================
---
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/variables/variable_chooser.xml
2008-03-26 06:43:27 UTC (rev 8116)
+++
grc/branches/grc_reloaded/src/grc_gnuradio/blocks/variables/variable_chooser.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -16,20 +16,6 @@
<type>string</type>
</param>
<param>
- <name>Orientation</name>
- <key>orientation</key>
- <value>wx.HORIZONTAL</value>
- <type>enum</type>
- <option>
- <name>Horizontal</name>
- <key>wx.HORIZONTAL</key>
- </option>
- <option>
- <name>Vertical</name>
- <key>wx.VERTICAL</key>
- </option>
- </param>
- <param>
<name>Value Index</name>
<key>value_index</key>
<value>0</value>
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-26 06:43:27 UTC (rev 8116)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/data/block_tree.xml
2008-03-26 21:21:52 UTC (rev 8117)
@@ -122,6 +122,7 @@
</cat>
<cat>
<name>Level Controls</name>
+ <block>gr_dpll_bb</block>
<block>gr_mute_xx</block>
<block>gr_agc_xx</block>
@@ -129,6 +130,7 @@
<block>gr_feedforward_agc_cc</block>
<block>gr_simple_squelch_cc</block>
+ <block>blks2_standard_squelch</block>
<block>gr_pwr_squelch_xx</block>
<block>gr_threshold_ff</block>
</cat>
@@ -139,7 +141,6 @@
<block>gr_interp_fir_filter_xxx</block>
<block>gr_fft_filter_xxx</block>
<block>gr_freq_xlating_fir_filter_xxx</block>
- <block>gr_rational_resampler_base_xxx</block>
<block>gr_iir_filter_ffd</block>
<block>gr_filter_delay_fc</block>
<block>blks2_channel_model</block>
@@ -149,23 +150,29 @@
<block>gr_hilbert_fc</block>
<block>gr_goertzel_fc</block>
<block>gr_cma_equalizer_cc</block>
+ <block>gr_rational_resampler_base_xxx</block>
+ <block>blks2_rational_resampler_xxx</block>
<block>gr_fractional_interpolator_xx</block>
<block>gr_keep_one_in_n</block>
</cat>
<cat>
<name>Modulators</name>
- <block>frequency_modulator</block>
- <block>phase_modulator</block>
- <block>quadrature_demodulator</block>
+ <block>gr_vco_f</block>
+ <block>gr_frequency_modulator_fc</block>
+ <block>gr_phase_modulator_fc</block>
+ <block>gr_quadrature_demod_cf</block>
- <block>wfm_receive</block>
- <block>wft_transmit</block>
+ <block>blks2_wft_tx</block>
+ <block>blks2_wfm_rcv</block>
+ <block>blks2_wfm_rcv_pll</block>
- <block>nbfm_receive</block>
- <block>nbfm_transmit</block>
+ <block>blks2_nbfm_tx</block>
+ <block>blks2_nbfm_rx</block>
- <block>am_demodulator</block>
- <block>fm_demodulator</block>
+ <block>blks2_am_demod_cf</block>
+ <block>blks2_fm_demod_cf</block>
+ <block>blks2_fm_deemph</block>
+ <block>blks2_fm_preemph</block>
<block>psk_modulator</block>
<block>psk demodulator</block>
@@ -179,7 +186,7 @@
<block>packet_modulator</block>
<block>packet_demodulator</block>
</cat>
- <cat>
+ <!-- <cat>
<name>Coders</name>
<block>constellation_decoder</block>
<block>differential_encoder</block>
@@ -187,7 +194,7 @@
<block>differential_phasor</block>
<block>correlate_access_code</block>
</cat>
- <cat>
+ <cat>
<name>Trellis</name>
<block>trellis_encoder</block>
<block>metrics</block>
@@ -196,8 +203,8 @@
<block>bcjr</block>
<block>bcjr_metric</block>
<block>interleaver</block>
- <block>deinterleaver</block>
- </cat>
+ <block>deinterleaver</block>
+ </cat> -->
<cat>
<name>Variables</name>
<block>variable</block>
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/data/wx_gui.tmpl
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/data/wx_gui.tmpl 2008-03-26
06:43:27 UTC (rev 8116)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/data/wx_gui.tmpl 2008-03-26
21:21:52 UTC (rev 8117)
@@ -133,7 +133,6 @@
#else
label="$chooser.get_id()",
#end if
- orientation=$chooser.get_param('orientation').to_code(),
index=$chooser.get_param('value_index').to_code(),
choices=$chooser.get_param('choices').to_code(),
labels=$chooser.get_param('labels').to_code(),
@@ -149,7 +148,7 @@
#if $WX_APP_ICON
_frame.SetIcon(wx.Icon("$os.path.abspath($WX_APP_ICON)", wx.BITMAP_TYPE_ANY))
#end if
-_frame.SetSizeHints(300, 100)
+_frame.SetSizeHints(200, 100)
def _quit(event):
_frame.Destroy()
tb.stop()
Modified: grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/Controls.py
===================================================================
--- grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/Controls.py
2008-03-26 06:43:27 UTC (rev 8116)
+++ grc/branches/grc_reloaded/src/grc_gnuradio/wxgui/Controls.py
2008-03-26 21:21:52 UTC (rev 8117)
@@ -23,9 +23,6 @@
import wx
import sys
-MAX_STR_LEN = 23
-def trim(s): return str(s)[0:MAX_STR_LEN].title()
-
class Control(wx.BoxSizer):
"""Control base class"""
@@ -40,13 +37,22 @@
def get_value(self): raise NotImplementedError
+class LabelText(wx.StaticText):
+ """Label Text class"""
+
+ def __init__(self, window, label):
+ wx.StaticText.__init__(self, window, -1, str(label))
+ font = self.GetFont()
+ font.SetWeight(wx.FONTWEIGHT_BOLD)
+ self.SetFont(font)
+
##############################################################################################
# Chooser Control
##############################################################################################
class Chooser(Control):
"""House a drop down or radio buttons for variable control."""
- def __init__(self, window, callback, label='Label',
orientation=wx.VERTICAL, index=0, choices=[0], labels=[], type='drop_down'):
+ def __init__(self, window, callback, label='Label', index=0,
choices=[0], labels=[], type='drop_down'):
"""!
Chooser contructor.
Create the slider, text box, and label.
@@ -58,18 +64,18 @@
@param radio true for radio buttons
"""
#initialize
- Control.__init__(self, window, callback, orientation)
- label_text = wx.StaticText(self.get_window(), -1, trim(label))
+ Control.__init__(self, window, callback, wx.VERTICAL)
+ label_text = LabelText(self.get_window(), label)
self.Add(label_text, 0, wx.ALIGN_CENTER)
self.choices = choices
- self.labels = labels = map(trim, labels or choices)
+ self.labels = labels = map(str, labels or choices)
########### Drop Down ###########
if type == 'drop_down':
self.drop_down = wx.Choice(self.get_window(), -1,
choices=labels)
self.Add(self.drop_down, 0, wx.ALIGN_CENTER)
self.drop_down.Bind(wx.EVT_CHOICE,
self._handle_changed)
self.drop_down.SetSelection(index)
- ########### Radio Button ###########
+ ########### Radio Buttons ###########
elif type in ('radio_buttons_horizontal',
'radio_buttons_vertical'):
#determine gui parameters
if type == 'radio_buttons_horizontal':
@@ -80,11 +86,13 @@
radio_button_align = wx.ALIGN_LEFT
#create box for radio buttons
radio_box = wx.BoxSizer(radio_box_orientation)
- self.Add(radio_box, 0, wx.ALIGN_CENTER)
+ panel = wx.Panel(self.get_window(), -1)
+ panel.SetSizer(radio_box)
+ self.Add(panel, 0, wx.ALIGN_CENTER)
#create radio buttons
self.radio_buttons = list()
for label in labels:
- radio_button =
wx.RadioButton(self.get_window(), -1, label)
+ radio_button = wx.RadioButton(panel, -1, label)
radio_button.SetValue(False)
self.radio_buttons.append(radio_button)
radio_box.Add(radio_button, 0,
radio_button_align)
@@ -93,10 +101,9 @@
self.radio_buttons[index].SetValue(True)
########### Button ###########
elif type == 'button':
- self.button = wx.Button(self.get_window(), -1, '')
+ self.button = wx.Button(self.get_window(), -1,
labels[index])
self.button.Bind(wx.EVT_BUTTON, self._handle_changed)
self.Add(self.button, 0, wx.ALIGN_CENTER)
- self.button.SetLabel(labels[index])
self.index = index
def _handle_changed(self, event=None):
@@ -112,11 +119,14 @@
Read the selected index and parse the choice.
@return one of the possible choices
"""
+ ########### Drop Down ###########
if hasattr(self, 'drop_down'):
index = self.drop_down.GetSelection()
+ ########### Radio Buttons ###########
elif hasattr(self, 'radio_buttons'):
selected_radio_button = filter(lambda rb:
rb.GetValue(), self.radio_buttons)[0]
index = self.radio_buttons.index(selected_radio_button)
+ ########### Button ###########
elif hasattr(self, 'button'):
index = (self.index + 1)%len(self.choices) #circularly
increment index
self.button.SetLabel(self.labels[index])
@@ -144,12 +154,12 @@
"""
#initialize
Control.__init__(self, window, callback, wx.VERTICAL)
- self.min = min
- self.max = max
- self.num_steps = num_steps
+ self.min = float(min)
+ self.max = float(max)
+ self.num_steps = int(num_steps)
#create gui elements
label_text_sizer = wx.BoxSizer(wx.HORIZONTAL) #label and text
box container
- label_text = wx.StaticText(self.get_window(), -1, trim(label) +
' -> ')
+ label_text = LabelText(self.get_window(), '%s -> '%str(label))
self.text_box = text_box = wx.TextCtrl(self.get_window(), -1,
str(value), style=wx.TE_PROCESS_ENTER)
text_box.Bind(wx.EVT_TEXT_ENTER, self._handle_enter) #bind
this special enter hotkey event
for obj in (label_text, text_box): #fill the container
with label and text entry box
@@ -159,7 +169,7 @@
self.slider = slider = wx.Slider(self.get_window(), -1,
size=wx.Size(200, 20), style=wx.SL_HORIZONTAL)
try: slider.SetRange(0, num_steps)
except Exception, e:
- sys.stderr.write('Slider, "%s", has too many
steps!\n'%id)
+ print >> sys.stderr, 'Error in set slider range:
"%s".'%e
sys.exit(-1)
slider.Bind(wx.EVT_SCROLL, self._handle_scroll) #bind the
scrolling event
self.Add(slider, 0, wx.ALIGN_CENTER)
@@ -172,7 +182,7 @@
@return the numeric representation of the slider
"""
slider_value = self.slider.GetValue()
- return
slider_value*(float(self.max)-float(self.min))/self.num_steps + float(self.min)
+ return slider_value*(self.max - self.min)/self.num_steps +
self.min
def _set_slider_value(self, real_value):
"""!
@@ -180,7 +190,7 @@
write the value to the slider.
@param real_value the numeric value the slider should represent
"""
- slider_value =
(float(real_value)-float(self.min))*self.num_steps/(float(self.max)-float(self.min))
+ slider_value = (float(real_value) -
self.min)*self.num_steps/(self.max - self.min)
self.slider.SetValue(slider_value)
def _handle_scroll(self, event=None):
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8117 - in grc/branches/grc_reloaded: . src/grc_gnuradio/blks2 src/grc_gnuradio/blocks src/grc_gnuradio/blocks/filters src/grc_gnuradio/blocks/level_controls src/grc_gnuradio/blocks/modulators src/grc_gnuradio/blocks/variables src/grc_gnuradio/data src/grc_gnuradio/wxgui,
jblum <=