[hamradio-commits] [gnss-sdr] 13/60: merging 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 9e1017ed23f34e44f8faf20d7df308de5597e14e
Merge: 5fe91b8 8cd5964
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Feb 27 17:37:42 2015 +0100

    merging next

 conf/gnss-sdr_Hybrid_nsr.conf                      |   2 +-
 ...dr_multichannel_GPS_L1_USRP_X300_realtime.conf} | 319 +++++++++++++--------
 ...r.conf => gnss-sdr_multisource_Hybrid_nsr.conf} | 242 ++++++++++++----
 ...conf => gnss-sdr_multisource_Hybrid_short.conf} | 289 ++++++++++++++-----
 src/algorithms/PVT/adapters/galileo_e1_pvt.cc      |   6 +-
 src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc       |   6 +-
 src/algorithms/PVT/adapters/hybrid_pvt.cc          |   6 +-
 ...galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc |   3 +-
 .../galileo_e5a_noncoherent_iq_acquisition_caf.cc  |   6 +-
 .../gps_l1_ca_pcps_acquisition_fine_doppler.cc     |   5 +-
 .../gps_l1_ca_pcps_assisted_acquisition.cc         |   6 +-
 .../conditioner/adapters/signal_conditioner.cc     |   8 -
 src/algorithms/libs/pass_through.cc                |   6 +-
 .../observables/adapters/galileo_e1_observables.cc |   6 +-
 .../observables/adapters/gps_l1_ca_observables.cc  |   6 +-
 .../observables/adapters/hybrid_observables.cc     |   6 +-
 .../output_filter/adapters/file_output_filter.cc   |   6 +-
 .../adapters/null_sink_output_filter.cc            |   6 +-
 .../signal_source/adapters/uhd_signal_source.cc    | 306 ++++++++++++--------
 .../signal_source/adapters/uhd_signal_source.h     |  33 +--
 .../adapters/galileo_e1b_telemetry_decoder.cc      |   6 +-
 .../adapters/galileo_e5a_telemetry_decoder.cc      |   6 +-
 .../adapters/gps_l1_ca_telemetry_decoder.cc        |   6 +-
 .../adapters/sbas_l1_telemetry_decoder.cc          |   6 +-
 .../adapters/galileo_e1_dll_pll_veml_tracking.cc   |   6 +-
 .../adapters/galileo_e1_tcp_connector_tracking.cc  |   6 +-
 .../adapters/galileo_e5a_dll_pll_tracking.cc       |   6 +-
 .../galileo_volk_e1_dll_pll_veml_tracking.cc       |   6 +-
 .../adapters/gps_l1_ca_dll_fll_pll_tracking.cc     |   6 +-
 .../adapters/gps_l1_ca_dll_pll_optim_tracking.cc   |   6 +-
 .../adapters/gps_l1_ca_dll_pll_tracking.cc         |   6 +-
 .../adapters/gps_l1_ca_tcp_connector_tracking.cc   |   6 +-
 src/core/interfaces/gnss_block_interface.h         |  33 ++-
 src/core/receiver/gnss_block_factory.cc            |  52 ++--
 src/core/receiver/gnss_block_factory.h             |   4 +-
 src/core/receiver/gnss_flowgraph.cc                | 188 ++++++------
 src/core/receiver/gnss_flowgraph.h                 |  11 +-
 src/core/system_parameters/gps_ephemeris.h         |   1 +
 src/core/system_parameters/gps_iono.h              |   2 +-
 src/core/system_parameters/gps_ref_location.h      |   2 +-
 src/core/system_parameters/gps_ref_time.h          |   1 +
 src/core/system_parameters/gps_utc_model.h         |   2 +-
 42 files changed, 1079 insertions(+), 562 deletions(-)


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