[hamradio-commits] [gnss-sdr] 06/251: Merge branch 'next' into arribas_next

[Carles Fernandez]

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

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

commit e72a743e22f1ef9294b96716837d713f573bc825
Merge: 1ce175f a97d987
Author: Javier <jarribas at cttc.es>
Date:   Wed Apr 22 17:34:19 2015 +0200

    Merge branch 'next' into arribas_next
    
    Conflicts:
    	src/algorithms/signal_source/adapters/uhd_signal_source.cc
    	src/core/receiver/gnss_flowgraph.cc

 CMakeLists.txt                                     | 273 +++++-----
 README.md                                          |  39 +-
 cmake/Modules/FindTeleorbit.cmake                  |  29 ++
 cmake/Modules/TestForARM.cmake                     |   2 +-
 cmake/Modules/TestForSSE.cmake                     |   2 +-
 conf/gnss-sdr_Galileo_E1_short.conf                |   6 +-
 ...rt.conf => gnss-sdr_Galileo_E5a_IFEN_CTTC.conf} | 272 +++++++---
 conf/gnss-sdr_Hybrid_short.conf                    |   6 +-
 ...tichannel_GPS_L1_Flexiband_bin_file_III_1a.conf | 346 +++++++++++++
 ...tichannel_GPS_L1_Flexiband_realtime_III_1a.conf | 343 +++++++++++++
 ...tichannel_GPS_L1_Flexiband_realtime_III_1b.conf | 343 +++++++++++++
 ...ltichannel_GPS_L1_Flexiband_realtime_II_3b.conf | 343 +++++++++++++
 ...ultichannel_GPS_L1_Flexiband_realtime_I_1b.conf | 343 +++++++++++++
 conf/gnss-sdr_multisource_Hybrid_short.conf        |   8 +-
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc       |  77 ++-
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.h        |   1 +
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc        |  54 +-
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h         |   1 +
 .../PVT/gnuradio_blocks/hybrid_pvt_cc.cc           | 100 +++-
 src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h |   1 +
 src/algorithms/PVT/libs/rinex_printer.cc           | 569 ++++++++++++++++++++-
 src/algorithms/PVT/libs/rinex_printer.h            |  50 +-
 ...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc |   2 +-
 .../galileo_pcps_8ms_acquisition_cc.cc             |   2 +-
 .../gnuradio_blocks/pcps_acquisition_cc.cc         |   2 +-
 .../pcps_acquisition_fine_doppler_cc.cc            |   2 +-
 .../pcps_assisted_acquisition_cc.cc                |   2 +-
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc  |   2 +-
 .../pcps_multithread_acquisition_cc.cc             |   2 +-
 .../gnuradio_blocks/pcps_opencl_acquisition_cc.cc  |   2 +-
 .../pcps_quicksync_acquisition_cc.cc               |   2 +-
 .../gnuradio_blocks/pcps_tong_acquisition_cc.cc    |   2 +-
 .../adapters/array_signal_conditioner.cc           |   1 +
 .../conditioner/adapters/signal_conditioner.cc     |   1 +
 .../libs/galileo_e1_signal_processing.cc           |  65 +--
 .../libs/galileo_e5_signal_processing.cc           |  90 ++--
 src/algorithms/libs/gnss_signal_processing.cc      |   8 +-
 .../volk_gnsssdr/CMakeLists.txt                    |   1 +
 .../volk_gnsssdr/apps/CMakeLists.txt               |   2 +
 .../volk_gnsssdr/lib/volk_gnsssdr_malloc.c         |  17 +-
 .../observables/adapters/galileo_e1_observables.cc |   8 +-
 .../observables/adapters/gps_l1_ca_observables.cc  |   6 +-
 .../observables/adapters/hybrid_observables.cc     |   8 +-
 .../gnuradio_blocks/hybrid_observables_cc.cc       |  44 +-
 .../signal_source/adapters/CMakeLists.txt          |  22 +
 .../adapters/flexiband_signal_source.cc            | 147 ++++++
 .../adapters/flexiband_signal_source.h             | 108 ++++
 .../signal_source/adapters/uhd_signal_source.cc    | 335 ++++++------
 .../adapters/galileo_e1b_telemetry_decoder.cc      |   8 +-
 .../adapters/gps_l1_ca_telemetry_decoder.cc        |  10 +-
 .../galileo_e1b_telemetry_decoder_cc.cc            |  99 ++--
 .../gps_l1_ca_telemetry_decoder_cc.cc              |  43 +-
 .../galileo_e1_dll_pll_veml_tracking_cc.cc         |   2 +
 .../galileo_e1_tcp_connector_tracking_cc.cc        |   2 +
 .../galileo_e5a_dll_pll_tracking_cc.cc             |   3 +
 .../galileo_volk_e1_dll_pll_veml_tracking_cc.cc    |   4 +-
 .../gps_l1_ca_dll_fll_pll_tracking_cc.cc           |   5 +
 .../gps_l1_ca_dll_pll_optim_tracking_cc.cc         |   2 +
 .../gps_l1_ca_dll_pll_tracking_cc.cc               |   3 +
 .../gps_l1_ca_tcp_connector_tracking_cc.cc         |   5 +-
 src/core/receiver/CMakeLists.txt                   |   4 +
 src/core/receiver/control_thread.cc                |   5 +-
 src/core/receiver/gnss_block_factory.cc            |  13 +
 src/core/receiver/gnss_flowgraph.cc                | 309 +++++------
 src/core/system_parameters/Galileo_E1.h            |   3 +-
 src/core/system_parameters/galileo_utc_model.cc    |  15 +-
 .../system_parameters/gps_navigation_message.cc    |  55 +-
 src/core/system_parameters/gps_utc_model.cc        |   2 +-
 src/core/system_parameters/sbas_telemetry_data.cc  |   2 +-
 src/core/system_parameters/sbas_telemetry_data.h   |  19 +-
 70 files changed, 3779 insertions(+), 925 deletions(-)

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