[hamradio-commits] [gnss-sdr] 142/236: Merge branch 'next' of https://github.com/carlesfernandez/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 864c81b0820cd5e0462c9b9aca50324ab9fd058a
Merge: 81ae079 36660e0
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Wed Mar 30 22:48:32 2016 +0200

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

 conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf       |   1 -
 conf/gnss-sdr_GPS_L1_USRP_realtime.conf            |   2 +-
 conf/gnss-sdr_GPS_L1_ishort.conf                   |  87 +++
 conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf         |   2 +-
 conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf          |   2 +-
 ...im_trk.conf => gnss-sdr_Hybrid_gr_complex.conf} | 208 ++++---
 conf/gnss-sdr_Hybrid_nsr.conf                      |  17 +-
 src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc       |  11 +-
 src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc        |  17 +-
 src/algorithms/PVT/libs/hybrid_ls_pvt.cc           |  25 +-
 src/algorithms/PVT/libs/pvt_solution.h             |   7 +-
 src/algorithms/channel/adapters/channel.cc         |   5 +
 src/algorithms/libs/CMakeLists.txt                 |   1 -
 src/algorithms/libs/nco_lib.cc                     | 106 ----
 src/algorithms/libs/nco_lib.h                      |  87 ---
 .../volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h     |   8 +-
 .../volk_gnsssdr_32fc_resamplerxnpuppet_32fc.h     | 248 +++++++++
 .../volk_gnsssdr_32fc_xn_resampler_32fc_xn.h       | 290 ++++++++++
 .../volk_gnsssdr/lib/kernel_tests.h                |   1 +
 .../galileo_e1b_telemetry_decoder_cc.cc            |   2 +
 .../galileo_e5a_telemetry_decoder_cc.cc            |   2 +
 .../gps_l1_ca_telemetry_decoder_cc.cc              | 126 ++---
 .../gps_l1_ca_telemetry_decoder_cc.h               |  11 +-
 .../gps_l2_m_telemetry_decoder_cc.cc               |   2 +
 .../sbas_l1_telemetry_decoder_cc.cc                |   2 +
 .../adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc   |  12 +
 .../galileo_e1_dll_pll_veml_tracking_cc.cc         |  33 +-
 .../galileo_e1_tcp_connector_tracking_cc.cc        |   3 +
 .../galileo_e5a_dll_pll_tracking_cc.cc             |   5 +-
 .../gps_l1_ca_dll_fll_pll_tracking_cc.cc           |  58 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc         | 395 ++++++++++----
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.h          |  33 ++
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.cc         |  35 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.h          |  10 +
 .../gps_l1_ca_dll_pll_tracking_cc.cc               |  19 +-
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.cc           |   5 +
 .../gps_l1_ca_dll_pll_tracking_gpu_cc_old.cc       | 606 ---------------------
 .../gps_l1_ca_tcp_connector_tracking_cc.cc         |   6 +-
 .../gps_l2_m_dll_pll_tracking_cc.cc                |  14 +-
 .../tracking/libs/cpu_multicorrelator.cc           |  29 +-
 src/algorithms/tracking/libs/lock_detectors.cc     |  21 +-
 src/core/system_parameters/GPS_L1_CA.h             |   5 +-
 src/core/system_parameters/gnss_synchro.h          |   3 +
 43 files changed, 1338 insertions(+), 1224 deletions(-)

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