[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r8939 - in grc/trunk: . notes src/grc/elements src/grc
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r8939 - in grc/trunk: . notes src/grc/elements src/grc_gnuradio src/grc_gnuradio/blocks src/grc_gnuradio/blocks/conversions src/grc_gnuradio/blocks/error_correction src/grc_gnuradio/blocks/filters src/grc_gnuradio/blocks/graphical_sinks src/grc_gnuradio/blocks/level_controls src/grc_gnuradio/blocks/misc src/grc_gnuradio/blocks/modulators src/grc_gnuradio/blocks/operators src/grc_gnuradio/blocks/sinks src/grc_gnuradio/blocks/sources src/grc_gnuradio/blocks/synchronizers src/grc_gnuradio/blocks/trellis src/grc_gnuradio/blocks/usrp src/grc_gnuradio/blocks/variables src/grc_gnuradio/data src/grc_gnuradio/wxgui |
|
Date: |
Fri, 18 Jul 2008 15:26:16 -0600 (MDT) |
Author: jblum
Date: 2008-07-18 15:26:14 -0600 (Fri, 18 Jul 2008)
New Revision: 8939
Added:
grc/trunk/src/grc_gnuradio/data/block.dtd
Removed:
grc/trunk/src/grc_gnuradio/blocks/block.dtd
Modified:
grc/trunk/notes/todo.txt
grc/trunk/setup.py
grc/trunk/src/grc/elements/Platform.py
grc/trunk/src/grc_gnuradio/Platform.py
grc/trunk/src/grc_gnuradio/blocks/conversions/blks2_stream_to_vector_decimator.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_binary_slicer_fb.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_char_to_float.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_chunks_to_symbols.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_arg.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_float.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_imag.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_interleaved_short.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag_squared.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_real.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_deinterleave.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_char.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_complex.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_short.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_uchar.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_interleave.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_interleaved_short_to_complex.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_map_bb.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_packed_to_unpacked_xx.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_short_to_float.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_stream_to_streams.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_stream_to_vector.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_streams_to_stream.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_streams_to_vector.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_uchar_to_float.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_unpack_k_bits_bb.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_unpacked_to_packed_xx.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_vector_to_stream.xml
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_vector_to_streams.xml
grc/trunk/src/grc_gnuradio/blocks/error_correction/blks2_packet_decoder.xml
grc/trunk/src/grc_gnuradio/blocks/error_correction/blks2_packet_encoder.xml
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_decode_ccsds_27_fb.xml
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_encode_ccsds_27_bb.xml
grc/trunk/src/grc_gnuradio/blocks/filters/band_pass_filter.xml
grc/trunk/src/grc_gnuradio/blocks/filters/band_reject_filter.xml
grc/trunk/src/grc_gnuradio/blocks/filters/blks2_channel_model.xml
grc/trunk/src/grc_gnuradio/blocks/filters/blks2_rational_resampler_xxx.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_cma_equalizer_cc.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_fft_filter_xxx.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_filter_delay_fc.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_fir_filter_xxx.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_fractional_interpolator_xx.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_freq_xlating_fir_filter_xxx.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_goertzel_fc.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_hilbert_fc.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_iir_filter_ffd.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_interp_fir_filter_xxx.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_keep_one_in_n.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_rational_resampler_base_xxx.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_rms_xx.xml
grc/trunk/src/grc_gnuradio/blocks/filters/gr_single_pole_iir_filter_xx.xml
grc/trunk/src/grc_gnuradio/blocks/filters/high_pass_filter.xml
grc/trunk/src/grc_gnuradio/blocks/filters/low_pass_filter.xml
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_constellationsink2.xml
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_fftsink2.xml
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_numbersink2.xml
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_scopesink2.xml
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_waterfallsink2.xml
grc/trunk/src/grc_gnuradio/blocks/level_controls/blks2_standard_squelch.xml
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_agc2_xx.xml
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_agc_xx.xml
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_dpll_bb.xml
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_feedforward_agc_cc.xml
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_mute_xx.xml
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_peak_detector2_fb.xml
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_peak_detector_xb.xml
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_pwr_squelch_xx.xml
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_sample_and_hold_xx.xml
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_simple_squelch_cc.xml
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_threshold_ff.xml
grc/trunk/src/grc_gnuradio/blocks/misc/blks2_error_rate.xml
grc/trunk/src/grc_gnuradio/blocks/misc/blks2_selector.xml
grc/trunk/src/grc_gnuradio/blocks/misc/blks2_valve.xml
grc/trunk/src/grc_gnuradio/blocks/misc/gr_delay.xml
grc/trunk/src/grc_gnuradio/blocks/misc/gr_head.xml
grc/trunk/src/grc_gnuradio/blocks/misc/gr_kludge_copy.xml
grc/trunk/src/grc_gnuradio/blocks/misc/gr_nop.xml
grc/trunk/src/grc_gnuradio/blocks/misc/gr_repeat.xml
grc/trunk/src/grc_gnuradio/blocks/misc/gr_skiphead.xml
grc/trunk/src/grc_gnuradio/blocks/misc/gr_throttle.xml
grc/trunk/src/grc_gnuradio/blocks/misc/hier_block.xml
grc/trunk/src/grc_gnuradio/blocks/misc/import.xml
grc/trunk/src/grc_gnuradio/blocks/misc/xmlrpc_client.xml
grc/trunk/src/grc_gnuradio/blocks/misc/xmlrpc_server.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_am_demod_cf.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_analysis_filterbank.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_demod.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_mod.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_fm_deemph.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_fm_demod_cf.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_fm_preemph.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_gmsk_demod.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_gmsk_mod.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_nbfm_rx.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_nbfm_tx.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_qamx_demod.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_qamx_mod.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_synthesis_filterbank.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv_pll.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_wfm_tx.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_constellation_decoder_cb.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_diff_decoder_bb.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_diff_encoder_bb.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_diff_phasor_cc.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_frequency_modulator_fc.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_phase_modulator_fc.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_quadrature_demod_cf.xml
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_vco_f.xml
grc/trunk/src/grc_gnuradio/blocks/operators/blks2_logpwrfft_x.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_add_const_vxx.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_add_vxx.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_and_xx.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_argmax_xx.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_conjugate_cc.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_divide_xx.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_fft_vxx.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_integrate_xx.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_max_xx.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_multiply_const_vxx.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_multiply_vxx.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_nlog10_ff.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_not_xx.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_or_xx.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_sub_xx.xml
grc/trunk/src/grc_gnuradio/blocks/operators/gr_xor_xx.xml
grc/trunk/src/grc_gnuradio/blocks/options.xml
grc/trunk/src/grc_gnuradio/blocks/preferences.xml
grc/trunk/src/grc_gnuradio/blocks/sinks/audio_sink.xml
grc/trunk/src/grc_gnuradio/blocks/sinks/gr_file_sink.xml
grc/trunk/src/grc_gnuradio/blocks/sinks/gr_null_sink.xml
grc/trunk/src/grc_gnuradio/blocks/sinks/gr_udp_sink.xml
grc/trunk/src/grc_gnuradio/blocks/sinks/gr_vector_sink_x.xml
grc/trunk/src/grc_gnuradio/blocks/sinks/gr_wavfile_sink.xml
grc/trunk/src/grc_gnuradio/blocks/sinks/pad_sink.xml
grc/trunk/src/grc_gnuradio/blocks/sources/audio_source.xml
grc/trunk/src/grc_gnuradio/blocks/sources/gr_file_source.xml
grc/trunk/src/grc_gnuradio/blocks/sources/gr_glfsr_source_x.xml
grc/trunk/src/grc_gnuradio/blocks/sources/gr_noise_source_x.xml
grc/trunk/src/grc_gnuradio/blocks/sources/gr_null_source.xml
grc/trunk/src/grc_gnuradio/blocks/sources/gr_sig_source_x.xml
grc/trunk/src/grc_gnuradio/blocks/sources/gr_udp_source.xml
grc/trunk/src/grc_gnuradio/blocks/sources/gr_vector_source_x.xml
grc/trunk/src/grc_gnuradio/blocks/sources/gr_wavfile_source.xml
grc/trunk/src/grc_gnuradio/blocks/sources/pad_source.xml
grc/trunk/src/grc_gnuradio/blocks/sources/random_source_x.xml
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_clock_recovery_mm_xx.xml
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_correlate_access_code_bb.xml
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_costas_loop_cc.xml
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_dd_mpsk_sync_cc.xml
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_mpsk_receiver_cc.xml
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_mpsk_sync_cc.xml
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pll_carriertracking_cc.xml
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pll_freqdet_cf.xml
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pll_refout_cc.xml
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pn_correlator_cc.xml
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_simple_correlator.xml
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_simple_framer.xml
grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_encoder_xx.xml
grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_metrics_x.xml
grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_permutation.xml
grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_siso_combined_f.xml
grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_siso_f.xml
grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_viterbi_combined_xx.xml
grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_viterbi_x.xml
grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_diagnostics.xml
grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_dual_sink_x.xml
grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_dual_source_x.xml
grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_simple_sink_x.xml
grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_simple_source_x.xml
grc/trunk/src/grc_gnuradio/blocks/variables/variable.xml
grc/trunk/src/grc_gnuradio/blocks/variables/variable_chooser.xml
grc/trunk/src/grc_gnuradio/blocks/variables/variable_sink.xml
grc/trunk/src/grc_gnuradio/blocks/variables/variable_slider.xml
grc/trunk/src/grc_gnuradio/blocks/variables/variable_text_box.xml
grc/trunk/src/grc_gnuradio/wxgui/top_block_gui.py
Log:
block wrappers: removed dtd reference, trailing whitespace strip
Modified: grc/trunk/notes/todo.txt
===================================================================
--- grc/trunk/notes/todo.txt 2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/notes/todo.txt 2008-07-18 21:26:14 UTC (rev 8939)
@@ -15,9 +15,9 @@
-dtd for external blocks
-hotkeys in action descriptions
-variables dependent on variables that change
--text box gui control
-log slider gui control
--remove dtd from all block wrappers, setup dtd in platform
+-variable resolution graph structure
+-catch error on open non-existant files
############ Suggestions: ####################
-simple usrp
Modified: grc/trunk/setup.py
===================================================================
--- grc/trunk/setup.py 2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/setup.py 2008-07-18 21:26:14 UTC (rev 8939)
@@ -17,7 +17,7 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
"""
address@hidden setup
address@hidden setup
#Distribution script for grc.
address@hidden Josh Blum
@@ -39,9 +39,9 @@
'data/*.*',
]
-GRC_GNURADIO_DATA = [
- 'data/*.*',
- 'blocks/*.*',
+GRC_GNURADIO_DATA = [
+ 'data/*.*',
+ 'blocks/*.xml',
'blocks/conversions/*.xml',
'blocks/error_correction/*.xml',
'blocks/filters/*.xml',
@@ -50,9 +50,9 @@
'blocks/misc/*.xml',
'blocks/modulators/*.xml',
'blocks/operators/*.xml',
- 'blocks/sinks/*.xml',
- 'blocks/sources/*.xml',
- 'blocks/synchronizers/*.xml',
+ 'blocks/sinks/*.xml',
+ 'blocks/sources/*.xml',
+ 'blocks/synchronizers/*.xml',
'blocks/trellis/*.xml',
'blocks/usrp/*.xml',
'blocks/variables/*.xml',
Modified: grc/trunk/src/grc/elements/Platform.py
===================================================================
--- grc/trunk/src/grc/elements/Platform.py 2008-07-18 19:09:30 UTC (rev
8938)
+++ grc/trunk/src/grc/elements/Platform.py 2008-07-18 21:26:14 UTC (rev
8939)
@@ -33,12 +33,13 @@
class Platform(_Element):
- def __init__(self, name, key, block_paths, block_tree,
default_flow_graph, generator):
+ def __init__(self, name, key, block_paths, block_dtd, block_tree,
default_flow_graph, generator):
"""!
Make a platform from the arguments.
@param name the platform name
@param key the unique platform key
@param block_paths the file paths to blocks in this platform
+ @param block_dtd the dtd validator for xml block wrappers
@param block_tree the nested tree of block keys and categories
@param default_flow_graph the default flow graph file path
@param load_one a single file to load into this platform or None
@@ -48,6 +49,7 @@
self._name = name
self._key = key
self._block_paths = block_paths
+ self._block_dtd = block_dtd
self._block_tree = block_tree
self._default_flow_graph = default_flow_graph
self._generator = generator
@@ -83,7 +85,7 @@
if not found:
self._block_tree_nested.append((custom_category, [custom_key]))
def _load_block(self, f):
- try: ParseXML.validate_dtd(f)
+ try: ParseXML.validate_dtd(f, self._block_dtd)
except ParseXML.XMLSyntaxError, e: self._exit_with_error('Block
definition "%s" failed: \n\t%s'%(f, e))
n = ParseXML.from_file(f)['block']
block = self.Block(self._flow_graph, n)
Modified: grc/trunk/src/grc_gnuradio/Platform.py
===================================================================
--- grc/trunk/src/grc_gnuradio/Platform.py 2008-07-18 19:09:30 UTC (rev
8938)
+++ grc/trunk/src/grc_gnuradio/Platform.py 2008-07-18 21:26:14 UTC (rev
8939)
@@ -30,11 +30,9 @@
from Generator import Generator
PATH = os.path.abspath(os.path.dirname(__file__))
-
BLOCK_PATH = os.path.join(PATH, 'blocks')
-
+BLOCK_DTD = os.path.join(PATH, 'data', 'block.dtd')
BLOCK_TREE = os.path.join(PATH, 'data', 'block_tree.xml')
-
DEFAULT_FLOW_GRAPH = os.path.join(PATH, 'data', 'default_flow_graph.grc.xml')
class Platform(_Platform):
@@ -58,6 +56,7 @@
name='GNURadio Python',
key='gnuradio_python',
block_paths=block_paths,
+ block_dtd=BLOCK_DTD,
block_tree=BLOCK_TREE,
default_flow_graph=DEFAULT_FLOW_GRAPH,
generator=Generator,
Deleted: grc/trunk/src/grc_gnuradio/blocks/block.dtd
Modified:
grc/trunk/src/grc_gnuradio/blocks/conversions/blks2_stream_to_vector_decimator.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/conversions/blks2_stream_to_vector_decimator.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++
grc/trunk/src/grc_gnuradio/blocks/conversions/blks2_stream_to_vector_decimator.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
<!--
###################################################
##Stream to Vector Decimator
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_binary_slicer_fb.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_binary_slicer_fb.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_binary_slicer_fb.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Binary Slicer
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_char_to_float.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_char_to_float.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_char_to_float.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Char to Float:
###################################################
@@ -13,7 +12,7 @@
<sink>
<name>in</name>
<type>byte</type>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>float</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_chunks_to_symbols.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_chunks_to_symbols.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_chunks_to_symbols.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Chunks to Symbols
###################################################
@@ -17,17 +16,17 @@
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:i</opt>
+ <opt>fcn:i</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:s</opt>
+ <opt>fcn:s</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:b</opt>
+ <opt>fcn:b</opt>
</option>
</param>
<param>
@@ -38,13 +37,13 @@
<name>Complex</name>
<key>complex</key>
<opt>fcn:c</opt>
- <opt>table:complex_vector</opt>
+ <opt>table:complex_vector</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
<opt>fcn:f</opt>
- <opt>table:real_vector</opt>
+ <opt>table:real_vector</opt>
</option>
</param>
<param>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_arg.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_arg.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_arg.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Complex to Arg
###################################################
@@ -14,17 +13,17 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
<name>in</name>
<type>complex</type>
<vlen>$vlen</vlen>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>float</type>
<vlen>$vlen</vlen>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_float.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_float.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_float.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Complex to Float:
## one or two output streams
@@ -15,14 +14,14 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
<name>in</name>
<type>complex</type>
<vlen>$vlen</vlen>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>float</type>
@@ -33,5 +32,5 @@
<type>float</type>
<vlen>$vlen</vlen>
<optional>1</optional>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_imag.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_imag.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_imag.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Complex to Imaginary
###################################################
@@ -14,17 +13,17 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
<name>in</name>
<type>complex</type>
<vlen>$vlen</vlen>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>float</type>
<vlen>$vlen</vlen>
- </source>
+ </source>
</block>
Modified:
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_interleaved_short.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_interleaved_short.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_interleaved_short.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Complex to Interleaved Short:
###################################################
@@ -13,7 +12,7 @@
<sink>
<name>in</name>
<type>complex</type>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>short</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Complex to Magnitude
###################################################
@@ -14,17 +13,17 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
<name>in</name>
<type>complex</type>
<vlen>$vlen</vlen>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>float</type>
<vlen>$vlen</vlen>
- </source>
+ </source>
</block>
Modified:
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag_squared.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag_squared.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_mag_squared.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Complex to Magnitude Squared
###################################################
@@ -14,17 +13,17 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
<name>in</name>
<type>complex</type>
<vlen>$vlen</vlen>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>float</type>
<vlen>$vlen</vlen>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_real.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_real.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_complex_to_real.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Complex to Real
###################################################
@@ -14,17 +13,17 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
<name>in</name>
<type>complex</type>
<vlen>$vlen</vlen>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>float</type>
<vlen>$vlen</vlen>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_deinterleave.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_deinterleave.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_deinterleave.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Deinterleave
###################################################
@@ -17,40 +16,40 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>Num Streams</name>
<key>num_streams</key>
<value>2</value>
- <type>int</type>
- </param>
+ <type>int</type>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_streams > 0</check>
<check>$vlen >= 1</check>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_char.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_char.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_char.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Float to Char:
###################################################
@@ -13,7 +12,7 @@
<sink>
<name>in</name>
<type>float</type>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>byte</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_complex.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_complex.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_complex.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Float to Complex:
## one or two input streams
@@ -14,12 +13,12 @@
<sink>
<name>in</name>
<type>float</type>
- </sink>
+ </sink>
<sink>
<name>in</name>
<type>float</type>
<optional>1</optional>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>complex</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_short.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_short.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_short.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Float to Short:
###################################################
@@ -13,7 +12,7 @@
<sink>
<name>in</name>
<type>float</type>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>short</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_uchar.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_uchar.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_float_to_uchar.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Float to Unsigned Char:
###################################################
@@ -13,7 +12,7 @@
<sink>
<name>in</name>
<type>float</type>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>byte</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_interleave.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_interleave.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_interleave.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Interleave
###################################################
@@ -17,40 +16,40 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>Num Streams</name>
<key>num_streams</key>
<value>2</value>
- <type>int</type>
- </param>
+ <type>int</type>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_streams > 0</check>
<check>$vlen >= 1</check>
Modified:
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_interleaved_short_to_complex.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_interleaved_short_to_complex.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_interleaved_short_to_complex.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Interleaved Short to Complex:
###################################################
@@ -13,7 +12,7 @@
<sink>
<name>in</name>
<type>short</type>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>complex</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_map_bb.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_map_bb.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_map_bb.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Map
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_packed_to_unpacked_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_packed_to_unpacked_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_packed_to_unpacked_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Packed to Unpacked
###################################################
@@ -17,17 +16,17 @@
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:bb</opt>
+ <opt>fcn:bb</opt>
</option>
</param>
<param>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_short_to_float.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_short_to_float.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_short_to_float.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Short to Float:
###################################################
@@ -13,7 +12,7 @@
<sink>
<name>in</name>
<type>short</type>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>float</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_stream_to_streams.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_stream_to_streams.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_stream_to_streams.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Stream to Streams
###################################################
@@ -17,40 +16,40 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>Num Streams</name>
<key>num_streams</key>
<value>2</value>
- <type>int</type>
- </param>
+ <type>int</type>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_streams > 0</check>
<check>$vlen >= 1</check>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_stream_to_vector.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_stream_to_vector.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_stream_to_vector.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
<!--
###################################################
##Stream to Vector
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_streams_to_stream.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_streams_to_stream.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_streams_to_stream.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Streams to Stream
###################################################
@@ -17,40 +16,40 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>Num Streams</name>
<key>num_streams</key>
<value>2</value>
- <type>int</type>
- </param>
+ <type>int</type>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_streams > 0</check>
<check>$vlen >= 1</check>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_streams_to_vector.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_streams_to_vector.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_streams_to_vector.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Streams to Vector
###################################################
@@ -17,40 +16,40 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>Num Streams</name>
<key>num_streams</key>
<value>2</value>
- <type>int</type>
- </param>
+ <type>int</type>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_streams > 0</check>
<check>$vlen >= 1</check>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_uchar_to_float.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_uchar_to_float.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_uchar_to_float.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Unsigned Char to Float:
###################################################
@@ -13,7 +12,7 @@
<sink>
<name>in</name>
<type>byte</type>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>float</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_unpack_k_bits_bb.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_unpack_k_bits_bb.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_unpack_k_bits_bb.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Unpack K Bits
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/conversions/gr_unpacked_to_packed_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_unpacked_to_packed_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_unpacked_to_packed_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Unpacked to Packed
###################################################
@@ -17,17 +16,17 @@
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:bb</opt>
+ <opt>fcn:bb</opt>
</option>
</param>
<param>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_vector_to_stream.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_vector_to_stream.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_vector_to_stream.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Vector to Stream
###################################################
@@ -17,40 +16,40 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>Num Items</name>
<key>num_items</key>
<value>2</value>
- <type>int</type>
- </param>
+ <type>int</type>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_items > 0</check>
<check>$vlen >= 1</check>
Modified: grc/trunk/src/grc_gnuradio/blocks/conversions/gr_vector_to_streams.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/conversions/gr_vector_to_streams.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/conversions/gr_vector_to_streams.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Vector to Streams
###################################################
@@ -17,40 +16,40 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>Num Streams</name>
<key>num_streams</key>
<value>2</value>
- <type>int</type>
- </param>
+ <type>int</type>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_streams > 0</check>
<check>$vlen >= 1</check>
Modified:
grc/trunk/src/grc_gnuradio/blocks/error_correction/blks2_packet_decoder.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/error_correction/blks2_packet_decoder.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/error_correction/blks2_packet_decoder.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Packet Decoder
###################################################
@@ -11,8 +10,8 @@
<import>from grc_gnuradio import blks2 as grc_blks2</import>
<import>from gnuradio import gr</import>
<make>grc_blks2.packet_decoder(
- item_size_out=$type.size*$vlen,
- access_code=$access_code,
+ item_size_out=$type.size*$vlen,
+ access_code=$access_code,
threshold=$threshold,
)</make>
<param>
@@ -23,46 +22,46 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>Access Code</name>
<key>access_code</key>
<value></value>
- <type>string</type>
+ <type>string</type>
</param>
<param>
<name>Threshold</name>
<key>threshold</key>
<value>-1</value>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
@@ -77,6 +76,6 @@
<doc>
Packet decoder block, for use with the gnuradio demodulator blocks: gmsk, psk,
qam.
-Access Code: string of 1's and 0's, leave blank for default.
+Access Code: string of 1's and 0's, leave blank for default.
</doc>
</block>
Modified:
grc/trunk/src/grc_gnuradio/blocks/error_correction/blks2_packet_encoder.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/error_correction/blks2_packet_encoder.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/error_correction/blks2_packet_encoder.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Packet Encoder
###################################################
@@ -11,12 +10,12 @@
<import>from grc_gnuradio import blks2 as grc_blks2</import>
<import>from gnuradio import gr</import>
<make>grc_blks2.packet_encoder(
- item_size_in=$type.size*$vlen,
- samples_per_symbol=$samples_per_symbol,
+ item_size_in=$type.size*$vlen,
+ samples_per_symbol=$samples_per_symbol,
bits_per_symbol=$bits_per_symbol,
- access_code=$access_code,
+ access_code=$access_code,
pad_for_usrp=$pad_for_usrp,
- payload_length=$payload_length,
+ payload_length=$payload_length,
)</make>
<param>
<name>Input Type</name>
@@ -26,44 +25,44 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>Samples/Symbol</name>
<key>samples_per_symbol</key>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Bits/Symbol</name>
<key>bits_per_symbol</key>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Access Code</name>
<key>access_code</key>
<value></value>
- <type>string</type>
+ <type>string</type>
</param>
<param>
<name>Pad for USRP</name>
@@ -71,24 +70,24 @@
<type>enum</type>
<option>
<name>Yes</name>
- <key>True</key>
+ <key>True</key>
</option>
<option>
<name>No</name>
- <key>False</key>
+ <key>False</key>
</option>
</param>
<param>
<name>Payload Length</name>
<key>payload_length</key>
<value>-1</value>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
@@ -105,7 +104,7 @@
Access Code: string of 1's and 0's, leave blank for default.
-Bits/Symbol should be set accordingly:
+Bits/Symbol should be set accordingly:
gmsk -> 1
dbpsk -> 1
dqpsk -> 2
@@ -113,6 +112,6 @@
qam8 -> 3
qam16 -> 4
qam64 -> 6
- qam256 -> 8
+ qam256 -> 8
</doc>
</block>
Modified:
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_decode_ccsds_27_fb.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_decode_ccsds_27_fb.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_decode_ccsds_27_fb.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Decode CCSDS 27
###################################################
@@ -13,7 +12,7 @@
<sink>
<name>in</name>
<type>float</type>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>byte</type>
Modified:
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_encode_ccsds_27_bb.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_encode_ccsds_27_bb.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++
grc/trunk/src/grc_gnuradio/blocks/error_correction/gr_encode_ccsds_27_bb.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Encode CCSDS 27
###################################################
@@ -13,7 +12,7 @@
<sink>
<name>in</name>
<type>byte</type>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>byte</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/band_pass_filter.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/band_pass_filter.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/band_pass_filter.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Band Pass Filter: Custom wrapper
###################################################
@@ -74,7 +73,7 @@
<name>Transition Width</name>
<key>width</key>
<type>real</type>
- </param>
+ </param>
<param>
<name>Window</name>
<key>window</key>
@@ -98,14 +97,14 @@
<option>
<name>Kaiser</name>
<key>WIN_KAISER</key>
- </option>
+ </option>
</param>
<param>
<name>Beta</name>
<key>beta</key>
<value>6.76</value>
<type>real</type>
- </param>
+ </param>
<sink>
<name>in</name>
<type>$type.input</type>
@@ -117,7 +116,7 @@
<doc>
This filter is a convenience wrapper for an fir filter and a firdes taps
generating function.
-The decimation paramater becomes interpolation when the filter type is set to
interpolating.
+The decimation paramater becomes interpolation when the filter type is set to
interpolating.
Sample rate, cutoff frequency, and transition width are in Hertz.
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/band_reject_filter.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/band_reject_filter.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/band_reject_filter.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Band Reject Filter: Custom wrapper
###################################################
@@ -74,7 +73,7 @@
<name>Transition Width</name>
<key>width</key>
<type>real</type>
- </param>
+ </param>
<param>
<name>Window</name>
<key>window</key>
@@ -98,14 +97,14 @@
<option>
<name>Kaiser</name>
<key>WIN_KAISER</key>
- </option>
+ </option>
</param>
<param>
<name>Beta</name>
<key>beta</key>
<value>6.76</value>
<type>real</type>
- </param>
+ </param>
<sink>
<name>in</name>
<type>$type.input</type>
@@ -117,7 +116,7 @@
<doc>
This filter is a convenience wrapper for an fir filter and a firdes taps
generating function.
-The decimation paramater becomes interpolation when the filter type is set to
interpolating.
+The decimation paramater becomes interpolation when the filter type is set to
interpolating.
Sample rate, cutoff frequency, and transition width are in Hertz.
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/blks2_channel_model.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/blks2_channel_model.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/blks2_channel_model.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Channel Model
###################################################
@@ -11,15 +10,15 @@
<import>from gnuradio import blks2</import>
<import>from gnuradio.gr import firdes</import>
<make>blks2.channel_model(
- noise_voltage=$noise_voltage,
- frequency_offset=$freq_offset,
- epsilon=$epsilon,
+ noise_voltage=$noise_voltage,
+ frequency_offset=$freq_offset,
+ epsilon=$epsilon,
taps=$taps,
noise_seed=$seed,
)</make>
<callback>set_noise_voltage($noise_voltage)</callback>
<callback>set_frequency_offset($freq_offset)</callback>
- <callback>set_taps($taps)</callback>
+ <callback>set_taps($taps)</callback>
<param>
<name>Noise Voltage</name>
<key>noise_voltage</key>
@@ -48,7 +47,7 @@
<name>Seed</name>
<key>seed</key>
<value>42</value>
- <type>int</type>
+ <type>int</type>
</param>
<sink>
<name>in</name>
Modified:
grc/trunk/src/grc_gnuradio/blocks/filters/blks2_rational_resampler_xxx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/blks2_rational_resampler_xxx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/blks2_rational_resampler_xxx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Rational Resampler
###################################################
@@ -12,7 +11,7 @@
<import>from gnuradio.gr import firdes</import>
<make>blks2.rational_resampler_$(type)(
interpolation=$interp,
- decimation=$decim,
+ decimation=$decim,
#if $taps.eval
taps=$taps,
#else
@@ -83,7 +82,7 @@
<type>$type.output</type>
</source>
<doc>
-Leave taps empty for automatic value.
+Leave taps empty for automatic value.
Leave fractional bandwidth 0 for automatic value.
</doc>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/gr_cma_equalizer_cc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/gr_cma_equalizer_cc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/gr_cma_equalizer_cc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##CMA Equalizer
###################################################
@@ -15,7 +14,7 @@
<key>num_taps</key>
<value>64</value>
<type>int</type>
- </param>
+ </param>
<param>
<name>Modulus</name>
<key>modulus</key>
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/gr_fft_filter_xxx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/gr_fft_filter_xxx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/gr_fft_filter_xxx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##FFT Filter
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/gr_filter_delay_fc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/gr_filter_delay_fc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/gr_filter_delay_fc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Filter Delay
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/gr_fir_filter_xxx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/gr_fir_filter_xxx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/gr_fir_filter_xxx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Decimating FIR Filter
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/filters/gr_fractional_interpolator_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/gr_fractional_interpolator_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/gr_fractional_interpolator_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Fractional Interpolator
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/filters/gr_freq_xlating_fir_filter_xxx.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/filters/gr_freq_xlating_fir_filter_xxx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++
grc/trunk/src/grc_gnuradio/blocks/filters/gr_freq_xlating_fir_filter_xxx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Frequency Xlating Filter
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/gr_goertzel_fc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/gr_goertzel_fc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/gr_goertzel_fc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Goertzel
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/gr_hilbert_fc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/gr_hilbert_fc.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/gr_hilbert_fc.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Hilbert
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/gr_iir_filter_ffd.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/gr_iir_filter_ffd.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/gr_iir_filter_ffd.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##IIR Filter
###################################################
@@ -10,7 +9,7 @@
<key>gr_iir_filter_ffd</key>
<import>from gnuradio import gr</import>
<make>gr.iir_filter_ffd($fftaps, $fbtaps)</make>
- <callback>set_taps($fftaps, $fbtaps)</callback>
+ <callback>set_taps($fftaps, $fbtaps)</callback>
<param>
<name>Feed-forward Taps</name>
<key>fftaps</key>
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/gr_interp_fir_filter_xxx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/gr_interp_fir_filter_xxx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/gr_interp_fir_filter_xxx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Interpolating FIR Filter
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/gr_keep_one_in_n.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/gr_keep_one_in_n.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/gr_keep_one_in_n.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Keep 1 in N
###################################################
@@ -18,40 +17,40 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>N</name>
<key>n</key>
<value>1</value>
- <type>int</type>
- </param>
+ <type>int</type>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$n > 0</check>
<check>$vlen > 0</check>
Modified:
grc/trunk/src/grc_gnuradio/blocks/filters/gr_rational_resampler_base_xxx.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/filters/gr_rational_resampler_base_xxx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++
grc/trunk/src/grc_gnuradio/blocks/filters/gr_rational_resampler_base_xxx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Rational Resampler Base
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/gr_rms_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/gr_rms_xx.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/gr_rms_xx.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##RMS
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/filters/gr_single_pole_iir_filter_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/gr_single_pole_iir_filter_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/gr_single_pole_iir_filter_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Single Pole IIR Filter
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/high_pass_filter.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/high_pass_filter.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/high_pass_filter.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##High Pass Filter: Custom wrapper
###################################################
@@ -69,7 +68,7 @@
<name>Transition Width</name>
<key>width</key>
<type>real</type>
- </param>
+ </param>
<param>
<name>Window</name>
<key>window</key>
@@ -93,14 +92,14 @@
<option>
<name>Kaiser</name>
<key>WIN_KAISER</key>
- </option>
+ </option>
</param>
<param>
<name>Beta</name>
<key>beta</key>
<value>6.76</value>
<type>real</type>
- </param>
+ </param>
<sink>
<name>in</name>
<type>$type.input</type>
@@ -112,7 +111,7 @@
<doc>
This filter is a convenience wrapper for an fir filter and a firdes taps
generating function.
-The decimation paramater becomes interpolation when the filter type is set to
interpolating.
+The decimation paramater becomes interpolation when the filter type is set to
interpolating.
Sample rate, cutoff frequency, and transition width are in Hertz.
Modified: grc/trunk/src/grc_gnuradio/blocks/filters/low_pass_filter.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/filters/low_pass_filter.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/filters/low_pass_filter.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Low Pass Filter: Custom wrapper
###################################################
@@ -69,7 +68,7 @@
<name>Transition Width</name>
<key>width</key>
<type>real</type>
- </param>
+ </param>
<param>
<name>Window</name>
<key>window</key>
@@ -93,14 +92,14 @@
<option>
<name>Kaiser</name>
<key>WIN_KAISER</key>
- </option>
+ </option>
</param>
<param>
<name>Beta</name>
<key>beta</key>
<value>6.76</value>
<type>real</type>
- </param>
+ </param>
<sink>
<name>in</name>
<type>$type.input</type>
@@ -112,7 +111,7 @@
<doc>
This filter is a convenience wrapper for an fir filter and a firdes taps
generating function.
-The decimation paramater becomes interpolation when the filter type is set to
interpolating.
+The decimation paramater becomes interpolation when the filter type is set to
interpolating.
Sample rate, cutoff frequency, and transition width are in Hertz.
Modified:
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_constellationsink2.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_constellationsink2.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_constellationsink2.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Constellation Sink
###################################################
@@ -10,9 +9,9 @@
<key>wxgui_constellationsink2</key>
<import>from gnuradio.wxgui import scopesink2</import>
<make>scopesink2.constellation_sink(
- self.GetWin(),
- title=$title,
- sample_rate=$samp_rate,
+ self.GetWin(),
+ title=$title,
+ sample_rate=$samp_rate,
frame_decim=$frame_decim,
)
self.$(id).win.$(marker)()
@@ -24,19 +23,19 @@
#end if</make>
<callback>set_sample_rate($samp_rate)</callback>
<param>
- <name>Title</name>
+ <name>Title</name>
<key>title</key>
<value>Constellation Plot</value>
<type>string</type>
</param>
<param>
- <name>Sample Rate</name>
+ <name>Sample Rate</name>
<key>samp_rate</key>
<value>samp_rate</value>
<type>real</type>
</param>
<param>
- <name>Frame Decimation</name>
+ <name>Frame Decimation</name>
<key>frame_decim</key>
<value>15</value>
<type>int</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_fftsink2.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_fftsink2.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_fftsink2.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##FFT Sink
###################################################
@@ -22,9 +21,9 @@
#if $avg_alpha.eval == 0
avg_alpha=None,
#else
- avg_alpha=$avg_alpha,
+ avg_alpha=$avg_alpha,
#end if
- title=$title,
+ title=$title,
peak_hold=$peak_hold,
)
#set $grid_pos = $grid_pos.eval
@@ -34,7 +33,7 @@
self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])
#end if</make>
<param>
- <name>Type</name>
+ <name>Type</name>
<key>type</key>
<value>complex</value>
<type>enum</type>
@@ -50,55 +49,55 @@
</option>
</param>
<param>
- <name>Title</name>
+ <name>Title</name>
<key>title</key>
<value>FFT Plot</value>
<type>string</type>
</param>
<param>
- <name>Sample Rate</name>
+ <name>Sample Rate</name>
<key>samp_rate</key>
<value>samp_rate</value>
<type>real</type>
</param>
<param>
- <name>Baseband Freq</name>
+ <name>Baseband Freq</name>
<key>baseband_freq</key>
<value>0</value>
<type>real</type>
</param>
<param>
- <name>Y per Div</name>
+ <name>Y per Div</name>
<key>y_per_div</key>
<value>10</value>
<type>real</type>
</param>
<param>
- <name>Y Divs</name>
+ <name>Y Divs</name>
<key>y_divs</key>
<value>8</value>
<type>real</type>
</param>
<param>
- <name>Reference Level</name>
+ <name>Reference Level</name>
<key>ref_level</key>
<value>50</value>
<type>real</type>
</param>
<param>
- <name>FFT Size</name>
+ <name>FFT Size</name>
<key>fft_size</key>
<value>512</value>
<type>int</type>
</param>
<param>
- <name>FFT Rate</name>
+ <name>FFT Rate</name>
<key>fft_rate</key>
<value>15</value>
<type>int</type>
</param>
<param>
- <name>Average Alpha</name>
+ <name>Average Alpha</name>
<key>avg_alpha</key>
<value>0</value>
<type>real</type>
@@ -142,7 +141,7 @@
<type>$type</type>
</sink>
<doc>
-Set Average Alpha to 0 for automatic setting.
+Set Average Alpha to 0 for automatic setting.
Use the Grid Position (row, column, row span, column span) to position the
graphical element in the window.
</doc>
Modified:
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_numbersink2.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_numbersink2.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_numbersink2.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Number Sink
###################################################
@@ -24,7 +23,7 @@
#if $avg_alpha.eval == 0
avg_alpha=None,
#else
- avg_alpha=$avg_alpha,
+ avg_alpha=$avg_alpha,
#end if
label=$title,
peak_hold=$options.peak_hold,
@@ -37,7 +36,7 @@
self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])
#end if</make>
<param>
- <name>Type</name>
+ <name>Type</name>
<key>type</key>
<value>complex</value>
<type>enum</type>
@@ -53,67 +52,67 @@
</option>
</param>
<param>
- <name>Title</name>
+ <name>Title</name>
<key>title</key>
<value>Number Plot</value>
<type>string</type>
</param>
<param>
- <name>Units</name>
+ <name>Units</name>
<key>units</key>
<value>Units</value>
<type>string</type>
</param>
<param>
- <name>Sample Rate</name>
+ <name>Sample Rate</name>
<key>samp_rate</key>
<value>samp_rate</value>
<type>real</type>
</param>
<param>
- <name>Base Value</name>
+ <name>Base Value</name>
<key>base_value</key>
<value>0.0</value>
<type>real</type>
</param>
<param>
- <name>Min Value</name>
+ <name>Min Value</name>
<key>min_value</key>
<value>-100</value>
<type>real</type>
</param>
<param>
- <name>Max Value</name>
+ <name>Max Value</name>
<key>max_value</key>
<value>100</value>
<type>real</type>
</param>
<param>
- <name>Factor</name>
+ <name>Factor</name>
<key>factor</key>
<value>1.0</value>
<type>real</type>
</param>
<param>
- <name>Decimal Places</name>
+ <name>Decimal Places</name>
<key>decimal_places</key>
<value>10</value>
<type>int</type>
</param>
<param>
- <name>Reference Level</name>
+ <name>Reference Level</name>
<key>ref_level</key>
<value>50</value>
<type>real</type>
</param>
<param>
- <name>Number Rate</name>
+ <name>Number Rate</name>
<key>number_rate</key>
<value>15</value>
<type>int</type>
</param>
<param>
- <name>Average Alpha</name>
+ <name>Average Alpha</name>
<key>avg_alpha</key>
<value>0</value>
<type>real</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_scopesink2.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_scopesink2.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_scopesink2.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Scope Sink
###################################################
@@ -11,16 +10,16 @@
<import>from gnuradio.wxgui import scopesink2</import>
<import>from gnuradio import gr</import>
<make>scopesink2.$(type.fcn)(
- self.GetWin(),
- title=$title,
- sample_rate=$samp_rate,
- frame_decim=$frame_decim,
+ self.GetWin(),
+ title=$title,
+ sample_rate=$samp_rate,
+ frame_decim=$frame_decim,
#if $v_scale.eval == 0
v_scale=None,
#else
- v_scale=$v_scale,
+ v_scale=$v_scale,
#end if
- t_scale=$t_scale,
+ t_scale=$t_scale,
num_inputs=$num_inputs,
)
self.$(id).win.$(marker)()
@@ -30,12 +29,12 @@
#else
self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])
#end if</make>
-<!--
+<!--
$(id).win.info.scopesink.set_trigger_channel($(trigger_channel))
$(id).win.info.scopesink.set_trigger_mode(gr.$(trigger_mode)) -->
<callback>set_sample_rate($samp_rate)</callback>
<param>
- <name>Type</name>
+ <name>Type</name>
<key>type</key>
<value>complex</value>
<type>enum</type>
@@ -51,31 +50,31 @@
</option>
</param>
<param>
- <name>Title</name>
+ <name>Title</name>
<key>title</key>
<value>Scope Plot</value>
<type>string</type>
</param>
<param>
- <name>Sample Rate</name>
+ <name>Sample Rate</name>
<key>samp_rate</key>
<value>samp_rate</value>
<type>real</type>
</param>
<param>
- <name>Frame Decimation</name>
+ <name>Frame Decimation</name>
<key>frame_decim</key>
<value>15</value>
<type>int</type>
</param>
<param>
- <name>V Scale</name>
+ <name>V Scale</name>
<key>v_scale</key>
<value>0</value>
<type>real</type>
</param>
<param>
- <name>T Scale</name>
+ <name>T Scale</name>
<key>t_scale</key>
<value>.001</value>
<type>real</type>
@@ -123,11 +122,11 @@
</option>
</param> -->
<param>
- <name>Num Inputs</name>
+ <name>Num Inputs</name>
<key>num_inputs</key>
<value>1</value>
<type>int</type>
- </param>
+ </param>
<param>
<name>Grid Position</name>
<key>grid_pos</key>
Modified:
grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_waterfallsink2.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_waterfallsink2.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/graphical_sinks/wxgui_waterfallsink2.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Waterfall Sink
###################################################
@@ -21,7 +20,7 @@
#if $avg_alpha.eval == 0
avg_alpha=None,
#else
- avg_alpha=$avg_alpha,
+ avg_alpha=$avg_alpha,
#end if
title=$title,
)
@@ -32,7 +31,7 @@
self.GridAdd(self.$(id).win, $grid_pos[0], $grid_pos[1], $grid_pos[2],
$grid_pos[3])
#end if</make>
<param>
- <name>Type</name>
+ <name>Type</name>
<key>type</key>
<value>complex</value>
<type>enum</type>
@@ -48,49 +47,49 @@
</option>
</param>
<param>
- <name>Title</name>
+ <name>Title</name>
<key>title</key>
<value>Waterfall Plot</value>
<type>string</type>
</param>
<param>
- <name>Sample Rate</name>
+ <name>Sample Rate</name>
<key>samp_rate</key>
<value>samp_rate</value>
<type>real</type>
</param>
<param>
- <name>Baseband Freq</name>
+ <name>Baseband Freq</name>
<key>baseband_freq</key>
<value>0</value>
<type>real</type>
</param>
<param>
- <name>Y per Div</name>
+ <name>Y per Div</name>
<key>y_per_div</key>
<value>10</value>
<type>real</type>
</param>
<param>
- <name>Reference Level</name>
+ <name>Reference Level</name>
<key>ref_level</key>
<value>50</value>
<type>real</type>
</param>
<param>
- <name>FFT Size</name>
+ <name>FFT Size</name>
<key>fft_size</key>
<value>512</value>
<type>int</type>
</param>
<param>
- <name>FFT Rate</name>
+ <name>FFT Rate</name>
<key>fft_rate</key>
<value>15</value>
<type>int</type>
</param>
<param>
- <name>Average Alpha</name>
+ <name>Average Alpha</name>
<key>avg_alpha</key>
<value>0</value>
<type>real</type>
@@ -122,7 +121,7 @@
<type>$type</type>
</sink>
<doc>
-Set Average Alpha to 0 for automatic setting.
+Set Average Alpha to 0 for automatic setting.
Use the Grid Position (row, column, row span, column span) to position the
graphical element in the window.
</doc>
Modified:
grc/trunk/src/grc_gnuradio/blocks/level_controls/blks2_standard_squelch.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/level_controls/blks2_standard_squelch.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/level_controls/blks2_standard_squelch.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Standard Squelch
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_agc2_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_agc2_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_agc2_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##AGC2
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_agc_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_agc_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_agc_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##AGC
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_dpll_bb.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_dpll_bb.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_dpll_bb.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Detect Peak
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_feedforward_agc_cc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_feedforward_agc_cc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_feedforward_agc_cc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Feed Forward AGC
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_mute_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_mute_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_mute_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Mute Block:
## Cast input to bool.
@@ -19,36 +18,36 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>fcn:cc</opt>
+ <opt>fcn:cc</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:ff</opt>
+ <opt>fcn:ff</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
</param>
<param>
<name>Mute</name>
<key>mute</key>
<value>False</value>
- <type>raw</type>
+ <type>raw</type>
</param>
<sink>
<name>in</name>
<type>$type</type>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>$type</type>
- </source>
+ </source>
</block>
Modified:
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_peak_detector2_fb.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_peak_detector2_fb.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_peak_detector2_fb.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Peak Detector2
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_peak_detector_xb.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_peak_detector_xb.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_peak_detector_xb.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Peak Detector
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_pwr_squelch_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_pwr_squelch_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_pwr_squelch_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Power Squelch
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_sample_and_hold_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_sample_and_hold_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_sample_and_hold_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Sample and Hold
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_simple_squelch_cc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_simple_squelch_cc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_simple_squelch_cc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Simple Squelch
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_threshold_ff.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_threshold_ff.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/level_controls/gr_threshold_ff.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Threshold
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/blks2_error_rate.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/blks2_error_rate.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/blks2_error_rate.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Error Rate:
## Custom blks2 block
@@ -11,8 +10,8 @@
<key>blks2_error_rate</key>
<import>from grc_gnuradio import blks2 as grc_blks2</import>
<make>grc_blks2.error_rate(
- type=$type,
- win_size=$win_size,
+ type=$type,
+ win_size=$win_size,
bits_per_symbol=$bits_per_symbol,
)</make>
<param>
@@ -21,11 +20,11 @@
<type>enum</type>
<option>
<name>Bit Error Rate</name>
- <key>"BER"</key>
+ <key>"BER"</key>
</option>
<option>
<name>Symbol Error Rate</name>
- <key>"SER"</key>
+ <key>"SER"</key>
</option>
</param>
<param>
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/blks2_selector.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/blks2_selector.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/blks2_selector.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Selector:
## Custom blks2 block
@@ -11,10 +10,10 @@
<key>blks2_selector</key>
<import>from grc_gnuradio import blks2 as grc_blks2</import>
<make>grc_blks2.selector(
- item_size=$type.size*$vlen,
- num_inputs=$num_inputs,
- num_outputs=$num_outputs,
- input_index=$input_index,
+ item_size=$type.size*$vlen,
+ num_inputs=$num_inputs,
+ num_outputs=$num_outputs,
+ input_index=$input_index,
output_index=$output_index,
)</make>
<callback>set_input_index($input_index)</callback>
@@ -26,27 +25,27 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
@@ -77,7 +76,7 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
@@ -93,6 +92,6 @@
<nports>$num_outputs</nports>
</source>
<doc>
-Connect the sink at input index to the source at output index. Leave all other
ports disconnected.
+Connect the sink at input index to the source at output index. Leave all other
ports disconnected.
</doc>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/blks2_valve.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/blks2_valve.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/blks2_valve.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Valve:
## Custom blks2 block
@@ -19,27 +18,27 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
@@ -52,7 +51,7 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/gr_delay.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/gr_delay.xml 2008-07-18 19:09:30 UTC
(rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/gr_delay.xml 2008-07-18 21:26:14 UTC
(rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Delay
###################################################
@@ -17,27 +16,27 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
@@ -50,7 +49,7 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/gr_head.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/gr_head.xml 2008-07-18 19:09:30 UTC
(rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/gr_head.xml 2008-07-18 21:26:14 UTC
(rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Head
###################################################
@@ -17,27 +16,27 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
@@ -50,7 +49,7 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/gr_kludge_copy.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/gr_kludge_copy.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/gr_kludge_copy.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Kludge Copy
###################################################
@@ -17,34 +16,34 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/gr_nop.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/gr_nop.xml 2008-07-18 19:09:30 UTC
(rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/gr_nop.xml 2008-07-18 21:26:14 UTC
(rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Nop
###################################################
@@ -17,34 +16,34 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/gr_repeat.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/gr_repeat.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/gr_repeat.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Repeat
###################################################
@@ -17,27 +16,27 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
@@ -49,7 +48,7 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/gr_skiphead.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/gr_skiphead.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/gr_skiphead.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Skip Head
###################################################
@@ -17,27 +16,27 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
@@ -50,7 +49,7 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/gr_throttle.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/gr_throttle.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/gr_throttle.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Throttle
###################################################
@@ -17,27 +16,27 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
@@ -50,7 +49,7 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/hier_block.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/hier_block.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/hier_block.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Hier Block
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/import.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/import.xml 2008-07-18 19:09:30 UTC
(rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/import.xml 2008-07-18 21:26:14 UTC
(rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Import python modules into the namespace
###################################################
@@ -14,7 +13,7 @@
<name>Import</name>
<key>import</key>
<value></value>
- <type>import</type>
+ <type>import</type>
</param>
<doc>
Import additional python modules into the namespace.
@@ -22,6 +21,6 @@
Examples:
from gnuradio.gr import firdes
import math,cmath
-from math import pi
+from math import pi
</doc>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/xmlrpc_client.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/xmlrpc_client.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/xmlrpc_client.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Simple XMLRPC Client
###################################################
@@ -15,7 +14,7 @@
<name>Address</name>
<key>addr</key>
<value>localhost</value>
- <type>string</type>
+ <type>string</type>
</param>
<param>
<name>Port</name>
Modified: grc/trunk/src/grc_gnuradio/blocks/misc/xmlrpc_server.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/misc/xmlrpc_server.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/misc/xmlrpc_server.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Simple XMLRPC Server
###################################################
@@ -17,7 +16,7 @@
<name>Address</name>
<key>addr</key>
<value>localhost</value>
- <type>string</type>
+ <type>string</type>
</param>
<param>
<name>Port</name>
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_am_demod_cf.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_am_demod_cf.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_am_demod_cf.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##AM Demod
###################################################
@@ -10,9 +9,9 @@
<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,
+ channel_rate=$chan_rate,
+ audio_decim=$audio_decim,
+ audio_pass=$audio_pass,
audio_stop=$audio_stop,
)</make>
<param>
Modified:
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_analysis_filterbank.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_analysis_filterbank.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_analysis_filterbank.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Analysis Filterbank
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_demod.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_demod.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_demod.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##DPSK Demod - 2, 4, 8
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_mod.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_mod.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_dxpsk_mod.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##DPSK Mod - 2, 4, 8
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_fm_deemph.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_fm_deemph.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_fm_deemph.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##FM Deemphasis
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_fm_demod_cf.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_fm_demod_cf.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_fm_demod_cf.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##FM Demod
###################################################
@@ -10,12 +9,12 @@
<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,
+ channel_rate=$chan_rate,
+ audio_decim=$audio_decim,
deviation=$deviation,
- audio_pass=$audio_pass,
- audio_stop=$audio_stop,
- gain=$gain,
+ audio_pass=$audio_pass,
+ audio_stop=$audio_stop,
+ gain=$gain,
tau=$tau,
)</make>
<param>
@@ -51,7 +50,7 @@
<key>gain</key>
<value>1.0</value>
<type>real</type>
- </param>
+ </param>
<param>
<name>Tau</name>
<key>tau</key>
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_fm_preemph.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_fm_preemph.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_fm_preemph.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##FM Preemphasis
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_gmsk_demod.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_gmsk_demod.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_gmsk_demod.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##GMSK Demod
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_gmsk_mod.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_gmsk_mod.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_gmsk_mod.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##GMSK Mod
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_nbfm_rx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_nbfm_rx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_nbfm_rx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##NBFM Receive
###################################################
@@ -11,7 +10,7 @@
<import>from gnuradio import blks2</import>
<make>blks2.nbfm_rx(
audio_rate=$audio_rate,
- quad_rate=$quad_rate,
+ quad_rate=$quad_rate,
tau=$tau,
max_dev=$max_dev,
)</make>
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_nbfm_tx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_nbfm_tx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_nbfm_tx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##NBFM Transmit
###################################################
@@ -11,7 +10,7 @@
<import>from gnuradio import blks2</import>
<make>blks2.nbfm_tx(
audio_rate=$audio_rate,
- quad_rate=$quad_rate,
+ quad_rate=$quad_rate,
tau=$tau,
max_dev=$max_dev,
)</make>
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_qamx_demod.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_qamx_demod.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_qamx_demod.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##QAM Demod - 8, 16, 64, 256
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_qamx_mod.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_qamx_mod.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_qamx_mod.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##QAM Mod - 8, 16, 64, 256
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_synthesis_filterbank.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_synthesis_filterbank.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_synthesis_filterbank.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Synthesis Filterbank
###################################################
@@ -23,7 +22,7 @@
</param>
<sink>
<name>in</name>
- <type>complex</type>
+ <type>complex</type>
<nports>$mpoints</nports>
</sink>
<source>
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##WBFM Receive
###################################################
@@ -10,7 +9,7 @@
<key>blks2_wfm_rcv</key>
<import>from gnuradio import blks2</import>
<make>blks2.wfm_rcv(
- quad_rate=$quad_rate,
+ quad_rate=$quad_rate,
audio_decimation=$audio_decimation,
)</make>
<param>
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv_pll.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv_pll.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_wfm_rcv_pll.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##WBFM Receive PLL
###################################################
@@ -10,7 +9,7 @@
<key>blks2_wfm_rcv_pll</key>
<import>from gnuradio import blks2</import>
<make>blks2.wfm_rcv_pll(
- demod_rate=$quad_rate,
+ demod_rate=$quad_rate,
audio_decimation=$audio_decimation,
)</make>
<param>
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_wfm_tx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_wfm_tx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/blks2_wfm_tx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##WBFM Transmit
###################################################
@@ -11,7 +10,7 @@
<import>from gnuradio import blks2</import>
<make>blks2.wfm_tx(
audio_rate=$audio_rate,
- quad_rate=$quad_rate,
+ quad_rate=$quad_rate,
tau=$tau,
max_dev=$max_dev,
)</make>
Modified:
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_constellation_decoder_cb.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_constellation_decoder_cb.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_constellation_decoder_cb.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Constellation Decoder
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/gr_diff_decoder_bb.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/gr_diff_decoder_bb.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/gr_diff_decoder_bb.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Differential Decoder
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/gr_diff_encoder_bb.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/gr_diff_encoder_bb.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/gr_diff_encoder_bb.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Differential Encoder
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/gr_diff_phasor_cc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/gr_diff_phasor_cc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/gr_diff_phasor_cc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Differential Phasor
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_frequency_modulator_fc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/gr_frequency_modulator_fc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/gr_frequency_modulator_fc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Frequency Modulator
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/gr_phase_modulator_fc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/gr_phase_modulator_fc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/gr_phase_modulator_fc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Phase Modulator
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/modulators/gr_quadrature_demod_cf.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/gr_quadrature_demod_cf.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/gr_quadrature_demod_cf.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Quadrature Demodulator
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/modulators/gr_vco_f.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/modulators/gr_vco_f.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/modulators/gr_vco_f.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##VCO
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/blks2_logpwrfft_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/blks2_logpwrfft_x.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/blks2_logpwrfft_x.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
<!--
###################################################
##Log Power FFT
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_add_const_vxx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_add_const_vxx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_add_const_vxx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Add Const Block:
## all types, 1 output, 1 input & const
@@ -20,27 +19,27 @@
<name>Complex</name>
<key>complex</key>
<opt>const_type:complex_vector</opt>
- <opt>fcn:cc</opt>
+ <opt>fcn:cc</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
<opt>const_type:real_vector</opt>
- <opt>fcn:ff</opt>
+ <opt>fcn:ff</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
<opt>const_type:int_vector</opt>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
<opt>const_type:int_vector</opt>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
- </param>
+ </param>
<param>
<name>Constant</name>
<key>const</key>
@@ -59,10 +58,10 @@
<name>in</name>
<type>$type</type>
<vlen>$vlen</vlen>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>$type</type>
<vlen>$vlen</vlen>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_add_vxx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_add_vxx.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_add_vxx.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Add Block:
## all types, 1 output, 2 to inf inputs
@@ -18,35 +17,35 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>fcn:cc</opt>
+ <opt>fcn:cc</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:ff</opt>
+ <opt>fcn:ff</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
</param>
<param>
<name>Num Inputs</name>
<key>num_inputs</key>
<value>2</value>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_inputs > 1</check>
<check>$vlen > 0</check>
@@ -55,10 +54,10 @@
<type>$type</type>
<vlen>$vlen</vlen>
<nports>$num_inputs</nports>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>$type</type>
<vlen>$vlen</vlen>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_and_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_and_xx.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_and_xx.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Logical And Block
###################################################
@@ -13,37 +12,37 @@
<param>
<name>IO Type</name>
<key>type</key>
- <type>enum</type>
+ <type>enum</type>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:bb</opt>
+ <opt>fcn:bb</opt>
</option>
</param>
<param>
<name>Num Inputs</name>
<key>num_inputs</key>
<value>2</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_inputs >= 2</check>
<sink>
<name>in</name>
<type>$type</type>
<nports>$num_inputs</nports>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>$type</type>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_argmax_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_argmax_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_argmax_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##ArgMax:
## 1 output, 2 to inf inputs
@@ -18,30 +17,30 @@
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:fs</opt>
+ <opt>fcn:fs</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:is</opt>
+ <opt>fcn:is</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:dd</opt>
+ <opt>fcn:dd</opt>
</option>
</param>
<param>
<name>Num Inputs</name>
<key>num_inputs</key>
<value>2</value>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_inputs >= 2</check>
<check>$vlen >= 1</check>
@@ -50,10 +49,10 @@
<type>$type</type>
<vlen>$vlen</vlen>
<nports>$num_inputs</nports>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>short</type>
<vlen>$vlen</vlen>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_conjugate_cc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_conjugate_cc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_conjugate_cc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Complex Conjugate
###################################################
@@ -13,9 +12,9 @@
<sink>
<name>in</name>
<type>complex</type>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>complex</type>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_divide_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_divide_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_divide_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Divide Block:
## all types, 1 output, 2 to inf inputs
@@ -18,36 +17,36 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>fcn:cc</opt>
+ <opt>fcn:cc</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:ff</opt>
+ <opt>fcn:ff</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
</param>
<param>
<name>Num Inputs</name>
<key>num_inputs</key>
<value>2</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_inputs >= 2</check>
<sink>
<name>in</name>
<type>$type</type>
<nports>$num_inputs</nports>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>$type</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_fft_vxx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_fft_vxx.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_fft_vxx.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
<!--
###################################################
##FFT
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_integrate_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_integrate_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_integrate_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Integrate
###################################################
@@ -9,30 +8,30 @@
<name>Integrate</name>
<key>gr_integrate_xx</key>
<import>from gnuradio import gr</import>
- <make>gr.integrate_$(type.fcn)($decim)</make>
+ <make>gr.integrate_$(type.fcn)($decim)</make>
<param>
<name>IO Type</name>
<key>type</key>
- <type>enum</type>
+ <type>enum</type>
<option>
<name>Complex</name>
<key>complex</key>
- <opt>fcn:cc</opt>
+ <opt>fcn:cc</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:ff</opt>
+ <opt>fcn:ff</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
</param>
<param>
@@ -43,9 +42,9 @@
<sink>
<name>in</name>
<type>$type</type>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>$type</type>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_max_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_max_xx.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_max_xx.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Max:
## 1 output, 2 to inf inputs
@@ -18,30 +17,30 @@
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:ff</opt>
+ <opt>fcn:ff</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:dd</opt>
+ <opt>fcn:dd</opt>
</option>
</param>
<param>
<name>Num Inputs</name>
<key>num_inputs</key>
<value>2</value>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_inputs >= 2</check>
<check>$vlen >= 1</check>
@@ -50,10 +49,10 @@
<type>$type</type>
<vlen>$vlen</vlen>
<nports>$num_inputs</nports>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>$type</type>
<vlen>$vlen</vlen>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_multiply_const_vxx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_multiply_const_vxx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_multiply_const_vxx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Multiply Const Block:
## all types, 1 output, 1 input & const
@@ -20,27 +19,27 @@
<name>Complex</name>
<key>complex</key>
<opt>const_type:complex_vector</opt>
- <opt>fcn:cc</opt>
+ <opt>fcn:cc</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
<opt>const_type:real_vector</opt>
- <opt>fcn:ff</opt>
+ <opt>fcn:ff</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
<opt>const_type:int_vector</opt>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
<opt>const_type:int_vector</opt>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
- </param>
+ </param>
<param>
<name>Constant</name>
<key>const</key>
@@ -59,10 +58,10 @@
<name>in</name>
<type>$type</type>
<vlen>$vlen</vlen>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>$type</type>
<vlen>$vlen</vlen>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_multiply_vxx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_multiply_vxx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_multiply_vxx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Multiply Block:
## all types, 1 output, 2 to inf inputs
@@ -18,35 +17,35 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>fcn:cc</opt>
+ <opt>fcn:cc</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:ff</opt>
+ <opt>fcn:ff</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
</param>
<param>
<name>Num Inputs</name>
<key>num_inputs</key>
<value>2</value>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_inputs > 1</check>
<check>$vlen > 0</check>
@@ -55,10 +54,10 @@
<type>$type</type>
<vlen>$vlen</vlen>
<nports>$num_inputs</nports>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>$type</type>
<vlen>$vlen</vlen>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_nlog10_ff.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_nlog10_ff.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_nlog10_ff.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Log10 Block:
## float in/ float out
@@ -27,14 +26,14 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen >= 1</check>
<sink>
<name>in</name>
<type>float</type>
<vlen>$vlen</vlen>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>float</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_not_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_not_xx.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_not_xx.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Logical Not Block
###################################################
@@ -9,41 +8,41 @@
<name>Not</name>
<key>gr_not_xx</key>
<import>from gnuradio import gr</import>
- <make>gr.not_$(type.fcn)()</make>
+ <make>gr.not_$(type.fcn)()</make>
<param>
<name>IO Type</name>
<key>type</key>
- <type>enum</type>
+ <type>enum</type>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:bb</opt>
+ <opt>fcn:bb</opt>
</option>
- </param>
+ </param>
<param>
<name>Num Inputs</name>
<key>num_inputs</key>
<value>2</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_inputs >= 2</check>
<sink>
<name>in</name>
<type>$type</type>
<nports>$num_inputs</nports>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>$type</type>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_or_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_or_xx.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_or_xx.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Logical Or Block
###################################################
@@ -13,37 +12,37 @@
<param>
<name>IO Type</name>
<key>type</key>
- <type>enum</type>
+ <type>enum</type>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:bb</opt>
+ <opt>fcn:bb</opt>
</option>
</param>
<param>
<name>Num Inputs</name>
<key>num_inputs</key>
<value>2</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_inputs >= 2</check>
<sink>
<name>in</name>
<type>$type</type>
<nports>$num_inputs</nports>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>$type</type>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_sub_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_sub_xx.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_sub_xx.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Subtract Block:
## all types, 1 output, 2 to inf inputs
@@ -18,36 +17,36 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>fcn:cc</opt>
+ <opt>fcn:cc</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:ff</opt>
+ <opt>fcn:ff</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
</param>
<param>
<name>Num Inputs</name>
<key>num_inputs</key>
<value>2</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_inputs >= 2</check>
<sink>
<name>in</name>
<type>$type</type>
<nports>$num_inputs</nports>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>$type</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/operators/gr_xor_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/operators/gr_xor_xx.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/operators/gr_xor_xx.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Logical Xor Block
###################################################
@@ -13,37 +12,37 @@
<param>
<name>IO Type</name>
<key>type</key>
- <type>enum</type>
+ <type>enum</type>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:ii</opt>
+ <opt>fcn:ii</opt>
</option>
<option>
<name>Shxort</name>
<key>short</key>
- <opt>fcn:ss</opt>
+ <opt>fcn:ss</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:bb</opt>
+ <opt>fcn:bb</opt>
</option>
</param>
<param>
<name>Num Inputs</name>
<key>num_inputs</key>
<value>2</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$num_inputs >= 2</check>
<sink>
<name>in</name>
<type>$type</type>
<nports>$num_inputs</nports>
- </sink>
+ </sink>
<source>
<name>out</name>
<type>$type</type>
- </source>
+ </source>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/options.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/options.xml 2008-07-18 19:09:30 UTC
(rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/options.xml 2008-07-18 21:26:14 UTC
(rev 8939)
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "./block.dtd">
<!--
###################################################
##Options Block:
Modified: grc/trunk/src/grc_gnuradio/blocks/preferences.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/preferences.xml 2008-07-18 19:09:30 UTC
(rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/preferences.xml 2008-07-18 21:26:14 UTC
(rev 8939)
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "./block.dtd">
<!--
###################################################
##Global Preferences:
Modified: grc/trunk/src/grc_gnuradio/blocks/sinks/audio_sink.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sinks/audio_sink.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sinks/audio_sink.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Audio Sink
###################################################
@@ -64,14 +63,14 @@
<name>Num Inputs</name>
<key>num_inputs</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>0 < $num_inputs</check>
<sink>
<name>in</name>
<type>float</type>
<nports>$num_inputs</nports>
- </sink>
+ </sink>
<doc>
Not all sampling rates will be supported by your hardware.
@@ -79,6 +78,6 @@
Audio device names may look like hw:0,0
The audio sink can have multiple inputs depending upon your hardware. \
-For example, set the inputs to 2 for stereo audio.
+For example, set the inputs to 2 for stereo audio.
</doc>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/sinks/gr_file_sink.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sinks/gr_file_sink.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sinks/gr_file_sink.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##File Sink
###################################################
@@ -23,34 +22,34 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
- </param>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
Modified: grc/trunk/src/grc_gnuradio/blocks/sinks/gr_null_sink.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sinks/gr_null_sink.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sinks/gr_null_sink.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Null Sink
###################################################
@@ -17,34 +16,34 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
- </param>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
Modified: grc/trunk/src/grc_gnuradio/blocks/sinks/gr_udp_sink.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sinks/gr_udp_sink.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sinks/gr_udp_sink.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##UDP Sink
###################################################
@@ -18,29 +17,29 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
- </param>
+ </param>
<param>
<name>Local IP Address</name>
<key>ipaddr_local</key>
@@ -70,12 +69,12 @@
<key>mtu</key>
<value>1024</value>
<type>int</type>
- </param>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
Modified: grc/trunk/src/grc_gnuradio/blocks/sinks/gr_vector_sink_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sinks/gr_vector_sink_x.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sinks/gr_vector_sink_x.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Vector sink
###################################################
@@ -9,7 +8,7 @@
<name>Vector Sink</name>
<key>gr_vector_sink_x</key>
<import>from gnuradio import gr</import>
- <make>gr.vector_sink_$(type.fcn)()</make>
+ <make>gr.vector_sink_$(type.fcn)()</make>
<param>
<name>Input Type</name>
<key>type</key>
@@ -17,27 +16,27 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>fcn:c</opt>
+ <opt>fcn:c</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:f</opt>
+ <opt>fcn:f</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:i</opt>
+ <opt>fcn:i</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:s</opt>
+ <opt>fcn:s</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:b</opt>
+ <opt>fcn:b</opt>
</option>
</param>
<sink>
Modified: grc/trunk/src/grc_gnuradio/blocks/sinks/gr_wavfile_sink.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sinks/gr_wavfile_sink.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sinks/gr_wavfile_sink.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Wav File Sink
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/sinks/pad_sink.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sinks/pad_sink.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sinks/pad_sink.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
<!--
###################################################
##Pad Sink: IO Pads
Modified: grc/trunk/src/grc_gnuradio/blocks/sources/audio_source.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sources/audio_source.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sources/audio_source.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Audio Source
###################################################
@@ -64,14 +63,14 @@
<name>Num Outputs</name>
<key>num_outputs</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>0 < $num_outputs</check>
<source>
<name>out</name>
<type>float</type>
<nports>$num_outputs</nports>
- </source>
+ </source>
<doc>
Not all sampling rates will be supported by your hardware.
@@ -79,6 +78,6 @@
Audio device names may look like hw:0,0
The audio source can have multiple outputs depending upon your hardware. \
-For example, set the outputs to 2 for stereo audio.
+For example, set the outputs to 2 for stereo audio.
</doc>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/sources/gr_file_source.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sources/gr_file_source.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sources/gr_file_source.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##File Source
###################################################
@@ -23,29 +22,29 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
- </param>
+ </param>
<param>
<name>Repeat</name>
<key>repeat</key>
@@ -64,7 +63,7 @@
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<source>
Modified: grc/trunk/src/grc_gnuradio/blocks/sources/gr_glfsr_source_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sources/gr_glfsr_source_x.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sources/gr_glfsr_source_x.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##GLFSR Source
###################################################
@@ -42,7 +41,7 @@
<name>No</name>
<key>False</key>
</option>
- </param>
+ </param>
<param>
<name>Mask</name>
<key>mask</key>
Modified: grc/trunk/src/grc_gnuradio/blocks/sources/gr_noise_source_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sources/gr_noise_source_x.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sources/gr_noise_source_x.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Noise Source
###################################################
@@ -18,24 +17,24 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>fcn:c</opt>
+ <opt>fcn:c</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:f</opt>
+ <opt>fcn:f</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:i</opt>
+ <opt>fcn:i</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:s</opt>
+ <opt>fcn:s</opt>
</option>
- </param>
+ </param>
<param>
<name>Noise Type</name>
<key>noise_type</key>
@@ -62,13 +61,13 @@
<name>Amplitude</name>
<key>amp</key>
<value>1</value>
- <type>real</type>
+ <type>real</type>
</param>
<param>
<name>Seed</name>
<key>seed</key>
<value>42</value>
- <type>int</type>
+ <type>int</type>
</param>
<source>
<name>out</name>
Modified: grc/trunk/src/grc_gnuradio/blocks/sources/gr_null_source.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sources/gr_null_source.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sources/gr_null_source.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Null Source
###################################################
@@ -17,34 +16,34 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
- </param>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<source>
Modified: grc/trunk/src/grc_gnuradio/blocks/sources/gr_sig_source_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sources/gr_sig_source_x.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sources/gr_sig_source_x.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Signal Source
###################################################
@@ -21,29 +20,29 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>fcn:c</opt>
+ <opt>fcn:c</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:f</opt>
+ <opt>fcn:f</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:i</opt>
+ <opt>fcn:i</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:s</opt>
+ <opt>fcn:s</opt>
</option>
- </param>
+ </param>
<param>
<name>Sample Rate</name>
<key>samp_rate</key>
<value>samp_rate</value>
- <type>real</type>
+ <type>real</type>
</param>
<param>
<name>Waveform</name>
@@ -79,19 +78,19 @@
<name>Frequency</name>
<key>freq</key>
<value>1000</value>
- <type>real</type>
+ <type>real</type>
</param>
<param>
<name>Amplitude</name>
<key>amp</key>
<value>1</value>
- <type>real</type>
+ <type>real</type>
</param>
<param>
<name>Offset</name>
<key>offset</key>
<value>0</value>
- <type>complex</type>
+ <type>complex</type>
</param>
<source>
<name>out</name>
Modified: grc/trunk/src/grc_gnuradio/blocks/sources/gr_udp_source.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sources/gr_udp_source.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sources/gr_udp_source.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##UDP Source
###################################################
@@ -18,27 +17,27 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
@@ -58,12 +57,12 @@
<key>mtu</key>
<value>1024</value>
<type>int</type>
- </param>
+ </param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<source>
Modified: grc/trunk/src/grc_gnuradio/blocks/sources/gr_vector_source_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sources/gr_vector_source_x.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sources/gr_vector_source_x.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Vector Source
###################################################
@@ -18,33 +17,33 @@
<name>Complex</name>
<key>complex</key>
<opt>fcn:c</opt>
- <opt>vec_type:complex_vector</opt>
+ <opt>vec_type:complex_vector</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
<opt>fcn:f</opt>
- <opt>vec_type:real_vector</opt>
+ <opt>vec_type:real_vector</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
<opt>fcn:i</opt>
- <opt>vec_type:int_vector</opt>
+ <opt>vec_type:int_vector</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
<opt>fcn:s</opt>
- <opt>vec_type:int_vector</opt>
+ <opt>vec_type:int_vector</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
<opt>fcn:b</opt>
- <opt>vec_type:int_vector</opt>
+ <opt>vec_type:int_vector</opt>
</option>
- </param>
+ </param>
<param>
<name>Vector</name>
<key>vector</key>
Modified: grc/trunk/src/grc_gnuradio/blocks/sources/gr_wavfile_source.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sources/gr_wavfile_source.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sources/gr_wavfile_source.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Wav File Source
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/sources/pad_source.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sources/pad_source.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sources/pad_source.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
<!--
###################################################
##Pad Source: IO Pads
Modified: grc/trunk/src/grc_gnuradio/blocks/sources/random_source_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/sources/random_source_x.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/sources/random_source_x.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Random Source:
## Custom block
@@ -19,19 +18,19 @@
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:i</opt>
+ <opt>fcn:i</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:s</opt>
+ <opt>fcn:s</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:b</opt>
+ <opt>fcn:b</opt>
</option>
- </param>
+ </param>
<param>
<name>Minimum</name>
<key>min</key>
@@ -69,6 +68,6 @@
<type>$type</type>
</source>
<doc>
-Generate num samples of random numbers of [min, max). Repeat samples if
specified.
+Generate num samples of random numbers of [min, max). Repeat samples if
specified.
</doc>
</block>
Modified:
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_clock_recovery_mm_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_clock_recovery_mm_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_clock_recovery_mm_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Clock Recovery MM
###################################################
@@ -28,7 +27,7 @@
<key>float</key>
<opt>fcn:ff</opt>
</option>
- </param>
+ </param>
<param>
<name>Omega</name>
<key>omega</key>
Modified:
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_correlate_access_code_bb.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_correlate_access_code_bb.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_correlate_access_code_bb.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Correlate Access Code
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_costas_loop_cc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_costas_loop_cc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_costas_loop_cc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Costas Loop
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_dd_mpsk_sync_cc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_dd_mpsk_sync_cc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_dd_mpsk_sync_cc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##DD MPSK Sync
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_mpsk_receiver_cc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_mpsk_receiver_cc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_mpsk_receiver_cc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##MPSK Receiver
###################################################
@@ -45,7 +44,7 @@
<name>Max Freq</name>
<key>fmax</key>
<type>real</type>
- </param>
+ </param>
<param>
<name>Mu</name>
<key>mu</key>
Modified: grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_mpsk_sync_cc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_mpsk_sync_cc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_mpsk_sync_cc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##MPSK Sync
###################################################
@@ -23,7 +22,7 @@
<name>Beta</name>
<key>beta</key>
<type>real</type>
- </param>
+ </param>
<param>
<name>Max Freq</name>
<key>max_freq</key>
Modified:
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pll_carriertracking_cc.xml
===================================================================
---
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pll_carriertracking_cc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pll_carriertracking_cc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##PLL Carrier Tracking
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pll_freqdet_cf.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pll_freqdet_cf.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pll_freqdet_cf.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##PLL Frequency Det
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pll_refout_cc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pll_refout_cc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pll_refout_cc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##PLL Reference Out
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pn_correlator_cc.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pn_correlator_cc.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_pn_correlator_cc.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##PN Correlator
###################################################
Modified:
grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_simple_correlator.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_simple_correlator.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_simple_correlator.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Simple Correlator
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_simple_framer.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_simple_framer.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/synchronizers/gr_simple_framer.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Simple Framer
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_encoder_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_encoder_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_encoder_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Trellis Encoder
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_metrics_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_metrics_x.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_metrics_x.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Trellis Metrics
###################################################
Modified: grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_permutation.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_permutation.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_permutation.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Trellis Permutation
###################################################
@@ -17,49 +16,49 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>size:gr.sizeof_gr_complex</opt>
+ <opt>size:gr.sizeof_gr_complex</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>size:gr.sizeof_float</opt>
+ <opt>size:gr.sizeof_float</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>size:gr.sizeof_int</opt>
+ <opt>size:gr.sizeof_int</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>size:gr.sizeof_short</opt>
+ <opt>size:gr.sizeof_short</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>size:gr.sizeof_char</opt>
+ <opt>size:gr.sizeof_char</opt>
</option>
</param>
<param>
<name>Block Size</name>
<key>block_size</key>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Table</name>
<key>table</key>
- <type>int_vector</type>
+ <type>int_vector</type>
</param>
<param>
<name>Symbols per Block</name>
<key>syms_per_block</key>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
Modified: grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_siso_combined_f.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_siso_combined_f.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_siso_combined_f.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Trellis SISO Combined
###################################################
@@ -18,7 +17,7 @@
<param>
<name>Block Size</name>
<key>block_size</key>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Initial State</name>
@@ -31,7 +30,7 @@
<key>final_state</key>
<value>-1</value>
<type>int</type>
- </param>
+ </param>
<param>
<name>A-posteriori In</name>
<key>a_post_in</key>
Modified: grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_siso_f.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_siso_f.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_siso_f.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Trellis SISO
###################################################
@@ -18,7 +17,7 @@
<param>
<name>Block Size</name>
<key>block_size</key>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Initial State</name>
@@ -31,7 +30,7 @@
<key>final_state</key>
<value>-1</value>
<type>int</type>
- </param>
+ </param>
<param>
<name>A-posteriori In</name>
<key>a_post_in</key>
Modified:
grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_viterbi_combined_xx.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_viterbi_combined_xx.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_viterbi_combined_xx.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Trellis Viterbi Combined
###################################################
@@ -67,7 +66,7 @@
<param>
<name>Block Size</name>
<key>block_size</key>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Initial State</name>
@@ -80,7 +79,7 @@
<key>final_state</key>
<value>-1</value>
<type>int</type>
- </param>
+ </param>
<param>
<name>Dimensionality</name>
<key>dim</key>
Modified: grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_viterbi_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_viterbi_x.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/trellis/trellis_viterbi_x.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Trellis Viterbi
###################################################
@@ -38,7 +37,7 @@
<param>
<name>Block Size</name>
<key>block_size</key>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>Initial State</name>
@@ -51,7 +50,7 @@
<key>final_state</key>
<value>-1</value>
<type>int</type>
- </param>
+ </param>
<sink>
<name>in</name>
<type>$type.io</type>
Modified: grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_diagnostics.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_diagnostics.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_diagnostics.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##USRP Diagnostics:
## This block should not appear in the tree.
@@ -14,7 +13,7 @@
<name>USRP Number</name>
<key>usrp_number</key>
<value>0</value>
- <type>int</type>
+ <type>int</type>
</param>
<param>
<name>USRP Type</name>
Modified: grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_dual_sink_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_dual_sink_x.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_dual_sink_x.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
<!--
###################################################
##USRP Dual Sink
Modified: grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_dual_source_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_dual_source_x.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_dual_source_x.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
<!--
###################################################
##USRP Dual Source
Modified: grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_simple_sink_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_simple_sink_x.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_simple_sink_x.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
<!--
###################################################
##USRP Simple Sink
Modified: grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_simple_source_x.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_simple_source_x.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/usrp/usrp_simple_source_x.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
<!--
###################################################
##USRP Simple Source
Modified: grc/trunk/src/grc_gnuradio/blocks/variables/variable.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/variables/variable.xml 2008-07-18
19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/variables/variable.xml 2008-07-18
21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Variable block: a grc variable with key, value
###################################################
@@ -18,5 +17,5 @@
<doc>
This block maps a value to a unique variable. \
This variable block has no graphical representation.
- </doc>
+ </doc>
</block>
Modified: grc/trunk/src/grc_gnuradio/blocks/variables/variable_chooser.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/variables/variable_chooser.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/variables/variable_chooser.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Variable Chooser: a grc variable with multiple choices
###################################################
@@ -10,12 +9,12 @@
<key>variable_chooser</key>
<make>$(choices)[$value_index]
_$(id)_control = grc_wxgui.$(chooser_type)_control(
- window=self.GetWin(),
+ window=self.GetWin(),
callback=self.set_$(id),
#if $label.eval
label=$label,
#else
- label="$id",
+ label="$id",
#end if
index=$value_index,
choices=$choices,
Modified: grc/trunk/src/grc_gnuradio/blocks/variables/variable_sink.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/variables/variable_sink.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/variables/variable_sink.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Variable Sink: Custom blks2 block
###################################################
@@ -18,40 +17,40 @@
<option>
<name>Complex</name>
<key>complex</key>
- <opt>fcn:c</opt>
+ <opt>fcn:c</opt>
</option>
<option>
<name>Float</name>
<key>float</key>
- <opt>fcn:f</opt>
+ <opt>fcn:f</opt>
</option>
<option>
<name>Int</name>
<key>int</key>
- <opt>fcn:i</opt>
+ <opt>fcn:i</opt>
</option>
<option>
<name>Short</name>
<key>short</key>
- <opt>fcn:s</opt>
+ <opt>fcn:s</opt>
</option>
<option>
<name>Byte</name>
<key>byte</key>
- <opt>fcn:b</opt>
+ <opt>fcn:b</opt>
</option>
</param>
<param>
<name>Variable</name>
<key>variable</key>
<value></value>
- <type>raw</type>
+ <type>raw</type>
</param>
<param>
<name>Vec Length</name>
<key>vlen</key>
<value>1</value>
- <type>int</type>
+ <type>int</type>
</param>
<check>$vlen > 0</check>
<sink>
@@ -60,7 +59,7 @@
<vlen>$vlen</vlen>
</sink>
<doc>
-Read samples from the input stream and write each sample to the variable.
+Read samples from the input stream and write each sample to the variable.
The variable must be the id of an existing variable block.
</doc>
Modified: grc/trunk/src/grc_gnuradio/blocks/variables/variable_slider.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/variables/variable_slider.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/variables/variable_slider.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Variable Slider: a grc variable with key, value, min, max, step
###################################################
@@ -10,12 +9,12 @@
<key>variable_slider</key>
<make>$value
_$(id)_control = grc_wxgui.slider_$(slider_type)_control(
- window=self.GetWin(),
+ window=self.GetWin(),
callback=self.set_$(id),
#if $label.eval
label=$label,
#else
- label="$id",
+ label="$id",
#end if
value=$id,
min=$min,
Modified: grc/trunk/src/grc_gnuradio/blocks/variables/variable_text_box.xml
===================================================================
--- grc/trunk/src/grc_gnuradio/blocks/variables/variable_text_box.xml
2008-07-18 19:09:30 UTC (rev 8938)
+++ grc/trunk/src/grc_gnuradio/blocks/variables/variable_text_box.xml
2008-07-18 21:26:14 UTC (rev 8939)
@@ -1,6 +1,5 @@
<?xml version="1.0"?>
-<!DOCTYPE block SYSTEM "../block.dtd">
-<!--
+<!--
###################################################
##Variable Text Box: a grc variable with key, value
###################################################
@@ -10,12 +9,12 @@
<key>variable_text_box</key>
<make>$value
_$(id)_control = grc_wxgui.text_box_control(
- window=self.GetWin(),
+ window=self.GetWin(),
callback=self.set_$(id),
#if $label.eval
label=$label,
#else
- label="$id",
+ label="$id",
#end if
value=$id,
)
Copied: grc/trunk/src/grc_gnuradio/data/block.dtd (from rev 8924,
grc/trunk/src/grc_gnuradio/blocks/block.dtd)
===================================================================
--- grc/trunk/src/grc_gnuradio/data/block.dtd (rev 0)
+++ grc/trunk/src/grc_gnuradio/data/block.dtd 2008-07-18 21:26:14 UTC (rev
8939)
@@ -0,0 +1,53 @@
+<!--
+Copyright 2008 Free Software Foundation, Inc.
+This file is part of GNU Radio
+
+GNU Radio Companion 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 2
+of the License, or (at your option) any later version.
+
+GNU Radio Companion 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 this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+-->
+<!--
+ gnuradio_python.blocks.dtd
+ Josh Blum
+ The document type definition for blocks.
+ -->
+<!--
+ Top level element.
+ A block contains a name, ...parameters list, and list of IO ports.
+ -->
+<!ELEMENT block (name, key, category?, import*, make, callback*, param*,
check*, sink*, source*, doc?)>
+<!--
+ Sub level elements.
+ -->
+<!ELEMENT param (name, key, value?, type, option*)>
+<!ELEMENT option (name, key, opt*)>
+<!ELEMENT sink (name, type, vlen?, nports?, optional?)>
+<!ELEMENT source (name, type, vlen?, nports?, optional?)>
+<!--
+ Bottom level elements.
+ Character data only.
+ -->
+<!ELEMENT category (#PCDATA)>
+<!ELEMENT import (#PCDATA)>
+<!ELEMENT doc (#PCDATA)>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT key (#PCDATA)>
+<!ELEMENT check (#PCDATA)>
+<!ELEMENT opt (#PCDATA)>
+<!ELEMENT type (#PCDATA)>
+<!ELEMENT vlen (#PCDATA)>
+<!ELEMENT nports (#PCDATA)>
+<!ELEMENT make (#PCDATA)>
+<!ELEMENT value (#PCDATA)>
+<!ELEMENT callback (#PCDATA)>
+<!ELEMENT optional (#PCDATA)>
Modified: grc/trunk/src/grc_gnuradio/wxgui/top_block_gui.py
===================================================================
--- grc/trunk/src/grc_gnuradio/wxgui/top_block_gui.py 2008-07-18 19:09:30 UTC
(rev 8938)
+++ grc/trunk/src/grc_gnuradio/wxgui/top_block_gui.py 2008-07-18 21:26:14 UTC
(rev 8939)
@@ -86,7 +86,6 @@
def _quit(event):
gr.top_block.stop(self)
self._wx_frame.Destroy()
- exit(0)
#setup app
self._wx_vbox.Add(self._wx_grid, 0, wx.EXPAND)
self._wx_frame.Bind(wx.EVT_CLOSE, _quit)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r8939 - in grc/trunk: . notes src/grc/elements src/grc_gnuradio src/grc_gnuradio/blocks src/grc_gnuradio/blocks/conversions src/grc_gnuradio/blocks/error_correction src/grc_gnuradio/blocks/filters src/grc_gnuradio/blocks/graphical_sinks src/grc_gnuradio/blocks/level_controls src/grc_gnuradio/blocks/misc src/grc_gnuradio/blocks/modulators src/grc_gnuradio/blocks/operators src/grc_gnuradio/blocks/sinks src/grc_gnuradio/blocks/sources src/grc_gnuradio/blocks/synchronizers src/grc_gnuradio/blocks/trellis src/grc_gnuradio/blocks/usrp src/grc_gnuradio/blocks/variables src/grc_gnuradio/data src/grc_gnuradio/wxgui,
jblum <=