mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-05-31 05:34:11 +00:00
Code Issues Releases Wiki Activity

minor cleaning

Browse Source
This commit is contained in:
Carles Fernandez 2016-05-02 01:28:37 +02:00
parent ed8d647935
commit ae8eaee724
2 changed files with 51 additions and 50 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

@ -483,10 +483,10 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
unsigned int channel_absolute_id = 0; unsigned int channel_absolute_id = 0;
unsigned int Channels_1C_count=configuration->property("Channels_1C.count", 0); unsigned int Channels_1C_count = configuration->property("Channels_1C.count", 0);
unsigned int Channels_2S_count=configuration->property("Channels_2S.count", 0); unsigned int Channels_2S_count = configuration->property("Channels_2S.count", 0);
unsigned int Channels_1B_count=configuration->property("Channels_1B.count", 0); unsigned int Channels_1B_count = configuration->property("Channels_1B.count", 0);
unsigned int Channels_5X_count=configuration->property("Channels_5X.count", 0); unsigned int Channels_5X_count = configuration->property("Channels_5X.count", 0);
unsigned int total_channels = Channels_1C_count + unsigned int total_channels = Channels_1C_count +
Channels_2S_count + Channels_2S_count +

93
src/core/receiver/gnss_flowgraph.cc
View File

