[hamradio-commits] [gnss-sdr] 207/236: Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into 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 0f2a08f49d83562b17f7c71d02075a093a7c7f04
Merge: cb8dd1c 60b6b98
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Apr 22 18:41:24 2016 +0200

    Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.

 conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf       | 105 ++--
 conf/gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf   | 339 ------------
 conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf           | 263 +--------
 ...tichannel_GPS_L1_Flexiband_bin_file_III_1a.conf |  66 +--
 ...ltichannel_GPS_L1_Flexiband_realtime_II_3b.conf |  50 +-
 ...1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf |  70 +--
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1a.conf | 440 ---------------
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1b.conf | 327 ++---------
 ...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc |   1 +
 .../galileo_pcps_8ms_acquisition_cc.cc             |   1 +
 .../gnuradio_blocks/pcps_acquisition_cc.cc         |   5 -
 .../pcps_acquisition_fine_doppler_cc.cc            |   1 +
 .../gnuradio_blocks/pcps_acquisition_sc.cc         |   1 +
 .../pcps_assisted_acquisition_cc.cc                |   1 +
 .../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               |   3 +-
 .../gnuradio_blocks/pcps_tong_acquisition_cc.cc    |   1 +
 src/algorithms/channel/adapters/channel.cc         |   3 +-
 src/algorithms/channel/libs/CMakeLists.txt         |   3 +
 src/algorithms/channel/libs/channel_fsm.cc         |  15 +-
 src/algorithms/observables/adapters/CMakeLists.txt |   1 -
 .../observables/adapters/mixed_observables.cc      |  89 ---
 .../observables/adapters/mixed_observables.h       |  88 ---
 .../observables/gnuradio_blocks/CMakeLists.txt     |   1 -
 .../gnuradio_blocks/mixed_observables_cc.cc        | 221 --------
 .../gnuradio_blocks/mixed_observables_cc.h         |  70 ---
 .../galileo_e1b_telemetry_decoder_cc.cc            |   2 -
 .../gps_l1_ca_telemetry_decoder_cc.cc              | 425 ++++++++-------
 .../gps_l1_ca_telemetry_decoder_cc.h               |   2 +-
 .../gps_l2_m_telemetry_decoder_cc.cc               |  13 +-
 .../galileo_e1_dll_pll_veml_tracking_cc.cc         |   9 +-
 .../galileo_e1_tcp_connector_tracking_cc.cc        |   9 +-
 .../galileo_e5a_dll_pll_tracking_cc.cc             |  14 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc         |   9 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.cc         |   7 +-
 .../gps_l1_ca_dll_pll_tracking_cc.cc               |   9 +-
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.cc           |   7 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.cc         |   6 +-
 .../gps_l2_m_dll_pll_tracking_cc.cc                |   7 +-
 src/core/receiver/gnss_block_factory.cc            | 604 ++++-----------------
 src/core/receiver/gnss_block_factory.h             |   9 -
 src/core/receiver/gnss_flowgraph.cc                |  67 +--
 src/core/system_parameters/gnss_signal.cc          |   4 +
 src/core/system_parameters/gnss_signal.h           |   1 +
 src/tests/CMakeLists.txt                           |   1 +
 src/utils/front-end-cal/CMakeLists.txt             |  34 +-
 48 files changed, 644 insertions(+), 2763 deletions(-)

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