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

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 https://sourceforge.net/projects/arma/files/armadillo-9.700.3.tar.xz
+$ wget https://sourceforge.net/projects/arma/files/armadillo-9.800.2.tar.xz
-$ tar xvfz armadillo-9.700.3.tar.xz
+$ tar xvfz armadillo-9.800.2.tar.xz
-$ cd armadillo-9.700.3
+$ cd armadillo-9.800.2
 $ cmake .
 $ make
 $ sudo make install

cmake/Modules/FindGPSTK.cmake

@@ -21,6 +21,10 @@
 #  GPSTK_INCLUDE_DIR, where to find Rinex3ObsBase.hpp, etc.
 #  GPSTK_FOUND, If false, do not try to use GPSTK.
 #  GPSTK_LIBRARY, where to find the GPSTK library.
+#
+# Provides the following imported target:
+# Gpstk::gpstk
+#
 
 if(NOT COMMAND feature_summary)
     include(FeatureSummary)

cmake/Modules/FindGRDBFCTTC.cmake

@@ -19,6 +19,11 @@
 # Find  GR-DBFCTTC Module
 ########################################################################
 
+#
+# Provides the following imported target:
+# Gnuradio::dbfcttc
+#
+
 set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
 include(FindPkgConfig)
 pkg_check_modules(PC_GR_DBFCTTC gr-dbfcttc)

cmake/Modules/FindGRGN3S.cmake

@@ -19,6 +19,11 @@
 # Find  GR-GN3S Module
 ########################################################################
 
+#
+# Provides the following imported target:
+# Gnuradio::gn3s
+#
+
 set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
 include(FindPkgConfig)
 pkg_check_modules(PC_GR_GN3S gr-gn3s)

cmake/Modules/FindLIBAD9361.cmake

@@ -17,7 +17,7 @@
 
 #
 # Provides the following imported target:
-# Iio::iio
+# Iio::ad9361
 #
 
 if(NOT COMMAND feature_summary)
@@ -28,8 +28,7 @@ set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
 include(FindPkgConfig)
 pkg_check_modules(PC_LIBAD9361 libad9361)
 
-find_path(
+find_path(LIBAD9361_INCLUDE_DIRS
-    LIBAD9361_INCLUDE_DIRS
     NAMES ad9361.h
     HINTS ${PC_LIBAD9361_INCLUDEDIR}
     PATHS /usr/include
@@ -41,8 +40,7 @@ find_path(
           $ENV{LIBAD9361_DIR}/include
 )
 
-find_library(
+find_library(LIBAD9361_LIBRARIES
-    LIBAD9361_LIBRARIES
     NAMES ad9361
     HINTS ${PC_LIBAD9361_LIBDIR}
     PATHS /usr/lib

cmake/Modules/FindTELEORBIT.cmake

@@ -15,6 +15,11 @@
 # You should have received a copy of the GNU General Public License
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 
+#
+# Provides the following imported target:
+# Gnuradio::teleorbit
+#
+
 if(NOT COMMAND feature_summary)
     include(FeatureSummary)
 endif()

cmake/Modules/FindUHD.cmake

@@ -17,7 +17,7 @@
 
 #
 # Provides the following imported target:
-# Iio::iio
+# Uhd::uhd
 #
 
 ########################################################################

docs/changelog

@@ -39,7 +39,8 @@
 
 - The CMake scripts now find dependencies in Debian's riscv64 architecture.
 - Enable AVX2 kernels of the volk_gnsssdr library when using the Clang compiler.
-- Added a CMake toolchain for building volk_gnsssdr in a Raspberry Pi.
+- Fixed building in some ARM-based devices. Now Clang and ARMClang can be used for native building.
+- Added toolchain files for building gnss-sdr and the volk_gnsssdr library in several ARM processor architectures, including those in Raspberry Pi 3 and 4.
 
 
 ### Improvements in Reliability:

src/algorithms/PVT/adapters/rtklib_pvt.cc

@@ -202,6 +202,9 @@ Rtklib_Pvt::Rtklib_Pvt(ConfigurationInterface* configuration,
      *    608   |  BeiDou B3I + GPS L1 C/A + Galileo E1B + BeiDou B1I
      *    609   |  BeiDou B3I + GPS L1 C/A + Galileo E1B + GLONASS L1 C/A
      *    610   |  BeiDou B3I + GPS L1 C/A + Galileo E1B + GLONASS L1 C/A + BeiDou B1I
+     *
+     *    1000  |  GPS L1 C/A + GPS L2C + GPS L5
+     *    1001  |  GPS L1 C/A + Galileo E1B + GPS L2C + GPS L5 + Galileo E5a
      */
     int gps_1C_count = configuration->property("Channels_1C.count", 0);
     int gps_2S_count = configuration->property("Channels_2S.count", 0);

src/algorithms/libs/rtklib/rtklib_conversions.cc

@@ -118,7 +118,14 @@ obsd_t insert_obs_to_rtklib(obsd_t& rtklib_obs, const Gnss_Synchro& gnss_synchro
     //           rtklib_obs.time = gpst2time(adjgpsweek(week), gnss_synchro.RX_time);
     //       }
     //
+    if (gnss_synchro.System == 'E')
+        {
+            rtklib_obs.time = gst2time(week, gnss_synchro.RX_time);
+        }
+    else
+        {
             rtklib_obs.time = gpst2time(adjgpsweek(week, pre_2009_file), gnss_synchro.RX_time);
+        }
     // account for the TOW crossover transitory in the first 18 seconds where the week is not yet updated!
     if (gnss_synchro.RX_time < 18.0)
         {
@@ -188,7 +195,7 @@ eph_t eph_to_rtklib(const Galileo_Ephemeris& gal_eph)
     rtklib_sat.Adot = 0;  // only in CNAV;
     rtklib_sat.ndot = 0;  // only in CNAV;
 
-    rtklib_sat.week = adjgpsweek(gal_eph.WN_5); /* week of tow */
+    rtklib_sat.week = gal_eph.WN_5 + 1024; /* week of tow in GPS (not mod-1024) week scale */
     rtklib_sat.cic = gal_eph.C_ic_4;
     rtklib_sat.cis = gal_eph.C_is_4;
     rtklib_sat.cuc = gal_eph.C_uc_3;

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt

@@ -405,6 +405,8 @@ if(MSVC)
         set(cmake_c_compiler_version "Microsoft Visual Studio 11.0")
     elseif(MSVC12) #Visual Studio 12
         set(cmake_c_compiler_version "Microsoft Visual Studio 12.0")
+    elseif(MSVC14) #Visual Studio 14
+        set(cmake_c_compiler_version "Microsoft Visual Studio 14.0")
     endif()
 else()
     execute_process(COMMAND ${CMAKE_C_COMPILER} --version
@@ -625,12 +627,12 @@ if(ENABLE_STATIC_LIBS)
         PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
     )
 
+    set_target_properties(volk_gnsssdr_static PROPERTIES OUTPUT_NAME volk_gnsssdr)
+
     install(TARGETS volk_gnsssdr_static
         EXPORT VOLK_GNSSSDR-export
         ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT "volk_gnsssdr_devel"
     )
-
-    set_target_properties(volk_gnsssdr_static PROPERTIES OUTPUT_NAME volk_gnsssdr)
 endif()
 
 ########################################################################