[hamradio-commits] [gnss-sdr] 02/06: Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

Sun May 15 21:12:19 UTC 2016

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.

commit fd7512e74530be4e13439a4160206ebb2823b10a
Merge: 706c374 fd5cd42
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Thu May 12 00:35:49 2016 +0200

    Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

 docs/doxygen/images/GeneralBlockDiagram.png        | Bin 139264 -> 92901 bytes
 src/algorithms/PVT/adapters/galileo_e1_pvt.cc      |   2 +-
 src/algorithms/PVT/adapters/hybrid_pvt.cc          |  56 +++---
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc       |   4 +-
 .../PVT/gnuradio_blocks/hybrid_pvt_cc.cc           | 192 ++++++++++++++++++++-
 src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h |   8 +
 src/algorithms/PVT/libs/hybrid_ls_pvt.cc           |  42 ++---
 .../galileo_e1_pcps_8ms_ambiguous_acquisition.cc   |   7 +-
 .../galileo_e1_pcps_8ms_ambiguous_acquisition.h    |   4 +-
 .../galileo_e1_pcps_ambiguous_acquisition.cc       |   9 +-
 ...galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc |   7 +-
 .../galileo_e1_pcps_cccwsr_ambiguous_acquisition.h |   4 +-
 ...ileo_e1_pcps_quicksync_ambiguous_acquisition.cc |   7 +-
 ...lileo_e1_pcps_quicksync_ambiguous_acquisition.h |   4 +-
 .../galileo_e1_pcps_tong_ambiguous_acquisition.cc  |   7 +-
 .../galileo_e1_pcps_tong_ambiguous_acquisition.h   |   4 +-
 .../galileo_e5a_noncoherent_iq_acquisition_caf.cc  |   9 +-
 .../galileo_e5a_noncoherent_iq_acquisition_caf.h   |   4 +-
 .../adapters/gps_l1_ca_pcps_acquisition.cc         |  22 +--
 .../adapters/gps_l1_ca_pcps_acquisition.h          |   2 -
 .../gps_l1_ca_pcps_acquisition_fine_doppler.cc     |   8 +-
 .../gps_l1_ca_pcps_acquisition_fine_doppler.h      |   4 +-
 .../gps_l1_ca_pcps_assisted_acquisition.cc         |  11 +-
 .../adapters/gps_l1_ca_pcps_assisted_acquisition.h |   4 +-
 .../gps_l1_ca_pcps_multithread_acquisition.cc      |   7 +-
 .../gps_l1_ca_pcps_multithread_acquisition.h       |   4 +-
 .../adapters/gps_l1_ca_pcps_opencl_acquisition.cc  |   7 +-
 .../adapters/gps_l1_ca_pcps_opencl_acquisition.h   |   4 +-
 .../gps_l1_ca_pcps_quicksync_acquisition.cc        |   7 +-
 .../gps_l1_ca_pcps_quicksync_acquisition.h         |   4 +-
 .../adapters/gps_l1_ca_pcps_tong_acquisition.cc    |   7 +-
 .../adapters/gps_l1_ca_pcps_tong_acquisition.h     |   4 +-
 .../adapters/gps_l2_m_pcps_acquisition.cc          |  14 +-
 ...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc |  13 +-
 ...galileo_e5a_noncoherent_iq_acquisition_caf_cc.h |   9 +-
 .../galileo_pcps_8ms_acquisition_cc.cc             |  13 +-
 .../galileo_pcps_8ms_acquisition_cc.h              |  12 +-
 .../gnuradio_blocks/pcps_acquisition_cc.cc         |  10 +-
 .../pcps_acquisition_fine_doppler_cc.cc            |  13 +-
 .../pcps_acquisition_fine_doppler_cc.h             |  11 +-
 .../gnuradio_blocks/pcps_acquisition_sc.cc         |   6 +-
 .../gnuradio_blocks/pcps_acquisition_sc.h          |   3 +-
 .../pcps_assisted_acquisition_cc.cc                |  11 +-
 .../gnuradio_blocks/pcps_assisted_acquisition_cc.h |   9 +-
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc  |  17 +-
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.h   |  13 +-
 .../pcps_multithread_acquisition_cc.cc             |  11 +-
 .../pcps_multithread_acquisition_cc.h              |  11 +-
 .../gnuradio_blocks/pcps_opencl_acquisition_cc.cc  |  13 +-
 .../gnuradio_blocks/pcps_opencl_acquisition_cc.h   |  11 +-
 .../pcps_quicksync_acquisition_cc.cc               |  14 +-
 .../pcps_quicksync_acquisition_cc.h                |  11 +-
 .../gnuradio_blocks/pcps_tong_acquisition_cc.cc    |  11 +-
 .../gnuradio_blocks/pcps_tong_acquisition_cc.h     |   9 +-
 .../adapters/array_signal_conditioner.cc           |   7 +-
 .../adapters/array_signal_conditioner.h            |   4 +-
 .../conditioner/adapters/signal_conditioner.cc     |  14 +-
 .../conditioner/adapters/signal_conditioner.h      |   5 +-
 .../data_type_adapter/adapters/byte_to_short.cc    |  13 +-
 .../data_type_adapter/adapters/byte_to_short.h     |   4 +-
 .../data_type_adapter/adapters/ibyte_to_cbyte.cc   |   6 +-
 .../data_type_adapter/adapters/ibyte_to_cbyte.h    |   4 +-
 .../data_type_adapter/adapters/ibyte_to_complex.cc |  13 +-
 .../data_type_adapter/adapters/ibyte_to_complex.h  |   4 +-
 .../data_type_adapter/adapters/ibyte_to_cshort.cc  |  13 +-
 .../data_type_adapter/adapters/ibyte_to_cshort.h   |   4 +-
 .../adapters/ishort_to_complex.cc                  |  13 +-
 .../data_type_adapter/adapters/ishort_to_complex.h |   4 +-
 .../data_type_adapter/adapters/ishort_to_cshort.cc |  13 +-
 .../data_type_adapter/adapters/ishort_to_cshort.h  |   4 +-
 src/algorithms/input_filter/adapters/fir_filter.cc |   5 +-
 src/algorithms/input_filter/adapters/fir_filter.h  |   5 +-
 .../adapters/freq_xlating_fir_filter.cc            |   5 +-
 .../adapters/freq_xlating_fir_filter.h             |   4 +-
 .../adapters/galileo_e1_dll_pll_veml_tracking.cc   |   7 +-
 .../adapters/galileo_e1_dll_pll_veml_tracking.h    |   6 +-
 .../adapters/galileo_e1_tcp_connector_tracking.cc  |   7 +-
 .../adapters/galileo_e1_tcp_connector_tracking.h   |   5 +-
 .../adapters/galileo_e5a_dll_pll_tracking.cc       |   7 +-
 .../adapters/galileo_e5a_dll_pll_tracking.h        |   5 +-
 .../adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc   |   8 +-
 .../adapters/gps_l1_ca_dll_pll_c_aid_tracking.h    |   5 +-
 .../adapters/gps_l1_ca_dll_pll_tracking.cc         |   7 +-
 .../tracking/adapters/gps_l1_ca_dll_pll_tracking.h |   7 +-
 .../adapters/gps_l1_ca_dll_pll_tracking_gpu.cc     |   7 +-
 .../adapters/gps_l1_ca_dll_pll_tracking_gpu.h      |   7 +-
 .../adapters/gps_l1_ca_tcp_connector_tracking.cc   |   7 +-
 .../adapters/gps_l1_ca_tcp_connector_tracking.h    |   5 +-
 .../tracking/adapters/gps_l2_m_dll_pll_tracking.cc |   7 +-
 .../tracking/adapters/gps_l2_m_dll_pll_tracking.h  |   5 +-
 .../galileo_e1_dll_pll_veml_tracking_cc.cc         |   5 +-
 .../galileo_e1_dll_pll_veml_tracking_cc.h          |   6 -
 .../galileo_e1_tcp_connector_tracking_cc.cc        |   5 +-
 .../galileo_e1_tcp_connector_tracking_cc.h         |   8 +-
 .../galileo_e5a_dll_pll_tracking_cc.cc             |   5 +-
 .../galileo_e5a_dll_pll_tracking_cc.h              |   6 -
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc         |   5 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.h          |   6 -
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.cc         |   5 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.h          |   7 -
 .../gps_l1_ca_dll_pll_tracking_cc.cc               |   5 +-
 .../gps_l1_ca_dll_pll_tracking_cc.h                |   6 -
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.cc           |   5 +-
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.h            |  18 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.cc         |   7 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.h          |   6 -
 .../gps_l2_m_dll_pll_tracking_cc.cc                |   5 +-
 .../gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h |   7 -
 src/core/receiver/gnss_block_factory.cc            | 171 +++++++++---------
 src/core/receiver/gnss_block_factory.h             |  18 +-
 src/core/receiver/gnss_flowgraph.cc                |  10 +-
 src/tests/gnss_block/fir_filter_test.cc            |  18 +-
 .../galileo_e1_dll_pll_veml_tracking_test.cc       |   6 +-
 ...pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc |  10 +-
 ..._e1_pcps_ambiguous_acquisition_gsoc2013_test.cc |  12 +-
 ...ileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc |   6 +-
 .../galileo_e1_pcps_ambiguous_acquisition_test.cc  |  10 +-
 ...s_cccwsr_ambiguous_acquisition_gsoc2013_test.cc |  12 +-
 ...uicksync_ambiguous_acquisition_gsoc2014_test.cc |  17 +-
 ...cps_tong_ambiguous_acquisition_gsoc2013_test.cc |  12 +-
 ...e5a_pcps_acquisition_gsoc2014_gensource_test.cc |  12 +-
 src/tests/gnss_block/galileo_e5a_tracking_test.cc  |   2 +-
 src/tests/gnss_block/gnss_block_factory_test.cc    |  52 ++----
 .../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc    |   4 +-
 .../gnss_block/gps_l1_ca_pcps_acquisition_test.cc  |   7 +-
 ...a_pcps_multithread_acquisition_gsoc2013_test.cc |  13 +-
 ..._l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc |  12 +-
 ..._ca_pcps_quicksync_acquisition_gsoc2014_test.cc |  16 +-
 ...ps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc |  12 +-
 .../gnss_block/gps_l2_m_dll_pll_tracking_test.cc   |   2 +-
 src/utils/front-end-cal/main.cc                    |   9 +-
 131 files changed, 699 insertions(+), 817 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git