commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] git://gnuradio.org/jblum branch, next, updated. 3d4959


From: git version control
Subject: [Commit-gnuradio] git://gnuradio.org/jblum branch, next, updated. 3d49591fef7f23d1de21542dd99742610d675221
Date: Tue, 18 Oct 2011 06:50:31 +0000 (UTC)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "git://gnuradio.org/jblum".

The branch, next has been updated
       via  3d49591fef7f23d1de21542dd99742610d675221 (commit)
       via  161910c66e88c081d267f4b2b699f7431f287279 (commit)
       via  f664585ddddeb040d1cd285d0b9dfb41c4979b91 (commit)
       via  a01c42495ecd9f3a8b34c3e10cfd0e9fec1f26c4 (commit)
       via  6a274e19aac8b0b3066af5b6990f563ec3170221 (commit)
       via  1c7bd647877ca835a410df903c478c99ead92b27 (commit)
       via  a69e35b2d9b5a07c86603a39b16111565258b41a (commit)
       via  b9156049149863d75e77dc619ce4d96f8ec0eafc (commit)
       via  6fcf521394ed256f4e75d52e986e63e38f2ec56b (commit)
       via  58f6261298a2f7dbf4c798f2dbaac0022f3f89ba (commit)
       via  641a60118ac5955bcb9d820874c13fe149b1095c (commit)
       via  006712e264f7659c40212e8acf1611c7a227655a (commit)
       via  2885d6b4ef76558c04f4337e953ac7c5f00a5c14 (commit)
       via  fef3fe57c75ce6011c87bc894472639d385fcb21 (commit)
       via  07324710bdf7eba63417e5591ff37c7641a3f7ab (commit)
       via  83bf767d281406878bd04bb7c553109dbf3a4afe (commit)
       via  fe23a0981507ee47f929026b10c77e990df56104 (commit)
       via  e011b5bb0bcb24fc43bd689d003cdf19d36581b9 (commit)
       via  1033576a2c839edce1c82b7e1466501d800e3a06 (commit)
       via  241e4f82049fd1a5ac434ade2c6bfe040f278405 (commit)
       via  c7493e83269d7358da0ba7fbd4beee8f0f6be2e8 (commit)
       via  620971bdb6554cf2a248b26a6dd5a069dbb9c873 (commit)
       via  68ac497f17af5af435b535d0dccbd930be0fc1d3 (commit)
       via  d6b2864470e44aeac3775909a24b9a734e9a369d (commit)
       via  73ccc57f0f8c25162b8a3410e8a9e59c9e824a45 (commit)
       via  06f576d2f8670e308ee5b47445f7377de6eeaed8 (commit)
       via  d53109a88522d243bf684ffe1a9aad2801c52f07 (commit)
       via  d47f0aeab7343fb033352e2ddb787c1dc95d660d (commit)
       via  60b3bd32aa145522a1eaf9978e594ed13b9a6bc5 (commit)
       via  0e16a28047d07afc6e4d31839d804dca0d0de31e (commit)
       via  b83d2ac592baf8135c889d5725d0e9fc53c4fab8 (commit)
       via  a2af88f65c730fa29e31a3d6e80cc111d1fbd430 (commit)
       via  9edab7aec9c59ad56956d19c34539f26aec069af (commit)
       via  1c3f94bb119b76db9159941ace08c318c5a3fbba (commit)
       via  5f0bc5a2096012d6a94f72e20190ab8b3e0b4f88 (commit)
       via  d1e3108c8705289d194300ca9fad1c22f579be9b (commit)
      from  41ce01bd6f602009b83422550b0b91bddd830c84 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3d49591fef7f23d1de21542dd99742610d675221
Author: Josh Blum <address@hidden>
Date:   Mon Oct 17 23:50:35 2011 -0700

    added some more python dash B

