[hamradio-commits] [gnss-sdr] 199/303: Merge branch 'mako' of https://github.com/carlesfernandez/gnss-sdr into no-cheetah
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Mon Feb 13 22:36:01 UTC 2017
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.
commit 9664b65720d54fdf89fa840dc949c1d5dbcc52e8
Merge: ec51b6c 05632aa
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Sun Dec 25 19:10:02 2016 +0100
Merge branch 'mako' of https://github.com/carlesfernandez/gnss-sdr into
no-cheetah
# Conflicts:
# src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
README.md | 5 +-
conf/gnss-sdr.conf | 2 +-
.../volk_gnsssdr/CMakeLists.txt | 9 +-
.../volk_gnsssdr_module/volk_gnsssdr/README.md | 2 +-
.../volk_gnsssdr/gen/volk_gnsssdr_tmpl_utils.py | 24 +----
.../volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.c | 106 ++++++++++-----------
.../volk_gnsssdr/tmpl/volk_gnsssdr.tmpl.h | 14 +--
.../tmpl/volk_gnsssdr_config_fixed.tmpl.h | 10 +-
.../volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.c | 25 +++--
.../volk_gnsssdr/tmpl/volk_gnsssdr_cpu.tmpl.h | 6 +-
.../tmpl/volk_gnsssdr_machine_xxx.tmpl.c | 76 ++++++---------
.../volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.c | 8 +-
.../volk_gnsssdr/tmpl/volk_gnsssdr_machines.tmpl.h | 24 ++---
.../volk_gnsssdr/tmpl/volk_gnsssdr_typedefs.tmpl.h | 6 +-
.../gps_l1_ca_dll_pll_tracking_cc.cc | 10 +-
15 files changed, 150 insertions(+), 177 deletions(-)
diff --cc README.md
index 59f8726,81cd933..26a7b13
--- a/README.md
+++ b/README.md
@@@ -11,19 -11,19 +11,19 @@@ If you have questions about GNSS-SDR, p
# How to build GNSS-SDR
-This section describes how to set up the compilation environment in GNU/Linux or [Mac OS X](#macosx), and to build GNSS-SDR. See also [our Building Guide](http://gnss-sdr.org/documentation/building-guide "GNSS-SDR's Building Guide").
+This section describes how to set up the compilation environment in GNU/Linux or [macOS / Mac OS X](#macosx), and to build GNSS-SDR. See also our [build and install page](http://gnss-sdr.org/build-and-install/ "GNSS-SDR's Build and Install").
-GNU/Linux
+GNU/Linux
----------
- * Tested distributions: Ubuntu 14.04 LTS and above, Debian 8.0 "jessie" and above, Linaro 15.03
- * Tested distributions: Ubuntu from 14.04 LTS to 16.04 LTS, Debian 8.0 "jessie", Linaro 15.03
++ * Tested distributions: Ubuntu 14.04 LTS and [above](http://packages.ubuntu.com/search?keywords=gnss-sdr), Debian 8.0 "jessie" and [above](https://packages.debian.org/search?searchon=names&keywords=gnss-sdr), Linaro 15.03
* Known to work but not continually tested: Arch Linux, Fedora, and openSUSE
- * Supported microprocessor architectures:
- * i386: Intel x86 instruction set (32-bit microprocessors).
+ * Supported microprocessor architectures:
+ * i386: Intel x86 instruction set (32-bit microprocessors).
* amd64: also known as x86-64, the 64-bit version of the x86 instruction set, originally created by AMD and implemented by AMD, Intel, VIA and others.
* armel: ARM embedded ABI, supported on ARM v4t and higher.
- * armhf: ARM hard float, ARMv7 + VFP3-D16 floating-point hardware extension + Thumb-2 instruction set and above.
+ * armhf: ARM hard float, ARMv7 + VFP3-D16 floating-point hardware extension + Thumb-2 instruction set and above.
* arm64: ARM 64 bits or ARMv8.
* mips: MIPS architecture (big-endian, such as those manufactured by SGI).
* mipsel: MIPS architecture (little-endian, such as Loongson 3).
@@@ -46,7 -46,7 +46,8 @@@ $ sudo apt-get install build-essential
libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev \
libboost-serialization-dev libboost-program-options-dev libboost-test-dev \
liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev \
-- libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev libgtest-dev
++ libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev libgtest-dev \
++ python-mako python-six
~~~~~~
Alternatively, and starting from Ubuntu 16.04 LTS, you can install all the required dependencies by adding the line
diff --cc conf/gnss-sdr.conf
index 88a66f3,88a66f3..a5cfb31
--- a/conf/gnss-sdr.conf
+++ b/conf/gnss-sdr.conf
@@@ -29,7 -29,7 +29,7 @@@ GNSS-SDR.SUPL_CI=0x31b
SignalSource.implementation=File_Signal_Source
;#filename: path to file with the captured GNSS signal samples to be processed
--SignalSource.filename=/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ; <- PUT YOUR FILE HERE
++SignalSource.filename=/Users/carlesfernandez/Documents/workspace/code2/trunk/data/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ;/datalogger/signals/CTTC/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN/2013_04_04_GNSS_SIGNAL_at_CTTC_SPAIN.dat ; <- PUT YOUR FILE HERE
;#item_type: Type and resolution for each of the signal samples.
SignalSource.item_type=ishort
diff --cc src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
index 1c455b9,6b68d62..1f69938
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
@@@ -74,23 -74,17 +74,24 @@@ SET(CROSSCOMPILE_MULTILIB ${CROSSCOMPIL
# Python
include(VolkPython) #sets PYTHON_EXECUTABLE and PYTHON_DASH_B
-VOLK_PYTHON_CHECK_MODULE("python >= 2.5" sys "sys.version.split()[0] >= '2.5'" PYTHON_MIN_VER_FOUND)
+VOLK_PYTHON_CHECK_MODULE("python >= 2.7" sys "sys.version.split()[0] >= '2.7'" PYTHON_MIN_VER_FOUND)
- VOLK_PYTHON_CHECK_MODULE("Cheetah >= 2.0.0" Cheetah "Cheetah.Version >= '2.0.0'" CHEETAH_FOUND)
+ VOLK_PYTHON_CHECK_MODULE("mako >= 0.9.1" mako "mako.__version__ >= '0.9.1'" MAKO_FOUND)
+VOLK_PYTHON_CHECK_MODULE("six - python 2 and 3 compatibility library" six "True" SIX_FOUND)
+
+
if(NOT PYTHON_MIN_VER_FOUND)
- message(FATAL_ERROR "Python 2.5 or greater required to build VOLK_GNSSSDR")
+ message(FATAL_ERROR "Python 2.7 or greater required to build VOLK_GNSSSDR")
endif()
- # Cheetah
- if(NOT CHEETAH_FOUND)
- message(FATAL_ERROR "Cheetah templates required to build VOLK_GNSSSDR")
+ # Mako
+ if(NOT MAKO_FOUND)
+ message(FATAL_ERROR "Mako templates required to build VOLK_GNSSSDR")
endif()
+# Six
+if(NOT SIX_FOUND)
+ message(FATAL_ERROR "six - python 2 and 3 compatibility library required to build VOLK")
+endif()
+
# Boost
if(MSVC)
diff --cc src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/README.md
index 5471f26,b82dde8..f555314
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/README.md
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/README.md
@@@ -17,7 -17,7 +17,7 @@@ However, you can install and use VOLK_G
First, make sure that the required dependencies are installed in you machine:
~~~~~~
- $ sudo apt-get install git subversion cmake python-cheetah libboost-dev libbbost-filesystem
-$ sudo apt-get install git subversion cmake python-mako libboost-dev libbbost-filesystem
++$ sudo apt-get install git subversion cmake python-mako python-six libboost-dev libbbost-filesystem
~~~~~~
In order to build and install the library, go to the base folder of the source code and do:
diff --cc src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
index 7455cca,52a5fe0..7dd7959
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
@@@ -377,7 -377,7 +377,11 @@@ int Gps_L1_Ca_Dll_Pll_Tracking_cc::gene
//remnant code phase [chips]
d_rem_code_phase_chips = d_rem_code_phase_samples * (d_code_freq_chips / static_cast<double>(d_fs_in));
++ current_synchro_data.Flag_valid_symbol_output = true;
// ####### CN0 ESTIMATION AND LOCK DETECTORS ######
++
++
++
if (d_cn0_estimation_counter < CN0_ESTIMATION_SAMPLES)
{
// fill buffer with prompt correlator output values
@@@ -395,6 -395,6 +399,10 @@@
if (d_carrier_lock_test < d_carrier_lock_threshold or d_CN0_SNV_dB_Hz < MINIMUM_VALID_CN0)
{
d_carrier_lock_fail_counter++;
++ //current_synchro_data.Flag_valid_symbol_output = false;
++ d_acc_carrier_phase_rad = 0.0;
++ std::cout << "----------------------------Cycle slip! Threshold: " << d_carrier_lock_threshold << " detector: " << d_carrier_lock_test << " CN0: " << d_CN0_SNV_dB_Hz << " Sat: " << Gnss_Satellite(systemName[sys], d_acquisition_gnss_synchro->PRN) << std::endl;
++
}
else
{
@@@ -424,7 -424,7 +432,7 @@@
current_synchro_data.Carrier_phase_rads = d_acc_carrier_phase_rad;
current_synchro_data.Carrier_Doppler_hz = d_carrier_doppler_hz;
current_synchro_data.CN0_dB_hz = d_CN0_SNV_dB_Hz;
-- current_synchro_data.Flag_valid_symbol_output = true;
++ //current_synchro_data.Flag_valid_symbol_output = true;
current_synchro_data.correlation_length_ms = 1;
}
else
--
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