1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-06-30 17:03:15 +00:00

Make constructors private, fix documentation

This commit is contained in:
Carles Fernandez 2019-03-08 10:24:06 +01:00
parent 69431e535d
commit 10a42945e6
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
9 changed files with 29 additions and 15 deletions

View File

@ -48,6 +48,7 @@ gnss_sdr_fpga_sample_counter_sptr gnss_sdr_make_fpga_sample_counter(double _fs,
class gnss_sdr_fpga_sample_counter : public gr::block class gnss_sdr_fpga_sample_counter : public gr::block
{ {
private: private:
friend gnss_sdr_fpga_sample_counter_sptr gnss_sdr_make_fpga_sample_counter(double _fs, int32_t _interval_ms);
gnss_sdr_fpga_sample_counter(double _fs, int32_t _interval_ms); gnss_sdr_fpga_sample_counter(double _fs, int32_t _interval_ms);
uint32_t test_register(uint32_t writeval); uint32_t test_register(uint32_t writeval);
void configure_samples_per_output(uint32_t interval); void configure_samples_per_output(uint32_t interval);
@ -76,7 +77,6 @@ private:
bool is_open; bool is_open;
public: public:
friend gnss_sdr_fpga_sample_counter_sptr gnss_sdr_make_fpga_sample_counter(double _fs, int32_t _interval_ms);
~gnss_sdr_fpga_sample_counter(); ~gnss_sdr_fpga_sample_counter();
int general_work(int noutput_items, int general_work(int noutput_items,
gr_vector_int &ninput_items, gr_vector_int &ninput_items,

View File

@ -65,6 +65,9 @@ gnss_sdr_sample_counter::gnss_sdr_sample_counter(
} }
gnss_sdr_sample_counter::~gnss_sdr_sample_counter() = default;
gnss_sdr_sample_counter_sptr gnss_sdr_make_sample_counter(double _fs, int32_t _interval_ms, size_t _size) gnss_sdr_sample_counter_sptr gnss_sdr_make_sample_counter(double _fs, int32_t _interval_ms, size_t _size)
{ {
gnss_sdr_sample_counter_sptr sample_counter_(new gnss_sdr_sample_counter(_fs, _interval_ms, _size)); gnss_sdr_sample_counter_sptr sample_counter_(new gnss_sdr_sample_counter(_fs, _interval_ms, _size));

View File

@ -51,6 +51,7 @@ gnss_sdr_sample_counter_sptr gnss_sdr_make_sample_counter(
class gnss_sdr_sample_counter : public gr::sync_decimator class gnss_sdr_sample_counter : public gr::sync_decimator
{ {
private: private:
friend gnss_sdr_sample_counter_sptr gnss_sdr_make_sample_counter(double _fs, int32_t _interval_ms, size_t _size);
gnss_sdr_sample_counter(double _fs, int32_t _interval_ms, size_t _size); gnss_sdr_sample_counter(double _fs, int32_t _interval_ms, size_t _size);
uint32_t samples_per_output; uint32_t samples_per_output;
double fs; double fs;
@ -68,7 +69,7 @@ private:
bool flag_enable_send_msg; bool flag_enable_send_msg;
public: public:
friend gnss_sdr_sample_counter_sptr gnss_sdr_make_sample_counter(double _fs, int32_t _interval_ms, size_t _size); ~gnss_sdr_sample_counter();
int work(int noutput_items, int work(int noutput_items,
gr_vector_const_void_star &input_items, gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items); gr_vector_void_star &output_items);

View File

@ -52,6 +52,9 @@ gnss_sdr_time_counter::gnss_sdr_time_counter() : gr::block("time_counter",
} }
gnss_sdr_time_counter::~gnss_sdr_time_counter() = default;
gnss_sdr_time_counter_sptr gnss_sdr_make_time_counter() gnss_sdr_time_counter_sptr gnss_sdr_make_time_counter()
{ {
gnss_sdr_time_counter_sptr counter_(new gnss_sdr_time_counter()); gnss_sdr_time_counter_sptr counter_(new gnss_sdr_time_counter());

View File

@ -59,6 +59,7 @@ private:
friend gnss_sdr_time_counter_sptr gnss_sdr_make_time_counter(); friend gnss_sdr_time_counter_sptr gnss_sdr_make_time_counter();
public: public:
~gnss_sdr_time_counter();
int general_work(int noutput_items __attribute__((unused)), gr_vector_int &ninput_items __attribute__((unused)), int general_work(int noutput_items __attribute__((unused)), gr_vector_int &ninput_items __attribute__((unused)),
gr_vector_const_void_star &input_items __attribute__((unused)), gr_vector_void_star &output_items); gr_vector_const_void_star &input_items __attribute__((unused)), gr_vector_void_star &output_items);
}; };

View File

@ -35,6 +35,8 @@
#define GNSS_SDR_GNSS_SYNCHRO_MONITOR_H #define GNSS_SDR_GNSS_SYNCHRO_MONITOR_H
#include "gnss_synchro_udp_sink.h" #include "gnss_synchro_udp_sink.h"
#include <boost/shared_ptr.hpp>
#include <gnuradio/runtime_types.h> // for gr_vector_void_star
#include <gnuradio/sync_block.h> #include <gnuradio/sync_block.h>
#include <memory> #include <memory>
#include <string> #include <string>
@ -51,7 +53,9 @@ gnss_synchro_monitor_sptr gnss_synchro_make_monitor(unsigned int n_channels,
const 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 monitoring block which allows sending
* a data stream with the receiver internal parameters (Gnss_Synchro objects)
* to local or remote clients over UDP.
*/ */
class gnss_synchro_monitor : public gr::sync_block class gnss_synchro_monitor : public gr::sync_block
{ {
@ -61,21 +65,17 @@ private:
int udp_port, int udp_port,
const std::vector<std::string>& udp_addresses); const std::vector<std::string>& udp_addresses);
unsigned int d_nchannels;
int d_decimation_factor;
std::unique_ptr<Gnss_Synchro_Udp_Sink> udp_sink_ptr;
int count;
public:
gnss_synchro_monitor(unsigned int n_channels, gnss_synchro_monitor(unsigned int n_channels,
int decimation_factor, int decimation_factor,
int udp_port, int udp_port,
const std::vector<std::string>& udp_addresses); const std::vector<std::string>& udp_addresses);
unsigned int d_nchannels;
int d_decimation_factor;
std::unique_ptr<Gnss_Synchro_Udp_Sink> udp_sink_ptr;
int count;
public:
~gnss_synchro_monitor(); //!< Default destructor ~gnss_synchro_monitor(); //!< Default destructor
int work(int noutput_items, gr_vector_const_void_star& input_items, int work(int noutput_items, gr_vector_const_void_star& input_items,

View File

@ -44,6 +44,7 @@ Gnss_Synchro_Udp_Sink::Gnss_Synchro_Udp_Sink(std::vector<std::string> addresses,
} }
} }
bool Gnss_Synchro_Udp_Sink::write_gnss_synchro(const std::vector<Gnss_Synchro>& stocks) bool Gnss_Synchro_Udp_Sink::write_gnss_synchro(const std::vector<Gnss_Synchro>& stocks)
{ {
std::ostringstream archive_stream; std::ostringstream archive_stream;

View File

@ -35,10 +35,15 @@
#include "gnss_synchro.h" #include "gnss_synchro.h"
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/system/error_code.hpp> #include <boost/system/error_code.hpp>
#include <cstdint>
#include <string> #include <string>
#include <vector> #include <vector>
/*!
* \brief This class sends serialized Gnss_Synchro objects
* over UDP to one or multiple endpoints.
*/
class Gnss_Synchro_Udp_Sink class Gnss_Synchro_Udp_Sink
{ {
public: public:

View File

@ -1664,10 +1664,10 @@ void GNSSFlowgraph::init()
if (enable_monitor_) if (enable_monitor_)
{ {
GnssSynchroMonitor_ = gr::basic_block_sptr(new gnss_synchro_monitor(channels_count_, GnssSynchroMonitor_ = gnss_synchro_make_monitor(channels_count_,
configuration_->property("Monitor.decimation_factor", 1), configuration_->property("Monitor.decimation_factor", 1),
configuration_->property("Monitor.udp_port", 1234), configuration_->property("Monitor.udp_port", 1234),
udp_addr_vec)); udp_addr_vec);
} }
} }