mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-10-04 06:41:49 +00:00
Code Issues Releases Wiki Activity

- Galileo channels now supports all the published PRN IDs in acquisition and tracking

Browse Source 
- Changes in Galileo telemetry decoding (still under construction)
- Bug correction in tracking blocks that could cause random segmentation faults on some configurations

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@431 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
Javier Arribas
2013-10-25 16:07:24 +00:00
parent 0f79be7e77
commit 4d66f6c6ab
13 changed files with 492 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/system_parameters/galileo_navigation_message.cc
+2 -1
View File
@@ -438,7 +438,7 @@ void Galileo_Navigation_Message::split_page(const char *page, int flag_even_word
{
flag_CRC_test = true;
// CRC correct: Decode word
//std::cout<<"CRC correct!"<<std::endl;
std::cout<<"CRC correct!"<<std::endl;
std::string page_number_bits = Data_k.substr (0,6);
//std::cout << "Page number bits from Data k" << std::endl << page_number_bits << std::endl;
@@ -472,6 +472,7 @@ void Galileo_Navigation_Message::split_page(const char *page, int flag_even_word
}else{
// CRC wrong.. discard frame
std::cout<<"CRC error!"<<std::endl;
flag_CRC_test= false;
}
//********** end of CRC checksum control ***/
}
src/core/system_parameters/gnss_satellite.cc
+12 -24
View File
@@ -145,7 +145,7 @@ void Gnss_Satellite::set_PRN(unsigned int PRN_)
}
if (system.compare("GPS") == 0)
{
if (PRN_ < 1 or PRN > 32)
if (PRN_ < 1 or PRN_ > 32)
{
DLOG(INFO) << "This PRN is not defined";
PRN = 0;
@@ -157,7 +157,7 @@ void Gnss_Satellite::set_PRN(unsigned int PRN_)
}
else if (system.compare("Glonass") == 0)
{
if (PRN_ < 1 or PRN > 24)
if (PRN_ < 1 or PRN_ > 24)
{
DLOG(INFO) << "This PRN is not defined";
PRN = 0;
@@ -181,29 +181,17 @@ void Gnss_Satellite::set_PRN(unsigned int PRN_)
}
}
else if (system.compare("Galileo") == 0)
{
if (PRN_ < 1 or PRN_ > 36)
{
if (PRN_ == 11)
{
PRN = 11;
}
else if (PRN_ == 12)
{
PRN = 12;
}
else if (PRN_ == 19)
{
PRN = 19;
}
else if (PRN_ == 20)
{
PRN = 20;
}
else
{
DLOG(INFO) << "This PRN is not defined";
PRN = 0;
}
DLOG(INFO) << "This PRN is not defined";
PRN = 0;
}
else
{
PRN = PRN_;
}
}
else
{
DLOG(INFO) << "System " << system << " is not defined";
@@ -517,7 +505,7 @@ void Gnss_Satellite::set_block(std::string system_, unsigned int PRN_ )
block = std::string("IOV"); // Galileo In-Orbit Validation (IOV) satellite FM4 (Flight Model 4)
break;
default:
block = std::string("Unknown");
block = std::string("Unknown(Simulated)");
}
}
}