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

Carles Fernandez carles_fernandez-guest at moszumanska.debian.org
Tue Apr 26 16:02:48 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 9fa3e4df3377a8cab68c3c9330cb3b4295f5fc11
Merge: 8a11105 150aceb
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Thu Apr 7 09:22:08 2016 +0200

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

 README.md                                          |  13 -
 conf/gnss-sdr.conf                                 |   5 -
 conf/gnss-sdr_GPS_L1_GN3S_realtime.conf            |   3 -
 conf/gnss-sdr_GPS_L1_SPIR.conf                     |   5 -
 conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf       |   5 -
 conf/gnss-sdr_GPS_L1_USRP_X300_realtime_new.conf   |   5 -
 conf/gnss-sdr_GPS_L1_USRP_realtime.conf            |   5 -
 conf/gnss-sdr_GPS_L1_acq_QuickSync.conf            |   5 -
 conf/gnss-sdr_GPS_L1_gr_complex.conf               |   3 -
 conf/gnss-sdr_GPS_L1_gr_complex_gpu.conf           |   5 -
 conf/gnss-sdr_GPS_L1_ishort.conf                   |   3 -
 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          |   4 -
 conf/gnss-sdr_GPS_L1_two_bits_cpx.conf             |   3 -
 conf/gnss-sdr_GPS_L2C_USRP1_realtime.conf          |   5 -
 conf/gnss-sdr_GPS_L2C_USRP_X300_realtime.conf      |   5 -
 conf/gnss-sdr_Galileo_E1_USRP_X300_realtime.conf   |   3 -
 conf/gnss-sdr_Galileo_E1_acq_QuickSync.conf        |   5 -
 conf/gnss-sdr_Galileo_E1_nsr.conf                  |   3 -
 conf/gnss-sdr_Galileo_E1_short.conf                |   5 -
 conf/gnss-sdr_Galileo_E5a.conf                     |   5 -
 conf/gnss-sdr_Galileo_E5a_IFEN_CTTC.conf           |   8 +-
 conf/gnss-sdr_Hybrid_byte.conf                     |   5 -
 conf/gnss-sdr_Hybrid_byte_sim.conf                 |   5 -
 conf/gnss-sdr_Hybrid_gr_complex.conf               |   5 -
 conf/gnss-sdr_Hybrid_nsr.conf                      |  17 +-
 conf/gnss-sdr_Hybrid_short.conf                    |   5 -
 ...tichannel_GPS_L1_Flexiband_bin_file_III_1a.conf |   5 -
 ...tichannel_GPS_L1_Flexiband_realtime_III_1a.conf |   5 -
 ...tichannel_GPS_L1_Flexiband_realtime_III_1b.conf |   5 -
 ...ltichannel_GPS_L1_Flexiband_realtime_II_3b.conf |   5 -
 ...ultichannel_GPS_L1_Flexiband_realtime_I_1b.conf |   5 -
 ...hannel_GPS_L1_L2_Flexiband_realtime_III_1b.conf |   5 -
 ...1_L2_Galileo_E1B_Flexiband_realtime_III_1b.conf |   5 -
 ...sdr_multichannel_GPS_L1_USRP_X300_realtime.conf |   5 -
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1a.conf |   5 -
 ...channel_GPS_L2_M_Flexiband_bin_file_III_1b.conf |   5 -
 conf/gnss-sdr_multisource_Hybrid_nsr.conf          |   5 -
 conf/gnss-sdr_multisource_Hybrid_short.conf        |   5 -
 docs/doxygen/other/main_page.dox                   |   5 -
 src/algorithms/CMakeLists.txt                      |   1 -
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc       |  27 +-
 .../PVT/gnuradio_blocks/galileo_e1_pvt_cc.h        |   3 +
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc        |  31 +-
 .../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h         |   3 +
 .../PVT/gnuradio_blocks/hybrid_pvt_cc.cc           |  27 +-
 src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h |   3 +
 ...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc |   3 +-
 .../galileo_pcps_8ms_acquisition_cc.cc             |   3 +-
 .../gnuradio_blocks/pcps_acquisition_cc.cc         |   3 +-
 .../pcps_acquisition_fine_doppler_cc.cc            |   3 +-
 .../gnuradio_blocks/pcps_acquisition_sc.cc         |   3 +-
 .../pcps_assisted_acquisition_cc.cc                |   3 +-
 .../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc  |   3 +-
 .../pcps_multithread_acquisition_cc.cc             |   3 +-
 .../gnuradio_blocks/pcps_opencl_acquisition_cc.cc  |   3 +-
 .../pcps_quicksync_acquisition_cc.cc               |   3 +-
 .../gnuradio_blocks/pcps_tong_acquisition_cc.cc    |   3 +-
 src/algorithms/output_filter/CMakeLists.txt        |  19 -
 .../output_filter/adapters/CMakeLists.txt          |  37 --
 .../output_filter/adapters/file_output_filter.cc   | 105 ----
 .../output_filter/adapters/file_output_filter.h    |  83 ---
 .../adapters/null_sink_output_filter.cc            | 105 ----
 .../adapters/null_sink_output_filter.h             |  88 ---
 .../gnuradio_blocks/signal_generator_c.cc          |  11 +-
 .../signal_source/adapters/gen_signal_source.h     |   1 -
 .../galileo_e1b_telemetry_decoder_cc.cc            |   7 +-
 .../galileo_e5a_telemetry_decoder_cc.cc            |  16 +-
 .../gps_l1_ca_telemetry_decoder_cc.cc              |  10 +-
 .../gps_l2_m_telemetry_decoder_cc.cc               |  13 +-
 .../sbas_l1_telemetry_decoder_cc.cc                |   8 +-
 src/algorithms/tracking/adapters/CMakeLists.txt    |   1 -
 .../adapters/gps_l1_ca_dll_fll_pll_tracking.cc     | 163 -----
 .../adapters/gps_l1_ca_dll_fll_pll_tracking.h      |  99 ---
 .../adapters/gps_l1_ca_tcp_connector_tracking.cc   |   6 -
 .../tracking/gnuradio_blocks/CMakeLists.txt        |   1 -
 .../galileo_e1_dll_pll_veml_tracking_cc.cc         |  65 +-
 .../galileo_e1_dll_pll_veml_tracking_cc.h          |   1 -
 .../galileo_e1_tcp_connector_tracking_cc.cc        | 213 ++-----
 .../galileo_e1_tcp_connector_tracking_cc.h         |  19 +-
 .../galileo_e5a_dll_pll_tracking_cc.cc             | 253 +++-----
 .../galileo_e5a_dll_pll_tracking_cc.h              |  27 +-
 .../gps_l1_ca_dll_fll_pll_tracking_cc.cc           | 690 ---------------------
 .../gps_l1_ca_dll_fll_pll_tracking_cc.h            | 206 ------
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc         |  50 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_cc.h          |   1 -
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.cc         |  48 +-
 .../gps_l1_ca_dll_pll_c_aid_tracking_sc.h          |   2 +-
 .../gps_l1_ca_dll_pll_tracking_cc.cc               | 256 ++------
 .../gps_l1_ca_dll_pll_tracking_cc.h                |  27 +-
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.cc           |  48 +-
 .../gps_l1_ca_dll_pll_tracking_gpu_cc.h            |   2 +-
 .../gps_l1_ca_tcp_connector_tracking_cc.cc         | 225 ++-----
 .../gps_l1_ca_tcp_connector_tracking_cc.h          |  30 +-
 .../gps_l2_m_dll_pll_tracking_cc.cc                | 245 ++------
 .../gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h |  25 +-
 src/algorithms/tracking/libs/CMakeLists.txt        |   1 -
 src/algorithms/tracking/libs/correlator.cc         | 201 ------
 src/algorithms/tracking/libs/correlator.h          |  99 ---
 src/algorithms/tracking/libs/volk_cw_epl_corr.h    | 202 ------
 src/core/receiver/CMakeLists.txt                   |   2 -
 src/core/receiver/gnss_block_factory.cc            |  37 --
 src/core/receiver/gnss_flowgraph.cc                |  29 +-
 src/core/receiver/gnss_flowgraph.h                 |   1 -
 src/tests/CMakeLists.txt                           |   7 -
 src/tests/control_thread/control_thread_test.cc    |   4 -
 src/tests/flowgraph/gnss_flowgraph_test.cc         |   9 -
 src/tests/gnss_block/file_output_filter_test.cc    |  47 --
 ...e5a_pcps_acquisition_gsoc2014_gensource_test.cc |   1 -
 src/tests/gnss_block/gnss_block_factory_test.cc    |  35 --
 src/tests/test_main.cc                             |   1 -
 113 files changed, 479 insertions(+), 3748 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