1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-10-01 16:30:50 +00:00

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into galileo-e6

This commit is contained in:
Carles Fernandez 2021-11-29 18:57:41 +01:00
commit 54a618cf58
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 16 additions and 12 deletions

View File

@ -19,6 +19,8 @@ All notable changes to GNSS-SDR will be documented in this file.
- Improved Time-To-First-Fix when using GPS L1 C/A signals, fixing a bug that - Improved Time-To-First-Fix when using GPS L1 C/A signals, fixing a bug that
was making the receiver to drop the satellite if the PLL got locked at 180 was making the receiver to drop the satellite if the PLL got locked at 180
degrees, and making some optimizations on bit transition detection. degrees, and making some optimizations on bit transition detection.
- Fixed a bug that prevented from obtaining PVT fixes with Galileo E1 OS signals
if the I/NAV subframe type 0 was the first decoded subframe.
### Improvements in Interoperability: ### Improvements in Interoperability:
@ -48,9 +50,13 @@ All notable changes to GNSS-SDR will be documented in this file.
### Improvements in Portability: ### Improvements in Portability:
- Fixed building against the new API in the gr-iio component present in GNU - Fixed building against the new API in the gr-iio component present in GNU
Radio's `master` branch (currently v3.10.0.git). Radio v3.10.0.0-rc1.
- Fixed building against current GNU Radio's `master` branch, which does not - Fixed building against GNU Radio v3.10.0.0-rc1, which does not support the
support the C++20 standard. C++20 standard.
- Fixed building against GNU Radio v3.10.0.0-rc1, which replaced
[log4cpp](http://log4cpp.sourceforge.net/) by
[spdlog](https://github.com/gabime/spdlog) and
[fmt](https://github.com/fmtlib/fmt) libraries.
- Updated `cpu_features` library for improved processor detection. - Updated `cpu_features` library for improved processor detection.
### Improvements in Reliability: ### Improvements in Reliability:

View File

@ -882,15 +882,13 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__((
d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>(GALILEO_INAV_PAGE_PART_MS + (d_required_symbols + 1) * d_PRN_code_period_ms); d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>(GALILEO_INAV_PAGE_PART_MS + (d_required_symbols + 1) * d_PRN_code_period_ms);
d_inav_nav.set_TOW6_flag(false); d_inav_nav.set_TOW6_flag(false);
} }
// warning: type 0 frame does not contain a valid TOW in some simulated signals, thus it is not safe to activate the following code: else if (d_inav_nav.is_TOW0_set() == true) // page 0 arrived and decoded
// else if (d_inav_nav.is_TOW0_set() == true) // page 0 arrived and decoded {
// { // TOW_0 refers to the even preamble, but when we decode it we are in the odd part, so 1 second later plus the decoding delay
// // TOW_0 refers to the even preamble, but when we decode it we are in the odd part, so 1 second later plus the decoding delay d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_inav_nav.get_TOW0() * 1000.0);
// d_TOW_at_Preamble_ms = static_cast<uint32_t>(d_inav_nav.get_TOW0() * 1000.0); d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>(GALILEO_INAV_PAGE_PART_MS + (d_required_symbols + 1) * d_PRN_code_period_ms);
// d_TOW_at_current_symbol_ms = d_TOW_at_Preamble_ms + static_cast<uint32_t>(GALILEO_INAV_PAGE_PART_MS + (d_required_symbols + 1) * d_PRN_code_period_ms); d_inav_nav.set_TOW0_flag(false);
// d_inav_nav.set_TOW0_flag(false); }
// // std::cout << "FRAME 0 current tow: " << tmp_d_TOW_at_current_symbol_ms << " vs. " << d_TOW_at_current_symbol_ms + d_PRN_code_period_ms << "\n";
// }
else else
{ {
// this page has no timing information // this page has no timing information