mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-06-06 00:24:10 +00:00
Code Issues Releases Wiki Activity

Re-enable RTCM and RINEX writing, average parameters removed

Browse Source
This commit is contained in:
Carles Fernandez 2017-04-29 09:25:05 +02:00
parent 44f748cb41
commit 0b6affe38b
4 changed files with 932 additions and 914 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,10 +57,6 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
dump_ = configuration->property(role + ".dump", false); dump_ = configuration->property(role + ".dump", false);
dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename); dump_filename_ = configuration->property(role + ".dump_filename", default_dump_filename);
// moving average depth parameters
int averaging_depth = configuration->property(role + ".averaging_depth", 10);
bool flag_averaging = configuration->property(role + ".flag_averaging", false);
// output rate // output rate
int output_rate_ms = configuration->property(role + ".output_rate_ms", 500); int output_rate_ms = configuration->property(role + ".output_rate_ms", 500);
@ -307,7 +303,7 @@ RtklibPvt::RtklibPvt(ConfigurationInterface* configuration,
rtklib_options = rtklib_configuration_options; rtklib_options = rtklib_configuration_options;
// make PVT object // make PVT object
pvt_ = rtklib_make_pvt_cc(in_streams_, dump_, dump_filename_, averaging_depth, flag_averaging, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_tcp_port, rtcm_station_id, rtcm_msg_rate_ms, rtcm_dump_devname, type_of_receiver, rtklib_options); pvt_ = rtklib_make_pvt_cc(in_streams_, dump_, dump_filename_, output_rate_ms, display_rate_ms, flag_nmea_tty_port, nmea_dump_filename, nmea_dump_devname, flag_rtcm_server, flag_rtcm_tty_port, rtcm_tcp_port, rtcm_station_id, rtcm_msg_rate_ms, rtcm_dump_devname, type_of_receiver, rtklib_options);
DLOG(INFO) << "pvt(" << pvt_->unique_id() << ")"; DLOG(INFO) << "pvt(" << pvt_->unique_id() << ")";
} }

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

File diff suppressed because it is too large Load Diff

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

@ -53,8 +53,6 @@ typedef boost::shared_ptr<rtklib_pvt_cc> rtklib_pvt_cc_sptr;
rtklib_pvt_cc_sptr rtklib_make_pvt_cc(unsigned int n_channels, rtklib_pvt_cc_sptr rtklib_make_pvt_cc(unsigned int n_channels,
bool dump, bool dump,
std::string dump_filename, std::string dump_filename,
int averaging_depth,
bool flag_averaging,
int output_rate_ms, int output_rate_ms,
int display_rate_ms, int display_rate_ms,
bool flag_nmea_tty_port, bool flag_nmea_tty_port,
@ -78,8 +76,6 @@ private:
friend rtklib_pvt_cc_sptr rtklib_make_pvt_cc(unsigned int nchannels, friend rtklib_pvt_cc_sptr rtklib_make_pvt_cc(unsigned int nchannels,
bool dump, bool dump,
std::string dump_filename, std::string dump_filename,
int averaging_depth,
bool flag_averaging,
int output_rate_ms, int output_rate_ms,
int display_rate_ms, int display_rate_ms,
bool flag_nmea_tty_port, bool flag_nmea_tty_port,
@ -95,8 +91,6 @@ private:
const 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,
bool flag_averaging,
int output_rate_ms, int output_rate_ms,
int display_rate_ms, int display_rate_ms,
bool flag_nmea_tty_port, bool flag_nmea_tty_port,
@ -123,14 +117,12 @@ private:
int d_rtcm_MT1097_rate_ms; int d_rtcm_MT1097_rate_ms;
int d_rtcm_MSM_rate_ms; int d_rtcm_MSM_rate_ms;
void print_receiver_status(Gnss_Synchro** channels_synchronization_data);
int d_last_status_print_seg; //for status printer int d_last_status_print_seg; //for status printer
unsigned int d_nchannels; unsigned int d_nchannels;
std::string d_dump_filename; std::string d_dump_filename;
std::ofstream d_dump_file; std::ofstream d_dump_file;
int d_averaging_depth;
bool d_flag_averaging;
int d_output_rate_ms; int d_output_rate_ms;
int d_display_rate_ms; int d_display_rate_ms;
//long unsigned int d_sample_counter; //long unsigned int d_sample_counter;
@ -143,6 +135,13 @@ private:
std::shared_ptr<Rtcm_Printer> d_rtcm_printer; std::shared_ptr<Rtcm_Printer> d_rtcm_printer;
double d_rx_time; double d_rx_time;
double last_pvt_display_T_rx_s; double last_pvt_display_T_rx_s;
double last_RTCM_1019_output_time;
double last_RTCM_1045_output_time;
double last_RTCM_1077_output_time;
double last_RTCM_1097_output_time;
double last_RTCM_MSM_output_time;
double last_RINEX_obs_output_time;
double last_RINEX_nav_output_time;
std::shared_ptr<rtklib_solver> d_ls_pvt; std::shared_ptr<rtklib_solver> d_ls_pvt;
prcopt_t rtklib_options; prcopt_t rtklib_options;
std::map<int,Gnss_Synchro> gnss_observables_map; std::map<int,Gnss_Synchro> gnss_observables_map;

5
src/tests/system-tests/obs_gps_l1_system_test.cc
View File

@ -672,7 +672,10 @@ TEST_F(Obs_Gps_L1_System_Test, Observables_system_test)
configure_generator(); configure_generator();
// Generate signal raw signal samples and observations RINEX file // Generate signal raw signal samples and observations RINEX file
generate_signal(); if(!FLAGS_disable_generator)
{
generate_signal();
}
std::cout << "Validating generated reference RINEX obs file: " << FLAGS_filename_rinex_obs << " ..." << std::endl; std::cout << "Validating generated reference RINEX obs file: " << FLAGS_filename_rinex_obs << " ..." << std::endl;
bool is_gen_rinex_obs_valid = check_valid_rinex_obs( "./" + FLAGS_filename_rinex_obs); bool is_gen_rinex_obs_valid = check_valid_rinex_obs( "./" + FLAGS_filename_rinex_obs);