commit 161910c66e88c081d267f4b2b699f7431f287279
Merge: 41ce01b f664585
Author: Josh Blum <address@hidden>
Date:   Mon Oct 17 23:40:51 2011 -0700

    Merge branch 'next' of http://gnuradio.org/git/gnuradio into next
    
    Conflicts:
        gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h
        gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h
        gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.h
        gr-digital/include/digital_ofdm_cyclic_prefixer.h
        gr-digital/include/digital_ofdm_frame_acquisition.h
        gr-digital/include/digital_ofdm_frame_sink.h
        gr-digital/include/digital_ofdm_insert_preamble.h
        gr-digital/include/digital_ofdm_mapper_bcv.h
        gr-digital/include/digital_ofdm_sampler.h

commit f664585ddddeb040d1cd285d0b9dfb41c4979b91
Merge: 1c7bd64 a01c424
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 17 22:52:28 2011 -0700

    Merge branch 'master' into next

commit a01c42495ecd9f3a8b34c3e10cfd0e9fec1f26c4
Merge: a69e35b 6a274e1
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 17 22:52:18 2011 -0700

    Merge branch 'maint'

commit 6a274e19aac8b0b3066af5b6990f563ec3170221
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 17 22:50:21 2011 -0700

    qtgui: missed something before.

commit 1c7bd647877ca835a410df903c478c99ead92b27
Merge: 6fcf521 a69e35b
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 17 21:04:33 2011 -0700

    Merge branch 'master' into next

commit a69e35b2d9b5a07c86603a39b16111565258b41a
Merge: 641a601 b915604
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 17 21:04:25 2011 -0700

    Merge branch 'maint'

commit b9156049149863d75e77dc619ce4d96f8ec0eafc
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 17 20:49:17 2011 -0700

    qtgui: a few more fixes for qwt 5.2/6.0.

commit 6fcf521394ed256f4e75d52e986e63e38f2ec56b
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 17 20:16:33 2011 -0700

    digital: adding OFDM GRC blocks to gr-digital.

commit 58f6261298a2f7dbf4c798f2dbaac0022f3f89ba
Merge: 2885d6b 641a601
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 17 11:39:09 2011 -0700

    Merge branch 'master' into next

commit 641a60118ac5955bcb9d820874c13fe149b1095c
Merge: 2d5a6f8 006712e
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 17 11:38:51 2011 -0700

    Merge branch 'maint'

commit 006712e264f7659c40212e8acf1611c7a227655a
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 17 11:28:40 2011 -0700

    build: fixed last warning generated from bootstrap under autoconf 2.68.

commit 2885d6b4ef76558c04f4337e953ac7c5f00a5c14
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 17 10:39:21 2011 -0700

    ofdm: removed old ofdm examples directory. All examples are now in 
gr-digital.

commit fef3fe57c75ce6011c87bc894472639d385fcb21
Merge: 0732471 a4dbd97
Author: Tom Rondeau <address@hidden>
Date:   Mon Oct 17 13:37:04 2011 -0400

    Merge branch 'next' into dig_ofdm

commit 07324710bdf7eba63417e5591ff37c7641a3f7ab
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 14 17:56:33 2011 -0400

    digital: added set_freq function to narrownband tunnel's main top block.

commit 83bf767d281406878bd04bb7c553109dbf3a4afe
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 14 17:55:57 2011 -0400

    digital: wip: working on tunnel.py for OFDM.

commit fe23a0981507ee47f929026b10c77e990df56104
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 14 17:47:10 2011 -0400

    digital: renamed OFDM benchmark codes; no real need to say what they are in 
an ofdm directory.

commit e011b5bb0bcb24fc43bd689d003cdf19d36581b9
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 14 17:46:20 2011 -0400

    digital: fixed narrowband channel model adder to take a signal amplitude to 
determine the SNR.

commit 1033576a2c839edce1c82b7e1466501d800e3a06
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 14 17:46:06 2011 -0400

    digital: add channel model for OFDM signals to a file.

commit 241e4f82049fd1a5ac434ade2c6bfe040f278405
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 14 17:35:16 2011 -0400

    digital: removed unnecessary benchmark_ofdm.py

