cleaning the use of includes

src/algorithms/PVT/adapters/galileo_e1_pvt.cc

@@ -34,7 +34,6 @@
 #include "galileo_e1_pvt.h"
 #include <glog/logging.h>
 #include "configuration_interface.h"
-#include "galileo_e1_pvt_cc.h"
 
 
 using google::LogMessage;

src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc

@@ -34,7 +34,6 @@
 #include "gps_l1_ca_pvt.h"
 #include <glog/logging.h>
 #include "configuration_interface.h"
-#include "gps_l1_ca_pvt_cc.h"
 
 using google::LogMessage;
 

src/algorithms/PVT/adapters/hybrid_pvt.cc

@@ -34,7 +34,6 @@
 #include "hybrid_pvt.h"
 #include <glog/logging.h>
 #include "configuration_interface.h"
-#include "hybrid_pvt_cc.h"
 
 
 using google::LogMessage;

src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc

@@ -39,8 +39,6 @@
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
-#include "control_message_factory.h"
-#include "gnss_synchro.h"
 #include "concurrent_map.h"
 
 using google::LogMessage;

src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h

@@ -39,17 +39,13 @@
 #include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
-#include "galileo_navigation_message.h"
-#include "galileo_ephemeris.h"
-#include "galileo_utc_model.h"
-#include "galileo_iono.h"
 #include "nmea_printer.h"
 #include "kml_printer.h"
 #include "rinex_printer.h"
 #include "geojson_printer.h"
 #include "rtcm_printer.h"
 #include "galileo_e1_ls_pvt.h"
-#include "Galileo_E1.h"
+
 
 class galileo_e1_pvt_cc;
 
@@ -108,7 +104,7 @@ private:
     bool b_rinex_header_writen;
     bool b_rinex_header_updated;
     bool b_rtcm_writing_started;
-    std::shared_ptr<Rinex_Printer> rp;
+
     unsigned int d_nchannels;
     std::string d_dump_filename;
     std::ofstream d_dump_file;
@@ -118,6 +114,8 @@ private:
     int d_display_rate_ms;
     long unsigned int d_sample_counter;
     long unsigned int d_last_sample_nav_output;
+
+    std::shared_ptr<Rinex_Printer> rp;
     std::shared_ptr<Kml_Printer> d_kml_dump;
     std::shared_ptr<Nmea_Printer> d_nmea_printer;
     std::shared_ptr<GeoJSON_Printer> d_geojson_printer;

src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc

@@ -38,8 +38,6 @@
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
-#include "control_message_factory.h"
-#include "gnss_synchro.h"
 #include "concurrent_map.h"
 #include "sbas_telemetry_data.h"
 #include "sbas_ionospheric_correction.h"

src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h

@@ -38,17 +38,13 @@
 #include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
-#include "gps_navigation_message.h"
-#include "gps_ephemeris.h"
-#include "gps_utc_model.h"
-#include "gps_iono.h"
 #include "nmea_printer.h"
 #include "kml_printer.h"
 #include "rinex_printer.h"
 #include "geojson_printer.h"
 #include "rtcm_printer.h"
 #include "gps_l1_ca_ls_pvt.h"
-#include "GPS_L1_CA.h"
+
 
 class gps_l1_ca_pvt_cc;
 
@@ -110,7 +106,7 @@ private:
     bool b_rinex_sbs_header_writen;
     bool b_rinex_header_updated;
     bool b_rtcm_writing_started;
-    std::shared_ptr<Rinex_Printer> rp;
+
     unsigned int d_nchannels;
     std::string d_dump_filename;
     std::ofstream d_dump_file;
@@ -120,6 +116,8 @@ private:
     int d_display_rate_ms;
     long unsigned int d_sample_counter;
     long unsigned int d_last_sample_nav_output;
+
+    std::shared_ptr<Rinex_Printer> rp;
     std::shared_ptr<Kml_Printer> d_kml_printer;
     std::shared_ptr<Nmea_Printer> d_nmea_printer;
     std::shared_ptr<GeoJSON_Printer> d_geojson_printer;

src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc

@@ -39,8 +39,6 @@
 #include <gnuradio/gr_complex.h>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
