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

[git version control]

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  ca86c6f82d81bbc57bfe898afb8489a419ddbe63 (commit)
       via  492446d2ec6ed85d6437bb35caf4700b02930147 (commit)
       via  0f43bdb085f98e1182dbd940db9ed1fb52119186 (commit)
       via  02a32461e2f625f02ecbbe41354d59bf8dd5452b (commit)
       via  19d1206555052d8d8deb2e625d465e955637e510 (commit)
       via  ceb1aae53c56e64cb7f3ad7c1ae42a6d68d909ef (commit)
       via  30618d2fcaefacfd3d2fc904405630a1ce482fe3 (commit)
       via  238029328976662d88d5444ff4b9c1521b360e1b (commit)
       via  8f6be2790220af5b4628de7daee3be4b494e3b3e (commit)
       via  52f9290374a64fef2ff2c0f9199166bed27fc955 (commit)
       via  772518ceb9cebefb8bb8ecc9edd63570f38de514 (commit)
       via  67ac7a2420eedb7221384b560fbc57efe6115eb8 (commit)
       via  54881f8803d4f796dde2af031e6f1a37df9445f1 (commit)
       via  2edf5df55faf494e54fe8ddc5e23d0b767cd82e4 (commit)
       via  64bb30a80b931f3816a2998adfd1e9623d076654 (commit)
       via  50cde24aea52d66d69313a490f7eab78a5085849 (commit)
       via  20e992b24ee70e515f08e8c5c2386c054141890f (commit)
       via  79158bb4f97b2f71a77351edcdfbfe0f9005c4bd (commit)
       via  f4cc7884c608a7ec1969e68b73e12cdbcc26145c (commit)
       via  d9955bc0ba633ebd4bb2964b656f47cd05ccd05f (commit)
       via  938eea97126e985927bc15091d3ad148ed593578 (commit)
       via  a8a9f157e738461dec3a969992b6ec7bcc0b01f0 (commit)
      from  0ea25051b5126d9761e49ceeb0e5d76aaecd2ca3 (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 ca86c6f82d81bbc57bfe898afb8489a419ddbe63
Merge: 0ea2505 492446d
Author: Josh Blum <address@hidden>
Date:   Mon Sep 5 21:15:49 2011 -0700

    Merge branch 'next' of gnuradio.org:gnuradio into next
    
    Conflicts:
        gr-trellis/src/lib/trellis_permutation.h

commit 492446d2ec6ed85d6437bb35caf4700b02930147
Merge: 52f9290 0f43bdb
Author: Tom Rondeau <address@hidden>
Date:   Fri Sep 2 12:15:24 2011 -0400

    Merge branch 'master' into next
    
    * master:
      Minor fixes in turbo GRC blocks
      Minor fixes in turbo GRC blocks and one more example added.
      Added pccc combined turbo decoder and corresponding GRC block
      More examples and turbo decoder blocks added.
      Added more turbo encoder/decoder blocks and examples.
      Added SCCC encoder/decoder grc blocksi and examples. Also moved all grc 
blocks related to trellis inside the gr-trellis/grc directory
      added grc directory in gr-trellis
      updated Makefile.am and block_tree.xml to reflect changes in grc file for 
gr-trellis
      Moved grc files from grc/block to gr-trellis/grc

commit 0f43bdb085f98e1182dbd940db9ed1fb52119186
Merge: 772518c 02a3246
Author: Tom Rondeau <address@hidden>
Date:   Fri Sep 2 12:14:57 2011 -0400

    Merge branch 'turbo'

commit 02a32461e2f625f02ecbbe41354d59bf8dd5452b
Author: Achilleas Anastasopoulos <address@hidden>
Date:   Thu Sep 1 17:33:53 2011 -0400

    Minor fixes in turbo GRC blocks

commit 19d1206555052d8d8deb2e625d465e955637e510
Author: Achilleas Anastasopoulos <address@hidden>
Date:   Thu Sep 1 16:47:45 2011 -0400

    Minor fixes in turbo GRC blocks and one more example added.

commit ceb1aae53c56e64cb7f3ad7c1ae42a6d68d909ef
Author: Achilleas Anastasopoulos <address@hidden>
Date:   Wed Aug 31 23:01:56 2011 -0400

    Added pccc combined turbo decoder and corresponding GRC block

commit 30618d2fcaefacfd3d2fc904405630a1ce482fe3
Author: Achilleas Anastasopoulos <address@hidden>
Date:   Wed Aug 31 20:42:22 2011 -0400

    More examples and turbo decoder blocks added.

commit 238029328976662d88d5444ff4b9c1521b360e1b
Author: Achilleas Anastasopoulos <address@hidden>
Date:   Wed Aug 31 20:10:06 2011 -0400

    Added more turbo encoder/decoder blocks and examples.

commit 8f6be2790220af5b4628de7daee3be4b494e3b3e
Author: Achilleas Anastasopoulos <address@hidden>
Date:   Wed Aug 31 19:35:58 2011 -0400

    Added SCCC encoder/decoder grc blocksi and examples. Also moved all grc 
blocks related to trellis inside the gr-trellis/grc directory

commit 52f9290374a64fef2ff2c0f9199166bed27fc955
Merge: 64bb30a 772518c
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 30 10:21:36 2011 -0400

    Merge branch 'master' into next

commit 772518ceb9cebefb8bb8ecc9edd63570f38de514
Merge: 54881f8 67ac7a2
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 30 09:59:20 2011 -0400

    Merge branch 'maint'

commit 67ac7a2420eedb7221384b560fbc57efe6115eb8
Author: Tom Rondeau <address@hidden>
Date:   Tue Aug 30 09:59:08 2011 -0400

    GRC: fixed error in XML format; need to declare XML type first.

commit 54881f8803d4f796dde2af031e6f1a37df9445f1
Merge: 50cde24 f4cc788
Author: Tom Rondeau <address@hidden>
Date:   Sat Aug 27 16:44:32 2011 -0400

    Merge branch 'master' of gnuradio.org:gnuradio

commit 2edf5df55faf494e54fe8ddc5e23d0b767cd82e4
Merge: 20e992b 6f79b8b
Author: Tom Rondeau <address@hidden>
Date:   Sat Aug 27 16:44:15 2011 -0400

    Merge branch 'maint' of gnuradio.org:gnuradio into maint

commit 64bb30a80b931f3816a2998adfd1e9623d076654
Merge: 79158bb 50cde24
Author: Tom Rondeau <address@hidden>
Date:   Sat Aug 27 16:43:56 2011 -0400

    Merge branch 'master' into next

commit 50cde24aea52d66d69313a490f7eab78a5085849
Merge: 081497e 20e992b
Author: Tom Rondeau <address@hidden>
Date:   Sat Aug 27 16:41:41 2011 -0400

    Merge branch 'maint'

commit 20e992b24ee70e515f08e8c5c2386c054141890f
Author: Tom Rondeau <address@hidden>
Date:   Sat Aug 27 16:15:00 2011 -0400

    grc: adding ctcss squelch block to GRC.

commit 79158bb4f97b2f71a77351edcdfbfe0f9005c4bd
Merge: a80d01b f4cc788
Author: Johnathan Corgan <address@hidden>
Date:   Mon Aug 22 11:52:35 2011 -0700

    Merge branch 'master' into next

commit f4cc7884c608a7ec1969e68b73e12cdbcc26145c
Author: Thomas Tsou <address@hidden>
Date:   Mon Aug 22 11:34:57 2011 -0700

    gr-uhd: readd displaced alias for single_usrp_sink
    
    Insert alias for single_usrp_sink mistakenly removed in
    
    Commit 893f946b "gr-uhd: add async metadata source block"

commit d9955bc0ba633ebd4bb2964b656f47cd05ccd05f
Author: Achilleas Anastasopoulos <address@hidden>
Date:   Mon Jun 13 18:38:03 2011 -0400

    added grc directory in gr-trellis

commit 938eea97126e985927bc15091d3ad148ed593578
Author: Achilleas Anastasopoulos <address@hidden>
Date:   Sun Jun 12 17:07:02 2011 -0400

    updated Makefile.am and block_tree.xml to reflect changes in
    grc file for gr-trellis

commit a8a9f157e738461dec3a969992b6ec7bcc0b01f0
Author: Achilleas Anastasopoulos <address@hidden>
Date:   Sun Jun 12 17:05:46 2011 -0400

    Moved grc files from grc/block to gr-trellis/grc

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

Summary of changes:
 config/grc_gr_trellis.m4                           |    1 +
 gnuradio-core/CMakeLists.txt                       |    8 +-
 .../grc/trellis/interference_cancellation.grc      |  763 ++++++++++--------
 gnuradio-examples/grc/trellis/pccc.grc             |  832 +++++++++++++++++++
 gnuradio-examples/grc/trellis/pccc1.grc            |  857 ++++++++++++++++++++
 gnuradio-examples/grc/trellis/readme.txt           |   18 +-
 gnuradio-examples/grc/trellis/sccc.grc             |  832 +++++++++++++++++++
 gnuradio-examples/grc/trellis/sccc1.grc            |  857 ++++++++++++++++++++
 gr-trellis/CMakeLists.txt                          |    3 +-
 gr-trellis/Makefile.am                             |    2 +-
 gr-trellis/{ => grc}/.gitignore                    |    0
 gr-trellis/grc/CMakeLists.txt                      |   36 +
 gr-trellis/grc/Makefile.am                         |   39 +
 gr-trellis/grc/trellis_encoder_xx.xml              |   77 ++
 gr-trellis/grc/trellis_metrics_x.xml               |   88 ++
 .../grc/trellis_pccc_decoder_combined_xx.xml       |  170 ++++
 gr-trellis/grc/trellis_pccc_decoder_x.xml          |  117 +++
 gr-trellis/grc/trellis_pccc_encoder_xx.xml         |   98 +++
 gr-trellis/grc/trellis_permutation.xml             |   81 ++
 .../grc/trellis_sccc_decoder_combined_xx.xml       |  170 ++++
 gr-trellis/grc/trellis_sccc_decoder_x.xml          |  117 +++
 gr-trellis/grc/trellis_sccc_encoder_xx.xml         |   98 +++
 gr-trellis/grc/trellis_siso_combined_f.xml         |  115 +++
 gr-trellis/grc/trellis_siso_f.xml                  |   88 ++
 gr-trellis/grc/trellis_viterbi_combined_xx.xml     |  126 +++
 gr-trellis/grc/trellis_viterbi_x.xml               |   69 ++
 gr-trellis/src/lib/CMakeLists.txt                  |    3 +
 gr-trellis/src/lib/Makefile.am                     |   23 +-
 gr-trellis/src/lib/Makefile.gen                    |   18 +
 gr-trellis/src/lib/core_algorithms.cc              |  246 +++++-
 gr-trellis/src/lib/core_algorithms.h               |   36 +-
 gr-trellis/src/lib/generate_trellis.py             |    6 +-
 .../src/lib/trellis_pccc_decoder_combined_XX.cc.t  |  147 ++++
 .../src/lib/trellis_pccc_decoder_combined_XX.h.t   |  125 +++
 .../src/lib/trellis_pccc_decoder_combined_XX.i.t   |   73 ++
 .../src/lib/trellis_pccc_decoder_combined_cb.cc    |  147 ++++
 .../src/lib/trellis_pccc_decoder_combined_cb.h     |  124 +++
 .../src/lib/trellis_pccc_decoder_combined_cb.i     |   73 ++
 .../src/lib/trellis_pccc_decoder_combined_ci.cc    |  147 ++++
 .../src/lib/trellis_pccc_decoder_combined_ci.h     |  124 +++
 .../src/lib/trellis_pccc_decoder_combined_ci.i     |   73 ++
 .../src/lib/trellis_pccc_decoder_combined_cs.cc    |  147 ++++
 .../src/lib/trellis_pccc_decoder_combined_cs.h     |  124 +++
 .../src/lib/trellis_pccc_decoder_combined_cs.i     |   73 ++
 .../src/lib/trellis_pccc_decoder_combined_fb.cc    |  147 ++++
 .../src/lib/trellis_pccc_decoder_combined_fb.h     |  124 +++
 .../src/lib/trellis_pccc_decoder_combined_fb.i     |   73 ++
 .../src/lib/trellis_pccc_decoder_combined_fi.cc    |  147 ++++
 .../src/lib/trellis_pccc_decoder_combined_fi.h     |  124 +++
 .../src/lib/trellis_pccc_decoder_combined_fi.i     |   73 ++
 .../src/lib/trellis_pccc_decoder_combined_fs.cc    |  147 ++++
 .../src/lib/trellis_pccc_decoder_combined_fs.h     |  124 +++
 .../src/lib/trellis_pccc_decoder_combined_fs.i     |   73 ++
 gr-trellis/src/lib/trellis_permutation.cc          |   18 +-
 gr-trellis/src/lib/trellis_permutation.h           |    8 +-
 gr-trellis/src/lib/trellis_permutation.i           |    8 +-
 gr-uhd/swig/__init__.py                            |    1 +
 grc/blocks/Makefile.am                             |    8 +-
 grc/blocks/block_tree.xml                          |    8 +-
 grc/blocks/gr_ctcss_squelch_ff.xml                 |   79 ++
 grc/blocks/trellis_encoder_xx.xml                  |   74 --
 grc/blocks/trellis_metrics_x.xml                   |   85 --
 grc/blocks/trellis_permutation.xml                 |   74 --
 grc/blocks/trellis_siso_combined_f.xml             |  112 ---
 grc/blocks/trellis_siso_f.xml                      |   85 --
 grc/blocks/trellis_viterbi_combined_xx.xml         |  123 ---
 grc/blocks/trellis_viterbi_x.xml                   |   66 --
 67 files changed, 8118 insertions(+), 1034 deletions(-)
 create mode 100644 gnuradio-examples/grc/trellis/pccc.grc
 create mode 100644 gnuradio-examples/grc/trellis/pccc1.grc
 create mode 100644 gnuradio-examples/grc/trellis/sccc.grc
 create mode 100644 gnuradio-examples/grc/trellis/sccc1.grc
 copy gr-trellis/{ => grc}/.gitignore (100%)
 create mode 100644 gr-trellis/grc/CMakeLists.txt
 create mode 100644 gr-trellis/grc/Makefile.am
 create mode 100644 gr-trellis/grc/trellis_encoder_xx.xml
 create mode 100644 gr-trellis/grc/trellis_metrics_x.xml
 create mode 100644 gr-trellis/grc/trellis_pccc_decoder_combined_xx.xml
 create mode 100644 gr-trellis/grc/trellis_pccc_decoder_x.xml
 create mode 100644 gr-trellis/grc/trellis_pccc_encoder_xx.xml
 create mode 100644 gr-trellis/grc/trellis_permutation.xml
 create mode 100644 gr-trellis/grc/trellis_sccc_decoder_combined_xx.xml
 create mode 100644 gr-trellis/grc/trellis_sccc_decoder_x.xml
 create mode 100644 gr-trellis/grc/trellis_sccc_encoder_xx.xml
 create mode 100644 gr-trellis/grc/trellis_siso_combined_f.xml
 create mode 100644 gr-trellis/grc/trellis_siso_f.xml
 create mode 100644 gr-trellis/grc/trellis_viterbi_combined_xx.xml
 create mode 100644 gr-trellis/grc/trellis_viterbi_x.xml
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.cc.t
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.h.t
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_XX.i.t
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_cb.cc
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_cb.h
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_cb.i
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_ci.cc
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_ci.h
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_ci.i
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_cs.cc
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_cs.h
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_cs.i
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_fb.cc
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_fb.h
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_fb.i
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_fi.cc
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_fi.h
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_fi.i
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_fs.cc
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_fs.h
 create mode 100644 gr-trellis/src/lib/trellis_pccc_decoder_combined_fs.i
 create mode 100644 grc/blocks/gr_ctcss_squelch_ff.xml
 delete mode 100644 grc/blocks/trellis_encoder_xx.xml
 delete mode 100644 grc/blocks/trellis_metrics_x.xml
 delete mode 100644 grc/blocks/trellis_permutation.xml
 delete mode 100644 grc/blocks/trellis_siso_combined_f.xml
 delete mode 100644 grc/blocks/trellis_siso_f.xml
 delete mode 100644 grc/blocks/trellis_viterbi_combined_xx.xml
 delete mode 100644 grc/blocks/trellis_viterbi_x.xml


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