[hamradio-commits] [gnss-sdr] 199/236: Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Tue Apr 26 16:02:53 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 1f8f63a46253e7607a4467600b41995dbce273da
Merge: 2eb4973 31ae25c
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Mon Apr 18 18:07:59 2016 +0200
Merge branch 'next' of git+ssh://github.com/gnss-sdr/gnss-sdr into next
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
README.md | 2 +-
conf/gnss-sdr_Hybrid_short.conf | 10 +-
.../galileo_e1_pcps_8ms_ambiguous_acquisition.cc | 13 --
.../galileo_e1_pcps_8ms_ambiguous_acquisition.h | 6 -
.../galileo_e1_pcps_ambiguous_acquisition.cc | 11 --
.../galileo_e1_pcps_ambiguous_acquisition.h | 6 -
...galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc | 14 ---
.../galileo_e1_pcps_cccwsr_ambiguous_acquisition.h | 6 -
...ileo_e1_pcps_quicksync_ambiguous_acquisition.cc | 14 ---
...lileo_e1_pcps_quicksync_ambiguous_acquisition.h | 6 -
.../galileo_e1_pcps_tong_ambiguous_acquisition.cc | 13 --
.../galileo_e1_pcps_tong_ambiguous_acquisition.h | 6 -
.../galileo_e5a_noncoherent_iq_acquisition_caf.cc | 12 --
.../galileo_e5a_noncoherent_iq_acquisition_caf.h | 6 -
.../adapters/gps_l1_ca_pcps_acquisition.cc | 18 ---
.../adapters/gps_l1_ca_pcps_acquisition.h | 6 -
.../gps_l1_ca_pcps_acquisition_fine_doppler.cc | 9 --
.../gps_l1_ca_pcps_acquisition_fine_doppler.h | 6 -
.../gps_l1_ca_pcps_assisted_acquisition.cc | 9 --
.../adapters/gps_l1_ca_pcps_assisted_acquisition.h | 6 -
.../gps_l1_ca_pcps_multithread_acquisition.cc | 12 --
.../gps_l1_ca_pcps_multithread_acquisition.h | 6 -
.../adapters/gps_l1_ca_pcps_opencl_acquisition.cc | 12 --
.../adapters/gps_l1_ca_pcps_opencl_acquisition.h | 6 -
.../gps_l1_ca_pcps_quicksync_acquisition.cc | 12 --
.../gps_l1_ca_pcps_quicksync_acquisition.h | 6 -
.../adapters/gps_l1_ca_pcps_tong_acquisition.cc | 12 --
.../adapters/gps_l1_ca_pcps_tong_acquisition.h | 6 -
.../adapters/gps_l2_m_pcps_acquisition.cc | 12 --
.../adapters/gps_l2_m_pcps_acquisition.h | 6 -
...alileo_e5a_noncoherent_iq_acquisition_caf_cc.cc | 5 +-
...galileo_e5a_noncoherent_iq_acquisition_caf_cc.h | 10 --
.../galileo_pcps_8ms_acquisition_cc.cc | 5 +-
.../galileo_pcps_8ms_acquisition_cc.h | 11 --
.../gnuradio_blocks/pcps_acquisition_cc.cc | 11 +-
.../gnuradio_blocks/pcps_acquisition_cc.h | 11 --
.../pcps_acquisition_fine_doppler_cc.cc | 5 +-
.../pcps_acquisition_fine_doppler_cc.h | 10 --
.../gnuradio_blocks/pcps_acquisition_sc.cc | 5 +-
.../gnuradio_blocks/pcps_acquisition_sc.h | 9 --
.../pcps_assisted_acquisition_cc.cc | 5 +-
.../gnuradio_blocks/pcps_assisted_acquisition_cc.h | 9 --
.../gnuradio_blocks/pcps_cccwsr_acquisition_cc.cc | 5 +-
.../gnuradio_blocks/pcps_cccwsr_acquisition_cc.h | 10 --
.../pcps_multithread_acquisition_cc.cc | 5 +-
.../pcps_multithread_acquisition_cc.h | 10 --
.../gnuradio_blocks/pcps_opencl_acquisition_cc.cc | 4 +-
.../gnuradio_blocks/pcps_opencl_acquisition_cc.h | 11 --
.../pcps_quicksync_acquisition_cc.cc | 5 +-
.../pcps_quicksync_acquisition_cc.h | 10 --
.../gnuradio_blocks/pcps_tong_acquisition_cc.cc | 5 +-
.../gnuradio_blocks/pcps_tong_acquisition_cc.h | 10 --
src/algorithms/channel/adapters/channel.cc | 131 ++++-----------------
src/algorithms/channel/adapters/channel.h | 24 ++--
src/algorithms/channel/libs/CMakeLists.txt | 5 +-
src/algorithms/channel/libs/channel_fsm.cc | 16 ++-
src/algorithms/channel/libs/channel_fsm.h | 1 +
.../channel/libs/channel_msg_receiver_cc.cc | 94 +++++++++++++++
.../channel/libs/channel_msg_receiver_cc.h | 60 ++++++++++
.../libs/gps_l1_ca_subframe_fsm.cc | 1 -
.../libs/gps_l1_ca_subframe_fsm.h | 2 -
.../adapters/galileo_e1_dll_pll_veml_tracking.cc | 12 --
.../adapters/galileo_e1_dll_pll_veml_tracking.h | 5 -
.../adapters/galileo_e1_tcp_connector_tracking.cc | 12 --
.../adapters/galileo_e1_tcp_connector_tracking.h | 5 -
.../adapters/galileo_e5a_dll_pll_tracking.cc | 10 --
.../adapters/galileo_e5a_dll_pll_tracking.h | 5 -
.../adapters/gps_l1_ca_dll_pll_c_aid_tracking.cc | 23 ----
.../adapters/gps_l1_ca_dll_pll_c_aid_tracking.h | 5 -
.../adapters/gps_l1_ca_dll_pll_tracking.cc | 12 --
.../tracking/adapters/gps_l1_ca_dll_pll_tracking.h | 5 -
.../adapters/gps_l1_ca_dll_pll_tracking_gpu.cc | 11 --
.../adapters/gps_l1_ca_dll_pll_tracking_gpu.h | 5 -
.../adapters/gps_l1_ca_tcp_connector_tracking.cc | 10 --
.../adapters/gps_l1_ca_tcp_connector_tracking.h | 5 -
.../tracking/adapters/gps_l2_m_dll_pll_tracking.cc | 10 --
.../tracking/adapters/gps_l2_m_dll_pll_tracking.h | 6 -
.../galileo_e1_dll_pll_veml_tracking_cc.cc | 23 ++--
.../galileo_e1_dll_pll_veml_tracking_cc.h | 2 -
.../galileo_e1_tcp_connector_tracking_cc.cc | 7 --
.../galileo_e1_tcp_connector_tracking_cc.h | 2 -
.../galileo_e5a_dll_pll_tracking_cc.cc | 8 --
.../galileo_e5a_dll_pll_tracking_cc.h | 2 -
.../gps_l1_ca_dll_pll_c_aid_tracking_cc.cc | 21 ++--
.../gps_l1_ca_dll_pll_c_aid_tracking_cc.h | 2 -
.../gps_l1_ca_dll_pll_c_aid_tracking_sc.cc | 7 --
.../gps_l1_ca_dll_pll_c_aid_tracking_sc.h | 2 -
.../gps_l1_ca_dll_pll_tracking_cc.cc | 22 ++--
.../gps_l1_ca_dll_pll_tracking_cc.h | 2 -
.../gps_l1_ca_dll_pll_tracking_gpu_cc.cc | 5 -
.../gps_l1_ca_dll_pll_tracking_gpu_cc.h | 2 -
.../gps_l1_ca_tcp_connector_tracking_cc.cc | 7 --
.../gps_l1_ca_tcp_connector_tracking_cc.h | 2 -
.../gps_l2_m_dll_pll_tracking_cc.cc | 7 --
.../gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h | 2 -
src/core/interfaces/acquisition_interface.h | 1 -
src/core/interfaces/channel_interface.h | 3 -
src/core/interfaces/tracking_interface.h | 1 -
src/core/receiver/control_thread.cc | 3 +-
src/core/receiver/gnss_flowgraph.cc | 29 ++---
src/core/receiver/gnss_flowgraph.h | 1 -
.../galileo_e1_dll_pll_veml_tracking_test.cc | 10 --
...pcps_8ms_ambiguous_acquisition_gsoc2013_test.cc | 13 --
..._e1_pcps_ambiguous_acquisition_gsoc2013_test.cc | 9 --
...ileo_e1_pcps_ambiguous_acquisition_gsoc_test.cc | 5 -
.../galileo_e1_pcps_ambiguous_acquisition_test.cc | 5 -
...s_cccwsr_ambiguous_acquisition_gsoc2013_test.cc | 9 --
...uicksync_ambiguous_acquisition_gsoc2014_test.cc | 13 --
...cps_tong_ambiguous_acquisition_gsoc2013_test.cc | 9 --
...e5a_pcps_acquisition_gsoc2014_gensource_test.cc | 13 --
src/tests/gnss_block/galileo_e5a_tracking_test.cc | 5 -
.../gps_l1_ca_pcps_acquisition_gsoc2013_test.cc | 9 --
.../gnss_block/gps_l1_ca_pcps_acquisition_test.cc | 5 -
...a_pcps_multithread_acquisition_gsoc2013_test.cc | 9 --
..._l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc | 9 --
..._ca_pcps_quicksync_acquisition_gsoc2014_test.cc | 13 --
...ps_l1_ca_pcps_tong_acquisition_gsoc2013_test.cc | 9 --
.../gnss_block/gps_l2_m_dll_pll_tracking_test.cc | 5 -
.../gnss_block/gps_l2_m_pcps_acquisition_test.cc | 5 -
src/tests/single_test_main.cc | 5 -
src/tests/test_main.cc | 38 +++---
src/utils/front-end-cal/main.cc | 2 +-
122 files changed, 298 insertions(+), 980 deletions(-)
diff --cc README.md
index ef614d0,6381ed9..089cdd0
--- a/README.md
+++ b/README.md
@@@ -52,9 -52,9 +52,9 @@@ $ python setup.py buil
$ sudo python setup.py install
$ pybombs recipes add gr-recipes https://github.com/gnuradio/gr-recipes.git
$ pybombs recipes add gr-etcetera https://github.com/gnuradio/gr-etcetera.git
- $ pybombs prefix init /usr/local -a myprefix
+ $ sudo pybombs prefix init /usr/local -a myprefix
$ pybombs config default_prefix myprefix
-$ sudo pybombs install gnuradio gr-osmosdr armadillo glog
+$ pybombs install gnuradio gr-osmosdr armadillo glog
~~~~~~
Other installation and configuration options are available from https://github.com/gnuradio/pybombs
diff --cc conf/gnss-sdr_Hybrid_short.conf
index 03455ff,03455ff..bf31786
--- a/conf/gnss-sdr_Hybrid_short.conf
+++ b/conf/gnss-sdr_Hybrid_short.conf
@@@ -172,9 -172,9 +172,9 @@@ Resampler.sample_freq_out=400000
;######### CHANNELS GLOBAL CONFIG ############
;#count: Number of available GPS satellite channels.
--Channels_1C.count=2
++Channels_1C.count=5
;#count: Number of available Galileo satellite channels.
--Channels_1B.count=4
++Channels_1B.count=0
;#in_acquisition: Number of channels simultaneously acquiring for the whole receiver
Channels.in_acquisition=1
@@@ -185,9 -185,9 +185,9 @@@
;# "5X" GALILEO E5a I+Q
Channel0.signal=1C
Channel1.signal=1C
--Channel2.signal=1B
--Channel3.signal=1B
--Channel4.signal=1B
++Channel2.signal=1C
++Channel3.signal=1C
++Channel4.signal=1C
Channel5.signal=1B
Channel6.signal=1B
Channel7.signal=1B
--
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