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

Make Galileo E1 message decoding less verbose in terminal

Browse Source
This commit is contained in:
Carles Fernandez 2019-02-28 18:20:33 +01:00
parent 92d20d0842
commit b1c6e1d91f
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/system_parameters/galileo_navigation_message.cc
View File

@ -343,18 +343,11 @@ bool Galileo_Navigation_Message::read_navigation_bool(std::bitset<GALILEO_DATA_J
void Galileo_Navigation_Message::split_page(std::string page_string, int32_t flag_even_word)
{
// ToDo: Clean all the tests and create an independent google test code for the telemetry decoder.
//char correct_tail[7]="011110"; //the viterbi decoder output change the tail to this value (why?)
//char correct_tail[7]="000000";
int32_t Page_type = 0;
// std::cout << "Start decoding Galileo I/NAV " << std::endl;
if (page_string.at(0) == '1') // if page is odd
{
// std::cout<< "page_string.at(0) split page="<<page_string.at(0) << std::endl;
const std::string& page_Odd = page_string;
// std::cout<<"Page odd string in split page"<< std::endl << page_Odd << std::endl;
if (flag_even_word == 1) // An odd page has been received but the previous even page is kept in memory and it is considered to join pages
{
@ -364,10 +357,6 @@ void Galileo_Navigation_Message::split_page(std::string page_string, int32_t fla
std::string Page_type_even = page_INAV.substr(1, 1);
std::string nominal = "0";
//if (Page_type_even.compare(nominal) != 0)
// std::cout << "Alert frame "<< std::endl;
//else std::cout << "Nominal Page" << std::endl;
std::string Data_k = page_INAV.substr(2, 112);
std::string Odd_bit = page_INAV.substr(114, 1);
std::string Page_type_Odd = page_INAV.substr(115, 1);
@ -388,10 +377,6 @@ void Galileo_Navigation_Message::split_page(std::string page_string, int32_t fla
std::bitset<GALILEO_DATA_FRAME_BITS> TLM_word_for_CRC_bits(TLM_word_for_CRC);
std::bitset<24> checksum(CRC_data);
//if (Tail_odd.compare(correct_tail) != 0)
// std::cout << "Tail odd is not correct!" << std::endl;
//else std::cout<<"Tail odd is correct!"<<std::endl;
if (CRC_test(TLM_word_for_CRC_bits, checksum.to_ulong()) == true)
{
flag_CRC_test = true;
@ -414,10 +399,6 @@ void Galileo_Navigation_Message::split_page(std::string page_string, int32_t fla
{
page_Even = page_string.substr(0, 114);
std::string tail_Even = page_string.substr(114, 6);
//std::cout << "tail_even_string: " << tail_Even <<std::endl;
//if (tail_Even.compare(correct_tail) != 0)
// std::cout << "Tail even is not correct!" << std::endl;
//else std::cout<<"Tail even is correct!"<< std::endl;
}
}
@ -429,14 +410,14 @@ bool Galileo_Navigation_Message::have_new_ephemeris() // Check if we have a new
// if all ephemeris pages have the same IOD, then they belong to the same block
if ((IOD_nav_1 == IOD_nav_2) and (IOD_nav_3 == IOD_nav_4) and (IOD_nav_1 == IOD_nav_3))
{
std::cout << "Ephemeris (1, 2, 3, 4) have been received and belong to the same batch" << std::endl;
DLOG(INFO) << "Ephemeris (1, 2, 3, 4) have been received and belong to the same batch";
flag_ephemeris_1 = false; // clear the flag
flag_ephemeris_2 = false; // clear the flag
flag_ephemeris_3 = false; // clear the flag
flag_ephemeris_4 = false; // clear the flag
flag_all_ephemeris = true;
IOD_ephemeris = IOD_nav_1;
std::cout << "Batch number: " << IOD_ephemeris << std::endl;
DLOG(INFO) << "Batch number: " << IOD_ephemeris;
return true;
}
}