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

CMakeLists.txt

@@ -411,11 +411,11 @@ 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.300.x")
+set(GNSSSDR_ARMADILLO_LOCAL_VERSION "9.500.x")
 set(GNSSSDR_GTEST_LOCAL_VERSION "1.8.1")
 set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
 set(GNSSSDR_GPSTK_LOCAL_VERSION "2.10.6")
-set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.14")
+set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.15")
 set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.9")
 set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.8.0")
 

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.300.2.tar.xz
+$ wget http://sourceforge.net/projects/arma/files/armadillo-9.400.4.tar.xz
-$ tar xvfz armadillo-9.300.2.tar.xz
+$ tar xvfz armadillo-9.400.4.tar.xz
-$ cd armadillo-9.300.2
+$ cd armadillo-9.400.4
 $ cmake .
 $ make
 $ sudo make install
@@ -708,14 +708,18 @@ $ cmake -DCMAKE_PREFIX_PATH=/opt/local -DUSE_MACPORTS_PYTHON=/opt/local/bin/pyth
 
 changing ```/opt/local``` by the base directory in which your software is installed.
 
-The CMake script will create Makefiles that download, build and link Armadillo, Gflags, Glog, Matio, PugiXML and Google Test on the fly at compile time if they are not detected in your machine.
+The CMake script will create Makefiles that download, build and link Armadillo, Gflags, Glog, Matio, Protocol Buffers, PugiXML and Google Test on the fly at compile time if they are not detected in your machine.
 
 
 Other builds
 ---------
-* **Docker container**: A technology providing operating-system-level virtualization to build, ship, and run distributed applications, whether on laptops, data center VMs, or the cloud. Visit [https://github.com/carlesfernandez/docker-gnsssdr](https://github.com/carlesfernandez/docker-gnsssdr) or [https://github.com/carlesfernandez/docker-pybombs-gnsssdr](https://github.com/carlesfernandez/docker-pybombs-gnsssdr) for instructions.
+* **Docker image**: A technology providing operating-system-level virtualization to build, ship, and run distributed applications, whether on laptops, data center VMs, or the cloud. Visit [https://github.com/carlesfernandez/docker-gnsssdr](https://github.com/carlesfernandez/docker-gnsssdr) or [https://github.com/carlesfernandez/docker-pybombs-gnsssdr](https://github.com/carlesfernandez/docker-pybombs-gnsssdr) for instructions.
 
-* **Snap packages**: [Snaps](https://snapcraft.io) are universal Linux packages aimed to work on any distribution or device, from IoT devices to servers, desktops to mobile devices. Visit [https://github.com/carlesfernandez/snapcraft-sandbox](https://github.com/carlesfernandez/snapcraft-sandbox) for instructions.
+* **Snap package**: [Snaps](https://snapcraft.io) are universal Linux packages aimed to work on any distribution or device, from IoT devices to servers, desktops to mobile devices. Visit [https://github.com/carlesfernandez/snapcraft-sandbox](https://github.com/carlesfernandez/snapcraft-sandbox) for instructions, or directly [get the software from the Snap Store](https://snapcraft.io/gnss-sdr-next):
+
+<p align="center">
+  <a href="https://snapcraft.io/gnss-sdr-next"><img src="https://snapcraft.io/static/images/badges/en/snap-store-white.svg" alt="Get GNSS-SDR from the Snap Store"></a>
+</p>
 
 * **GNSS-SDR in embedded platforms**: we provide a Software Development Kit (SDK) based on [OpenEmbedded](http://www.openembedded.org/wiki/Main_Page) for cross-compiling GNSS-SDR in your desktop computer and for producing executables that can run in embedded platforms, such as a Zedboard or a Raspberry Pi 3. Visit [Cross-compiling GNSS-SDR](https://gnss-sdr.org/docs/tutorials/cross-compiling/) for instructions.
 
@@ -1299,7 +1303,8 @@ Tracking_1C.implementation=GPS_L1_CA_DLL_PLL_Tracking
 Tracking_1C.item_type=gr_complex
 Tracking_1C.pll_bw_hz=50.0 ; PLL loop filter bandwidth [Hz]
 Tracking_1C.dll_bw_hz=2.0 ; DLL loop filter bandwidth [Hz]
-Tracking_1C.order=3 ; PLL/DLL loop filter order [2] or [3]
+Tracking_1C.pll_filter_order=3 ; PLL loop filter order [2] or [3]
+Tracking_1C.dll_filter_order=2 ; DLL loop filter order [1], [2] or [3]
 Tracking_1C.early_late_space_chips=0.5 ; correlator early-late space [chips].
 Tracking_1C.dump=false ; Enable internal binary data file logging [true] or [false]
 Tracking_1C.dump_filename=./tracking_ch_ ; Log path and filename. Notice that the tracking channel will add "x.dat" where x is the channel number.
@@ -1313,7 +1318,8 @@ Tracking_1B.implementation=Galileo_E1_DLL_PLL_VEML_Tracking
 Tracking_1B.item_type=gr_complex
 Tracking_1B.pll_bw_hz=15.0;
 Tracking_1B.dll_bw_hz=2.0;
-Tracking_1B.order=3;
+Tracking_1B.pll_filter_order=3 ; PLL loop filter order [2] or [3]
+Tracking_1B.dll_filter_order=2 ; DLL loop filter order [1], [2] or [3]
 Tracking_1B.early_late_space_chips=0.15;
 Tracking_1B.very_early_late_space_chips=0.6;
 Tracking_1B.dump=false

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/volk_gnsssdr_profile.cc

@@ -253,7 +253,16 @@ void write_results(const std::vector<volk_gnsssdr_test_results_t> *results, bool
     if (!fs::exists(config_path.parent_path()))
         {
             std::cout << "Creating " << config_path.parent_path() << " ..." << std::endl;
-            fs::create_directories(config_path.parent_path());
+            try
+                {
+                    fs::create_directories(config_path.parent_path());
+                }
+            catch (const fs::filesystem_error &e)
+                {
+                    std::cerr << "ERROR: Could not create folder " << config_path.parent_path() << std::endl;
+                    std::cerr << "Reason: " << e.what() << std::endl;
+                    return;
+                }
         }
 
     std::ofstream config;

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/volk_gnsssdr_prefs.c

@@ -77,6 +77,15 @@ void volk_gnsssdr_get_config_path(char *path)
             return;
         }
 
+    // if nothing exists, write to HOME or APPDATA
+    home = getenv("HOME");
+    if (home == NULL) home = getenv("APPDATA");
+    if (home != NULL)
+        {
+            strncpy(path, home, 512);
+            strcat(path, suffix);
+            return;
+        }
     path[0] = 0;
     return;
 }