mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-15 04:30:33 +00:00
Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next
This commit is contained in:
commit
a3fcbc3155
@ -45,19 +45,19 @@ using google::LogMessage;
|
|||||||
gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
|
gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
|
||||||
int output_rate_ms,
|
int output_rate_ms,
|
||||||
int udp_port,
|
int udp_port,
|
||||||
std::vector<std::string> udp_addresses)
|
const std::vector<std::string>& udp_addresses)
|
||||||
{
|
{
|
||||||
return gnss_synchro_monitor_sptr(new gnss_synchro_monitor(n_channels,
|
return gnss_synchro_monitor_sptr(new gnss_synchro_monitor(n_channels,
|
||||||
output_rate_ms,
|
output_rate_ms,
|
||||||
udp_port,
|
udp_port,
|
||||||
std::move(udp_addresses)));
|
udp_addresses));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
gnss_synchro_monitor::gnss_synchro_monitor(unsigned int n_channels,
|
gnss_synchro_monitor::gnss_synchro_monitor(unsigned int n_channels,
|
||||||
int output_rate_ms,
|
int output_rate_ms,
|
||||||
int udp_port,
|
int udp_port,
|
||||||
std::vector<std::string> udp_addresses) : gr::sync_block("gnss_synchro_monitor",
|
const std::vector<std::string>& udp_addresses) : gr::sync_block("gnss_synchro_monitor",
|
||||||
gr::io_signature::make(n_channels, n_channels, sizeof(Gnss_Synchro)),
|
gr::io_signature::make(n_channels, n_channels, sizeof(Gnss_Synchro)),
|
||||||
gr::io_signature::make(0, 0, 0))
|
gr::io_signature::make(0, 0, 0))
|
||||||
{
|
{
|
||||||
|
@ -48,7 +48,7 @@ using gnss_synchro_monitor_sptr = boost::shared_ptr<gnss_synchro_monitor>;
|
|||||||
gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
|
gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
|
||||||
int output_rate_ms,
|
int output_rate_ms,
|
||||||
int udp_port,
|
int udp_port,
|
||||||
std::vector<std::string> udp_addresses);
|
const std::vector<std::string>& udp_addresses);
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief This class implements a block that computes the PVT solution with Galileo E1 signals
|
* \brief This class implements a block that computes the PVT solution with Galileo E1 signals
|
||||||
@ -59,7 +59,7 @@ private:
|
|||||||
friend gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int nchannels,
|
friend gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int nchannels,
|
||||||
int output_rate_ms,
|
int output_rate_ms,
|
||||||
int udp_port,
|
int udp_port,
|
||||||
std::vector<std::string> udp_addresses);
|
const std::vector<std::string>& udp_addresses);
|
||||||
|
|
||||||
unsigned int d_nchannels;
|
unsigned int d_nchannels;
|
||||||
|
|
||||||
@ -74,7 +74,7 @@ public:
|
|||||||
gnss_synchro_monitor(unsigned int nchannels,
|
gnss_synchro_monitor(unsigned int nchannels,
|
||||||
int output_rate_ms,
|
int output_rate_ms,
|
||||||
int udp_port,
|
int udp_port,
|
||||||
std::vector<std::string> udp_addresses);
|
const std::vector<std::string>& udp_addresses);
|
||||||
|
|
||||||
~gnss_synchro_monitor(); //!< Default destructor
|
~gnss_synchro_monitor(); //!< Default destructor
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user