[hamradio-commits] [gnss-sdr] 01/06: Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next

Carles Fernandez carles_fernandez-guest at moszumanska.debian.org
Sun May 15 21:12:19 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 706c3744e4380243ac616ed4633622696841c070
Merge: 1245ecb 24e0055
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sun May 8 12:01:23 2016 +0200

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

 README.md                                          |   4 +-
 conf/front-end-cal.conf                            |   4 +-
 conf/gnss-sdr.conf                                 |  10 +-
 conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf       |   2 +-
 conf/gnss-sdr_GPS_L1_USRP_realtime.conf            |   2 +-
 conf/gnss-sdr_GPS_L1_ishort.conf                   |   1 -
 conf/gnss-sdr_GPS_L1_nsr.conf                      |   2 +-
 conf/gnss-sdr_GPS_L1_nsr_twobit_packed.conf        |   2 +-
 conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf         |   2 +-
 conf/gnss-sdr_GPS_L1_rtlsdr_realtime.conf          |   2 +-
 conf/gnss-sdr_GPS_L1_two_bits_cpx.conf             |   2 +-
 conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf          |   2 +-
 conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf      |   2 +-
 conf/gnss-sdr_Galileo_E1_short.conf                |   6 +-
 conf/gnss-sdr_Galileo_E5a.conf                     |  24 +-
 conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf           |   2 +-
 conf/gnss-sdr_Hybrid_short.conf                    |  16 +-
 ...tichannel_GPS_L1_Flexiband_bin_file_III_1a.conf |   2 +-
 ...tichannel_GPS_L1_Flexiband_realtime_III_1a.conf |   2 +-
 ...tichannel_GPS_L1_Flexiband_realtime_III_1b.conf |   2 +-
 ...ltichannel_GPS_L1_Flexiband_realtime_II_3b.conf |   2 +-
 ...ultichannel_GPS_L1_Flexiband_realtime_I_1b.conf |   2 +-
 ...hannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf |   2 +-
 ...1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf |   4 +-
 ...sdr_multichannel_GPS_L1_USRP_X300_realtime.conf |   2 +-
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1b.conf |   2 +-
 src/algorithms/PVT/adapters/CMakeLists.txt         |   1 +
 src/algorithms/PVT/adapters/galileo_e1_pvt.cc      |  67 +-
 src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc       | 173 ++++-
 src/algorithms/PVT/adapters/gps_l1_ca_pvt.h        |   3 +
 src/algorithms/PVT/adapters/hybrid_pvt.cc          |  57 +-
 src/algorithms/PVT/adapters/hybrid_pvt.h           |   3 +
 src/algorithms/PVT/gnuradio_blocks/CMakeLists.txt  |   1 +
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc       |  72 ++-
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.h        |  13 +-
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc        | 105 +++-
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h         |  23 +-
 .../PVT/gnuradio_blocks/hybrid_pvt_cc.cc           |  44 +-
 src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h |  15 +-
 src/algorithms/PVT/libs/kml_printer.cc             |  16 +-
 src/algorithms/PVT/libs/nmea_printer.h             |   2 +-
 src/algorithms/PVT/libs/rinex_printer.cc           |   6 +-
 src/algorithms/PVT/libs/rinex_printer.h            |   2 +-
 src/algorithms/PVT/libs/rtcm_printer.cc            |  45 +-
 src/algorithms/PVT/libs/rtcm_printer.h             |   9 +-
 .../galileo_e1_pcps_8ms_ambiguous_acquisition.cc   |  60 +-
 .../galileo_e1_pcps_8ms_ambiguous_acquisition.h    |   1 -
 .../galileo_e1_pcps_ambiguous_acquisition.cc       |  14 +-
 .../galileo_e1_pcps_ambiguous_acquisition.h        |   1 -
 ...galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc |  84 ++-
 .../galileo_e1_pcps_cccwsr_ambiguous_acquisition.h |   1 -
 ...ileo_e1_pcps_quicksync_ambiguous_acquisition.cc |  14 +-
 ...lileo_e1_pcps_quicksync_ambiguous_acquisition.h |   1 -
 .../galileo_e1_pcps_tong_ambiguous_acquisition.cc  |  97 ++-
 .../galileo_e1_pcps_tong_ambiguous_acquisition.h   |   2 -
 .../galileo_e5a_noncoherent_iq_acquisition_caf.cc  |  21 +-
 .../galileo_e5a_noncoherent_iq_acquisition_caf.h   |   3 +-
 .../adapters/gps_l1_ca_pcps_acquisition.cc         |  10 +-
 .../adapters/gps_l1_ca_pcps_acquisition.h          |   1 -
 .../gps_l1_ca_pcps_acquisition_fine_doppler.cc     |   6 +-
 .../gps_l1_ca_pcps_acquisition_fine_doppler.h      |   2 +-
 .../gps_l1_ca_pcps_assisted_acquisition.cc         |  10 +-
 .../gps_l1_ca_pcps_multithread_acquisition.cc      | 118 ++--
 .../gps_l1_ca_pcps_multithread_acquisition.h       |   1 -
 .../adapters/gps_l1_ca_pcps_opencl_acquisition.cc  | 119 ++--
 .../adapters/gps_l1_ca_pcps_opencl_acquisition.h   |   1 -
 .../gps_l1_ca_pcps_quicksync_acquisition.cc        |  13 +-
 .../gps_l1_ca_pcps_quicksync_acquisition.h         |   1 -
 .../adapters/gps_l1_ca_pcps_tong_acquisition.cc    |  14 +-
 .../adapters/gps_l1_ca_pcps_tong_acquisition.h     |   5 +-
 .../adapters/gps_l2_m_pcps_acquisition.cc          |  19 +-
 .../adapters/gps_l2_m_pcps_acquisition.h           |   1 -
 ...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc |  12 +-
 ...galileo_e5a_noncoherent_iq_acquisition_caf_cc.h |  12 +-
 .../galileo_pcps_8ms_acquisition_cc.cc             |  14 +-
 .../galileo_pcps_8ms_acquisition_cc.h              |  45 +-
 .../pcps_acquisition_fine_doppler_cc.cc            |  76 +--
 .../pcps_acquisition_fine_doppler_cc.h             |   2 +-
 .../gnuradio_blocks/pcps_acquisition_sc.h          |   5 +-
 .../pcps_assisted_acquisition_cc.cc                |  35 +-
 .../pcps_multithread_acquisition_cc.h              |  46 +-
 .../pcps_quicksync_acquisition_cc.cc               |   7 +-
 .../gnuradio_blocks/pcps_tong_acquisition_cc.cc    |   2 +-
 src/algorithms/channel/adapters/channel.cc         |  15 +-
 src/algorithms/channel/adapters/channel.h          |  18 +-
 src/algorithms/channel/libs/channel_fsm.cc         |  10 +-
 src/algorithms/channel/libs/channel_fsm.h          |  10 +-
 .../adapters/array_signal_conditioner.cc           |  14 +-
 .../adapters/array_signal_conditioner.h            |  16 +-
 .../conditioner/adapters/signal_conditioner.cc     |  10 +-
 .../conditioner/adapters/signal_conditioner.h      |  16 +-
 src/algorithms/input_filter/adapters/fir_filter.cc |  36 +-
 .../input_filter/gnuradio_blocks/beamformer.cc     |  62 +-
 .../libs/galileo_e5_signal_processing.cc           | 104 +--
 src/algorithms/libs/galileo_e5_signal_processing.h |   2 +-
 src/algorithms/libs/gnss_sdr_valve.cc              |   8 +-
 src/algorithms/libs/gnss_sdr_valve.h               |   4 +-
 src/algorithms/libs/gnss_signal_processing.cc      | 198 +++---
 src/algorithms/libs/gps_sdr_signal_processing.cc   |  13 +-
 src/algorithms/libs/pass_through.cc                |   8 +-
 .../volk_gnsssdr_module/volk_gnsssdr/Doxyfile.in   |   2 +-
 .../volk_gnsssdr_module/volk_gnsssdr/README.md     |  19 +-
 .../volk_gnsssdr/apps/CMakeLists.txt               |   1 -
 .../docs/images/VOLK_GNSSSDR_Usage_Example.png     | Bin 0 -> 114963 bytes
 .../volk_gnsssdr/docs/kernels.dox                  |   5 +-
 ...c.h => volk_gnsssdr_16ic_resampler_fast_16ic.h} |  31 +-
 ...> volk_gnsssdr_16ic_resamplerfastpuppet_16ic.h} |  26 +-
 ...volk_gnsssdr_16ic_resamplerfastxnpuppet_16ic.h} |  24 +-
 .../volk_gnsssdr_16ic_resamplerxnpuppet2_16ic.h    | 282 ---------
 .../volk_gnsssdr_16ic_resamplerxnpuppet_16ic.h     | 191 +++++-
 .../volk_gnsssdr_16ic_xn_resampler2_16ic_xn.h      | 591 -----------------
 .../volk_gnsssdr_16ic_xn_resampler_16ic_xn.h       | 699 ++++++++++++++-------
 ... volk_gnsssdr_16ic_xn_resampler_fast_16ic_xn.h} |  26 +-
 .../volk_gnsssdr/volk_gnsssdr_32f_sincos_32fc.h    |  40 +-
 .../volk_gnsssdr/volk_gnsssdr_s32f_sincos_32fc.h   |  36 +-
 .../volk_gnsssdr/lib/CMakeLists.txt                |   2 +-
 .../volk_gnsssdr/lib/kernel_tests.h                |   4 +-
 .../volk_gnsssdr/lib/volk_gnsssdr_rank_archs.c     |   2 +-
 .../volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c          |   2 +-
 .../observables/adapters/galileo_e1_observables.h  |   8 +-
 .../observables/adapters/hybrid_observables.h      |   8 +-
 .../gnuradio_blocks/galileo_e1_observables_cc.cc   |   6 +-
 .../gnuradio_blocks/galileo_e1_observables_cc.h    |   2 +-
 .../gnuradio_blocks/gps_l1_ca_observables_cc.cc    |  10 +-
 .../gnuradio_blocks/gps_l1_ca_observables_cc.h     |   2 +-
 .../gnuradio_blocks/hybrid_observables_cc.cc       |   6 +-
 .../gnuradio_blocks/hybrid_observables_cc.h        |   2 +-
 .../direct_resampler_conditioner_cc.h              |   2 +-
 .../direct_resampler_conditioner_cs.h              |   2 +-
 .../signal_generator/adapters/signal_generator.cc  |  56 +-
 .../gnuradio_blocks/signal_generator_c.cc          | 313 +++++----
 .../gnuradio_blocks/signal_generator_c.h           |   2 +-
 .../signal_source/adapters/file_signal_source.cc   |   8 +-
 .../signal_source/adapters/gn3s_signal_source.h    |   2 +-
 .../adapters/nsr_file_signal_source.cc             |   4 +-
 .../signal_source/adapters/osmosdr_signal_source.h |   2 +-
 .../adapters/raw_array_signal_source.cc            |   8 +-
 .../adapters/raw_array_signal_source.h             |   2 +-
 .../adapters/rtl_tcp_signal_source.cc              | 121 ++--
 .../signal_source/adapters/rtl_tcp_signal_source.h |   2 +-
 .../adapters/spir_file_signal_source.cc            |   2 +-
 .../adapters/two_bit_cpx_file_signal_source.cc     |  16 +-
 .../adapters/two_bit_packed_file_signal_source.cc  |  16 +-
 .../gnuradio_blocks/rtl_tcp_signal_source_c.cc     | 484 +++++++-------
 .../gnuradio_blocks/rtl_tcp_signal_source_c.h      |  21 +-
 .../gnuradio_blocks/unpack_2bit_samples.cc         |   2 +-
 .../unpack_byte_2bit_cpx_samples.cc                |   8 +-
 .../gnuradio_blocks/unpack_byte_2bit_samples.cc    |  15 +-
 .../gnuradio_blocks/unpack_intspir_1bit_samples.cc |  45 +-
 .../adapters/galileo_e5a_telemetry_decoder.cc      |   2 +-
 .../adapters/galileo_e5a_telemetry_decoder.h       |   2 +-
 .../adapters/sbas_l1_telemetry_decoder.cc          |   8 +-
 .../galileo_e1b_telemetry_decoder_cc.cc            |  14 +-
 .../galileo_e5a_telemetry_decoder_cc.cc            |  38 +-
 .../galileo_e5a_telemetry_decoder_cc.h             |   2 +-
 .../gps_l1_ca_telemetry_decoder_cc.cc              |   6 +-
 .../gps_l1_ca_telemetry_decoder_cc.h               |   3 +-
 .../gps_l2_m_telemetry_decoder_cc.cc               |   4 +-
 .../gps_l2_m_telemetry_decoder_cc.h                |   2 +-
 .../sbas_l1_telemetry_decoder_cc.cc                |  10 +-
 .../telemetry_decoder/libs/convolutional.h         |   8 +-
 .../telemetry_decoder/libs/viterbi_decoder.cc      |  38 +-
 .../adapters/galileo_e1_dll_pll_veml_tracking.cc   |   8 +-
 .../adapters/galileo_e1_tcp_connector_tracking.cc  |   8 +-
 .../adapters/galileo_e5a_dll_pll_tracking.cc       |  10 +-
 .../adapters/galileo_e5a_dll_pll_tracking.h        |   2 +-
 .../adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc   |  44 +-
 .../adapters/gps_l1_ca_dll_pll_tracking_gpu.cc     |   8 +-
 .../adapters/gps_l1_ca_tcp_connector_tracking.cc   |  10 +-
 .../tracking/adapters/gps_l2_m_dll_pll_tracking.cc |   8 +-
 .../galileo_e1_dll_pll_veml_tracking_cc.cc         |  20 +-
 .../galileo_e1_tcp_connector_tracking_cc.cc        |  10 +-
 .../galileo_e1_tcp_connector_tracking_cc.h         |   2 +-
 .../galileo_e5a_dll_pll_tracking_cc.cc             | 110 ++--
 .../galileo_e5a_dll_pll_tracking_cc.h              |   2 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc         |  12 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.h          |   2 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.cc         |   4 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.h          |   2 +-
 .../gps_l1_ca_dll_pll_tracking_cc.cc               |   8 +-
 .../gps_l1_ca_dll_pll_tracking_cc.h                |   2 +-
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.cc           |  13 +-
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.h            |   2 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.cc         |  12 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.h          |   2 +-
 .../gps_l2_m_dll_pll_tracking_cc.cc                |  20 +-
 .../gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h |   2 +-
 .../tracking/libs/cpu_multicorrelator.cc           |  14 +-
 .../tracking/libs/cpu_multicorrelator_16sc.cc      |   8 +-
 src/algorithms/tracking/libs/lock_detectors.cc     |  12 +-
 src/algorithms/tracking/libs/lock_detectors.h      |   2 +-
 src/algorithms/tracking/libs/tcp_communication.cc  |  65 +-
 .../tracking/libs/tracking_FLL_PLL_filter.cc       |  18 +-
 .../tracking/libs/tracking_discriminators.cc       |   8 +-
 .../tracking/libs/tracking_discriminators.h        |   8 +-
 src/core/interfaces/configuration_interface.h      |   1 +
 src/core/libs/gnss_sdr_supl_client.cc              |  22 +-
 src/core/libs/string_converter.cc                  |  16 +
 src/core/libs/string_converter.h                   |   1 +
 src/core/receiver/control_thread.cc                | 159 ++---
 src/core/receiver/control_thread.h                 |   6 +
 src/core/receiver/file_configuration.cc            |  15 +
 src/core/receiver/file_configuration.h             |   1 +
 src/core/receiver/gnss_block_factory.cc            |  68 +-
 src/core/receiver/gnss_flowgraph.cc                |  95 +--
 src/core/receiver/in_memory_configuration.cc       |   7 +
 src/core/receiver/in_memory_configuration.h        |   1 +
 src/core/system_parameters/Galileo_E1.h            | 234 +++----
 src/core/system_parameters/Galileo_E5a.h           | 294 ++++-----
 src/core/system_parameters/MATH_CONSTANTS.h        |  12 +-
 src/core/system_parameters/galileo_ephemeris.cc    |  47 +-
 src/core/system_parameters/galileo_fnav_message.cc | 457 +++++++-------
 src/core/system_parameters/galileo_fnav_message.h  |   8 +-
 .../galileo_navigation_message.cc                  |  90 +--
 .../system_parameters/galileo_navigation_message.h |  10 +-
 src/core/system_parameters/gnss_satellite.cc       |  21 +-
 src/core/system_parameters/gps_almanac.h           |   2 +-
 src/core/system_parameters/gps_cnav_ephemeris.h    |   2 +-
 .../gps_cnav_navigation_message.cc                 | 196 +++---
 src/core/system_parameters/gps_ephemeris.cc        |  45 +-
 .../system_parameters/gps_navigation_message.cc    |  45 +-
 src/core/system_parameters/gps_ref_time.h          |  18 +-
 src/core/system_parameters/rtcm.cc                 | 218 ++++---
 src/core/system_parameters/rtcm.h                  |  25 +-
 src/core/system_parameters/sbas_ephemeris.h        |   2 +-
 .../sbas_ionospheric_correction.h                  |   2 +-
 .../system_parameters/sbas_satellite_correction.cc |  10 +-
 .../system_parameters/sbas_satellite_correction.h  |   2 +-
 src/core/system_parameters/sbas_telemetry_data.cc  |   2 +-
 src/core/system_parameters/sbas_telemetry_data.h   |   2 +-
 src/core/system_parameters/sbas_time.h             |  36 +-
 src/main/main.cc                                   |   4 +-
 src/tests/formats/rtcm_test.cc                     |  50 +-
 .../galileo_e1_dll_pll_veml_tracking_test.cc       |   2 +-
 ...pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc |  62 ++
 ..._e1_pcps_ambiguous_acquisition_gsoc2013_test.cc |  33 +-
 ...ileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc |  63 +-
 .../galileo_e1_pcps_ambiguous_acquisition_test.cc  |  22 +-
 ...s_cccwsr_ambiguous_acquisition_gsoc2013_test.cc |  62 ++
 ...uicksync_ambiguous_acquisition_gsoc2014_test.cc |  70 ++-
 ...cps_tong_ambiguous_acquisition_gsoc2013_test.cc |  57 ++
 ...e5a_pcps_acquisition_gsoc2014_gensource_test.cc | 424 ++++---------
 src/tests/gnss_block/galileo_e5a_tracking_test.cc  |   2 +-
 .../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc    |  65 +-
 .../gnss_block/gps_l1_ca_pcps_acquisition_test.cc  |  22 +-
 ..._l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc |  63 ++
 ..._ca_pcps_quicksync_acquisition_gsoc2014_test.cc |  78 ++-
 ...ps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc |  62 ++
 .../gnss_block/gps_l2_m_dll_pll_tracking_test.cc   |  21 +-
 .../gnss_block/gps_l2_m_pcps_acquisition_test.cc   |  25 +-
 src/tests/gnss_block/rtcm_printer_test.cc          |  28 +-
 src/tests/test_main.cc                             |  25 +-
 252 files changed, 4767 insertions(+), 4582 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