mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-16 12:12:57 +00:00
Code Issues Releases Wiki Activity

Pass configuration by reference

Browse Source
This commit is contained in:
Carles Fernandez 2017-04-26 16:09:30 +02:00
parent 54f9108f15
commit 18d2ba5e51
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/algorithms/PVT/adapters/rtklib_pvt.cc
View File

@ -169,7 +169,7 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
//RTKLIB PVT solver options //RTKLIB PVT solver options
/* defaults processing options */ /* defaults processing options */
rtklib_options={PMODE_SINGLE,0,2,SYS_GPS, /* mode,soltype,nf,navsys */ rtklib_options = {PMODE_SINGLE,0,2,SYS_GPS, /* mode,soltype,nf,navsys */
15.0*D2R, { {}, {{},{}} }, /* elmin,snrmask */ 15.0*D2R, { {}, {{},{}} }, /* elmin,snrmask */
0,1,1,1, /* sateph,modear,glomodear,bdsmodear */ 0,1,1,1, /* sateph,modear,glomodear,bdsmodear */
5,0,10,1, /* maxout,minlock,minfix,armaxiter */ 5,0,10,1, /* maxout,minlock,minfix,armaxiter */

4
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.cc
View File

@ -61,7 +61,7 @@ rtklib_make_pvt_cc(unsigned int nchannels,
std::map<int,int> rtcm_msg_rate_ms, std::map<int,int> rtcm_msg_rate_ms,
std::string rtcm_dump_devname, std::string rtcm_dump_devname,
const unsigned int type_of_receiver, const unsigned int type_of_receiver,
prcopt_t rtklib_opt) const prcopt_t rtklib_opt)
{ {
return rtklib_pvt_cc_sptr(new rtklib_pvt_cc(nchannels, return rtklib_pvt_cc_sptr(new rtklib_pvt_cc(nchannels,
dump, dump,
@ -203,7 +203,7 @@ rtklib_pvt_cc::rtklib_pvt_cc(unsigned int nchannels, bool dump, std::string dump
int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port, int averaging_depth, bool flag_averaging, int output_rate_ms, int display_rate_ms, bool flag_nmea_tty_port,
std::string nmea_dump_filename, std::string nmea_dump_devname, std::string nmea_dump_filename, std::string nmea_dump_devname,
bool flag_rtcm_server, bool flag_rtcm_tty_port, unsigned short rtcm_tcp_port, bool flag_rtcm_server, bool flag_rtcm_tty_port, unsigned short rtcm_tcp_port,
unsigned short rtcm_station_id, std::map<int,int> rtcm_msg_rate_ms, std::string rtcm_dump_devname, const unsigned int type_of_receiver, prcopt_t rtklib_opt) : unsigned short rtcm_station_id, std::map<int,int> rtcm_msg_rate_ms, std::string rtcm_dump_devname, const unsigned int type_of_receiver, const prcopt_t rtklib_opt) :
gr::block("rtklib_pvt_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)), gr::block("rtklib_pvt_cc", gr::io_signature::make(nchannels, nchannels, sizeof(Gnss_Synchro)),
gr::io_signature::make(0, 0, sizeof(gr_complex))) gr::io_signature::make(0, 0, sizeof(gr_complex)))

4
src/algorithms/PVT/gnuradio_blocks/rtklib_pvt_cc.h
View File

@ -92,7 +92,7 @@ private:
std::map<int,int> rtcm_msg_rate_ms, std::map<int,int> rtcm_msg_rate_ms,
std::string rtcm_dump_devname, std::string rtcm_dump_devname,
const unsigned int type_of_receiver, const unsigned int type_of_receiver,
prcopt_t rtklib_opt); const prcopt_t rtklib_opt);
rtklib_pvt_cc(unsigned int nchannels, rtklib_pvt_cc(unsigned int nchannels,
bool dump, std::string dump_filename, bool dump, std::string dump_filename,
int averaging_depth, int averaging_depth,
@ -109,7 +109,7 @@ private:
std::map<int,int> rtcm_msg_rate_ms, std::map<int,int> rtcm_msg_rate_ms,
std::string rtcm_dump_devname, std::string rtcm_dump_devname,
const unsigned int type_of_receiver, const unsigned int type_of_receiver,
prcopt_t rtklib_opt); const prcopt_t rtklib_opt);
void msg_handler_telemetry(pmt::pmt_t msg); void msg_handler_telemetry(pmt::pmt_t msg);

2
src/algorithms/PVT/libs/rtklib_solver.cc
View File

@ -58,7 +58,7 @@
using google::LogMessage; using google::LogMessage;
rtklib_solver::rtklib_solver(int nchannels, std::string dump_filename, bool flag_dump_to_file, prcopt_t rtklib_opt) rtklib_solver::rtklib_solver(int nchannels, std::string dump_filename, bool flag_dump_to_file, const prcopt_t & rtklib_opt)
{ {
// init empty ephemeris for all the available GNSS channels // init empty ephemeris for all the available GNSS channels
d_nchannels = nchannels; d_nchannels = nchannels;

2
src/algorithms/PVT/libs/rtklib_solver.h
View File

@ -70,7 +70,7 @@ class rtklib_solver : public Pvt_Solution
private: private:
public: public:
rtklib_solver(int nchannels,std::string dump_filename, bool flag_dump_to_file, prcopt_t rtklib_opt); rtklib_solver(int nchannels,std::string dump_filename, bool flag_dump_to_file, const prcopt_t & rtklib_opt);
~rtklib_solver(); ~rtklib_solver();
bool get_PVT(std::map<int,Gnss_Synchro> gnss_observables_map, double Rx_time, bool flag_averaging); bool get_PVT(std::map<int,Gnss_Synchro> gnss_observables_map, double Rx_time, bool flag_averaging);