mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-31 15:23:04 +00:00
Code Issues Releases Wiki Activity

removed unused queues in observables blocks

Browse Source
This commit is contained in:
Javier Arribas
2016-04-13 17:02:33 +02:00
parent 638fbf7bd8
commit 6b45d4019c
17 changed files with 47 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/algorithms/observables/adapters/galileo_e1_observables.cc
View File

@@ -39,12 +39,10 @@ using google::LogMessage;
GalileoE1Observables::GalileoE1Observables(ConfigurationInterface* configuration, GalileoE1Observables::GalileoE1Observables(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) :
role_(role), role_(role),
in_streams_(in_streams), in_streams_(in_streams),
out_streams_(out_streams), out_streams_(out_streams)
queue_(queue)
{ {
int output_rate_ms; int output_rate_ms;
output_rate_ms = configuration->property(role + ".output_rate_ms", 500); output_rate_ms = configuration->property(role + ".output_rate_ms", 500);
@@ -54,7 +52,7 @@ GalileoE1Observables::GalileoE1Observables(ConfigurationInterface* configuration
flag_averaging = configuration->property(role + ".flag_averaging", false); flag_averaging = configuration->property(role + ".flag_averaging", false);
dump_ = configuration->property(role + ".dump", false); dump_ = configuration->property(role + ".dump", false);
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
observables_ = galileo_e1_make_observables_cc(in_streams_, queue_, dump_, dump_filename_, output_rate_ms, flag_averaging); observables_ = galileo_e1_make_observables_cc(in_streams_, dump_, dump_filename_, output_rate_ms, flag_averaging);
DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")"; DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")";
} }

5
src/algorithms/observables/adapters/galileo_e1_observables.h
View File

@@ -35,7 +35,6 @@
#define GNSS_SDR_GALILEO_E1_OBSERVABLES_H_ #define GNSS_SDR_GALILEO_E1_OBSERVABLES_H_
#include <string> #include <string>
#include <gnuradio/msg_queue.h>
#include "observables_interface.h" #include "observables_interface.h"
#include "galileo_e1_observables_cc.h" #include "galileo_e1_observables_cc.h"
@@ -51,8 +50,7 @@ public:
GalileoE1Observables(ConfigurationInterface* configuration, GalileoE1Observables(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 ~GalileoE1Observables(); virtual ~GalileoE1Observables();
std::string role() std::string role()
{ {
@@ -86,7 +84,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 #endif

8
src/algorithms/observables/adapters/gps_l1_ca_observables.cc
View File

@@ -39,12 +39,10 @@ using google::LogMessage;
GpsL1CaObservables::GpsL1CaObservables(ConfigurationInterface* configuration, GpsL1CaObservables::GpsL1CaObservables(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) :
role_(role), role_(role),
in_streams_(in_streams), in_streams_(in_streams),
out_streams_(out_streams), out_streams_(out_streams)
queue_(queue)
{ {
int output_rate_ms; int output_rate_ms;
output_rate_ms = configuration->property(role + ".output_rate_ms", 500); output_rate_ms = configuration->property(role + ".output_rate_ms", 500);
@@ -54,7 +52,7 @@ GpsL1CaObservables::GpsL1CaObservables(ConfigurationInterface* configuration,
flag_averaging = configuration->property(role + ".flag_averaging", false); flag_averaging = configuration->property(role + ".flag_averaging", false);
dump_ = configuration->property(role + ".dump", false); dump_ = configuration->property(role + ".dump", false);
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
observables_ = gps_l1_ca_make_observables_cc(in_streams_, queue_, dump_, dump_filename_, output_rate_ms, flag_averaging); observables_ = gps_l1_ca_make_observables_cc(in_streams_, dump_, dump_filename_, output_rate_ms, flag_averaging);
DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")"; DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")";
} }

5
src/algorithms/observables/adapters/gps_l1_ca_observables.h
View File

@@ -34,7 +34,6 @@
#define GNSS_SDR_GPS_L1_CA_OBSERVABLES_H_ #define GNSS_SDR_GPS_L1_CA_OBSERVABLES_H_
#include <string> #include <string>
#include <gnuradio/msg_queue.h>
#include "observables_interface.h" #include "observables_interface.h"
#include "gps_l1_ca_observables_cc.h" #include "gps_l1_ca_observables_cc.h"
@@ -50,8 +49,7 @@ public:
GpsL1CaObservables(ConfigurationInterface* configuration, GpsL1CaObservables(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 ~GpsL1CaObservables(); virtual ~GpsL1CaObservables();
std::string role() std::string role()
{ {
@@ -86,7 +84,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 #endif

8
src/algorithms/observables/adapters/hybrid_observables.cc
View File

@@ -39,12 +39,10 @@ using google::LogMessage;
HybridObservables::HybridObservables(ConfigurationInterface* configuration, HybridObservables::HybridObservables(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) :
role_(role), role_(role),
in_streams_(in_streams), in_streams_(in_streams),
out_streams_(out_streams), out_streams_(out_streams)
queue_(queue)
{ {
int output_rate_ms; int output_rate_ms;
output_rate_ms = configuration->property(role + ".output_rate_ms", 500); output_rate_ms = configuration->property(role + ".output_rate_ms", 500);
@@ -54,7 +52,7 @@ HybridObservables::HybridObservables(ConfigurationInterface* configuration,
flag_averaging = configuration->property(role + ".flag_averaging", false); flag_averaging = configuration->property(role + ".flag_averaging", false);
dump_ = configuration->property(role + ".dump", false); dump_ = configuration->property(role + ".dump", false);
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
observables_ = hybrid_make_observables_cc(in_streams_, queue_, dump_, dump_filename_, output_rate_ms, flag_averaging); observables_ = hybrid_make_observables_cc(in_streams_, dump_, dump_filename_, output_rate_ms, flag_averaging);
DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")"; DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")";
} }

5
src/algorithms/observables/adapters/hybrid_observables.h
View File

@@ -35,7 +35,6 @@
#define GNSS_SDR_hybrid_observables_H_ #define GNSS_SDR_hybrid_observables_H_
#include <string> #include <string>
#include <gnuradio/msg_queue.h>
#include "observables_interface.h" #include "observables_interface.h"
#include "hybrid_observables_cc.h" #include "hybrid_observables_cc.h"
@@ -51,8 +50,7 @@ public:
HybridObservables(ConfigurationInterface* configuration, HybridObservables(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 ~HybridObservables(); virtual ~HybridObservables();
std::string role() std::string role()
{ {
@@ -86,7 +84,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 #endif

8
src/algorithms/observables/adapters/mixed_observables.cc
View File

@@ -39,12 +39,10 @@ using google::LogMessage;
MixedObservables::MixedObservables(ConfigurationInterface* configuration, MixedObservables::MixedObservables(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) :
role_(role), role_(role),
in_streams_(in_streams), in_streams_(in_streams),
out_streams_(out_streams), out_streams_(out_streams)
queue_(queue)
{ {
int output_rate_ms; int output_rate_ms;
output_rate_ms = configuration->property(role + ".output_rate_ms", 500); output_rate_ms = configuration->property(role + ".output_rate_ms", 500);
@@ -54,7 +52,7 @@ MixedObservables::MixedObservables(ConfigurationInterface* configuration,
flag_averaging = configuration->property(role + ".flag_averaging", false); flag_averaging = configuration->property(role + ".flag_averaging", false);
dump_ = configuration->property(role + ".dump", false); dump_ = configuration->property(role + ".dump", false);
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
observables_ = mixed_make_observables_cc(in_streams_, queue_, dump_, dump_filename_, output_rate_ms, flag_averaging); observables_ = mixed_make_observables_cc(in_streams_, dump_, dump_filename_, output_rate_ms, flag_averaging);
DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")"; DLOG(INFO) << "pseudorange(" << observables_->unique_id() << ")";
} }

5
src/algorithms/observables/adapters/mixed_observables.h
View File

@@ -33,7 +33,6 @@
#define GNSS_SDR_MIXED_OBSERVABLES_H_ #define GNSS_SDR_MIXED_OBSERVABLES_H_
#include <string> #include <string>
#include <gnuradio/msg_queue.h>
#include "observables_interface.h" #include "observables_interface.h"
#include "mixed_observables_cc.h" #include "mixed_observables_cc.h"
@@ -49,8 +48,7 @@ public:
MixedObservables(ConfigurationInterface* configuration, MixedObservables(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 ~MixedObservables(); virtual ~MixedObservables();
std::string role() std::string role()
{ {
@@ -85,7 +83,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 #endif

9
src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.cc
View File

@@ -50,18 +50,17 @@ using google::LogMessage;
galileo_e1_observables_cc_sptr galileo_e1_observables_cc_sptr
galileo_e1_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) galileo_e1_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging)
{ {
return galileo_e1_observables_cc_sptr(new galileo_e1_observables_cc(nchannels, queue, dump, dump_filename, output_rate_ms, flag_averaging)); return galileo_e1_observables_cc_sptr(new galileo_e1_observables_cc(nchannels, dump, dump_filename, output_rate_ms, flag_averaging));
} }
galileo_e1_observables_cc::galileo_e1_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) : galileo_e1_observables_cc::galileo_e1_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) :
gr::block("galileo_e1_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)), gr::block("galileo_e1_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro))) gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)))
{ {
// initialize internal vars // initialize internal vars
d_queue = queue;
d_dump = dump; d_dump = dump;
d_nchannels = nchannels; d_nchannels = nchannels;
d_output_rate_ms = output_rate_ms; d_output_rate_ms = output_rate_ms;
@@ -86,7 +85,7 @@ galileo_e1_observables_cc::galileo_e1_observables_cc(unsigned int nchannels, boo
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
LOG(INFO) << "Observables dump enabled Log file: " << d_dump_filename.c_str(); LOG(INFO) << "Observables dump enabled Log file: " << d_dump_filename.c_str();
} }
catch (std::ifstream::failure e) catch (const std::ifstream::failure & e)
{ {
LOG(WARNING) << "Exception opening observables dump file " << e.what(); LOG(WARNING) << "Exception opening observables dump file " << e.what();
} }

8
src/algorithms/observables/gnuradio_blocks/galileo_e1_observables_cc.h
View File

@@ -37,7 +37,6 @@
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <gnuradio/block.h> #include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
class galileo_e1_observables_cc; class galileo_e1_observables_cc;
@@ -45,7 +44,7 @@ class galileo_e1_observables_cc;
typedef boost::shared_ptr<galileo_e1_observables_cc> galileo_e1_observables_cc_sptr; typedef boost::shared_ptr<galileo_e1_observables_cc> galileo_e1_observables_cc_sptr;
galileo_e1_observables_cc_sptr galileo_e1_observables_cc_sptr
galileo_e1_make_observables_cc(unsigned int n_channels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); galileo_e1_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
/*! /*!
* \brief This class implements a block that computes Galileo observables * \brief This class implements a block that computes Galileo observables
@@ -60,8 +59,8 @@ public:
private: private:
friend galileo_e1_observables_cc_sptr friend galileo_e1_observables_cc_sptr
galileo_e1_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); galileo_e1_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
galileo_e1_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); galileo_e1_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
//Tracking observable history //Tracking observable history
std::vector<std::deque<double>> d_acc_carrier_phase_queue_rads; std::vector<std::deque<double>> d_acc_carrier_phase_queue_rads;
@@ -69,7 +68,6 @@ private:
std::vector<std::deque<double>> d_symbol_TOW_queue_s; std::vector<std::deque<double>> d_symbol_TOW_queue_s;
// class private vars // class private vars
boost::shared_ptr<gr::msg_queue> d_queue;
bool d_dump; bool d_dump;
bool d_flag_averaging; bool d_flag_averaging;
unsigned int d_nchannels; unsigned int d_nchannels;

9
src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.cc
View File

@@ -47,18 +47,17 @@ using google::LogMessage;
gps_l1_ca_observables_cc_sptr gps_l1_ca_observables_cc_sptr
gps_l1_ca_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) gps_l1_ca_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging)
{ {
return gps_l1_ca_observables_cc_sptr(new gps_l1_ca_observables_cc(nchannels, queue, dump, dump_filename, output_rate_ms, flag_averaging)); return gps_l1_ca_observables_cc_sptr(new gps_l1_ca_observables_cc(nchannels, dump, dump_filename, output_rate_ms, flag_averaging));
} }
gps_l1_ca_observables_cc::gps_l1_ca_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) : gps_l1_ca_observables_cc::gps_l1_ca_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) :
gr::block("gps_l1_ca_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)), gr::block("gps_l1_ca_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro))) gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)))
{ {
// initialize internal vars // initialize internal vars
d_queue = queue;
d_dump = dump; d_dump = dump;
d_nchannels = nchannels; d_nchannels = nchannels;
d_output_rate_ms = output_rate_ms; d_output_rate_ms = output_rate_ms;
@@ -83,7 +82,7 @@ gps_l1_ca_observables_cc::gps_l1_ca_observables_cc(unsigned int nchannels, boost
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
LOG(INFO) << "Observables dump enabled Log file: " << d_dump_filename.c_str() << std::endl; LOG(INFO) << "Observables dump enabled Log file: " << d_dump_filename.c_str() << std::endl;
} }
catch (std::ifstream::failure e) catch (const std::ifstream::failure & e)
{ {
LOG(WARNING) << "Exception opening observables dump file " << e.what() << std::endl; LOG(WARNING) << "Exception opening observables dump file " << e.what() << std::endl;
} }

8
src/algorithms/observables/gnuradio_blocks/gps_l1_ca_observables_cc.h
View File

@@ -37,7 +37,6 @@
#include <vector> #include <vector>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <gnuradio/block.h> #include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
class gps_l1_ca_observables_cc; class gps_l1_ca_observables_cc;
@@ -45,7 +44,7 @@ class gps_l1_ca_observables_cc;
typedef boost::shared_ptr<gps_l1_ca_observables_cc> gps_l1_ca_observables_cc_sptr; typedef boost::shared_ptr<gps_l1_ca_observables_cc> gps_l1_ca_observables_cc_sptr;
gps_l1_ca_observables_cc_sptr gps_l1_ca_observables_cc_sptr
gps_l1_ca_make_observables_cc(unsigned int n_channels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); gps_l1_ca_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
/*! /*!
* \brief This class implements a block that computes GPS L1 C/A observables * \brief This class implements a block that computes GPS L1 C/A observables
@@ -60,8 +59,8 @@ public:
private: private:
friend gps_l1_ca_observables_cc_sptr friend gps_l1_ca_observables_cc_sptr
gps_l1_ca_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); gps_l1_ca_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
gps_l1_ca_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); gps_l1_ca_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
//Tracking observable history //Tracking observable history
@@ -70,7 +69,6 @@ private:
std::vector<std::deque<double>> d_symbol_TOW_queue_s; std::vector<std::deque<double>> d_symbol_TOW_queue_s;
// class private vars // class private vars
boost::shared_ptr<gr::msg_queue> d_queue;
bool d_dump; bool d_dump;
bool d_flag_averaging; bool d_flag_averaging;
unsigned int d_nchannels; unsigned int d_nchannels;

9
src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.cc
View File

@@ -48,18 +48,17 @@ using google::LogMessage;
hybrid_observables_cc_sptr hybrid_observables_cc_sptr
hybrid_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) hybrid_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging)
{ {
return hybrid_observables_cc_sptr(new hybrid_observables_cc(nchannels, queue, dump, dump_filename, output_rate_ms, flag_averaging)); return hybrid_observables_cc_sptr(new hybrid_observables_cc(nchannels, dump, dump_filename, output_rate_ms, flag_averaging));
} }
hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) : hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) :
gr::block("hybrid_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)), gr::block("hybrid_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro))) gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)))
{ {
// initialize internal vars // initialize internal vars
d_queue = queue;
d_dump = dump; d_dump = dump;
d_nchannels = nchannels; d_nchannels = nchannels;
d_output_rate_ms = output_rate_ms; d_output_rate_ms = output_rate_ms;
@@ -77,7 +76,7 @@ hybrid_observables_cc::hybrid_observables_cc(unsigned int nchannels, boost::shar
d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary); d_dump_file.open(d_dump_filename.c_str(), std::ios::out | std::ios::binary);
LOG(INFO) << "Observables dump enabled Log file: " << d_dump_filename.c_str(); LOG(INFO) << "Observables dump enabled Log file: " << d_dump_filename.c_str();
} }
catch (std::ifstream::failure e) catch (const std::ifstream::failure & e)
{ {
LOG(WARNING) << "Exception opening observables dump file " << e.what(); LOG(WARNING) << "Exception opening observables dump file " << e.what();
} }

9
src/algorithms/observables/gnuradio_blocks/hybrid_observables_cc.h
View File

@@ -36,7 +36,6 @@
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <gnuradio/block.h> #include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
class hybrid_observables_cc; class hybrid_observables_cc;
@@ -44,7 +43,7 @@ class hybrid_observables_cc;
typedef boost::shared_ptr<hybrid_observables_cc> hybrid_observables_cc_sptr; typedef boost::shared_ptr<hybrid_observables_cc> hybrid_observables_cc_sptr;
hybrid_observables_cc_sptr hybrid_observables_cc_sptr
hybrid_make_observables_cc(unsigned int n_channels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); hybrid_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
/*! /*!
* \brief This class implements a block that computes Galileo observables * \brief This class implements a block that computes Galileo observables
@@ -53,17 +52,15 @@ class hybrid_observables_cc : public gr::block
{ {
public: public:
~hybrid_observables_cc (); ~hybrid_observables_cc ();
//void set_fs_in(unsigned long int fs_in) {d_fs_in = fs_in;};
int general_work (int noutput_items, gr_vector_int &ninput_items, int general_work (int noutput_items, gr_vector_int &ninput_items,
gr_vector_const_void_star &input_items, gr_vector_void_star &output_items); gr_vector_const_void_star &input_items, gr_vector_void_star &output_items);
private: private:
friend hybrid_observables_cc_sptr friend hybrid_observables_cc_sptr
hybrid_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); hybrid_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
hybrid_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); hybrid_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
// class private vars // class private vars
boost::shared_ptr<gr::msg_queue> d_queue;
bool d_dump; bool d_dump;
bool d_flag_averaging; bool d_flag_averaging;
unsigned int d_nchannels; unsigned int d_nchannels;

7
src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.cc
View File

@@ -46,18 +46,17 @@ using google::LogMessage;
mixed_observables_cc_sptr mixed_observables_cc_sptr
mixed_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) mixed_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging)
{ {
return mixed_observables_cc_sptr(new mixed_observables_cc(nchannels, queue, dump, dump_filename, output_rate_ms, flag_averaging)); return mixed_observables_cc_sptr(new mixed_observables_cc(nchannels, dump, dump_filename, output_rate_ms, flag_averaging));
} }
mixed_observables_cc::mixed_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) : mixed_observables_cc::mixed_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging) :
gr::block("mixed_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)), gr::block("mixed_observables_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro))) gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)))
{ {
// initialize internal vars // initialize internal vars
d_queue = queue;
d_dump = dump; d_dump = dump;
d_nchannels = nchannels; d_nchannels = nchannels;
d_output_rate_ms = output_rate_ms; d_output_rate_ms = output_rate_ms;

8
src/algorithms/observables/gnuradio_blocks/mixed_observables_cc.h
View File

@@ -34,7 +34,6 @@
#include <fstream> #include <fstream>
#include <string> #include <string>
#include <gnuradio/block.h> #include <gnuradio/block.h>
#include <gnuradio/msg_queue.h>
class mixed_observables_cc; class mixed_observables_cc;
@@ -42,7 +41,7 @@ class mixed_observables_cc;
typedef boost::shared_ptr<mixed_observables_cc> mixed_observables_cc_sptr; typedef boost::shared_ptr<mixed_observables_cc> mixed_observables_cc_sptr;
mixed_observables_cc_sptr mixed_observables_cc_sptr
mixed_make_observables_cc(unsigned int n_channels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); mixed_make_observables_cc(unsigned int n_channels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
/*! /*!
* \brief This class implements a block that computes MIXED observables (Multi-frequency and Multi-system) * \brief This class implements a block that computes MIXED observables (Multi-frequency and Multi-system)
@@ -56,11 +55,10 @@ public:
private: private:
friend mixed_observables_cc_sptr friend mixed_observables_cc_sptr
mixed_make_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); mixed_make_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
mixed_observables_cc(unsigned int nchannels, boost::shared_ptr<gr::msg_queue> queue, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging); mixed_observables_cc(unsigned int nchannels, bool dump, std::string dump_filename, int output_rate_ms, bool flag_averaging);
// class private vars // class private vars
boost::shared_ptr<gr::msg_queue> d_queue;
bool d_dump; bool d_dump;
bool d_flag_averaging; bool d_flag_averaging;
unsigned int d_nchannels; unsigned int d_nchannels;

8
src/core/receiver/gnss_block_factory.cc
View File

@@ -1366,26 +1366,26 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
else if (implementation.compare("GPS_L1_CA_Observables") == 0) else if (implementation.compare("GPS_L1_CA_Observables") == 0)
{ {
std::unique_ptr<GNSSBlockInterface> block_(new GpsL1CaObservables(configuration.get(), role, in_streams, std::unique_ptr<GNSSBlockInterface> block_(new GpsL1CaObservables(configuration.get(), role, in_streams,
out_streams, queue)); out_streams));
block = std::move(block_); block = std::move(block_);
} }
else if (implementation.compare("Galileo_E1B_Observables") == 0) else if (implementation.compare("Galileo_E1B_Observables") == 0)
{ {
std::unique_ptr<GNSSBlockInterface> block_(new GalileoE1Observables(configuration.get(), role, in_streams, std::unique_ptr<GNSSBlockInterface> block_(new GalileoE1Observables(configuration.get(), role, in_streams,
out_streams, queue)); out_streams));
block = std::move(block_); block = std::move(block_);
} }
else if (implementation.compare("Hybrid_Observables") == 0) else if (implementation.compare("Hybrid_Observables") == 0)
{ {
std::unique_ptr<GNSSBlockInterface> block_(new HybridObservables(configuration.get(), role, in_streams, std::unique_ptr<GNSSBlockInterface> block_(new HybridObservables(configuration.get(), role, in_streams,
out_streams, queue)); out_streams));
block = std::move(block_); block = std::move(block_);
} }
else if (implementation.compare("Mixed_Observables") == 0) else if (implementation.compare("Mixed_Observables") == 0)
{ {
std::unique_ptr<GNSSBlockInterface> block_(new MixedObservables(configuration.get(), role, in_streams, std::unique_ptr<GNSSBlockInterface> block_(new MixedObservables(configuration.get(), role, in_streams,
out_streams, queue)); out_streams));
block = std::move(block_); block = std::move(block_);
} }
// PVT ------------------------------------------------------------------------- // PVT -------------------------------------------------------------------------