commit c7493e83269d7358da0ba7fbd4beee8f0f6be2e8
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 14 17:34:31 2011 -0400

    digital: fixed OFDM benchmark code to work over-the-air with UHD.

commit 620971bdb6554cf2a248b26a6dd5a069dbb9c873
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 14 16:18:43 2011 -0400

    fixed a couple of typos.

commit 68ac497f17af5af435b535d0dccbd930be0fc1d3
Author: Tom Rondeau <address@hidden>
Date:   Fri Oct 14 13:05:25 2011 -0400

    docs: Updated some docs and made it so GRC can pull docs in from other 
components like vocoder and digital.

commit d6b2864470e44aeac3775909a24b9a734e9a369d
Merge: 73ccc57 06f576d
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 12 23:03:04 2011 -0400

    Merge branch 'dig_ofdm' of github.com:trondeau/gnuradio into dig_ofdm

commit 73ccc57f0f8c25162b8a3410e8a9e59c9e824a45
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 12 23:02:56 2011 -0400

    digital: changed modulation_utils2 to modulation_utils and update all files 
using it.

commit 06f576d2f8670e308ee5b47445f7377de6eeaed8
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 12 23:01:41 2011 -0400

    digital: fixed QA tests for ofdm.

commit d53109a88522d243bf684ffe1a9aad2801c52f07
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 12 22:42:55 2011 -0400

    digital: OFDM using new psk and qam modules for constellations. Also, 
psk2->psk updated in all files and examples.

commit d47f0aeab7343fb033352e2ddb787c1dc95d660d
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 12 22:13:45 2011 -0400

    digital: sneaking in a fix to cpm.py here. Working with benchmark_tx. Also 
adding some print statements to benchmark script to indicate what type of 
source/sink is being used.

commit 60b3bd32aa145522a1eaf9978e594ed13b9a6bc5
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 12 19:02:47 2011 -0400

    digital: moved over all c++ blocks to gr-digital. Benchmark tx/rx still 
working.

commit 0e16a28047d07afc6e4d31839d804dca0d0de31e
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 12 17:43:35 2011 -0400

    digital: removed psk and qam from gnuradio-core; unnecessary now.

commit b83d2ac592baf8135c889d5725d0e9fc53c4fab8
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 12 17:34:55 2011 -0400

    digital: unnecessary import.

commit a2af88f65c730fa29e31a3d6e80cc111d1fbd430
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 12 17:34:35 2011 -0400

    digital: I didn't think this was needed, but apparently, it is.

commit 9edab7aec9c59ad56956d19c34539f26aec069af
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 12 17:31:39 2011 -0400

    digital: benchmark_tx and benchmark_rx are working to/from file.

commit 1c3f94bb119b76db9159941ace08c318c5a3fbba
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 12 17:22:20 2011 -0400

    digital: wip: changes to get benchmark_ofdm_tx to produce output (runs but 
untested/verified).

commit 5f0bc5a2096012d6a94f72e20190ab8b3e0b4f88
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 12 17:01:44 2011 -0400

    digital: wip: moved all OFDM examples and blks2impl to gr-digital.

commit d1e3108c8705289d194300ca9fad1c22f579be9b
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 12 16:57:51 2011 -0400

    digital: moved narrowband examples to their own directory (to make room for 
OFDM examples).

-----------------------------------------------------------------------

