[hamradio-commits] [gnss-sdr] 99/126: Merge branch 'next-gnss-sdr' into new_next

[Carles Fernandez]

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 9bcea5b9cb9a7b21db679f72e5bf2f064553fd3c
Merge: 424e7ab 49523f7
Author: Javier Arribas <javiarribas at gmail.com>
Date:   Thu Dec 10 13:07:33 2015 +0100

    Merge branch 'next-gnss-sdr' into new_next
    
    Conflicts:
    	src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc

 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc       |    9 +-
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc        |    7 +-
 .../PVT/gnuradio_blocks/hybrid_pvt_cc.cc           |    9 +-
 src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc       |   38 +-
 src/algorithms/PVT/libs/geojson_printer.cc         |    5 +-
 src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc        |    2 +-
 src/algorithms/PVT/libs/hybrid_ls_pvt.cc           |   52 +-
 ...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc |   23 +-
 .../galileo_pcps_8ms_acquisition_cc.cc             |    1 +
 .../gnuradio_blocks/pcps_acquisition_cc.cc         |    6 +-
 .../pcps_acquisition_fine_doppler_cc.cc            |    6 +-
 .../pcps_assisted_acquisition_cc.cc                |    6 +-
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc  |    1 +
 .../pcps_multithread_acquisition_cc.cc             |    1 +
 .../gnuradio_blocks/pcps_opencl_acquisition_cc.cc  |    1 +
 .../pcps_quicksync_acquisition_cc.cc               |    2 +-
 .../gnuradio_blocks/pcps_tong_acquisition_cc.cc    |    1 +
 .../volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h  |   12 +-
 .../volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h   |   11 +-
 .../volk_gnsssdr_32fc_s32f_convert_8ic.h           |   11 +-
 .../gnuradio_blocks/galileo_e1_observables_cc.cc   |   47 +-
 .../gnuradio_blocks/gps_l1_ca_observables_cc.cc    |   18 +-
 .../gnuradio_blocks/hybrid_observables_cc.cc       |   13 +-
 .../gnuradio_blocks/mixed_observables_cc.cc        |   11 +-
 .../gnuradio_blocks/signal_generator_c.cc          |    9 +-
 .../gnuradio_blocks/unpack_2bit_samples.cc         |    8 +-
 .../adapters/galileo_e1b_telemetry_decoder.cc      |    6 +-
 .../adapters/galileo_e1b_telemetry_decoder.h       |    1 -
 .../adapters/galileo_e5a_telemetry_decoder.cc      |    6 +-
 .../adapters/galileo_e5a_telemetry_decoder.h       |    1 -
 .../adapters/gps_l1_ca_telemetry_decoder.cc        |    6 +-
 .../adapters/gps_l1_ca_telemetry_decoder.h         |    1 -
 .../adapters/gps_l2_m_telemetry_decoder.cc         |    6 +-
 .../adapters/gps_l2_m_telemetry_decoder.h          |    1 -
 .../adapters/sbas_l1_telemetry_decoder.cc          |    6 +-
 .../adapters/sbas_l1_telemetry_decoder.h           |    1 -
 .../galileo_e1b_telemetry_decoder_cc.cc            |   21 +-
 .../galileo_e1b_telemetry_decoder_cc.h             |   15 +-
 .../galileo_e5a_telemetry_decoder_cc.cc            |   21 +-
 .../galileo_e5a_telemetry_decoder_cc.h             |   18 +-
 .../gps_l1_ca_telemetry_decoder_cc.cc              |   23 +-
 .../gps_l1_ca_telemetry_decoder_cc.h               |   13 +-
 .../gps_l2_m_telemetry_decoder_cc.cc               |   24 +-
 .../gps_l2_m_telemetry_decoder_cc.h                |   10 +-
 .../sbas_l1_telemetry_decoder_cc.cc                |   15 +-
 .../gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h |   11 +-
 .../galileo_e1_dll_pll_veml_tracking_cc.cc         |   23 +-
 .../galileo_e1_tcp_connector_tracking_cc.cc        |    9 +-
 .../galileo_e5a_dll_pll_tracking_cc.cc             |    9 +-
 .../galileo_volk_e1_dll_pll_veml_tracking_cc.cc    |   53 +-
 .../gps_l1_ca_dll_fll_pll_tracking_cc.cc           |    9 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc         |   41 +-
 .../gps_l1_ca_dll_pll_optim_tracking_cc.cc         |   17 +-
 .../gps_l1_ca_dll_pll_tracking_cc.cc               |   34 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.cc         |    9 +-
 .../gps_l2_m_dll_pll_tracking_cc.cc                |   10 +-
 .../tracking/libs/cpu_multicorrelator.cc           |    1 +
 src/core/libs/gnss_sdr_supl_client.cc              |    2 +-
 src/core/system_parameters/gnss_satellite.cc       |    6 +
 src/core/system_parameters/rtcm.cc                 | 1899 +++++++++++++++++---
 src/core/system_parameters/rtcm.h                  |  240 ++-
 src/core/system_parameters/sbas_telemetry_data.cc  |    4 +-
 src/tests/arithmetic/tracking_loop_filter_test.cc  |   44 +-
 src/tests/formats/rtcm_test.cc                     |  196 +-
 src/tests/test_main.cc                             |    1 +
 65 files changed, 2523 insertions(+), 600 deletions(-)

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