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

Carles Fernandez carles_fernandez-guest at moszumanska.debian.org
Sat Feb 6 19:42:56 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 cd2da4e4a7b5800918195df88f7c483b87d864bf
Merge: f4aaa0f 3b4fdfa
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sat Jul 18 14:32:06 2015 +0200

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

 CMakeLists.txt                                     |  56 +-
 README.md                                          | 160 ++--
 conf/gnss-sdr.conf                                 |  16 +-
 conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf       |  33 +-
 ...=> gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf} | 104 +--
 conf/gnss-sdr_GPS_L1_gr_complex.conf               |   6 +-
 conf/gnss-sdr_GPS_L1_rtl_tcp_realtime.conf         |  19 +-
 ...-sdr.conf => gnss-sdr_GPS_L1_two_bits_cpx.conf} | 120 ++-
 conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf          | 209 ++++++
 conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf      | 164 +++++
 conf/gnss-sdr_Galileo_E5a.conf                     |  66 +-
 conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf           |  82 +--
 conf/gnss-sdr_Hybrid_byte.conf                     | 115 +--
 conf/gnss-sdr_Hybrid_nsr.conf                      | 123 ++--
 conf/gnss-sdr_Hybrid_short.conf                    | 130 ++--
 ...tichannel_GPS_L1_Flexiband_realtime_III_1a.conf |  75 +-
 ...tichannel_GPS_L1_Flexiband_realtime_III_1b.conf |  73 +-
 ...ltichannel_GPS_L1_Flexiband_realtime_II_3b.conf |  22 +-
 ...ultichannel_GPS_L1_Flexiband_realtime_I_1b.conf |  77 +-
 ...annel_GPS_L1_L2_Flexiband_realtime_III_1b.conf} | 272 +++++--
 ..._L2_Galileo_E1B_Flexiband_realtime_III_1b.conf} | 293 ++++++--
 ...sdr_multichannel_GPS_L1_USRP_X300_realtime.conf |  90 +--
 ...hannel_GPS_L2_M_Flexiband_bin_file_III_1a.conf} | 249 +++++--
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1b.conf | 659 +++++++++++++++++
 conf/gnss-sdr_multisource_Hybrid_nsr.conf          | 121 +--
 drivers/gr-gn3s/CMakeLists.txt                     |   7 +-
 drivers/gr-gn3s/README                             |  69 --
 drivers/gr-gn3s/README.md                          | 111 +++
 .../cmake/Modules/FindGnuradioRuntime.cmake        | 131 +++-
 drivers/gr-gn3s/cmake/Modules/FindUSB.cmake        |   2 +
 drivers/gr-gn3s/cmake/Modules/GrSwig.cmake         |  55 +-
 drivers/gr-gn3s/cmake/Modules/GrTest.cmake         |   9 +-
 drivers/gr-gn3s/include/CMakeLists.txt             |  17 +-
 drivers/gr-gn3s/lib/CMakeLists.txt                 |  22 +-
 drivers/gr-gn3s/python/CMakeLists.txt              |  17 +-
 drivers/gr-gn3s/swig/CMakeLists.txt                |  17 +-
 src/algorithms/PVT/adapters/galileo_e1_pvt.h       |   2 +-
 src/algorithms/PVT/adapters/gps_l1_ca_pvt.h        |   1 -
 src/algorithms/PVT/adapters/hybrid_pvt.h           |   1 -
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc       |   2 +-
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.h        |   2 +-
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc        |   2 +-
 .../PVT/gnuradio_blocks/hybrid_pvt_cc.cc           |   5 +-
 src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h |   4 +-
 src/algorithms/PVT/libs/galileo_e1_ls_pvt.cc       |  75 +-
 src/algorithms/PVT/libs/galileo_e1_ls_pvt.h        |   6 +-
 src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.cc        |  58 +-
 src/algorithms/PVT/libs/gps_l1_ca_ls_pvt.h         |   6 +-
 src/algorithms/PVT/libs/hybrid_ls_pvt.cc           |  63 +-
 src/algorithms/PVT/libs/hybrid_ls_pvt.h            |   6 +-
 src/algorithms/PVT/libs/nmea_printer.cc            |   2 +-
 src/algorithms/PVT/libs/rinex_printer.cc           |  14 +-
 src/algorithms/PVT/libs/rinex_printer.h            | 139 ++--
 src/algorithms/PVT/libs/rtcm_printer.cc            |   8 +-
 src/algorithms/acquisition/adapters/CMakeLists.txt |   1 +
 .../galileo_e1_pcps_8ms_ambiguous_acquisition.cc   |  10 +-
 .../galileo_e1_pcps_ambiguous_acquisition.cc       |  16 +-
 ...galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc |  10 +-
 ...ileo_e1_pcps_quicksync_ambiguous_acquisition.cc |  40 +-
 .../galileo_e1_pcps_tong_ambiguous_acquisition.cc  |  11 +-
 .../galileo_e5a_noncoherent_iq_acquisition_caf.cc  |  18 +-
 .../adapters/gps_l1_ca_pcps_acquisition.cc         |  24 +-
 .../gps_l1_ca_pcps_acquisition_fine_doppler.cc     |  26 +-
 .../gps_l1_ca_pcps_assisted_acquisition.cc         |  27 +-
 .../gps_l1_ca_pcps_multithread_acquisition.cc      |  37 +-
 .../adapters/gps_l1_ca_pcps_opencl_acquisition.cc  |  37 +-
 .../gps_l1_ca_pcps_quicksync_acquisition.cc        |  32 +-
 .../adapters/gps_l1_ca_pcps_tong_acquisition.cc    |  11 +-
 ...acquisition.cc => gps_l2_m_pcps_acquisition.cc} |  91 +--
 .../adapters/gps_l2_m_pcps_acquisition.h           | 176 +++++
 ...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc |  36 +-
 .../galileo_pcps_8ms_acquisition_cc.cc             |  11 +
 .../gnuradio_blocks/pcps_acquisition_cc.cc         |  22 +-
 .../gnuradio_blocks/pcps_acquisition_cc.h          |   2 +-
 .../pcps_acquisition_fine_doppler_cc.cc            |  15 +
 .../pcps_assisted_acquisition_cc.cc                |  18 +-
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc  |  11 +
 .../pcps_multithread_acquisition_cc.cc             |  11 +
 .../pcps_quicksync_acquisition_cc.cc               |  27 +-
 .../gnuradio_blocks/pcps_tong_acquisition_cc.cc    |  12 +
 src/algorithms/channel/adapters/channel.cc         |  33 +-
 src/algorithms/channel/adapters/channel.h          |   6 +-
 src/algorithms/channel/libs/CMakeLists.txt         |   4 +-
 src/algorithms/channel/libs/channel_fsm.cc         | 222 ++++++
 .../{gps_l1_ca_channel_fsm.h => channel_fsm.h}     |  33 +-
 .../channel/libs/gps_l1_ca_channel_fsm.cc          | 217 ------
 .../input_filter/adapters/beamformer_filter.cc     |   1 +
 .../adapters/freq_xlating_fir_filter.cc            |   1 +
 src/algorithms/libs/CMakeLists.txt                 |   1 +
 .../libs/galileo_e1_signal_processing.cc           |   2 +-
 .../libs/galileo_e5_signal_processing.cc           |  30 +-
 src/algorithms/libs/gnss_signal_processing.cc      |  41 +-
 src/algorithms/libs/gps_l2c_signal.cc              | 133 ++++
 .../libs/gps_l2c_signal.h}                         |  26 +-
 src/algorithms/libs/gps_sdr_signal_processing.cc   |  56 +-
 .../kernels/volk_gnsssdr/volk_gnsssdr_8i_max_s8i.h |  24 +-
 .../volk_gnsssdr/lib/qa_utils.cc                   |   2 +-
 .../volk_gnsssdr/lib/volk_gnsssdr_prefs.c          |   2 +-
 src/algorithms/observables/adapters/CMakeLists.txt |   1 +
 .../observables/adapters/galileo_e1_observables.cc |   2 -
 .../observables/adapters/galileo_e1_observables.h  |   1 -
 .../observables/adapters/gps_l1_ca_observables.cc  |   4 +-
 .../observables/adapters/gps_l1_ca_observables.h   |   2 +-
 .../observables/adapters/hybrid_observables.cc     |   2 -
 .../observables/adapters/hybrid_observables.h      |   1 -
 ...{hybrid_observables.cc => mixed_observables.cc} |  37 +-
 ...gps_l1_ca_observables.h => mixed_observables.h} |  29 +-
 .../observables/gnuradio_blocks/CMakeLists.txt     |   1 +
 .../gnuradio_blocks/galileo_e1_observables_cc.cc   |   6 +-
 .../gnuradio_blocks/galileo_e1_observables_cc.h    |   4 +-
 .../gnuradio_blocks/gps_l1_ca_observables_cc.cc    |   5 +-
 .../gnuradio_blocks/gps_l1_ca_observables_cc.h     |   4 +-
 .../gnuradio_blocks/hybrid_observables_cc.cc       |   8 +-
 .../gnuradio_blocks/hybrid_observables_cc.h        |   4 +-
 ...a_observables_cc.cc => mixed_observables_cc.cc} | 106 +--
 ..._e1_observables_cc.h => mixed_observables_cc.h} |  39 +-
 .../adapters/direct_resampler_conditioner.h        |   1 -
 src/algorithms/signal_source/CMakeLists.txt        |   1 +
 .../signal_source/adapters/CMakeLists.txt          |  71 +-
 .../adapters/rtl_tcp_signal_source.cc              | 187 +++++
 ...uhd_signal_source.h => rtl_tcp_signal_source.h} |  74 +-
 .../adapters/two_bit_cpx_file_signal_source.cc     | 336 +++++++++
 .../adapters/two_bit_cpx_file_signal_source.h      | 127 ++++
 .../signal_source/adapters/uhd_signal_source.cc    |   4 +-
 .../signal_source/adapters/uhd_signal_source.h     |   1 +
 .../signal_source/gnuradio_blocks/CMakeLists.txt   |   9 +-
 .../gnuradio_blocks/rtl_tcp_signal_source_c.cc     | 321 ++++++++
 .../gnuradio_blocks/rtl_tcp_signal_source_c.h      | 123 ++++
 .../unpack_byte_2bit_cpx_samples.cc                | 107 +++
 .../gnuradio_blocks/unpack_byte_2bit_cpx_samples.h |  64 ++
 .../signal_source/{ => libs}/CMakeLists.txt        |   9 +-
 .../signal_source/libs/rtl_tcp_commands.cc}        |  29 +-
 .../signal_source/libs/rtl_tcp_commands.h}         |  35 +-
 .../signal_source/libs/rtl_tcp_dongle_info.cc      | 144 ++++
 .../signal_source/libs/rtl_tcp_dongle_info.h       |  80 ++
 .../telemetry_decoder/adapters/CMakeLists.txt      |  11 +-
 .../adapters/galileo_e1b_telemetry_decoder.cc      |   6 +
 .../adapters/galileo_e5a_telemetry_decoder.cc      |   1 +
 .../adapters/gps_l1_ca_telemetry_decoder.cc        |   1 +
 ...ry_decoder.cc => gps_l2_m_telemetry_decoder.cc} |  51 +-
 .../adapters/gps_l2_m_telemetry_decoder.h}         |  45 +-
 .../adapters/sbas_l1_telemetry_decoder.cc          |   1 +
 .../gnuradio_blocks/CMakeLists.txt                 |   1 +
 .../galileo_e1b_telemetry_decoder_cc.cc            |  47 +-
 .../galileo_e1b_telemetry_decoder_cc.h             |  10 +
 .../galileo_e5a_telemetry_decoder_cc.cc            |  19 +-
 .../galileo_e5a_telemetry_decoder_cc.h             |   2 +-
 .../gps_l1_ca_telemetry_decoder_cc.cc              |   8 +-
 .../gps_l2_m_telemetry_decoder_cc.cc               | 527 +++++++++++++
 .../gps_l2_m_telemetry_decoder_cc.h                | 167 +++++
 .../sbas_l1_telemetry_decoder_cc.cc                |   3 +-
 .../libs/gps_l1_ca_subframe_fsm.cc                 |   7 +
 .../telemetry_decoder/libs/viterbi_decoder.cc      |  53 +-
 .../telemetry_decoder/libs/viterbi_decoder.h       |   1 +
 src/algorithms/tracking/adapters/CMakeLists.txt    |   1 +
 .../adapters/galileo_e1_dll_pll_veml_tracking.cc   |   6 +-
 .../adapters/galileo_e1_tcp_connector_tracking.cc  |   4 +-
 .../adapters/galileo_e5a_dll_pll_tracking.cc       |   3 +
 .../galileo_volk_e1_dll_pll_veml_tracking.cc       |   4 +
 .../adapters/gps_l1_ca_dll_fll_pll_tracking.cc     |   3 +
 .../adapters/gps_l1_ca_dll_pll_optim_tracking.cc   |   4 +
 .../adapters/gps_l1_ca_dll_pll_tracking.cc         |   3 +
 .../adapters/gps_l1_ca_tcp_connector_tracking.cc   |   4 +
 ...ll_tracking.cc => gps_l2_m_dll_pll_tracking.cc} |  37 +-
 .../adapters/gps_l2_m_dll_pll_tracking.h}          |  77 +-
 .../tracking/gnuradio_blocks/CMakeLists.txt        |   3 +-
 .../galileo_e1_dll_pll_veml_tracking_cc.cc         |  26 +-
 .../galileo_e1_tcp_connector_tracking_cc.cc        |  12 +
 .../galileo_e5a_dll_pll_tracking_cc.cc             |  82 ++-
 .../galileo_volk_e1_dll_pll_veml_tracking_cc.cc    |  11 +-
 .../gps_l1_ca_dll_fll_pll_tracking_cc.cc           |  16 +
 .../gps_l1_ca_dll_pll_optim_tracking_cc.cc         |  10 +
 .../gps_l1_ca_dll_pll_tracking_cc.cc               |  64 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.cc         |  14 +-
 ...cking_cc.cc => gps_l2_m_dll_pll_tracking_cc.cc} | 185 +++--
 .../gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h | 186 +++++
 src/algorithms/tracking/libs/CMakeLists.txt        |   3 +-
 src/algorithms/tracking/libs/cordic.cc             | 194 -----
 src/algorithms/tracking/libs/cordic.h              |  80 --
 .../tracking/libs/tracking_2nd_DLL_filter.h        |  22 +-
 .../tracking/libs/tracking_2nd_PLL_filter.h        |  28 +-
 .../tracking/libs/tracking_FLL_PLL_filter.cc       |  14 +-
 src/core/interfaces/channel_interface.h            |   2 +-
 src/core/libs/gnss_sdr_supl_client.cc              |  11 +-
 src/core/receiver/CMakeLists.txt                   |  59 +-
 src/core/receiver/concurrent_map.h                 |   8 +-
 src/core/receiver/control_thread.cc                |   8 +-
 src/core/receiver/gnss_block_factory.cc            | 811 +++++++++++++++++++--
 src/core/receiver/gnss_block_factory.h             |  36 +-
 src/core/receiver/gnss_flowgraph.cc                | 175 +++--
 src/core/system_parameters/CMakeLists.txt          |   4 +
 src/core/system_parameters/GPS_L2C.h               | 218 ++++++
 src/core/system_parameters/MATH_CONSTANTS.h        |   5 +
 src/core/system_parameters/galileo_almanac.cc      |  64 +-
 src/core/system_parameters/galileo_almanac.h       |   8 +-
 src/core/system_parameters/galileo_ephemeris.cc    |  18 +-
 .../galileo_navigation_message.cc                  |  17 +
 src/core/system_parameters/gnss_satellite.cc       | 193 ++---
 src/core/system_parameters/gnss_satellite.h        |   2 +-
 src/core/system_parameters/gnss_signal.cc          |   7 +-
 src/core/system_parameters/gnss_signal.h           |   2 +-
 src/core/system_parameters/gps_acq_assist.cc       |  15 +-
 src/core/system_parameters/gps_almanac.cc          |  16 +-
 src/core/system_parameters/gps_cnav_ephemeris.cc   |  97 +++
 src/core/system_parameters/gps_cnav_ephemeris.h    | 177 +++++
 .../{gps_iono.cc => gps_cnav_iono.cc}              |  19 +-
 src/core/system_parameters/gps_cnav_iono.h         |  81 ++
 .../gps_cnav_navigation_message.cc                 | 372 ++++++++++
 .../gps_cnav_navigation_message.h                  | 126 ++++
 .../{gps_ref_location.cc => gps_cnav_utc_model.cc} |  23 +-
 src/core/system_parameters/gps_cnav_utc_model.h    |  85 +++
 src/core/system_parameters/gps_ephemeris.cc        |  25 +-
 src/core/system_parameters/gps_iono.cc             |   9 +-
 .../system_parameters/gps_navigation_message.cc    |   9 +
 .../system_parameters/gps_navigation_message.h     |   1 +
 src/core/system_parameters/gps_ref_location.cc     |   3 +
 src/core/system_parameters/gps_ref_time.cc         |   4 +
 src/core/system_parameters/sbas_telemetry_data.cc  |   2 +-
 src/core/system_parameters/sbas_time.h             |   3 +
 src/main/main.cc                                   |  66 +-
 src/tests/CMakeLists.txt                           |   7 +-
 src/tests/arithmetic/code_generation_test.cc       | 182 +++++
 src/tests/arithmetic/complex_carrier_test.cc       |  17 +-
 src/tests/arithmetic/conjugate_test.cc             |   6 +-
 src/tests/arithmetic/magnitude_squared_test.cc     |   6 +-
 src/tests/arithmetic/multiply_test.cc              |  15 +-
 src/tests/data/gps_l2c_m_prn7_5msps.dat            | Bin 0 -> 8000000 bytes
 src/tests/gnss_block/fir_filter_test.cc            |   1 +
 .../galileo_e1_dll_pll_veml_tracking_test.cc       |   1 +
 ...pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc |  16 +-
 ..._e1_pcps_ambiguous_acquisition_gsoc2013_test.cc |  35 +-
 ...ileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc |   1 +
 .../galileo_e1_pcps_ambiguous_acquisition_test.cc  |   1 +
 ...s_cccwsr_ambiguous_acquisition_gsoc2013_test.cc |  16 +-
 ...uicksync_ambiguous_acquisition_gsoc2014_test.cc |  20 +-
 ...cps_tong_ambiguous_acquisition_gsoc2013_test.cc |  16 +-
 ...e5a_pcps_acquisition_gsoc2014_gensource_test.cc |  53 +-
 src/tests/gnss_block/galileo_e5a_tracking_test.cc  |   3 +-
 .../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc    |  17 +-
 .../gnss_block/gps_l1_ca_pcps_acquisition_test.cc  |   1 +
 ...a_pcps_multithread_acquisition_gsoc2013_test.cc |  35 +-
 ..._l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc |  16 +-
 ..._ca_pcps_quicksync_acquisition_gsoc2014_test.cc |  43 +-
 ...ps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc |  35 +-
 ...g_test.cc => gps_l2_m_dll_pll_tracking_test.cc} |  76 +-
 ...n_test.cc => gps_l2_m_pcps_acquisition_test.cc} | 107 ++-
 src/tests/single_test_main.cc                      |   7 +
 src/tests/test_main.cc                             |  25 +-
 src/utils/front-end-cal/CMakeLists.txt             |   6 +-
 src/utils/front-end-cal/front_end_cal.cc           |  31 +-
 src/utils/front-end-cal/front_end_cal.h            |   4 +-
 src/utils/front-end-cal/main.cc                    | 107 ++-
 252 files changed, 10436 insertions(+), 3040 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