Summary of changes:
 config/ax_boost_base.m4                            |    2 +-
 config/grc_gnuradio_examples.m4                    |    1 -
 gnuradio-core/src/guile/tests/general_ctors.test   |   22 -
 gnuradio-core/src/lib/filter/gr_dc_blocker_cc.h    |   36 +-
 gnuradio-core/src/lib/filter/gr_dc_blocker_ff.h    |   37 +-
 gnuradio-core/src/lib/general/CMakeLists.txt       |    8 -
 gnuradio-core/src/lib/general/Makefile.am          |   21 -
 gnuradio-core/src/lib/general/general.i            |   14 -
 gnuradio-core/src/lib/general/gr_int_to_float.h    |    2 +-
 .../src/lib/general/gr_ofdm_cyclic_prefixer.cc     |   68 ---
 .../src/lib/general/gr_ofdm_cyclic_prefixer.h      |   59 ---
 .../src/lib/general/gr_ofdm_cyclic_prefixer.i      |   34 --
 .../src/lib/general/gr_ofdm_demapper_vcb.cc        |   41 --
 .../src/lib/general/gr_ofdm_demapper_vcb.h         |   57 ---
 .../src/lib/general/gr_ofdm_demapper_vcb.i         |   36 --
 .../src/lib/general/gr_ofdm_frame_acquisition.cc   |  208 ---------
 .../src/lib/general/gr_ofdm_frame_acquisition.h    |  117 -----
 .../src/lib/general/gr_ofdm_frame_acquisition.i    |   49 ---
 .../src/lib/general/gr_ofdm_frame_sink.cc          |  405 -----------------
 gnuradio-core/src/lib/general/gr_ofdm_frame_sink.h |  127 ------
 gnuradio-core/src/lib/general/gr_ofdm_frame_sink.i |   41 --
 .../src/lib/general/gr_ofdm_insert_preamble.cc     |  187 --------
 .../src/lib/general/gr_ofdm_insert_preamble.h      |  105 -----
 .../src/lib/general/gr_ofdm_insert_preamble.i      |   35 --
 .../src/lib/general/gr_ofdm_mapper_bcv.cc          |  241 -----------
 gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.h |   88 ----
 gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.i |   46 --
 gnuradio-core/src/lib/general/gr_ofdm_sampler.cc   |  133 ------
 gnuradio-core/src/lib/general/gr_ofdm_sampler.h    |   68 ---
 gnuradio-core/src/lib/general/gr_ofdm_sampler.i    |   35 --
 gnuradio-core/src/python/gnuradio/CMakeLists.txt   |    2 -
 gnuradio-core/src/python/gnuradio/Makefile.am      |    2 -
 .../src/python/gnuradio/blks2impl/CMakeLists.txt   |    8 -
 .../src/python/gnuradio/blks2impl/Makefile.am      |    8 -
 .../src/python/gnuradio/blks2impl/ofdm.py          |  299 -------------
 .../src/python/gnuradio/blks2impl/ofdm_receiver.py |  133 ------
 gnuradio-core/src/python/gnuradio/blks2impl/psk.py |   94 ----
 gnuradio-core/src/python/gnuradio/blks2impl/qam.py |  113 -----
 gnuradio-core/src/python/gnuradio/gr/Makefile.am   |    1 -
 .../python/gnuradio/gr/qa_ofdm_insert_preamble.py  |  179 --------
 .../src/python/gnuradio/modulation_utils2.py       |   81 ----
 .../src/python/gnuradio/ofdm_packet_utils.py       |  453 -------------------
 gnuradio-examples/python/Makefile.am               |    1 -
 gnuradio-examples/python/ofdm/.gitignore           |    4 -
 gnuradio-examples/python/ofdm/Makefile.am          |   42 --
 gnuradio-examples/python/ofdm/benchmark_ofdm.py    |  187 --------
 gnuradio-examples/python/ofdm/benchmark_ofdm_rx.py |  212 ---------
 gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py |  219 ----------
 gnuradio-examples/python/ofdm/fftshift.py          |   44 --
 gnuradio-examples/python/ofdm/fusb_options.py      |   31 --
 gnuradio-examples/python/ofdm/pick_bitrate.py      |  143 ------
 gnuradio-examples/python/ofdm/receive_path.py      |  105 -----
 gnuradio-examples/python/ofdm/transmit_path.py     |   93 ----
 gnuradio-examples/python/ofdm/tunnel.py            |  435 -------------------
 gr-atsc/src/python/CMakeLists.txt                  |    2 +-
 gr-digital/examples/CMakeLists.txt                 |   28 +-
 gr-digital/examples/Makefile.am                    |   38 +-
 gr-digital/examples/benchmark_add_channel.py       |  101 -----
 gr-digital/examples/benchmark_rx.py                |  135 ------
 gr-digital/examples/benchmark_tx.py                |  150 -------
 gr-digital/examples/digital_bert_rx.py             |  209 ---------
 gr-digital/examples/digital_bert_tx.py             |  135 ------
 .../examples/narrowband/benchmark_add_channel.py   |  102 +++++
 gr-digital/examples/narrowband/benchmark_rx.py     |  136 ++++++
 gr-digital/examples/narrowband/benchmark_tx.py     |  149 +++++++
 gr-digital/examples/narrowband/digital_bert_rx.py  |  209 +++++++++
 gr-digital/examples/narrowband/digital_bert_tx.py  |  135 ++++++
 .../examples/{ => narrowband}/receive_path.py      |    0
 gr-digital/examples/narrowband/rx_voice.py         |  164 +++++++
 gr-digital/examples/narrowband/transmit_path.py    |  126 ++++++
 gr-digital/examples/narrowband/tunnel.py           |  291 +++++++++++++
 gr-digital/examples/narrowband/tx_voice.py         |  171 ++++++++
 .../examples/{ => narrowband}/uhd_interface.py     |    0
 gr-digital/examples/ofdm/benchmark_add_channel.py  |  110 +++++
 gr-digital/examples/ofdm/benchmark_rx.py           |  122 ++++++
 gr-digital/examples/ofdm/benchmark_tx.py           |  121 ++++++
 .../examples}/ofdm/gr_plot_ofdm.py                 |    0
 .../examples}/ofdm/ofdm_mod_demod_test.py          |    0
 .../examples}/ofdm/ofdm_sync.m                     |    0
 .../examples}/ofdm/ofdm_sync_pn.m                  |    0
 .../examples}/ofdm/plot_ofdm.m                     |    0
 gr-digital/examples/ofdm/receive_path.py           |  105 +++++
 gr-digital/examples/ofdm/transmit_path.py          |  100 +++++
 gr-digital/examples/ofdm/tunnel.py                 |  267 ++++++++++++
 gr-digital/examples/ofdm/uhd_interface.py          |  199 +++++++++
 gr-digital/examples/rx_voice.py                    |  164 -------
 gr-digital/examples/transmit_path.py               |  121 ------
 gr-digital/examples/tunnel.py                      |  283 ------------
 gr-digital/examples/tx_voice.py                    |  171 --------
 gr-digital/grc/Makefile.am                         |    9 +-
 gr-digital/grc/digital_block_tree.xml              |   10 +
 gr-digital/grc/digital_ofdm_cyclic_prefixer.xml    |   52 +++
 gr-digital/grc/digital_ofdm_demod.xml              |  143 ++++++
 gr-digital/grc/digital_ofdm_frame_acquisition.xml  |   77 ++++
 gr-digital/grc/digital_ofdm_insert_preamble.xml    |   57 +++
 gr-digital/grc/digital_ofdm_mod.xml                |  156 +++++++
 gr-digital/grc/digital_ofdm_sampler.xml            |   67 +++
 gr-digital/grc/digital_ofdm_sync_pn.xml            |   61 +++
 gr-digital/grc/digital_psk_mod.xml                 |    2 +-
 gr-digital/include/CMakeLists.txt                  |    6 +
 gr-digital/include/Makefile.am                     |    6 +
 gr-digital/include/digital_clock_recovery_mm_cc.h  |    9 +-
 gr-digital/include/digital_ofdm_cyclic_prefixer.h  |   59 +++
 .../include/digital_ofdm_frame_acquisition.h       |  116 +++++
 gr-digital/include/digital_ofdm_frame_sink.h       |  127 ++++++
 gr-digital/include/digital_ofdm_insert_preamble.h  |  105 +++++
 gr-digital/include/digital_ofdm_mapper_bcv.h       |   88 ++++
 gr-digital/include/digital_ofdm_sampler.h          |   68 +++
 gr-digital/lib/CMakeLists.txt                      |    6 +
 gr-digital/lib/Makefile.am                         |    6 +
 gr-digital/lib/digital_ofdm_cyclic_prefixer.cc     |   70 +++
 gr-digital/lib/digital_ofdm_frame_acquisition.cc   |  210 +++++++++
 gr-digital/lib/digital_ofdm_frame_sink.cc          |  405 +++++++++++++++++
 gr-digital/lib/digital_ofdm_insert_preamble.cc     |  187 ++++++++
 gr-digital/lib/digital_ofdm_mapper_bcv.cc          |  241 +++++++++++
 gr-digital/lib/digital_ofdm_sampler.cc             |  133 ++++++
 gr-digital/python/CMakeLists.txt                   |   12 +-
 gr-digital/python/Makefile.am                      |   13 +-
 gr-digital/python/__init__.py                      |   17 +-
 gr-digital/python/bpsk.py                          |   14 +-
 gr-digital/python/cpm.py                           |   54 ++--
 gr-digital/python/generic_mod_demod.py             |    2 +-
 gr-digital/python/gmsk.py                          |   10 +-
 .../{modulation_utils2.py => modulation_utils.py}  |    0
 gr-digital/python/ofdm.py                          |  131 ++++---
 gr-digital/python/ofdm_packet_utils.py             |  454 ++++++++++++++++++++
 gr-digital/python/ofdm_receiver.py                 |  151 +++++++
 .../python}/ofdm_sync_fixed.py                     |    0
 .../python}/ofdm_sync_ml.py                        |    0
 .../python}/ofdm_sync_pn.py                        |    0
 .../python}/ofdm_sync_pnac.py                      |    0
 gr-digital/python/psk.py                           |  174 +++++----
 gr-digital/python/psk2.py                          |  122 ------
 gr-digital/python/qa_clock_recovery_mm.py          |    2 +-
 gr-digital/python/qa_constellation.py              |    4 +-
 gr-digital/python/qa_costas_loop_cc.py             |    4 +-
 gr-digital/python/qa_mpsk_receiver.py              |    2 +-
 gr-digital/python/qa_ofdm_insert_preamble.py       |  180 ++++++++
 gr-digital/python/qam.py                           |   12 +-
 gr-digital/python/qpsk.py                          |   14 +-
 gr-digital/swig/CMakeLists.txt                     |    6 +
 gr-digital/swig/Makefile.am                        |    6 +
 gr-digital/swig/digital_ofdm_cyclic_prefixer.i     |   34 ++
 gr-digital/swig/digital_ofdm_frame_acquisition.i   |   49 +++
 gr-digital/swig/digital_ofdm_frame_sink.i          |   41 ++
 gr-digital/swig/digital_ofdm_insert_preamble.i     |   35 ++
 gr-digital/swig/digital_ofdm_mapper_bcv.i          |   46 ++
 gr-digital/swig/digital_ofdm_sampler.i             |   35 ++
 gr-digital/swig/digital_swig.i                     |   12 +
 gr-qtgui/lib/WaterfallDisplayPlot.cc               |    2 +-
 gr-qtgui/lib/plot_waterfall.cc                     |    7 +-
 gr-qtgui/lib/plot_waterfall.h                      |    3 +-
 gr-vocoder/python/CMakeLists.txt                   |    2 +-
 grc/blocks/Makefile.am                             |    2 -
 grc/blocks/blks2_ofdm_demod.xml                    |  122 ------
 grc/blocks/blks2_ofdm_mod.xml                      |  135 ------
 grc/blocks/block_tree.xml                          |    3 -
 grc/blocks/gr_dc_blocker.xml                       |    2 +-
 grc/python/extract_docs.py                         |    5 +-
 volk/config/ax_boost_base.m4                       |   10 +-
 160 files changed, 6393 insertions(+), 7268 deletions(-)
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_cyclic_prefixer.cc
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_cyclic_prefixer.h
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_cyclic_prefixer.i
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.cc
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.h
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_demapper_vcb.i
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.cc
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.h
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_frame_acquisition.i
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_frame_sink.cc
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_frame_sink.h
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_frame_sink.i
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.cc
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.h
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_insert_preamble.i
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.cc
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.h
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_mapper_bcv.i
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_sampler.cc
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_sampler.h
 delete mode 100644 gnuradio-core/src/lib/general/gr_ofdm_sampler.i
 delete mode 100644 gnuradio-core/src/python/gnuradio/blks2impl/ofdm.py
 delete mode 100644 gnuradio-core/src/python/gnuradio/blks2impl/ofdm_receiver.py
 delete mode 100644 gnuradio-core/src/python/gnuradio/blks2impl/psk.py
 delete mode 100644 gnuradio-core/src/python/gnuradio/blks2impl/qam.py
 delete mode 100755 