-#include "control_message_factory.h"
-#include "gnss_synchro.h"
 #include "concurrent_map.h"
 
 using google::LogMessage;

src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h

@@ -39,22 +39,13 @@
 #include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
-#include "galileo_navigation_message.h"
-#include "galileo_ephemeris.h"
-#include "galileo_utc_model.h"
-#include "galileo_iono.h"
-#include "gps_navigation_message.h"
-#include "gps_ephemeris.h"
-#include "gps_utc_model.h"
-#include "gps_iono.h"
 #include "nmea_printer.h"
 #include "kml_printer.h"
 #include "geojson_printer.h"
 #include "rinex_printer.h"
 #include "rtcm_printer.h"
 #include "hybrid_ls_pvt.h"
-#include "GPS_L1_CA.h"
+
-#include "Galileo_E1.h"
 
 class hybrid_pvt_cc;
 
@@ -112,7 +103,7 @@ private:
     bool d_dump;
     bool b_rinex_header_writen;
     bool b_rinex_header_updated;
-    std::shared_ptr<Rinex_Printer> rp;
+
     unsigned int d_nchannels;
     std::string d_dump_filename;
     std::ofstream d_dump_file;
@@ -122,6 +113,8 @@ private:
     int d_display_rate_ms;
     long unsigned int d_sample_counter;
     long unsigned int d_last_sample_nav_output;
+
+    std::shared_ptr<Rinex_Printer> rp;
     std::shared_ptr<Kml_Printer> d_kml_dump;
     std::shared_ptr<Nmea_Printer> d_nmea_printer;
     std::shared_ptr<GeoJSON_Printer> d_geojson_printer;

src/algorithms/observables/adapters/galileo_e1_observables.cc

@@ -32,7 +32,6 @@
 
 #include "galileo_e1_observables.h"
 #include "configuration_interface.h"
-#include "galileo_e1_observables_cc.h"
 #include <glog/logging.h>
 
 using google::LogMessage;

src/algorithms/observables/adapters/gps_l1_ca_observables.cc

@@ -32,7 +32,6 @@
 
 #include "gps_l1_ca_observables.h"
 #include "configuration_interface.h"
-#include "gps_l1_ca_observables_cc.h"
 #include <glog/logging.h>
 
 using google::LogMessage;
@@ -55,9 +54,7 @@ GpsL1CaObservables::GpsL1CaObservables(ConfigurationInterface* configuration,
     flag_averaging = configuration->property(role + ".flag_averaging", false);
     dump_ = configuration->property(role + ".dump", false);
     dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
-    //fs_in_ = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
     observables_ = gps_l1_ca_make_observables_cc(in_streams_, queue_, dump_, dump_filename_, output_rate_ms, flag_averaging);
-    //observables_->set_fs_in(fs_in_);
     DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")";
 }
 

src/algorithms/observables/adapters/hybrid_observables.cc

@@ -32,7 +32,6 @@
 
 #include "hybrid_observables.h"
 #include "configuration_interface.h"
-#include "hybrid_observables_cc.h"
 #include <glog/logging.h>
 
 using google::LogMessage;

src/algorithms/observables/adapters/mixed_observables.cc

@@ -32,7 +32,6 @@
 
 #include "mixed_observables.h"
 #include "configuration_interface.h"
-#include "mixed_observables_cc.h"
 #include <glog/logging.h>
 
 using google::LogMessage;
@@ -55,9 +54,7 @@ MixedObservables::MixedObservables(ConfigurationInterface* configuration,
     flag_averaging = configuration->property(role + ".flag_averaging", false);
     dump_ = configuration->property(role + ".dump", false);
     dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
-    //fs_in_ = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
     observables_ = mixed_make_observables_cc(in_streams_, queue_, dump_, dump_filename_, output_rate_ms, flag_averaging);
-    //observables_->set_fs_in(fs_in_);
     DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")";
 }
 

src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc

@@ -29,6 +29,7 @@
  * -------------------------------------------------------------------------
  */
 
+
 #include "galileo_e1_observables_cc.h"
 #include <algorithm>
 #include <bitset>
@@ -40,9 +41,11 @@
 #include <armadillo>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
