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

Adding a configuration file flag to TTFF test

Browse Source 
Now the conf file can be passed as a parameter:
ttff --config_file_ttff=myconf.conf
This commit is contained in:
Carles Fernandez 2016-10-10 11:02:39 +02:00
parent b1721489e5
commit 257d2de18e
1 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/tests/system-tests/ttff_gps_l1.cc
View File

@ -59,7 +59,7 @@ DEFINE_int32(max_measurement_duration, 90, "Maximum time waiting for a position
DEFINE_int32(num_measurements, 2, "Number of measurements"); DEFINE_int32(num_measurements, 2, "Number of measurements");
DEFINE_string(device_address, "192.168.40.2", "USRP device IP address"); DEFINE_string(device_address, "192.168.40.2", "USRP device IP address");
DEFINE_string(subdevice, "A:0", "USRP subdevice"); DEFINE_string(subdevice, "A:0", "USRP subdevice");
DEFINE_string(config_file_ttff, std::string(""), "File containing the configuration parameters for the TTFF test.");
// For GPS NAVIGATION (L1) // For GPS NAVIGATION (L1)
concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue; concurrent_queue<Gps_Acq_Assist> global_gps_acq_assist_queue;
@ -238,9 +238,9 @@ void TTFF_GPS_L1_CA_Test::config_1()
void TTFF_GPS_L1_CA_Test::config_2() void TTFF_GPS_L1_CA_Test::config_2()
{ {
std::string path = std::string(TEST_PATH); //std::string path = std::string(TEST_PATH);
std::string filename = path + "../../conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf"; //std::string filename = path + "../../conf/gnss-sdr_GPS_L1_USRP_X300_realtime.conf";
config2 = std::make_shared<FileConfiguration>(filename); config2 = std::make_shared<FileConfiguration>(FLAGS_config_file_ttff);
config2->set_property("SignalSource.samples", std::to_string(FLAGS_fs_in * FLAGS_max_measurement_duration)); config2->set_property("SignalSource.samples", std::to_string(FLAGS_fs_in * FLAGS_max_measurement_duration));
} }
@ -467,11 +467,19 @@ TEST_F(TTFF_GPS_L1_CA_Test, ColdStart)
config2->set_property("GNSS-SDR.SUPL_read_gps_assistance_xml", "false"); config2->set_property("GNSS-SDR.SUPL_read_gps_assistance_xml", "false");
config2->set_property("PVT.flag_rtcm_server", "false"); config2->set_property("PVT.flag_rtcm_server", "false");
std::unique_ptr<ControlThread> control_thread;
for(int n = 0; n < FLAGS_num_measurements; n++) for(int n = 0; n < FLAGS_num_measurements; n++)
{ {
// Create a new ControlThread object with a smart pointer // Create a new ControlThread object with a smart pointer
if(FLAGS_config_file_ttff.empty())
{
std::unique_ptr<ControlThread> control_thread(new ControlThread(config)); std::unique_ptr<ControlThread> control_thread(new ControlThread(config));
}
else
{
std::unique_ptr<ControlThread> control_thread(new ControlThread(config2));
}
// record startup time // record startup time
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
@ -516,7 +524,14 @@ TEST_F(TTFF_GPS_L1_CA_Test, ColdStart)
} }
// Print TTFF report // Print TTFF report
if(FLAGS_config_file_ttff.empty())
{
print_TTFF_report(TTFF_v, config); print_TTFF_report(TTFF_v, config);
}
else
{
print_TTFF_report(TTFF_v, config2);
}
std::this_thread::sleep_until(std::chrono::system_clock::now() + std::chrono::seconds(5)); //let the USRP some time to rest before the next test std::this_thread::sleep_until(std::chrono::system_clock::now() + std::chrono::seconds(5)); //let the USRP some time to rest before the next test
} }
@ -531,11 +546,25 @@ TEST_F(TTFF_GPS_L1_CA_Test, HotStart)
config->set_property("GNSS-SDR.SUPL_gps_enabled", "true"); config->set_property("GNSS-SDR.SUPL_gps_enabled", "true");
config->set_property("GNSS-SDR.SUPL_read_gps_assistance_xml", "true"); config->set_property("GNSS-SDR.SUPL_read_gps_assistance_xml", "true");
config_2();
// Ensure Hot Start
config2->set_property("GNSS-SDR.SUPL_gps_enabled", "true");
config2->set_property("GNSS-SDR.SUPL_read_gps_assistance_xml", "true");
config2->set_property("PVT.flag_rtcm_server", "false");
std::unique_ptr<ControlThread> control_thread;
for(int n = 0; n < FLAGS_num_measurements; n++) for(int n = 0; n < FLAGS_num_measurements; n++)
{ {
// Create a new ControlThread object with a smart pointer // Create a new ControlThread object with a smart pointer
if(FLAGS_config_file_ttff.empty())
{
std::unique_ptr<ControlThread> control_thread(new ControlThread(config)); std::unique_ptr<ControlThread> control_thread(new ControlThread(config));
}
else
{
std::unique_ptr<ControlThread> control_thread(new ControlThread(config2));
}
// record startup time // record startup time
struct timeval tv; struct timeval tv;
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
@ -580,7 +609,14 @@ TEST_F(TTFF_GPS_L1_CA_Test, HotStart)
} }
// Print TTFF report // Print TTFF report
if(FLAGS_config_file_ttff.empty())
{
print_TTFF_report(TTFF_v, config); print_TTFF_report(TTFF_v, config);
}
else
{
print_TTFF_report(TTFF_v, config2);
}
} }