mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-07-07 12:32:57 +00:00
Code Issues Releases Wiki Activity

Fix formatting

Browse Source
This commit is contained in:
Carles Fernandez 2024-07-23 16:51:59 +02:00
parent 39f94dcbe6
commit 49eb854b16
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
7 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Modules/GnssSdrCrypto.cmake
View File

@ -127,7 +127,7 @@ else()
set(GNUTLS_HMAC_INIT_WITH_DIGEST TRUE) set(GNUTLS_HMAC_INIT_WITH_DIGEST TRUE)
endif() endif()
if("${gnutls_gnutls_file_contents}" MATCHES "GNUTLS_MAC_AES_CMAC_128") if("${gnutls_gnutls_file_contents}" MATCHES "GNUTLS_MAC_AES_CMAC_128")
set(GNUTLS_MAC_AES_CMAC_128 TRUE) set(GNUTLS_MAC_AES_CMAC_128 TRUE)
endif() endif()
file(READ "${GNUTLS_INCLUDE_DIR}/gnutls/abstract.h" gnutls_abstract_file_contents) file(READ "${GNUTLS_INCLUDE_DIR}/gnutls/abstract.h" gnutls_abstract_file_contents)
if("${gnutls_abstract_file_contents}" MATCHES "gnutls_pubkey_export2") if("${gnutls_abstract_file_contents}" MATCHES "gnutls_pubkey_export2")

17
src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc
View File