@ -66,6 +66,7 @@ GNSSFlowgraph::GNSSFlowgraph(std::shared_ptr<ConfigurationInterface> configurati
GNSSFlowgraph::~GNSSFlowgraph() GNSSFlowgraph::~GNSSFlowgraph()
{} {}
void GNSSFlowgraph::start() void GNSSFlowgraph::start()
{ {
if (running_) if (running_)
@ -91,12 +92,12 @@ void GNSSFlowgraph::start()
void GNSSFlowgraph::stop() void GNSSFlowgraph::stop()
{ {
// for (unsigned int i = 0; i < channels_count_; i++) // for (unsigned int i = 0; i < channels_count_; i++)
// { // {
// channels_.at(i)->stop_channel(); // channels_.at(i)->stop_channel();
// LOG(INFO) << "Channel " << i << " in state " << channels_state_[i]; // LOG(INFO) << "Channel " << i << " in state " << channels_state_[i];
// } // }
// LOG(INFO) << "Threads finished. Return to main program."; // LOG(INFO) << "Threads finished. Return to main program.";
top_block_->stop(); top_block_->stop();
running_ = false; running_ = false;
} }
@ -575,49 +576,50 @@ void GNSSFlowgraph::set_signals_list()
std::string sv_list = configuration_->property("Galileo.prns", std::string("") ); std::string sv_list = configuration_->property("Galileo.prns", std::string("") );
if( sv_list.length() > 0 ) if( sv_list.length() > 0 )
{
// Reset the available prns:
std::set< unsigned int > tmp_set;
boost::tokenizer<> tok( sv_list );
std::transform( tok.begin(), tok.end(), std::inserter( tmp_set, tmp_set.begin() ),
boost::lexical_cast<unsigned int, std::string> );
if( tmp_set.size() > 0 )
{ {
available_galileo_prn = tmp_set; // Reset the available prns:
std::set< unsigned int > tmp_set;
boost::tokenizer<> tok( sv_list );
std::transform( tok.begin(), tok.end(), std::inserter( tmp_set, tmp_set.begin() ),
boost::lexical_cast<unsigned int, std::string> );
if( tmp_set.size() > 0 )
{
available_galileo_prn = tmp_set;
}
} }
}
sv_list = configuration_->property("GPS.prns", std::string("") ); sv_list = configuration_->property("GPS.prns", std::string("") );
if( sv_list.length() > 0 ) if( sv_list.length() > 0 )
{
// Reset the available prns:
std::set< unsigned int > tmp_set;
boost::tokenizer<> tok( sv_list );
std::transform( tok.begin(), tok.end(), std::inserter( tmp_set, tmp_set.begin() ),
boost::lexical_cast<unsigned int, std::string> );
if( tmp_set.size() > 0 )
{ {
available_gps_prn = tmp_set; // Reset the available prns:
std::set< unsigned int > tmp_set;
boost::tokenizer<> tok( sv_list );
std::transform( tok.begin(), tok.end(), std::inserter( tmp_set, tmp_set.begin() ),
boost::lexical_cast<unsigned int, std::string> );
if( tmp_set.size() > 0 )
{
available_gps_prn = tmp_set;
}
} }
}
sv_list = configuration_->property("SBAS.prns", std::string("") ); sv_list = configuration_->property("SBAS.prns", std::string("") );
if( sv_list.length() > 0 ) if( sv_list.length() > 0 )
{
// Reset the available prns:
std::set< unsigned int > tmp_set;
boost::tokenizer<> tok( sv_list );
std::transform( tok.begin(), tok.end(), std::inserter( tmp_set, tmp_set.begin() ),
boost::lexical_cast<unsigned int, std::string> );
if( tmp_set.size() > 0 )
{ {
available_sbas_prn = tmp_set; // Reset the available prns:
std::set< unsigned int > tmp_set;
boost::tokenizer<> tok( sv_list );
std::transform( tok.begin(), tok.end(), std::inserter( tmp_set, tmp_set.begin() ),
boost::lexical_cast<unsigned int, std::string> );
if( tmp_set.size() > 0 )
{
available_sbas_prn = tmp_set;
}
} }
}
if (configuration_->property("Channels_1C.count", 0) > 0 ) if (configuration_->property("Channels_1C.count", 0) > 0 )
{ {
@ -694,7 +696,7 @@ void GNSSFlowgraph::set_signals_list()
*/ */
std::list<Gnss_Signal>::iterator gnss_it = available_GNSS_signals_.begin(); std::list<Gnss_Signal>::iterator gnss_it = available_GNSS_signals_.begin();
// Preassignation if not defined at ChannelX.signal=1C ...? In what order? // Pre-assignation if not defined at ChannelX.signal=1C ...? In what order?
for (unsigned int i = 0; i < total_channels; i++) for (unsigned int i = 0; i < total_channels; i++)
{ {
@ -716,13 +718,13 @@ void GNSSFlowgraph::set_signals_list()
} }
} }
// **** FOR DEBUGGING THE LIST OF GNSS SIGNALS **** // **** FOR DEBUGGING THE LIST OF GNSS SIGNALS ****
// std::list<Gnss_Signal>::iterator available_gnss_list_iter; // std::list<Gnss_Signal>::iterator available_gnss_list_iter;
// for (available_gnss_list_iter = available_GNSS_signals_.begin(); available_gnss_list_iter // for (available_gnss_list_iter = available_GNSS_signals_.begin(); available_gnss_list_iter
// != available_GNSS_signals_.end(); available_gnss_list_iter++) // != available_GNSS_signals_.end(); available_gnss_list_iter++)
// { // {
// std::cout << *available_gnss_list_iter << std::endl; // std::cout << *available_gnss_list_iter << std::endl;
// } // }
} }
@ -732,8 +734,7 @@ void GNSSFlowgraph::set_channels_state()
if (max_acq_channels_ > channels_count_) if (max_acq_channels_ > channels_count_)
{ {
max_acq_channels_ = channels_count_; max_acq_channels_ = channels_count_;
LOG(WARNING) << "Channels_in_acquisition is bigger than number of channels. Variable acq_channels_count_ is set to " LOG(WARNING) << "Channels_in_acquisition is bigger than number of channels. Variable acq_channels_count_ is set to " << channels_count_;
<< channels_count_;
} }
channels_state_.reserve(channels_count_); channels_state_.reserve(channels_count_);
for (unsigned int i = 0; i < channels_count_; i++) for (unsigned int i = 0; i < channels_count_; i++)