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.6.2-440-g59f9e55
Date: Wed, 31 Oct 2012 21:44:13 +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  59f9e558daeb3d148a26fbb56fedc8f1dac1a5bb (commit)
       via  ac9430cd39bf12395952ca49b1966ec428fdadf3 (commit)
       via  21beb2a5dc1e589873b49836190c3caf354c86f7 (commit)
       via  9dbc8b75787e4a6d493251826c0436f9af167a6d (commit)
       via  300f7b5313ff79d9f3d9c19e109e71ee608bea86 (commit)
       via  54e947e394dcd2bbff2b49968adf7b0861f0851b (commit)
       via  0353e0b56734c62884c7fd6d3634a28bafbae74f (commit)
       via  c8b0062aeb430e9e8655014a430e5a8899278881 (commit)
       via  1c5accf1a195616f241f0a31f07e5a1847a3941d (commit)
       via  a2cbbdd98e262b29d96109be7df2d888e4fe9c28 (commit)
       via  acde17371a4bec6afb07e9c83db001aa02a618eb (commit)
       via  bffff0329827a3c89ab50e6561ae0573c46c1dac (commit)
       via  4c155b6caad4166c9dae2c49bd25215e8cba1e51 (commit)
       via  e0f8e5e72ac119c980bc33f2fad9a7b83f44ab1b (commit)
       via  4c2330d08927e6436652c1cd3f651633b6b9e2d1 (commit)
       via  43e13c6c0877930562a3d23e75bdb4db5698c466 (commit)
       via  1eb6dd37acdfb81f7a8602897ac5cb1685c532e8 (commit)
       via  11cd6d2dc3e6b3b40474a5a4495d814a7688fe0a (commit)
       via  440739593a0648f40ddaf4e6d4cd898495a9c856 (commit)
       via  0c47c920908bb8e1b42c8e2cc77346ccc9d28693 (commit)
       via  d5306ee4f6f76fd85f84b5f023917179f780d26a (commit)
       via  d67c7948339b3d243449b54fa415e0dcfbf33988 (commit)
       via  8c9a5fdb19046c3cb8d25d6b77dbac87d49d8391 (commit)
       via  7b3ca29290f97388c3006959a91c24eea1116483 (commit)
       via  0723682d4f99a8dbe379a9aed0558650a977663e (commit)
       via  502eeffa9f5ebeec092be1954efeab4992ef9796 (commit)
       via  f5bc994d85d020958d91111e82acf40262058686 (commit)
       via  bce7518ae10c2514ae6d7c6edef3166c45c80782 (commit)
       via  fce7c0c5e1b1648c03f453cff457116990268a7c (commit)
       via  970bb33df3e9dfe19d9cae49a95494b7e175644f (commit)
      from  1cd15f64cb2b53219133bcb3821f76ecd2582ff5 (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 59f9e558daeb3d148a26fbb56fedc8f1dac1a5bb
Merge: 1cd15f6 ac9430c
Author: Tom Rondeau <address@hidden>
Date:   Wed Oct 31 17:12:06 2012 -0400

    Merge branch 'master' into next
    
    Conflicts:
        gr-digital/CMakeLists.txt
        gr-digital/include/digital_additive_scrambler_bb.h
        gr-digital/include/digital_descrambler_bb.h
        gr-digital/include/digital_scrambler_bb.h
        gr-digital/lib/CMakeLists.txt
    
    Conflicts were for adding dependency on gr-analog.
    additive_scrambler_bb_impl, descrambler_bb_impl, and scrambler_bb_impl were 
update to use LFSR from gr-analog.

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

Summary of changes:
 gnuradio-core/src/lib/general/gri_control_loop.cc |   23 +
 gnuradio-core/src/lib/general/gri_control_loop.h  |   39 ++-
 gnuradio-core/src/python/build_utils.py           |    2 +-
 gr-analog/grc/analog_agc2_xx.xml                  |   70 +++
 gr-analog/grc/analog_agc_xx.xml                   |   63 +++
 gr-analog/grc/analog_block_tree.xml               |   31 ++-
 gr-analog/grc/analog_cpfsk_bc.xml                 |   37 ++
 gr-analog/grc/analog_ctcss_squelch_ff.xml         |   79 ++++
 gr-analog/grc/analog_dpll_bb.xml                  |   31 ++
 gr-analog/grc/analog_feedforward_agc_cc.xml       |   32 ++
 gr-analog/grc/analog_frequency_modulator_fc.xml   |   26 ++
 gr-analog/grc/analog_noise_source_x.xml           |   77 ++++
 gr-analog/grc/analog_phase_modulator_fc.xml       |   26 ++
 gr-analog/grc/analog_pll_carriertracking_cc.xml   |   38 ++
 gr-analog/grc/analog_pll_freqdet_cf.xml           |   38 ++
 gr-analog/grc/analog_pll_refout_cc.xml            |   38 ++
 gr-analog/grc/analog_pwr_squelch_xx.xml           |   65 +++
 gr-analog/grc/analog_quadrature_demod_cf.xml      |   26 ++
 gr-analog/grc/analog_rail_ff.xml                  |   54 +++
 gr-analog/grc/analog_sig_source_x.xml             |  104 +++++
 gr-analog/grc/analog_simple_squelch_cc.xml        |   32 ++
 gr-analog/include/analog/CMakeLists.txt           |   30 ++-
 gr-analog/include/analog/agc.h                    |  136 ++++++
 gr-analog/include/analog/agc2.h                   |  160 +++++++
 gr-analog/include/analog/agc2_cc.h                |   65 +++
 gr-analog/include/analog/agc2_ff.h                |   65 +++
 gr-analog/include/analog/agc_cc.h                 |   62 +++
 gr-analog/include/analog/agc_ff.h                 |   62 +++
 gr-analog/include/analog/cpfsk_bc.h               |   59 +++
 gr-analog/include/analog/ctcss_squelch_ff.h       |   69 +++
 gr-analog/include/analog/dpll_bb.h                |   59 +++
 gr-analog/include/analog/feedforward_agc_cc.h     |   48 ++
 gr-analog/include/analog/fmdet_cf.h               |   70 +++
 gr-analog/include/analog/frequency_modulator_fc.h |   53 +++
 gr-analog/include/analog/lfsr.h                   |  162 +++++++
 gr-analog/include/analog/noise_source_X.h.t       |   68 +++
 gr-analog/include/analog/noise_type.h             |   36 ++
 gr-analog/include/analog/phase_modulator_fc.h     |   63 +++
 gr-analog/include/analog/pll_carriertracking_cc.h |   88 ++++
 gr-analog/include/analog/pll_freqdet_cf.h         |   83 ++++
 gr-analog/include/analog/pll_refout_cc.h          |   66 +++
 gr-analog/include/analog/probe_avg_mag_sqrd_c.h   |   67 +++
 gr-analog/include/analog/probe_avg_mag_sqrd_cf.h  |   69 +++
 gr-analog/include/analog/probe_avg_mag_sqrd_f.h   |   69 +++
 gr-analog/include/analog/pwr_squelch_cc.h         |   75 +++
 gr-analog/include/analog/pwr_squelch_ff.h         |   75 +++
 gr-analog/include/analog/quadrature_demod_cf.h    |   54 +++
 gr-analog/include/analog/rail_ff.h                |   54 +++
 gr-analog/include/analog/rotator.h                |   63 +++
 gr-analog/include/analog/sig_source_X.h.t         |   75 +++
 gr-analog/include/analog/sig_source_waveform.h    |   41 ++
 gr-analog/include/analog/simple_squelch_cc.h      |   62 +++
 gr-analog/include/analog/sincos.h                 |   46 ++
 gr-analog/include/analog/squelch_base_cc.h        |   56 +++
 gr-analog/include/analog/squelch_base_ff.h        |   56 +++
 gr-analog/lib/CMakeLists.txt                      |   59 +++-
 gr-analog/lib/agc2_cc_impl.cc                     |   70 +++
 gr-analog/lib/agc2_cc_impl.h                      |   59 +++
 gr-analog/lib/agc2_ff_impl.cc                     |   71 +++
 gr-analog/lib/agc2_ff_impl.h                      |   59 +++
 gr-analog/lib/agc_cc_impl.cc                      |   66 +++
 gr-analog/lib/agc_cc_impl.h                       |   56 +++
 gr-analog/lib/agc_ff_impl.cc                      |   64 +++
 gr-analog/lib/agc_ff_impl.h                       |   56 +++
 gr-analog/lib/cpfsk_bc_impl.cc                    |   86 ++++
 gr-analog/lib/cpfsk_bc_impl.h                     |   54 +++
 gr-analog/lib/ctcss_squelch_ff_impl.cc            |  130 ++++++
 gr-analog/lib/ctcss_squelch_ff_impl.h             |   82 ++++
 gr-analog/lib/dpll_bb_impl.cc                     |   98 ++++
 gr-analog/lib/dpll_bb_impl.h                      |   58 +++
 gr-analog/lib/feedforward_agc_cc_impl.cc          |   99 ++++
 gr-analog/lib/feedforward_agc_cc_impl.h           |   49 ++
 gr-analog/lib/fmdet_cf_impl.cc                    |  129 ++++++
 gr-analog/lib/fmdet_cf_impl.h                     |   62 +++
 gr-analog/lib/frequency_modulator_fc_impl.cc      |   82 ++++
 gr-analog/lib/frequency_modulator_fc_impl.h       |   52 +++
 gr-analog/lib/noise_source_X_impl.cc.t            |  116 +++++
 gr-analog/lib/noise_source_X_impl.h.t             |   58 +++
 gr-analog/lib/phase_modulator_fc_impl.cc          |   73 +++
 gr-analog/lib/phase_modulator_fc_impl.h           |   55 +++
 gr-analog/lib/pll_carriertracking_cc_impl.cc      |  228 ++++++++++
 gr-analog/lib/pll_carriertracking_cc_impl.h       |   76 ++++
 gr-analog/lib/pll_freqdet_cf_impl.cc              |  198 ++++++++
 gr-analog/lib/pll_freqdet_cf_impl.h               |   70 +++
 gr-analog/lib/pll_refout_cc_impl.cc               |  201 +++++++++
 gr-analog/lib/pll_refout_cc_impl.h                |   69 +++
 gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc        |   91 ++++
 gr-analog/lib/probe_avg_mag_sqrd_c_impl.h         |   60 +++
 gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc       |   93 ++++
 gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h        |   60 +++
 gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc        |   92 ++++
 gr-analog/lib/probe_avg_mag_sqrd_f_impl.h         |   60 +++
 gr-analog/lib/pwr_squelch_cc_impl.cc              |   73 +++
 gr-analog/lib/pwr_squelch_cc_impl.h               |   78 ++++
 gr-analog/lib/pwr_squelch_ff_impl.cc              |   73 +++
 gr-analog/lib/pwr_squelch_ff_impl.h               |   78 ++++
 gr-analog/lib/qa_analog.cc                        |   41 ++
 gr-analog/lib/qa_analog.h                         |   38 ++
 gr-analog/lib/qa_rotator.cc                       |   81 ++++
 gr-analog/lib/qa_rotator.h                        |   45 ++
 gr-analog/lib/qa_sincos.cc                        |   75 +++
 gr-analog/lib/qa_sincos.h                         |   47 ++
 gr-analog/lib/quadrature_demod_cf_impl.cc         |   72 +++
 gr-analog/lib/quadrature_demod_cf_impl.h          |   51 +++
 gr-analog/lib/rail_ff_impl.cc                     |   91 ++++
 gr-analog/lib/rail_ff_impl.h                      |   57 +++
 gr-analog/lib/sig_source_X_impl.cc.t              |  253 +++++++++++
 gr-analog/lib/sig_source_X_impl.h.t               |   70 +++
 gr-analog/lib/simple_squelch_cc_impl.cc           |  106 +++++
 gr-analog/lib/simple_squelch_cc_impl.h            |   59 +++
 gr-analog/lib/sincos.c                            |   86 ++++
 gr-analog/lib/squelch_base_cc_impl.cc             |  140 ++++++
 gr-analog/lib/squelch_base_cc_impl.h              |   65 +++
 gr-analog/lib/squelch_base_ff_impl.cc             |  140 ++++++
 gr-analog/lib/squelch_base_ff_impl.h              |   65 +++
 gr-analog/lib/test_gr_analog.cc                   |   43 ++
 gr-analog/python/qa_agc.py                        |  495 +++++++++++++++++++++
 gr-analog/python/qa_cpfsk.py                      |   68 +++
 gr-analog/python/qa_ctcss_squelch.py              |  110 +++++
 gr-analog/python/qa_dpll.py                       |   76 ++++
 gr-analog/python/qa_fmdet.py                      |   80 ++++
 gr-analog/python/qa_frequency_modulator.py        |   56 +++
 gr-analog/python/qa_lfsr.py                       |   49 ++
 gr-analog/python/qa_noise.py                      |   52 +++
 gr-analog/python/qa_phase_modulator.py            |   58 +++
 gr-analog/python/qa_pll_carriertracking.py        |  157 +++++++
 gr-analog/python/qa_pll_freqdet.py                |  161 +++++++
 gr-analog/python/qa_pll_refout.py                 |  157 +++++++
 gr-analog/python/qa_probe_avg_mag_sqrd.py         |   98 ++++
 gr-analog/python/qa_pwr_squelch.py                |  128 ++++++
 gr-analog/python/qa_quadrature_demod.py           |   63 +++
 gr-analog/python/qa_rail_ff.py                    |   79 ++++
 gr-analog/python/qa_sig_source.py                 |  160 +++++++
 gr-analog/python/qa_simple_squelch.py             |   69 +++
 gr-analog/swig/analog_swig.i                      |  104 +++++-
 gr-digital/CMakeLists.txt                         |    1 +
 gr-digital/lib/CMakeLists.txt                     |    5 +-
 gr-digital/lib/additive_scrambler_bb_impl.h       |    4 +-
 gr-digital/lib/descrambler_bb_impl.h              |    4 +-
 gr-digital/lib/scrambler_bb_impl.h                |    4 +-
 gr-digital/swig/CMakeLists.txt                    |    1 +
 141 files changed, 10586 insertions(+), 18 deletions(-)
 create mode 100644 gr-analog/grc/analog_agc2_xx.xml
 create mode 100644 gr-analog/grc/analog_agc_xx.xml
 create mode 100644 gr-analog/grc/analog_cpfsk_bc.xml
 create mode 100644 gr-analog/grc/analog_ctcss_squelch_ff.xml
 create mode 100644 gr-analog/grc/analog_dpll_bb.xml
 create mode 100644 gr-analog/grc/analog_feedforward_agc_cc.xml
 create mode 100644 gr-analog/grc/analog_frequency_modulator_fc.xml
 create mode 100644 gr-analog/grc/analog_noise_source_x.xml
 create mode 100644 gr-analog/grc/analog_phase_modulator_fc.xml
 create mode 100644 gr-analog/grc/analog_pll_carriertracking_cc.xml
 create mode 100644 gr-analog/grc/analog_pll_freqdet_cf.xml
 create mode 100644 gr-analog/grc/analog_pll_refout_cc.xml
 create mode 100644 gr-analog/grc/analog_pwr_squelch_xx.xml
 create mode 100644 gr-analog/grc/analog_quadrature_demod_cf.xml
 create mode 100644 gr-analog/grc/analog_rail_ff.xml
 create mode 100644 gr-analog/grc/analog_sig_source_x.xml
 create mode 100644 gr-analog/grc/analog_simple_squelch_cc.xml
 create mode 100644 gr-analog/include/analog/agc.h
 create mode 100644 gr-analog/include/analog/agc2.h
 create mode 100644 gr-analog/include/analog/agc2_cc.h
 create mode 100644 gr-analog/include/analog/agc2_ff.h
 create mode 100644 gr-analog/include/analog/agc_cc.h
 create mode 100644 gr-analog/include/analog/agc_ff.h
 create mode 100644 gr-analog/include/analog/cpfsk_bc.h
 create mode 100644 gr-analog/include/analog/ctcss_squelch_ff.h
 create mode 100644 gr-analog/include/analog/dpll_bb.h
 create mode 100644 gr-analog/include/analog/feedforward_agc_cc.h
 create mode 100644 gr-analog/include/analog/fmdet_cf.h
 create mode 100644 gr-analog/include/analog/frequency_modulator_fc.h
 create mode 100644 gr-analog/include/analog/lfsr.h
 create mode 100644 gr-analog/include/analog/noise_source_X.h.t
 create mode 100644 gr-analog/include/analog/noise_type.h
 create mode 100644 gr-analog/include/analog/phase_modulator_fc.h
 create mode 100644 gr-analog/include/analog/pll_carriertracking_cc.h
 create mode 100644 gr-analog/include/analog/pll_freqdet_cf.h
 create mode 100644 gr-analog/include/analog/pll_refout_cc.h
 create mode 100644 gr-analog/include/analog/probe_avg_mag_sqrd_c.h
 create mode 100644 gr-analog/include/analog/probe_avg_mag_sqrd_cf.h
 create mode 100644 gr-analog/include/analog/probe_avg_mag_sqrd_f.h
 create mode 100644 gr-analog/include/analog/pwr_squelch_cc.h
 create mode 100644 gr-analog/include/analog/pwr_squelch_ff.h
 create mode 100644 gr-analog/include/analog/quadrature_demod_cf.h
 create mode 100644 gr-analog/include/analog/rail_ff.h
 create mode 100644 gr-analog/include/analog/rotator.h
 create mode 100644 gr-analog/include/analog/sig_source_X.h.t
 create mode 100644 gr-analog/include/analog/sig_source_waveform.h
 create mode 100644 gr-analog/include/analog/simple_squelch_cc.h
 create mode 100644 gr-analog/include/analog/sincos.h
 create mode 100644 gr-analog/include/analog/squelch_base_cc.h
 create mode 100644 gr-analog/include/analog/squelch_base_ff.h
 create mode 100644 gr-analog/lib/agc2_cc_impl.cc
 create mode 100644 gr-analog/lib/agc2_cc_impl.h
 create mode 100644 gr-analog/lib/agc2_ff_impl.cc
 create mode 100644 gr-analog/lib/agc2_ff_impl.h
 create mode 100644 gr-analog/lib/agc_cc_impl.cc
 create mode 100644 gr-analog/lib/agc_cc_impl.h
 create mode 100644 gr-analog/lib/agc_ff_impl.cc
 create mode 100644 gr-analog/lib/agc_ff_impl.h
 create mode 100644 gr-analog/lib/cpfsk_bc_impl.cc
 create mode 100644 gr-analog/lib/cpfsk_bc_impl.h
 create mode 100644 gr-analog/lib/ctcss_squelch_ff_impl.cc
 create mode 100644 gr-analog/lib/ctcss_squelch_ff_impl.h
 create mode 100644 gr-analog/lib/dpll_bb_impl.cc
 create mode 100644 gr-analog/lib/dpll_bb_impl.h
 create mode 100644 gr-analog/lib/feedforward_agc_cc_impl.cc
 create mode 100644 gr-analog/lib/feedforward_agc_cc_impl.h
 create mode 100644 gr-analog/lib/fmdet_cf_impl.cc
 create mode 100644 gr-analog/lib/fmdet_cf_impl.h
 create mode 100644 gr-analog/lib/frequency_modulator_fc_impl.cc
 create mode 100644 gr-analog/lib/frequency_modulator_fc_impl.h
 create mode 100644 gr-analog/lib/noise_source_X_impl.cc.t
 create mode 100644 gr-analog/lib/noise_source_X_impl.h.t
 create mode 100644 gr-analog/lib/phase_modulator_fc_impl.cc
 create mode 100644 gr-analog/lib/phase_modulator_fc_impl.h
 create mode 100644 gr-analog/lib/pll_carriertracking_cc_impl.cc
 create mode 100644 gr-analog/lib/pll_carriertracking_cc_impl.h
 create mode 100644 gr-analog/lib/pll_freqdet_cf_impl.cc
 create mode 100644 gr-analog/lib/pll_freqdet_cf_impl.h
 create mode 100644 gr-analog/lib/pll_refout_cc_impl.cc
 create mode 100644 gr-analog/lib/pll_refout_cc_impl.h
 create mode 100644 gr-analog/lib/probe_avg_mag_sqrd_c_impl.cc
 create mode 100644 gr-analog/lib/probe_avg_mag_sqrd_c_impl.h
 create mode 100644 gr-analog/lib/probe_avg_mag_sqrd_cf_impl.cc
 create mode 100644 gr-analog/lib/probe_avg_mag_sqrd_cf_impl.h
 create mode 100644 gr-analog/lib/probe_avg_mag_sqrd_f_impl.cc
 create mode 100644 gr-analog/lib/probe_avg_mag_sqrd_f_impl.h
 create mode 100644 gr-analog/lib/pwr_squelch_cc_impl.cc
 create mode 100644 gr-analog/lib/pwr_squelch_cc_impl.h
 create mode 100644 gr-analog/lib/pwr_squelch_ff_impl.cc
 create mode 100644 gr-analog/lib/pwr_squelch_ff_impl.h
 create mode 100644 gr-analog/lib/qa_analog.cc
 create mode 100644 gr-analog/lib/qa_analog.h
 create mode 100644 gr-analog/lib/qa_rotator.cc
 create mode 100644 gr-analog/lib/qa_rotator.h
 create mode 100644 gr-analog/lib/qa_sincos.cc
 create mode 100644 gr-analog/lib/qa_sincos.h
 create mode 100644 gr-analog/lib/quadrature_demod_cf_impl.cc
 create mode 100644 gr-analog/lib/quadrature_demod_cf_impl.h
 create mode 100644 gr-analog/lib/rail_ff_impl.cc
 create mode 100644 gr-analog/lib/rail_ff_impl.h
 create mode 100644 gr-analog/lib/sig_source_X_impl.cc.t
 create mode 100644 gr-analog/lib/sig_source_X_impl.h.t
 create mode 100644 gr-analog/lib/simple_squelch_cc_impl.cc
 create mode 100644 gr-analog/lib/simple_squelch_cc_impl.h
 create mode 100644 gr-analog/lib/sincos.c
 create mode 100644 gr-analog/lib/squelch_base_cc_impl.cc
 create mode 100644 gr-analog/lib/squelch_base_cc_impl.h
 create mode 100644 gr-analog/lib/squelch_base_ff_impl.cc
 create mode 100644 gr-analog/lib/squelch_base_ff_impl.h
 create mode 100644 gr-analog/lib/test_gr_analog.cc
 create mode 100755 gr-analog/python/qa_agc.py
 create mode 100755 gr-analog/python/qa_cpfsk.py
 create mode 100755 gr-analog/python/qa_ctcss_squelch.py
 create mode 100755 gr-analog/python/qa_dpll.py
 create mode 100755 gr-analog/python/qa_fmdet.py
 create mode 100755 gr-analog/python/qa_frequency_modulator.py
 create mode 100755 gr-analog/python/qa_lfsr.py
 create mode 100755 gr-analog/python/qa_noise.py
 create mode 100755 gr-analog/python/qa_phase_modulator.py
 create mode 100755 gr-analog/python/qa_pll_carriertracking.py
 create mode 100755 gr-analog/python/qa_pll_freqdet.py
 create mode 100755 gr-analog/python/qa_pll_refout.py
 create mode 100755 gr-analog/python/qa_probe_avg_mag_sqrd.py
 create mode 100755 gr-analog/python/qa_pwr_squelch.py
 create mode 100755 gr-analog/python/qa_quadrature_demod.py
 create mode 100755 gr-analog/python/qa_rail_ff.py
 create mode 100755 gr-analog/python/qa_sig_source.py
 create mode 100755 gr-analog/python/qa_simple_squelch.py


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



reply via email to

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