From 0583de24dd4e8b7f60eba50e36042802599156ce Mon Sep 17 00:00:00 2001 From: Javier Arribas Date: Thu, 23 Dec 2021 14:48:27 +0100 Subject: [PATCH 1/3] The use of ORC library is now optional, even if it is installed on the system --- CMakeLists.txt | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5710cca7a..753046e01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,6 +120,7 @@ endif() option(ENABLE_EXTERNAL_MATHJAX "Use MathJax from an external CDN in HTML docs" ON) +option(ENABLE_ORC "Use (if available) the Optimized Inner Loop Runtime Compiler (ORC)" OFF) ################################################################################ # GNSS-SDR version information @@ -1139,13 +1140,18 @@ if(NOT VOLKGNSSSDR_FOUND) else() set(VOLK_GNSSSDR_COMPILER -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}) endif() - find_package(ORC) - set_package_properties(ORC PROPERTIES - PURPOSE "Used by volk_gnsssdr." - TYPE OPTIONAL - ) - if(ORC_FOUND) - set(ORC_ENABLED ON) + + if(ENABLE_ORC) + find_package(ORC) + set_package_properties(ORC PROPERTIES + PURPOSE "Used by volk_gnsssdr." + TYPE OPTIONAL + ) + if(ORC_FOUND) + set(ORC_ENABLED ON) + else() + set(ORC_ENABLED OFF) + endif() else() set(ORC_ENABLED OFF) endif() From 6d2aaa160e04286ddbf3d5bdcc9647e2758c1ed0 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 23 Dec 2021 15:18:40 +0100 Subject: [PATCH 2/3] Report usage of ORC library in the CMake summary --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 753046e01..1dd1b53eb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1151,9 +1151,11 @@ if(NOT VOLKGNSSSDR_FOUND) set(ORC_ENABLED ON) else() set(ORC_ENABLED OFF) + set(ENABLE_ORC OFF) endif() else() set(ORC_ENABLED OFF) + set(ENABLE_ORC OFF) endif() set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_COMPILER} @@ -1342,6 +1344,7 @@ if(NOT VOLKGNSSSDR_FOUND) ) else() set(ENABLE_OWN_CPUFEATURES OFF) + set(ENABLE_ORC OFF) endif() @@ -3343,6 +3346,7 @@ add_feature_info(ENABLE_PACKAGING ENABLE_PACKAGING "Enables software packaging." add_feature_info(ENABLE_OWN_GLOG ENABLE_OWN_GLOG "Forces the downloading and building of Google glog.") add_feature_info(ENABLE_OWN_ARMADILLO ENABLE_OWN_ARMADILLO "Forces the downloading and building of Armadillo.") add_feature_info(ENABLE_LOG ENABLE_LOG "Enables runtime internal logging with Google glog.") +add_feature_info(ENABLE_ORC ENABLE_ORC "Use the Optimized Inner Loop Runtime Compiler (ORC) for building volk_gnsssdr.") add_feature_info(ENABLE_STRIP ENABLE_STRIP "Enables the generation of stripped binaries (without debugging symbols).") add_feature_info(ENABLE_UNIT_TESTING ENABLE_UNIT_TESTING "Enables building of Unit Tests.") add_feature_info(ENABLE_UNIT_TESTING_MINIMAL ENABLE_UNIT_TESTING_MINIMAL "Enables building a minimal set of Unit Tests.") From ce9bbf74b0829369812366d487786bc1edfb7912 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 23 Dec 2021 15:41:59 +0100 Subject: [PATCH 3/3] Reset TOW0 flag when resetting the block --- .../gnuradio_blocks/galileo_telemetry_decoder_gs.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc index 3a968f6b3..75e20684e 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc @@ -604,6 +604,7 @@ void galileo_telemetry_decoder_gs::reset() d_TOW_at_Preamble_ms = 0; d_fnav_nav.set_flag_TOW_set(false); d_inav_nav.set_flag_TOW_set(false); + d_inav_nav.set_TOW0_flag(false); d_last_valid_preamble = d_sample_counter; d_sent_tlm_failed_msg = false; d_stat = 0;