[hamradio-commits] [gnss-sdr] 03/149: Merge branch 'next' of git://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 2216d520addd9ad7ac3907b9ed7bbdadd05b285c
Merge: 6cec5b3 8be9ac8
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Aug 28 20:14:09 2015 +0200

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

 CMakeLists.txt                                     |   46 +-
 README.md                                          |   55 +-
 conf/gnss-sdr.conf                                 |   77 +-
 conf/gnss-sdr_GPS_L1_GN3S_realtime.conf            |  348 +----
 conf/gnss-sdr_GPS_L1_SPIR.conf                     |   76 +-
 conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf       |    6 +-
 conf/gnss-sdr_GPS_L1_acq_QuickSync.conf            |  133 +-
 conf/gnss-sdr_GPS_L1_gr_complex.conf               |  265 +---
 ...ex.conf => gnss-sdr_GPS_L1_gr_complex_gpu.conf} |   14 +-
 conf/gnss-sdr_GPS_L1_gr_complex_optim_trk.conf     |  105 +-
 conf/gnss-sdr_GPS_L1_nsr.conf                      |  216 +--
 conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf         |   72 +-
 conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf          |  219 +--
 conf/gnss-sdr_GPS_L1_two_bits_cpx.conf             |  226 +--
 conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf   |   82 ++
 conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf        |  131 +-
 conf/gnss-sdr_Galileo_E1_nsr.conf                  |  299 +---
 conf/gnss-sdr_Galileo_E1_short.conf                |   76 +-
 conf/gnss-sdr_Galileo_E5a.conf                     |   66 -
 conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf           |  272 +---
 conf/gnss-sdr_Hybrid_byte.conf                     |    6 -
 conf/gnss-sdr_Hybrid_nsr.conf                      |    3 -
 conf/gnss-sdr_Hybrid_short.conf                    |    8 +-
 ...tichannel_GPS_L1_Flexiband_bin_file_III_1a.conf |    4 +-
 ...1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf |   30 +-
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1a.conf |    3 +-
 conf/{ => old}/gnss-sdr_SBAS_short.conf            |    0
 drivers/gr-gn3s/README.md                          |  143 +-
 drivers/gr-gn3s/cmake/Modules/FindUSB.cmake        |   68 +-
 src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc       |    3 +-
 src/algorithms/libs/cudahelpers/exception.h        |  151 ++
 src/algorithms/libs/cudahelpers/helper_cuda.h      | 1255 +++++++++++++++++
 .../libs/cudahelpers/helper_cuda_drvapi.h          |  517 +++++++
 src/algorithms/libs/cudahelpers/helper_cuda_gl.h   |  165 +++
 src/algorithms/libs/cudahelpers/helper_functions.h |   42 +
 src/algorithms/libs/cudahelpers/helper_image.h     | 1110 +++++++++++++++
 src/algorithms/libs/cudahelpers/helper_math.h      | 1453 ++++++++++++++++++++
 src/algorithms/libs/cudahelpers/helper_string.h    |  516 +++++++
 src/algorithms/libs/cudahelpers/helper_timer.h     |  499 +++++++
 .../signal_source/adapters/CMakeLists.txt          |    2 +-
 src/algorithms/signal_source/libs/CMakeLists.txt   |    5 +
 src/algorithms/tracking/adapters/CMakeLists.txt    |    6 +
 .../adapters/gps_l1_ca_dll_pll_tracking_gpu.cc     |  158 +++
 .../adapters/gps_l1_ca_dll_pll_tracking_gpu.h      |  112 ++
 .../tracking/gnuradio_blocks/CMakeLists.txt        |   15 +-
 .../gps_l1_ca_dll_pll_tracking_cc.cc               |    3 +-
 ..._cc.cc => gps_l1_ca_dll_pll_tracking_gpu_cc.cc} |  233 ++--
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.h            |  191 +++
 src/algorithms/tracking/libs/CMakeLists.txt        |   24 +-
 .../tracking/libs/cuda_multicorrelator.cu          |  714 ++++++++++
 .../tracking/libs/cuda_multicorrelator.h           |  171 +++
 .../tracking/libs/tracking_2nd_PLL_filter.cc       |    2 +-
 src/core/receiver/CMakeLists.txt                   |    9 +-
 src/core/receiver/gnss_block_factory.cc            |   12 +
 src/main/CMakeLists.txt                            |   11 +-
 src/main/main.cc                                   |   16 +
 src/tests/CMakeLists.txt                           |   41 +-
 src/tests/flowgraph/gnss_flowgraph_test.cc         |  224 ++-
 58 files changed, 8200 insertions(+), 2509 deletions(-)

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