mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-04-28 05:33:20 +00:00
Code Issues Releases Wiki Activity

[TAS-221] [BUG] FLX tag verification fails for recorded signals but succeeds for configuration_2 (otv)

Browse Source 
Implemented changes to ensure accurate computation of the d_GST_Sf in message receiver. Checked test is not affected by this. Logging improvements have been made.
This commit is contained in:
cesaaargm 2024-06-11 18:33:58 +02:00
parent 8de00f92bf
commit ed32e84402
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,15 +91,19 @@ void osnma_msg_receiver::msg_handler_osnma(const pmt::pmt_t& msg)
{
const auto nma_msg = wht::any_cast<std::shared_ptr<OSNMA_msg>>(pmt::any_ref(msg));
const auto sat = Gnss_Satellite(std::string("Galileo"), nma_msg->PRN);
LOG(WARNING) << "Galileo OSNMA: Subframe received starting at "
<< "WN="
<< nma_msg->WN_sf0
<< ", TOW="
<< nma_msg->TOW_sf0
<< ", from satellite "
<< sat;
process_osnma_message(nma_msg);
std::ostringstream output_message;
output_message << "Galileo OSNMA: Subframe received starting at "
<< "WN="
<< nma_msg->WN_sf0
<< ", TOW="
<< nma_msg->TOW_sf0
<< ", from satellite "
<< sat;
LOG(WARNING) << output_message.str();
std::cout << output_message.str() << std::endl;
process_osnma_message(nma_msg);
}
else
@ -1079,6 +1083,7 @@ std::vector<uint8_t> osnma_msg_receiver::build_message(const Tag& tag)
if(tag.CTR != 1)
m.push_back(static_cast<uint8_t>(tag.PRN_d));
m.push_back(static_cast<uint8_t>(tag.PRNa));
// TODO: maybe here I have to use d_receiver_time instead of d_GST_SIS which is what I am computing
uint32_t GST = d_helper->compute_gst( tag.WN,tag.TOW);
std::vector<uint8_t> GST_uint8 = d_helper->gst_to_uint8(GST);
m.insert(m.end(),GST_uint8.begin(),GST_uint8.end());
@ -1091,7 +1096,7 @@ std::vector<uint8_t> osnma_msg_receiver::build_message(const Tag& tag)
// Add applicable NavData bits to message
std::string applicable_nav_data;
std::vector<uint8_t> applicable_nav_data_bytes;
if (tag.ADKD == 0 || tag.ADKD == 12)
if (tag.ADKD == 0 || tag.ADKD == 12) // note: for ADKD=12 still the same logic applies. Only the Key selection is shifted 10 Subframes into the future.
{
applicable_nav_data = d_satellite_nav_data[tag.PRN_d][tag.TOW - 30].ephemeris_iono_vector_2;
}
@ -1100,7 +1105,7 @@ std::vector<uint8_t> osnma_msg_receiver::build_message(const Tag& tag)
applicable_nav_data = d_satellite_nav_data[tag.PRN_d][tag.TOW - 30].utc_vector_2;
}
else
std::cerr<<"Galileo OSNMA :: Tag verification :: unknown ADKD" <<"\n";
LOG(ERROR) <<"Galileo OSNMA :: Tag verification :: unknown ADKD" <<"\n";
// convert std::string to vector<uint8_t>
applicable_nav_data_bytes = d_helper->bytes(applicable_nav_data);
@ -1255,7 +1260,7 @@ void osnma_msg_receiver::control_tags_awaiting_verify_size()
bool osnma_msg_receiver::verify_macseq(const MACK_message& mack)
{
// MACSEQ verification
d_GST_Sf = d_GST_SIS - 30; // time of the start of SF containing MACSEQ // TODO buffer with times? since out of debug not every 30 s a Sf is necessarily received..
d_GST_Sf = d_receiver_time - 30; // time of the start of SF containing MACSEQ // TODO buffer with times? since out of debug not every 30 s a Sf is necessarily received..
std::vector<uint8_t> applicable_key = d_tesla_keys[mack.TOW + 30]; // current tesla key ie transmitted in the next subframe
std::vector<std::string> sq1{};
std::vector<std::string> sq2{};

10
src/core/system_parameters/osnma_helper.cc
View File

@ -34,6 +34,16 @@ std::vector<uint8_t> Osnma_Helper::gst_to_uint8(uint32_t GST) const
return res;
}
/**
* @brief Convert a binary string to a vector of bytes.
*
* This function takes a binary string and converts it into a vector of uint8_t bytes.
* The binary string is padded with zeros if necessary to ensure that the total number
* of bits is a multiple of a byte.
*
* @param binaryString The binary string to be converted.
* @return The vector of bytes converted from the binary string.
*/
std::vector<uint8_t> Osnma_Helper::bytes(const std::string& binaryString) {
std::vector<uint8_t> bytes;

2
src/tests/unit-tests/signal-processing-blocks/osnma/osnma_msg_receiver_test.cc
View File

@ -408,6 +408,8 @@ void OsnmaMsgReceiverTest::set_time(std::tm& input)
this->TOW = time_of_week + LEAP_SECONDS;
// Return the week number and time of week as a pair
// TODO: d_GST_SIS or d_receiver_time? doubt
// I am assuming that local realisation of receiver is identical to SIS GST time coming from W5 or W0
this->d_GST_SIS = (this->WN & 0x00000FFF) << 20 | (this->TOW & 0x000FFFFF);