[hamradio-commits] [gnss-sdr] 50/80: Remove unused queue from tracking blocks
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Sun May 15 20:11:56 UTC 2016
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch upstream
in repository gnss-sdr.
commit 0acb48c0b58388095bc27142324404cecf93d2d7
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date: Mon May 9 11:51:42 2016 +0200
Remove unused queue from tracking blocks
Now replaced by GNU Radio block's message passing system
---
.../adapters/galileo_e1_dll_pll_veml_tracking.cc | 7 +---
.../adapters/galileo_e1_dll_pll_veml_tracking.h | 6 +--
.../adapters/galileo_e1_tcp_connector_tracking.cc | 7 +---
.../adapters/galileo_e1_tcp_connector_tracking.h | 5 +--
.../adapters/galileo_e5a_dll_pll_tracking.cc | 7 +---
.../adapters/galileo_e5a_dll_pll_tracking.h | 5 +--
.../adapters/gps_l1_ca_dll_pll_tracking_gpu.cc | 7 +---
.../adapters/gps_l1_ca_dll_pll_tracking_gpu.h | 7 +---
.../adapters/gps_l1_ca_tcp_connector_tracking.cc | 7 +---
.../adapters/gps_l1_ca_tcp_connector_tracking.h | 5 +--
.../tracking/adapters/gps_l2_m_dll_pll_tracking.cc | 7 +---
.../tracking/adapters/gps_l2_m_dll_pll_tracking.h | 5 +--
.../galileo_e1_dll_pll_veml_tracking_cc.cc | 5 +--
.../galileo_e1_dll_pll_veml_tracking_cc.h | 6 ---
.../galileo_e1_tcp_connector_tracking_cc.cc | 5 +--
.../galileo_e1_tcp_connector_tracking_cc.h | 8 +---
.../galileo_e5a_dll_pll_tracking_cc.cc | 5 +--
.../galileo_e5a_dll_pll_tracking_cc.h | 6 ---
.../gps_l1_ca_dll_pll_tracking_gpu_cc.cc | 5 +--
.../gps_l1_ca_dll_pll_tracking_gpu_cc.h | 18 +++------
.../gps_l1_ca_tcp_connector_tracking_cc.cc | 7 +---
.../gps_l1_ca_tcp_connector_tracking_cc.h | 6 ---
.../gps_l2_m_dll_pll_tracking_cc.cc | 5 +--
.../gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h | 7 ----
src/core/receiver/gnss_block_factory.cc | 45 ++++++++++++++--------
src/core/receiver/gnss_block_factory.h | 2 +-
.../gnss_block/gps_l2_m_dll_pll_tracking_test.cc | 2 +-
27 files changed, 64 insertions(+), 143 deletions(-)
diff --git a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
index 222469b..ce9613e 100755
--- a/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
@@ -44,10 +44,8 @@ using google::LogMessage;
GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking(
ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
- role_(role), in_streams_(in_streams), out_streams_(out_streams),
- queue_(queue)
+ unsigned int in_streams, unsigned int out_streams) :
+ role_(role), in_streams_(in_streams), out_streams_(out_streams)
{
DLOG(INFO) << "role " << role;
//################# CONFIGURATION PARAMETERS ########################
@@ -85,7 +83,6 @@ GalileoE1DllPllVemlTracking::GalileoE1DllPllVemlTracking(
f_if,
fs_in,
vector_length,
- queue_,
dump,
dump_filename,
pll_bw_hz,
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 5d6a770..874044b 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
@@ -37,8 +37,8 @@
#ifndef GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_H_
#define GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_H_
+
#include <string>
-#include <gnuradio/msg_queue.h>
#include "tracking_interface.h"
#include "galileo_e1_dll_pll_veml_tracking_cc.h"
@@ -55,8 +55,7 @@ public:
GalileoE1DllPllVemlTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
- unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
virtual ~GalileoE1DllPllVemlTracking();
@@ -103,7 +102,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
};
#endif // GNSS_SDR_GALILEO_E1_DLL_PLL_VEML_TRACKING_H_
diff --git a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
index 91d989f..1f8cd27 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
@@ -45,10 +45,8 @@ using google::LogMessage;
GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking(
ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
- role_(role), in_streams_(in_streams), out_streams_(out_streams),
- queue_(queue)
+ unsigned int in_streams, unsigned int out_streams) :
+ role_(role), in_streams_(in_streams), out_streams_(out_streams)
{
DLOG(INFO) << "role " << role;
//################# CONFIGURATION PARAMETERS ########################
@@ -85,7 +83,6 @@ GalileoE1TcpConnectorTracking::GalileoE1TcpConnectorTracking(
f_if,
fs_in,
vector_length,
- queue_,
dump,
dump_filename,
pll_bw_hz,
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 116cb99..c4e0c3e 100644
--- a/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h
+++ b/src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h
@@ -40,7 +40,6 @@
#define GNSS_SDR_GALILEO_E1_TCP_CONNECTOR_TRACKING_H_
#include <string>
-#include <gnuradio/msg_queue.h>
#include "tracking_interface.h"
#include "galileo_e1_tcp_connector_tracking_cc.h"
@@ -56,8 +55,7 @@ public:
GalileoE1TcpConnectorTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
- unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
virtual ~GalileoE1TcpConnectorTracking();
@@ -104,7 +102,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
};
#endif // GNSS_SDR_GALILEO_E1_TCP_CONNECTOR_TRACKING_H_
diff --git a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
index ab4dcdc..c90d981 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
@@ -46,10 +46,8 @@ using google::LogMessage;
GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
- role_(role), in_streams_(in_streams), out_streams_(out_streams),
- queue_(queue)
+ unsigned int in_streams, unsigned int out_streams) :
+ role_(role), in_streams_(in_streams), out_streams_(out_streams)
{
DLOG(INFO) << "role " << role;
//################# CONFIGURATION PARAMETERS ########################
@@ -91,7 +89,6 @@ GalileoE5aDllPllTracking::GalileoE5aDllPllTracking(
f_if,
fs_in,
vector_length,
- queue_,
dump,
dump_filename,
pll_bw_hz,
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 ad2c388..b9b4678 100644
--- a/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
+++ b/src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
@@ -40,7 +40,6 @@
#define GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_H_
#include <string>
-#include <gnuradio/msg_queue.h>
#include "tracking_interface.h"
#include "galileo_e5a_dll_pll_tracking_cc.h"
@@ -56,8 +55,7 @@ public:
GalileoE5aDllPllTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
- unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
virtual ~GalileoE5aDllPllTracking();
@@ -102,7 +100,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
};
#endif /* GNSS_SDR_GALILEO_E5A_DLL_PLL_TRACKING_H_ */
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc
index 6989906..ac36f52 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc
@@ -45,10 +45,8 @@ using google::LogMessage;
GpsL1CaDllPllTrackingGPU::GpsL1CaDllPllTrackingGPU(
ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
- role_(role), in_streams_(in_streams), out_streams_(out_streams),
- queue_(queue)
+ unsigned int in_streams, unsigned int out_streams) :
+ role_(role), in_streams_(in_streams), out_streams_(out_streams)
{
DLOG(INFO) << "role " << role;
//################# CONFIGURATION PARAMETERS ########################
@@ -83,7 +81,6 @@ GpsL1CaDllPllTrackingGPU::GpsL1CaDllPllTrackingGPU(
f_if,
fs_in,
vector_length,
- queue_,
dump,
dump_filename,
pll_bw_hz,
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h
index 674b258..2632689 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h
@@ -38,7 +38,6 @@
#define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_GPU_H_
#include <string>
-#include <gnuradio/msg_queue.h>
#include "tracking_interface.h"
#include "gps_l1_ca_dll_pll_tracking_gpu_cc.h"
@@ -54,8 +53,7 @@ public:
GpsL1CaDllPllTrackingGPU(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
- unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
virtual ~GpsL1CaDllPllTrackingGPU();
@@ -79,7 +77,6 @@ public:
gr::basic_block_sptr get_left_block();
gr::basic_block_sptr get_right_block();
-
/*!
* \brief Set tracking channel unique ID
*/
@@ -91,7 +88,6 @@ public:
*/
void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro);
-
void start_tracking();
private:
@@ -101,7 +97,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
};
#endif // GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_GPU_H_
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc
index 5e38465..38a2a08 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc
@@ -45,10 +45,8 @@ using google::LogMessage;
GpsL1CaTcpConnectorTracking::GpsL1CaTcpConnectorTracking(
ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
- role_(role), in_streams_(in_streams), out_streams_(out_streams),
- queue_(queue)
+ unsigned int in_streams, unsigned int out_streams) :
+ role_(role), in_streams_(in_streams), out_streams_(out_streams)
{
DLOG(INFO) << "role " << role;
//################# CONFIGURATION PARAMETERS ########################
@@ -80,7 +78,6 @@ GpsL1CaTcpConnectorTracking::GpsL1CaTcpConnectorTracking(
f_if,
fs_in,
vector_length,
- queue_,
dump,
dump_filename,
early_late_space_chips,
diff --git a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h
index 78b83ad..32d91e3 100644
--- a/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h
+++ b/src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h
@@ -39,7 +39,6 @@
#define GNSS_SDR_GPS_L1_CA_TCP_CONNECTOR_TRACKING_H_
#include <string>
-#include <gnuradio/msg_queue.h>
#include "tracking_interface.h"
#include "gps_l1_ca_tcp_connector_tracking_cc.h"
@@ -57,8 +56,7 @@ public:
GpsL1CaTcpConnectorTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
- unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
virtual ~GpsL1CaTcpConnectorTracking();
@@ -107,7 +105,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
};
#endif // GNSS_SDR_GPS_L1_CA_TCP_CONNECTOR_TRACKING_H_
diff --git a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc
index 02a45ce..01afa14 100644
--- a/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc
+++ b/src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc
@@ -45,10 +45,8 @@ using google::LogMessage;
GpsL2MDllPllTracking::GpsL2MDllPllTracking(
ConfigurationInterface* configuration, std::string role,
- unsigned int in_streams, unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue) :
- role_(role), in_streams_(in_streams), out_streams_(out_streams),
- queue_(queue)
+ unsigned int in_streams, unsigned int out_streams) :
+ role_(role), in_streams_(in_streams), out_streams_(out_streams)
{
DLOG(INFO) << "role " << role;
//################# CONFIGURATION PARAMETERS ########################
@@ -82,7 +80,6 @@ GpsL2MDllPllTracking::GpsL2MDllPllTracking(
f_if,
fs_in,
vector_length,
- queue_,
dump,
dump_filename,
pll_bw_hz,
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 9141877..b864249 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
@@ -39,7 +39,6 @@
#define GNSS_SDR_gps_l2_m_dll_pll_tracking_H_
#include <string>
-#include <gnuradio/msg_queue.h>
#include "tracking_interface.h"
#include "gps_l2_m_dll_pll_tracking_cc.h"
@@ -55,8 +54,7 @@ public:
GpsL2MDllPllTracking(ConfigurationInterface* configuration,
std::string role,
unsigned int in_streams,
- unsigned int out_streams,
- boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
virtual ~GpsL2MDllPllTracking();
@@ -102,7 +100,6 @@ private:
std::string role_;
unsigned int in_streams_;
unsigned int out_streams_;
- boost::shared_ptr<gr::msg_queue> queue_;
};
#endif // GNSS_SDR_gps_l2_m_dll_pll_tracking_H_
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 06879b2..70f7489 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
@@ -67,7 +67,6 @@ galileo_e1_dll_pll_veml_make_tracking_cc(
long if_freq,
long fs_in,
unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -76,7 +75,7 @@ galileo_e1_dll_pll_veml_make_tracking_cc(
float very_early_late_space_chips)
{
return galileo_e1_dll_pll_veml_tracking_cc_sptr(new galileo_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, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips, very_early_late_space_chips));
}
@@ -94,7 +93,6 @@ galileo_e1_dll_pll_veml_tracking_cc::galileo_e1_dll_pll_veml_tracking_cc(
long if_freq,
long fs_in,
unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -111,7 +109,6 @@ galileo_e1_dll_pll_veml_tracking_cc::galileo_e1_dll_pll_veml_tracking_cc(
this->message_port_register_out(pmt::mp("events"));
// initialize internal vars
- d_queue = queue;
d_dump = dump;
d_if_freq = if_freq;
d_fs_in = fs_in;
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 e10eb09..3377234 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
@@ -36,8 +36,6 @@
#include <string>
#include <map>
#include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
-#include "concurrent_queue.h"
#include "gnss_synchro.h"
#include "tracking_2nd_DLL_filter.h"
#include "tracking_2nd_PLL_filter.h"
@@ -51,7 +49,6 @@ galileo_e1_dll_pll_veml_tracking_cc_sptr
galileo_e1_dll_pll_veml_make_tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -87,7 +84,6 @@ private:
galileo_e1_dll_pll_veml_make_tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -98,7 +94,6 @@ private:
galileo_e1_dll_pll_veml_tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -111,7 +106,6 @@ private:
void update_local_carrier();
// tracking configuration vars
- boost::shared_ptr<gr::msg_queue> d_queue;
unsigned int d_vector_length;
bool d_dump;
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 5b8bfab..9ac0e22 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
@@ -69,7 +69,6 @@ galileo_e1_tcp_connector_tracking_cc_sptr galileo_e1_tcp_connector_make_tracking
long if_freq,
long fs_in,
unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -79,7 +78,7 @@ galileo_e1_tcp_connector_tracking_cc_sptr galileo_e1_tcp_connector_make_tracking
size_t port_ch0)
{
return galileo_e1_tcp_connector_tracking_cc_sptr(new Galileo_E1_Tcp_Connector_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, port_ch0));
+ fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips, very_early_late_space_chips, port_ch0));
}
@@ -97,7 +96,6 @@ Galileo_E1_Tcp_Connector_Tracking_cc::Galileo_E1_Tcp_Connector_Tracking_cc(
long if_freq,
long fs_in,
unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz __attribute__((unused)),
@@ -113,7 +111,6 @@ Galileo_E1_Tcp_Connector_Tracking_cc::Galileo_E1_Tcp_Connector_Tracking_cc(
this->message_port_register_out(pmt::mp("events"));
this->set_relative_rate(1.0/vector_length);
// initialize internal vars
- d_queue = queue;
d_dump = dump;
d_if_freq = if_freq;
d_fs_in = fs_in;
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
index c0042e0..8a00caa 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e1_tcp_connector_tracking_cc.h
@@ -43,10 +43,8 @@
#include <map>
#include <string>
#include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
-#include "concurrent_queue.h"
-#include "gnss_synchro.h"
#include <volk/volk.h>
+#include "gnss_synchro.h"
#include "cpu_multicorrelator.h"
#include "tcp_communication.h"
@@ -59,7 +57,6 @@ galileo_e1_tcp_connector_tracking_cc_sptr
galileo_e1_tcp_connector_make_tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -90,7 +87,6 @@ private:
galileo_e1_tcp_connector_make_tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -102,7 +98,6 @@ private:
Galileo_E1_Tcp_Connector_Tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -116,7 +111,6 @@ private:
void update_local_carrier();
// tracking configuration vars
- boost::shared_ptr<gr::msg_queue> d_queue;
unsigned int d_vector_length;
bool d_dump;
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 255a2c2..006ac92 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
@@ -66,7 +66,6 @@ galileo_e5a_dll_pll_make_tracking_cc(
long if_freq,
long fs_in,
unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -77,7 +76,7 @@ galileo_e5a_dll_pll_make_tracking_cc(
float early_late_space_chips)
{
return galileo_e5a_dll_pll_tracking_cc_sptr(new Galileo_E5a_Dll_Pll_Tracking_cc(if_freq,
- fs_in, vector_length, queue, dump, dump_filename, pll_bw_hz, dll_bw_hz, pll_bw_init_hz, dll_bw_init_hz, ti_ms, early_late_space_chips));
+ fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, pll_bw_init_hz, dll_bw_init_hz, ti_ms, early_late_space_chips));
}
@@ -95,7 +94,6 @@ Galileo_E5a_Dll_Pll_Tracking_cc::Galileo_E5a_Dll_Pll_Tracking_cc(
long if_freq,
long fs_in,
unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -112,7 +110,6 @@ Galileo_E5a_Dll_Pll_Tracking_cc::Galileo_E5a_Dll_Pll_Tracking_cc(
this->message_port_register_out(pmt::mp("events"));
this->set_relative_rate(1.0 / vector_length);
// initialize internal vars
- d_queue = queue;
d_dump = dump;
d_if_freq = if_freq;
d_fs_in = fs_in;
diff --git a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h
index 7f0a9f8..3d21bd7 100644
--- a/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/galileo_e5a_dll_pll_tracking_cc.h
@@ -41,8 +41,6 @@
#include <map>
#include <string>
#include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
-#include "concurrent_queue.h"
#include "gnss_synchro.h"
#include "tracking_2nd_DLL_filter.h"
#include "tracking_2nd_PLL_filter.h"
@@ -57,7 +55,6 @@ galileo_e5a_dll_pll_tracking_cc_sptr
galileo_e5a_dll_pll_make_tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -91,7 +88,6 @@ private:
galileo_e5a_dll_pll_make_tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -104,7 +100,6 @@ private:
Galileo_E5a_Dll_Pll_Tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -115,7 +110,6 @@ private:
float early_late_space_chips);
void acquire_secondary();
// tracking configuration vars
- boost::shared_ptr<gr::msg_queue> d_queue;
unsigned int d_vector_length;
int d_current_ti_ms;
int d_ti_ms;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc
index ba963dc..8bca816 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.cc
@@ -62,7 +62,6 @@ gps_l1_ca_dll_pll_make_tracking_gpu_cc(
long if_freq,
long fs_in,
unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -70,7 +69,7 @@ gps_l1_ca_dll_pll_make_tracking_gpu_cc(
float early_late_space_chips)
{
return gps_l1_ca_dll_pll_tracking_gpu_cc_sptr(new Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc(if_freq,
- fs_in, vector_length, queue, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips));
+ fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips));
}
@@ -90,7 +89,6 @@ Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc::Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc(
long if_freq,
long fs_in,
unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -103,7 +101,6 @@ Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc::Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc(
this->message_port_register_in(pmt::mp("preamble_timestamp_s"));
this->message_port_register_out(pmt::mp("events"));
// initialize internal vars
- d_queue = queue;
d_dump = dump;
d_if_freq = if_freq;
d_fs_in = fs_in;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h
index ed59676..e2a51b1 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h
@@ -40,8 +40,6 @@
#include <map>
#include <string>
#include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
-#include "concurrent_queue.h"
#include "gnss_synchro.h"
#include "tracking_2nd_DLL_filter.h"
#include "tracking_FLL_PLL_filter.h"
@@ -54,9 +52,8 @@ typedef boost::shared_ptr<Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc>
gps_l1_ca_dll_pll_tracking_gpu_cc_sptr
gps_l1_ca_dll_pll_make_tracking_gpu_cc(long if_freq,
- long fs_in, unsigned
- int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
+ long fs_in,
+ unsigned int vector_length,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -85,9 +82,8 @@ public:
private:
friend gps_l1_ca_dll_pll_tracking_gpu_cc_sptr
gps_l1_ca_dll_pll_make_tracking_gpu_cc(long if_freq,
- long fs_in, unsigned
- int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
+ long fs_in,
+ unsigned int vector_length,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -95,9 +91,8 @@ private:
float early_late_space_chips);
Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc(long if_freq,
- long fs_in, unsigned
- int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
+ long fs_in,
+ unsigned int vector_length,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -107,7 +102,6 @@ private:
void update_local_carrier();
// tracking configuration vars
- boost::shared_ptr<gr::msg_queue> d_queue;
unsigned int d_vector_length;
bool d_dump;
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 362be06..a88b4b4 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
@@ -8,7 +8,7 @@
* Code DLL + carrier PLL according to the algorithms described in:
* [1] K.Borre, D.M.Akos, N.Bertelsen, P.Rinder, and S.H.Jensen,
* A Software-Defined GPS and Galileo Receiver. A Single-Frequency
- * Approach, Birkha user, 2007
+ * Approach, Birkhauser, 2007
*
* -------------------------------------------------------------------------
*
@@ -67,14 +67,13 @@ gps_l1_ca_tcp_connector_make_tracking_cc(
long if_freq,
long fs_in,
unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float early_late_space_chips,
size_t port_ch0)
{
return gps_l1_ca_tcp_connector_tracking_cc_sptr(new Gps_L1_Ca_Tcp_Connector_Tracking_cc(if_freq,
- fs_in, vector_length, queue, dump, dump_filename, early_late_space_chips, port_ch0));
+ fs_in, vector_length, dump, dump_filename, early_late_space_chips, port_ch0));
}
@@ -94,7 +93,6 @@ Gps_L1_Ca_Tcp_Connector_Tracking_cc::Gps_L1_Ca_Tcp_Connector_Tracking_cc(
long if_freq,
long fs_in,
unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float early_late_space_chips,
@@ -106,7 +104,6 @@ Gps_L1_Ca_Tcp_Connector_Tracking_cc::Gps_L1_Ca_Tcp_Connector_Tracking_cc(
this->message_port_register_in(pmt::mp("preamble_timestamp_s"));
this->message_port_register_out(pmt::mp("events"));
// initialize internal vars
- d_queue = queue;
d_dump = dump;
d_if_freq = if_freq;
d_fs_in = fs_in;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
index 6bd9d63..20a92da 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_tcp_connector_tracking_cc.h
@@ -41,8 +41,6 @@
#include <map>
#include <string>
#include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
-#include "concurrent_queue.h"
#include "gnss_synchro.h"
#include "cpu_multicorrelator.h"
#include "tcp_communication.h"
@@ -57,7 +55,6 @@ gps_l1_ca_tcp_connector_tracking_cc_sptr
gps_l1_ca_tcp_connector_make_tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float early_late_space_chips,
@@ -90,7 +87,6 @@ private:
gps_l1_ca_tcp_connector_make_tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float early_late_space_chips,
@@ -99,14 +95,12 @@ private:
Gps_L1_Ca_Tcp_Connector_Tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float early_late_space_chips,
size_t port_ch0);
// tracking configuration vars
- boost::shared_ptr<gr::msg_queue> d_queue;
unsigned int d_vector_length;
bool d_dump;
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 aae20dd..898a5e4 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
@@ -66,7 +66,6 @@ gps_l2_m_dll_pll_make_tracking_cc(
long if_freq,
long fs_in,
unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -74,7 +73,7 @@ gps_l2_m_dll_pll_make_tracking_cc(
float early_late_space_chips)
{
return gps_l2_m_dll_pll_tracking_cc_sptr(new gps_l2_m_dll_pll_tracking_cc(if_freq,
- fs_in, vector_length, queue, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips));
+ fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, early_late_space_chips));
}
@@ -93,7 +92,6 @@ gps_l2_m_dll_pll_tracking_cc::gps_l2_m_dll_pll_tracking_cc(
long if_freq,
long fs_in,
unsigned int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -106,7 +104,6 @@ gps_l2_m_dll_pll_tracking_cc::gps_l2_m_dll_pll_tracking_cc(
this->message_port_register_in(pmt::mp("preamble_timestamp_s"));
this->message_port_register_out(pmt::mp("events"));
// initialize internal vars
- d_queue = queue;
d_dump = dump;
d_if_freq = if_freq;
d_fs_in = fs_in;
diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h
index 9ebe7eb..1a371a7 100644
--- a/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h
+++ b/src/algorithms/tracking/gnuradio_blocks/gps_l2_m_dll_pll_tracking_cc.h
@@ -37,12 +37,9 @@
#define GNSS_SDR_GPS_L2_M_DLL_PLL_TRACKING_CC_H
#include <fstream>
-#include <queue>
#include <map>
#include <string>
#include <gnuradio/block.h>
-#include <gnuradio/msg_queue.h>
-#include "concurrent_queue.h"
#include "gnss_synchro.h"
#include "tracking_2nd_DLL_filter.h"
#include "tracking_2nd_PLL_filter.h"
@@ -57,7 +54,6 @@ gps_l2_m_dll_pll_tracking_cc_sptr
gps_l2_m_dll_pll_make_tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -88,7 +84,6 @@ private:
gps_l2_m_dll_pll_make_tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -98,7 +93,6 @@ private:
gps_l2_m_dll_pll_tracking_cc(long if_freq,
long fs_in, unsigned
int vector_length,
- boost::shared_ptr<gr::msg_queue> queue,
bool dump,
std::string dump_filename,
float pll_bw_hz,
@@ -106,7 +100,6 @@ private:
float early_late_space_chips);
// tracking configuration vars
- boost::shared_ptr<gr::msg_queue> d_queue;
unsigned int d_vector_length;
bool d_dump;
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 93e4793..65c3c17 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -294,7 +294,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_1C(
std::unique_ptr<GNSSBlockInterface> pass_through_ = GetBlock(configuration, "Channel", "Pass_Through", 1, 1, queue);
std::unique_ptr<AcquisitionInterface> acq_ = GetAcqBlock(configuration, "Acquisition_1C" + appendix1, acq, 1, 0, queue);
- std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_1C"+ appendix2, trk, 1, 1, queue);
+ std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_1C"+ appendix2, trk, 1, 1);
std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_1C" + appendix3, tlm, 1, 1);
std::unique_ptr<GNSSBlockInterface> channel_(new Channel(configuration.get(), channel, std::move(pass_through_),
@@ -348,8 +348,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_2S(
std::unique_ptr<GNSSBlockInterface> pass_through_ = GetBlock(configuration, "Channel", "Pass_Through", 1, 1, queue);
std::unique_ptr<AcquisitionInterface> acq_ = GetAcqBlock(configuration, "Acquisition_2S" + appendix1 , acq, 1, 0, queue);
- std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_2S" + appendix2, trk, 1, 1, queue);
-
+ std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_2S" + appendix2, trk, 1, 1);
std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_2S" + appendix3, tlm, 1, 1);
std::unique_ptr<GNSSBlockInterface> channel_(new Channel(configuration.get(), channel, std::move(pass_through_),
@@ -405,7 +404,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_1B(
std::unique_ptr<GNSSBlockInterface> pass_through_ = GetBlock(configuration, "Channel", "Pass_Through", 1, 1, queue);
std::unique_ptr<AcquisitionInterface> acq_ = GetAcqBlock(configuration, "Acquisition_1B" + appendix1, acq, 1, 0, queue);
- std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_1B" + appendix2, trk, 1, 1, queue);
+ std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_1B" + appendix2, trk, 1, 1);
std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_1B" + appendix3, tlm, 1, 1);
std::unique_ptr<GNSSBlockInterface> channel_(new Channel(configuration.get(), channel, std::move(pass_through_),
@@ -461,7 +460,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetChannel_5X(
std::unique_ptr<GNSSBlockInterface> pass_through_ = GetBlock(configuration, "Channel", "Pass_Through", 1, 1, queue);
std::unique_ptr<AcquisitionInterface> acq_ = GetAcqBlock(configuration, "Acquisition_5X" + appendix1, acq, 1, 0, queue);
- std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_5X" + appendix2, trk, 1, 1, queue);
+ std::unique_ptr<TrackingInterface> trk_ = GetTrkBlock(configuration, "Tracking_5X" + appendix2, trk, 1, 1);
std::unique_ptr<TelemetryDecoderInterface> tlm_ = GetTlmBlock(configuration, "TelemetryDecoder_5X" + appendix3, tlm, 1, 1);
std::unique_ptr<GNSSBlockInterface> channel_(new Channel(configuration.get(), channel, std::move(pass_through_),
@@ -950,25 +949,39 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
else if (implementation.compare("GPS_L1_CA_TCP_CONNECTOR_Tracking") == 0)
{
std::unique_ptr<GNSSBlockInterface> block_(new GpsL1CaTcpConnectorTracking(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
+ block = std::move(block_);
+ }
+ else if (implementation.compare("GPS_L2_M_DLL_PLL_Tracking") == 0)
+ {
+ std::unique_ptr<GNSSBlockInterface> block_(new GpsL2MDllPllTracking(configuration.get(), role, in_streams,
+ out_streams));
+ block = std::move(block_);
+ }
+#if CUDA_GPU_ACCEL
+ else if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking_GPU") == 0)
+ {
+ std::unique_ptr<GNSSBlockInterface> block_(new GpsL1CaDllPllTrackingGPU(configuration.get(), role, in_streams,
+ out_streams));
block = std::move(block_);
}
+#endif
else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking") == 0)
{
std::unique_ptr<GNSSBlockInterface> block_(new GalileoE1DllPllVemlTracking(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
else if (implementation.compare("Galileo_E1_TCP_CONNECTOR_Tracking") == 0)
{
std::unique_ptr<GNSSBlockInterface> block_(new GalileoE1TcpConnectorTracking(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking") == 0)
{
std::unique_ptr<GNSSBlockInterface> block_(new GalileoE5aDllPllTracking(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
@@ -1164,7 +1177,7 @@ std::unique_ptr<TrackingInterface> GNSSBlockFactory::GetTrkBlock(
std::shared_ptr<ConfigurationInterface> configuration,
std::string role,
std::string implementation, unsigned int in_streams,
- unsigned int out_streams, boost::shared_ptr<gr::msg_queue> queue)
+ unsigned int out_streams)
{
std::unique_ptr<TrackingInterface> block;
@@ -1184,38 +1197,38 @@ std::unique_ptr<TrackingInterface> GNSSBlockFactory::GetTrkBlock(
else if (implementation.compare("GPS_L1_CA_TCP_CONNECTOR_Tracking") == 0)
{
std::unique_ptr<TrackingInterface> block_(new GpsL1CaTcpConnectorTracking(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
else if (implementation.compare("Galileo_E1_DLL_PLL_VEML_Tracking") == 0)
{
std::unique_ptr<TrackingInterface> block_(new GalileoE1DllPllVemlTracking(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
else if (implementation.compare("Galileo_E1_TCP_CONNECTOR_Tracking") == 0)
{
std::unique_ptr<TrackingInterface> block_(new GalileoE1TcpConnectorTracking(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
else if (implementation.compare("Galileo_E5a_DLL_PLL_Tracking") == 0)
{
std::unique_ptr<TrackingInterface> block_(new GalileoE5aDllPllTracking(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
else if (implementation.compare("GPS_L2_M_DLL_PLL_Tracking") == 0)
{
std::unique_ptr<TrackingInterface> block_(new GpsL2MDllPllTracking(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
#if CUDA_GPU_ACCEL
else if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking_GPU") == 0)
{
std::unique_ptr<TrackingInterface> block_(new GpsL1CaDllPllTrackingGPU(configuration.get(), role, in_streams,
- out_streams, queue));
+ out_streams));
block = std::move(block_);
}
#endif
diff --git a/src/core/receiver/gnss_block_factory.h b/src/core/receiver/gnss_block_factory.h
index 10d8c4d..b4e9b7c 100644
--- a/src/core/receiver/gnss_block_factory.h
+++ b/src/core/receiver/gnss_block_factory.h
@@ -110,7 +110,7 @@ private:
std::shared_ptr<ConfigurationInterface> configuration,
std::string role,
std::string implementation, unsigned int in_streams,
- unsigned int out_streams, boost::shared_ptr<gr::msg_queue> queue);
+ unsigned int out_streams);
std::unique_ptr<TelemetryDecoderInterface> GetTlmBlock(
std::shared_ptr<ConfigurationInterface> configuration,
diff --git a/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc b/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc
index 36d5429..842600c 100644
--- a/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc
+++ b/src/tests/gnss_block/gps_l2_m_dll_pll_tracking_test.cc
@@ -159,7 +159,7 @@ TEST_F(GpsL2MDllPllTrackingTest, ValidationOfResults)
init();
queue = gr::msg_queue::make(0);
top_block = gr::make_top_block("Tracking test");
- std::shared_ptr<TrackingInterface> tracking = std::make_shared<GpsL2MDllPllTracking>(config.get(), "Tracking_2S", 1, 1, queue);
+ std::shared_ptr<TrackingInterface> tracking = std::make_shared<GpsL2MDllPllTracking>(config.get(), "Tracking_2S", 1, 1);
boost::shared_ptr<GpsL2MDllPllTrackingTest_msg_rx> msg_rx = GpsL2MDllPllTrackingTest_msg_rx_make();
gnss_synchro.Acq_delay_samples = 1;
--
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