diff --git a/CMakeLists.txt b/CMakeLists.txt index ec72710a5..deb3a7ff9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -400,7 +400,7 @@ set(GNSSSDR_PROTOBUF_MIN_VERSION "3.0.0") ################################################################################ set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2") set(GNSSSDR_GLOG_LOCAL_VERSION "0.4.0") -set(GNSSSDR_ARMADILLO_LOCAL_VERSION "9.600.x") +set(GNSSSDR_ARMADILLO_LOCAL_VERSION "9.700.x") set(GNSSSDR_GTEST_LOCAL_VERSION "1.8.1") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GPSTK_LOCAL_VERSION "2.12") diff --git a/README.md b/README.md index b436dfe9b..6929e828d 100644 --- a/README.md +++ b/README.md @@ -220,9 +220,9 @@ $ sudo apt-get install libblas-dev liblapack-dev # For Debian/Ubuntu/Linux $ sudo yum install lapack-devel blas-devel # For Fedora/CentOS/RHEL $ sudo zypper install lapack-devel blas-devel # For OpenSUSE $ sudo pacman -S blas lapack # For Arch Linux -$ wget http://sourceforge.net/projects/arma/files/armadillo-9.600.4.tar.xz -$ tar xvfz armadillo-9.600.4.tar.xz -$ cd armadillo-9.600.4 +$ wget http://sourceforge.net/projects/arma/files/armadillo-9.700.2.tar.xz +$ tar xvfz armadillo-9.700.2.tar.xz +$ cd armadillo-9.700.2 $ cmake . $ make $ sudo make install diff --git a/src/core/system_parameters/GPS_L2C.h b/src/core/system_parameters/GPS_L2C.h index 11a082a8f..2b1e8de73 100644 --- a/src/core/system_parameters/GPS_L2C.h +++ b/src/core/system_parameters/GPS_L2C.h @@ -55,11 +55,11 @@ const double GPS_L2_FREQ_HZ = FREQ2; //!< L2 [Hz] const double GPS_L2_M_CODE_RATE_CPS = 0.5115e6; //!< GPS L2 M code rate [chips/s] const int32_t GPS_L2_M_CODE_LENGTH_CHIPS = 10230; //!< GPS L2 M code length [chips] -const double GPS_L2_M_PERIOD_S = 0.02; //!< GPS L2 M code period [seconds] +const double GPS_L2_M_PERIOD_S = 0.02; //!< GPS L2 M code period [seconds] const double GPS_L2_L_CODE_RATE_CPS = 0.5115e6; //!< GPS L2 L code rate [chips/s] const int32_t GPS_L2_L_CODE_LENGTH_CHIPS = 767250; //!< GPS L2 L code length [chips] -const double GPS_L2_L_PERIOD_S = 1.5; //!< GPS L2 L code period [seconds] +const double GPS_L2_L_PERIOD_S = 1.5; //!< GPS L2 L code period [seconds] const int32_t GPS_L2C_HISTORY_DEEP = 5;