[hamradio-commits] [gnss-sdr] 303/303: Merge branch 'master' of https://github.com/gnss-sdr/gnss-sdr

Carles Fernandez carles_fernandez-guest at moszumanska.debian.org
Mon Feb 13 22:36:10 UTC 2017


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 c35f0f0db6fd3f41c9ab13f0c5eaaab8b1ddddd9
Merge: 0addc0d 32e4d22
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Mon Feb 13 23:34:48 2017 +0100

    Merge branch 'master' of https://github.com/gnss-sdr/gnss-sdr

 .gitignore                                         |    2 +-
 CMakeLists.txt                                     |  554 ++-
 README.md                                          |  682 ++-
 cmake/Modules/FindGFlags.cmake                     |   11 +
 cmake/Modules/FindGLOG.cmake                       |   40 +-
 cmake/Modules/FindGPSTK.cmake                      |   67 +-
 cmake/Modules/FindGnuradio.cmake                   |   30 +-
 cmake/Modules/FindGrOsmoSDR.cmake                  |   76 +-
 cmake/Modules/FindLibOsmoSDR.cmake                 |   24 +
 cmake/Modules/FindORC.cmake                        |   16 +
 cmake/Modules/FindUHD.cmake                        |   24 +
 cmake/Modules/FindVolk.cmake                       |   23 +
 cmake/Modules/GnssSdrPackaging.cmake               |  323 --
 cmake/Modules/SetupPython.cmake                    |   78 +
 cmake/Modules/TestForARM.cmake                     |    6 +-
 cmake/Packaging/fixup_deb_permissions.sh.in        |   10 -
 cmake/Packaging/postinst.in                        |    4 -
 cmake/Packaging/prerm.in                           |   14 -
 cmake/Toolchains/oe-sdk_cross.cmake                |   20 +
 cmake/Toolchains/zynq-7000.cmake                   |   26 +
 conf/gnss-sdr_GPS_L1_ishort.conf                   |   44 +-
 conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf          |    6 +-
 conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf      |    6 +-
 conf/gnss-sdr_Galileo_E1_ishort.conf               |    2 +-
 ...hannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf |    6 +-
 ...1_L2_Galileo_E1B_Flexiband_bin_file_III_1b.conf |    2 +-
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1b.conf |    6 +-
 docs/changelog                                     |    7 -
 docs/changelog.Debian                              |    5 -
 docs/doxygen/other/main_page.dox                   |   12 +-
 docs/manpage/gnss-sdr-manpage                      |    2 +-
 src/CMakeLists.txt                                 |    4 +-
 src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc       |   10 +-
 src/algorithms/PVT/adapters/hybrid_pvt.cc          |   67 +-
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc       |   70 +-
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.h        |   15 +-
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc        |  105 +-
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h         |   29 +-
 .../PVT/gnuradio_blocks/hybrid_pvt_cc.cc           |  664 ++-
 src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h |   32 +-
 src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc       |  198 +-
 src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc        |  223 +-
 src/algorithms/PVT/libs/hybrid_ls_pvt.cc           |  415 +-
 src/algorithms/PVT/libs/hybrid_ls_pvt.h            |   19 +-
 src/algorithms/PVT/libs/ls_pvt.cc                  |  191 +-
 src/algorithms/PVT/libs/ls_pvt.h                   |   19 +-
 src/algorithms/PVT/libs/pvt_solution.cc            |   19 +-
 src/algorithms/PVT/libs/pvt_solution.h             |    4 +-
 src/algorithms/PVT/libs/rinex_printer.cc           | 4663 +++++++++++++-------
 src/algorithms/PVT/libs/rinex_printer.h            |   80 +-
 src/algorithms/PVT/libs/rtcm_printer.cc            |   53 +-
 src/algorithms/PVT/libs/rtcm_printer.h             |    8 +-
 .../galileo_e1_pcps_tong_ambiguous_acquisition.cc  |    3 +-
 .../galileo_e1_pcps_tong_ambiguous_acquisition.h   |    1 +
 .../adapters/gps_l1_ca_pcps_tong_acquisition.cc    |    3 +-
 .../adapters/gps_l1_ca_pcps_tong_acquisition.h     |    1 +
 .../acquisition/gnuradio_blocks/CMakeLists.txt     |   26 -
 ...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc |   90 +-
 .../galileo_pcps_8ms_acquisition_cc.cc             |   32 +-
 .../gnuradio_blocks/pcps_acquisition_cc.cc         |   20 +-
 .../pcps_acquisition_fine_doppler_cc.cc            |   47 +-
 .../gnuradio_blocks/pcps_acquisition_sc.cc         |   24 +-
 .../pcps_assisted_acquisition_cc.cc                |   27 +-
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc  |   50 +-
 .../pcps_multithread_acquisition_cc.cc             |    8 +-
 .../gnuradio_blocks/pcps_opencl_acquisition_cc.cc  |   36 +-
 .../pcps_quicksync_acquisition_cc.cc               |   42 +-
 .../gnuradio_blocks/pcps_tong_acquisition_cc.cc    |   46 +-
 .../gnuradio_blocks/pcps_tong_acquisition_cc.h     |    9 +-
 .../volk_gnsssdr/CMakeLists.txt                    |   31 +-
 .../volk_gnsssdr_module/volk_gnsssdr/README.md     |    4 +-
 .../volk_gnsssdr/apps/CMakeLists.txt               |   27 +-
 .../volk_gnsssdr/apps/volk_gnsssdr_profile.cc      |    2 +-
 .../volk_gnsssdr/cmake/Modules/FindORC.cmake       |   16 +
 .../volk_gnsssdr/cmake/Modules/VolkPython.cmake    |    9 +-
 .../Packaging/volk_gnsssdr-config-info-manpage     |   40 +
 .../cmake/Packaging/volk_gnsssdr_profile-manpage   |    2 +-
 .../volk_gnsssdr/cmake/msvc/config.h               |   19 +-
 .../volk_gnsssdr/cmake/msvc/inttypes.h             |  301 --
 .../volk_gnsssdr/cmake/msvc/stdbool.h              |   45 -
 .../volk_gnsssdr/cmake/msvc/stdint.h               |  251 --
 .../docs/images/VOLK_GNSSSDR_Usage_Example.png     |  Bin 114963 -> 223367 bytes
 .../volk_gnsssdr/gen/volk_gnsssdr_arch_defs.py     |    8 +-
 .../volk_gnsssdr/gen/volk_gnsssdr_compile_utils.py |    8 +-
 .../volk_gnsssdr/gen/volk_gnsssdr_kernel_defs.py   |   12 +-
 .../volk_gnsssdr/gen/volk_gnsssdr_machine_defs.py  |    7 +-
 .../volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py    |   28 +-
 .../volk_gnsssdr/include/volk_gnsssdr/constants.h  |   10 +-
 .../include/volk_gnsssdr/volk_gnsssdr_common.h     |   18 +
 .../include/volk_gnsssdr/volk_gnsssdr_malloc.h     |    6 +-
 .../include/volk_gnsssdr/volk_gnsssdr_prefs.h      |    6 +-
 .../volk_gnsssdr/volk_gnsssdr_16ic_convert_32fc.h  |    2 +-
 .../volk_gnsssdr_16ic_resampler_fast_16ic.h        |    2 +-
 .../volk_gnsssdr_16ic_s32fc_x2_rotator_16ic.h      |   18 +-
 .../volk_gnsssdr_16ic_x2_dot_prod_16ic.h           |   28 +-
 .../volk_gnsssdr_16ic_x2_dot_prod_16ic_xn.h        |   16 +-
 .../volk_gnsssdr_16ic_x2_multiply_16ic.h           |    4 +-
 ...volk_gnsssdr_16ic_x2_rotator_dot_prod_16ic_xn.h |   24 +-
 .../volk_gnsssdr_16ic_xn_resampler_16ic_xn.h       |   16 +-
 .../volk_gnsssdr_16ic_xn_resampler_fast_16ic_xn.h  |    2 +-
 .../volk_gnsssdr/volk_gnsssdr_32f_index_max_32u.h  |  533 +++
 .../volk_gnsssdr/volk_gnsssdr_32f_sincos_32fc.h    |   10 +-
 .../volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h  |   10 +-
 ...volk_gnsssdr_32fc_x2_rotator_dot_prod_32fc_xn.h |   10 +-
 .../volk_gnsssdr_32fc_xn_resampler_32fc_xn.h       |   16 +-
 .../volk_gnsssdr/volk_gnsssdr_8ic_conjugate_8ic.h  |    2 +-
 .../volk_gnsssdr_8ic_x2_dot_prod_8ic.h             |    4 +-
 .../volk_gnsssdr/lib/CMakeLists.txt                |   13 +-
 .../volk_gnsssdr/lib/constants.c.in                |   13 +-
 .../volk_gnsssdr/lib/kernel_tests.h                |    1 +
 .../python/volk_gnsssdr_modtool/cfg.py             |   10 +-
 .../volk_gnsssdr_modtool_generate.py               |    9 +-
 .../volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c          |  106 +-
 .../volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h          |   14 +-
 .../tmpl/volk_gnsssdr_config_fixed.tmpl.h          |   10 +-
 .../volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c      |   25 +-
 .../volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h      |    6 +-
 .../tmpl/volk_gnsssdr_machine_xxx.tmpl.c           |   76 +-
 .../volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c |    8 +-
 .../volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h |   24 +-
 .../volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h |    6 +-
 src/algorithms/observables/adapters/CMakeLists.txt |    4 +-
 .../observables/adapters/galileo_e1_observables.cc |   11 +-
 .../adapters/galileo_e5a_observables.cc            |   96 +
 ...rid_observables.h => galileo_e5a_observables.h} |   25 +-
 .../observables/adapters/gps_l1_ca_observables.cc  |    9 +-
 ...ybrid_observables.cc => gps_l2c_observables.cc} |   47 +-
 ...{hybrid_observables.h => gps_l2c_observables.h} |   25 +-
 .../observables/adapters/hybrid_observables.cc     |   25 +-
 .../observables/adapters/hybrid_observables.h      |    6 +-
 .../gnuradio_blocks/galileo_e1_observables_cc.cc   |   22 +-
 .../gnuradio_blocks/galileo_e1_observables_cc.h    |    9 +-
 .../gnuradio_blocks/gps_l1_ca_observables_cc.cc    |   52 +-
 .../gnuradio_blocks/gps_l1_ca_observables_cc.h     |    9 +-
 .../gnuradio_blocks/hybrid_observables_cc.cc       |  123 +-
 .../gnuradio_blocks/hybrid_observables_cc.h        |   14 +-
 .../adapters/direct_resampler_conditioner.cc       |   14 +-
 .../gnuradio_blocks/CMakeLists.txt                 |    2 +-
 .../gnuradio_blocks/signal_generator_c.cc          |    6 +-
 .../signal_source/adapters/file_signal_source.cc   |    8 +-
 .../adapters/nsr_file_signal_source.cc             |    2 +
 .../adapters/spir_file_signal_source.cc            |    2 +
 .../adapters/two_bit_cpx_file_signal_source.cc     |    2 +
 .../adapters/two_bit_packed_file_signal_source.cc  |    3 +-
 .../gnuradio_blocks/unpack_2bit_samples.cc         |    6 +-
 .../telemetry_decoder/adapters/CMakeLists.txt      |    2 +-
 .../adapters/galileo_e1b_telemetry_decoder.cc      |    1 -
 .../adapters/galileo_e1b_telemetry_decoder.h       |    1 -
 .../adapters/galileo_e5a_telemetry_decoder.cc      |    1 -
 .../adapters/galileo_e5a_telemetry_decoder.h       |    1 -
 .../adapters/gps_l1_ca_telemetry_decoder.cc        |    1 -
 .../adapters/gps_l1_ca_telemetry_decoder.h         |    1 -
 ...try_decoder.cc => gps_l2c_telemetry_decoder.cc} |   21 +-
 ...metry_decoder.h => gps_l2c_telemetry_decoder.h} |   23 +-
 .../adapters/sbas_l1_telemetry_decoder.cc          |    1 -
 .../adapters/sbas_l1_telemetry_decoder.h           |    1 -
 .../gnuradio_blocks/CMakeLists.txt                 |    2 +-
 .../gps_l1_ca_telemetry_decoder_cc.cc              |   58 +-
 .../gps_l1_ca_telemetry_decoder_cc.h               |    4 +-
 ...coder_cc.cc => gps_l2c_telemetry_decoder_cc.cc} |   46 +-
 ...decoder_cc.h => gps_l2c_telemetry_decoder_cc.h} |   26 +-
 .../adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc   |    2 +-
 .../tracking/adapters/gps_l2_m_dll_pll_tracking.h  |    4 +-
 .../tracking/gnuradio_blocks/CMakeLists.txt        |    2 +-
 .../galileo_e1_dll_pll_veml_tracking_cc.cc         |   24 +-
 .../galileo_e1_tcp_connector_tracking_cc.cc        |   23 +-
 .../galileo_e5a_dll_pll_tracking_cc.cc             |   21 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc         |  129 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.h          |    3 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.cc         |  405 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.h          |   18 +
 .../gps_l1_ca_dll_pll_tracking_cc.cc               |  106 +-
 .../gps_l1_ca_dll_pll_tracking_cc.h                |    1 -
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.cc           |    1 -
 .../gps_l1_ca_tcp_connector_tracking_cc.cc         |   16 +-
 .../gps_l2_m_dll_pll_tracking_cc.cc                |   82 +-
 .../gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h |    5 +-
 .../tracking/libs/cpu_multicorrelator_16sc.cc      |   21 +-
 .../tracking/libs/cpu_multicorrelator_16sc.h       |    1 -
 src/core/libs/gnss_sdr_supl_client.cc              |    4 +-
 src/core/receiver/control_thread.cc                |   50 +
 src/core/receiver/control_thread.h                 |    4 +-
 src/core/receiver/gnss_block_factory.cc            |  104 +-
 src/core/receiver/in_memory_configuration.cc       |    4 +-
 src/core/system_parameters/GPS_L2C.h               |    2 +
 src/core/system_parameters/Galileo_E1.h            |   28 +-
 src/core/system_parameters/Galileo_E5a.h           |   41 +-
 src/core/system_parameters/galileo_almanac.h       |    2 +-
 src/core/system_parameters/galileo_ephemeris.h     |    2 +-
 src/core/system_parameters/galileo_fnav_message.h  |    6 +-
 src/core/system_parameters/galileo_iono.h          |    2 +-
 .../galileo_navigation_message.cc                  |    8 +-
 .../system_parameters/galileo_navigation_message.h |    6 +-
 src/core/system_parameters/galileo_utc_model.h     |    2 +-
 src/core/system_parameters/gnss_satellite.cc       |   50 +-
 src/core/system_parameters/gnss_synchro.h          |    2 +-
 src/core/system_parameters/gps_cnav_ephemeris.cc   |  181 +-
 src/core/system_parameters/gps_cnav_ephemeris.h    |   23 +-
 src/core/system_parameters/gps_cnav_iono.h         |    4 +-
 .../gps_cnav_navigation_message.h                  |    4 +-
 src/core/system_parameters/gps_cnav_utc_model.h    |   10 +-
 src/core/system_parameters/gps_ephemeris.cc        |   40 +-
 src/core/system_parameters/gps_ephemeris.h         |    3 +-
 .../system_parameters/gps_navigation_message.cc    |   15 +-
 src/core/system_parameters/rtcm.cc                 |  475 +-
 src/core/system_parameters/rtcm.h                  |   56 +-
 src/core/system_parameters/sbas_telemetry_data.cc  |    2 +-
 src/main/CMakeLists.txt                            |   15 +-
 src/main/main.cc                                   |   24 +-
 src/tests/CMakeLists.txt                           |  376 +-
 src/tests/common-files/signal_generator_flags.h    |   48 +
 src/tests/data/gps_l2c_m_prn7_5msps.dat            |  Bin 8000000 -> 0 bytes
 src/tests/system-tests/obs_gps_l1_system_test.cc   |  722 +++
 src/tests/system-tests/ttff_gps_l1.cc              |  674 +++
 src/tests/test_main.cc                             |  103 +-
 .../arithmetic/code_generation_test.cc             |    0
 .../arithmetic/complex_carrier_test.cc             |    1 -
 .../{ => unit-tests}/arithmetic/conjugate_test.cc  |    9 +-
 .../{ => unit-tests}/arithmetic/fft_length_test.cc |    0
 .../arithmetic/magnitude_squared_test.cc           |    9 +-
 .../{ => unit-tests}/arithmetic/multiply_test.cc   |   13 +-
 .../control-plane}/control_message_factory_test.cc |    0
 .../control-plane}/control_thread_test.cc          |   98 +-
 .../control-plane}/file_configuration_test.cc      |    0
 .../control-plane}/gnss_block_factory_test.cc      |    0
 .../control-plane}/gnss_flowgraph_test.cc          |    0
 .../control-plane}/in_memory_configuration_test.cc |    0
 .../control-plane}/string_converter_test.cc        |    0
 ...pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc |    0
 ..._e1_pcps_ambiguous_acquisition_gsoc2013_test.cc |    0
 ...ileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc |    0
 .../galileo_e1_pcps_ambiguous_acquisition_test.cc  |    4 +-
 ...s_cccwsr_ambiguous_acquisition_gsoc2013_test.cc |    0
 ...uicksync_ambiguous_acquisition_gsoc2014_test.cc |    0
 ...cps_tong_ambiguous_acquisition_gsoc2013_test.cc |    0
 ...e5a_pcps_acquisition_gsoc2014_gensource_test.cc |    0
 .../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc    |    0
 .../gps_l1_ca_pcps_acquisition_test.cc             |    0
 ...a_pcps_multithread_acquisition_gsoc2013_test.cc |    0
 ..._l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc |    0
 ..._ca_pcps_quicksync_acquisition_gsoc2014_test.cc |    0
 ...ps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc |    0
 .../acquisition}/gps_l2_m_pcps_acquisition_test.cc |    2 +-
 .../adapter}/pass_through_test.cc                  |    0
 .../filter}/fir_filter_test.cc                     |    0
 .../signal-processing-blocks/libs}/CMakeLists.txt  |   26 +-
 .../libs/tlm_dump_reader.cc                        |  110 +
 .../libs/tlm_dump_reader.h}                        |   45 +-
 .../libs/tracking_dump_reader.cc                   |  129 +
 .../libs/tracking_dump_reader.h                    |   87 +
 .../libs/tracking_true_obs_reader.cc               |  112 +
 .../libs/tracking_true_obs_reader.h}               |   47 +-
 .../pvt/rinex_printer_test.cc                      |  475 ++
 .../pvt}/rtcm_printer_test.cc                      |    0
 .../signal-processing-blocks/pvt}/rtcm_test.cc     |    0
 .../direct_resampler_conditioner_cc_test.cc        |    0
 .../sources}/file_signal_source_test.cc            |    0
 .../sources}/gnss_sdr_valve_test.cc                |    0
 .../sources}/unpack_2bit_samples_test.cc           |    0
 .../gps_l1_ca_telemetry_decoder_test.cc            |  466 ++
 .../tracking}/cpu_multicorrelator_test.cc          |   18 +-
 .../galileo_e1_dll_pll_veml_tracking_test.cc       |    0
 .../tracking}/galileo_e5a_tracking_test.cc         |    0
 .../tracking/gps_l1_ca_dll_pll_tracking_test.cc    |  480 ++
 .../tracking}/gps_l2_m_dll_pll_tracking_test.cc    |    2 +-
 .../tracking}/gpu_multicorrelator_test.cc          |    0
 .../tracking}/tracking_loop_filter_test.cc         |    0
 src/utils/front-end-cal/main.cc                    |    2 +-
 268 files changed, 12358 insertions(+), 5794 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