@ -45,6 +45,7 @@
#include <limits> // for std::numeric_limits #include <limits> // for std::numeric_limits
#include <map> // for std::map #include <map> // for std::map
#include <stdexcept> // for std::out_of_range #include <stdexcept> // for std::out_of_range
#include <tuple> // for std::tuple
#include <typeinfo> // for typeid #include <typeinfo> // for typeid
#include <utility> // for std::pair #include <utility> // for std::pair
@ -468,7 +469,7 @@ void galileo_telemetry_decoder_gs::decode_INAV_word(float *page_part_symbols, in
d_inav_nav.reset_osnma_nav_bits_adkd4(); d_inav_nav.reset_osnma_nav_bits_adkd4();
} }
if (d_inav_nav.have_new_ephemeris() == true) // C: tells if W1-->W4 available from same blcok (and W5!) if (d_inav_nav.have_new_ephemeris() == true) // C: tells if W1-->W4 available from same blcok (and W5!)
{ {
// get object for this SV (mandatory) // get object for this SV (mandatory)
const std::shared_ptr<Galileo_Ephemeris> tmp_obj = std::make_shared<Galileo_Ephemeris>(d_inav_nav.get_ephemeris()); const std::shared_ptr<Galileo_Ephemeris> tmp_obj = std::make_shared<Galileo_Ephemeris>(d_inav_nav.get_ephemeris());
@ -503,7 +504,7 @@ void galileo_telemetry_decoder_gs::decode_INAV_word(float *page_part_symbols, in
else else
{ {
// If we still do not have ephemeris, check if we have a reduced CED // If we still do not have ephemeris, check if we have a reduced CED
if ((d_band == '1') && d_use_ced && !d_first_eph_sent && (d_inav_nav.have_new_reduced_ced() == true)) // C: W16 has some Eph. params, uneeded for OSNMa I guess if ((d_band == '1') && d_use_ced && !d_first_eph_sent && (d_inav_nav.have_new_reduced_ced() == true)) // C: W16 has some Eph. params, uneeded for OSNMa I guess
{ {
const std::shared_ptr<Galileo_Ephemeris> tmp_obj = std::make_shared<Galileo_Ephemeris>(d_inav_nav.get_reduced_ced()); const std::shared_ptr<Galileo_Ephemeris> tmp_obj = std::make_shared<Galileo_Ephemeris>(d_inav_nav.get_reduced_ced());
this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj)); this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj));
@ -519,7 +520,7 @@ void galileo_telemetry_decoder_gs::decode_INAV_word(float *page_part_symbols, in
} }
} }
if (d_inav_nav.have_new_iono_and_GST() == true) // C: W5 if (d_inav_nav.have_new_iono_and_GST() == true) // C: W5
{ {
// get object for this SV (mandatory) // get object for this SV (mandatory)
const std::shared_ptr<Galileo_Iono> tmp_obj = std::make_shared<Galileo_Iono>(d_inav_nav.get_iono()); const std::shared_ptr<Galileo_Iono> tmp_obj = std::make_shared<Galileo_Iono>(d_inav_nav.get_iono());
@ -550,7 +551,7 @@ void galileo_telemetry_decoder_gs::decode_INAV_word(float *page_part_symbols, in
} }
} }
if (d_inav_nav.have_new_utc_model() == true) // C: tells if W6 is available if (d_inav_nav.have_new_utc_model() == true) // C: tells if W6 is available
{ {
// get object for this SV (mandatory) // get object for this SV (mandatory)
const std::shared_ptr<Galileo_Utc_Model> tmp_obj = std::make_shared<Galileo_Utc_Model>(d_inav_nav.get_utc_model()); const std::shared_ptr<Galileo_Utc_Model> tmp_obj = std::make_shared<Galileo_Utc_Model>(d_inav_nav.get_utc_model());
@ -587,7 +588,7 @@ void galileo_telemetry_decoder_gs::decode_INAV_word(float *page_part_symbols, in
flag_osnma_adkd_4_utc = true; flag_osnma_adkd_4_utc = true;
} }
if (d_inav_nav.have_new_almanac() == true) // flag_almanac_4 tells if W10 available. if (d_inav_nav.have_new_almanac() == true) // flag_almanac_4 tells if W10 available.
{ {
const std::shared_ptr<Galileo_Almanac_Helper> tmp_obj = std::make_shared<Galileo_Almanac_Helper>(d_inav_nav.get_almanac()); const std::shared_ptr<Galileo_Almanac_Helper> tmp_obj = std::make_shared<Galileo_Almanac_Helper>(d_inav_nav.get_almanac());
this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj)); this->message_port_pub(pmt::mp("telemetry"), pmt::make_any(tmp_obj));
@ -623,19 +624,17 @@ void galileo_telemetry_decoder_gs::decode_INAV_word(float *page_part_symbols, in
} }
// get osnma message if the needed nav data is available // get osnma message if the needed nav data is available
bool adkd_4_nav_data_available = flag_osnma_adkd_4_utc && flag_osnma_adkd_4_gst; // supposition: data did not change bt. flags reset and now. bool adkd_4_nav_data_available = flag_osnma_adkd_4_utc && flag_osnma_adkd_4_gst; // supposition: data did not change bt. flags reset and now.
// bool adkd_4_nav_data_available = d_inav_nav.get_osnma_adkd_4_nav_bits().size() == 141; // newApproach: let decoder decide when block starts and let it fill the data, and just check for length // bool adkd_4_nav_data_available = d_inav_nav.get_osnma_adkd_4_nav_bits().size() == 141; // newApproach: let decoder decide when block starts and let it fill the data, and just check for length
if(adkd_4_nav_data_available /*&& d_inav_nav.is_TOW5_set() not needed cause W6 has TOW also.*/) if (adkd_4_nav_data_available /*&& d_inav_nav.is_TOW5_set() not needed cause W6 has TOW also.*/)
{ {
} }
auto newOSNMA = d_inav_nav.have_new_nma(); auto newOSNMA = d_inav_nav.have_new_nma();
if (d_band == '1' && newOSNMA) if (d_band == '1' && newOSNMA)
{ {
const std::shared_ptr<OSNMA_msg> tmp_obj = std::make_shared<OSNMA_msg>(d_inav_nav.get_osnma_msg()); const std::shared_ptr<OSNMA_msg> tmp_obj = std::make_shared<OSNMA_msg>(d_inav_nav.get_osnma_msg());
this->message_port_pub(pmt::mp("OSNMA_from_TLM"), pmt::make_any(tmp_obj)); this->message_port_pub(pmt::mp("OSNMA_from_TLM"), pmt::make_any(tmp_obj));
} }
} }

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

