[hamradio-commits] [gnss-sdr] 26/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 37a346f3f6e6f34f7ddb9cda609f73fad7f56090
Merge: d8d5daa ec7c514
Author: Javier <jarribas at cttc.es>
Date:   Wed May 6 16:49:11 2015 +0200

    Merge branch 'next' into arribas_next
    
    Conflicts:
    	src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc

 CMakeLists.txt                                     |   50 +-
 README.md                                          |   18 +-
 cmake/Modules/FindVolk.cmake                       |    4 +-
 conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf         |  308 ++++++
 .../PVT/gnuradio_blocks/hybrid_pvt_cc.cc           |    2 +-
 src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc       |    4 +-
 src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc        |   10 +-
 src/algorithms/PVT/libs/hybrid_ls_pvt.cc           |    6 +-
 ...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc | 1022 ++++++++++----------
 .../pcps_acquisition_fine_doppler_cc.cc            |    4 +-
 src/algorithms/libs/CMakeLists.txt                 |   16 +-
 src/algorithms/libs/gnss_signal_processing.cc      |   41 +-
 src/algorithms/libs/gps_sdr_signal_processing.cc   |   47 +-
 .../volk_gnsssdr/lib/volk_gnsssdr_malloc.c         |   35 +-
 .../volk_gnsssdr/lib/volk_gnsssdr_prefs.c          |    8 +-
 .../gnuradio_blocks/CMakeLists.txt                 |   10 +-
 .../adapters/nsr_file_signal_source.cc             |    2 +-
 .../adapters/osmosdr_signal_source.cc              |    8 +-
 .../signal_source/adapters/osmosdr_signal_source.h |    1 +
 .../galileo_e1b_telemetry_decoder_cc.cc            |    2 +-
 .../gps_l1_ca_telemetry_decoder_cc.cc              |    2 +-
 .../tracking/gnuradio_blocks/CMakeLists.txt        |    8 +-
 .../galileo_e1_dll_pll_veml_tracking_cc.cc         |   17 +-
 .../galileo_e5a_dll_pll_tracking_cc.cc             |   15 +-
 .../gps_l1_ca_dll_pll_tracking_cc.cc               |   20 +-
 src/core/receiver/gnss_flowgraph.cc                |   24 +-
 .../galileo_navigation_message.cc                  |    4 +-
 src/core/system_parameters/galileo_utc_model.cc    |    3 +-
 .../system_parameters/gps_navigation_message.cc    |    3 +-
 src/core/system_parameters/gps_utc_model.cc        |    3 +-
 src/core/system_parameters/sbas_telemetry_data.cc  |    7 +-
 src/main/CMakeLists.txt                            |   24 +-
 src/tests/arithmetic/code_generation_test.cc       |  183 ++++
 ...pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc |    4 +-
 ..._e1_pcps_ambiguous_acquisition_gsoc2013_test.cc |    4 +-
 .../galileo_e1_pcps_ambiguous_acquisition_test.cc  |    4 +-
 ...s_cccwsr_ambiguous_acquisition_gsoc2013_test.cc |    4 +-
 ...uicksync_ambiguous_acquisition_gsoc2014_test.cc |    4 +-
 ...cps_tong_ambiguous_acquisition_gsoc2013_test.cc |    4 +-
 ...e5a_pcps_acquisition_gsoc2014_gensource_test.cc |   16 +-
 .../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc    |    4 +-
 ...a_pcps_multithread_acquisition_gsoc2013_test.cc |    4 +-
 ..._l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc |    4 +-
 ..._ca_pcps_quicksync_acquisition_gsoc2014_test.cc |    4 +-
 ...ps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc |    4 +-
 src/tests/single_test_main.cc                      |    1 +
 src/tests/test_main.cc                             |    5 +-
 src/utils/front-end-cal/CMakeLists.txt             |   49 +-
 48 files changed, 1261 insertions(+), 765 deletions(-)

diff --cc src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index 7098138,eec2ce0..268e1f9
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@@ -25,9 -25,8 +25,9 @@@ set(TRACKING_GR_BLOCKS_SOURCE
       gps_l1_ca_dll_pll_tracking_cc.cc
       gps_l1_ca_tcp_connector_tracking_cc.cc
       galileo_e5a_dll_pll_tracking_cc.cc
 +     gps_l2_m_dll_pll_tracking_cc.cc
  )
-       
+ 
  include_directories(
       $(CMAKE_CURRENT_SOURCE_DIR)
       ${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@@ -49,7 -48,7 +49,7 @@@ endif(ENABLE_GENERIC_ARCH
  file(GLOB TRACKING_GR_BLOCKS_HEADERS "*.h")
  add_library(tracking_gr_blocks ${TRACKING_GR_BLOCKS_SOURCES} ${TRACKING_GR_BLOCKS_HEADERS})
  source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS})
- target_link_libraries(tracking_gr_blocks tracking_lib ${GNURADIO_RUNTIME_LIBRARIES} gnss_sp_libs ${Boost_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} )
+ target_link_libraries(tracking_gr_blocks tracking_lib ${GNURADIO_RUNTIME_LIBRARIES} gnss_sp_libs ${Boost_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES} )
  if(NOT VOLK_GNSSSDR_FOUND)
      add_dependencies(tracking_gr_blocks volk_gnsssdr_module)
--endif(NOT VOLK_GNSSSDR_FOUND)
++endif(NOT VOLK_GNSSSDR_FOUND)

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