From a84bdc7d54fd648b54abf69bab33cee9c1329482 Mon Sep 17 00:00:00 2001 From: Gastd Date: Wed, 29 Mar 2017 15:09:19 -0300 Subject: [PATCH] fix glonass signal string --- src/core/receiver/gnss_flowgraph.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc index c652ee061..b148a5948 100644 --- a/src/core/receiver/gnss_flowgraph.cc +++ b/src/core/receiver/gnss_flowgraph.cc @@ -748,11 +748,15 @@ void GNSSFlowgraph::set_signals_list() available_gnss_prn_iter++) { available_GNSS_signals_.push_back(Gnss_Signal(Gnss_Satellite(std::string("Glonass"), +<<<<<<< 3c93101c23e7e730777f47eeff6e7d538c9528e4 <<<<<<< aadcdb80509f7a96b0558b8d33ecaed526bceae9 *available_gnss_prn_iter), std::string("1G"))); ======= *available_gnss_prn_iter), std::string("5X"))); >>>>>>> Add glonass svn in signals list +======= + *available_gnss_prn_iter), std::string("1G"))); +>>>>>>> fix glonass signal string } } /*