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

CMakeLists.txt

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

README.md

@@ -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 yum install lapack-devel blas-devel gcc-fortran          # For Fedora/CentOS/RHEL
 $ sudo zypper install lapack-devel blas-devel gcc-fortran       # For OpenSUSE
-$ wget http://sourceforge.net/projects/arma/files/armadillo-5.100.2.tar.gz
+$ wget http://sourceforge.net/projects/arma/files/armadillo-5.200.1.tar.gz
-$ tar xvfz armadillo-5.100.2.tar.gz
+$ tar xvfz armadillo-5.200.1.tar.gz
-$ cd armadillo-5.100.2
+$ cd armadillo-5.200.1
 $ cmake .
 $ make
 $ sudo make install

src/algorithms/acquisition/gnuradio_blocks/galileo_e5a_noncoherent_iq_acquisition_caf_cc.cc

@@ -137,6 +137,13 @@ galileo_e5a_noncoherentIQ_acquisition_caf_cc::galileo_e5a_noncoherentIQ_acquisit
                     d_magnitudeQB = 0;
                 }
         }
+    else
+        {
+            d_fft_code_I_B = 0;
+            d_magnitudeIB = 0;
+            d_fft_code_Q_B = 0;
+            d_magnitudeQB = 0;
+        }
 
     // Direct FFT
     d_fft_if = new gr::fft::fft_complex(d_fft_size, true);

src/core/system_parameters/gps_cnav_ephemeris.cc

@@ -90,4 +90,5 @@ Gps_CNAV_Ephemeris::Gps_CNAV_Ephemeris()
     d_ISCL2 = 0.0;
     d_ISCL5I = 0.0;
     d_ISCL5Q = 0.0;
+    b_l2c_phasing_flag = false;
 }

src/core/system_parameters/gps_cnav_navigation_message.cc

@@ -63,6 +63,7 @@ Gps_CNAV_Navigation_Message::Gps_CNAV_Navigation_Message()
         {
             satelliteBlock[prn_] = gnss_satellite_.what_block("GPS", prn_);
         }
+    flag_iono_valid = false;
 }
 
 void Gps_CNAV_Navigation_Message::print_gps_word_bytes(unsigned int GPS_word)

src/utils/front-end-cal/main.cc

@@ -40,6 +40,7 @@
 #include <boost/filesystem.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/thread.hpp>
+#include <boost/exception/detail/exception_ptr.hpp>
 #include <gflags/gflags.h>
 #include <glog/logging.h>
 #include <gnuradio/msg_queue.h>
@@ -159,10 +160,26 @@ bool front_end_capture(std::shared_ptr<ConfigurationInterface> configuration)
     top_block = gr::make_top_block("Acquisition test");
 
     std::shared_ptr<GNSSBlockInterface> source;
-    source = block_factory.GetSignalSource(configuration, queue);
+    try
-
+    {
-    std::shared_ptr<GNSSBlockInterface> conditioner = block_factory.GetSignalConditioner(configuration,queue);
+            source = block_factory.GetSignalSource(configuration, queue);
+    }
+    catch(const boost::exception_ptr & e)
+    {
+            std::cout << "Exception catched in creating source " << e << std::endl;
+            return 0;
+    }
 
+    std::shared_ptr<GNSSBlockInterface> conditioner;
+    try
+    {
+            conditioner = block_factory.GetSignalConditioner(configuration,queue);
+    }
+    catch(const boost::exception_ptr & e)
+    {
+            std::cout << "Exception catched in creating signal conditioner " << e << std::endl;
+            return 0;
+    }
     gr::block_sptr sink;
     sink = gr::blocks::file_sink::make(sizeof(gr_complex), "tmp_capture.dat");
 
@@ -188,7 +205,7 @@ bool front_end_capture(std::shared_ptr<ConfigurationInterface> configuration)
             top_block->connect(head, 0, sink, 0);
             top_block->run();
     }
-    catch(std::exception& e)
+    catch(const std::exception & e)
     {
             std::cout << "Failure connecting the GNU Radio blocks " << e.what() << std::endl;
             return false;
@@ -280,7 +297,6 @@ int main(int argc, char** argv)
         }
 
     // 3. Capture some front-end samples to hard disk
-
     if (front_end_capture(configuration))
         {
             std::cout << "Front-end RAW samples captured" << std::endl;
@@ -291,7 +307,6 @@ int main(int argc, char** argv)
         }
 
     // 4. Setup GNU Radio flowgraph (file_source -> Acquisition_10m)
-
     gr::top_block_sptr top_block;
     boost::shared_ptr<gr::msg_queue> queue;
     queue = gr::msg_queue::make(0);
@@ -381,7 +396,14 @@ int main(int argc, char** argv)
                     std::cout << " . ";
                 }
             channel_internal_queue.push(3);
-            ch_thread.join();
+            try
+            {
+                    ch_thread.join();
+            }
+            catch(const boost::exception_ptr & e)
+            {
+                    std::cout << "Exception caught while joining threads " << e << std::endl;
+            }
             gnss_sync_vector.clear();
             boost::dynamic_pointer_cast<gr::blocks::file_source>(source)->seek(0, 0);
             std::cout.flush();
@@ -470,6 +492,10 @@ int main(int argc, char** argv)
                     f_fs_estimation_Hz_map.insert(std::pair<int,double>(it->first,estimated_fs_Hz));
                     f_ppm_estimation_Hz_map.insert(std::pair<int,double>(it->first,f_osc_err_ppm));
             }
+            catch(const std::logic_error & e)
+            {
+                    std::cout << "  " << it->first << "   " << it->second << "  (Eph not found)" << std::endl;
+            }
             catch(int ex)
             {
                     std::cout << "  " << it->first << "   " << it->second << "  (Eph not found)" << std::endl;