[Commit-gnuradio] git://gnuradio.org/jblum branch, digital, updated. b06328b4adee941fe62f12a848cc903097711bdd

[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, digital has been updated
       via  b06328b4adee941fe62f12a848cc903097711bdd (commit)
       via  3e8c3125da6234c4d1f8c0eaf869bc86923cb292 (commit)
       via  199487167956a6149d1a895397b72d2525b39742 (commit)
       via  b6cd070a9b6422672409bfb43232db265a31998b (commit)
       via  12b5f9c37eebe694d34e0d3976393dad1e0f99d5 (commit)
       via  4fec8eba2eb3d362319c8e09bf370edaa10cd1b9 (commit)
       via  e3b56bfd879f16c2fa1f284f330ed3df6a211ec1 (commit)
       via  77f5aa4f1985e0605b5ed07994a2af7dac2d2a8d (commit)
       via  79e7183bda0e3850c79dee7f086a8676311607fa (commit)
       via  440488461ae86754e24fb576b5a9e54a94ae11f4 (commit)
       via  7d8aa3f5d03ce72188bd443573a107c470928d9f (commit)
       via  461725e514dcf5e2f7fa3e83249467ef28766869 (commit)
       via  924479da09f02241d4fdc51429605f696c305ff5 (commit)
       via  a39ad83b38b67235baeda2f3c98d1f5b7723fe90 (commit)
      from  3f7db0afa99caeecb18428d7514dadd380d88d56 (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 b06328b4adee941fe62f12a848cc903097711bdd
Merge: 3f7db0a 3e8c312
Author: Josh Blum <address@hidden>
Date:   Wed Sep 28 22:59:51 2011 -0700

    Merge branch 'digital' of https://github.com/trondeau/gnuradio into digital
    
    Conflicts:
        gr-digital/lib/Makefile.am
        gr-digital/python/__init__.py

commit 3e8c3125da6234c4d1f8c0eaf869bc86923cb292
Author: Tom Rondeau <address@hidden>
Date:   Tue Sep 27 17:13:05 2011 -0400

    digital: fixed differential/non-differential. Defaults to differential now, 
too.

commit 199487167956a6149d1a895397b72d2525b39742
Author: Tom Rondeau <address@hidden>
Date:   Tue Sep 27 16:59:41 2011 -0400

    digital: fixed up benchmark codes to handle receive, too. Over-the-air 
tests worked.

commit b6cd070a9b6422672409bfb43232db265a31998b
Author: Tom Rondeau <address@hidden>
Date:   Tue Sep 27 16:59:04 2011 -0400

    digital: making a parent class for the UHD interface since most of the 
functions are duplicated between receiver and transmitter. Made a receiver 
interface, too.

commit 12b5f9c37eebe694d34e0d3976393dad1e0f99d5
Author: Tom Rondeau <address@hidden>
Date:   Tue Sep 27 12:55:26 2011 -0400

    digital: bug fixes for digital mods. Adding fist pass at a UHD benchmark 
transit chain. Automatically selects the right samples/symbol and sample rate 
to achieve requested bitrate.

commit 4fec8eba2eb3d362319c8e09bf370edaa10cd1b9
Merge: 79e7183 e3b56bf
Author: Tom Rondeau <address@hidden>
Date:   Mon Sep 26 23:23:14 2011 -0400

    Merge branch 'next' into digital
    
    Conflicts:
        gnuradio-core/src/lib/general/general.i
        gnuradio-core/src/lib/general/gr_pll_carriertracking_cc.cc
        gnuradio-core/src/lib/general/gr_pll_freqdet_cf.cc
        gnuradio-core/src/lib/general/gr_pll_refout_cc.cc
        gnuradio-core/src/python/gnuradio/gr/qa_pll_carriertracking.py
        gnuradio-core/src/python/gnuradio/gr/qa_pll_freqdet.py
        gnuradio-core/src/python/gnuradio/gr/qa_pll_refout.py
        gr-digital/lib/digital_constellation_receiver_cb.cc
        gr-digital/python/Makefile.am
        gr-digital/python/__init__.py
        gr-digital/python/generic_mod_demod.py
        gr-digital/python/pkt.py
        gr-digital/python/psk2.py
        gr-digital/python/qam.py

commit e3b56bfd879f16c2fa1f284f330ed3df6a211ec1
Merge: 18201a6 77f5aa4
Author: Tom Rondeau <address@hidden>
Date:   Mon Sep 26 21:25:26 2011 -0400

    Merge branch 'master' into next

commit 77f5aa4f1985e0605b5ed07994a2af7dac2d2a8d
Author: Tom Rondeau <address@hidden>
Date:   Mon Sep 26 17:57:01 2011 -0400

    docs: fix Doxygen so it gets all generated files in builddir if this is 
different than srcdir.

commit 79e7183bda0e3850c79dee7f086a8676311607fa
Author: Tom Rondeau <address@hidden>
Date:   Mon Sep 26 16:16:54 2011 -0400

    digital: removed hier directory

commit 440488461ae86754e24fb576b5a9e54a94ae11f4
Merge: 7d8aa3f a6890ef
Author: Tom Rondeau <address@hidden>
Date:   Mon Sep 26 16:16:03 2011 -0400

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

commit 7d8aa3f5d03ce72188bd443573a107c470928d9f
Author: Tom Rondeau <address@hidden>
Date:   Mon Sep 26 16:14:58 2011 -0400

    digital: removed hier directory in gr-digital; put c++ hier blocks into 
lib/include/swig.

commit 461725e514dcf5e2f7fa3e83249467ef28766869
Author: Tom Rondeau <address@hidden>
Date:   Mon Sep 26 14:59:01 2011 -0400

    digital: moved header files from lib to include in gr-digital.

commit 924479da09f02241d4fdc51429605f696c305ff5
Author: Tom Rondeau <address@hidden>
Date:   Mon Sep 26 14:58:16 2011 -0400

    digital: updated build files for new gr-digital/include directory.

commit a39ad83b38b67235baeda2f3c98d1f5b7723fe90
Author: Tom Rondeau <address@hidden>
Date:   Mon Sep 26 13:54:36 2011 -0400

    digital: adding include directory for public header files.

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

Summary of changes:
 config/grc_gr_digital.m4                           |    5 +-
 docs/doxygen/Doxyfile.in                           |    2 +-
 gr-digital/CMakeLists.txt                          |    5 +-
 gr-digital/Makefile.am                             |    2 +-
 gr-digital/examples/Makefile.am                    |    1 +
 gr-digital/examples/benchmark_rx.py                |   24 ++-
 gr-digital/examples/benchmark_tx.py                |   26 ++-
 gr-digital/examples/receive_path.py                |   15 +-
 gr-digital/examples/transmit_path.py               |   15 +-
 gr-digital/examples/uhd_interface.py               |  215 ++++++++++++++++++++
 gr-digital/{hier => include}/.gitignore            |    0
 gr-digital/{hier => include}/CMakeLists.txt        |   37 ++--
 gr-digital/{hier => include}/Makefile.am           |   35 ++--
 gr-digital/{lib => include}/digital_api.h          |    0
 .../{lib => include}/digital_binary_slicer_fb.h    |    0
 .../digital_clock_recovery_mm_cc.h                 |    0
 .../digital_clock_recovery_mm_ff.h                 |    0
 .../{lib => include}/digital_cma_equalizer_cc.h    |    0
 .../{lib => include}/digital_constellation.h       |    0
 .../digital_constellation_decoder_cb.h             |    0
 .../digital_constellation_receiver_cb.h            |    0
 .../digital_correlate_access_code_bb.h             |    0
 .../{lib => include}/digital_costas_loop_cc.h      |    0
 gr-digital/{hier => include}/digital_cpmmod_bc.h   |    0
 gr-digital/{lib => include}/digital_crc32.h        |    0
 .../{lib => include}/digital_fll_band_edge_cc.h    |    0
 gr-digital/{hier => include}/digital_gmskmod_bc.h  |    0
 .../digital_kurtotic_equalizer_cc.h                |    0
 .../{lib => include}/digital_lms_dd_equalizer_cc.h |    0
 gr-digital/{lib => include}/digital_metric_type.h  |    0
 .../{lib => include}/digital_mpsk_receiver_cc.h    |    0
 gr-digital/lib/CMakeLists.txt                      |   26 +---
 gr-digital/lib/Makefile.am                         |   29 +--
 gr-digital/{hier => lib}/digital_cpmmod_bc.cc      |    0
 gr-digital/{hier => lib}/digital_gmskmod_bc.cc     |    0
 gr-digital/python/__init__.py                      |    3 +-
 gr-digital/python/generic_mod_demod.py             |   14 +-
 gr-digital/python/pkt.py                           |   33 +---
 gr-digital/swig/CMakeLists.txt                     |    3 +-
 gr-digital/swig/Makefile.am                        |    8 +-
 gr-digital/swig/Makefile.swig.gen                  |  147 -------------
 gr-digital/{hier => swig}/_digital_hier.i          |    0
 gr-digital/{hier => swig}/digital_cpmmod_bc.i      |    0
 gr-digital/{hier => swig}/digital_gmskmod_bc.i     |    0
 gr-digital/swig/digital_hier.i                     |   40 ----
 gr-digital/swig/digital_swig.i                     |    5 +-
 gr-trellis/src/lib/Makefile.am                     |    8 +-
 47 files changed, 343 insertions(+), 355 deletions(-)
 create mode 100644 gr-digital/examples/uhd_interface.py
 rename gr-digital/{hier => include}/.gitignore (100%)
 rename gr-digital/{hier => include}/CMakeLists.txt (63%)
 rename gr-digital/{hier => include}/Makefile.am (55%)
 rename gr-digital/{lib => include}/digital_api.h (100%)
 rename gr-digital/{lib => include}/digital_binary_slicer_fb.h (100%)
 rename gr-digital/{lib => include}/digital_clock_recovery_mm_cc.h (100%)
 rename gr-digital/{lib => include}/digital_clock_recovery_mm_ff.h (100%)
 rename gr-digital/{lib => include}/digital_cma_equalizer_cc.h (100%)
 rename gr-digital/{lib => include}/digital_constellation.h (100%)
 rename gr-digital/{lib => include}/digital_constellation_decoder_cb.h (100%)
 rename gr-digital/{lib => include}/digital_constellation_receiver_cb.h (100%)
 rename gr-digital/{lib => include}/digital_correlate_access_code_bb.h (100%)
 rename gr-digital/{lib => include}/digital_costas_loop_cc.h (100%)
 rename gr-digital/{hier => include}/digital_cpmmod_bc.h (100%)
 rename gr-digital/{lib => include}/digital_crc32.h (100%)
 rename gr-digital/{lib => include}/digital_fll_band_edge_cc.h (100%)
 rename gr-digital/{hier => include}/digital_gmskmod_bc.h (100%)
 rename gr-digital/{lib => include}/digital_kurtotic_equalizer_cc.h (100%)
 rename gr-digital/{lib => include}/digital_lms_dd_equalizer_cc.h (100%)
 rename gr-digital/{lib => include}/digital_metric_type.h (100%)
 rename gr-digital/{lib => include}/digital_mpsk_receiver_cc.h (100%)
 rename gr-digital/{hier => lib}/digital_cpmmod_bc.cc (100%)
 rename gr-digital/{hier => lib}/digital_gmskmod_bc.cc (100%)
 rename gr-digital/{hier => swig}/_digital_hier.i (100%)
 rename gr-digital/{hier => swig}/digital_cpmmod_bc.i (100%)
 rename gr-digital/{hier => swig}/digital_gmskmod_bc.i (100%)
 delete mode 100644 gr-digital/swig/digital_hier.i


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