gnuradio-core/src/python/gnuradio/gr/qa_ofdm_insert_preamble.py
 delete mode 100644 gnuradio-core/src/python/gnuradio/modulation_utils2.py
 delete mode 100644 gnuradio-core/src/python/gnuradio/ofdm_packet_utils.py
 delete mode 100644 gnuradio-examples/python/ofdm/.gitignore
 delete mode 100644 gnuradio-examples/python/ofdm/Makefile.am
 delete mode 100755 gnuradio-examples/python/ofdm/benchmark_ofdm.py
 delete mode 100755 gnuradio-examples/python/ofdm/benchmark_ofdm_rx.py
 delete mode 100755 gnuradio-examples/python/ofdm/benchmark_ofdm_tx.py
 delete mode 100755 gnuradio-examples/python/ofdm/fftshift.py
 delete mode 100644 gnuradio-examples/python/ofdm/fusb_options.py
 delete mode 100644 gnuradio-examples/python/ofdm/pick_bitrate.py
 delete mode 100644 gnuradio-examples/python/ofdm/receive_path.py
 delete mode 100644 gnuradio-examples/python/ofdm/transmit_path.py
 delete mode 100755 gnuradio-examples/python/ofdm/tunnel.py
 delete mode 100755 gr-digital/examples/benchmark_add_channel.py
 delete mode 100755 gr-digital/examples/benchmark_rx.py
 delete mode 100755 gr-digital/examples/benchmark_tx.py
 delete mode 100755 gr-digital/examples/digital_bert_rx.py
 delete mode 100755 gr-digital/examples/digital_bert_tx.py
 create mode 100755 gr-digital/examples/narrowband/benchmark_add_channel.py
 create mode 100755 gr-digital/examples/narrowband/benchmark_rx.py
 create mode 100755 gr-digital/examples/narrowband/benchmark_tx.py
 create mode 100755 gr-digital/examples/narrowband/digital_bert_rx.py
 create mode 100755 gr-digital/examples/narrowband/digital_bert_tx.py
 rename gr-digital/examples/{ => narrowband}/receive_path.py (100%)
 create mode 100755 gr-digital/examples/narrowband/rx_voice.py
 create mode 100644 gr-digital/examples/narrowband/transmit_path.py
 create mode 100755 gr-digital/examples/narrowband/tunnel.py
 create mode 100755 gr-digital/examples/narrowband/tx_voice.py
 rename gr-digital/examples/{ => narrowband}/uhd_interface.py (100%)
 create mode 100755 gr-digital/examples/ofdm/benchmark_add_channel.py
 create mode 100755 gr-digital/examples/ofdm/benchmark_rx.py
 create mode 100755 gr-digital/examples/ofdm/benchmark_tx.py
 rename {gnuradio-examples/python => gr-digital/examples}/ofdm/gr_plot_ofdm.py 