-#include "control_message_factory.h"
+//#include "control_message_factory.h"
 #include "gnss_synchro.h"
 #include "Galileo_E1.h"
+#include "galileo_navigation_message.h"
+
 
 
 using google::LogMessage;
@@ -154,21 +157,23 @@ int galileo_e1_observables_cc::general_work (int noutput_items, gr_vector_int &n
                     // save TOW history
                     d_symbol_TOW_queue_s[i].push_back(current_gnss_synchro[i].d_TOW_at_current_symbol);
 
-				 if (d_carrier_doppler_queue_hz[i].size()>GALILEO_E1_HISTORY_DEEP)
+                    if (d_carrier_doppler_queue_hz[i].size() > GALILEO_E1_HISTORY_DEEP)
                         {
                             d_carrier_doppler_queue_hz[i].pop_front();
                         }
-				 if (d_acc_carrier_phase_queue_rads[i].size()>GALILEO_E1_HISTORY_DEEP)
+                    if (d_acc_carrier_phase_queue_rads[i].size() > GALILEO_E1_HISTORY_DEEP)
                         {
                             d_acc_carrier_phase_queue_rads[i].pop_front();
                         }
-				 if (d_symbol_TOW_queue_s[i].size()>GALILEO_E1_HISTORY_DEEP)
+                    if (d_symbol_TOW_queue_s[i].size() > GALILEO_E1_HISTORY_DEEP)
                         {
                             d_symbol_TOW_queue_s[i].pop_front();
                         }
-			 }else{
+                }
+            else
+                {
                     // Clear the observables history for this channel
-				if (d_symbol_TOW_queue_s[i].size()>0)
+                    if (d_symbol_TOW_queue_s[i].size() > 0)
                         {
                             d_symbol_TOW_queue_s[i].clear();
                             d_carrier_doppler_queue_hz[i].clear();
@@ -207,23 +212,23 @@ int galileo_e1_observables_cc::general_work (int noutput_items, gr_vector_int &n
                     // compute the required symbol history shift in order to match the reference symbol
                     delta_rx_time_ms = gnss_synchro_iter->second.Prn_timestamp_ms - d_ref_PRN_rx_time_ms;
                     //compute the pseudorange
-				traveltime_ms = (d_TOW_reference-gnss_synchro_iter->second.d_TOW_at_current_symbol)*1000.0 + delta_rx_time_ms + GALILEO_STARTOFFSET_ms;
+                    traveltime_ms = (d_TOW_reference-gnss_synchro_iter->second.d_TOW_at_current_symbol) * 1000.0 + delta_rx_time_ms + GALILEO_STARTOFFSET_ms;
-				pseudorange_m = traveltime_ms * GPS_C_m_ms; // [m]
+                    pseudorange_m = traveltime_ms * GALILEO_C_m_ms; // [m]
                     // update the pseudorange object
                     current_gnss_synchro[gnss_synchro_iter->second.Channel_ID] = gnss_synchro_iter->second;
                     current_gnss_synchro[gnss_synchro_iter->second.Channel_ID].Pseudorange_m = pseudorange_m;
                     current_gnss_synchro[gnss_synchro_iter->second.Channel_ID].Flag_valid_pseudorange = true;
-				current_gnss_synchro[gnss_synchro_iter->second.Channel_ID].d_TOW_at_current_symbol = round(d_TOW_reference*1000.0)/1000.0 + GALILEO_STARTOFFSET_ms/1000.0;
+                    current_gnss_synchro[gnss_synchro_iter->second.Channel_ID].d_TOW_at_current_symbol = round(d_TOW_reference * 1000.0) / 1000.0 + GALILEO_STARTOFFSET_ms / 1000.0;
 
-				if (d_symbol_TOW_queue_s[gnss_synchro_iter->second.Channel_ID].size()>=GPS_L1_CA_HISTORY_DEEP)
+                    if (d_symbol_TOW_queue_s[gnss_synchro_iter->second.Channel_ID].size() >= GALILEO_E1_HISTORY_DEEP)
                         {
                             // compute interpolated observation values for Doppler and Accumulate carrier phase
                             symbol_TOW_vec_s = arma::vec(std::vector<double>(d_symbol_TOW_queue_s[gnss_synchro_iter->second.Channel_ID].begin(), d_symbol_TOW_queue_s[gnss_synchro_iter->second.Channel_ID].end()));
                             acc_phase_vec_rads = arma::vec(std::vector<double>(d_acc_carrier_phase_queue_rads[gnss_synchro_iter->second.Channel_ID].begin(), d_acc_carrier_phase_queue_rads[gnss_synchro_iter->second.Channel_ID].end()));
                             dopper_vec_hz = arma::vec(std::vector<double>(d_carrier_doppler_queue_hz[gnss_synchro_iter->second.Channel_ID].begin(), d_carrier_doppler_queue_hz[gnss_synchro_iter->second.Channel_ID].end()));
-					desired_symbol_TOW[0] = symbol_TOW_vec_s[GPS_L1_CA_HISTORY_DEEP - 1] + delta_rx_time_ms / 1000.0;
+                            desired_symbol_TOW[0] = symbol_TOW_vec_s[GALILEO_E1_HISTORY_DEEP - 1] + delta_rx_time_ms / 1000.0;
                             // Curve fitting to cuadratic function
-					arma::mat A = arma::ones<arma::mat>(GPS_L1_CA_HISTORY_DEEP, 2);
+                            arma::mat A = arma::ones<arma::mat>(GALILEO_E1_HISTORY_DEEP, 2);
                             A.col(1) = symbol_TOW_vec_s;
                             //A.col(2)=symbol_TOW_vec_s % symbol_TOW_vec_s;
                             arma::mat coef_acc_phase(1,3);

src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h

@@ -33,6 +33,7 @@
 #ifndef GNSS_SDR_GALILEO_E1_OBSERVABLES_CC_H
 #define	GNSS_SDR_GALILEO_E1_OBSERVABLES_CC_H
 
+
 #include <fstream>
 #include <queue>
 #include <string>
@@ -41,11 +42,12 @@
 #include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
-#include "concurrent_queue.h"
+
-#include "galileo_navigation_message.h"
+//#include "concurrent_queue.h"
-#include "rinex_printer.h"
+//#include "galileo_navigation_message.h"
-#include "Galileo_E1.h"
+//#include "rinex_printer.h"
-#include "gnss_synchro.h"
+//#include "Galileo_E1.h"
+//#include "gnss_synchro.h"
 
 class galileo_e1_observables_cc;
 

src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc

@@ -40,6 +40,8 @@
 #include <glog/logging.h>
 #include "control_message_factory.h"
 #include "gnss_synchro.h"
+#include "GPS_L1_CA.h"
+
 
 
 using google::LogMessage;

src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h

@@ -31,22 +31,18 @@
 #ifndef GNSS_SDR_GPS_L1_CA_OBSERVABLES_CC_H
 #define	GNSS_SDR_GPS_L1_CA_OBSERVABLES_CC_H
 
+#include <deque>
 #include <fstream>
 #include <queue>
-#include <deque>
-#include <vector>
 #include <string>
 #include <utility>
+#include <vector>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
-#include "concurrent_queue.h"
+
-#include "gps_navigation_message.h"
-#include "rinex_printer.h"
-#include "GPS_L1_CA.h"
-#include "gnss_synchro.h"
 
 class gps_l1_ca_observables_cc;
 

src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc

@@ -39,8 +39,10 @@
 #include <vector>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
-#include "control_message_factory.h"
 #include "gnss_synchro.h"
+#include "Galileo_E1.h"
+#include "GPS_L1_CA.h"
+
 
 
 using google::LogMessage;

src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h

@@ -41,11 +41,7 @@
 #include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
-#include "concurrent_queue.h"
+
-#include "galileo_navigation_message.h"
-#include "rinex_printer.h"
-#include "Galileo_E1.h"
-#include "gnss_synchro.h"
 
 class hybrid_observables_cc;
 

src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc

@@ -39,6 +39,8 @@
 #include <glog/logging.h>
 #include "control_message_factory.h"
 #include "gnss_synchro.h"
+#include "GPS_L1_CA.h"
+
 
 
 using google::LogMessage;

src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h

@@ -39,11 +39,7 @@
 #include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
-#include "concurrent_queue.h"
+
-#include "gps_navigation_message.h"
-#include "rinex_printer.h"
-#include "GPS_L1_CA.h"
-#include "gnss_synchro.h"
 
 class mixed_observables_cc;
 

src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc

@@ -38,7 +38,7 @@
 #include "gps_iono.h"
 #include "gps_utc_model.h"
 #include "configuration_interface.h"
-#include "gps_l1_ca_telemetry_decoder_cc.h"
+
 
 extern concurrent_queue<Gps_Ephemeris> global_gps_ephemeris_queue;
 extern concurrent_queue<Gps_Iono> global_gps_iono_queue;

src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt

@@ -48,6 +48,7 @@ include_directories(
      ${GFlags_INCLUDE_DIRS}
      ${Boost_INCLUDE_DIRS}
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
+     ${VOLK_INCLUDE_DIRS}
      ${VOLK_GNSSSDR_INCLUDE_DIRS}
      ${OPT_TRACKING_INCLUDES}
 )
@@ -60,7 +61,7 @@ file(GLOB TRACKING_GR_BLOCKS_HEADERS "*.h")
 add_library(tracking_gr_blocks ${TRACKING_GR_BLOCKS_SOURCES} ${TRACKING_GR_BLOCKS_HEADERS})
 source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS})
 
-target_link_libraries(tracking_gr_blocks tracking_lib ${GNURADIO_RUNTIME_LIBRARIES} gnss_sp_libs ${Boost_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES} ${OPT_TRACKING_LIBRARIES})
+target_link_libraries(tracking_gr_blocks tracking_lib ${GNURADIO_RUNTIME_LIBRARIES} gnss_sp_libs ${Boost_LIBRARIES} ${VOLK_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES} ${OPT_TRACKING_LIBRARIES})
 
 if(NOT VOLK_GNSSSDR_FOUND)
     add_dependencies(tracking_gr_blocks volk_gnsssdr_module)

src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc

@@ -43,6 +43,7 @@
 #include <gnuradio/io_signature.h>
 #include <gnuradio/fxpt.h>  // fixed point sine and cosine
 #include <glog/logging.h>
+#include <volk/volk.h>
 #include "gnss_synchro.h"
 #include "galileo_e1_signal_processing.h"
 #include "tracking_discriminators.h"

src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h

@@ -40,6 +40,7 @@
 #include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
+//#include <volk/volk.h>
 #include "concurrent_queue.h"
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"

src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc

@@ -45,6 +45,7 @@
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
+#include <volk/volk.h>
 #include "gnss_synchro.h"
 #include "galileo_e1_signal_processing.h"
 #include "tracking_discriminators.h"

src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc

@@ -42,6 +42,7 @@
 #include <gnuradio/io_signature.h>
 #include <gnuradio/fxpt.h>  // fixed point sine and cosine
 #include <glog/logging.h>
+#include <volk/volk.h>
 #include "gnss_synchro.h"
 #include "galileo_e5_signal_processing.h"
 #include "tracking_discriminators.h"

src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc

@@ -42,13 +42,14 @@
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
+#include <volk_gnsssdr/volk_gnsssdr.h>
 #include "gnss_synchro.h"
 #include "galileo_e1_signal_processing.h"
 #include "tracking_discriminators.h"
 #include "lock_detectors.h"
 #include "Galileo_E1.h"
 #include "control_message_factory.h"
-#include "volk_gnsssdr/volk_gnsssdr.h"
+
 
 
 
@@ -129,37 +130,37 @@ gr::block("galileo_volk_e1_dll_pll_veml_tracking_cc", gr::io_signature::make(1,
     
     // Initialization of local code replica
     // Get space for a vector with the sinboc(1,1) replica sampled 2x/chip
-    d_ca_code = static_cast<gr_complex*>(volk_malloc((2 * Galileo_E1_B_CODE_LENGTH_CHIPS + 4) * sizeof(gr_complex), volk_get_alignment()));
+    d_ca_code = static_cast<gr_complex*>(volk_malloc((2 * Galileo_E1_B_CODE_LENGTH_CHIPS + 4) * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
     
-    d_very_early_code = static_cast<gr_complex*>(volk_malloc(2 * d_vector_length * sizeof(gr_complex), volk_get_alignment()));
+    d_very_early_code = static_cast<gr_complex*>(volk_malloc(2 * d_vector_length * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
-    d_early_code = static_cast<gr_complex*>(volk_malloc(2 * d_vector_length * sizeof(gr_complex), volk_get_alignment()));
+    d_early_code = static_cast<gr_complex*>(volk_malloc(2 * d_vector_length * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
-    d_prompt_code = static_cast<gr_complex*>(volk_malloc(2 * d_vector_length * sizeof(gr_complex), volk_get_alignment()));
+    d_prompt_code = static_cast<gr_complex*>(volk_malloc(2 * d_vector_length * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
-    d_late_code = static_cast<gr_complex*>(volk_malloc(2 * d_vector_length * sizeof(gr_complex), volk_get_alignment()));
+    d_late_code = static_cast<gr_complex*>(volk_malloc(2 * d_vector_length * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
-    d_very_late_code = static_cast<gr_complex*>(volk_malloc(2 * d_vector_length * sizeof(gr_complex), volk_get_alignment()));
+    d_very_late_code = static_cast<gr_complex*>(volk_malloc(2 * d_vector_length * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
-    d_carr_sign = static_cast<gr_complex*>(volk_malloc(2*d_vector_length * sizeof(gr_complex), volk_get_alignment()));
+    d_carr_sign = static_cast<gr_complex*>(volk_malloc(2*d_vector_length * sizeof(gr_complex), volk_gnsssdr_get_alignment()));
     
-    d_very_early_code16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_get_alignment()));
+    d_very_early_code16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_gnsssdr_get_alignment()));
-    d_early_code16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_get_alignment()));
+    d_early_code16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_gnsssdr_get_alignment()));
-    d_prompt_code16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_get_alignment()));
+    d_prompt_code16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_gnsssdr_get_alignment()));
-    d_late_code16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_get_alignment()));
+    d_late_code16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_gnsssdr_get_alignment()));
-    d_very_late_code16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_get_alignment()));
+    d_very_late_code16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_gnsssdr_get_alignment()));
-    d_carr_sign16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_get_alignment()));
+    d_carr_sign16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_gnsssdr_get_alignment()));
-    in16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_get_alignment()));
+    in16 = static_cast<lv_16sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_16sc_t), volk_gnsssdr_get_alignment()));
     
