mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-07-07 20:24:21 +00:00
Code Issues Releases Wiki Activity

fix glonass signal string

Browse Source
This commit is contained in:
Gastd 2017-03-29 15:09:19 -03:00
parent 661620e883
commit 6052514018
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -745,11 +745,15 @@ void GNSSFlowgraph::set_signals_list()
available_gnss_prn_iter++) available_gnss_prn_iter++)
{ {
available_GNSS_signals_.push_back(Gnss_Signal(Gnss_Satellite(std::string("Glonass"), available_GNSS_signals_.push_back(Gnss_Signal(Gnss_Satellite(std::string("Glonass"),
<<<<<<< 3c93101c23e7e730777f47eeff6e7d538c9528e4
<<<<<<< aadcdb80509f7a96b0558b8d33ecaed526bceae9 <<<<<<< aadcdb80509f7a96b0558b8d33ecaed526bceae9
*available_gnss_prn_iter), std::string("1G"))); *available_gnss_prn_iter), std::string("1G")));
======= =======
*available_gnss_prn_iter), std::string("5X"))); *available_gnss_prn_iter), std::string("5X")));
>>>>>>> Add glonass svn in signals list >>>>>>> Add glonass svn in signals list
=======
*available_gnss_prn_iter), std::string("1G")));
>>>>>>> fix glonass signal string
} }
} }
/* /*