mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-07-07 20:42:56 +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

5
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
@ -626,16 +627,14 @@ void galileo_telemetry_decoder_gs::decode_INAV_word(float *page_part_symbols, in
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));
} }
} }

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.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