-    d_very_early_code8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_get_alignment()));
+    d_very_early_code8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_gnsssdr_get_alignment()));
-    d_early_code8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_get_alignment()));
+    d_early_code8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_gnsssdr_get_alignment()));
-    d_prompt_code8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_get_alignment()));
+    d_prompt_code8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_gnsssdr_get_alignment()));
-    d_late_code8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_get_alignment()));
+    d_late_code8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_gnsssdr_get_alignment()));
-    d_very_late_code8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_get_alignment()));
+    d_very_late_code8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_gnsssdr_get_alignment()));
-    d_carr_sign8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_get_alignment()));
+    d_carr_sign8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_gnsssdr_get_alignment()));
-    in8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_get_alignment()));
+    in8 = static_cast<lv_8sc_t*>(volk_malloc(2 * d_vector_length * sizeof(lv_8sc_t), volk_gnsssdr_get_alignment()));
     
     // correlator outputs (scalar)
-    d_Very_Early = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_get_alignment()));
+    d_Very_Early = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_gnsssdr_get_alignment()));
-    d_Early = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_get_alignment()));
+    d_Early = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_gnsssdr_get_alignment()));
-    d_Prompt = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_get_alignment()));
+    d_Prompt = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_gnsssdr_get_alignment()));
-    d_Late = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_get_alignment()));
+    d_Late = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_gnsssdr_get_alignment()));
-    d_Very_Late = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_get_alignment()));
+    d_Very_Late = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_gnsssdr_get_alignment()));
     
     //--- Initializations ------------------------------
     // Initial code frequency basis of NCO

