[hamradio-commits] [gnss-sdr] 31/149: Cleaning 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 0a1aa50c4a6c5649868d1e6389a4e081e5068c3f
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Tue Jan 5 10:59:37 2016 +0100
Cleaning includes
plus some code cleaning
---
.../galileo_e1_pcps_8ms_ambiguous_acquisition.cc | 3 -
.../galileo_e1_pcps_ambiguous_acquisition.cc | 1 -
...galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc | 2 -
...ileo_e1_pcps_quicksync_ambiguous_acquisition.cc | 2 -
.../galileo_e1_pcps_tong_ambiguous_acquisition.cc | 1 -
.../galileo_e5a_noncoherent_iq_acquisition_caf.cc | 3 -
.../galileo_e5a_noncoherent_iq_acquisition_caf.h | 226 +++++++++++----------
.../adapters/gps_l1_ca_pcps_acquisition.cc | 8 +-
.../gps_l1_ca_pcps_acquisition_fine_doppler.cc | 14 +-
.../gps_l1_ca_pcps_assisted_acquisition.cc | 18 +-
.../gps_l1_ca_pcps_multithread_acquisition.cc | 5 +-
.../adapters/gps_l1_ca_pcps_opencl_acquisition.cc | 3 -
.../gps_l1_ca_pcps_quicksync_acquisition.cc | 37 ++--
.../adapters/gps_l1_ca_pcps_tong_acquisition.cc | 68 +++----
.../adapters/gps_l2_m_pcps_acquisition.cc | 26 +--
.../gnuradio_blocks/pcps_acquisition_cc.h | 3 -
.../adapters/galileo_e1_dll_pll_veml_tracking.h | 7 +-
.../adapters/galileo_e1_tcp_connector_tracking.h | 8 +-
.../adapters/galileo_e5a_dll_pll_tracking.h | 2 -
.../galileo_volk_e1_dll_pll_veml_tracking.h | 7 +-
.../adapters/gps_l1_ca_dll_fll_pll_tracking.h | 2 +-
.../adapters/gps_l1_ca_dll_pll_optim_tracking.cc | 3 +-
.../adapters/gps_l1_ca_dll_pll_tracking.cc | 19 +-
.../tracking/adapters/gps_l1_ca_dll_pll_tracking.h | 4 +-
.../tracking/adapters/gps_l2_m_dll_pll_tracking.h | 4 +-
25 files changed, 209 insertions(+), 267 deletions(-)
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
index 5cde60b..8d36a2b 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_8ms_ambiguous_acquisition.cc
@@ -30,8 +30,6 @@
*/
#include "galileo_e1_pcps_8ms_ambiguous_acquisition.h"
-#include <iostream>
-#include <string>
#include <boost/lexical_cast.hpp>
#include <boost/math/distributions/exponential.hpp>
#include <glog/logging.h>
@@ -68,7 +66,6 @@ GalileoE1Pcps8msAmbiguousAcquisition::GalileoE1Pcps8msAmbiguousAcquisition(
LOG(WARNING) << "coherent_integration_time should be multiple of "
<< "Galileo code length (4 ms). coherent_integration_time = "
<< sampled_ms_ << " ms will be used.";
-
}
max_dwells_ = configuration_->property(role + ".max_dwells", 1);
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
index d063f35..fd0b62d 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_ambiguous_acquisition.cc
@@ -30,7 +30,6 @@
*/
#include "galileo_e1_pcps_ambiguous_acquisition.h"
-#include <iostream>
#include <boost/lexical_cast.hpp>
#include <boost/math/distributions/exponential.hpp>
#include <glog/logging.h>
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
index 165b891..844222e 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_cccwsr_ambiguous_acquisition.cc
@@ -30,11 +30,9 @@
*/
#include "galileo_e1_pcps_cccwsr_ambiguous_acquisition.h"
-#include <iostream>
#include <boost/lexical_cast.hpp>
#include <boost/math/distributions/exponential.hpp>
#include <glog/logging.h>
-#include <volk/volk.h>
#include "galileo_e1_signal_processing.h"
#include "Galileo_E1.h"
#include "configuration_interface.h"
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
index cb185ba..fc8156c 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_quicksync_ambiguous_acquisition.cc
@@ -30,11 +30,9 @@
*/
#include "galileo_e1_pcps_quicksync_ambiguous_acquisition.h"
-#include <iostream>
#include <boost/lexical_cast.hpp>
#include <boost/math/distributions/exponential.hpp>
#include <glog/logging.h>
-#include <cmath>
#include "galileo_e1_signal_processing.h"
#include "Galileo_E1.h"
#include "configuration_interface.h"
diff --git a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
index 1e9cc78..913b800 100644
--- a/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e1_pcps_tong_ambiguous_acquisition.cc
@@ -30,7 +30,6 @@
*/
#include "galileo_e1_pcps_tong_ambiguous_acquisition.h"
-#include <iostream>
#include <boost/lexical_cast.hpp>
#include <boost/math/distributions/exponential.hpp>
#include <glog/logging.h>
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
index 27c3187..5c11c43 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.cc
@@ -36,12 +36,9 @@
*/
#include "galileo_e5a_noncoherent_iq_acquisition_caf.h"
-#include <iostream>
#include <boost/lexical_cast.hpp>
-#include <stdexcept>
#include <boost/math/distributions/exponential.hpp>
#include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
#include "galileo_e5_signal_processing.h"
#include "Galileo_E5a.h"
#include "configuration_interface.h"
diff --git a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h
index 646c3a5..4d003ab 100644
--- a/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h
+++ b/src/algorithms/acquisition/adapters/galileo_e5a_noncoherent_iq_acquisition_caf.h
@@ -54,119 +54,121 @@ public:
std::string role, unsigned int in_streams,
unsigned int out_streams, boost::shared_ptr<gr::msg_queue> queue);
- virtual ~GalileoE5aNoncoherentIQAcquisitionCaf();
-
- std::string role()
- {
- return role_;
- }
- /*!
- * \brief Returns "Galileo_E5a_Noncoherent_IQ_Acquisition_CAF"
- */
- std::string implementation()
- {
- return "Galileo_E5a_Noncoherent_IQ_Acquisition_CAF";
- }
- size_t item_size()
- {
- return item_size_;
- }
-
- void connect(gr::top_block_sptr top_block);
- void disconnect(gr::top_block_sptr top_block);
- gr::basic_block_sptr get_left_block();
- gr::basic_block_sptr get_right_block();
-
- /*!
- * \brief Set acquisition/tracking common Gnss_Synchro object pointer
- * to efficiently exchange synchronization data between acquisition and
- * tracking blocks
- */
- void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro);
-
- /*!
- * \brief Set acquisition channel unique ID
- */
- void set_channel(unsigned int channel);
-
- /*!
- * \brief Set statistics threshold of PCPS algorithm
- */
- void set_threshold(float threshold);
-
- /*!
- * \brief Set maximum Doppler off grid search
- */
- void set_doppler_max(unsigned int doppler_max);
-
- /*!
- * \brief Set Doppler steps for the grid search
- */
- void set_doppler_step(unsigned int doppler_step);
-
- /*!
- * \brief Set tracking channel internal queue
- */
- void set_channel_queue(concurrent_queue<int> *channel_internal_queue);
-
- /*!
- * \brief Initializes acquisition algorithm.
- */
- void init();
-
- /*!
- * \brief Sets local Galileo E5a code for PCPS acquisition algorithm.
- */
- void set_local_code();
-
- /*!
- * \brief Returns the maximum peak of grid search
- */
- signed int mag();
-
- /*!
- * \brief Restart acquisition algorithm
- */
- void reset();
-
- /*!
- * \brief If set to 1, ensures that acquisition starts at the
- * first available sample.
- * \param state - int=1 forces start of acquisition
- */
- void set_state(int state);
+ virtual ~GalileoE5aNoncoherentIQAcquisitionCaf();
+
+ std::string role()
+ {
+ return role_;
+ }
+
+ /*!
+ * \brief Returns "Galileo_E5a_Noncoherent_IQ_Acquisition_CAF"
+ */
+ std::string implementation()
+ {
+ return "Galileo_E5a_Noncoherent_IQ_Acquisition_CAF";
+ }
+
+ size_t item_size()
+ {
+ return item_size_;
+ }
+
+ void connect(gr::top_block_sptr top_block);
+ void disconnect(gr::top_block_sptr top_block);
+ gr::basic_block_sptr get_left_block();
+ gr::basic_block_sptr get_right_block();
+
+ /*!
+ * \brief Set acquisition/tracking common Gnss_Synchro object pointer
+ * to efficiently exchange synchronization data between acquisition and
+ * tracking blocks
+ */
+ void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro);
+
+ /*!
+ * \brief Set acquisition channel unique ID
+ */
+ void set_channel(unsigned int channel);
+
+ /*!
+ * \brief Set statistics threshold of PCPS algorithm
+ */
+ void set_threshold(float threshold);
+
+ /*!
+ * \brief Set maximum Doppler off grid search
+ */
+ void set_doppler_max(unsigned int doppler_max);
+
+ /*!
+ * \brief Set Doppler steps for the grid search
+ */
+ void set_doppler_step(unsigned int doppler_step);
+
+ /*!
+ * \brief Set tracking channel internal queue
+ */
+ void set_channel_queue(concurrent_queue<int> *channel_internal_queue);
+
+ /*!
+ * \brief Initializes acquisition algorithm.
+ */
+ void init();
+
+ /*!
+ * \brief Sets local Galileo E5a code for PCPS acquisition algorithm.
+ */
+ void set_local_code();
+
+ /*!
+ * \brief Returns the maximum peak of grid search
+ */
+ signed int mag();
+
+ /*!
+ * \brief Restart acquisition algorithm
+ */
+ void reset();
+
+ /*!
+ * \brief If set to 1, ensures that acquisition starts at the
+ * first available sample.
+ * \param state - int=1 forces start of acquisition
+ */
+ void set_state(int state);
private:
- ConfigurationInterface* configuration_;
- galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr acquisition_cc_;
- gr::blocks::stream_to_vector::sptr stream_to_vector_;
- size_t item_size_;
- std::string item_type_;
- unsigned int vector_length_;
- unsigned int code_length_;
- bool bit_transition_flag_;
- unsigned int channel_;
- float threshold_;
- unsigned int doppler_max_;
- unsigned int doppler_step_;
- unsigned int shift_resolution_;
- unsigned int sampled_ms_;
- unsigned int max_dwells_;
- long fs_in_;
- long if_;
- bool dump_;
- std::string dump_filename_;
- int Zero_padding;
- int CAF_window_hz_;
- std::complex<float> * codeI_;
- std::complex<float> * codeQ_;
- bool both_signal_components;
- Gnss_Synchro * gnss_synchro_;
- std::string role_;
- unsigned int in_streams_;
- unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
- concurrent_queue<int> *channel_internal_queue_;
- float calculate_threshold(float pfa);
+ ConfigurationInterface* configuration_;
+ galileo_e5a_noncoherentIQ_acquisition_caf_cc_sptr acquisition_cc_;
+ gr::blocks::stream_to_vector::sptr stream_to_vector_;
+ size_t item_size_;
+ std::string item_type_;
+ unsigned int vector_length_;
+ unsigned int code_length_;
+ bool bit_transition_flag_;
+ unsigned int channel_;
+ float threshold_;
+ unsigned int doppler_max_;
+ unsigned int doppler_step_;
+ unsigned int shift_resolution_;
+ unsigned int sampled_ms_;
+ unsigned int max_dwells_;
+ long fs_in_;
+ long if_;
+ bool dump_;
+ std::string dump_filename_;
+ int Zero_padding;
+ int CAF_window_hz_;
+ std::complex<float> * codeI_;
+ std::complex<float> * codeQ_;
+ bool both_signal_components;
+ Gnss_Synchro * gnss_synchro_;
+ std::string role_;
+ unsigned int in_streams_;
+ unsigned int out_streams_;
+ boost::shared_ptr<gr::msg_queue> queue_;
+ concurrent_queue<int> *channel_internal_queue_;
+ float calculate_threshold(float pfa);
};
#endif /* GALILEO_E5A_NONCOHERENT_IQ_ACQUISITION_CAF_H_ */
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
index 5df940c..196450f 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition.cc
@@ -34,11 +34,8 @@
*/
#include "gps_l1_ca_pcps_acquisition.h"
-#include <iostream>
-#include <stdexcept>
#include <boost/math/distributions/exponential.hpp>
#include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
#include "gps_sdr_signal_processing.h"
#include "GPS_L1_CA.h"
#include "configuration_interface.h"
@@ -85,7 +82,7 @@ GpsL1CaPcpsAcquisition::GpsL1CaPcpsAcquisition(
vector_length_ = code_length_ * sampled_ms_;
- code_= new gr_complex[vector_length_];
+ code_ = new gr_complex[vector_length_];
// if (item_type_.compare("gr_complex") == 0 )
// {
@@ -274,7 +271,7 @@ float GpsL1CaPcpsAcquisition::calculate_threshold(float pfa)
{
frequency_bins++;
}
- DLOG(INFO) << "Channel " << channel_<< " Pfa = " << pfa;
+ DLOG(INFO) << "Channel " << channel_ << " Pfa = " << pfa;
unsigned int ncells = vector_length_ * frequency_bins;
double exponent = 1 / static_cast<double>(ncells);
double val = pow(1.0 - pfa, exponent);
@@ -310,7 +307,6 @@ void GpsL1CaPcpsAcquisition::connect(gr::top_block_sptr top_block)
{
LOG(WARNING) << item_type_ << " unknown acquisition item type";
}
-
}
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
index 7a0a365..efac995 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_acquisition_fine_doppler.cc
@@ -34,7 +34,6 @@
#include "gps_l1_ca_pcps_acquisition_fine_doppler.h"
#include <glog/logging.h>
-#include <gnuradio/io_signature.h>
#include "gps_sdr_signal_processing.h"
#include "GPS_L1_CA.h"
#include "configuration_interface.h"
@@ -53,7 +52,6 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
DLOG(INFO) << "role " << role;
item_type_ = configuration->property(role + ".item_type", default_item_type);
-
fs_in_ = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
if_ = configuration->property(role + ".ifreq", 0);
dump_ = configuration->property(role + ".dump", false);
@@ -67,7 +65,7 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
vector_length_ = round(fs_in_
/ (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS));
- code_= new gr_complex[vector_length_];
+ code_ = new gr_complex[vector_length_];
if (item_type_.compare("gr_complex") == 0)
{
@@ -75,7 +73,6 @@ GpsL1CaPcpsAcquisitionFineDoppler::GpsL1CaPcpsAcquisitionFineDoppler(
acquisition_cc_ = pcps_make_acquisition_fine_doppler_cc(max_dwells_,sampled_ms_,
doppler_max_, doppler_min_, if_, fs_in_, vector_length_, queue_,
dump_, dump_filename_);
-
}
else
{
@@ -161,22 +158,21 @@ void GpsL1CaPcpsAcquisitionFineDoppler::set_local_code()
void GpsL1CaPcpsAcquisitionFineDoppler::reset()
{
- acquisition_cc_->set_active(true);
+ acquisition_cc_->set_active(true);
}
void GpsL1CaPcpsAcquisitionFineDoppler::connect(boost::shared_ptr<gr::top_block> top_block)
{
- if(top_block) { /* top_block is not null */};
+ if(top_block) { /* top_block is not null */};
//nothing to disconnect, now the tracking uses gr_sync_decimator
-
}
void GpsL1CaPcpsAcquisitionFineDoppler::disconnect(boost::shared_ptr<gr::top_block> top_block)
{
- if(top_block) { /* top_block is not null */};
- //nothing to disconnect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to disconnect, now the tracking uses gr_sync_decimator
}
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc
index d32710b..94d3f5a 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_assisted_acquisition.cc
@@ -33,7 +33,6 @@
*/
#include "gps_l1_ca_pcps_assisted_acquisition.h"
-#include <iostream>
#include <glog/logging.h>
#include "gps_sdr_signal_processing.h"
#include "GPS_L1_CA.h"
@@ -54,9 +53,7 @@ GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition(
DLOG(INFO) << "role " << role;
- item_type_ = configuration->property(role + ".item_type",
- default_item_type);
-
+ item_type_ = configuration->property(role + ".item_type", default_item_type);
fs_in_ = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
if_ = configuration->property(role + ".ifreq", 0);
dump_ = configuration->property(role + ".dump", false);
@@ -64,14 +61,13 @@ GpsL1CaPcpsAssistedAcquisition::GpsL1CaPcpsAssistedAcquisition(
doppler_min_ = configuration->property(role + ".doppler_min", -5000);
sampled_ms_ = configuration->property(role + ".coherent_integration_time_ms", 1);
max_dwells_= configuration->property(role + ".max_dwells", 1);
- dump_filename_ = configuration->property(role + ".dump_filename",
- default_dump_filename);
+ dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
//--- Find number of samples per spreading code -------------------------
vector_length_ = round(fs_in_
/ (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS));
- code_= new gr_complex[vector_length_];
+ code_ = new gr_complex[vector_length_];
if (item_type_.compare("gr_complex") == 0)
{
@@ -164,21 +160,21 @@ void GpsL1CaPcpsAssistedAcquisition::set_local_code()
void GpsL1CaPcpsAssistedAcquisition::reset()
{
- acquisition_cc_->set_active(true);
+ acquisition_cc_->set_active(true);
}
void GpsL1CaPcpsAssistedAcquisition::connect(gr::top_block_sptr top_block)
{
- if(top_block) { /* top_block is not null */};
+ if(top_block) { /* top_block is not null */};
//nothing to disconnect, now the tracking uses gr_sync_decimator
}
void GpsL1CaPcpsAssistedAcquisition::disconnect(gr::top_block_sptr top_block)
{
- if(top_block) { /* top_block is not null */};
- //nothing to disconnect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to disconnect, now the tracking uses gr_sync_decimator
}
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc
index 1be6e06..813e2a3 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_multithread_acquisition.cc
@@ -30,11 +30,8 @@
*/
#include "gps_l1_ca_pcps_multithread_acquisition.h"
-#include <iostream>
-#include <stdexcept>
#include <boost/math/distributions/exponential.hpp>
#include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
#include "gps_sdr_signal_processing.h"
#include "GPS_L1_CA.h"
#include "configuration_interface.h"
@@ -83,7 +80,7 @@ GpsL1CaPcpsMultithreadAcquisition::GpsL1CaPcpsMultithreadAcquisition(
vector_length_ = code_length_ * sampled_ms_;
- code_= new gr_complex[vector_length_];
+ code_ = new gr_complex[vector_length_];
if (item_type_.compare("gr_complex") == 0)
{
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc
index f1d85ae..4dba5e2 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.cc
@@ -30,11 +30,8 @@
*/
#include "gps_l1_ca_pcps_opencl_acquisition.h"
-#include <iostream>
-#include <stdexcept>
#include <boost/math/distributions/exponential.hpp>
#include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
#include "gps_sdr_signal_processing.h"
#include "GPS_L1_CA.h"
#include "configuration_interface.h"
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
index dbae797..2d5be99 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_quicksync_acquisition.cc
@@ -31,12 +31,8 @@
*/
#include "gps_l1_ca_pcps_quicksync_acquisition.h"
-#include <iostream>
-#include <cmath>
-#include <stdexcept>
#include <boost/math/distributions/exponential.hpp>
#include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
#include "gps_sdr_signal_processing.h"
#include "GPS_L1_CA.h"
#include "configuration_interface.h"
@@ -49,7 +45,7 @@ GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition(
ConfigurationInterface* configuration, std::string role,
unsigned int in_streams, unsigned int out_streams,
gr::msg_queue::sptr queue) :
- role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(queue)
+ role_(role), in_streams_(in_streams), out_streams_(out_streams), queue_(queue)
{
configuration_ = configuration;
std::string default_item_type = "gr_complex";
@@ -63,13 +59,13 @@ GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition(
dump_ = configuration_->property(role + ".dump", false);
shift_resolution_ = configuration_->property(role + ".doppler_max", 15);
sampled_ms_ = configuration_->property(role + ".coherent_integration_time_ms", 4);
-
+
//--- Find number of samples per spreading code -------------------------
code_length_ = round(fs_in_
/ (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS));
-
+
/*Calculate the folding factor value based on the calculations*/
unsigned int temp = (unsigned int)ceil(sqrt(log2(code_length_)));
folding_factor_ = configuration_->property(role + ".folding_factor", temp);
@@ -92,7 +88,7 @@ GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition(
<< sampled_ms_ << " ms will be used instead.";
}
- vector_length_ = code_length_ * sampled_ms_;
+ vector_length_ = code_length_ * sampled_ms_;
bit_transition_flag_ = configuration_->property(role + ".bit_transition_flag", false);
if (!bit_transition_flag_)
@@ -110,11 +106,11 @@ GpsL1CaPcpsQuickSyncAcquisition::GpsL1CaPcpsQuickSyncAcquisition(
code_ = new gr_complex[code_length_]();
/*Object relevant information for debugging*/
LOG(INFO) << "Implementation: " << this->implementation()
- << ", Vector Length: " << vector_length_
- << ", Samples per ms: " << samples_per_ms
- << ", Folding factor: " << folding_factor_
- << ", Sampled ms: " << sampled_ms_
- << ", Code Length: " << code_length_;
+ << ", Vector Length: " << vector_length_
+ << ", Samples per ms: " << samples_per_ms
+ << ", Folding factor: " << folding_factor_
+ << ", Sampled ms: " << sampled_ms_
+ << ", Code Length: " << code_length_;
if (item_type_.compare("gr_complex") == 0)
{
@@ -179,7 +175,7 @@ void GpsL1CaPcpsQuickSyncAcquisition::set_threshold(float threshold)
threshold_ = calculate_threshold(pfa);
}
- DLOG(INFO) <<"Channel "<<channel_<<" Threshold = " << threshold_;
+ DLOG(INFO) << "Channel "<< channel_ << " Threshold = " << threshold_;
if (item_type_.compare("gr_complex") == 0)
{
@@ -205,7 +201,6 @@ void GpsL1CaPcpsQuickSyncAcquisition::set_doppler_step(unsigned int doppler_step
{
acquisition_cc_->set_doppler_step(doppler_step_);
}
-
}
@@ -259,13 +254,13 @@ void GpsL1CaPcpsQuickSyncAcquisition::set_local_code()
gps_l1_ca_code_gen_complex_sampled(code, gnss_synchro_->PRN, fs_in_, 0);
-
+
for (unsigned int i = 0; i < (sampled_ms_/folding_factor_); i++)
- {
- memcpy(&(code_[i*code_length_]), code,
- sizeof(gr_complex)*code_length_);
- }
-
+ {
+ memcpy(&(code_[i*code_length_]), code,
+ sizeof(gr_complex)*code_length_);
+ }
+
//memcpy(code_, code,sizeof(gr_complex)*code_length_);
acquisition_cc_->set_local_code(code_);
diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc
index 289cfdd..f49ba2f 100644
--- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_tong_acquisition.cc
@@ -30,11 +30,8 @@
*/
#include "gps_l1_ca_pcps_tong_acquisition.h"
-#include <iostream>
-#include <stdexcept>
#include <boost/math/distributions/exponential.hpp>
#include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
#include "gps_sdr_signal_processing.h"
#include "GPS_L1_CA.h"
#include "configuration_interface.h"
@@ -54,8 +51,7 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition(
DLOG(INFO) << "role " << role;
- item_type_ = configuration_->property(role + ".item_type",
- default_item_type);
+ item_type_ = configuration_->property(role + ".item_type", default_item_type);
fs_in_ = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000);
if_ = configuration_->property(role + ".ifreq", 0);
@@ -66,8 +62,7 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition(
tong_init_val_ = configuration->property(role + ".tong_init_val", 1);
tong_max_val_ = configuration->property(role + ".tong_max_val", 2);
- dump_filename_ = configuration_->property(role + ".dump_filename",
- default_dump_filename);
+ dump_filename_ = configuration_->property(role + ".dump_filename", default_dump_filename);
//--- Find number of samples per spreading code -------------------------
code_length_ = round(fs_in_
@@ -75,7 +70,7 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition(
vector_length_ = code_length_ * sampled_ms_;
- code_= new gr_complex[vector_length_];
+ code_ = new gr_complex[vector_length_];
if (item_type_.compare("gr_complex") == 0)
{
@@ -86,10 +81,8 @@ GpsL1CaPcpsTongAcquisition::GpsL1CaPcpsTongAcquisition(
stream_to_vector_ = gr::blocks::stream_to_vector::make(item_size_, vector_length_);
- DLOG(INFO) << "stream_to_vector(" << stream_to_vector_->unique_id()
- << ")";
- DLOG(INFO) << "acquisition(" << acquisition_cc_->unique_id()
- << ")";
+ DLOG(INFO) << "stream_to_vector(" << stream_to_vector_->unique_id() << ")";
+ DLOG(INFO) << "acquisition(" << acquisition_cc_->unique_id() << ")";
}
else
{
@@ -125,22 +118,22 @@ void GpsL1CaPcpsTongAcquisition::set_channel(unsigned int channel)
void GpsL1CaPcpsTongAcquisition::set_threshold(float threshold)
{
- float pfa = configuration_->property(role_ + boost::lexical_cast<std::string>(channel_) + ".pfa", 0.0);
+ float pfa = configuration_->property(role_ + boost::lexical_cast<std::string>(channel_) + ".pfa", 0.0);
- if(pfa==0.0)
+ if(pfa == 0.0)
{
- pfa = configuration_->property(role_+".pfa", 0.0);
+ pfa = configuration_->property(role_+".pfa", 0.0);
+ }
+ if(pfa == 0.0)
+ {
+ threshold_ = threshold;
+ }
+ else
+ {
+ threshold_ = calculate_threshold(pfa);
}
- if(pfa==0.0)
- {
- threshold_ = threshold;
- }
- else
- {
- threshold_ = calculate_threshold(pfa);
- }
- DLOG(INFO) <<"Channel "<<channel_<<" Threshold = " << threshold_;
+ DLOG(INFO) << "Channel " << channel_ << " Threshold = " << threshold_;
if (item_type_.compare("gr_complex") == 0)
{
@@ -230,6 +223,7 @@ void GpsL1CaPcpsTongAcquisition::set_local_code()
}
}
+
void GpsL1CaPcpsTongAcquisition::reset()
{
if (item_type_.compare("gr_complex") == 0)
@@ -238,6 +232,7 @@ void GpsL1CaPcpsTongAcquisition::reset()
}
}
+
void GpsL1CaPcpsTongAcquisition::set_state(int state)
{
if (item_type_.compare("gr_complex") == 0)
@@ -246,28 +241,29 @@ void GpsL1CaPcpsTongAcquisition::set_state(int state)
}
}
+
float GpsL1CaPcpsTongAcquisition::calculate_threshold(float pfa)
{
- //Calculate the threshold
-
- unsigned int frequency_bins = 0;
- for (int doppler = (int)(-doppler_max_); doppler <= (int)doppler_max_; doppler += doppler_step_)
+ //Calculate the threshold
+ unsigned int frequency_bins = 0;
+ for (int doppler = (int)(-doppler_max_); doppler <= (int)doppler_max_; doppler += doppler_step_)
{
frequency_bins++;
}
- DLOG(INFO) << "Channel "<< channel_ <<" Pfa = "<< pfa;
+ DLOG(INFO) << "Channel "<< channel_ <<" Pfa = "<< pfa;
- unsigned int ncells = vector_length_ * frequency_bins;
- double exponent = 1 / static_cast<double>(ncells);
- double val = pow(1.0 - pfa,exponent);
- double lambda = double(vector_length_);
- boost::math::exponential_distribution<double> mydist (lambda);
- float threshold = (float)quantile(mydist, val);
+ unsigned int ncells = vector_length_ * frequency_bins;
+ double exponent = 1 / static_cast<double>(ncells);
+ double val = pow(1.0 - pfa,exponent);
+ double lambda = double(vector_length_);
+ boost::math::exponential_distribution<double> mydist (lambda);
+ float threshold = (float)quantile(mydist, val);
- return threshold;
+ return threshold;
}
+
void GpsL1CaPcpsTongAcquisition::connect(gr::top_block_sptr top_block)
{
if (item_type_.compare("gr_complex") == 0)
diff --git a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
index adb05c3..853eabc 100644
--- a/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
+++ b/src/algorithms/acquisition/adapters/gps_l2_m_pcps_acquisition.cc
@@ -32,12 +32,8 @@
*/
#include "gps_l2_m_pcps_acquisition.h"
-#include <iostream>
-#include <fstream>
-#include <stdexcept>
#include <boost/math/distributions/exponential.hpp>
#include <glog/logging.h>
-#include <gnuradio/msg_queue.h>
#include "gps_l2c_signal.h"
#include "GPS_L2C.h"
#include "configuration_interface.h"
@@ -57,8 +53,7 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
LOG(INFO) << "role " << role;
- item_type_ = configuration_->property(role + ".item_type",
- default_item_type);
+ item_type_ = configuration_->property(role + ".item_type", default_item_type);
//float pfa = configuration_->property(role + ".pfa", 0.0);
fs_in_ = configuration_->property("GNSS-SDR.internal_fs_hz", 2048000);
@@ -77,16 +72,15 @@ GpsL2MPcpsAcquisition::GpsL2MPcpsAcquisition(
max_dwells_ = 2;
}
- dump_filename_ = configuration_->property(role + ".dump_filename",
- default_dump_filename);
+ dump_filename_ = configuration_->property(role + ".dump_filename", default_dump_filename);
//--- Find number of samples per spreading code -------------------------
- code_length_ = round((double)fs_in_
- / (GPS_L2_M_CODE_RATE_HZ / (double)GPS_L2_M_CODE_LENGTH_CHIPS));
+ code_length_ = round(static_cast<double>(fs_in_)
+ / (GPS_L2_M_CODE_RATE_HZ / static_cast<double>(GPS_L2_M_CODE_LENGTH_CHIPS)));
vector_length_ = code_length_;
- code_= new gr_complex[vector_length_];
+ code_ = new gr_complex[vector_length_];
// if (item_type_.compare("gr_complex") == 0 )
// {
@@ -161,11 +155,11 @@ void GpsL2MPcpsAcquisition::set_threshold(float threshold)
threshold_ = calculate_threshold(pfa);
}
- DLOG(INFO) <<"Channel "<<channel_<<" Threshold = " << threshold_;
+ DLOG(INFO) << "Channel " << channel_ <<" Threshold = " << threshold_;
- // if (item_type_.compare("gr_complex") == 0)
+ // if (item_type_.compare("gr_complex") == 0)
// {
- acquisition_cc_->set_threshold(threshold_);
+ acquisition_cc_->set_threshold(threshold_);
// }
}
@@ -277,13 +271,13 @@ float GpsL2MPcpsAcquisition::calculate_threshold(float pfa)
{
//Calculate the threshold
unsigned int frequency_bins = 0;
- for (int doppler = (int)(-doppler_max_); doppler <= (int)doppler_max_; doppler += doppler_step_)
+ for (int doppler = static_cast<int>(-doppler_max_); doppler <= static_cast<int>(doppler_max_); doppler += doppler_step_)
{
frequency_bins++;
}
DLOG(INFO) << "Channel " << channel_<< " Pfa = " << pfa;
unsigned int ncells = vector_length_ * frequency_bins;
- double exponent = 1 / static_cast<double>(ncells);
+ double exponent = 1.0 / static_cast<double>(ncells);
double val = pow(1.0 - pfa, exponent);
double lambda = double(vector_length_);
boost::math::exponential_distribution<double> mydist (lambda);
diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h
index db2d27f..e7b89c3 100644
--- a/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h
+++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h
@@ -52,8 +52,6 @@
#include <fstream>
#include <string>
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/thread.hpp>
#include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
#include <gnuradio/gr_complex.h>
@@ -225,7 +223,6 @@ public:
d_doppler_step = doppler_step;
}
-
/*!
* \brief Set tracking channel internal queue.
* \param channel_internal_queue - Channel's internal blocks information queue.
diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h
index aacd271..c95d1da 100755
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h
@@ -51,10 +51,8 @@ class ConfigurationInterface;
*/
class GalileoE1DllPllVemlTracking : public TrackingInterface
{
-
public:
-
- GalileoE1DllPllVemlTracking(ConfigurationInterface* configuration,
+ GalileoE1DllPllVemlTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,
@@ -103,12 +101,9 @@ public:
void start_tracking();
private:
-
galileo_e1_dll_pll_veml_tracking_cc_sptr tracking_;
size_t item_size_;
-
unsigned int channel_;
-
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h
index 05e130a..65b7d9a 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h
+++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h
@@ -52,10 +52,8 @@ class ConfigurationInterface;
*/
class GalileoE1TcpConnectorTracking : public TrackingInterface
{
-
public:
-
- GalileoE1TcpConnectorTracking(ConfigurationInterface* configuration,
+ GalileoE1TcpConnectorTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,
@@ -67,6 +65,7 @@ public:
{
return role_;
}
+
//! Returns "Galileo_E1_TCP_CONNECTOR_Tracking"
std::string implementation()
{
@@ -103,12 +102,9 @@ public:
void start_tracking();
private:
-
galileo_e1_tcp_connector_tracking_cc_sptr tracking_;
size_t item_size_;
-
unsigned int channel_;
-
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
index efba54c..bcb5271 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
@@ -53,7 +53,6 @@ class ConfigurationInterface;
class GalileoE5aDllPllTracking : public TrackingInterface
{
public:
-
GalileoE5aDllPllTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
@@ -82,7 +81,6 @@ public:
gr::basic_block_sptr get_left_block();
gr::basic_block_sptr get_right_block();
-
/*!
* \brief Set tracking channel unique ID
*/
diff --git a/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.h b/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.h
index 965e91d..fae1a23 100644
--- a/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.h
+++ b/src/algorithms/tracking/adapters/galileo_volk_e1_dll_pll_veml_tracking.h
@@ -51,10 +51,8 @@ class ConfigurationInterface;
*/
class GalileoVolkE1DllPllVemlTracking : public TrackingInterface
{
-
public:
-
- GalileoVolkE1DllPllVemlTracking(ConfigurationInterface* configuration,
+ GalileoVolkE1DllPllVemlTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,
@@ -103,12 +101,9 @@ public:
void start_tracking();
private:
-
galileo_volk_e1_dll_pll_veml_tracking_cc_sptr tracking_;
size_t item_size_;
-
unsigned int channel_;
-
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.h
index ab20b38..7fd84a9 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_fll_pll_tracking.h
@@ -52,7 +52,7 @@ class ConfigurationInterface;
class GpsL1CaDllFllPllTracking : public TrackingInterface
{
public:
- GpsL1CaDllFllPllTracking(ConfigurationInterface* configuration,
+ GpsL1CaDllFllPllTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc
index 11392d8..14cf004 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_optim_tracking.cc
@@ -37,8 +37,7 @@
*/
#include "gps_l1_ca_dll_pll_optim_tracking.h"
-#include <boost/math/special_functions/round.hpp>
-#include <gnuradio/io_signature.h>
+#include <cmath>
#include <glog/logging.h>
#include "GPS_L1_CA.h"
#include "configuration_interface.h"
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
index 4dcab03..60fc038 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.cc
@@ -64,7 +64,6 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
float dll_bw_hz;
float early_late_space_chips;
item_type = configuration->property(role + ".item_type", default_item_type);
- //vector_length = configuration->property(role + ".vector_length", 2048);
fs_in = configuration->property("GNSS-SDR.internal_fs_hz", 2048000);
f_if = configuration->property(role + ".if", 0);
dump = configuration->property(role + ".dump", false);
@@ -72,8 +71,7 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
dll_bw_hz = configuration->property(role + ".dll_bw_hz", 2.0);
early_late_space_chips = configuration->property(role + ".early_late_space_chips", 0.5);
std::string default_dump_filename = "./track_ch";
- dump_filename = configuration->property(role + ".dump_filename",
- default_dump_filename); //unused!
+ dump_filename = configuration->property(role + ".dump_filename", default_dump_filename); //unused!
vector_length = std::round(fs_in / (GPS_L1_CA_CODE_RATE_HZ / GPS_L1_CA_CODE_LENGTH_CHIPS));
//################# MAKE TRACKING GNURadio object ###################
@@ -111,6 +109,7 @@ void GpsL1CaDllPllTracking::start_tracking()
tracking_->start_tracking();
}
+
/*
* Set tracking channel unique ID
*/
@@ -120,6 +119,7 @@ void GpsL1CaDllPllTracking::set_channel(unsigned int channel)
tracking_->set_channel(channel);
}
+
/*
* Set tracking channel internal queue
*/
@@ -130,28 +130,33 @@ void GpsL1CaDllPllTracking::set_channel_queue(
tracking_->set_channel_queue(channel_internal_queue_);
}
+
void GpsL1CaDllPllTracking::set_gnss_synchro(Gnss_Synchro* p_gnss_synchro)
{
tracking_->set_gnss_synchro(p_gnss_synchro);
}
+
void GpsL1CaDllPllTracking::connect(gr::top_block_sptr top_block)
{
- if(top_block) { /* top_block is not null */};
- //nothing to connect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to connect, now the tracking uses gr_sync_decimator
}
+
void GpsL1CaDllPllTracking::disconnect(gr::top_block_sptr top_block)
{
- if(top_block) { /* top_block is not null */};
- //nothing to disconnect, now the tracking uses gr_sync_decimator
+ if(top_block) { /* top_block is not null */};
+ //nothing to disconnect, now the tracking uses gr_sync_decimator
}
+
gr::basic_block_sptr GpsL1CaDllPllTracking::get_left_block()
{
return tracking_;
}
+
gr::basic_block_sptr GpsL1CaDllPllTracking::get_right_block()
{
return tracking_;
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h
index acb726a..322a3b2 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking.h
@@ -52,8 +52,7 @@ class ConfigurationInterface;
class GpsL1CaDllPllTracking : public TrackingInterface
{
public:
-
- GpsL1CaDllPllTracking(ConfigurationInterface* configuration,
+ GpsL1CaDllPllTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,
@@ -71,6 +70,7 @@ public:
{
return "GPS_L1_CA_DLL_PLL_Tracking";
}
+
size_t item_size()
{
return item_size_;
diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h
index 06e9112..5ab564d 100644
--- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h
@@ -52,8 +52,7 @@ class ConfigurationInterface;
class GpsL2MDllPllTracking : public TrackingInterface
{
public:
-
- GpsL2MDllPllTracking(ConfigurationInterface* configuration,
+ GpsL2MDllPllTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
unsigned int out_streams,
@@ -71,6 +70,7 @@ public:
{
return "gps_l2_m_dll_pll_tracking";
}
+
size_t item_size()
{
return item_size_;
--
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