diff --git a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc index 156194544..e83bfb05c 100644 --- a/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc +++ b/src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc @@ -452,7 +452,9 @@ void galileo_telemetry_decoder_gs::decode_INAV_word(float *page_part_symbols, in d_inav_nav.get_osnma_adkd_0_12_nav_bits(), d_inav_nav.get_TOW5() - 25); this->message_port_pub(pmt::mp("OSNMA_from_TLM"), pmt::make_any(tmp_obj_osnma)); - DLOG(INFO) << "|---> Galileo OSNMA :: Sending Telemetry Decoder NavData (PRN_d=" << static_cast(d_satellite.get_PRN()) << ", TOW=" << static_cast(d_inav_nav.get_TOW5() - 25) << ")"; //: 0b" << d_inav_nav.get_osnma_adkd_0_12_nav_bits(); + DLOG(INFO) << "|---> Galileo OSNMA :: Sending Telemetry Decoder NavData (PRN_d=" + << static_cast(d_satellite.get_PRN()) + << ", TOW=" << static_cast(d_inav_nav.get_TOW5() - 25) << ")"; //: 0b" << d_inav_nav.get_osnma_adkd_0_12_nav_bits(); d_inav_nav.reset_osnma_nav_bits_adkd0_12(); } @@ -465,7 +467,9 @@ void galileo_telemetry_decoder_gs::decode_INAV_word(float *page_part_symbols, in d_inav_nav.get_osnma_adkd_4_nav_bits(), d_inav_nav.get_TOW6() - 5); this->message_port_pub(pmt::mp("OSNMA_from_TLM"), pmt::make_any(tmp_obj)); - DLOG(INFO) << "|---> Galileo OSNMA :: Sending Telemetry Decoder NavData (PRN_d=" << static_cast(d_satellite.get_PRN()) << ", TOW=" << static_cast(d_inav_nav.get_TOW6() - 5) << ")"; //: 0b" << d_inav_nav.get_osnma_adkd_4_nav_bits(); + DLOG(INFO) << "|---> Galileo OSNMA :: Sending Telemetry Decoder NavData (PRN_d=" + << static_cast(d_satellite.get_PRN()) + << ", TOW=" << static_cast(d_inav_nav.get_TOW6() - 5) << ")"; //: 0b" << d_inav_nav.get_osnma_adkd_4_nav_bits(); d_inav_nav.reset_osnma_nav_bits_adkd4(); } diff --git a/src/core/system_parameters/galileo_inav_message.cc b/src/core/system_parameters/galileo_inav_message.cc index c5ddcbfaa..ab62b684c 100644 --- a/src/core/system_parameters/galileo_inav_message.cc +++ b/src/core/system_parameters/galileo_inav_message.cc @@ -380,10 +380,6 @@ bool Galileo_Inav_Message::have_new_utc_model() // Check if we have a new utc d // flag_almanac_4 tells if W10 available. bool Galileo_Inav_Message::have_new_almanac() // Check if we have a new almanac data set stored in the galileo navigation class { - // if(flag_almanac_4) - // { - // flag_adkd_4_complete = true; - // } if ((flag_almanac_1 == true) and (flag_almanac_2 == true) and (flag_almanac_3 == true) and (flag_almanac_4 == true)) { // All Almanac data have been received @@ -1451,7 +1447,6 @@ bool Galileo_Inav_Message::have_new_nma() std::string Galileo_Inav_Message::get_osnma_adkd_4_nav_bits() { nav_bits_adkd_4 = nav_bits_word_6 + nav_bits_word_10; - return nav_bits_adkd_4; } diff --git a/src/core/system_parameters/galileo_inav_message.h b/src/core/system_parameters/galileo_inav_message.h index 2ecb8aa53..820478c77 100644 --- a/src/core/system_parameters/galileo_inav_message.h +++ b/src/core/system_parameters/galileo_inav_message.h @@ -141,15 +141,21 @@ public: * @brief Retrieves the OSNMA ADKD 4 NAV bits. Resets the string. */ std::string get_osnma_adkd_4_nav_bits(); + + /* + * @brief Resets the OSNMA ADKD 4 NAV bits. + */ void reset_osnma_nav_bits_adkd4(); - bool flag_adkd_4_complete{false}; /* * @brief Retrieves the OSNMA ADKD 0/12 NAV bits. Resets the string. */ std::string get_osnma_adkd_0_12_nav_bits(); + + /* + * @brief Resets the OSNMA ADKD 0/12 NAV bits. + */ void reset_osnma_nav_bits_adkd0_12(); - bool flag_adkd_0_12_complete{false}; inline bool get_flag_CRC_test() const { diff --git a/src/core/system_parameters/gnss_crypto.cc b/src/core/system_parameters/gnss_crypto.cc index 9ff183ed3..fa47720b1 100644 --- a/src/core/system_parameters/gnss_crypto.cc +++ b/src/core/system_parameters/gnss_crypto.cc @@ -225,7 +225,7 @@ bool Gnss_Crypto::verify_signature_ecdsa_p256(const std::vector& messag success = (ret >= 0); if (success) { - LOG(INFO) << "GnuTLS: OSNMA signature authenticated successfully"; + DLOG(INFO) << "GnuTLS: OSNMA signature authenticated successfully"; } else { @@ -301,7 +301,7 @@ bool Gnss_Crypto::verify_signature_ecdsa_p256(const std::vector& messag if (verification == 1) { success = true; - LOG(INFO) << "OpenSSL: OSNMA signature authenticated successfully"; + DLOG(INFO) << "OpenSSL: OSNMA signature authenticated successfully"; } else { @@ -320,7 +320,7 @@ bool Gnss_Crypto::verify_signature_ecdsa_p256(const std::vector& messag if (verification == 1) { success = true; - LOG(INFO) << "OpenSSL: OSNMA signature authenticated successfully"; + DLOG(INFO) << "OpenSSL: OSNMA signature authenticated successfully"; } else if (verification == 0) { @@ -379,7 +379,7 @@ bool Gnss_Crypto::verify_signature_ecdsa_p521(const std::vector& messag if (ret >= 0) { - LOG(INFO) << "GnuTLS: OSNMA signature authenticated successfully"; + DLOG(INFO) << "GnuTLS: OSNMA signature authenticated successfully"; success = true; } else @@ -428,7 +428,7 @@ bool Gnss_Crypto::verify_signature_ecdsa_p521(const std::vector& messag if (verification == 1) { - LOG(INFO) << "OpenSSL: OSNMA signature authenticated successfully"; + DLOG(INFO) << "OpenSSL: OSNMA signature authenticated successfully"; success = true; } else if (verification == 0) @@ -451,7 +451,7 @@ bool Gnss_Crypto::verify_signature_ecdsa_p521(const std::vector& messag ECDSA_SIG_free(ecdsa_sig); if (verification == 1) { - LOG(INFO) << "OpenSSL: OSNMA signature authenticated successfully"; + DLOG(INFO) << "OpenSSL: OSNMA signature authenticated successfully"; success = true; } else if (verification == 0) @@ -896,7 +896,7 @@ void Gnss_Crypto::set_public_key(const std::vector& publicKey) #endif // OpenSSL 1.x EVP_PKEY_free(pkey); #endif - LOG(INFO) << "OSNMA Public Key successfully set up."; + DLOG(INFO) << "OSNMA Public Key successfully set up."; }