[hamradio-commits] [gnss-sdr] 49/149: Merge branch 'new_next' of git://github.com/Arribas/gnss-sdr into new_volk_module

[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 601dc7a85c350d1668e7cad932a8c0a0d0e7ee0c
Merge: 2490951 c2676ec
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Tue Jan 12 20:57:06 2016 +0100

    Merge branch 'new_next' of git://github.com/Arribas/gnss-sdr into
    new_volk_module

 conf/gnss-sdr.conf                                 |   2 +-
 conf/gnss-sdr_Galileo_E1_short.conf                |   2 +-
 conf/gnss-sdr_Hybrid_byte_sim.conf                 |   2 +-
 conf/gnss-sdr_multisource_Hybrid_nsr.conf          |   2 +-
 .../data_type_adapter/adapters/ibyte_to_complex.cc |  18 +-
 .../data_type_adapter/adapters/ibyte_to_complex.h  |   7 +-
 src/algorithms/tracking/adapters/CMakeLists.txt    |   4 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_16sc.cc       | 159 ++++++
 .../gps_l1_ca_dll_pll_c_aid_tracking_16sc.h        | 114 ++++
 .../tracking/gnuradio_blocks/CMakeLists.txt        |   5 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_16sc_cc.cc    | 612 +++++++++++++++++++++
 .../gps_l1_ca_dll_pll_c_aid_tracking_16sc_cc.h     | 189 +++++++
 .../gps_l1_ca_dll_pll_tracking_gpu_cc_old.cc       | 606 ++++++++++++++++++++
 src/algorithms/tracking/libs/CMakeLists.txt        |   4 +-
 .../tracking/libs/cpu_multicorrelator_16sc.cc      | 194 +++++++
 .../tracking/libs/cpu_multicorrelator_16sc.h       |  73 +++
 .../tracking/libs/saturated_arithmetic.h           |  31 ++
 .../libs/volk_gnsssdr_16ic_resampler_16ic.h        | 171 ++++++
 .../libs/volk_gnsssdr_16ic_x2_dot_prod_16ic.h      | 152 +++++
 .../libs/volk_gnsssdr_16ic_x2_multiply_16ic.h      | 117 ++++
 .../libs/volk_gnsssdr_16ic_xn_dot_prod_16ic_xn.h   | 171 ++++++
 .../libs/volk_gnsssdr_16ic_xn_resampler_16ic_xn.h  | 172 ++++++
 src/core/receiver/CMakeLists.txt                   |   1 +
 src/core/receiver/gnss_block_factory.cc            |  13 +
 24 files changed, 2796 insertions(+), 25 deletions(-)

diff --cc conf/gnss-sdr.conf
index ac6a20c,ac6a20c..abd8a47
--- a/conf/gnss-sdr.conf
+++ b/conf/gnss-sdr.conf
@@@ -302,7 -302,7 +302,7 @@@ PVT.flag_nmea_tty_port=tru
  PVT.nmea_dump_devname=/dev/pts/4
  
  ;#flag_rtcm_server: Enables or disables a TCP/IP server transmitting RTCM 3.2 messages (accepts multiple clients, port 2101 by default)
--PVT.flag_rtcm_server=false
++PVT.flag_rtcm_server=true
  
  ;#flag_rtcm_tty_port: Enables or disables the RTCM log to a serial TTY port (Can be used with real hardware or virtual one)
  PVT.flag_rtcm_tty_port=false
diff --cc conf/gnss-sdr_Galileo_E1_short.conf
index 2aa07c4,2aa07c4..62919ac
--- a/conf/gnss-sdr_Galileo_E1_short.conf
+++ b/conf/gnss-sdr_Galileo_E1_short.conf
@@@ -286,7 -286,7 +286,7 @@@ PVT.flag_nmea_tty_port=true
  PVT.nmea_dump_devname=/dev/pts/4
  
  ;#flag_rtcm_server: Enables or disables a TCP/IP server transmitting RTCM 3.2 messages (accepts multiple clients, port 2101 by default)
--PVT.flag_rtcm_server=false;
++PVT.flag_rtcm_server=true;
  
  ;#flag_rtcm_tty_port: Enables or disables the RTCM log to a serial TTY port (Can be used with real hardware or virtual one)
  PVT.flag_rtcm_tty_port=false;
diff --cc conf/gnss-sdr_multisource_Hybrid_nsr.conf
index 404a70d,404a70d..d2aceef
--- a/conf/gnss-sdr_multisource_Hybrid_nsr.conf
+++ b/conf/gnss-sdr_multisource_Hybrid_nsr.conf
@@@ -483,7 -483,7 +483,7 @@@ PVT.display_rate_ms=500
  ;#dump: Enable or disable the PVT internal binary data file logging [true] or [false]
  PVT.dump=false
  
--PVT.flag_rtcm_server=true
++PVT.flag_rtcm_server=false
  PVT.flag_rtcm_tty_port=false
  PVT.rtcm_dump_devname=/dev/pts/1
  

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