commit-gnuradio
[Top][All Lists]
Advanced

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

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


From: git version control
Subject: [Commit-gnuradio] git://gnuradio.org/gnuradio branch, next, updated. v3.4.0-294-g492446d
Date: Fri, 2 Sep 2011 16:15:36 +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/gnuradio".

The branch, next has been updated
       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  d9955bc0ba633ebd4bb2964b656f47cd05ccd05f (commit)
       via  938eea97126e985927bc15091d3ad148ed593578 (commit)
       via  a8a9f157e738461dec3a969992b6ec7bcc0b01f0 (commit)
      from  52f9290374a64fef2ff2c0f9199166bed27fc955 (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 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

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

Summary of changes:
 config/grc_gr_trellis.m4                           |    1 +
 .../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/Makefile.am                             |    2 +-
 gr-trellis/{ => grc}/.gitignore                    |    0
 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/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   |  124 +++
 .../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 +-
 grc/blocks/Makefile.am                             |    7 -
 grc/blocks/block_tree.xml                          |    7 -
 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 --
 61 files changed, 7990 insertions(+), 1029 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/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
 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/gnuradio



reply via email to

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