From afc78ee0ffd9d0197901a58212852e1acc72c336 Mon Sep 17 00:00:00 2001
From: Marc Majoral <mmajoral@cttc.es>
Date: Sat, 4 Dec 2021 18:07:25 +0100
Subject: [PATCH 1/2] fix acquisition performance test
---
.../acquisition/acq_performance_test.cc | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
index 2cac830f5..ef7fb777c 100644
--- a/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
+++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/acq_performance_test.cc
@@ -87,8 +87,6 @@ DEFINE_int32(acq_test_iterations, 1, "Number of iterations (same signal, differe
DEFINE_bool(plot_acq_test, false, "Plots results with gnuplot, if available");
DEFINE_int32(acq_test_skiphead, 0, "Number of samples to skip in the input file");
-DEFINE_bool(acq_test_dump, false, "Dump the results of an acquisition block into .mat files.");
-
// ######## GNURADIO BLOCK MESSAGE RECEVER #########
class AcqPerfTest_msg_rx;
@@ -536,14 +534,7 @@ int AcquisitionPerformanceTest::configure_receiver(double cn0, float pfa, unsign
config->set_property("Acquisition.make_two_steps", "false");
}
- if (FLAGS_acq_test_dump)
- {
- config->set_property("Acquisition.dump", "true");
- }
- else
- {
- config->set_property("Acquisition.dump", "false");
- }
+ config->set_property("Acquisition.dump", "true");
// std::string dump_file = path_str + std::string("/acquisition_") + std::to_string(cn0) + "_" + std::to_string(iter) + "_" + std::to_string(pfa);
std::string dump_file = path_str + std::string("/acquisition_") + std::to_string(static_cast<int>(cn0)) + "_" + std::to_string(iter) + "_" + std::to_string(static_cast<int>(pfa * 1.0e5));
@@ -847,7 +838,7 @@ TEST_F(AcquisitionPerformanceTest, ROC)
run_receiver();
// count executions
- std::string basename = path_str + std::string("/acquisition_") + std::to_string(static_cast<int>(it)) + "_" + std::to_string(iter) + "_" + std::to_string(static_cast<int>(pfa_vector[pfa_iter] * 1e-5)) + "_" + gnss_synchro.System + "_" + signal_id;
+ std::string basename = path_str + std::string("/acquisition_") + std::to_string(static_cast<int>(it)) + "_" + std::to_string(iter) + "_" + std::to_string(static_cast<int>(pfa_vector[pfa_iter] * 1.0e5)) + "_" + gnss_synchro.System + "_" + gnss_synchro.Signal;
int num_executions = count_executions(basename, observed_satellite);
// Read measured data
From f6ff0bbe89d89a90c259c803c2743676c777b9b0 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Tue, 7 Dec 2021 13:42:31 +0100
Subject: [PATCH 2/2] Add two new Galileo satellites
---
src/core/system_parameters/gnss_satellite.cc | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/core/system_parameters/gnss_satellite.cc b/src/core/system_parameters/gnss_satellite.cc
index 4cf372e7d..ff6af54dd 100644
--- a/src/core/system_parameters/gnss_satellite.cc
+++ b/src/core/system_parameters/gnss_satellite.cc
@@ -552,6 +552,9 @@ std::string Gnss_Satellite::what_block(const std::string& system_, uint32_t PRN_
case 9:
block_ = std::string("FOC-FM9"); // Galileo Full Operational Capability (FOC) satellite FM9 / GSAT0209, launched on December 17, 2015.
break;
+ case 10:
+ block_ = std::string("FOC-FM24"); // Galileo Full Operational Capability (FOC) satellite FM24 / GSAT0224, launched on December 5, 2021.
+ break;
case 11:
block_ = std::string("IOV-PFM"); // PFM, the ProtoFlight Model / GSAT0101, launched from French Guiana at 10:30 GMT on October 21, 2011.
break;
@@ -603,6 +606,9 @@ std::string Gnss_Satellite::what_block(const std::string& system_, uint32_t PRN_
case 33:
block_ = std::string("FOC-FM22"); // Galileo Full Operational Capability (FOC) satellite FM22 / GSAT0222, launched on Jul. 25, 2018. UNDER COMMISSIONING.
break;
+ case 34:
+ block_ = std::string("FOC-FM23"); // Galileo Full Operational Capability (FOC) satellite FM23 / GSAT0223, launched on December 5, 2021.
+ break;
case 36:
block_ = std::string("FOC-FM19"); // Galileo Full Operational Capability (FOC) satellite FM19 / GSAT0219, launched on Jul. 25, 2018. UNDER COMMISSIONING.
break;