(100%)
 rename {gnuradio-examples/python => 
gr-digital/examples}/ofdm/ofdm_mod_demod_test.py (100%)
 rename {gnuradio-examples/python => gr-digital/examples}/ofdm/ofdm_sync.m 
(100%)
 rename {gnuradio-examples/python => gr-digital/examples}/ofdm/ofdm_sync_pn.m 
(100%)
 rename {gnuradio-examples/python => gr-digital/examples}/ofdm/plot_ofdm.m 
(100%)
 create mode 100644 gr-digital/examples/ofdm/receive_path.py
 create mode 100644 gr-digital/examples/ofdm/transmit_path.py
 create mode 100755 gr-digital/examples/ofdm/tunnel.py
 create mode 100644 gr-digital/examples/ofdm/uhd_interface.py
 delete mode 100755 gr-digital/examples/rx_voice.py
 delete mode 100644 gr-digital/examples/transmit_path.py
 delete mode 100755 gr-digital/examples/tunnel.py
 delete mode 100755 gr-digital/examples/tx_voice.py
 create mode 100644 gr-digital/grc/digital_ofdm_cyclic_prefixer.xml
 create mode 100644 gr-digital/grc/digital_ofdm_demod.xml
 create mode 100644 gr-digital/grc/digital_ofdm_frame_acquisition.xml
 create mode 100644 gr-digital/grc/digital_ofdm_insert_preamble.xml
 create mode 100644 gr-digital/grc/digital_ofdm_mod.xml
 create mode 100644 gr-digital/grc/digital_ofdm_sampler.xml
 create mode 100644 gr-digital/grc/digital_ofdm_sync_pn.xml
 create mode 100644 gr-digital/include/digital_ofdm_cyclic_prefixer.h
 create mode 100644 gr-digital/include/digital_ofdm_frame_acquisition.h
 create mode 100644 gr-digital/include/digital_ofdm_frame_sink.h
 create mode 100644 gr-digital/include/digital_ofdm_insert_preamble.h
 create mode 100644 gr-digital/include/digital_ofdm_mapper_bcv.h
 create mode 100644 gr-digital/include/digital_ofdm_sampler.h
 create mode 100644 gr-digital/lib/digital_ofdm_cyclic_prefixer.cc
 create mode 100644 gr-digital/lib/digital_ofdm_frame_acquisition.cc
 create mode 100644 gr-digital/lib/digital_ofdm_frame_sink.cc
 create mode 100644 gr-digital/lib/digital_ofdm_insert_preamble.cc
 create mode 100644 gr-digital/lib/digital_ofdm_mapper_bcv.cc
 create mode 100644 gr-digital/lib/digital_ofdm_sampler.cc
 rename gr-digital/python/{modulation_utils2.py => modulation_utils.py} (100%)
 create mode 100644 gr-digital/python/ofdm_packet_utils.py
 create mode 100644 gr-digital/python/ofdm_receiver.py
 rename {gnuradio-core/src/python/gnuradio/blks2impl => 
gr-digital/python}/ofdm_sync_fixed.py (100%)
 rename {gnuradio-core/src/python/gnuradio/blks2impl => 
gr-digital/python}/ofdm_sync_ml.py (100%)
 rename {gnuradio-core/src/python/gnuradio/blks2impl => 
gr-digital/python}/ofdm_sync_pn.py (100%)
 rename {gnuradio-core/src/python/gnuradio/blks2impl => 
gr-digital/python}/ofdm_sync_pnac.py (100%)
 delete mode 100644 gr-digital/python/psk2.py
 create mode 100755 gr-digital/python/qa_ofdm_insert_preamble.py
 create mode 100644 gr-digital/swig/digital_ofdm_cyclic_prefixer.i
 create mode 100644 gr-digital/swig/digital_ofdm_frame_acquisition.i
 create mode 100644 gr-digital/swig/digital_ofdm_frame_sink.i
 create mode 100644 gr-digital/swig/digital_ofdm_insert_preamble.i
 create mode 100644 gr-digital/swig/digital_ofdm_mapper_bcv.i
 create mode 100644 gr-digital/swig/digital_ofdm_sampler.i
 delete mode 100644 grc/blocks/blks2_ofdm_demod.xml
 delete mode 100644 grc/blocks/blks2_ofdm_mod.xml


hooks/post-receive
-- 
git://gnuradio.org/jblum



reply via email to

[Prev in Thread] Current Thread [Next in Thread]