mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-07-15 16:32:55 +00:00
Remove unused queue
Now replaced by GNU Radio block's message passing system
This commit is contained in:
parent
24e0055e36
commit
7a6952f8b6
@ -46,10 +46,8 @@ using google::LogMessage;
|
|||||||
|
|
||||||
GpsL1CaDllPllCAidTracking::GpsL1CaDllPllCAidTracking(
|
GpsL1CaDllPllCAidTracking::GpsL1CaDllPllCAidTracking(
|
||||||
ConfigurationInterface* configuration, std::string role,
|
ConfigurationInterface* configuration, std::string role,
|
||||||
unsigned int in_streams, unsigned int out_streams,
|
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)
|
||||||
role_(role), in_streams_(in_streams), out_streams_(out_streams),
|
|
||||||
queue_(queue)
|
|
||||||
{
|
{
|
||||||
DLOG(INFO) << "role " << role;
|
DLOG(INFO) << "role " << role;
|
||||||
//################# CONFIGURATION PARAMETERS ########################
|
//################# CONFIGURATION PARAMETERS ########################
|
||||||
@ -90,7 +88,6 @@ GpsL1CaDllPllCAidTracking::GpsL1CaDllPllCAidTracking(
|
|||||||
f_if,
|
f_if,
|
||||||
fs_in,
|
fs_in,
|
||||||
vector_length,
|
vector_length,
|
||||||
queue_,
|
|
||||||
dump,
|
dump,
|
||||||
dump_filename,
|
dump_filename,
|
||||||
pll_bw_hz,
|
pll_bw_hz,
|
||||||
@ -108,7 +105,6 @@ GpsL1CaDllPllCAidTracking::GpsL1CaDllPllCAidTracking(
|
|||||||
f_if,
|
f_if,
|
||||||
fs_in,
|
fs_in,
|
||||||
vector_length,
|
vector_length,
|
||||||
queue_,
|
|
||||||
dump,
|
dump,
|
||||||
dump_filename,
|
dump_filename,
|
||||||
pll_bw_hz,
|
pll_bw_hz,
|
||||||
|
@ -39,7 +39,6 @@
|
|||||||
#define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_H_
|
#define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_H_
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <gnuradio/msg_queue.h>
|
|
||||||
#include "tracking_interface.h"
|
#include "tracking_interface.h"
|
||||||
#include "gps_l1_ca_dll_pll_c_aid_tracking_cc.h"
|
#include "gps_l1_ca_dll_pll_c_aid_tracking_cc.h"
|
||||||
#include "gps_l1_ca_dll_pll_c_aid_tracking_sc.h"
|
#include "gps_l1_ca_dll_pll_c_aid_tracking_sc.h"
|
||||||
@ -57,8 +56,7 @@ public:
|
|||||||
GpsL1CaDllPllCAidTracking(ConfigurationInterface* configuration,
|
GpsL1CaDllPllCAidTracking(ConfigurationInterface* configuration,
|
||||||
std::string role,
|
std::string role,
|
||||||
unsigned int in_streams,
|
unsigned int in_streams,
|
||||||
unsigned int out_streams,
|
unsigned int out_streams);
|
||||||
boost::shared_ptr<gr::msg_queue> queue);
|
|
||||||
|
|
||||||
virtual ~GpsL1CaDllPllCAidTracking();
|
virtual ~GpsL1CaDllPllCAidTracking();
|
||||||
|
|
||||||
@ -106,7 +104,6 @@ private:
|
|||||||
std::string role_;
|
std::string role_;
|
||||||
unsigned int in_streams_;
|
unsigned int in_streams_;
|
||||||
unsigned int out_streams_;
|
unsigned int out_streams_;
|
||||||
boost::shared_ptr<gr::msg_queue> queue_;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_H_
|
#endif // GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_H_
|
||||||
|
@ -46,10 +46,8 @@ using google::LogMessage;
|
|||||||
|
|
||||||
GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
|
GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
|
||||||
ConfigurationInterface* configuration, std::string role,
|
ConfigurationInterface* configuration, std::string role,
|
||||||
unsigned int in_streams, unsigned int out_streams,
|
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)
|
||||||
role_(role), in_streams_(in_streams), out_streams_(out_streams),
|
|
||||||
queue_(queue)
|
|
||||||
{
|
{
|
||||||
DLOG(INFO) << "role " << role;
|
DLOG(INFO) << "role " << role;
|
||||||
//################# CONFIGURATION PARAMETERS ########################
|
//################# CONFIGURATION PARAMETERS ########################
|
||||||
@ -82,7 +80,6 @@ GpsL1CaDllPllTracking::GpsL1CaDllPllTracking(
|
|||||||
f_if,
|
f_if,
|
||||||
fs_in,
|
fs_in,
|
||||||
vector_length,
|
vector_length,
|
||||||
queue_,
|
|
||||||
dump,
|
dump,
|
||||||
dump_filename,
|
dump_filename,
|
||||||
pll_bw_hz,
|
pll_bw_hz,
|
||||||
|
@ -39,7 +39,6 @@
|
|||||||
#define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_H_
|
#define GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_H_
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <gnuradio/msg_queue.h>
|
|
||||||
#include "tracking_interface.h"
|
#include "tracking_interface.h"
|
||||||
#include "gps_l1_ca_dll_pll_tracking_cc.h"
|
#include "gps_l1_ca_dll_pll_tracking_cc.h"
|
||||||
|
|
||||||
@ -55,8 +54,7 @@ public:
|
|||||||
GpsL1CaDllPllTracking(ConfigurationInterface* configuration,
|
GpsL1CaDllPllTracking(ConfigurationInterface* configuration,
|
||||||
std::string role,
|
std::string role,
|
||||||
unsigned int in_streams,
|
unsigned int in_streams,
|
||||||
unsigned int out_streams,
|
unsigned int out_streams);
|
||||||
boost::shared_ptr<gr::msg_queue> queue);
|
|
||||||
|
|
||||||
virtual ~GpsL1CaDllPllTracking();
|
virtual ~GpsL1CaDllPllTracking();
|
||||||
|
|
||||||
@ -81,7 +79,6 @@ public:
|
|||||||
gr::basic_block_sptr get_left_block();
|
gr::basic_block_sptr get_left_block();
|
||||||
gr::basic_block_sptr get_right_block();
|
gr::basic_block_sptr get_right_block();
|
||||||
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Set tracking channel unique ID
|
* \brief Set tracking channel unique ID
|
||||||
*/
|
*/
|
||||||
@ -93,7 +90,6 @@ public:
|
|||||||
*/
|
*/
|
||||||
void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro);
|
void set_gnss_synchro(Gnss_Synchro* p_gnss_synchro);
|
||||||
|
|
||||||
|
|
||||||
void start_tracking();
|
void start_tracking();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@ -103,7 +99,6 @@ private:
|
|||||||
std::string role_;
|
std::string role_;
|
||||||
unsigned int in_streams_;
|
unsigned int in_streams_;
|
||||||
unsigned int out_streams_;
|
unsigned int out_streams_;
|
||||||
boost::shared_ptr<gr::msg_queue> queue_;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_H_
|
#endif // GNSS_SDR_GPS_L1_CA_DLL_PLL_TRACKING_H_
|
||||||
|
@ -62,7 +62,6 @@ gps_l1_ca_dll_pll_c_aid_make_tracking_cc(
|
|||||||
long if_freq,
|
long if_freq,
|
||||||
long fs_in,
|
long fs_in,
|
||||||
unsigned int vector_length,
|
unsigned int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -73,7 +72,7 @@ gps_l1_ca_dll_pll_c_aid_make_tracking_cc(
|
|||||||
float early_late_space_chips)
|
float early_late_space_chips)
|
||||||
{
|
{
|
||||||
return gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr(new gps_l1_ca_dll_pll_c_aid_tracking_cc(if_freq,
|
return gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr(new gps_l1_ca_dll_pll_c_aid_tracking_cc(if_freq,
|
||||||
fs_in, vector_length, queue, dump, dump_filename, pll_bw_hz, dll_bw_hz,pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
|
fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz,pll_bw_narrow_hz, dll_bw_narrow_hz, extend_correlation_ms, early_late_space_chips));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -104,7 +103,6 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc::gps_l1_ca_dll_pll_c_aid_tracking_cc(
|
|||||||
long if_freq,
|
long if_freq,
|
||||||
long fs_in,
|
long fs_in,
|
||||||
unsigned int vector_length,
|
unsigned int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -124,7 +122,6 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc::gps_l1_ca_dll_pll_c_aid_tracking_cc(
|
|||||||
|
|
||||||
this->message_port_register_out(pmt::mp("events"));
|
this->message_port_register_out(pmt::mp("events"));
|
||||||
// initialize internal vars
|
// initialize internal vars
|
||||||
d_queue = queue;
|
|
||||||
d_dump = dump;
|
d_dump = dump;
|
||||||
d_if_freq = if_freq;
|
d_if_freq = if_freq;
|
||||||
d_fs_in = fs_in;
|
d_fs_in = fs_in;
|
||||||
|
@ -42,9 +42,7 @@
|
|||||||
#include <deque>
|
#include <deque>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <gnuradio/block.h>
|
#include <gnuradio/block.h>
|
||||||
#include <gnuradio/msg_queue.h>
|
|
||||||
#include <pmt/pmt.h>
|
#include <pmt/pmt.h>
|
||||||
#include "concurrent_queue.h"
|
|
||||||
#include "gnss_synchro.h"
|
#include "gnss_synchro.h"
|
||||||
#include "tracking_2nd_DLL_filter.h"
|
#include "tracking_2nd_DLL_filter.h"
|
||||||
#include "tracking_FLL_PLL_filter.h"
|
#include "tracking_FLL_PLL_filter.h"
|
||||||
@ -60,7 +58,6 @@ gps_l1_ca_dll_pll_c_aid_tracking_cc_sptr
|
|||||||
gps_l1_ca_dll_pll_c_aid_make_tracking_cc(long if_freq,
|
gps_l1_ca_dll_pll_c_aid_make_tracking_cc(long if_freq,
|
||||||
long fs_in, unsigned
|
long fs_in, unsigned
|
||||||
int vector_length,
|
int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -94,7 +91,6 @@ private:
|
|||||||
gps_l1_ca_dll_pll_c_aid_make_tracking_cc(long if_freq,
|
gps_l1_ca_dll_pll_c_aid_make_tracking_cc(long if_freq,
|
||||||
long fs_in, unsigned
|
long fs_in, unsigned
|
||||||
int vector_length,
|
int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -107,7 +103,6 @@ private:
|
|||||||
gps_l1_ca_dll_pll_c_aid_tracking_cc(long if_freq,
|
gps_l1_ca_dll_pll_c_aid_tracking_cc(long if_freq,
|
||||||
long fs_in, unsigned
|
long fs_in, unsigned
|
||||||
int vector_length,
|
int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -118,7 +113,6 @@ private:
|
|||||||
float early_late_space_chips);
|
float early_late_space_chips);
|
||||||
|
|
||||||
// tracking configuration vars
|
// tracking configuration vars
|
||||||
boost::shared_ptr<gr::msg_queue> d_queue;
|
|
||||||
unsigned int d_vector_length;
|
unsigned int d_vector_length;
|
||||||
bool d_dump;
|
bool d_dump;
|
||||||
|
|
||||||
|
@ -61,7 +61,6 @@ gps_l1_ca_dll_pll_c_aid_make_tracking_sc(
|
|||||||
long if_freq,
|
long if_freq,
|
||||||
long fs_in,
|
long fs_in,
|
||||||
unsigned int vector_length,
|
unsigned int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -71,7 +70,7 @@ gps_l1_ca_dll_pll_c_aid_make_tracking_sc(
|
|||||||
float early_late_space_chips)
|
float early_late_space_chips)
|
||||||
{
|
{
|
||||||
return gps_l1_ca_dll_pll_c_aid_tracking_sc_sptr(new gps_l1_ca_dll_pll_c_aid_tracking_sc(if_freq,
|
return gps_l1_ca_dll_pll_c_aid_tracking_sc_sptr(new gps_l1_ca_dll_pll_c_aid_tracking_sc(if_freq,
|
||||||
fs_in, vector_length, queue, dump, dump_filename, pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, early_late_space_chips));
|
fs_in, vector_length, dump, dump_filename, pll_bw_hz, dll_bw_hz, pll_bw_narrow_hz, dll_bw_narrow_hz, early_late_space_chips));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -91,7 +90,6 @@ gps_l1_ca_dll_pll_c_aid_tracking_sc::gps_l1_ca_dll_pll_c_aid_tracking_sc(
|
|||||||
long if_freq,
|
long if_freq,
|
||||||
long fs_in,
|
long fs_in,
|
||||||
unsigned int vector_length,
|
unsigned int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -106,7 +104,6 @@ gps_l1_ca_dll_pll_c_aid_tracking_sc::gps_l1_ca_dll_pll_c_aid_tracking_sc(
|
|||||||
this->message_port_register_in(pmt::mp("preamble_timestamp_s"));
|
this->message_port_register_in(pmt::mp("preamble_timestamp_s"));
|
||||||
this->message_port_register_out(pmt::mp("events"));
|
this->message_port_register_out(pmt::mp("events"));
|
||||||
// initialize internal vars
|
// initialize internal vars
|
||||||
d_queue = queue;
|
|
||||||
d_dump = dump;
|
d_dump = dump;
|
||||||
d_if_freq = if_freq;
|
d_if_freq = if_freq;
|
||||||
d_fs_in = fs_in;
|
d_fs_in = fs_in;
|
||||||
|
@ -38,15 +38,12 @@
|
|||||||
#define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_SC_H
|
#define GNSS_SDR_GPS_L1_CA_DLL_PLL_C_AID_TRACKING_SC_H
|
||||||
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <queue>
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <boost/thread/mutex.hpp>
|
#include <boost/thread/mutex.hpp>
|
||||||
#include <boost/thread/thread.hpp>
|
#include <boost/thread/thread.hpp>
|
||||||
#include <gnuradio/block.h>
|
#include <gnuradio/block.h>
|
||||||
#include <gnuradio/msg_queue.h>
|
|
||||||
#include <volk/volk.h>
|
#include <volk/volk.h>
|
||||||
#include "concurrent_queue.h"
|
|
||||||
#include "gps_sdr_signal_processing.h"
|
#include "gps_sdr_signal_processing.h"
|
||||||
#include "gnss_synchro.h"
|
#include "gnss_synchro.h"
|
||||||
#include "tracking_2nd_DLL_filter.h"
|
#include "tracking_2nd_DLL_filter.h"
|
||||||
@ -62,7 +59,6 @@ gps_l1_ca_dll_pll_c_aid_tracking_sc_sptr
|
|||||||
gps_l1_ca_dll_pll_c_aid_make_tracking_sc(long if_freq,
|
gps_l1_ca_dll_pll_c_aid_make_tracking_sc(long if_freq,
|
||||||
long fs_in, unsigned
|
long fs_in, unsigned
|
||||||
int vector_length,
|
int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -95,7 +91,6 @@ private:
|
|||||||
gps_l1_ca_dll_pll_c_aid_make_tracking_sc(long if_freq,
|
gps_l1_ca_dll_pll_c_aid_make_tracking_sc(long if_freq,
|
||||||
long fs_in, unsigned
|
long fs_in, unsigned
|
||||||
int vector_length,
|
int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -107,7 +102,6 @@ private:
|
|||||||
gps_l1_ca_dll_pll_c_aid_tracking_sc(long if_freq,
|
gps_l1_ca_dll_pll_c_aid_tracking_sc(long if_freq,
|
||||||
long fs_in, unsigned
|
long fs_in, unsigned
|
||||||
int vector_length,
|
int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -117,7 +111,6 @@ private:
|
|||||||
float early_late_space_chips);
|
float early_late_space_chips);
|
||||||
|
|
||||||
// tracking configuration vars
|
// tracking configuration vars
|
||||||
boost::shared_ptr<gr::msg_queue> d_queue;
|
|
||||||
unsigned int d_vector_length;
|
unsigned int d_vector_length;
|
||||||
bool d_dump;
|
bool d_dump;
|
||||||
|
|
||||||
|
@ -66,7 +66,6 @@ gps_l1_ca_dll_pll_make_tracking_cc(
|
|||||||
long if_freq,
|
long if_freq,
|
||||||
long fs_in,
|
long fs_in,
|
||||||
unsigned int vector_length,
|
unsigned int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -74,7 +73,7 @@ gps_l1_ca_dll_pll_make_tracking_cc(
|
|||||||
float early_late_space_chips)
|
float early_late_space_chips)
|
||||||
{
|
{
|
||||||
return gps_l1_ca_dll_pll_tracking_cc_sptr(new Gps_L1_Ca_Dll_Pll_Tracking_cc(if_freq,
|
return gps_l1_ca_dll_pll_tracking_cc_sptr(new Gps_L1_Ca_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));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -94,7 +93,6 @@ Gps_L1_Ca_Dll_Pll_Tracking_cc::Gps_L1_Ca_Dll_Pll_Tracking_cc(
|
|||||||
long if_freq,
|
long if_freq,
|
||||||
long fs_in,
|
long fs_in,
|
||||||
unsigned int vector_length,
|
unsigned int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -108,7 +106,6 @@ Gps_L1_Ca_Dll_Pll_Tracking_cc::Gps_L1_Ca_Dll_Pll_Tracking_cc(
|
|||||||
this->message_port_register_out(pmt::mp("events"));
|
this->message_port_register_out(pmt::mp("events"));
|
||||||
|
|
||||||
// initialize internal vars
|
// initialize internal vars
|
||||||
d_queue = queue;
|
|
||||||
d_dump = dump;
|
d_dump = dump;
|
||||||
d_if_freq = if_freq;
|
d_if_freq = if_freq;
|
||||||
d_fs_in = fs_in;
|
d_fs_in = fs_in;
|
||||||
|
@ -41,8 +41,6 @@
|
|||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <gnuradio/block.h>
|
#include <gnuradio/block.h>
|
||||||
#include <gnuradio/msg_queue.h>
|
|
||||||
#include "concurrent_queue.h"
|
|
||||||
#include "gnss_synchro.h"
|
#include "gnss_synchro.h"
|
||||||
#include "tracking_2nd_DLL_filter.h"
|
#include "tracking_2nd_DLL_filter.h"
|
||||||
#include "tracking_2nd_PLL_filter.h"
|
#include "tracking_2nd_PLL_filter.h"
|
||||||
@ -57,7 +55,6 @@ gps_l1_ca_dll_pll_tracking_cc_sptr
|
|||||||
gps_l1_ca_dll_pll_make_tracking_cc(long if_freq,
|
gps_l1_ca_dll_pll_make_tracking_cc(long if_freq,
|
||||||
long fs_in, unsigned
|
long fs_in, unsigned
|
||||||
int vector_length,
|
int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -88,7 +85,6 @@ private:
|
|||||||
gps_l1_ca_dll_pll_make_tracking_cc(long if_freq,
|
gps_l1_ca_dll_pll_make_tracking_cc(long if_freq,
|
||||||
long fs_in, unsigned
|
long fs_in, unsigned
|
||||||
int vector_length,
|
int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -98,7 +94,6 @@ private:
|
|||||||
Gps_L1_Ca_Dll_Pll_Tracking_cc(long if_freq,
|
Gps_L1_Ca_Dll_Pll_Tracking_cc(long if_freq,
|
||||||
long fs_in, unsigned
|
long fs_in, unsigned
|
||||||
int vector_length,
|
int vector_length,
|
||||||
boost::shared_ptr<gr::msg_queue> queue,
|
|
||||||
bool dump,
|
bool dump,
|
||||||
std::string dump_filename,
|
std::string dump_filename,
|
||||||
float pll_bw_hz,
|
float pll_bw_hz,
|
||||||
@ -106,7 +101,6 @@ private:
|
|||||||
float early_late_space_chips);
|
float early_late_space_chips);
|
||||||
|
|
||||||
// tracking configuration vars
|
// tracking configuration vars
|
||||||
boost::shared_ptr<gr::msg_queue> d_queue;
|
|
||||||
unsigned int d_vector_length;
|
unsigned int d_vector_length;
|
||||||
bool d_dump;
|
bool d_dump;
|
||||||
|
|
||||||
|
@ -938,13 +938,13 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
|
|||||||
else if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking") == 0)
|
else if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking") == 0)
|
||||||
{
|
{
|
||||||
std::unique_ptr<GNSSBlockInterface> block_(new GpsL1CaDllPllTracking(configuration.get(), role, in_streams,
|
std::unique_ptr<GNSSBlockInterface> block_(new GpsL1CaDllPllTracking(configuration.get(), role, in_streams,
|
||||||
out_streams, queue));
|
out_streams));
|
||||||
block = std::move(block_);
|
block = std::move(block_);
|
||||||
}
|
}
|
||||||
else if (implementation.compare("GPS_L1_CA_DLL_PLL_C_Aid_Tracking") == 0)
|
else if (implementation.compare("GPS_L1_CA_DLL_PLL_C_Aid_Tracking") == 0)
|
||||||
{
|
{
|
||||||
std::unique_ptr<TrackingInterface> block_(new GpsL1CaDllPllCAidTracking(configuration.get(), role, in_streams,
|
std::unique_ptr<TrackingInterface> block_(new GpsL1CaDllPllCAidTracking(configuration.get(), role, in_streams,
|
||||||
out_streams, queue));
|
out_streams));
|
||||||
block = std::move(block_);
|
block = std::move(block_);
|
||||||
}
|
}
|
||||||
else if (implementation.compare("GPS_L1_CA_TCP_CONNECTOR_Tracking") == 0)
|
else if (implementation.compare("GPS_L1_CA_TCP_CONNECTOR_Tracking") == 0)
|
||||||
@ -1172,13 +1172,13 @@ std::unique_ptr<TrackingInterface> GNSSBlockFactory::GetTrkBlock(
|
|||||||
if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking") == 0)
|
if (implementation.compare("GPS_L1_CA_DLL_PLL_Tracking") == 0)
|
||||||
{
|
{
|
||||||
std::unique_ptr<TrackingInterface> block_(new GpsL1CaDllPllTracking(configuration.get(), role, in_streams,
|
std::unique_ptr<TrackingInterface> block_(new GpsL1CaDllPllTracking(configuration.get(), role, in_streams,
|
||||||
out_streams, queue));
|
out_streams));
|
||||||
block = std::move(block_);
|
block = std::move(block_);
|
||||||
}
|
}
|
||||||
else if (implementation.compare("GPS_L1_CA_DLL_PLL_C_Aid_Tracking") == 0)
|
else if (implementation.compare("GPS_L1_CA_DLL_PLL_C_Aid_Tracking") == 0)
|
||||||
{
|
{
|
||||||
std::unique_ptr<TrackingInterface> block_(new GpsL1CaDllPllCAidTracking(configuration.get(), role, in_streams,
|
std::unique_ptr<TrackingInterface> block_(new GpsL1CaDllPllCAidTracking(configuration.get(), role, in_streams,
|
||||||
out_streams, queue));
|
out_streams));
|
||||||
block = std::move(block_);
|
block = std::move(block_);
|
||||||
}
|
}
|
||||||
else if (implementation.compare("GPS_L1_CA_TCP_CONNECTOR_Tracking") == 0)
|
else if (implementation.compare("GPS_L1_CA_TCP_CONNECTOR_Tracking") == 0)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user