1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-11-01 07:43:04 +00:00

bds b1i: Merging latest changes from upstream/next

This commit is contained in:
Damian Miralles
2018-12-18 15:55:36 -06:00
633 changed files with 8609 additions and 7671 deletions

View File

@@ -38,16 +38,16 @@
#define GNSS_SDR_GNSS_FLOWGRAPH_H_
#include "GPS_L1_CA.h"
#include "gnss_signal.h"
#include "gnss_sdr_sample_counter.h"
#include "gnss_synchro_monitor.h"
#include "gnss_block_interface.h"
#include "pvt_interface.h"
#include "channel_interface.h"
#include "configuration_interface.h"
#include "gnss_block_factory.h"
#include <gnuradio/top_block.h>
#include "gnss_block_interface.h"
#include "gnss_sdr_sample_counter.h"
#include "gnss_signal.h"
#include "gnss_synchro_monitor.h"
#include "pvt_interface.h"
#include <gnuradio/msg_queue.h>
#include <gnuradio/top_block.h>
#include <list>
#include <map>
#include <memory>
@@ -55,6 +55,7 @@
#include <queue>
#include <string>
#include <vector>
#include <map>
#if ENABLE_FPGA
#include "gnss_sdr_fpga_sample_counter.h"
@@ -72,7 +73,7 @@ public:
/*!
* \brief Constructor that initializes the receiver flow graph
*/
GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configuration, gr::msg_queue::sptr queue);
GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configuration, const gr::msg_queue::sptr& queue);
/*!
* \brief Destructor
@@ -128,7 +129,7 @@ public:
*
* It is used to assist the receiver with external ephemeris data
*/
bool send_telemetry_msg(pmt::pmt_t msg);
bool send_telemetry_msg(const pmt::pmt_t& msg);
/*!
* \brief Returns a smart pointer to the PVT object
@@ -148,7 +149,7 @@ private:
void set_signals_list();
void set_channels_state(); // Initializes the channels state (start acquisition or keep standby)
// using the configuration parameters (number of channels and max channels in acquisition)
Gnss_Signal search_next_signal(std::string searched_signal, bool pop, bool tracked = false);
Gnss_Signal search_next_signal(const std::string& searched_signal, bool pop, bool tracked = false);
bool connected_;
bool running_;
int sources_count_;
@@ -166,6 +167,7 @@ private:
std::shared_ptr<GNSSBlockInterface> observables_;
std::shared_ptr<GNSSBlockInterface> pvt_;
std::map<std::string, gr::basic_block_sptr> acq_resamplers_;
std::vector<std::shared_ptr<ChannelInterface>> channels_;
gnss_sdr_sample_counter_sptr ch_out_sample_counter;
#if ENABLE_FPGA
@@ -202,7 +204,7 @@ private:
bool enable_monitor_;
gr::basic_block_sptr GnssSynchroMonitor_;
std::vector<std::string> split_string(const std::string &s, char delim);
std::vector<std::string> split_string(const std::string& s, char delim);
};
#endif /*GNSS_SDR_GNSS_FLOWGRAPH_H_*/