mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-07-08 04:52:55 +00:00
Code Issues Releases Wiki Activity

Revert "[TAS-111] time synch check: first draft"

Browse Source 
This reverts commit 50fbc3e9
This commit is contained in:
cesaaargm 2024-02-27 21:13:23 +01:00
parent 35cfbd7f05
commit aca6c21944
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,7 +22,6 @@
#include "gnss_crypto.h" #include "gnss_crypto.h"
#include "gnss_satellite.h" #include "gnss_satellite.h"
#include "osnma_dsm_reader.h" // for OSNMA_DSM_Reader #include "osnma_dsm_reader.h" // for OSNMA_DSM_Reader
#include "pvt_interface.h"
#include <glog/logging.h> // for DLOG #include <glog/logging.h> // for DLOG
#include <gnuradio/io_signature.h> // for gr::io_signature::make #include <gnuradio/io_signature.h> // for gr::io_signature::make
#include <cmath> #include <cmath>
@ -63,6 +62,9 @@ osnma_msg_receiver::osnma_msg_receiver(
d_old_mack_message.set_capacity(10); d_old_mack_message.set_capacity(10);
// register OSNMA input message port from telemetry blocks // register OSNMA input message port from telemetry blocks
this->message_port_register_in(pmt::mp("OSNMA_from_TLM")); this->message_port_register_in(pmt::mp("OSNMA_from_TLM"));
// register OSNMA output message port to PVT block
this->message_port_register_out(pmt::mp("OSNMA_to_PVT"));
this->set_msg_handler(pmt::mp("OSNMA_from_TLM"), this->set_msg_handler(pmt::mp("OSNMA_from_TLM"),
#if HAS_GENERIC_LAMBDA #if HAS_GENERIC_LAMBDA
[this](auto&& PH1) { msg_handler_osnma(PH1); }); [this](auto&& PH1) { msg_handler_osnma(PH1); });
@ -73,33 +75,9 @@ osnma_msg_receiver::osnma_msg_receiver(
boost::bind(&osnma_msg_receiver::msg_handler_osnma, this, _1)); boost::bind(&osnma_msg_receiver::msg_handler_osnma, this, _1));
#endif #endif
#endif #endif
// register OSNMA input message port from PVT block
this->message_port_register_in(pmt::mp("pvt_to_osnma"));
this->set_msg_handler(pmt::mp("pvt_to_osnma"),
#if HAS_GENERIC_LAMBDA
[this](auto&& PH1) { msg_handler_pvt_to_osnma(PH1); });
#else
#if USE_BOOST_BIND_PLACEHOLDERS
boost::bind(&osnma_msg_receiver::msg_handler_pvt_to_osnma, this, boost::placeholders::_1));
#else
boost::bind(&osnma_msg_receiver::msg_handler_pvt_to_osnma, this, _1));
#endif
#endif
// register OSNMA output message port to PVT block
this->message_port_register_out(pmt::mp("OSNMA_to_PVT"));
} }
void osnma_msg_receiver::msg_handler_pvt_to_osnma(const pmt::pmt_t& msg)
{
try
{
d_receiver_time = wht::any_cast<std::time_t>(pmt::any_ref(msg)); // C: TODO - check if this is the correct way to get the time from the PVT block
}
catch (const pmt::exception& e)
{
LOG(WARNING) << "osnma_msg_receiver pmt exception: " << e.what();
}
}
void osnma_msg_receiver::msg_handler_osnma(const pmt::pmt_t& msg) void osnma_msg_receiver::msg_handler_osnma(const pmt::pmt_t& msg)
{ {
// requires mutex with msg_handler_osnma function called by the scheduler // requires mutex with msg_handler_osnma function called by the scheduler
@ -135,6 +113,7 @@ void osnma_msg_receiver::msg_handler_osnma(const pmt::pmt_t& msg)
// } // }
// } // }
process_osnma_message(nma_msg);
} }
else else
{ {

1
src/core/libs/osnma_msg_receiver.h
View File

@ -60,7 +60,6 @@ private:
osnma_msg_receiver(const std::string& pemFilePath, const std::string& merkleFilePath); osnma_msg_receiver(const std::string& pemFilePath, const std::string& merkleFilePath);
void msg_handler_osnma(const pmt::pmt_t& msg); void msg_handler_osnma(const pmt::pmt_t& msg);
void msg_handler_pvt_to_osnma(const pmt::pmt_t& msg);
void process_osnma_message(const std::shared_ptr<OSNMA_msg>& osnma_msg); void process_osnma_message(const std::shared_ptr<OSNMA_msg>& osnma_msg);
void read_nma_header(uint8_t nma_header); void read_nma_header(uint8_t nma_header);
void read_dsm_header(uint8_t dsm_header); void read_dsm_header(uint8_t dsm_header);