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

Remove Hybrid_PVT implementation, it is replaced by RTKLIB_PVT

Browse Source
This commit is contained in:
Carles Fernandez
2017-05-10 16:42:22 +02:00
parent e61b65760a
commit 111ad3b221
8 changed files with 4 additions and 1622 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/receiver/gnss_block_factory.cc
+1 -8
View File
@@ -91,7 +91,6 @@
#include "galileo_e5a_telemetry_decoder.h"
#include "sbas_l1_telemetry_decoder.h"
#include "hybrid_observables.h"
#include "hybrid_pvt.h"
#include "rtklib_pvt.h"
#if OPENCL_BLOCKS
@@ -1068,13 +1067,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
block = std::move(block_);
}
// PVT -------------------------------------------------------------------------
else if (implementation.compare("Hybrid_PVT") == 0)
{
std::unique_ptr<GNSSBlockInterface> block_(new HybridPvt(configuration.get(), role, in_streams,
out_streams));
block = std::move(block_);
}
else if ((implementation.compare("RTKLIB_PVT") == 0) || (implementation.compare("GPS_L1_CA_PVT") == 0) || (implementation.compare("Galileo_E1_PVT") == 0) )
else if ((implementation.compare("RTKLIB_PVT") == 0) || (implementation.compare("GPS_L1_CA_PVT") == 0) || (implementation.compare("Galileo_E1_PVT") == 0) || (implementation.compare("Hybrid_PVT") == 0))
{
std::unique_ptr<GNSSBlockInterface> block_(new RtklibPvt(configuration.get(), role, in_streams,
out_streams));
src/core/receiver/gnss_flowgraph.cc
+1 -1
View File
@@ -536,7 +536,7 @@ void GNSSFlowgraph::init()
pvt_ = block_factory_->GetPVT(configuration_);
// Mark old implementations as deprecated
std::string pvt_implementation = configuration_->property("PVT.implementation", default_str);
if ((pvt_implementation.compare("GPS_L1_CA_PVT") == 0) || (pvt_implementation.compare("Galileo_E1_PVT") == 0))
if ((pvt_implementation.compare("GPS_L1_CA_PVT") == 0) || (pvt_implementation.compare("Galileo_E1_PVT") == 0) || (pvt_implementation.compare("Hybrid_PVT") == 0))
{
std::cout << "WARNING: Implementation '" << pvt_implementation << "' of the PVT block has been replaced by 'RTKLIB_PVT'." << std::endl;
std::cout << "Please update your configuration file." << std::endl;