mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-05-01 03:01:24 +00:00
Code Issues Releases Wiki Activity

Merge branch 'MathieuFavreau-fix-format' into next

Browse Source
This commit is contained in:
Carles Fernandez
2025-12-17 20:27:14 +01:00
parent 330cfae079 6526707351
commit 5c29805ca4
3 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/citation.yml vendored
View File

@@ -24,7 +24,7 @@ jobs:
uses: dieghernan/cff-validator@main
# Upload artifact in case of failure
- name: Update artifact
uses: actions/upload-artifact@v5
uses: actions/upload-artifact@v6
if: failure()
with:
name: citation-cff-errors

12
src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l1_ca_telemetry_decoder_gs.cc
View File

@@ -149,7 +149,7 @@ void glonass_l1_ca_telemetry_decoder_gs::decode_string(const double *frame_symbo
// Convert from bi-binary code to relative code
for (int32_t i = 0; i < (GLONASS_GNAV_STRING_BITS); i++)
{
if (frame_symbols[2 * i] >0 && frame_symbols[2 * i + 1] <=0)
if (frame_symbols[2 * i] > 0 && frame_symbols[2 * i + 1] <= 0)
{
relative_code.push_back('1');
}
@@ -278,7 +278,7 @@ int glonass_l1_ca_telemetry_decoder_gs::general_work(int noutput_items __attribu
const auto **in = reinterpret_cast<const Gnss_Synchro **>(&input_items[0]); // Get the input buffer pointer
Gnss_Synchro current_symbol{}; // structure to save the synchronization information and send the output object to the next block
// 1. Copy the current tracking output
current_symbol = in[0][0];
d_symbol_history.push_back(current_symbol); // add new symbol to the symbol queue
@@ -301,8 +301,7 @@ int glonass_l1_ca_telemetry_decoder_gs::general_work(int noutput_items __attribu
corr_value += d_preambles_bits[i];
}
}
// std::cout<< "Preamble correlation value: " << corr_value << std::endl;
// std::cout<< "Preamble correlation value: " << corr_value << std::endl;
}
// ******* frame sync ******************
@@ -316,9 +315,8 @@ int glonass_l1_ca_telemetry_decoder_gs::general_work(int noutput_items __attribu
// Enter into frame pre-detection status
d_stat = 1;
d_preamble_time_samples = d_symbol_history[0].Tracking_sample_counter; // record the preamble sample stamp
//std::cout<< "Preamble detection for GLONASS L1 C/A SAT " << this->d_satellite;
// std::cout<< "Preamble detection for GLONASS L1 C/A SAT " << this->d_satellite;
}
}
else if (d_stat == 1) // possible preamble lock
{
@@ -343,7 +341,7 @@ int glonass_l1_ca_telemetry_decoder_gs::general_work(int noutput_items __attribu
d_stat = 0; // start again
}
DLOG(INFO) << "Failed string decoder for GLONASS L1 C/A SAT " << this->d_satellite;
//std::cout<< "Failed string decoder for GLONASS L1 C/A SAT " << this->d_satellite<<". Preamble separation: " << preamble_diff << " samples.";
// std::cout<< "Failed string decoder for GLONASS L1 C/A SAT " << this->d_satellite<<". Preamble separation: " << preamble_diff << " samples.";
}
}
}

14
src/core/system_parameters/GLONASS_L1_L2_CA.h
View File

@@ -78,7 +78,7 @@ constexpr double GLONASS_L1_CA_DFREQ_HZ = DFRQ1_GLO; //!< Freq Bias for G
constexpr double GLONASS_L1_CA_CODE_RATE_CPS = 0.511e6; //!< GLONASS L1 C/A code rate [chips/s]
constexpr double GLONASS_L1_CA_CODE_LENGTH_CHIPS = 511.0; //!< GLONASS L1 C/A code length [chips]
constexpr double GLONASS_L1_CA_CODE_PERIOD_S = 0.001; //!< GLONASS L1 C/A code period [seconds]
constexpr double GLONASS_L1_CA_SYMBOL_PERIOD_S = 0.01; //!< GLONASS L1 C/A symbol period [seconds]
constexpr double GLONASS_L1_CA_SYMBOL_PERIOD_S = 0.01; //!< GLONASS L1 C/A symbol period [seconds]
constexpr double GLONASS_L1_CA_CHIP_PERIOD_S = 1.9569e-06; //!< GLONASS L1 C/A chip period [seconds]
constexpr double GLONASS_L1_CA_SYMBOL_RATE_BPS = 1000.0;
@@ -95,7 +95,7 @@ constexpr int32_t GLONASS_L1_CA_HISTORY_DEEP = 100;
1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0}
#define GLONASS_GNAV_PREAMBLE_SAMPLES \
{ \
{ \
1, 1, 1, 1, 1, -1, -1, -1, 1, 1, -1, 1, 1, 1, -1, 1, -1, 1, -1, -1, -1, -1, 1, -1, -1, 1, -1, 1, 1, -1}
constexpr char GLONASS_GNAV_PREAMBLE_STR[301] = "111111111111111111111111111111111111111111111111110000000000000000000000000000001111111111111111111100000000001111111111111111111111111111110000000000111111111100000000001111111111000000000000000000000000000000000000000011111111110000000000000000000011111111110000000000111111111111111111110000000000";
@@ -108,11 +108,11 @@ constexpr int32_t GLONASS_GNAV_TELEMETRY_RATE_BITS_SECOND = 50; //!< NAV messag
constexpr int32_t GLONASS_GNAV_TELEMETRY_SYMBOLS_PER_BIT = 10;
constexpr int32_t GLONASS_GNAV_TELEMETRY_SYMBOLS_PER_PREAMBLE_BIT = 10;
constexpr int32_t GLONASS_GNAV_TELEMETRY_RATE_SYMBOLS_SECOND = GLONASS_GNAV_TELEMETRY_RATE_BITS_SECOND * GLONASS_GNAV_TELEMETRY_SYMBOLS_PER_BIT; //!< NAV message bit rate [symbols/s]
constexpr int32_t GLONASS_GNAV_STRING_SYMBOLS_WITH_PREABLE = 2000;
constexpr int32_t GLONASS_GNAV_STRING_BIBINARY_WITH_PREABLE = 200; //!< Number of bits per string in the GNAV message (85 data bits + 30 time mark bits) [bits]
constexpr int32_t GLONASS_GNAV_STRING_BITS = 85; //!< Number of bits per string in the GNAV message (85 data bits + 30 time mark bits) [bits]
constexpr int32_t GLONASS_GNAV_HAMMING_CODE_BITS = 8; //!< Number of bits in hamming code sequence of GNAV message
constexpr int32_t GLONASS_GNAV_DATA_SYMBOLS = 1700; // STRING DATA WITHOUT PREAMBLE
constexpr int32_t GLONASS_GNAV_STRING_SYMBOLS_WITH_PREABLE = 2000;
constexpr int32_t GLONASS_GNAV_STRING_BIBINARY_WITH_PREABLE = 200; //!< Number of bits per string in the GNAV message (85 data bits + 30 time mark bits) [bits]
constexpr int32_t GLONASS_GNAV_STRING_BITS = 85; //!< Number of bits per string in the GNAV message (85 data bits + 30 time mark bits) [bits]
constexpr int32_t GLONASS_GNAV_HAMMING_CODE_BITS = 8; //!< Number of bits in hamming code sequence of GNAV message
constexpr int32_t GLONASS_GNAV_DATA_SYMBOLS = 1700; // STRING DATA WITHOUT PREAMBLE
/*!
* \brief Record of leap seconds definition for GLOT to GPST conversion and vice versa