mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-16 12:12:57 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Carles Fernandez 2015-05-24 11:18:32 +02:00
commit a243250b1a
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -711,8 +711,8 @@ if(NOT ARMADILLO_FOUND)
message(STATUS " Armadillo will be downloaded and built automatically ") message(STATUS " Armadillo will be downloaded and built automatically ")
message(STATUS " when doing 'make'. ") message(STATUS " when doing 'make'. ")
set(armadillo_RELEASE 5.100.1) set(armadillo_RELEASE 5.100.2)
set(armadillo_MD5 "6926fbf81bde99d777e3d09d034b308a") set(armadillo_MD5 "fe57525a4fce94799d1556eb06339bbd")
ExternalProject_Add( ExternalProject_Add(
armadillo-${armadillo_RELEASE} armadillo-${armadillo_RELEASE}

6
README.md
View File

@ -94,9 +94,9 @@ In case you do not want to use PyBOMBS and prefer to build and install GNU Radio
$ sudo apt-get install libopenblas-dev liblapack-dev gfortran # For Debian/Ubuntu/LinuxMint $ sudo apt-get install libopenblas-dev liblapack-dev gfortran # For Debian/Ubuntu/LinuxMint
$ sudo yum install lapack-devel blas-devel gcc-fortran # For Fedora/CentOS/RHEL $ sudo yum install lapack-devel blas-devel gcc-fortran # For Fedora/CentOS/RHEL
$ sudo zypper install lapack-devel blas-devel gcc-fortran # For OpenSUSE $ sudo zypper install lapack-devel blas-devel gcc-fortran # For OpenSUSE
$ wget http://sourceforge.net/projects/arma/files/armadillo-5.100.1.tar.gz $ wget http://sourceforge.net/projects/arma/files/armadillo-5.100.2.tar.gz
$ tar xvfz armadillo-5.100.1.tar.gz $ tar xvfz armadillo-5.100.2.tar.gz
$ cd armadillo-5.100.1 $ cd armadillo-5.100.2
$ cmake . $ cmake .
$ make $ make
$ sudo make install $ sudo make install

14
src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc
View File

@ -175,6 +175,20 @@ Galileo_E5a_Dll_Pll_Tracking_cc::Galileo_E5a_Dll_Pll_Tracking_cc(
d_carrier_lock_fail_counter = 0; d_carrier_lock_fail_counter = 0;
d_carrier_lock_threshold = CARRIER_LOCK_THRESHOLD; d_carrier_lock_threshold = CARRIER_LOCK_THRESHOLD;
d_channel_internal_queue = 0;
d_acquisition_gnss_synchro = 0;
d_channel = 0;
tmp_E = 0;
tmp_P = 0;
tmp_L = 0;
d_acq_code_phase_samples = 0;
d_acq_carrier_doppler_hz = 0;
d_carrier_doppler_hz = 0;
d_acc_carrier_phase_rad = 0;
d_code_phase_samples = 0;
d_acc_code_phase_secs = 0;
d_state = 0;
systemName["E"] = std::string("Galileo"); systemName["E"] = std::string("Galileo");
} }