[hamradio-commits] [gnss-sdr] 28/149: cleaning the use of includes
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Sat Feb 6 19:42:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.
commit 972c86c1eac450ef5be7064649b2597d075fc5f2
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Mon Jan 4 18:06:54 2016 +0100
cleaning the use of includes
---
src/algorithms/PVT/adapters/galileo_e1_pvt.cc | 1 -
src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc | 1 -
src/algorithms/PVT/adapters/hybrid_pvt.cc | 1 -
.../PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc | 2 -
.../PVT/gnuradio_blocks/galileo_e1_pvt_cc.h | 10 +-
.../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc | 2 -
.../PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h | 10 +-
.../PVT/gnuradio_blocks/hybrid_pvt_cc.cc | 2 -
src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h | 15 +--
.../observables/adapters/galileo_e1_observables.cc | 1 -
.../observables/adapters/gps_l1_ca_observables.cc | 3 -
.../observables/adapters/hybrid_observables.cc | 1 -
.../observables/adapters/mixed_observables.cc | 3 -
.../gnuradio_blocks/galileo_e1_observables_cc.cc | 139 +++++++++++----------
.../gnuradio_blocks/galileo_e1_observables_cc.h | 12 +-
.../gnuradio_blocks/gps_l1_ca_observables_cc.cc | 2 +
.../gnuradio_blocks/gps_l1_ca_observables_cc.h | 10 +-
.../gnuradio_blocks/hybrid_observables_cc.cc | 4 +-
.../gnuradio_blocks/hybrid_observables_cc.h | 6 +-
.../gnuradio_blocks/mixed_observables_cc.cc | 2 +
.../gnuradio_blocks/mixed_observables_cc.h | 6 +-
.../adapters/gps_l1_ca_telemetry_decoder.cc | 2 +-
.../tracking/gnuradio_blocks/CMakeLists.txt | 3 +-
.../galileo_e1_dll_pll_veml_tracking_cc.cc | 1 +
.../galileo_e1_dll_pll_veml_tracking_cc.h | 1 +
.../galileo_e1_tcp_connector_tracking_cc.cc | 1 +
.../galileo_e5a_dll_pll_tracking_cc.cc | 1 +
.../galileo_volk_e1_dll_pll_veml_tracking_cc.cc | 63 +++++-----
.../galileo_volk_e1_dll_pll_veml_tracking_cc.h | 7 +-
.../gps_l1_ca_dll_fll_pll_tracking_cc.cc | 1 +
.../gps_l1_ca_dll_pll_optim_tracking_cc.cc | 1 +
.../gps_l1_ca_dll_pll_tracking_cc.cc | 1 +
.../gps_l1_ca_tcp_connector_tracking_cc.cc | 1 +
.../gps_l2_m_dll_pll_tracking_cc.cc | 1 +
src/algorithms/tracking/libs/correlator.cc | 1 +
src/algorithms/tracking/libs/correlator.h | 1 -
src/algorithms/tracking/libs/lock_detectors.cc | 4 +-
.../system_parameters/gps_navigation_message.h | 2 +-
38 files changed, 155 insertions(+), 170 deletions(-)
diff --git a/src/algorithms/PVT/adapters/galileo_e1_pvt.cc b/src/algorithms/PVT/adapters/galileo_e1_pvt.cc
index 78074d5..56b9e28 100644
--- a/src/algorithms/PVT/adapters/galileo_e1_pvt.cc
+++ b/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;
diff --git a/src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc b/src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc
index c05bc3c..a44f246 100644
--- a/src/algorithms/PVT/adapters/gps_l1_ca_pvt.cc
+++ b/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;
diff --git a/src/algorithms/PVT/adapters/hybrid_pvt.cc b/src/algorithms/PVT/adapters/hybrid_pvt.cc
index 155c243..bbf5c55 100644
--- a/src/algorithms/PVT/adapters/hybrid_pvt.cc
+++ b/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;
diff --git a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
index e29b5dd..c071cb2 100644
--- a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
+++ b/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;
diff --git a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h
index 074ebb0..5878f5c 100644
--- a/src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.h
+++ b/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;
diff --git a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
index f45276b..ec5ddfc 100644
--- a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
+++ b/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"
diff --git a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h
index 6c1ea24..3a87378 100644
--- a/src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.h
+++ b/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;
diff --git a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
index abf1412..dd63788 100644
--- a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
+++ b/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;
diff --git a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h b/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h
index b708719..4582df9 100644
--- a/src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.h
+++ b/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;
diff --git a/src/algorithms/observables/adapters/galileo_e1_observables.cc b/src/algorithms/observables/adapters/galileo_e1_observables.cc
index 504514a..f6ddd13 100644
--- a/src/algorithms/observables/adapters/galileo_e1_observables.cc
+++ b/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;
diff --git a/src/algorithms/observables/adapters/gps_l1_ca_observables.cc b/src/algorithms/observables/adapters/gps_l1_ca_observables.cc
index 40a5a92..ef8b324 100644
--- a/src/algorithms/observables/adapters/gps_l1_ca_observables.cc
+++ b/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() << ")";
}
diff --git a/src/algorithms/observables/adapters/hybrid_observables.cc b/src/algorithms/observables/adapters/hybrid_observables.cc
index 145c5d0..4eda3df 100644
--- a/src/algorithms/observables/adapters/hybrid_observables.cc
+++ b/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;
diff --git a/src/algorithms/observables/adapters/mixed_observables.cc b/src/algorithms/observables/adapters/mixed_observables.cc
index 9882956..94dedc3 100644
--- a/src/algorithms/observables/adapters/mixed_observables.cc
+++ b/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() << ")";
}
diff --git a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
index b78ec14..0f5aaea 100644
--- a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
+++ b/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;
@@ -144,37 +147,39 @@ int galileo_e1_observables_cc::general_work (int noutput_items, gr_vector_int &n
current_gnss_synchro[i].Pseudorange_m = 0.0;
if (current_gnss_synchro[i].Flag_valid_word) //if this channel have valid word
- {
- //record the word structure in a map for pseudorange computation
- current_gnss_synchro_map.insert(std::pair<int, Gnss_Synchro>(current_gnss_synchro[i].Channel_ID, current_gnss_synchro[i]));
-
- //################### SAVE DOPPLER AND ACC CARRIER PHASE HISTORIC DATA FOR INTERPOLATION IN OBSERVABLE MODULE #######
- d_carrier_doppler_queue_hz[i].push_back(current_gnss_synchro[i].Carrier_Doppler_hz);
- d_acc_carrier_phase_queue_rads[i].push_back(current_gnss_synchro[i].Carrier_phase_rads);
- // 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)
- {
- d_carrier_doppler_queue_hz[i].pop_front();
- }
- 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)
- {
- d_symbol_TOW_queue_s[i].pop_front();
- }
- }else{
- // Clear the observables history for this channel
- if (d_symbol_TOW_queue_s[i].size()>0)
- {
- d_symbol_TOW_queue_s[i].clear();
- d_carrier_doppler_queue_hz[i].clear();
- d_acc_carrier_phase_queue_rads[i].clear();
- }
- }
+ {
+ //record the word structure in a map for pseudorange computation
+ current_gnss_synchro_map.insert(std::pair<int, Gnss_Synchro>(current_gnss_synchro[i].Channel_ID, current_gnss_synchro[i]));
+
+ //################### SAVE DOPPLER AND ACC CARRIER PHASE HISTORIC DATA FOR INTERPOLATION IN OBSERVABLE MODULE #######
+ d_carrier_doppler_queue_hz[i].push_back(current_gnss_synchro[i].Carrier_Doppler_hz);
+ d_acc_carrier_phase_queue_rads[i].push_back(current_gnss_synchro[i].Carrier_phase_rads);
+ // 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)
+ {
+ d_carrier_doppler_queue_hz[i].pop_front();
+ }
+ 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)
+ {
+ d_symbol_TOW_queue_s[i].pop_front();
+ }
+ }
+ else
+ {
+ // Clear the observables history for this channel
+ if (d_symbol_TOW_queue_s[i].size() > 0)
+ {
+ d_symbol_TOW_queue_s[i].clear();
+ d_carrier_doppler_queue_hz[i].clear();
+ d_acc_carrier_phase_queue_rads[i].clear();
+ }
+ }
}
/*
@@ -204,44 +209,44 @@ int galileo_e1_observables_cc::general_work (int noutput_items, gr_vector_int &n
arma::vec desired_symbol_TOW(1);
for(gnss_synchro_iter = current_gnss_synchro_map.begin(); gnss_synchro_iter != current_gnss_synchro_map.end(); gnss_synchro_iter++)
{
- // 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;
- pseudorange_m = traveltime_ms * GPS_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;
-
- if (d_symbol_TOW_queue_s[gnss_synchro_iter->second.Channel_ID].size()>=GPS_L1_CA_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;
- // Curve fitting to cuadratic function
- arma::mat A = arma::ones<arma::mat>(GPS_L1_CA_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);
- arma::mat pinv_A = arma::pinv(A.t() * A) * A.t();
- coef_acc_phase = pinv_A * acc_phase_vec_rads;
- arma::mat coef_doppler(1,3);
- coef_doppler = pinv_A * dopper_vec_hz;
- arma::vec acc_phase_lin;
- arma::vec carrier_doppler_lin;
- acc_phase_lin = coef_acc_phase[0] + coef_acc_phase[1] * desired_symbol_TOW[0];//+coef_acc_phase[2]*desired_symbol_TOW[0]*desired_symbol_TOW[0];
- carrier_doppler_lin = coef_doppler[0] + coef_doppler[1] * desired_symbol_TOW[0];//+coef_doppler[2]*desired_symbol_TOW[0]*desired_symbol_TOW[0];
- current_gnss_synchro[gnss_synchro_iter->second.Channel_ID].Carrier_phase_rads = acc_phase_lin[0];
- current_gnss_synchro[gnss_synchro_iter->second.Channel_ID].Carrier_Doppler_hz = carrier_doppler_lin[0];
- }
+ // 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;
+ 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;
+
+ 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[GALILEO_E1_HISTORY_DEEP - 1] + delta_rx_time_ms / 1000.0;
+ // Curve fitting to cuadratic function
+ 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);
+ arma::mat pinv_A = arma::pinv(A.t() * A) * A.t();
+ coef_acc_phase = pinv_A * acc_phase_vec_rads;
+ arma::mat coef_doppler(1,3);
+ coef_doppler = pinv_A * dopper_vec_hz;
+ arma::vec acc_phase_lin;
+ arma::vec carrier_doppler_lin;
+ acc_phase_lin = coef_acc_phase[0] + coef_acc_phase[1] * desired_symbol_TOW[0];//+coef_acc_phase[2]*desired_symbol_TOW[0]*desired_symbol_TOW[0];
+ carrier_doppler_lin = coef_doppler[0] + coef_doppler[1] * desired_symbol_TOW[0];//+coef_doppler[2]*desired_symbol_TOW[0]*desired_symbol_TOW[0];
+ current_gnss_synchro[gnss_synchro_iter->second.Channel_ID].Carrier_phase_rads = acc_phase_lin[0];
+ current_gnss_synchro[gnss_synchro_iter->second.Channel_ID].Carrier_Doppler_hz = carrier_doppler_lin[0];
+ }
}
}
- if(d_dump == true)
+ if(d_dump == true)
{
// MULTIPLEXED FILE RECORDING - Record results to file
try
diff --git a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
index 5b008e6..0791e15 100644
--- a/src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
+++ b/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 "rinex_printer.h"
-#include "Galileo_E1.h"
-#include "gnss_synchro.h"
+
+//#include "concurrent_queue.h"
+//#include "galileo_navigation_message.h"
+//#include "rinex_printer.h"
+//#include "Galileo_E1.h"
+//#include "gnss_synchro.h"
class galileo_e1_observables_cc;
diff --git a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
index ae58bef..9a793a7 100644
--- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
+++ b/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;
diff --git a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
index 63bcba1..4ca64d8 100644
--- a/src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
+++ b/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;
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
index f17f551..5fa1a46 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
+++ b/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;
diff --git a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
index 5749726..5cfca58 100644
--- a/src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
+++ b/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;
diff --git a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc b/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc
index 29dadd4..161d20b 100644
--- a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc
+++ b/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;
diff --git a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h b/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h
index 0b2d8bc..5d41a64 100644
--- a/src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h
+++ b/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;
diff --git a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc b/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc
index 4f57d08..90408f5 100644
--- a/src/algorithms/telemetry_decoder/adapters/gps_l1_ca_telemetry_decoder.cc
+++ b/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;
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index bd6bb71..6e9029e 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/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)
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
index 6c21126..645ed5d 100755
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.cc
+++ b/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"
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h
index c42eb04..6451ec6 100755
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_dll_pll_veml_tracking_cc.h
+++ b/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"
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
index ebecc93..d65555c 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.cc
+++ b/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"
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc
index 061cc86..1f28e82 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.cc
+++ b/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"
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc
index 1294133..a4be25c 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.cc
+++ b/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"
+
@@ -78,7 +79,7 @@ galileo_volk_e1_dll_pll_veml_make_tracking_cc(
float very_early_late_space_chips)
{
return galileo_volk_e1_dll_pll_veml_tracking_cc_sptr(new galileo_volk_e1_dll_pll_veml_tracking_cc(if_freq,
- fs_in, vector_length, queue, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips, very_early_late_space_chips));
+ fs_in, vector_length, queue, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips, very_early_late_space_chips));
}
@@ -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_very_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_get_alignment()));
- d_prompt_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_get_alignment()));
- d_very_late_code = 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_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_early_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_get_alignment()));
- d_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_get_alignment()));
- d_carr_sign16 = 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_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_early_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_get_alignment()));
- d_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_get_alignment()));
- d_carr_sign8 = 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_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_gnsssdr_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_gnsssdr_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_gnsssdr_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_gnsssdr_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_gnsssdr_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_gnsssdr_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_gnsssdr_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_gnsssdr_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_gnsssdr_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_gnsssdr_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_Early = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_get_alignment()));
- d_Prompt = static_cast<gr_complex*>(volk_malloc(sizeof(gr_complex), volk_get_alignment()));
- d_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_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_gnsssdr_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_gnsssdr_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
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.h
index ead8d05..8db210f 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_volk_e1_dll_pll_veml_tracking_cc.h
+++ b/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
-#define 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_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;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.cc
index 0322a4e..4fc99ef 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_fll_pll_tracking_cc.cc
+++ b/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"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.cc
index 66ed0aa..62f058d 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_optim_tracking_cc.cc
+++ b/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"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
index 9baf997..963bd6e 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_cc.cc
+++ b/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"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
index 1b25ce0..7e64d78 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.cc
+++ b/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"
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc
index a0daf2c..67d3fec 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.cc
+++ b/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"
diff --git a/src/algorithms/tracking/libs/correlator.cc b/src/algorithms/tracking/libs/correlator.cc
index 0f920a9..ff34e69 100644
--- a/src/algorithms/tracking/libs/correlator.cc
+++ b/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"
diff --git a/src/algorithms/tracking/libs/correlator.h b/src/algorithms/tracking/libs/correlator.h
index aebd198..9deaaf4 100644
--- a/src/algorithms/tracking/libs/correlator.h
+++ b/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
diff --git a/src/algorithms/tracking/libs/lock_detectors.cc b/src/algorithms/tracking/libs/lock_detectors.cc
index b3d6e9c..17dafdc 100644
--- a/src/algorithms/tracking/libs/lock_detectors.cc
+++ b/src/algorithms/tracking/libs/lock_detectors.cc
@@ -47,9 +47,7 @@
*/
#include "lock_detectors.h"
-#include "GPS_L1_CA.h"
-#include "Galileo_E1.h"
-
+#include <cmath>
/*
* Signal-to-Noise (SNR) (\f$\rho\f$) estimator using the Signal-to-Noise Variance (SNV) estimator:
diff --git a/src/core/system_parameters/gps_navigation_message.h b/src/core/system_parameters/gps_navigation_message.h
index 02f14fb..4c5e30d 100644
--- a/src/core/system_parameters/gps_navigation_message.h
+++ b/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"
+
/*!
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list