mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-07-28 23:02:56 +00:00
Code Issues Releases Wiki Activity

Improve formatting

Browse Source
This commit is contained in:
Carles Fernandez 2019-09-17 16:25:17 +02:00
parent 630e94dbef
commit 837dcc6859
6 changed files with 12 additions and 12 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

@ -68,7 +68,7 @@ Rtklib_Pvt::Rtklib_Pvt(ConfigurationInterface* configuration,
pvt_output_parameters.dump_filename = configuration->property(role + ".dump_filename", default_dump_filename); pvt_output_parameters.dump_filename = configuration->property(role + ".dump_filename", default_dump_filename);
pvt_output_parameters.dump_mat = configuration->property(role + ".dump_mat", true); pvt_output_parameters.dump_mat = configuration->property(role + ".dump_mat", true);
//OPTIONAL: specify a custom year to override the system time in order to postprocess old gnss records and avoid wrong week rollover // OPTIONAL: specify a custom year to override the system time in order to postprocess old gnss records and avoid wrong week rollover
pvt_output_parameters.custom_year = configuration->property("GNSS-SDR.custom_year", 0); pvt_output_parameters.custom_year = configuration->property("GNSS-SDR.custom_year", 0);
// output rate // output rate

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

@ -53,7 +53,7 @@ Pvt_Solution::Pvt_Solution()
d_valid_observations = 0; d_valid_observations = 0;
d_rx_pos = arma::zeros(3, 1); d_rx_pos = arma::zeros(3, 1);
d_rx_dt_s = 0.0; d_rx_dt_s = 0.0;
d_custom_year = 0; //disabled by default d_custom_year = 0; // disabled by default
} }

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

@ -130,7 +130,7 @@ public:
int tropo(double *ddr_m, double sinel, double hsta_km, double p_mb, double t_kel, double hum, double hp_km, double htkel_km, double hhum_km); int tropo(double *ddr_m, double sinel, double hsta_km, double p_mb, double t_kel, double hum, double hp_km, double htkel_km, double hhum_km);
protected: protected:
int d_custom_year; //custom year to guess the correct week rollover in post processing mode int d_custom_year; // custom year to guess the correct week rollover in post processing mode
private: private:
double d_rx_dt_s; // RX time offset [s] double d_rx_dt_s; // RX time offset [s]

14
src/algorithms/libs/rtklib/rtklib_rtkcmn.cc
View File

@ -2128,10 +2128,10 @@ int adjgpsweek(int week, int custom_year)
// w = week + 1024; //add weeks from 6-january-1980 to week rollover in 21 august 1999 // w = week + 1024; //add weeks from 6-january-1980 to week rollover in 21 august 1999
// } // }
int w; int w;
if (week>1023) if (week > 1023)
{ {
return week; return week;
} }
if (custom_year == 0) if (custom_year == 0)
{ {
@ -2146,15 +2146,15 @@ int adjgpsweek(int week, int custom_year)
{ {
if (custom_year >= 2019) if (custom_year >= 2019)
{ {
w = week + 2048; //add weeks from 6-january-1980 to week rollover in 6 april 2019 w = week + 2048; // add weeks from 6-january-1980 to week rollover in 6 april 2019
} }
else if (custom_year < 2019 and custom_year >= 1999) else if (custom_year < 2019 and custom_year >= 1999)
{ {
w = week + 1024; //add weeks from 6-january-1980 to week rollover in 21 august 1999 w = week + 1024; // add weeks from 6-january-1980 to week rollover in 21 august 1999
} }
else else
{ {
w = week; //no rollover w = week; // no rollover
} }
return w; return w;
} }

2
src/core/receiver/control_thread.cc
View File

@ -116,7 +116,7 @@ ControlThread::ControlThread(const std::shared_ptr<ConfigurationInterface> &conf
void ControlThread::init() void ControlThread::init()
{ {
//OPTIONAL: specify a custom year to override the system time in order to postprocess old gnss records and avoid wrong week rollover // OPTIONAL: specify a custom year to override the system time in order to postprocess old gnss records and avoid wrong week rollover
custom_year_ = configuration_->property("GNSS-SDR.custom_year", 0); custom_year_ = configuration_->property("GNSS-SDR.custom_year", 0);
// Instantiates a control queue, a GNSS flowgraph, and a control message factory // Instantiates a control queue, a GNSS flowgraph, and a control message factory
control_queue_ = std::make_shared<Concurrent_Queue<pmt::pmt_t>>(); control_queue_ = std::make_shared<Concurrent_Queue<pmt::pmt_t>>();

2
src/core/receiver/control_thread.h
View File

@ -171,7 +171,7 @@ private:
std::shared_ptr<GNSSFlowgraph> flowgraph_; std::shared_ptr<GNSSFlowgraph> flowgraph_;
std::shared_ptr<ConfigurationInterface> configuration_; std::shared_ptr<ConfigurationInterface> configuration_;
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> control_queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> control_queue_;
int custom_year_; //to override the system time to postprocess old gnss records and avoid wrong week rollover int custom_year_; // to override the system time to postprocess old gnss records and avoid wrong week rollover
bool stop_; bool stop_;
bool restart_; bool restart_;
bool delete_configuration_; bool delete_configuration_;