mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-03-04 18:48:17 +00:00
Code Issues Releases Wiki Activity

Reading generic configuration for Channel

Browse Source
This commit is contained in:
Carles Fernandez 2015-05-12 08:07:02 +02:00
parent d270705013
commit ef046f9a14
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/receiver/gnss_block_factory.cc
View File

@ -665,7 +665,7 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
// Search for specific implementation of that particular channel in config file // Search for specific implementation of that particular channel in config file
//(i.e. Acquisition_GPS0.implementation=xxxx) DEPRECATED //(i.e. Acquisition_GPS0.implementation=xxxx) DEPRECATED
s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", std::string("W")); s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", configuration->property("Channel.signal", std::string("W")));
if( s.compare("1C") == 0 ) if( s.compare("1C") == 0 )
{ {
apply_ = true; apply_ = true;
@ -758,7 +758,7 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
// Search for specific implementation of that particular channel in config file // Search for specific implementation of that particular channel in config file
//(i.e. Acquisition_2S0.implementation=xxxx) //(i.e. Acquisition_2S0.implementation=xxxx)
s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", std::string("W")); s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", configuration->property("Channel.signal", std::string("W")));
if( s.compare("2S") == 0 ) if( s.compare("2S") == 0 )
{ {
apply_ = true; apply_ = true;
@ -842,7 +842,7 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
} }
// Search for specific implementation of that particular channel in config file // Search for specific implementation of that particular channel in config file
//(i.e. Acquisition_Galileo0.implementation=xxxx) DEPRECATED //(i.e. Acquisition_Galileo0.implementation=xxxx) DEPRECATED
s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", std::string("W")); s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", configuration->property("Channel.signal", std::string("W")));
if( s.compare("1B") == 0 ) if( s.compare("1B") == 0 )
{ {
apply_ = true; apply_ = true;
@ -936,7 +936,7 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
} }
// Search for specific implementation of that particular channel in config file // Search for specific implementation of that particular channel in config file
//(i.e. Acquisition_5X0.implementation=xxxx) //(i.e. Acquisition_5X0.implementation=xxxx)
s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", std::string("W")); s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", configuration->property("Channel.signal", std::string("W")));
if( s.compare("5X") == 0 ) if( s.compare("5X") == 0 )
{ {
apply_ = true; apply_ = true;