diff options
Diffstat (limited to 'grc')
-rw-r--r-- | grc/blocks/blks2_standard_squelch.xml | 32 | ||||
-rw-r--r-- | grc/blocks/block_tree.xml | 33 | ||||
-rw-r--r-- | grc/blocks/const_source_x.xml | 52 | ||||
-rw-r--r-- | grc/blocks/gr_agc2_xx.xml | 70 | ||||
-rw-r--r-- | grc/blocks/gr_agc_xx.xml | 59 | ||||
-rw-r--r-- | grc/blocks/gr_cpfsk_bc.xml | 37 | ||||
-rw-r--r-- | grc/blocks/gr_ctcss_squelch_ff.xml | 79 | ||||
-rw-r--r-- | grc/blocks/gr_dpll_bb.xml | 30 | ||||
-rw-r--r-- | grc/blocks/gr_frequency_modulator_fc.xml | 26 | ||||
-rw-r--r-- | grc/blocks/gr_noise_source_x.xml | 77 | ||||
-rw-r--r-- | grc/blocks/gr_phase_modulator_fc.xml | 25 | ||||
-rw-r--r-- | grc/blocks/gr_pll_carriertracking_cc.xml | 36 | ||||
-rw-r--r-- | grc/blocks/gr_pll_freqdet_cf.xml | 36 | ||||
-rw-r--r-- | grc/blocks/gr_pll_refout_cc.xml | 36 | ||||
-rw-r--r-- | grc/blocks/gr_probe_avg_mag_sqrd_x.xml | 50 | ||||
-rw-r--r-- | grc/blocks/gr_pwr_squelch_xx.xml | 65 | ||||
-rw-r--r-- | grc/blocks/gr_quadrature_demod_cf.xml | 26 | ||||
-rw-r--r-- | grc/blocks/gr_sig_source_x.xml | 104 | ||||
-rw-r--r-- | grc/blocks/gr_simple_squelch_cc.xml | 32 | ||||
-rw-r--r-- | grc/examples/simple/variable_config.grc | 156 | ||||
-rw-r--r-- | grc/examples/xmlrpc/xmlrpc_server.grc | 220 |
21 files changed, 232 insertions, 1049 deletions
diff --git a/grc/blocks/blks2_standard_squelch.xml b/grc/blocks/blks2_standard_squelch.xml deleted file mode 100644 index f0baeb6624..0000000000 --- a/grc/blocks/blks2_standard_squelch.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##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) -self.$(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> diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml index 31298a2288..842e32c15e 100644 --- a/grc/blocks/block_tree.xml +++ b/grc/blocks/block_tree.xml @@ -8,9 +8,6 @@ <name></name> <!-- Blank for Root Name --> <cat> <name>Sources</name> - <block>const_source_x</block> - <block>gr_sig_source_x</block> - <block>gr_noise_source_x</block> <block>gr_vector_source_x</block> <block>random_source_x</block> <block>gr_null_source</block> @@ -123,10 +120,6 @@ <block>gr_mpsk_sync_cc</block> - <block>gr_pll_carriertracking_cc</block> - <block>gr_pll_freqdet_cf</block> - <block>gr_pll_refout_cc</block> - <block>gr_simple_correlator</block> <block>blks2_packet_decoder</block> @@ -134,20 +127,11 @@ </cat> <cat> <name>Level Controls</name> - <block>gr_dpll_bb</block> <block>gr_peak_detector_xb</block> <block>gr_peak_detector2_fb</block> <block>gr_sample_and_hold_xx</block> - <block>gr_agc_xx</block> - <block>gr_agc2_xx</block> - <block>gr_feedforward_agc_cc</block> - <block>gr_mute_xx</block> - <block>gr_simple_squelch_cc</block> - <block>blks2_standard_squelch</block> - <block>gr_pwr_squelch_xx</block> - <block>gr_ctcss_squelch_ff</block> <block>gr_threshold_ff</block> </cat> <cat> @@ -161,22 +145,6 @@ <cat> <name>Modulators</name> <block>gr_vco_f</block> - <block>gr_frequency_modulator_fc</block> - <block>gr_phase_modulator_fc</block> - <block>gr_quadrature_demod_cf</block> - <block>gr_cpfsk_bc</block> - - <block>blks2_wfm_tx</block> - <block>blks2_wfm_rcv</block> - <block>blks2_wfm_rcv_pll</block> - - <block>blks2_nbfm_tx</block> - <block>blks2_nbfm_rx</block> - - <block>blks2_am_demod_cf</block> - <block>blks2_fm_demod_cf</block> - <block>blks2_fm_deemph</block> - <block>blks2_fm_preemph</block> </cat> <cat> <name>Error Correction</name> @@ -189,7 +157,6 @@ </cat> <cat> <name>Probes</name> - <block>gr_probe_avg_mag_sqrd_x</block> <block>gr_probe_signal_f</block> </cat> <cat> diff --git a/grc/blocks/const_source_x.xml b/grc/blocks/const_source_x.xml deleted file mode 100644 index fe8e56ec4a..0000000000 --- a/grc/blocks/const_source_x.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##Constant Source: Custom wrapper -################################################### - --> -<block> - <name>Constant Source</name> - <key>const_source_x</key> - <import>from gnuradio import gr</import> - <make>gr.sig_source_$(type.fcn)(0, gr.GR_CONST_WAVE, 0, 0, $const)</make> - <callback>set_offset($const)</callback> - <param> - <name>Output Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>Complex</name> - <key>complex</key> - <opt>fcn:c</opt> - <opt>const_type:complex</opt> - </option> - <option> - <name>Float</name> - <key>float</key> - <opt>fcn:f</opt> - <opt>const_type:real</opt> - </option> - <option> - <name>Int</name> - <key>int</key> - <opt>fcn:i</opt> - <opt>const_type:int</opt> - </option> - <option> - <name>Short</name> - <key>short</key> - <opt>fcn:s</opt> - <opt>const_type:int</opt> - </option> - </param> - <param> - <name>Constant</name> - <key>const</key> - <value>0</value> - <type>$type.const_type</type> - </param> - <source> - <name>out</name> - <type>$type</type> - </source> -</block> diff --git a/grc/blocks/gr_agc2_xx.xml b/grc/blocks/gr_agc2_xx.xml deleted file mode 100644 index 55b20d4e82..0000000000 --- a/grc/blocks/gr_agc2_xx.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##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> - <callback>set_attack_rate($attack_rate)</callback> - <callback>set_decay_rate($decay_rate)</callback> - <callback>set_reference($reference)</callback> - <callback>set_gain($gain)</callback> - <callback>set_max_gain($max_gain)</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>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> diff --git a/grc/blocks/gr_agc_xx.xml b/grc/blocks/gr_agc_xx.xml deleted file mode 100644 index c87d239edd..0000000000 --- a/grc/blocks/gr_agc_xx.xml +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##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> diff --git a/grc/blocks/gr_cpfsk_bc.xml b/grc/blocks/gr_cpfsk_bc.xml deleted file mode 100644 index d5549d933f..0000000000 --- a/grc/blocks/gr_cpfsk_bc.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##CPFSK -################################################### - --> -<block> - <name>CPFSK</name> - <key>gr_cpfsk_bc</key> - <import>from gnuradio import gr</import> - <make>gr.cpfsk_bc($k, $amplitude, $samples_per_symbol)</make> - <callback>set_amplitude($amplitude)</callback> - <param> - <name>K</name> - <key>k</key> - <type>real</type> - </param> - <param> - <name>Amplitude</name> - <key>amplitude</key> - <type>real</type> - </param> - <param> - <name>Samples/Symbol</name> - <key>samples_per_symbol</key> - <value>2</value> - <type>int</type> - </param> - <sink> - <name>in</name> - <type>byte</type> - </sink> - <source> - <name>out</name> - <type>complex</type> - </source> -</block> diff --git a/grc/blocks/gr_ctcss_squelch_ff.xml b/grc/blocks/gr_ctcss_squelch_ff.xml deleted file mode 100644 index a34c75374c..0000000000 --- a/grc/blocks/gr_ctcss_squelch_ff.xml +++ /dev/null @@ -1,79 +0,0 @@ -<?xml version="1.0"?> -<!-- -# -# Copyright 2011 Free Software Foundation, Inc. -# -# This file is part of GNU Radio -# -# GNU Radio is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3, or (at your option) -# any later version. -# -# GNU Radio is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Radio; see the file COPYING. If not, write to -# the Free Software Foundation, Inc., 51 Franklin Street, -# Boston, MA 02110-1301, USA. ---> - -<!-- -################################################### -##CTCSS Squelch -################################################### - --> -<block> - <name>CTCSS Squelch</name> - <key>gr_ctcss_squelch_ff</key> - <import>from gnuradio import gr</import> - <make>gr.ctcss_squelch_ff($rate, $freq, $level, $len, $ramp, $gate)</make> - <callback>set_level($level)</callback> - <param> - <name>Sampling Rate (Hz)</name> - <key>rate</key> - <value>samp_rate</value> - <type>real</type> - </param> - <param> - <name>Tone Frequency</name> - <key>freq</key> - <value>100.0</value> - <type>real</type> - </param> - <param> - <name>Level</name> - <key>level</key> - <value>0.01</value> - <type>real</type> - </param> - <param> - <name>Length</name> - <key>len</key> - <value>0</value> - <type>int</type> - </param> - <param> - <name>Ramp</name> - <key>ramp</key> - <value>0</value> - <type>int</type> - </param> - <param> - <name>Gate</name> - <key>gate</key> - <value>False</value> - <type>bool</type> - </param> - <sink> - <name>in</name> - <type>float</type> - </sink> - <source> - <name>out</name> - <type>float</type> - </source> -</block> diff --git a/grc/blocks/gr_dpll_bb.xml b/grc/blocks/gr_dpll_bb.xml deleted file mode 100644 index 044d398ff1..0000000000 --- a/grc/blocks/gr_dpll_bb.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##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> diff --git a/grc/blocks/gr_frequency_modulator_fc.xml b/grc/blocks/gr_frequency_modulator_fc.xml deleted file mode 100644 index d5f8fcfe35..0000000000 --- a/grc/blocks/gr_frequency_modulator_fc.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##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> - <callback>set_sensitivity($sensitivity)</callback> - <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> diff --git a/grc/blocks/gr_noise_source_x.xml b/grc/blocks/gr_noise_source_x.xml deleted file mode 100644 index 72daaaa209..0000000000 --- a/grc/blocks/gr_noise_source_x.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##Noise Source -################################################### - --> -<block> - <name>Noise Source</name> - <key>gr_noise_source_x</key> - <import>from gnuradio import gr</import> - <make>gr.noise_source_$(type.fcn)($noise_type, $amp, $seed)</make> - <callback>set_type($noise_type)</callback> - <callback>set_amplitude($amp)</callback> - <param> - <name>Output 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> - <option> - <name>Int</name> - <key>int</key> - <opt>fcn:i</opt> - </option> - <option> - <name>Short</name> - <key>short</key> - <opt>fcn:s</opt> - </option> - </param> - <param> - <name>Noise Type</name> - <key>noise_type</key> - <value>gr.GR_GAUSSIAN</value> - <type>int</type> - <option> - <name>Uniform</name> - <key>gr.GR_UNIFORM</key> - </option> - <option> - <name>Gaussian</name> - <key>gr.GR_GAUSSIAN</key> - </option> - <option> - <name>Laplacian</name> - <key>gr.GR_LAPLACIAN</key> - </option> - <option> - <name>Impulse</name> - <key>gr.GR_IMPULSE</key> - </option> - </param> - <param> - <name>Amplitude</name> - <key>amp</key> - <value>1</value> - <type>real</type> - </param> - <param> - <name>Seed</name> - <key>seed</key> - <value>0</value> - <type>int</type> - </param> - <source> - <name>out</name> - <type>$type</type> - </source> -</block> diff --git a/grc/blocks/gr_phase_modulator_fc.xml b/grc/blocks/gr_phase_modulator_fc.xml deleted file mode 100644 index 758c50863b..0000000000 --- a/grc/blocks/gr_phase_modulator_fc.xml +++ /dev/null @@ -1,25 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##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> diff --git a/grc/blocks/gr_pll_carriertracking_cc.xml b/grc/blocks/gr_pll_carriertracking_cc.xml deleted file mode 100644 index 27e6732482..0000000000 --- a/grc/blocks/gr_pll_carriertracking_cc.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##PLL Carrier Tracking -################################################### - --> -<block> - <name>PLL Carrier Tracking</name> - <key>gr_pll_carriertracking_cc</key> - <import>from gnuradio import gr</import> - <make>gr.pll_carriertracking_cc($w, $max_freq, $min_freq)</make> - <callback>set_loop_bandwidth($w)</callback> - <param> - <name>Loop Bandwidth</name> - <key>w</key> - <type>real</type> - </param> - <param> - <name>Max Freq</name> - <key>max_freq</key> - <type>real</type> - </param> - <param> - <name>Min Freq</name> - <key>min_freq</key> - <type>real</type> - </param> - <sink> - <name>in</name> - <type>complex</type> - </sink> - <source> - <name>out</name> - <type>complex</type> - </source> -</block> diff --git a/grc/blocks/gr_pll_freqdet_cf.xml b/grc/blocks/gr_pll_freqdet_cf.xml deleted file mode 100644 index d6e4694f00..0000000000 --- a/grc/blocks/gr_pll_freqdet_cf.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##PLL Frequency Det -################################################### - --> -<block> - <name>PLL Freq Det</name> - <key>gr_pll_freqdet_cf</key> - <import>from gnuradio import gr</import> - <make>gr.pll_freqdet_cf($w, $max_freq, $min_freq)</make> - <callback>set_loop_bandwidth($w)</callback> - <param> - <name>Loop Bandwidth</name> - <key>w</key> - <type>real</type> - </param> - <param> - <name>Max Freq</name> - <key>max_freq</key> - <type>real</type> - </param> - <param> - <name>Min Freq</name> - <key>min_freq</key> - <type>real</type> - </param> - <sink> - <name>in</name> - <type>complex</type> - </sink> - <source> - <name>out</name> - <type>float</type> - </source> -</block> diff --git a/grc/blocks/gr_pll_refout_cc.xml b/grc/blocks/gr_pll_refout_cc.xml deleted file mode 100644 index b231ddd19a..0000000000 --- a/grc/blocks/gr_pll_refout_cc.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##PLL Reference Out -################################################### - --> -<block> - <name>PLL Ref Out</name> - <key>gr_pll_refout_cc</key> - <import>from gnuradio import gr</import> - <make>gr.pll_refout_cc($w, $max_freq, $min_freq)</make> - <callback>set_loop_bandwidth($w)</callback> - <param> - <name>Loop Bandwidth</name> - <key>w</key> - <type>real</type> - </param> - <param> - <name>Max Freq</name> - <key>max_freq</key> - <type>real</type> - </param> - <param> - <name>Min Freq</name> - <key>min_freq</key> - <type>real</type> - </param> - <sink> - <name>in</name> - <type>complex</type> - </sink> - <source> - <name>out</name> - <type>complex</type> - </source> -</block> diff --git a/grc/blocks/gr_probe_avg_mag_sqrd_x.xml b/grc/blocks/gr_probe_avg_mag_sqrd_x.xml deleted file mode 100644 index 6bf706ae1c..0000000000 --- a/grc/blocks/gr_probe_avg_mag_sqrd_x.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##Probe Average Magnitude Squared -################################################### - --> -<block> - <name>Probe Avg Mag^2</name> - <key>gr_probe_avg_mag_sqrd_x</key> - <import>from gnuradio import gr</import> - <make>gr.probe_avg_mag_sqrd_$(type)($threshold, $alpha)</make> - <callback>set_alpha($alpha)</callback> - <callback>set_threshold($threshold)</callback> - <param> - <name>Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>Complex</name> - <key>c</key> - <opt>input:complex</opt> - </option> - <option> - <name>Float</name> - <key>f</key> - <opt>input:float</opt> - </option> - </param> - <param> - <name>Threshold (dB)</name> - <key>threshold</key> - <value>0</value> - <type>real</type> - </param> - <param> - <name>Alpha</name> - <key>alpha</key> - <value>1</value> - <type>real</type> - </param> - <sink> - <name>in</name> - <type>$type.input</type> - </sink> - <doc> -Available functions to probe: level() - -Use with the function probe block. - </doc> -</block> diff --git a/grc/blocks/gr_pwr_squelch_xx.xml b/grc/blocks/gr_pwr_squelch_xx.xml deleted file mode 100644 index 08d6211770..0000000000 --- a/grc/blocks/gr_pwr_squelch_xx.xml +++ /dev/null @@ -1,65 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##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> diff --git a/grc/blocks/gr_quadrature_demod_cf.xml b/grc/blocks/gr_quadrature_demod_cf.xml deleted file mode 100644 index fad0b3879c..0000000000 --- a/grc/blocks/gr_quadrature_demod_cf.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##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> - <callback>set_gain($gain)</callback> - <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> diff --git a/grc/blocks/gr_sig_source_x.xml b/grc/blocks/gr_sig_source_x.xml deleted file mode 100644 index 644cf52d0c..0000000000 --- a/grc/blocks/gr_sig_source_x.xml +++ /dev/null @@ -1,104 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##Signal Source -################################################### - --> -<block> - <name>Signal Source</name> - <key>gr_sig_source_x</key> - <import>from gnuradio import gr</import> - <make>gr.sig_source_$(type.fcn)($samp_rate, $waveform, $freq, $amp, $offset)</make> - <callback>set_sampling_freq($samp_rate)</callback> - <callback>set_waveform($waveform)</callback> - <callback>set_frequency($freq)</callback> - <callback>set_amplitude($amp)</callback> - <callback>set_offset($offset)</callback> - <param> - <name>Output Type</name> - <key>type</key> - <type>enum</type> - <option> - <name>Complex</name> - <key>complex</key> - <opt>fcn:c</opt> - <opt>offset_type:complex</opt> - </option> - <option> - <name>Float</name> - <key>float</key> - <opt>fcn:f</opt> - <opt>offset_type:real</opt> - </option> - <option> - <name>Int</name> - <key>int</key> - <opt>fcn:i</opt> - <opt>offset_type:int</opt> - </option> - <option> - <name>Short</name> - <key>short</key> - <opt>fcn:s</opt> - <opt>offset_type:int</opt> - </option> - </param> - <param> - <name>Sample Rate</name> - <key>samp_rate</key> - <value>samp_rate</value> - <type>real</type> - </param> - <param> - <name>Waveform</name> - <key>waveform</key> - <value>gr.GR_COS_WAVE</value> - <type>int</type> - <option> - <name>Constant</name> - <key>gr.GR_CONST_WAVE</key> - </option> - <option> - <name>Sine</name> - <key>gr.GR_SIN_WAVE</key> - </option> - <option> - <name>Cosine</name> - <key>gr.GR_COS_WAVE</key> - </option> - <option> - <name>Square</name> - <key>gr.GR_SQR_WAVE</key> - </option> - <option> - <name>Triangle</name> - <key>gr.GR_TRI_WAVE</key> - </option> - <option> - <name>Saw Tooth</name> - <key>gr.GR_SAW_WAVE</key> - </option> - </param> - <param> - <name>Frequency</name> - <key>freq</key> - <value>1000</value> - <type>real</type> - </param> - <param> - <name>Amplitude</name> - <key>amp</key> - <value>1</value> - <type>real</type> - </param> - <param> - <name>Offset</name> - <key>offset</key> - <value>0</value> - <type>$type.offset_type</type> - </param> - <source> - <name>out</name> - <type>$type</type> - </source> -</block> diff --git a/grc/blocks/gr_simple_squelch_cc.xml b/grc/blocks/gr_simple_squelch_cc.xml deleted file mode 100644 index 5c0727f5f8..0000000000 --- a/grc/blocks/gr_simple_squelch_cc.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?xml version="1.0"?> -<!-- -################################################### -##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> diff --git a/grc/examples/simple/variable_config.grc b/grc/examples/simple/variable_config.grc index 95c287cce7..fc0d2fea6b 100644 --- a/grc/examples/simple/variable_config.grc +++ b/grc/examples/simple/variable_config.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Thu Jun 25 10:56:04 2009</timestamp> + <timestamp>Sat Nov 10 15:20:12 2012</timestamp> <block> <key>options</key> <param> @@ -36,10 +36,18 @@ <value>Custom</value> </param> <param> - <key>autostart</key> + <key>run_options</key> + <value>prompt</value> + </param> + <param> + <key>run</key> <value>True</value> </param> <param> + <key>max_nouts</key> + <value>0</value> + </param> + <param> <key>realtime_scheduling</key> <value></value> </param> @@ -161,6 +169,10 @@ <value></value> </param> <param> + <key>notebook</key> + <value></value> + </param> + <param> <key>_coordinate</key> <value>(429, 24)</value> </param> @@ -170,10 +182,10 @@ </param> </block> <block> - <key>gr_throttle</key> + <key>wxgui_fftsink2</key> <param> <key>id</key> - <value>gr_throttle_0</value> + <value>wxgui_fftsink2_0</value> </param> <param> <key>_enabled</key> @@ -184,59 +196,76 @@ <value>complex</value> </param> <param> - <key>samples_per_second</key> - <value>samp_rate</value> + <key>title</key> + <value>FFT Plot</value> </param> <param> - <key>vlen</key> - <value>1</value> + <key>samp_rate</key> + <value>samp_rate</value> </param> <param> - <key>_coordinate</key> - <value>(392, 233)</value> + <key>baseband_freq</key> + <value>0</value> </param> <param> - <key>_rotation</key> - <value>0</value> + <key>y_per_div</key> + <value>10</value> </param> - </block> - <block> - <key>gr_sig_source_x</key> <param> - <key>id</key> - <value>gr_sig_source_x_0</value> + <key>y_divs</key> + <value>10</value> </param> <param> - <key>_enabled</key> - <value>True</value> + <key>ref_level</key> + <value>50</value> </param> <param> - <key>type</key> - <value>complex</value> + <key>ref_scale</key> + <value>2.0</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>fft_size</key> + <value>1024</value> </param> <param> - <key>waveform</key> - <value>gr.GR_COS_WAVE</value> + <key>fft_rate</key> + <value>30</value> </param> <param> - <key>freq</key> - <value>freq</value> + <key>peak_hold</key> + <value>False</value> </param> <param> - <key>amp</key> - <value>1</value> + <key>average</key> + <value>False</value> </param> <param> - <key>offset</key> + <key>avg_alpha</key> <value>0</value> </param> <param> + <key>win</key> + <value>None</value> + </param> + <param> + <key>win_size</key> + <value></value> + </param> + <param> + <key>grid_pos</key> + <value></value> + </param> + <param> + <key>notebook</key> + <value></value> + </param> + <param> + <key>freqvar</key> + <value>None</value> + </param> + <param> <key>_coordinate</key> - <value>(148, 233)</value> + <value>(671, 233)</value> </param> <param> <key>_rotation</key> @@ -244,10 +273,10 @@ </param> </block> <block> - <key>wxgui_fftsink2</key> + <key>gr_throttle</key> <param> <key>id</key> - <value>wxgui_fftsink2_0</value> + <value>gr_throttle_0</value> </param> <param> <key>_enabled</key> @@ -258,56 +287,59 @@ <value>complex</value> </param> <param> - <key>title</key> - <value>FFT Plot</value> + <key>samples_per_second</key> + <value>samp_rate</value> </param> <param> - <key>samp_rate</key> - <value>samp_rate</value> + <key>vlen</key> + <value>1</value> </param> <param> - <key>baseband_freq</key> - <value>0</value> + <key>_coordinate</key> + <value>(392, 233)</value> </param> <param> - <key>y_per_div</key> - <value>10</value> + <key>_rotation</key> + <value>0</value> </param> + </block> + <block> + <key>analog_sig_source_x</key> <param> - <key>y_divs</key> - <value>10</value> + <key>id</key> + <value>analog_sig_source_x_0</value> </param> <param> - <key>ref_level</key> - <value>50</value> + <key>_enabled</key> + <value>True</value> </param> <param> - <key>fft_size</key> - <value>1024</value> + <key>type</key> + <value>complex</value> </param> <param> - <key>fft_rate</key> - <value>30</value> + <key>samp_rate</key> + <value>samp_rate</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>waveform</key> + <value>analog.GR_COS_WAVE</value> </param> <param> - <key>average</key> - <value>False</value> + <key>freq</key> + <value>freq</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>amp</key> + <value>1</value> </param> <param> - <key>grid_pos</key> - <value></value> + <key>offset</key> + <value>0</value> </param> <param> <key>_coordinate</key> - <value>(671, 233)</value> + <value>(173, 201)</value> </param> <param> <key>_rotation</key> @@ -315,14 +347,14 @@ </param> </block> <connection> - <source_block_id>gr_sig_source_x_0</source_block_id> - <sink_block_id>gr_throttle_0</sink_block_id> + <source_block_id>gr_throttle_0</source_block_id> + <sink_block_id>wxgui_fftsink2_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>gr_throttle_0</source_block_id> - <sink_block_id>wxgui_fftsink2_0</sink_block_id> + <source_block_id>analog_sig_source_x_0</source_block_id> + <sink_block_id>gr_throttle_0</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> diff --git a/grc/examples/xmlrpc/xmlrpc_server.grc b/grc/examples/xmlrpc/xmlrpc_server.grc index dc539ef1b1..ea70ded720 100644 --- a/grc/examples/xmlrpc/xmlrpc_server.grc +++ b/grc/examples/xmlrpc/xmlrpc_server.grc @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='ASCII'?> <flow_graph> - <timestamp>Thu Jul 24 14:27:42 2008</timestamp> + <timestamp>Sat Nov 10 15:20:55 2012</timestamp> <block> <key>options</key> <param> @@ -36,51 +36,24 @@ <value>Custom</value> </param> <param> - <key>_coordinate</key> - <value>(10, 10)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> - <key>gr_sig_source_x</key> - <param> - <key>id</key> - <value>gr_sig_source_x</value> + <key>run_options</key> + <value>prompt</value> </param> <param> - <key>_enabled</key> + <key>run</key> <value>True</value> </param> <param> - <key>type</key> - <value>float</value> - </param> - <param> - <key>samp_rate</key> - <value>samp_rate</value> - </param> - <param> - <key>waveform</key> - <value>gr.GR_COS_WAVE</value> - </param> - <param> - <key>freq</key> - <value>freq</value> - </param> - <param> - <key>amp</key> - <value>ampl</value> + <key>max_nouts</key> + <value>0</value> </param> <param> - <key>offset</key> - <value>offset</value> + <key>realtime_scheduling</key> + <value></value> </param> <param> <key>_coordinate</key> - <value>(162, 200)</value> + <value>(10, 10)</value> </param> <param> <key>_rotation</key> @@ -138,37 +111,6 @@ </param> </block> <block> - <key>gr_throttle</key> - <param> - <key>id</key> - <value>gr_throttle</value> - </param> - <param> - <key>_enabled</key> - <value>True</value> - </param> - <param> - <key>type</key> - <value>float</value> - </param> - <param> - <key>samples_per_second</key> - <value>samp_rate</value> - </param> - <param> - <key>vlen</key> - <value>1</value> - </param> - <param> - <key>_coordinate</key> - <value>(386, 93)</value> - </param> - <param> - <key>_rotation</key> - <value>0</value> - </param> - </block> - <block> <key>wxgui_scopesink2</key> <param> <key>id</key> @@ -191,11 +133,11 @@ <value>samp_rate</value> </param> <param> - <key>frame_decim</key> - <value>15</value> + <key>v_scale</key> + <value>0</value> </param> <param> - <key>v_scale</key> + <key>v_offset</key> <value>0</value> </param> <param> @@ -203,18 +145,38 @@ <value>.001</value> </param> <param> - <key>marker</key> - <value>set_format_line</value> + <key>ac_couple</key> + <value>False</value> + </param> + <param> + <key>xy_mode</key> + <value>False</value> </param> <param> <key>num_inputs</key> <value>1</value> </param> <param> + <key>win_size</key> + <value></value> + </param> + <param> <key>grid_pos</key> <value>0, 0, 2, 4</value> </param> <param> + <key>notebook</key> + <value></value> + </param> + <param> + <key>trig_mode</key> + <value>gr.gr_TRIG_MODE_AUTO</value> + </param> + <param> + <key>y_axis_label</key> + <value>Counts</value> + </param> + <param> <key>_coordinate</key> <value>(623, 28)</value> </param> @@ -262,6 +224,10 @@ <value>50</value> </param> <param> + <key>ref_scale</key> + <value>2.0</value> + </param> + <param> <key>fft_size</key> <value>512</value> </param> @@ -270,22 +236,38 @@ <value>15</value> </param> <param> - <key>avg_alpha</key> - <value>0</value> + <key>peak_hold</key> + <value>False</value> </param> <param> <key>average</key> <value>False</value> </param> <param> - <key>peak_hold</key> - <value>False</value> + <key>avg_alpha</key> + <value>0</value> + </param> + <param> + <key>win</key> + <value>None</value> + </param> + <param> + <key>win_size</key> + <value></value> </param> <param> <key>grid_pos</key> <value>2, 0, 2, 4</value> </param> <param> + <key>notebook</key> + <value></value> + </param> + <param> + <key>freqvar</key> + <value>None</value> + </param> + <param> <key>_coordinate</key> <value>(630, 233)</value> </param> @@ -363,22 +345,96 @@ <value>0</value> </param> </block> + <block> + <key>gr_throttle</key> + <param> + <key>id</key> + <value>gr_throttle</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>float</value> + </param> + <param> + <key>samples_per_second</key> + <value>samp_rate</value> + </param> + <param> + <key>vlen</key> + <value>1</value> + </param> + <param> + <key>_coordinate</key> + <value>(386, 93)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> + <block> + <key>analog_sig_source_x</key> + <param> + <key>id</key> + <value>analog_sig_source_x_0</value> + </param> + <param> + <key>_enabled</key> + <value>True</value> + </param> + <param> + <key>type</key> + <value>float</value> + </param> + <param> + <key>samp_rate</key> + <value>samp_rate</value> + </param> + <param> + <key>waveform</key> + <value>analog.GR_COS_WAVE</value> + </param> + <param> + <key>freq</key> + <value>freq</value> + </param> + <param> + <key>amp</key> + <value>ampl</value> + </param> + <param> + <key>offset</key> + <value>offset</value> + </param> + <param> + <key>_coordinate</key> + <value>(164, 154)</value> + </param> + <param> + <key>_rotation</key> + <value>0</value> + </param> + </block> <connection> - <source_block_id>gr_sig_source_x</source_block_id> - <sink_block_id>gr_throttle</sink_block_id> + <source_block_id>gr_throttle</source_block_id> + <sink_block_id>wxgui_scopesink2</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> <source_block_id>gr_throttle</source_block_id> - <sink_block_id>wxgui_scopesink2</sink_block_id> + <sink_block_id>wxgui_fftsink2</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> <connection> - <source_block_id>gr_throttle</source_block_id> - <sink_block_id>wxgui_fftsink2</sink_block_id> + <source_block_id>analog_sig_source_x_0</source_block_id> + <sink_block_id>gr_throttle</sink_block_id> <source_key>0</source_key> <sink_key>0</sink_key> </connection> -</flow_graph>
\ No newline at end of file +</flow_graph> |