mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-09-03 11:27:59 +00:00
Code Issues Releases Wiki Activity

Bug fixed in flowgraph.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@243 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
Luis Esteve
2012-09-05 13:50:59 +00:00
parent 02ab6ce7d7
commit 90146d26bf
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -347,6 +347,7 @@ void GNSSFlowgraph::wait()
void GNSSFlowgraph::apply_action(unsigned int who, unsigned int what) void GNSSFlowgraph::apply_action(unsigned int who, unsigned int what)
{ {
DLOG(INFO) << "received " << what << " from " << who; DLOG(INFO) << "received " << what << " from " << who;
// Gnss_Signal aux_signal;
switch (what) switch (what)
{ {
@@ -355,9 +356,22 @@ void GNSSFlowgraph::apply_action(unsigned int who, unsigned int what)
DLOG(INFO) << "Channel " << who << " ACQ FAILED satellite " DLOG(INFO) << "Channel " << who << " ACQ FAILED satellite "
<< channel(who)->get_signal().get_satellite(); << channel(who)->get_signal().get_satellite();
available_GNSS_signals_.push_back(channel(who)->get_signal()); available_GNSS_signals_.push_back(channel(who)->get_signal());
while (channel(who)->get_signal().get_satellite().get_system() != available_GNSS_signals_.front().get_satellite().get_system()){
std::cout << "Entra en el bucleeeeeeeeeeee" << std::endl;
available_GNSS_signals_.push_back(available_GNSS_signals_.front());
available_GNSS_signals_.pop_front();
}
channel(who)->set_signal(available_GNSS_signals_.front()); channel(who)->set_signal(available_GNSS_signals_.front());
available_GNSS_signals_.pop_front(); available_GNSS_signals_.pop_front();
channel(who)->start_acquisition(); channel(who)->start_acquisition();
// std::cout << "Signal queue: " << std::endl;
// for (std::list<Gnss_Signal>::iterator it = available_GNSS_signals_.begin(); it != available_GNSS_signals_.end(); it++) {
// aux_signal = *it;
// std::cout << aux_signal.get_satellite().get_system() << " " << aux_signal.get_signal() << " PRN " << aux_signal.get_satellite().get_PRN() << std::endl;
// }
break; break;
// TODO: Tracking messages // TODO: Tracking messages
@@ -558,9 +572,9 @@ void GNSSFlowgraph::set_signals_list()
signal_value = Gnss_Signal(Gnss_Satellite(std::string("Galileo"), signal_value = Gnss_Signal(Gnss_Satellite(std::string("Galileo"),
*available_gnss_prn_iter), std::string("1B")); *available_gnss_prn_iter), std::string("1B"));
available_GNSS_signals_.push_back(signal_value); available_GNSS_signals_.push_back(signal_value);
signal_value = Gnss_Signal(Gnss_Satellite(std::string("Galileo"), // signal_value = Gnss_Signal(Gnss_Satellite(std::string("Galileo"),
*available_gnss_prn_iter), std::string("1C")); // *available_gnss_prn_iter), std::string("1C"));
available_GNSS_signals_.push_back(signal_value); // available_GNSS_signals_.push_back(signal_value);
} }
std::list<Gnss_Signal>::iterator gnss_it = available_GNSS_signals_.begin(); std::list<Gnss_Signal>::iterator gnss_it = available_GNSS_signals_.begin();
@@ -592,12 +606,13 @@ void GNSSFlowgraph::set_signals_list()
} }
} }
/* std::cout << "Signal queue: " << std::endl;
for (std::list<Gnss_Signal>::iterator it = // std::cout << "Signal queue: " << std::endl;
available_GNSS_signals_.begin(); it // Gnss_Signal aux_signal;
!= available_GNSS_signals_.end(); it++) { // for (std::list<Gnss_Signal>::iterator it = available_GNSS_signals_.begin(); it != available_GNSS_signals_.end(); it++) {
std::cout << *it << std::endl; // aux_signal = *it;
}*/ // std::cout << aux_signal.get_satellite().get_system() << " " << aux_signal.get_signal() << " PRN " << aux_signal.get_satellite().get_PRN() << std::endl;
// }
} }