@ -96,8 +96,8 @@ private:
std::vector<MACK_tag_and_info> verify_macseq_new(const MACK_message& mack); std::vector<MACK_tag_and_info> verify_macseq_new(const MACK_message& mack);
std::map<uint32_t, std::map<uint32_t, OSNMA_NavData>> d_satellite_nav_data; // map holding OSNMA_NavData sorted by SVID (first key) and TOW (second key). std::map<uint32_t, std::map<uint32_t, OSNMA_NavData>> d_satellite_nav_data; // map holding OSNMA_NavData sorted by SVID (first key) and TOW (second key).
std::map<uint32_t, std::vector<uint8_t>> d_tesla_keys; // tesla keys over time, sorted by TOW std::map<uint32_t, std::vector<uint8_t>> d_tesla_keys; // tesla keys over time, sorted by TOW
std::multimap<uint32_t, Tag> d_tags_awaiting_verify; // container with tags to verify from arbitrary SVIDs, sorted by TOW std::multimap<uint32_t, Tag> d_tags_awaiting_verify; // container with tags to verify from arbitrary SVIDs, sorted by TOW
std::vector<uint8_t> d_tags_to_verify{0, 4, 12}; std::vector<uint8_t> d_tags_to_verify{0, 4, 12};
std::vector<MACK_message> d_macks_awaiting_MACSEQ_verification; std::vector<MACK_message> d_macks_awaiting_MACSEQ_verification;

3
src/core/system_parameters/Galileo_OSNMA.h
View File

@ -193,8 +193,7 @@ const std::unordered_map<uint8_t, Mack_lookup> OSNMA_TABLE_16 = {
{38, {2, 5, {"00S", "FLX", "04S", "FLX", "12S"}, {"00S", "FLX", "FLX", "12S", "FLX"}}}, {38, {2, 5, {"00S", "FLX", "04S", "FLX", "12S"}, {"00S", "FLX", "FLX", "12S", "FLX"}}},
{39, {2, 4, {"00S", "FLX", "04S", "FLX"}, {"00S", "FLX", "00E", "12S"}}}, {39, {2, 4, {"00S", "FLX", "04S", "FLX"}, {"00S", "FLX", "00E", "12S"}}},
{40, {2, 4, {"00S", "00E", "04S", "12S"}, {"00S", "00E", "00E", "12E"}}}, {40, {2, 4, {"00S", "00E", "04S", "12S"}, {"00S", "00E", "00E", "12E"}}},
{41, {2, 4, {"00S", "FLX", "04S", "FLX"}, {"00S", "FLX", "FLX", "12S"}}} {41, {2, 4, {"00S", "FLX", "04S", "FLX"}, {"00S", "FLX", "FLX", "12S"}}}};
};
/** \} */ /** \} */
/** \} */ /** \} */

2
src/core/system_parameters/osnma_data.cc
View File

@ -39,7 +39,7 @@ std::string OSNMA_NavData::get_utc_data() const
uint32_t OSNMA_NavData::get_tow_sf0() const uint32_t OSNMA_NavData::get_tow_sf0() const
{ {
return d_TOW_sf0; return d_TOW_sf0;
} }

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

@ -182,7 +182,7 @@ public:
skipped(0) skipped(0)
{ {
} }
Tag(const MACK_message& mack) // constructor for Tag0 explicit Tag(const MACK_message& mack) // constructor for Tag0
: tag_id(id_counter++), : tag_id(id_counter++),
TOW(mack.TOW), // TODO missing for build_message WN for GST computation, CTR, NMAS, OSNMA_NavData missing TOW(mack.TOW), // TODO missing for build_message WN for GST computation, CTR, NMAS, OSNMA_NavData missing
WN(mack.WN), WN(mack.WN),

28
src/core/system_parameters/osnma_helper.h
View File

@ -1,18 +1,18 @@
/*! /*!
* \file osnma_helper.h * \file osnma_helper.h
* \brief Class for auxiliary osnma functions * \brief Class for auxiliary osnma functions
* \author Carles Fernandez-Prades, 2024 cfernandez(at)cttc.es * \author Carles Fernandez-Prades, 2024 cfernandez(at)cttc.es
* *
* ----------------------------------------------------------------------------- * -----------------------------------------------------------------------------
* *
* GNSS-SDR is a Global Navigation Satellite System software-defined receiver. * GNSS-SDR is a Global Navigation Satellite System software-defined receiver.
* This file is part of GNSS-SDR. * This file is part of GNSS-SDR.
* *
* Copyright (C) 2010-2023 (see AUTHORS file for a list of contributors) * Copyright (C) 2010-2023 (see AUTHORS file for a list of contributors)
* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-License-Identifier: GPL-3.0-or-later
* *
* ----------------------------------------------------------------------------- * -----------------------------------------------------------------------------
*/ */
#ifndef GNSS_SDR_OSNMA_HELPER_H #ifndef GNSS_SDR_OSNMA_HELPER_H
#define GNSS_SDR_OSNMA_HELPER_H #define GNSS_SDR_OSNMA_HELPER_H