mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-03-03 18:25:23 +00:00
Code Issues Releases Wiki Activity

[TAS-226] [FEAT] Remove tags skipped ≥ 10 times

Browse Source
This commit is contained in:
cesaaargm 2024-06-22 14:04:08 +02:00
parent c8c7d4c352
commit f1e616c4e5
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/core/libs/osnma_msg_receiver.cc
View File

@ -109,8 +109,6 @@ void osnma_msg_receiver::msg_handler_osnma(const pmt::pmt_t& msg)
std::cout << output_message.str() << std::endl; std::cout << output_message.str() << std::endl;
process_osnma_message(nma_msg); process_osnma_message(nma_msg);
std::cout << "Galileo OSNMA: d_tags_awaiting_verify :: size: " << d_tags_awaiting_verify.size() << std::endl;
} }
else if (msg_type_hash_code == typeid(std::shared_ptr<std::tuple<uint32_t, std::string, uint32_t>>).hash_code()) else if (msg_type_hash_code == typeid(std::shared_ptr<std::tuple<uint32_t, std::string, uint32_t>>).hash_code())
{ {
@ -915,6 +913,7 @@ void osnma_msg_receiver::process_mack_message()
d_tags_awaiting_verify.insert(std::pair(mack->TOW, t)); d_tags_awaiting_verify.insert(std::pair(mack->TOW, t));
LOG(WARNING) << "Galileo OSNMA: MACSEQ verification :: SUCCESS for Mack at TOW=" << mack->TOW << ", PRN" << mack->PRNa; LOG(WARNING) << "Galileo OSNMA: MACSEQ verification :: SUCCESS for Mack at TOW=" << mack->TOW << ", PRN" << mack->PRNa;
} }
std::cout << "Galileo OSNMA: d_tags_awaiting_verify :: size: " << d_tags_awaiting_verify.size() << std::endl;
mack = d_macks_awaiting_MACSEQ_verification.erase(mack); mack = d_macks_awaiting_MACSEQ_verification.erase(mack);
} }
else else
@ -980,7 +979,8 @@ void osnma_msg_receiver::process_mack_message()
} }
} }
else { else {
LOG(WARNING) << "Galileo OSNMA: Tag verification :: SKIPPED for Tag Id= " it.second.skipped ++;
LOG(WARNING) << "Galileo OSNMA: Tag verification :: SKIPPED (x"<< it.second.skipped <<")for Tag Id= "
<< it.second.tag_id << it.second.tag_id
<< ", value=0x" << std::setfill('0') << std::setw(10) << std::hex << std::uppercase << ", value=0x" << std::setfill('0') << std::setw(10) << std::hex << std::uppercase
<< it.second.received_tag << std::dec << it.second.received_tag << std::dec
@ -1286,6 +1286,25 @@ void osnma_msg_receiver::remove_verified_tags()
<< std::endl; << std::endl;
it = d_tags_awaiting_verify.erase(it); it = d_tags_awaiting_verify.erase(it);
} }
else if (it->second.skipped >= 10)
{
LOG(INFO) << "Galileo OSNMA: Tag verification :: DELETE tag Id="
<< it->second.tag_id
<< ", value=0x" << std::setfill('0') << std::setw(10) << std::hex << std::uppercase
<< it->second.received_tag << std::dec
<< ", TOW="
<< it->second.TOW
<< ", ADKD="
<< static_cast<unsigned>(it->second.ADKD)
<< ", PRNa="
<< static_cast<unsigned>(it->second.PRNa)
<< ", PRNd="
<< static_cast<unsigned>(it->second.PRN_d)
<< ", status= "
<< it->second.status
<< std::endl;
it = d_tags_awaiting_verify.erase(it);
}
else else
++it; ++it;
} }

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

@ -182,8 +182,8 @@ public:
computed_tag(0), computed_tag(0),
PRN_d(MTI.tag_info.PRN_d), PRN_d(MTI.tag_info.PRN_d),
ADKD(MTI.tag_info.ADKD), ADKD(MTI.tag_info.ADKD),
cop(MTI.tag_info.cop) cop(MTI.tag_info.cop),
skipped(0)
{ {
} }
@ -201,6 +201,7 @@ public:
uint8_t PRN_d; uint8_t PRN_d;
uint8_t ADKD; uint8_t ADKD;
uint8_t cop; uint8_t cop;
uint32_t skipped;
}; };
/** \} */ /** \} */
/** \} */ /** \} */