mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 20:50:33 +00:00
Code Issues Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Gastd 2017-06-05 20:26:39 -03:00
commit bbbb5bcc1d
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/algorithms/acquisition/gnuradio_blocks/pcps_acquisition_cc.h
View File

@ -150,6 +150,12 @@ public:
{ {
gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler gr::thread::scoped_lock lock(d_setlock); // require mutex with work function called by the scheduler
d_gnss_synchro = p_gnss_synchro; d_gnss_synchro = p_gnss_synchro;
// Dealing with FDMA system
if(d_gnss_synchro->System == 'R')
{
d_freq += 0.5625e6 * GLONASS_PRN[d_gnss_synchro->PRN+1];
std::cout << "d_freq " << d_freq << std::endl;
}
} }
/*! /*!

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

@ -605,6 +605,12 @@ void GNSSFlowgraph::set_signals_list()
std::set<unsigned int> available_glonass_prn = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, std::set<unsigned int> available_glonass_prn = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24}; 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24};
/*
* Only 24 operational
*/
std::set<unsigned int> available_glonass_prn = { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24};
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 )

5
src/core/system_parameters/Glonass_L1_CA.h
View File

@ -2,10 +2,15 @@
#define GNSS_SDR_GLONASS_L1_CA_H_ #define GNSS_SDR_GLONASS_L1_CA_H_
#include <vector> #include <vector>
<<<<<<< HEAD
#include <map> // std::map #include <map> // std::map
#include "MATH_CONSTANTS.h" #include "MATH_CONSTANTS.h"
#include "gnss_frequencies.h" #include "gnss_frequencies.h"
=======
#include <utility> // std::pair
#include "MATH_CONSTANTS.h"
>>>>>>> c381e10dc3b71a0a762b27c06ac828557d2ddf4e
// Physical constants // Physical constants
const double GLONASS_C_m_s = 299792458.0; //!< The speed of light, [m/s] const double GLONASS_C_m_s = 299792458.0; //!< The speed of light, [m/s]