src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.h

@@ -29,8 +29,9 @@
  * -------------------------------------------------------------------------
  */
 
-#ifndef GNSS_SDR_GALIELEO_VOLK_E1_DLL_PLL_VEML_TRACKING_CC_H
+#ifndef GNSS_SDR_GALILEO_VOLK_E1_DLL_PLL_VEML_TRACKING_CC_H
-#define GNSS_SDR_GALIELEO_VOLK_E1_DLL_PLL_VEML_TRACKING_CC_H
+#define GNSS_SDR_GALILEO_VOLK_E1_DLL_PLL_VEML_TRACKING_CC_H
+
 
 #include <fstream>
 #include <queue>
@@ -40,12 +41,14 @@
 #include <boost/thread/thread.hpp>
 #include <gnuradio/block.h>
 #include <gnuradio/msg_queue.h>
+#include <volk/volk.h>
 #include "concurrent_queue.h"
 #include "gnss_synchro.h"
 #include "tracking_2nd_DLL_filter.h"
 #include "tracking_2nd_PLL_filter.h"
 #include "correlator.h"
 
+
 class galileo_volk_e1_dll_pll_veml_tracking_cc;
 
 typedef boost::shared_ptr<galileo_volk_e1_dll_pll_veml_tracking_cc> galileo_volk_e1_dll_pll_veml_tracking_cc_sptr;

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.cc

