[hamradio-commits] [gnss-sdr] 04/251: Merge branch 'next' into Arribas_branch/next
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Wed Sep 2 00:22:29 UTC 2015
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 46752fcc7c1f9f96c780bc21a6530444c83df1ff
Merge: 7a681a2 e4bd312
Author: Javier Arribas <jarribas at cttc.es>
Date: Sun Mar 1 21:33:20 2015 +0100
Merge branch 'next' into Arribas_branch/next
Conflicts:
src/algorithms/signal_source/adapters/uhd_signal_source.cc
src/core/receiver/gnss_flowgraph.cc
CMakeLists.txt | 14 +-
conf/gnss-sdr.conf | 18 +-
docs/manpage/front-end-cal-manpage | 36 +--
docs/manpage/gnss-sdr-manpage | 32 +--
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 +-
src/algorithms/PVT/libs/rinex_printer.cc | 173 +++++++++--
src/algorithms/acquisition/adapters/CMakeLists.txt | 50 ++--
.../galileo_e1_pcps_ambiguous_acquisition.cc | 6 +
.../galileo_e1_pcps_ambiguous_acquisition.h | 5 +
...galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc | 10 +-
.../galileo_e1_pcps_cccwsr_ambiguous_acquisition.h | 5 +
...ileo_e1_pcps_quicksync_ambiguous_acquisition.cc | 10 +
...lileo_e1_pcps_quicksync_ambiguous_acquisition.h | 5 +
.../galileo_e1_pcps_tong_ambiguous_acquisition.cc | 6 +
.../galileo_e1_pcps_tong_ambiguous_acquisition.h | 5 +
.../galileo_e5a_noncoherent_iq_acquisition_caf.cc | 11 +-
.../galileo_e5a_noncoherent_iq_acquisition_caf.h | 7 +
.../adapters/gps_l1_ca_pcps_acquisition.cc | 243 ++++++++++------
.../adapters/gps_l1_ca_pcps_acquisition.h | 11 +
.../gps_l1_ca_pcps_acquisition_fine_doppler.cc | 5 +-
.../gps_l1_ca_pcps_assisted_acquisition.cc | 6 +-
.../gps_l1_ca_pcps_quicksync_acquisition.cc | 8 +
.../gps_l1_ca_pcps_quicksync_acquisition.h | 5 +-
.../adapters/gps_l1_ca_pcps_tong_acquisition.cc | 8 +
.../adapters/gps_l1_ca_pcps_tong_acquisition.h | 8 +-
.../acquisition/gnuradio_blocks/CMakeLists.txt | 38 +--
...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc | 25 ++
...galileo_e5a_noncoherent_iq_acquisition_caf_cc.h | 7 +
.../galileo_pcps_8ms_acquisition_cc.cc | 24 ++
.../galileo_pcps_8ms_acquisition_cc.h | 7 +
.../gnuradio_blocks/pcps_acquisition_cc.cc | 23 ++
.../gnuradio_blocks/pcps_acquisition_cc.h | 7 +
.../pcps_acquisition_fine_doppler_cc.h | 320 +++++++++++----------
.../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc | 23 ++
.../gnuradio_blocks/pcps_cccwsr_acquisition_cc.h | 7 +
.../pcps_multithread_acquisition_cc.cc | 27 ++
.../pcps_multithread_acquisition_cc.h | 7 +
.../gnuradio_blocks/pcps_opencl_acquisition_cc.cc | 22 ++
.../gnuradio_blocks/pcps_opencl_acquisition_cc.h | 7 +
.../pcps_quicksync_acquisition_cc.cc | 22 ++
.../pcps_quicksync_acquisition_cc.h | 7 +
.../gnuradio_blocks/pcps_tong_acquisition_cc.cc | 31 ++
.../gnuradio_blocks/pcps_tong_acquisition_cc.h | 7 +
.../data_type_adapter/adapters/byte_to_short.h | 4 +-
.../data_type_adapter/adapters/ibyte_to_cbyte.h | 4 +-
.../data_type_adapter/adapters/ibyte_to_complex.h | 4 +-
.../data_type_adapter/adapters/ishort_to_complex.h | 4 +-
.../data_type_adapter/adapters/ishort_to_cshort.h | 4 +-
.../input_filter/adapters/CMakeLists.txt | 5 +-
src/algorithms/input_filter/adapters/fir_filter.cc | 53 +++-
.../input_filter/gnuradio_blocks/CMakeLists.txt | 12 +-
src/algorithms/libs/CMakeLists.txt | 46 +--
.../byte_x2_to_complex_byte.cc | 0
.../byte_x2_to_complex_byte.h | 0
.../complex_byte_to_float_x2.cc | 0
.../complex_byte_to_float_x2.h | 0
.../complex_float_to_complex_byte.cc | 0
.../complex_float_to_complex_byte.h | 0
.../gnuradio_blocks => libs}/cshort_to_float_x2.cc | 0
.../gnuradio_blocks => libs}/cshort_to_float_x2.h | 0
src/algorithms/libs/pass_through.cc | 26 +-
.../gnuradio_blocks => libs}/short_x2_to_cshort.cc | 0
.../gnuradio_blocks => libs}/short_x2_to_cshort.h | 0
.../python/volk_gnsssdr_modtool/__init__.pyc | Bin 327 -> 0 bytes
.../python/volk_gnsssdr_modtool/cfg.pyc | Bin 3870 -> 0 bytes
.../volk_gnsssdr_modtool_generate.pyc | Bin 11076 -> 0 bytes
.../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 +-
.../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 | 49 ++--
src/core/receiver/gnss_block_factory.cc | 44 +--
src/core/receiver/gnss_block_factory.h | 4 +-
src/core/receiver/gnss_flowgraph.h | 1 -
src/core/system_parameters/gps_ephemeris.cc | 20 +-
src/core/system_parameters/gps_ephemeris.h | 5 +
src/core/system_parameters/gps_iono.h | 2 +-
.../system_parameters/gps_navigation_message.cc | 3 +-
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 +-
src/main/CMakeLists.txt | 2 -
src/tests/CMakeLists.txt | 10 +-
src/tests/arithmetic/magnitude_squared_test.cc | 4 +-
...pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc | 31 +-
..._e1_pcps_ambiguous_acquisition_gsoc2013_test.cc | 40 +--
...ileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc | 27 +-
.../galileo_e1_pcps_ambiguous_acquisition_test.cc | 23 +-
...s_cccwsr_ambiguous_acquisition_gsoc2013_test.cc | 37 +--
...uicksync_ambiguous_acquisition_gsoc2014_test.cc | 97 +++----
...cps_tong_ambiguous_acquisition_gsoc2013_test.cc | 68 ++---
...e5a_pcps_acquisition_gsoc2014_gensource_test.cc | 26 +-
src/tests/gnss_block/gnss_block_factory_test.cc | 4 +-
.../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 10 +-
.../gnss_block/gps_l1_ca_pcps_acquisition_test.cc | 44 ++-
..._ca_pcps_quicksync_acquisition_gsoc2014_test.cc | 125 ++++----
...ps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc | 30 +-
112 files changed, 1422 insertions(+), 869 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list