1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 04:30:33 +00:00

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

This commit is contained in:
Carles Fernandez 2019-01-28 05:19:40 +01:00
commit 1ebc3ce08b
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D

View File

@ -593,7 +593,7 @@ void dll_pll_veml_tracking::start_tracking()
uint16_t preambles_bits[BEIDOU_B1I_PREAMBLE_LENGTH_BITS] = {1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0}; uint16_t preambles_bits[BEIDOU_B1I_PREAMBLE_LENGTH_BITS] = {1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 0};
for (uint16_t preambles_bit : preambles_bits) for (uint16_t preambles_bit : preambles_bits)
{ {
for (uint32_t j = 0; j < d_symbols_per_bit; j++) for (int32_t j = 0; j < d_symbols_per_bit; j++)
{ {
if (preambles_bit == 1) if (preambles_bit == 1)
{ {
@ -1508,9 +1508,9 @@ int dll_pll_veml_tracking::general_work(int noutput_items __attribute__((unused)
d_symbol_history.push_back(d_Prompt->real()); d_symbol_history.push_back(d_Prompt->real());
//******* preamble correlation ******** //******* preamble correlation ********
int32_t corr_value = 0; int32_t corr_value = 0;
if ((d_symbol_history.size() == d_preamble_length_symbols)) // and (d_make_correlation or !d_flag_frame_sync)) if ((static_cast<int32_t>(d_symbol_history.size()) == d_preamble_length_symbols)) // and (d_make_correlation or !d_flag_frame_sync))
{ {
for (uint32_t i = 0; i < d_preamble_length_symbols; i++) for (int32_t i = 0; i < d_preamble_length_symbols; i++)
{ {
if (d_symbol_history.at(i) < 0) // symbols clipping if (d_symbol_history.at(i) < 0) // symbols clipping
{ {