mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-09 19:53:04 +00:00
Code Issues Releases Wiki Activity

Remove unused queue from tracking blocks

Browse Source 
Now replaced by GNU Radio block's message passing system
This commit is contained in:
Carles Fernandez
2016-05-09 11:51:42 +02:00
parent 7a6952f8b6
commit 0acb48c0b5
27 changed files with 64 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.cc
View File

@@ -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,

6
src/algorithms/tracking/adapters/galileo_e1_dll_pll_veml_tracking.h
View File

@@ -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_

7
src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.cc
View File

@@ -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,

5
src/algorithms/tracking/adapters/galileo_e1_tcp_connector_tracking.h
View File

@@ -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_

7
src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.cc
View File

@@ -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,

5
src/algorithms/tracking/adapters/galileo_e5a_dll_pll_tracking.h
View File

@@ -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_ */

7
src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.cc
View File

@@ -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,

7
src/algorithms/tracking/adapters/gps_l1_ca_dll_pll_tracking_gpu.h
View File

@@ -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_

7
src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.cc
View File

@@ -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,

5
src/algorithms/tracking/adapters/gps_l1_ca_tcp_connector_tracking.h
View File

@@ -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_

7
src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.cc
View File

@@ -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,

5
src/algorithms/tracking/adapters/gps_l2_m_dll_pll_tracking.h
View File

@@ -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_