From 4c9416e05fa634cda81bbc20d9503a6634432dcf Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 3 Oct 2019 16:41:15 +0200 Subject: [PATCH 1/2] Update Protocol Buffers to 3.10.0 --- CMakeLists.txt | 2 +- README.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bf0f50472..b06cf7141 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -407,7 +407,7 @@ set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GPSTK_LOCAL_VERSION "2.12") set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.17") set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.10") -set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.9.2") +set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "3.10.0") if(CMAKE_VERSION VERSION_LESS "3.0.2") # Fix for CentOS 7 set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.1") diff --git a/README.md b/README.md index 1f1f8f642..07a86d4e4 100644 --- a/README.md +++ b/README.md @@ -305,9 +305,9 @@ $ sudo apt-get install autoconf automake libtool curl make g++ unzip and then: ~~~~~~ -$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.9.2/protobuf-cpp-3.9.2.tar.gz -$ tar xvfz protobuf-cpp-3.9.2.tar.gz -$ cd protobuf-3.9.2 +$ wget https://github.com/protocolbuffers/protobuf/releases/download/v3.10.0/protobuf-cpp-3.10.0.tar.gz +$ tar xvfz protobuf-cpp-3.10.0.tar.gz +$ cd protobuf-3.10.0 $ ./autogen.sh $ ./configure $ make From ceaa7854237cf77593498d334ab8e0c98ff44744 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 3 Oct 2019 19:15:05 +0200 Subject: [PATCH 2/2] Set global parameter assist_dual_frequency_acq to true by default --- src/core/receiver/gnss_flowgraph.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index 1e91a8395..46ac6f046 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -1218,7 +1218,7 @@ void GNSSFlowgraph::acquisition_manager(unsigned int who) estimated_doppler, RX_time); channels_[current_channel]->set_signal(gnss_signal); - start_acquisition = is_primary_freq or assistance_available or !configuration_->property("GNSS-SDR.assist_dual_frequency_acq", false); + start_acquisition = is_primary_freq or assistance_available or !configuration_->property("GNSS-SDR.assist_dual_frequency_acq", true); } else { @@ -1233,7 +1233,7 @@ void GNSSFlowgraph::acquisition_manager(unsigned int who) DLOG(INFO) << "Channel " << current_channel << " Starting acquisition " << channels_[current_channel]->get_signal().get_satellite() << ", Signal " << channels_[current_channel]->get_signal().get_signal_str(); - if (assistance_available == true and configuration_->property("GNSS-SDR.assist_dual_frequency_acq", false)) + if (assistance_available == true and configuration_->property("GNSS-SDR.assist_dual_frequency_acq", true)) { channels_[current_channel]->assist_acquisition_doppler(project_doppler(channels_[current_channel]->get_signal().get_signal_str(), estimated_doppler)); }