From 89efa1023679f6ec0dbf35f626e9754c9d02d9cd Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Wed, 24 Feb 2021 10:41:26 +0100 Subject: [PATCH] Improve error messages --- conf/gnss-sdr_GPS_L1_FPGA.conf | 4 ---- src/core/receiver/gnss_block_factory.cc | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/conf/gnss-sdr_GPS_L1_FPGA.conf b/conf/gnss-sdr_GPS_L1_FPGA.conf index c18b357b8..c873f60cc 100644 --- a/conf/gnss-sdr_GPS_L1_FPGA.conf +++ b/conf/gnss-sdr_GPS_L1_FPGA.conf @@ -20,10 +20,6 @@ SignalSource.freq=1575420000 SignalSource.switch_position=2 SignalSource.gain_mode_rx1=slow_attack -;######### SIGNAL_CONDITIONER CONFIG ############ -SignalConditioner.implementation=Pass_Through -SignalConditioner.enable_FPGA=true - ;######### CHANNELS GLOBAL CONFIG ############ Channels.in_acquisition=1 Channels_1C.count=12 diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc index 7bcbde86e..8d56f11b9 100644 --- a/src/core/receiver/gnss_block_factory.cc +++ b/src/core/receiver/gnss_block_factory.cc @@ -1265,7 +1265,7 @@ std::unique_ptr GNSSBlockFactory::GetBlock( else { // Consider making this a fatal error, terminating the program. Unfortunately, existing unit tests expect otherwise - LOG(ERROR) << role << "." << implementation << ": Undefined implementation for block"; + LOG(ERROR) << role << ".implementation=" << implementation << " is an undefined implementation."; } } catch (const std::exception& e) @@ -1464,7 +1464,7 @@ std::unique_ptr GNSSBlockFactory::GetAcqBlock( else { - LOG(ERROR) << role << " block: Undefined implementation " << implementation; + LOG(ERROR) << role << " block: Undefined implementation" << (implementation == "Wrong"s ? "" : " "s + implementation); } return block; } @@ -1618,7 +1618,7 @@ std::unique_ptr GNSSBlockFactory::GetTrkBlock( #endif else { - LOG(ERROR) << role << " block: Undefined implementation " << implementation; + LOG(ERROR) << role << " block: Undefined implementation" << (implementation == "Wrong"s ? "" : " "s + implementation); } return block; } @@ -1709,7 +1709,7 @@ std::unique_ptr GNSSBlockFactory::GetTlmBlock( else { - LOG(ERROR) << role << " block: Undefined implementation " << implementation; + LOG(ERROR) << role << " block: Undefined implementation" << (implementation == "Wrong"s ? "" : " "s + implementation); } return block;