[hamradio-commits] [gnss-sdr] 17/149: Merge branch 'next' of git://github.com/gnss-sdr/gnss-sdr into next

Carles Fernandez carles_fernandez-guest at moszumanska.debian.org
Sat Feb 6 19:42:58 UTC 2016


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 f9f0f72f3a173a397c1210c31e8e76e2ab49eccc
Merge: d1f4933 fc91768
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Dec 25 12:42:06 2015 +0100

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

 CMakeLists.txt                                     |    3 +
 README.md                                          |   81 +-
 conf/gnss-sdr.conf                                 |   22 +-
 conf/gnss-sdr_GPS_L1_GN3S_realtime.conf            |   13 +-
 conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf       |    3 +
 conf/gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf   |    5 +-
 conf/gnss-sdr_GPS_L1_USRP_realtime.conf            |    6 +-
 conf/gnss-sdr_GPS_L1_acq_QuickSync.conf            |   39 +-
 conf/gnss-sdr_GPS_L1_gr_complex.conf               |    3 +
 conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf           |   55 +-
 conf/gnss-sdr_GPS_L1_gr_complex_optim_trk.conf     |   37 +-
 conf/gnss-sdr_GPS_L1_nsr.conf                      |    3 +
 conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf        |    3 +
 conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf         |    6 +-
 conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf          |   10 +-
 conf/gnss-sdr_GPS_L1_two_bits_cpx.conf             |    4 +-
 conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf          |    3 +
 conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf      |    3 +
 conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf   |    6 +
 conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf        |   53 +-
 conf/gnss-sdr_Galileo_E1_nsr.conf                  |   19 +-
 conf/gnss-sdr_Galileo_E1_short.conf                |   54 +-
 conf/gnss-sdr_Galileo_E5a.conf                     |    7 +-
 conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf           |    9 +-
 conf/gnss-sdr_Hybrid_byte.conf                     |   46 +-
 ...rid_byte.conf => gnss-sdr_Hybrid_byte_sim.conf} |   96 +-
 conf/gnss-sdr_Hybrid_nsr.conf                      |   54 +-
 conf/gnss-sdr_Hybrid_short.conf                    |   46 +-
 ...tichannel_GPS_L1_Flexiband_bin_file_III_1a.conf |   43 +-
 ...tichannel_GPS_L1_Flexiband_realtime_III_1a.conf |   45 +-
 ...tichannel_GPS_L1_Flexiband_realtime_III_1b.conf |   45 +-
 ...ltichannel_GPS_L1_Flexiband_realtime_II_3b.conf |   43 +-
 ...ultichannel_GPS_L1_Flexiband_realtime_I_1b.conf |   45 +-
 ...hannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf |   50 +-
 ...1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf |   59 +-
 ...sdr_multichannel_GPS_L1_USRP_X300_realtime.conf |   65 +-
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1a.conf |   53 +-
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1b.conf |   61 +-
 conf/gnss-sdr_multisource_Hybrid_nsr.conf          |   76 +-
 conf/gnss-sdr_multisource_Hybrid_short.conf        |   66 +-
 docs/doxygen/other/reference_docs.dox              |    2 +-
 src/algorithms/PVT/adapters/galileo_e1_pvt.cc      |   10 +-
 src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc       |   11 +-
 src/algorithms/PVT/adapters/hybrid_pvt.cc          |   10 +-
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc       |   57 +-
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.h        |   18 +-
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc        |   55 +-
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h         |   19 +-
 .../PVT/gnuradio_blocks/hybrid_pvt_cc.cc           |   20 +-
 src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h |   17 +-
 src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc       |   38 +-
 src/algorithms/PVT/libs/geojson_printer.cc         |    5 +-
 src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc        |    2 +-
 src/algorithms/PVT/libs/hybrid_ls_pvt.cc           |   52 +-
 src/algorithms/PVT/libs/nmea_printer.cc            |    5 +-
 src/algorithms/PVT/libs/nmea_printer.h             |    1 +
 src/algorithms/PVT/libs/rinex_printer.cc           |    2 +-
 src/algorithms/PVT/libs/rtcm_printer.cc            |  127 +-
 src/algorithms/PVT/libs/rtcm_printer.h             |   17 +-
 .../galileo_e1_pcps_ambiguous_acquisition.cc       |    4 +
 ...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc |   23 +-
 .../galileo_pcps_8ms_acquisition_cc.cc             |    1 +
 .../gnuradio_blocks/pcps_acquisition_cc.cc         |   81 +-
 .../pcps_acquisition_fine_doppler_cc.cc            |   10 +-
 .../pcps_assisted_acquisition_cc.cc                |    6 +-
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc  |    1 +
 .../pcps_multithread_acquisition_cc.cc             |    1 +
 .../gnuradio_blocks/pcps_opencl_acquisition_cc.cc  |    1 +
 .../pcps_quicksync_acquisition_cc.cc               |    2 +-
 .../gnuradio_blocks/pcps_tong_acquisition_cc.cc    |    1 +
 .../volk_gnsssdr/volk_gnsssdr_32fc_convert_16ic.h  |   12 +-
 .../volk_gnsssdr/volk_gnsssdr_32fc_convert_8ic.h   |   11 +-
 .../volk_gnsssdr_32fc_s32f_convert_8ic.h           |   11 +-
 .../observables/gnuradio_blocks/CMakeLists.txt     |    5 +-
 .../gnuradio_blocks/galileo_e1_observables_cc.cc   |  107 +-
 .../gnuradio_blocks/galileo_e1_observables_cc.h    |    5 +
 .../gnuradio_blocks/gps_l1_ca_observables_cc.cc    |  127 +-
 .../gnuradio_blocks/gps_l1_ca_observables_cc.h     |    9 +
 .../gnuradio_blocks/hybrid_observables_cc.cc       |   13 +-
 .../gnuradio_blocks/mixed_observables_cc.cc        |   11 +-
 .../gnuradio_blocks/signal_generator_c.cc          |    9 +-
 .../signal_source/adapters/file_signal_source.cc   |   46 +-
 .../gnuradio_blocks/unpack_2bit_samples.cc         |    8 +-
 .../adapters/galileo_e1b_telemetry_decoder.cc      |    6 +-
 .../adapters/galileo_e1b_telemetry_decoder.h       |    1 -
 .../adapters/galileo_e5a_telemetry_decoder.cc      |    6 +-
 .../adapters/galileo_e5a_telemetry_decoder.h       |    1 -
 .../adapters/gps_l1_ca_telemetry_decoder.cc        |    6 +-
 .../adapters/gps_l1_ca_telemetry_decoder.h         |    1 -
 .../adapters/gps_l2_m_telemetry_decoder.cc         |    6 +-
 .../adapters/gps_l2_m_telemetry_decoder.h          |    1 -
 .../adapters/sbas_l1_telemetry_decoder.cc          |    6 +-
 .../adapters/sbas_l1_telemetry_decoder.h           |    1 -
 .../galileo_e1b_telemetry_decoder_cc.cc            |   21 +-
 .../galileo_e1b_telemetry_decoder_cc.h             |   15 +-
 .../galileo_e5a_telemetry_decoder_cc.cc            |   21 +-
 .../galileo_e5a_telemetry_decoder_cc.h             |   18 +-
 .../gps_l1_ca_telemetry_decoder_cc.cc              |   44 +-
 .../gps_l1_ca_telemetry_decoder_cc.h               |   20 +-
 .../gps_l2_m_telemetry_decoder_cc.cc               |   24 +-
 .../gps_l2_m_telemetry_decoder_cc.h                |   10 +-
 .../sbas_l1_telemetry_decoder_cc.cc                |   15 +-
 .../gnuradio_blocks/sbas_l1_telemetry_decoder_cc.h |   11 +-
 src/algorithms/tracking/adapters/CMakeLists.txt    |    1 +
 .../adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc   |  159 +
 .../adapters/gps_l1_ca_dll_pll_c_aid_tracking.h    |  114 +
 .../tracking/gnuradio_blocks/CMakeLists.txt        |    1 +
 .../galileo_e1_dll_pll_veml_tracking_cc.cc         |  106 +-
 .../galileo_e1_dll_pll_veml_tracking_cc.h          |   18 +-
 .../galileo_e1_tcp_connector_tracking_cc.cc        |   11 +-
 .../galileo_e5a_dll_pll_tracking_cc.cc             |  131 +-
 .../galileo_e5a_dll_pll_tracking_cc.h              |   34 +-
 .../galileo_volk_e1_dll_pll_veml_tracking_cc.cc    |  106 +-
 .../galileo_volk_e1_dll_pll_veml_tracking_cc.h     |   18 +-
 .../gps_l1_ca_dll_fll_pll_tracking_cc.cc           |   14 +-
 ...c.cc => gps_l1_ca_dll_pll_c_aid_tracking_cc.cc} |  376 +--
 ..._cc.h => gps_l1_ca_dll_pll_c_aid_tracking_cc.h} |   78 +-
 .../gps_l1_ca_dll_pll_optim_tracking_cc.cc         |   72 +-
 .../gps_l1_ca_dll_pll_optim_tracking_cc.h          |   20 +-
 .../gps_l1_ca_dll_pll_tracking_cc.cc               |  138 +-
 .../gps_l1_ca_dll_pll_tracking_cc.h                |   20 +-
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.cc           |  357 +-
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.h            |   38 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.cc         |    9 +-
 .../gps_l2_m_dll_pll_tracking_cc.cc                |   80 +-
 .../gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h |   20 +-
 src/algorithms/tracking/libs/CMakeLists.txt        |    5 +
 src/algorithms/tracking/libs/correlator.cc         |   47 +
 src/algorithms/tracking/libs/correlator.h          |   31 +-
 .../tracking/libs/cpu_multicorrelator.cc           |  168 +
 src/algorithms/tracking/libs/cpu_multicorrelator.h |   72 +
 .../tracking/libs/cuda_multicorrelator.cu          |  644 +---
 .../tracking/libs/cuda_multicorrelator.h           |   35 +-
 src/algorithms/tracking/libs/lock_detectors.cc     |   14 +-
 .../tracking/libs/tracking_discriminators.cc       |   36 +-
 .../tracking/libs/tracking_discriminators.h        |   10 +-
 .../tracking/libs/tracking_loop_filter.cc          |  284 ++
 .../tracking/libs/tracking_loop_filter.h           |   98 +
 src/core/libs/gnss_sdr_supl_client.cc              |    2 +-
 src/core/receiver/gnss_block_factory.cc            |   13 +
 src/core/receiver/gnss_flowgraph.cc                |   74 +-
 src/core/system_parameters/GPS_L1_CA.h             |    5 +
 src/core/system_parameters/Galileo_E1.h            |    5 +
 src/core/system_parameters/MATH_CONSTANTS.h        |    2 +-
 src/core/system_parameters/gnss_satellite.cc       |    6 +
 src/core/system_parameters/gnss_signal.cc          |    2 +-
 src/core/system_parameters/gnss_synchro.h          |    1 +
 src/core/system_parameters/rtcm.cc                 | 3500 ++++++++++++++++----
 src/core/system_parameters/rtcm.h                  |  781 ++++-
 src/core/system_parameters/sbas_telemetry_data.cc  |    4 +-
 src/tests/CMakeLists.txt                           |    3 +-
 src/tests/arithmetic/tracking_loop_filter_test.cc  |  222 ++
 src/tests/formats/rtcm_test.cc                     |  327 +-
 src/tests/gnss_block/rtcm_printer_test.cc          |    6 +-
 src/tests/test_main.cc                             |    1 +
 .../libs/gps_l1_ca_dll_pll_read_tracking_dump.m    |    7 +-
 156 files changed, 8045 insertions(+), 2828 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