Merge r6461:6464 from jcorgan/t162-staging into trunk.
authorjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Tue, 18 Sep 2007 18:59:00 +0000 (18:59 +0000)
committerjcorgan <jcorgan@221aa14e-8319-0410-a670-987f0aec2ac5>
Tue, 18 Sep 2007 18:59:00 +0000 (18:59 +0000)
commite692e71305ecd71d3681fe37f3d76f350d67e276
treedc320c9261303aa9a92f4d12bdba85f82720d1bf
parent6ad04a094ced626e46c210b9847eae46a1ae8e67
Merge r6461:6464 from jcorgan/t162-staging into trunk.

* Final gr.top_block and gr.hier_block2 implementation inside
  gnuradio-core/src/lib/runtime

* Implementation of gr.hier_block2 versions of all the old-style blocks
  in blks.  These live in blks2.

* Addition of gr.hier_block2 based versions of gr-wxgui blocks

* Conversion of all the example code in gnuradio-examples to use this
  new code

* Conversion of all the gr-utils scripts to use the new code

The OFDM examples and related hierarchical blocks have not yet been
converted.  Code in the rest of the tree that is outside the core
and example components has also not yet been converted.

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@6466 221aa14e-8319-0410-a670-987f0aec2ac5
178 files changed:
config/grc_gnuradio_core.m4
config/grc_gnuradio_examples.m4
debian/gen-install-files.sh
gnuradio-core/src/lib/runtime/gr_hier_block2.cc
gnuradio-core/src/lib/runtime/gr_hier_block2.h
gnuradio-core/src/lib/runtime/gr_hier_block2.i
gnuradio-core/src/lib/runtime/gr_hier_block2_detail.cc
gnuradio-core/src/lib/runtime/gr_hier_block2_detail.h
gnuradio-core/src/lib/runtime/gr_top_block.cc
gnuradio-core/src/lib/runtime/gr_top_block.h
gnuradio-core/src/lib/runtime/gr_top_block.i
gnuradio-core/src/lib/runtime/gr_top_block_impl.h
gnuradio-core/src/python/gnuradio/Makefile.am
gnuradio-core/src/python/gnuradio/blks2/__init__.py
gnuradio-core/src/python/gnuradio/blks2impl/Makefile.am [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/__init__.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/am_demod.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/channel_model.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/cpm.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/d8psk.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/dbpsk.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/digital_voice.py.real [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/dqpsk.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/filterbank.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/fm_demod.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/fm_emph.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/gmsk.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/nbfm_rx.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/nbfm_tx.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_fixed.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_ml.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pn.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/ofdm_sync_pnac.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/pkt.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/psk.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/qam.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/qam16.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/qam256.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/qam64.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/qam8.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/rational_resampler.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/standard_squelch.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/wfm_rcv_pll.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blks2impl/wfm_tx.py [new file with mode: 0644]
gnuradio-core/src/python/gnuradio/blksimpl2/Makefile.am [deleted file]
gnuradio-core/src/python/gnuradio/blksimpl2/__init__.py [deleted file]
gnuradio-core/src/python/gnuradio/blksimpl2/d8psk.py [deleted file]
gnuradio-core/src/python/gnuradio/blksimpl2/dbpsk.py [deleted file]
gnuradio-core/src/python/gnuradio/blksimpl2/dqpsk.py [deleted file]
gnuradio-core/src/python/gnuradio/blksimpl2/filterbank.py [deleted file]
gnuradio-core/src/python/gnuradio/blksimpl2/gmsk.py [deleted file]
gnuradio-core/src/python/gnuradio/blksimpl2/pkt.py [deleted file]
gnuradio-core/src/python/gnuradio/blksimpl2/psk.py [deleted file]
gnuradio-core/src/python/gnuradio/blksimpl2/rational_resampler.py [deleted file]
gnuradio-core/src/python/gnuradio/gr/hier_block2.py
gnuradio-core/src/python/gnuradio/gr/qa_hier_block2.py
gnuradio-core/src/python/gnuradio/gr/top_block.py
gnuradio-examples/python/Makefile.am
gnuradio-examples/python/apps/hf_explorer/hfx2.py
gnuradio-examples/python/audio/audio_copy.py
gnuradio-examples/python/audio/audio_fft.py
gnuradio-examples/python/audio/audio_play.py
gnuradio-examples/python/audio/audio_to_file.py
gnuradio-examples/python/audio/dial_tone.py
gnuradio-examples/python/audio/mono_tone.py
gnuradio-examples/python/audio/multi_tone.py
gnuradio-examples/python/audio/noise.py
gnuradio-examples/python/audio/spectrum_inversion.py
gnuradio-examples/python/audio/test_resampler.py
gnuradio-examples/python/dect/Makefile.am [new file with mode: 0644]
gnuradio-examples/python/dect/README [new file with mode: 0644]
gnuradio-examples/python/dect/dect_receiver.py [new file with mode: 0644]
gnuradio-examples/python/dect/usrp_dect.py [new file with mode: 0755]
gnuradio-examples/python/dect/usrp_source.py [new file with mode: 0644]
gnuradio-examples/python/digital/Makefile.am
gnuradio-examples/python/digital/benchmark_loopback.py
gnuradio-examples/python/digital/benchmark_rx.py
gnuradio-examples/python/digital/benchmark_tx.py
gnuradio-examples/python/digital/receive_path.py
gnuradio-examples/python/digital/receive_path_lb.py
gnuradio-examples/python/digital/rx_voice.py
gnuradio-examples/python/digital/transmit_path.py
gnuradio-examples/python/digital/transmit_path_lb.py
gnuradio-examples/python/digital/tunnel.py
gnuradio-examples/python/digital/tx_voice.py
gnuradio-examples/python/digital_voice/cvsd_test.py
gnuradio-examples/python/digital_voice/encdec.py
gnuradio-examples/python/hier/Makefile.am [deleted file]
gnuradio-examples/python/hier/audio/Makefile.am [deleted file]
gnuradio-examples/python/hier/audio/dial_tone2.py [deleted file]
gnuradio-examples/python/hier/dect/Makefile.am [deleted file]
gnuradio-examples/python/hier/dect/README [deleted file]
gnuradio-examples/python/hier/dect/dect_receiver.py [deleted file]
gnuradio-examples/python/hier/dect/gmsk2.py [deleted file]
gnuradio-examples/python/hier/dect/usrp_dect.py [deleted file]
gnuradio-examples/python/hier/dect/usrp_source.py [deleted file]
gnuradio-examples/python/hier/digital/Makefile.am [deleted file]
gnuradio-examples/python/hier/digital/README [deleted file]
gnuradio-examples/python/hier/digital/benchmark_loopback.py [deleted file]
gnuradio-examples/python/hier/digital/benchmark_rx.py [deleted file]
gnuradio-examples/python/hier/digital/benchmark_tx.py [deleted file]
gnuradio-examples/python/hier/digital/fusb_options.py [deleted file]
gnuradio-examples/python/hier/digital/pick_bitrate.py [deleted file]
gnuradio-examples/python/hier/digital/receive_path.py [deleted file]
gnuradio-examples/python/hier/digital/receive_path_lb.py [deleted file]
gnuradio-examples/python/hier/digital/rx_voice.py [deleted file]
gnuradio-examples/python/hier/digital/transmit_path.py [deleted file]
gnuradio-examples/python/hier/digital/transmit_path_lb.py [deleted file]
gnuradio-examples/python/hier/digital/tunnel.py [deleted file]
gnuradio-examples/python/hier/digital/tx_voice.py [deleted file]
gnuradio-examples/python/hier/networking/Makefile.am [deleted file]
gnuradio-examples/python/hier/networking/audio_sink.py [deleted file]
gnuradio-examples/python/hier/networking/audio_source.py [deleted file]
gnuradio-examples/python/hier/networking/dial_tone_sink.py [deleted file]
gnuradio-examples/python/hier/networking/dial_tone_source.py [deleted file]
gnuradio-examples/python/hier/networking/vector_sink.py [deleted file]
gnuradio-examples/python/hier/networking/vector_source.py [deleted file]
gnuradio-examples/python/hier/ofdm/Makefile.am [deleted file]
gnuradio-examples/python/hier/sounder/Makefile.am [deleted file]
gnuradio-examples/python/hier/sounder/sounder_rx.py [deleted file]
gnuradio-examples/python/hier/sounder/sounder_tx.py [deleted file]
gnuradio-examples/python/hier/sounder/usrp_sink.py [deleted file]
gnuradio-examples/python/hier/sounder/usrp_sounder_rx.py [deleted file]
gnuradio-examples/python/hier/sounder/usrp_sounder_tx.py [deleted file]
gnuradio-examples/python/hier/sounder/usrp_source.py [deleted file]
gnuradio-examples/python/hier/usrp/Makefile.am [deleted file]
gnuradio-examples/python/hier/usrp/usrp_fft.py [deleted file]
gnuradio-examples/python/hier/usrp/usrp_siggen.py [deleted file]
gnuradio-examples/python/limbo/networking/Makefile.am [new file with mode: 0644]
gnuradio-examples/python/limbo/networking/measurement_slave.py [new file with mode: 0755]
gnuradio-examples/python/limbo/sounder/Makefile.am [new file with mode: 0644]
gnuradio-examples/python/limbo/sounder/sounder_rx.py [new file with mode: 0644]
gnuradio-examples/python/limbo/sounder/sounder_tx.py [new file with mode: 0644]
gnuradio-examples/python/limbo/sounder/usrp_sink.py [new file with mode: 0644]
gnuradio-examples/python/limbo/sounder/usrp_sounder_rx.py [new file with mode: 0755]
gnuradio-examples/python/limbo/sounder/usrp_sounder_tx.py [new file with mode: 0755]
gnuradio-examples/python/limbo/sounder/usrp_source.py [new file with mode: 0644]
gnuradio-examples/python/network/Makefile.am [new file with mode: 0644]
gnuradio-examples/python/network/audio_sink.py [new file with mode: 0755]
gnuradio-examples/python/network/audio_source.py [new file with mode: 0755]
gnuradio-examples/python/network/dial_tone_sink.py [new file with mode: 0755]
gnuradio-examples/python/network/dial_tone_source.py [new file with mode: 0755]
gnuradio-examples/python/network/vector_sink.py [new file with mode: 0755]
gnuradio-examples/python/network/vector_source.py [new file with mode: 0755]
gnuradio-examples/python/networking/Makefile.am [deleted file]
gnuradio-examples/python/networking/measurement_slave.py [deleted file]
gnuradio-examples/python/ofdm/Makefile.am
gnuradio-examples/python/usrp/fm_tx4.py
gnuradio-examples/python/usrp/fm_tx_2_daughterboards.py
gnuradio-examples/python/usrp/max_power.py
gnuradio-examples/python/usrp/usrp_benchmark_usb.py
gnuradio-examples/python/usrp/usrp_nbfm_ptt.py
gnuradio-examples/python/usrp/usrp_nbfm_rcv.py
gnuradio-examples/python/usrp/usrp_spectrum_sense.py
gnuradio-examples/python/usrp/usrp_test_loop_lfsr.py
gnuradio-examples/python/usrp/usrp_tv_rcv.py
gnuradio-examples/python/usrp/usrp_tv_rcv_nogui.py
gnuradio-examples/python/usrp/usrp_wfm_rcv.py
gnuradio-examples/python/usrp/usrp_wfm_rcv2_nogui.py
gnuradio-examples/python/usrp/usrp_wfm_rcv_nogui.py
gnuradio-examples/python/usrp/usrp_wfm_rcv_pll.py
gnuradio-examples/python/usrp/usrp_wfm_rcv_sca.py
gnuradio-examples/python/usrp/usrp_wxapt_rcv.py
gr-cvsd-vocoder/src/python/Makefile.am
gr-cvsd-vocoder/src/python/cvsd.py
gr-cvsd-vocoder/src/python/encdec.py
gr-cvsd-vocoder/src/python/qa_cvsd_vocoder.py
gr-pager/src/usrp_flex_band.py
gr-utils/src/python/usrp_fft.py
gr-utils/src/python/usrp_oscope.py
gr-utils/src/python/usrp_rx_cfile.py
gr-utils/src/python/usrp_rx_nogui.py
gr-utils/src/python/usrp_siggen.py
gr-utils/src/python/usrp_test_counting.py
gr-utils/src/python/usrp_test_loopback.py