@@ -40,6 +40,7 @@
 #include <sstream>
 #include <boost/lexical_cast.hpp>
 #include <glog/logging.h>
+#include <volk/volk.h>
 #include <gnuradio/io_signature.h>
 #include "gnss_synchro.h"
 #include "gps_sdr_signal_processing.h"

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.cc

@@ -41,6 +41,7 @@
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
+#include <volk/volk.h>
 #include "gnss_synchro.h"
 #include "gps_sdr_signal_processing.h"
 #include "tracking_discriminators.h"

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc

@@ -43,6 +43,7 @@
 #include <gnuradio/io_signature.h>
 #include <gnuradio/fxpt.h>  // fixed point sine and cosine
 #include <glog/logging.h>
+#include <volk/volk.h>
 #include "gnss_synchro.h"
 #include "gps_sdr_signal_processing.h"
 #include "tracking_discriminators.h"

src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc

@@ -43,6 +43,7 @@
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
+#include <volk/volk.h>
 #include "gnss_synchro.h"
 #include "gps_sdr_signal_processing.h"
 #include "tracking_discriminators.h"

src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc

@@ -42,6 +42,7 @@
 #include <boost/lexical_cast.hpp>
 #include <gnuradio/io_signature.h>
 #include <glog/logging.h>
+#include <volk/volk.h>
 #include "gnss_synchro.h"
 #include "gps_l2c_signal.h"
 #include "tracking_discriminators.h"

