[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r10678 - in gnuradio/trunk: . gnuradio-core/src/lib/ge
|
From: |
jblum |
|
Subject: |
[Commit-gnuradio] r10678 - in gnuradio/trunk: . gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/python/gnuradio/gr gr-wxgui/src/python/plotter grc/data/platforms/python grc/data/platforms/python/blocks grc/examples/audio grc/examples/simple grc/examples/trellis grc/examples/usrp grc/src/utils |
|
Date: |
Tue, 24 Mar 2009 13:45:56 -0600 (MDT) |
Author: jblum
Date: 2009-03-24 13:45:55 -0600 (Tue, 24 Mar 2009)
New Revision: 10678
Added:
gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml
gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml
Removed:
gnuradio/trunk/gnuradio-core/src/lib/general/Makefile.gen
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_vXX.cc.t
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_vXX.h.t
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_vXX.i.t
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_vXX.cc.t
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_vXX.h.t
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_vXX.i.t
gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_vxx.xml
gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_vxx.xml
Modified:
gnuradio/trunk/
gnuradio/trunk/gnuradio-core/src/lib/gengen/
gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.gen
gnuradio/trunk/gnuradio-core/src/lib/gengen/generate_common.py
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_XX.cc.t
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_XX.h.t
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_XX.i.t
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_XX.cc.t
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_XX.h.t
gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_XX.i.t
gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/__init__.py
gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py
gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py
gnuradio/trunk/grc/data/platforms/python/block_tree.xml
gnuradio/trunk/grc/data/platforms/python/blocks/Makefile.am
gnuradio/trunk/grc/examples/audio/dial_tone.grc
gnuradio/trunk/grc/examples/simple/ber_simulation.grc
gnuradio/trunk/grc/examples/trellis/interference_cancellation.grc
gnuradio/trunk/grc/examples/usrp/usrp_two_tone_loopback.grc
gnuradio/trunk/grc/src/utils/converter.py
Log:
Merged r10666:10669 from jblum/vlen. Trunk passes distcheck.
Property changes on: gnuradio/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
+ /gnuradio/branches/developers/eb/t348:10638-10648
/gnuradio/branches/developers/jblum/gui_guts:10464-10658
/gnuradio/branches/developers/jblum/vlen:10667-10677
/gnuradio/branches/developers/michaelld/am_swig_4:10555-10595
/gnuradio/branches/developers/michaelld/two_mods:10540-10546
Property changes on: gnuradio/trunk/gnuradio-core/src/lib/gengen
___________________________________________________________________
Modified: svn:ignore
- Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
generate-stamp
GrFIRfilterCCC.cc
GrFIRfilterCCC.h
GrFIRfilterCCF.cc
GrFIRfilterCCF.h
GrFIRfilterFCC.cc
GrFIRfilterFCC.h
GrFIRfilterFFF.cc
GrFIRfilterFFF.h
GrFIRfilterFSF.cc
GrFIRfilterFSF.h
GrFIRfilterSCC.cc
GrFIRfilterSCC.h
GrFIRfilterSIS.cc
GrFIRfilterSIS.h
GrFreqXlatingFIRfilterCCC.cc
GrFreqXlatingFIRfilterCCC.h
GrFreqXlatingFIRfilterCCF.cc
GrFreqXlatingFIRfilterCCF.h
GrFreqXlatingFIRfilterFCC.cc
GrFreqXlatingFIRfilterFCC.h
GrFreqXlatingFIRfilterFCF.cc
GrFreqXlatingFIRfilterFCF.h
GrFreqXlatingFIRfilterSCC.cc
GrFreqXlatingFIRfilterSCC.h
GrFreqXlatingFIRfilterSCF.cc
GrFreqXlatingFIRfilterSCF.h
gr_fir_CCC.cc
gr_fir_CCC.h
gr_fir_CCC_generic.cc
gr_fir_CCC_generic.h
gr_fir_CCF.cc
gr_fir_CCF.h
gr_fir_CCF_generic.cc
gr_fir_CCF_generic.h
gr_fir_FCC.cc
gr_fir_FCC.h
gr_fir_FCC_generic.cc
gr_fir_FCC_generic.h
gr_fir_FFF.cc
gr_fir_FFF.h
gr_fir_FFF_generic.cc
gr_fir_FFF_generic.h
gr_fir_FSF.cc
gr_fir_FSF.h
gr_fir_FSF_generic.cc
gr_fir_FSF_generic.h
gr_fir_SCC.cc
gr_fir_SCC.h
gr_fir_SCC_generic.cc
gr_fir_SCC_generic.h
gr_fir_SIS.cc
gr_fir_SIS.h
gr_fir_SIS_generic.cc
gr_fir_SIS_generic.h
gr_fir_sysconfig.cc
gr_fir_sysconfig.h
gr_fir_sysconfig_generic.cc
gr_fir_sysconfig_generic.h
gr_fir_util.cc
gr_fir_util.h
GrFIRfilterCCC.i
GrFIRfilterCCF.i
GrFIRfilterFCC.i
GrFIRfilterFFF.i
GrFIRfilterFSF.i
GrFIRfilterSCC.i
GrFIRfilterSIS.i
GrFreqXlatingFIRfilterCCC.i
GrFreqXlatingFIRfilterCCF.i
GrFreqXlatingFIRfilterFCC.i
GrFreqXlatingFIRfilterFCF.i
GrFreqXlatingFIRfilterSCC.i
GrFreqXlatingFIRfilterSCF.i
# --- generated files ---
gr_add_cc.cc
gr_add_cc.h
gr_add_cc.i
gr_add_const_c.cc
gr_add_const_cc.cc
gr_add_const_cc.h
gr_add_const_cc.i
gr_add_const_c.h
gr_add_const_c.i
gr_add_const_f.cc
gr_add_const_ff.cc
gr_add_const_ff.h
gr_add_const_ff.i
gr_add_const_f.h
gr_add_const_f.i
gr_add_const_i.cc
gr_add_const_i.h
gr_add_const_i.i
gr_add_const_ii.cc
gr_add_const_ii.h
gr_add_const_ii.i
gr_add_const_s.cc
gr_add_const_sf.cc
gr_add_const_sf.h
gr_add_const_sf.i
gr_add_const_s.h
gr_add_const_s.i
gr_add_const_ss.cc
gr_add_const_ss.h
gr_add_const_ss.i
gr_add_const_vcc.cc
gr_add_const_vcc.h
gr_add_const_vcc.i
gr_add_const_vff.cc
gr_add_const_vff.h
gr_add_const_vff.i
gr_add_const_vii.cc
gr_add_const_vii.h
gr_add_const_vii.i
gr_add_const_vss.cc
gr_add_const_vss.h
gr_add_const_vss.i
gr_add_ff.cc
gr_add_ff.h
gr_add_ff.i
gr_add_ii.cc
gr_add_ii.h
gr_add_ii.i
gr_add_ss.cc
gr_add_ss.h
gr_add_ss.i
gr_add_vcc.cc
gr_add_vcc.h
gr_add_vcc.i
gr_add_vff.cc
gr_add_vff.h
gr_add_vff.i
gr_add_vii.cc
gr_add_vii.h
gr_add_vii.i
gr_add_vss.cc
gr_add_vss.h
gr_add_vss.i
gr_and_bb.cc
gr_and_bb.h
gr_and_bb.i
gr_and_ii.cc
gr_and_ii.h
gr_and_ii.i
gr_and_ss.cc
gr_and_ss.h
gr_and_ss.i
gr_argmax_fs.cc
gr_argmax_fs.h
gr_argmax_fs.i
gr_argmax_is.cc
gr_argmax_is.h
gr_argmax_is.i
gr_argmax_ss.cc
gr_argmax_ss.h
gr_argmax_ss.i
gr_chunks_to_symbols_bc.cc
gr_chunks_to_symbols_bc.h
gr_chunks_to_symbols_bc.i
gr_chunks_to_symbols_bf.cc
gr_chunks_to_symbols_bf.h
gr_chunks_to_symbols_bf.i
gr_chunks_to_symbols_ic.cc
gr_chunks_to_symbols_ic.h
gr_chunks_to_symbols_ic.i
gr_chunks_to_symbols_if.cc
gr_chunks_to_symbols_if.h
gr_chunks_to_symbols_if.i
gr_chunks_to_symbols_sc.cc
gr_chunks_to_symbols_sc.h
gr_chunks_to_symbols_sc.i
gr_chunks_to_symbols_sf.cc
gr_chunks_to_symbols_sf.h
gr_chunks_to_symbols_sf.i
gr_divide_cc.cc
gr_divide_cc.h
gr_divide_cc.i
gr_divide_ff.cc
gr_divide_ff.h
gr_divide_ff.i
gr_divide_ii.cc
gr_divide_ii.h
gr_divide_ii.i
gr_divide_ss.cc
gr_divide_ss.h
gr_divide_ss.i
gr_integrate_cc.cc
gr_integrate_cc.h
gr_integrate_cc.i
gr_integrate_ff.cc
gr_integrate_ff.h
gr_integrate_ff.i
gr_integrate_ii.cc
gr_integrate_ii.h
gr_integrate_ii.i
gr_integrate_ss.cc
gr_integrate_ss.h
gr_integrate_ss.i
gr_max_ff.cc
gr_max_ff.h
gr_max_ff.i
gr_max_ii.cc
gr_max_ii.h
gr_max_ii.i
gr_max_ss.cc
gr_max_ss.h
gr_max_ss.i
gr_multiply_cc.cc
gr_multiply_cc.h
gr_multiply_cc.i
gr_multiply_const_cc.cc
gr_multiply_const_cc.h
gr_multiply_const_cc.i
gr_multiply_const_ff.cc
gr_multiply_const_ff.h
gr_multiply_const_ff.i
gr_multiply_const_ii.cc
gr_multiply_const_ii.h
gr_multiply_const_ii.i
gr_multiply_const_ss.cc
gr_multiply_const_ss.h
gr_multiply_const_ss.i
gr_multiply_const_vcc.cc
gr_multiply_const_vcc.h
gr_multiply_const_vcc.i
gr_multiply_const_vff.cc
gr_multiply_const_vff.h
gr_multiply_const_vff.i
gr_multiply_const_vii.cc
gr_multiply_const_vii.h
gr_multiply_const_vii.i
gr_multiply_const_vss.cc
gr_multiply_const_vss.h
gr_multiply_const_vss.i
gr_multiply_ff.cc
gr_multiply_ff.h
gr_multiply_ff.i
gr_multiply_ii.cc
gr_multiply_ii.h
gr_multiply_ii.i
gr_multiply_ss.cc
gr_multiply_ss.h
gr_multiply_ss.i
gr_multiply_vcc.cc
gr_multiply_vcc.h
gr_multiply_vcc.i
gr_multiply_vff.cc
gr_multiply_vff.h
gr_multiply_vff.i
gr_multiply_vii.cc
gr_multiply_vii.h
gr_multiply_vii.i
gr_multiply_vss.cc
gr_multiply_vss.h
gr_multiply_vss.i
gr_mute_cc.cc
gr_mute_cc.h
gr_mute_cc.i
gr_mute_ff.cc
gr_mute_ff.h
gr_mute_ff.i
gr_mute_ii.cc
gr_mute_ii.h
gr_mute_ii.i
gr_mute_ss.cc
gr_mute_ss.h
gr_mute_ss.i
gr_noise_source_c.cc
gr_noise_source_c.h
gr_noise_source_c.i
gr_noise_source_f.cc
gr_noise_source_f.h
gr_noise_source_f.i
gr_noise_source_i.cc
gr_noise_source_i.h
gr_noise_source_i.i
gr_noise_source_s.cc
gr_noise_source_s.h
gr_noise_source_s.i
gr_not_bb.cc
gr_not_bb.h
gr_not_bb.i
gr_not_ii.cc
gr_not_ii.h
gr_not_ii.i
gr_not_ss.cc
gr_not_ss.h
gr_not_ss.i
gr_or_bb.cc
gr_or_bb.h
gr_or_bb.i
gr_or_ii.cc
gr_or_ii.h
gr_or_ii.i
gr_or_ss.cc
gr_or_ss.h
gr_or_ss.i
gr_packed_to_unpacked_bb.cc
gr_packed_to_unpacked_bb.h
gr_packed_to_unpacked_bb.i
gr_packed_to_unpacked_ii.cc
gr_packed_to_unpacked_ii.h
gr_packed_to_unpacked_ii.i
gr_packed_to_unpacked_ss.cc
gr_packed_to_unpacked_ss.h
gr_packed_to_unpacked_ss.i
gr_peak_detector_fb.cc
gr_peak_detector_fb.h
gr_peak_detector_fb.i
gr_peak_detector_ff.cc
gr_peak_detector_ff.h
gr_peak_detector_ff.i
gr_peak_detector_ib.cc
gr_peak_detector_ib.h
gr_peak_detector_ib.i
gr_peak_detector_ii.cc
gr_peak_detector_ii.h
gr_peak_detector_ii.i
gr_peak_detector_sb.cc
gr_peak_detector_sb.h
gr_peak_detector_sb.i
gr_peak_detector_ss.cc
gr_peak_detector_ss.h
gr_peak_detector_ss.i
gr_prefix.cc
gr_sample_and_hold_bb.cc
gr_sample_and_hold_bb.h
gr_sample_and_hold_bb.i
gr_sample_and_hold_ff.cc
gr_sample_and_hold_ff.h
gr_sample_and_hold_ff.i
gr_sample_and_hold_ii.cc
gr_sample_and_hold_ii.h
gr_sample_and_hold_ii.i
gr_sample_and_hold_ss.cc
gr_sample_and_hold_ss.h
gr_sample_and_hold_ss.i
gr_sig_source_c.cc
gr_sig_source_c.h
gr_sig_source_c.i
gr_sig_source_f.cc
gr_sig_source_f.h
gr_sig_source_f.i
gr_sig_source_i.cc
gr_sig_source_i.h
gr_sig_source_i.i
gr_sig_source_s.cc
gr_sig_source_s.h
gr_sig_source_s.i
gr_sub_cc.cc
gr_sub_cc.h
gr_sub_cc.i
gr_sub_ff.cc
gr_sub_ff.h
gr_sub_ff.i
gr_sub_ii.cc
gr_sub_ii.h
gr_sub_ii.i
gr_sub_ss.cc
gr_sub_ss.h
gr_sub_ss.i
gr_unpacked_to_packed_bb.cc
gr_unpacked_to_packed_bb.h
gr_unpacked_to_packed_bb.i
gr_unpacked_to_packed_ii.cc
gr_unpacked_to_packed_ii.h
gr_unpacked_to_packed_ii.i
gr_unpacked_to_packed_ss.cc
gr_unpacked_to_packed_ss.h
gr_unpacked_to_packed_ss.i
gr_vector_sink_b.cc
gr_vector_sink_b.h
gr_vector_sink_b.i
gr_vector_sink_c.cc
gr_vector_sink_c.h
gr_vector_sink_c.i
gr_vector_sink_f.cc
gr_vector_sink_f.h
gr_vector_sink_f.i
gr_vector_sink_i.cc
gr_vector_sink_i.h
gr_vector_sink_i.i
gr_vector_sink_s.cc
gr_vector_sink_s.h
gr_vector_sink_s.i
gr_vector_source_b.cc
gr_vector_source_b.h
gr_vector_source_b.i
gr_vector_source_c.cc
gr_vector_source_c.h
gr_vector_source_c.i
gr_vector_source_f.cc
gr_vector_source_f.h
gr_vector_source_f.i
gr_vector_source_i.cc
gr_vector_source_i.h
gr_vector_source_i.i
gr_vector_source_s.cc
gr_vector_source_s.h
gr_vector_source_s.i
gr_xor_bb.cc
gr_xor_bb.h
gr_xor_bb.i
gr_xor_ii.cc
gr_xor_ii.h
gr_xor_ii.i
gr_xor_ss.cc
gr_xor_ss.h
gr_xor_ss.i
gr_moving_average_cc.cc
gr_moving_average_cc.h
gr_moving_average_cc.i
gr_moving_average_ff.cc
gr_moving_average_ff.h
gr_moving_average_ff.i
gr_moving_average_ss.cc
gr_moving_average_ss.h
gr_moving_average_ss.i
gr_moving_average_ii.cc
gr_moving_average_ii.h
gr_moving_average_ii.i
gr_and_const_bb.cc
gr_and_const_ss.h
gr_and_const_ss.i
gr_and_const_ii.cc
gr_and_const_bb.h
gr_and_const_ss.cc
gr_and_const_bb.i
gr_and_const_ii.h
gr_and_const_ii.i
# --- end generated files ---
stamp-*
gengen_generated.i
+ Makefile
Makefile.in
.la
.lo
.deps
.libs
*.la
*.lo
*.pyc
generate-stamp
GrFIRfilterCCC.cc
GrFIRfilterCCC.h
GrFIRfilterCCF.cc
GrFIRfilterCCF.h
GrFIRfilterFCC.cc
GrFIRfilterFCC.h
GrFIRfilterFFF.cc
GrFIRfilterFFF.h
GrFIRfilterFSF.cc
GrFIRfilterFSF.h
GrFIRfilterSCC.cc
GrFIRfilterSCC.h
GrFIRfilterSIS.cc
GrFIRfilterSIS.h
GrFreqXlatingFIRfilterCCC.cc
GrFreqXlatingFIRfilterCCC.h
GrFreqXlatingFIRfilterCCF.cc
GrFreqXlatingFIRfilterCCF.h
GrFreqXlatingFIRfilterFCC.cc
GrFreqXlatingFIRfilterFCC.h
GrFreqXlatingFIRfilterFCF.cc
GrFreqXlatingFIRfilterFCF.h
GrFreqXlatingFIRfilterSCC.cc
GrFreqXlatingFIRfilterSCC.h
GrFreqXlatingFIRfilterSCF.cc
GrFreqXlatingFIRfilterSCF.h
gr_fir_CCC.cc
gr_fir_CCC.h
gr_fir_CCC_generic.cc
gr_fir_CCC_generic.h
gr_fir_CCF.cc
gr_fir_CCF.h
gr_fir_CCF_generic.cc
gr_fir_CCF_generic.h
gr_fir_FCC.cc
gr_fir_FCC.h
gr_fir_FCC_generic.cc
gr_fir_FCC_generic.h
gr_fir_FFF.cc
gr_fir_FFF.h
gr_fir_FFF_generic.cc
gr_fir_FFF_generic.h
gr_fir_FSF.cc
gr_fir_FSF.h
gr_fir_FSF_generic.cc
gr_fir_FSF_generic.h
gr_fir_SCC.cc
gr_fir_SCC.h
gr_fir_SCC_generic.cc
gr_fir_SCC_generic.h
gr_fir_SIS.cc
gr_fir_SIS.h
gr_fir_SIS_generic.cc
gr_fir_SIS_generic.h
gr_fir_sysconfig.cc
gr_fir_sysconfig.h
gr_fir_sysconfig_generic.cc
gr_fir_sysconfig_generic.h
gr_fir_util.cc
gr_fir_util.h
GrFIRfilterCCC.i
GrFIRfilterCCF.i
GrFIRfilterFCC.i
GrFIRfilterFFF.i
GrFIRfilterFSF.i
GrFIRfilterSCC.i
GrFIRfilterSIS.i
GrFreqXlatingFIRfilterCCC.i
GrFreqXlatingFIRfilterCCF.i
GrFreqXlatingFIRfilterFCC.i
GrFreqXlatingFIRfilterFCF.i
GrFreqXlatingFIRfilterSCC.i
GrFreqXlatingFIRfilterSCF.i
# --- generated files ---
gr_add_cc.cc
gr_add_cc.h
gr_add_cc.i
gr_add_const_c.cc
gr_add_const_cc.cc
gr_add_const_cc.h
gr_add_const_cc.i
gr_add_const_c.h
gr_add_const_c.i
gr_add_const_f.cc
gr_add_const_ff.cc
gr_add_const_ff.h
gr_add_const_ff.i
gr_add_const_f.h
gr_add_const_f.i
gr_add_const_i.cc
gr_add_const_i.h
gr_add_const_i.i
gr_add_const_ii.cc
gr_add_const_ii.h
gr_add_const_ii.i
gr_add_const_s.cc
gr_add_const_sf.cc
gr_add_const_sf.h
gr_add_const_sf.i
gr_add_const_s.h
gr_add_const_s.i
gr_add_const_ss.cc
gr_add_const_ss.h
gr_add_const_ss.i
gr_add_const_vcc.cc
gr_add_const_vcc.h
gr_add_const_vcc.i
gr_add_const_vff.cc
gr_add_const_vff.h
gr_add_const_vff.i
gr_add_const_vii.cc
gr_add_const_vii.h
gr_add_const_vii.i
gr_add_const_vss.cc
gr_add_const_vss.h
gr_add_const_vss.i
gr_add_ff.cc
gr_add_ff.h
gr_add_ff.i
gr_add_ii.cc
gr_add_ii.h
gr_add_ii.i
gr_add_ss.cc
gr_add_ss.h
gr_add_ss.i
gr_and_bb.cc
gr_and_bb.h
gr_and_bb.i
gr_and_ii.cc
gr_and_ii.h
gr_and_ii.i
gr_and_ss.cc
gr_and_ss.h
gr_and_ss.i
gr_argmax_fs.cc
gr_argmax_fs.h
gr_argmax_fs.i
gr_argmax_is.cc
gr_argmax_is.h
gr_argmax_is.i
gr_argmax_ss.cc
gr_argmax_ss.h
gr_argmax_ss.i
gr_chunks_to_symbols_bc.cc
gr_chunks_to_symbols_bc.h
gr_chunks_to_symbols_bc.i
gr_chunks_to_symbols_bf.cc
gr_chunks_to_symbols_bf.h
gr_chunks_to_symbols_bf.i
gr_chunks_to_symbols_ic.cc
gr_chunks_to_symbols_ic.h
gr_chunks_to_symbols_ic.i
gr_chunks_to_symbols_if.cc
gr_chunks_to_symbols_if.h
gr_chunks_to_symbols_if.i
gr_chunks_to_symbols_sc.cc
gr_chunks_to_symbols_sc.h
gr_chunks_to_symbols_sc.i
gr_chunks_to_symbols_sf.cc
gr_chunks_to_symbols_sf.h
gr_chunks_to_symbols_sf.i
gr_divide_cc.cc
gr_divide_cc.h
gr_divide_cc.i
gr_divide_ff.cc
gr_divide_ff.h
gr_divide_ff.i
gr_divide_ii.cc
gr_divide_ii.h
gr_divide_ii.i
gr_divide_ss.cc
gr_divide_ss.h
gr_divide_ss.i
gr_integrate_cc.cc
gr_integrate_cc.h
gr_integrate_cc.i
gr_integrate_ff.cc
gr_integrate_ff.h
gr_integrate_ff.i
gr_integrate_ii.cc
gr_integrate_ii.h
gr_integrate_ii.i
gr_integrate_ss.cc
gr_integrate_ss.h
gr_integrate_ss.i
gr_max_ff.cc
gr_max_ff.h
gr_max_ff.i
gr_max_ii.cc
gr_max_ii.h
gr_max_ii.i
gr_max_ss.cc
gr_max_ss.h
gr_max_ss.i
gr_multiply_cc.cc
gr_multiply_cc.h
gr_multiply_cc.i
gr_multiply_const_cc.cc
gr_multiply_const_cc.h
gr_multiply_const_cc.i
gr_multiply_const_ff.cc
gr_multiply_const_ff.h
gr_multiply_const_ff.i
gr_multiply_const_ii.cc
gr_multiply_const_ii.h
gr_multiply_const_ii.i
gr_multiply_const_ss.cc
gr_multiply_const_ss.h
gr_multiply_const_ss.i
gr_multiply_const_vcc.cc
gr_multiply_const_vcc.h
gr_multiply_const_vcc.i
gr_multiply_const_vff.cc
gr_multiply_const_vff.h
gr_multiply_const_vff.i
gr_multiply_const_vii.cc
gr_multiply_const_vii.h
gr_multiply_const_vii.i
gr_multiply_const_vss.cc
gr_multiply_const_vss.h
gr_multiply_const_vss.i
gr_multiply_ff.cc
gr_multiply_ff.h
gr_multiply_ff.i
gr_multiply_ii.cc
gr_multiply_ii.h
gr_multiply_ii.i
gr_multiply_ss.cc
gr_multiply_ss.h
gr_multiply_ss.i
gr_mute_cc.cc
gr_mute_cc.h
gr_mute_cc.i
gr_mute_ff.cc
gr_mute_ff.h
gr_mute_ff.i
gr_mute_ii.cc
gr_mute_ii.h
gr_mute_ii.i
gr_mute_ss.cc
gr_mute_ss.h
gr_mute_ss.i
gr_noise_source_c.cc
gr_noise_source_c.h
gr_noise_source_c.i
gr_noise_source_f.cc
gr_noise_source_f.h
gr_noise_source_f.i
gr_noise_source_i.cc
gr_noise_source_i.h
gr_noise_source_i.i
gr_noise_source_s.cc
gr_noise_source_s.h
gr_noise_source_s.i
gr_not_bb.cc
gr_not_bb.h
gr_not_bb.i
gr_not_ii.cc
gr_not_ii.h
gr_not_ii.i
gr_not_ss.cc
gr_not_ss.h
gr_not_ss.i
gr_or_bb.cc
gr_or_bb.h
gr_or_bb.i
gr_or_ii.cc
gr_or_ii.h
gr_or_ii.i
gr_or_ss.cc
gr_or_ss.h
gr_or_ss.i
gr_packed_to_unpacked_bb.cc
gr_packed_to_unpacked_bb.h
gr_packed_to_unpacked_bb.i
gr_packed_to_unpacked_ii.cc
gr_packed_to_unpacked_ii.h
gr_packed_to_unpacked_ii.i
gr_packed_to_unpacked_ss.cc
gr_packed_to_unpacked_ss.h
gr_packed_to_unpacked_ss.i
gr_peak_detector_fb.cc
gr_peak_detector_fb.h
gr_peak_detector_fb.i
gr_peak_detector_ff.cc
gr_peak_detector_ff.h
gr_peak_detector_ff.i
gr_peak_detector_ib.cc
gr_peak_detector_ib.h
gr_peak_detector_ib.i
gr_peak_detector_ii.cc
gr_peak_detector_ii.h
gr_peak_detector_ii.i
gr_peak_detector_sb.cc
gr_peak_detector_sb.h
gr_peak_detector_sb.i
gr_peak_detector_ss.cc
gr_peak_detector_ss.h
gr_peak_detector_ss.i
gr_prefix.cc
gr_sample_and_hold_bb.cc
gr_sample_and_hold_bb.h
gr_sample_and_hold_bb.i
gr_sample_and_hold_ff.cc
gr_sample_and_hold_ff.h
gr_sample_and_hold_ff.i
gr_sample_and_hold_ii.cc
gr_sample_and_hold_ii.h
gr_sample_and_hold_ii.i
gr_sample_and_hold_ss.cc
gr_sample_and_hold_ss.h
gr_sample_and_hold_ss.i
gr_sig_source_c.cc
gr_sig_source_c.h
gr_sig_source_c.i
gr_sig_source_f.cc
gr_sig_source_f.h
gr_sig_source_f.i
gr_sig_source_i.cc
gr_sig_source_i.h
gr_sig_source_i.i
gr_sig_source_s.cc
gr_sig_source_s.h
gr_sig_source_s.i
gr_sub_cc.cc
gr_sub_cc.h
gr_sub_cc.i
gr_sub_ff.cc
gr_sub_ff.h
gr_sub_ff.i
gr_sub_ii.cc
gr_sub_ii.h
gr_sub_ii.i
gr_sub_ss.cc
gr_sub_ss.h
gr_sub_ss.i
gr_unpacked_to_packed_bb.cc
gr_unpacked_to_packed_bb.h
gr_unpacked_to_packed_bb.i
gr_unpacked_to_packed_ii.cc
gr_unpacked_to_packed_ii.h
gr_unpacked_to_packed_ii.i
gr_unpacked_to_packed_ss.cc
gr_unpacked_to_packed_ss.h
gr_unpacked_to_packed_ss.i
gr_vector_sink_b.cc
gr_vector_sink_b.h
gr_vector_sink_b.i
gr_vector_sink_c.cc
gr_vector_sink_c.h
gr_vector_sink_c.i
gr_vector_sink_f.cc
gr_vector_sink_f.h
gr_vector_sink_f.i
gr_vector_sink_i.cc
gr_vector_sink_i.h
gr_vector_sink_i.i
gr_vector_sink_s.cc
gr_vector_sink_s.h
gr_vector_sink_s.i
gr_vector_source_b.cc
gr_vector_source_b.h
gr_vector_source_b.i
gr_vector_source_c.cc
gr_vector_source_c.h
gr_vector_source_c.i
gr_vector_source_f.cc
gr_vector_source_f.h
gr_vector_source_f.i
gr_vector_source_i.cc
gr_vector_source_i.h
gr_vector_source_i.i
gr_vector_source_s.cc
gr_vector_source_s.h
gr_vector_source_s.i
gr_xor_bb.cc
gr_xor_bb.h
gr_xor_bb.i
gr_xor_ii.cc
gr_xor_ii.h
gr_xor_ii.i
gr_xor_ss.cc
gr_xor_ss.h
gr_xor_ss.i
gr_moving_average_cc.cc
gr_moving_average_cc.h
gr_moving_average_cc.i
gr_moving_average_ff.cc
gr_moving_average_ff.h
gr_moving_average_ff.i
gr_moving_average_ss.cc
gr_moving_average_ss.h
gr_moving_average_ss.i
gr_moving_average_ii.cc
gr_moving_average_ii.h
gr_moving_average_ii.i
gr_and_const_bb.cc
gr_and_const_ss.h
gr_and_const_ss.i
gr_and_const_ii.cc
gr_and_const_bb.h
gr_and_const_ss.cc
gr_and_const_bb.i
gr_and_const_ii.h
gr_and_const_ii.i
# --- end generated files ---
stamp-*
gengen_generated.i
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am 2009-03-24
15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.am 2009-03-24
19:45:55 UTC (rev 10678)
@@ -38,9 +38,6 @@
gr_add_const_XX.cc.t \
gr_add_const_XX.h.t \
gr_add_const_XX.i.t \
- gr_add_vXX.cc.t \
- gr_add_vXX.h.t \
- gr_add_vXX.i.t \
gr_add_const_vXX.cc.t \
gr_add_const_vXX.h.t \
gr_add_const_vXX.i.t \
@@ -65,9 +62,6 @@
gr_multiply_const_XX.cc.t \
gr_multiply_const_XX.h.t \
gr_multiply_const_XX.i.t \
- gr_multiply_vXX.cc.t \
- gr_multiply_vXX.h.t \
- gr_multiply_vXX.i.t \
gr_multiply_const_vXX.cc.t \
gr_multiply_const_vXX.h.t \
gr_multiply_const_vXX.i.t \
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.gen
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.gen 2009-03-24
15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/Makefile.gen 2009-03-24
19:45:55 UTC (rev 10678)
@@ -15,10 +15,6 @@
gr_add_ff.h \
gr_add_ii.h \
gr_add_ss.h \
- gr_add_vcc.h \
- gr_add_vff.h \
- gr_add_vii.h \
- gr_add_vss.h \
gr_and_bb.h \
gr_and_const_bb.h \
gr_and_const_ii.h \
@@ -61,10 +57,6 @@
gr_multiply_ff.h \
gr_multiply_ii.h \
gr_multiply_ss.h \
- gr_multiply_vcc.h \
- gr_multiply_vff.h \
- gr_multiply_vii.h \
- gr_multiply_vss.h \
gr_mute_cc.h \
gr_mute_ff.h \
gr_mute_ii.h \
@@ -128,10 +120,6 @@
gr_add_ff.i \
gr_add_ii.i \
gr_add_ss.i \
- gr_add_vcc.i \
- gr_add_vff.i \
- gr_add_vii.i \
- gr_add_vss.i \
gr_and_bb.i \
gr_and_const_bb.i \
gr_and_const_ii.i \
@@ -174,10 +162,6 @@
gr_multiply_ff.i \
gr_multiply_ii.i \
gr_multiply_ss.i \
- gr_multiply_vcc.i \
- gr_multiply_vff.i \
- gr_multiply_vii.i \
- gr_multiply_vss.i \
gr_mute_cc.i \
gr_mute_ff.i \
gr_mute_ii.i \
@@ -241,10 +225,6 @@
gr_add_ff.cc \
gr_add_ii.cc \
gr_add_ss.cc \
- gr_add_vcc.cc \
- gr_add_vff.cc \
- gr_add_vii.cc \
- gr_add_vss.cc \
gr_and_bb.cc \
gr_and_const_bb.cc \
gr_and_const_ii.cc \
@@ -287,10 +267,6 @@
gr_multiply_ff.cc \
gr_multiply_ii.cc \
gr_multiply_ss.cc \
- gr_multiply_vcc.cc \
- gr_multiply_vff.cc \
- gr_multiply_vii.cc \
- gr_multiply_vss.cc \
gr_mute_cc.cc \
gr_mute_ff.cc \
gr_mute_ii.cc \
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/generate_common.py
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/generate_common.py
2009-03-24 15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/generate_common.py
2009-03-24 19:45:55 UTC (rev 10678)
@@ -47,8 +47,6 @@
'gr_multiply_XX',
'gr_divide_XX',
'gr_mute_XX',
- 'gr_add_vXX',
- 'gr_multiply_vXX',
'gr_add_const_vXX',
'gr_multiply_const_vXX',
'gr_integrate_XX',
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_XX.cc.t
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_XX.cc.t 2009-03-24
15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_XX.cc.t 2009-03-24
19:45:55 UTC (rev 10678)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004, 2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -30,15 +30,16 @@
#include <gr_io_signature.h>
@SPTR_NAME@
address@hidden@ ()
address@hidden@ (size_t vlen)
{
- return @SPTR_NAME@ (new @NAME@ ());
+ return @SPTR_NAME@ (new @NAME@ (vlen));
}
address@hidden@::@NAME@ ()
address@hidden@::@NAME@ (size_t vlen)
: gr_sync_block ("@BASE_NAME@",
- gr_make_io_signature (1, -1, sizeof (@I_TYPE@)),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)))
+ gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
+ gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)),
+ d_vlen (vlen)
{
}
@@ -51,7 +52,7 @@
int ninputs = input_items.size ();
- for (int i = 0; i < noutput_items; i++){
+ for (int i = 0; i < noutput_items*d_vlen; i++){
@I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i];
for (int j = 1; j < ninputs; j++)
acc += ((@I_TYPE@ *) input_items[j])[i];
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_XX.h.t
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_XX.h.t 2009-03-24
15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_XX.h.t 2009-03-24
19:45:55 UTC (rev 10678)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004, 2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -30,7 +30,7 @@
class @NAME@;
typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
address@hidden@ address@hidden@ ();
address@hidden@ address@hidden@ (size_t vlen = 1);
/*!
* \brief output = sum (input_0, input_1, ...)
@@ -40,10 +40,12 @@
*/
class @NAME@ : public gr_sync_block
{
- friend @SPTR_NAME@ address@hidden@ ();
+ friend @SPTR_NAME@ address@hidden@ (size_t vlen);
- @NAME@ ();
+ @NAME@ (size_t vlen);
+ size_t d_vlen;
+
public:
int work (int noutput_items,
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_XX.i.t
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_XX.i.t 2009-03-24
15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_add_XX.i.t 2009-03-24
19:45:55 UTC (rev 10678)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004, 2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -24,10 +24,10 @@
GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
address@hidden@ address@hidden@ ();
address@hidden@ address@hidden@ (size_t vlen = 1);
class @NAME@ : public gr_sync_block
{
private:
- @NAME@ ();
+ @NAME@ (size_t vlen);
};
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_XX.cc.t
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_XX.cc.t
2009-03-24 15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_XX.cc.t
2009-03-24 19:45:55 UTC (rev 10678)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004, 2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -30,15 +30,16 @@
#include <gr_io_signature.h>
@SPTR_NAME@
address@hidden@ ()
address@hidden@ (size_t vlen)
{
- return @SPTR_NAME@ (new @NAME@ ());
+ return @SPTR_NAME@ (new @NAME@ (vlen));
}
address@hidden@::@NAME@ ()
address@hidden@::@NAME@ (size_t vlen)
: gr_sync_block ("@BASE_NAME@",
- gr_make_io_signature (1, -1, sizeof (@I_TYPE@)),
- gr_make_io_signature (1, 1, sizeof (@O_TYPE@)))
+ gr_make_io_signature (1, -1, sizeof (@I_TYPE@)*vlen),
+ gr_make_io_signature (1, 1, sizeof (@O_TYPE@)*vlen)),
+ d_vlen (vlen)
{
}
@@ -51,7 +52,7 @@
int ninputs = input_items.size ();
- for (int i = 0; i < noutput_items; i++){
+ for (int i = 0; i < noutput_items*d_vlen; i++){
@I_TYPE@ acc = ((@I_TYPE@ *) input_items[0])[i];
for (int j = 1; j < ninputs; j++)
acc *= ((@I_TYPE@ *) input_items[j])[i];
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_XX.h.t
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_XX.h.t
2009-03-24 15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_XX.h.t
2009-03-24 19:45:55 UTC (rev 10678)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004, 2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -30,7 +30,7 @@
class @NAME@;
typedef boost::shared_ptr<@NAME@> @SPTR_NAME@;
address@hidden@ address@hidden@ ();
address@hidden@ address@hidden@ (size_t vlen = 1);
/*!
* \brief output = prod (input_0, input_1, ...)
@@ -40,10 +40,12 @@
*/
class @NAME@ : public gr_sync_block
{
- friend @SPTR_NAME@ address@hidden@ ();
+ friend @SPTR_NAME@ address@hidden@ (size_t vlen);
- @NAME@ ();
+ @NAME@ (size_t vlen);
+ size_t d_vlen;
+
public:
int work (int noutput_items,
Modified: gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_XX.i.t
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_XX.i.t
2009-03-24 15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/gnuradio-core/src/lib/gengen/gr_multiply_XX.i.t
2009-03-24 19:45:55 UTC (rev 10678)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004, 2009 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -24,10 +24,10 @@
GR_SWIG_BLOCK_MAGIC(gr,@BASE_NAME@)
address@hidden@ address@hidden@ ();
address@hidden@ address@hidden@ (size_t vlen = 1);
class @NAME@ : public gr_sync_block
{
private:
- @NAME@ ();
+ @NAME@ (size_t vlen);
};
Modified: gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/__init__.py
===================================================================
--- gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/__init__.py
2009-03-24 15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/__init__.py
2009-03-24 19:45:55 UTC (rev 10678)
@@ -1,5 +1,5 @@
#
-# Copyright 2003,2004,2006,2008 Free Software Foundation, Inc.
+# Copyright 2003,2004,2006,2008,2009 Free Software Foundation, Inc.
#
# This file is part of GNU Radio
#
@@ -55,3 +55,12 @@
# Force the preference database to be initialized
from prefs import prefs
+#alias old gr_add_vXX and gr_multiply_vXX
+add_vcc = add_cc
+add_vff = add_ff
+add_vii = add_ii
+add_vss = add_ss
+multiply_vcc = multiply_cc
+multiply_vff = multiply_ff
+multiply_vii = multiply_ii
+multiply_vss = multiply_ss
Property changes on:
gnuradio/trunk/gnuradio-core/src/python/gnuradio/gr/pubsub.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
+
/gnuradio/branches/developers/eb/t348/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10638-10648
/gnuradio/branches/developers/jblum/vlen/gnuradio-core/src/python/gnuradio/gr/pubsub.py:10667-10677
/gnuradio/branches/developers/michaelld/two_mods/gr-wxgui/src/python/pubsub.py:10540-10546
Property changes on:
gnuradio/trunk/gr-wxgui/src/python/plotter/grid_plotter_base.py
___________________________________________________________________
Modified: svn:mergeinfo
-
+
/gnuradio/branches/developers/jblum/vlen/gr-wxgui/src/python/plotter/grid_plotter_base.py:10667-10677
Modified: gnuradio/trunk/grc/data/platforms/python/block_tree.xml
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/block_tree.xml 2009-03-24
15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/grc/data/platforms/python/block_tree.xml 2009-03-24
19:45:55 UTC (rev 10678)
@@ -42,9 +42,9 @@
</cat>
<cat>
<name>Operators</name>
- <block>gr_add_vxx</block>
+ <block>gr_add_xx</block>
<block>gr_sub_xx</block>
- <block>gr_multiply_vxx</block>
+ <block>gr_multiply_xx</block>
<block>gr_divide_xx</block>
<block>gr_nlog10_ff</block>
Modified: gnuradio/trunk/grc/data/platforms/python/blocks/Makefile.am
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/Makefile.am 2009-03-24
15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/Makefile.am 2009-03-24
19:45:55 UTC (rev 10678)
@@ -59,7 +59,7 @@
blks2_wfm_tx.xml \
const_source_x.xml \
gr_add_const_vxx.xml \
- gr_add_vxx.xml \
+ gr_add_xx.xml \
gr_agc2_xx.xml \
gr_agc_xx.xml \
gr_and_xx.xml \
@@ -124,7 +124,7 @@
gr_mpsk_receiver_cc.xml \
gr_mpsk_sync_cc.xml \
gr_multiply_const_vxx.xml \
- gr_multiply_vxx.xml \
+ gr_multiply_xx.xml \
gr_mute_xx.xml \
gr_nlog10_ff.xml \
gr_noise_source_x.xml \
Copied: gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml (from rev
10677,
gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_add_xx.xml)
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml
(rev 0)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/gr_add_xx.xml
2009-03-24 19:45:55 UTC (rev 10678)
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Add Block:
+## all types, 1 output, 2 to inf inputs
+###################################################
+ -->
+<block>
+ <name>Add</name>
+ <key>gr_add_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.add_v$(type.fcn)($vlen)</make>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:cc</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:ff</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:ii</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:ss</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Inputs</name>
+ <key>num_inputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$num_inputs > 1</check>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_inputs</nports>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Copied: gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml
(from rev 10677,
gnuradio/branches/developers/jblum/vlen/grc/data/platforms/python/blocks/gr_multiply_xx.xml)
===================================================================
--- gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml
(rev 0)
+++ gnuradio/trunk/grc/data/platforms/python/blocks/gr_multiply_xx.xml
2009-03-24 19:45:55 UTC (rev 10678)
@@ -0,0 +1,63 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Multiply Block:
+## all types, 1 output, 2 to inf inputs
+###################################################
+ -->
+<block>
+ <name>Multiply</name>
+ <key>gr_multiply_xx</key>
+ <import>from gnuradio import gr</import>
+ <make>gr.multiply_v$(type.fcn)($vlen)</make>
+ <param>
+ <name>IO Type</name>
+ <key>type</key>
+ <type>enum</type>
+ <option>
+ <name>Complex</name>
+ <key>complex</key>
+ <opt>fcn:cc</opt>
+ </option>
+ <option>
+ <name>Float</name>
+ <key>float</key>
+ <opt>fcn:ff</opt>
+ </option>
+ <option>
+ <name>Int</name>
+ <key>int</key>
+ <opt>fcn:ii</opt>
+ </option>
+ <option>
+ <name>Short</name>
+ <key>short</key>
+ <opt>fcn:ss</opt>
+ </option>
+ </param>
+ <param>
+ <name>Num Inputs</name>
+ <key>num_inputs</key>
+ <value>2</value>
+ <type>int</type>
+ </param>
+ <param>
+ <name>Vec Length</name>
+ <key>vlen</key>
+ <value>1</value>
+ <type>int</type>
+ </param>
+ <check>$num_inputs > 1</check>
+ <check>$vlen > 0</check>
+ <sink>
+ <name>in</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ <nports>$num_inputs</nports>
+ </sink>
+ <source>
+ <name>out</name>
+ <type>$type</type>
+ <vlen>$vlen</vlen>
+ </source>
+</block>
Modified: gnuradio/trunk/grc/examples/audio/dial_tone.grc
===================================================================
--- gnuradio/trunk/grc/examples/audio/dial_tone.grc 2009-03-24 15:46:30 UTC
(rev 10677)
+++ gnuradio/trunk/grc/examples/audio/dial_tone.grc 2009-03-24 19:45:55 UTC
(rev 10678)
@@ -45,10 +45,10 @@
</param>
</block>
<block>
- <key>gr_add_vxx</key>
+ <key>gr_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_vxx</value>
+ <value>gr_add_xx</value>
</param>
<param>
<key>_enabled</key>
@@ -350,26 +350,26 @@
</block>
<connection>
<source_block_id>gr_sig_source_x0</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sig_source_x</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>gr_noise_source_x</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>2</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx</source_block_id>
+ <source_block_id>gr_add_xx</source_block_id>
<sink_block_id>audio_sink</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
-</flow_graph>
\ No newline at end of file
+</flow_graph>
Modified: gnuradio/trunk/grc/examples/simple/ber_simulation.grc
===================================================================
--- gnuradio/trunk/grc/examples/simple/ber_simulation.grc 2009-03-24
15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/grc/examples/simple/ber_simulation.grc 2009-03-24
19:45:55 UTC (rev 10678)
@@ -422,10 +422,10 @@
</param>
</block>
<block>
- <key>gr_add_vxx</key>
+ <key>gr_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_vxx</value>
+ <value>gr_add_xx</value>
</param>
<param>
<key>_enabled</key>
@@ -526,20 +526,20 @@
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx</source_block_id>
+ <source_block_id>gr_add_xx</source_block_id>
<sink_block_id>gr_constellation_decoder_cb</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_chunks_to_symbols_xx</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_noise_source_x</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
@@ -556,7 +556,7 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx</source_block_id>
+ <source_block_id>gr_add_xx</source_block_id>
<sink_block_id>wxgui_scopesink2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
Modified: gnuradio/trunk/grc/examples/trellis/interference_cancellation.grc
===================================================================
--- gnuradio/trunk/grc/examples/trellis/interference_cancellation.grc
2009-03-24 15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/grc/examples/trellis/interference_cancellation.grc
2009-03-24 19:45:55 UTC (rev 10678)
@@ -384,10 +384,10 @@
</param>
</block>
<block>
- <key>gr_add_vxx</key>
+ <key>gr_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_vxx_0</value>
+ <value>gr_add_xx_0</value>
</param>
<param>
<key>_enabled</key>
@@ -481,10 +481,10 @@
</param>
</block>
<block>
- <key>gr_multiply_vxx</key>
+ <key>gr_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_vxx_0</value>
+ <value>gr_multiply_xx_0</value>
</param>
<param>
<key>_enabled</key>
@@ -562,10 +562,10 @@
</param>
</block>
<block>
- <key>gr_multiply_vxx</key>
+ <key>gr_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_vxx_1</value>
+ <value>gr_multiply_xx_1</value>
</param>
<param>
<key>_enabled</key>
@@ -740,10 +740,10 @@
</param>
</block>
<block>
- <key>gr_multiply_vxx</key>
+ <key>gr_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_vxx_2</value>
+ <value>gr_multiply_xx_2</value>
</param>
<param>
<key>_enabled</key>
@@ -918,10 +918,10 @@
</param>
</block>
<block>
- <key>gr_multiply_vxx</key>
+ <key>gr_multiply_xx</key>
<param>
<key>id</key>
- <value>gr_multiply_vxx_2_0</value>
+ <value>gr_multiply_xx_2_0</value>
</param>
<param>
<key>_enabled</key>
@@ -1607,10 +1607,10 @@
</param>
</block>
<block>
- <key>gr_add_vxx</key>
+ <key>gr_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_vxx_1</value>
+ <value>gr_add_xx_1</value>
</param>
<param>
<key>_enabled</key>
@@ -1801,19 +1801,19 @@
</connection>
<connection>
<source_block_id>gr_multiply_const_vxx_0</source_block_id>
- <sink_block_id>gr_add_vxx_0</sink_block_id>
+ <sink_block_id>gr_add_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx_0</source_block_id>
- <sink_block_id>gr_add_vxx_1</sink_block_id>
+ <source_block_id>gr_add_xx_0</source_block_id>
+ <sink_block_id>gr_add_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_noise_source_x_0</source_block_id>
- <sink_block_id>gr_add_vxx_1</sink_block_id>
+ <sink_block_id>gr_add_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
@@ -1825,24 +1825,24 @@
</connection>
<connection>
<source_block_id>gr_multiply_const_vxx_1</source_block_id>
- <sink_block_id>gr_add_vxx_0</sink_block_id>
+ <sink_block_id>gr_add_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_vxx_0</sink_block_id>
+ <sink_block_id>gr_multiply_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sub_xx_0</source_block_id>
- <sink_block_id>gr_multiply_vxx_0</sink_block_id>
+ <sink_block_id>gr_multiply_xx_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_vxx_0</source_block_id>
+ <source_block_id>gr_multiply_xx_0</source_block_id>
<sink_block_id>gr_short_to_float_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -1854,7 +1854,7 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_vxx_2</source_block_id>
+ <source_block_id>gr_multiply_xx_2</source_block_id>
<sink_block_id>gr_short_to_float_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -1866,7 +1866,7 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx_1</source_block_id>
+ <source_block_id>gr_add_xx_1</source_block_id>
<sink_block_id>trellis_viterbi_combined_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -1897,13 +1897,13 @@
</connection>
<connection>
<source_block_id>gr_sub_xx_1</source_block_id>
- <sink_block_id>gr_multiply_vxx_2</sink_block_id>
+ <sink_block_id>gr_multiply_xx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sub_xx_1</source_block_id>
- <sink_block_id>gr_multiply_vxx_2</sink_block_id>
+ <sink_block_id>gr_multiply_xx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
@@ -1914,7 +1914,7 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx_1</source_block_id>
+ <source_block_id>gr_add_xx_1</source_block_id>
<sink_block_id>gr_sub_xx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -1944,7 +1944,7 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_vxx_1</source_block_id>
+ <source_block_id>gr_multiply_xx_1</source_block_id>
<sink_block_id>gr_short_to_float_2</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -1963,18 +1963,18 @@
</connection>
<connection>
<source_block_id>gr_sub_xx_3</source_block_id>
- <sink_block_id>gr_multiply_vxx_1</sink_block_id>
+ <sink_block_id>gr_multiply_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sub_xx_3</source_block_id>
- <sink_block_id>gr_multiply_vxx_1</sink_block_id>
+ <sink_block_id>gr_multiply_xx_1</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx_1</source_block_id>
+ <source_block_id>gr_add_xx_1</source_block_id>
<sink_block_id>trellis_viterbi_combined_xx_2</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -2010,7 +2010,7 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_multiply_vxx_2_0</source_block_id>
+ <source_block_id>gr_multiply_xx_2_0</source_block_id>
<sink_block_id>gr_short_to_float_1_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -2023,13 +2023,13 @@
</connection>
<connection>
<source_block_id>gr_sub_xx_1_0</source_block_id>
- <sink_block_id>gr_multiply_vxx_2_0</sink_block_id>
+ <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sub_xx_1_0</source_block_id>
- <sink_block_id>gr_multiply_vxx_2_0</sink_block_id>
+ <sink_block_id>gr_multiply_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
@@ -2046,7 +2046,7 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx_1</source_block_id>
+ <source_block_id>gr_add_xx_1</source_block_id>
<sink_block_id>gr_sub_xx_2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
@@ -2064,7 +2064,7 @@
<sink_key>1</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx_1</source_block_id>
+ <source_block_id>gr_add_xx_1</source_block_id>
<sink_block_id>wxgui_scopesink2_0</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
Modified: gnuradio/trunk/grc/examples/usrp/usrp_two_tone_loopback.grc
===================================================================
--- gnuradio/trunk/grc/examples/usrp/usrp_two_tone_loopback.grc 2009-03-24
15:46:30 UTC (rev 10677)
+++ gnuradio/trunk/grc/examples/usrp/usrp_two_tone_loopback.grc 2009-03-24
19:45:55 UTC (rev 10678)
@@ -479,10 +479,10 @@
</param>
</block>
<block>
- <key>gr_add_vxx</key>
+ <key>gr_add_xx</key>
<param>
<key>id</key>
- <value>gr_add_vxx</value>
+ <value>gr_add_xx</value>
</param>
<param>
<key>_enabled</key>
@@ -613,19 +613,19 @@
</block>
<connection>
<source_block_id>gr_sig_source_x</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
<connection>
<source_block_id>gr_sig_source_x0</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>1</sink_key>
</connection>
<connection>
<source_block_id>gr_noise_source_x</source_block_id>
- <sink_block_id>gr_add_vxx</sink_block_id>
+ <sink_block_id>gr_add_xx</sink_block_id>
<source_key>0</source_key>
<sink_key>2</sink_key>
</connection>
@@ -636,9 +636,9 @@
<sink_key>0</sink_key>
</connection>
<connection>
- <source_block_id>gr_add_vxx</source_block_id>
+ <source_block_id>gr_add_xx</source_block_id>
<sink_block_id>usrp_simple_sink_x</sink_block_id>
<source_key>0</source_key>
<sink_key>0</sink_key>
</connection>
-</flow_graph>
\ No newline at end of file
+</flow_graph>
Modified: gnuradio/trunk/grc/src/utils/converter.py
===================================================================
--- gnuradio/trunk/grc/src/utils/converter.py 2009-03-24 15:46:30 UTC (rev
10677)
+++ gnuradio/trunk/grc/src/utils/converter.py 2009-03-24 19:45:55 UTC (rev
10678)
@@ -81,10 +81,10 @@
#convert instances of gui_coordinate and gui_rotation
xml = etree.parse(file_path)
for find, replace in (
- ('gui_coordinate', '_coordinate'),
- ('gui_rotation', '_rotation'),
+ ('gr_add_vxx', 'gr_add_xx'),
+ ('gr_multiply_vxx', 'gr_multiply_xx'),
):
- keys =
xml.xpath('/flow_graph/block/param[key="%s"]/key'%find)
+ keys =
xml.xpath('/flow_graph/block[key="%s"]/key'%find)
for key in keys:
key.text = replace
changed = True
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r10678 - in gnuradio/trunk: . gnuradio-core/src/lib/general gnuradio-core/src/lib/gengen gnuradio-core/src/python/gnuradio/gr gr-wxgui/src/python/plotter grc/data/platforms/python grc/data/platforms/python/blocks grc/examples/audio grc/examples/simple grc/examples/trellis grc/examples/usrp grc/src/utils,
jblum <=