src/algorithms/tracking/libs/correlator.cc

@@ -36,6 +36,7 @@
 
 #include "correlator.h"
 #include <iostream>
+#include <volk/volk.h>
 #if USING_VOLK_CW_EPL_CORR_CUSTOM
   #define LV_HAVE_SSE3
   #include "volk_cw_epl_corr.h"

src/algorithms/tracking/libs/correlator.h

@@ -38,7 +38,6 @@
 #define GNSS_SDR_CORRELATOR_H_
 
 #include <string>
-#include <volk/volk.h>
 #include <gnuradio/gr_complex.h>
 
 #if !defined(GENERIC_ARCH) && HAVE_SSE3

src/algorithms/tracking/libs/lock_detectors.cc

@@ -47,9 +47,7 @@
  */
 
 #include "lock_detectors.h"
-#include "GPS_L1_CA.h"
+#include <cmath>
-#include "Galileo_E1.h"
-
 
 /*
  * Signal-to-Noise (SNR) (\f$\rho\f$) estimator using the Signal-to-Noise Variance (SNV) estimator:

src/core/system_parameters/gps_navigation_message.h

@@ -46,7 +46,7 @@
 #include "gps_iono.h"
 #include "gps_almanac.h"
 #include "gps_utc_model.h"
-#include "GPS_L1_CA.h"
+
 
 
 /*!