mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 12:40:35 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Carles Fernandez 2019-07-09 20:32:39 +02:00
commit c2999e1e2f
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,13 +100,11 @@ glonass_l1_ca_telemetry_decoder_gs::glonass_l1_ca_telemetry_decoder_gs(
} }
} }
d_symbol_history.set_capacity(GLONASS_GNAV_PREAMBLE_LENGTH_SYMBOLS); d_symbol_history.set_capacity(GLONASS_GNAV_STRING_SYMBOLS);
d_sample_counter = 0ULL; d_sample_counter = 0ULL;
d_stat = 0; d_stat = 0;
d_preamble_index = 0ULL; d_preamble_index = 0ULL;
d_flag_frame_sync = false; d_flag_frame_sync = false;
d_flag_parity = false; d_flag_parity = false;
d_TOW_at_current_symbol = 0; d_TOW_at_current_symbol = 0;
Flag_valid_word = false; Flag_valid_word = false;
@ -289,13 +287,12 @@ int glonass_l1_ca_telemetry_decoder_gs::general_work(int noutput_items __attribu
d_flag_preamble = false; d_flag_preamble = false;
if (static_cast<int32_t>(d_symbol_history.size()) == d_symbols_per_preamble) if (static_cast<int32_t>(d_symbol_history.size()) >= d_symbols_per_preamble)
{ {
// ******* preamble correlation ******** // ******* preamble correlation ********
int i = 0; for (int32_t i = 0; i < d_symbols_per_preamble; i++)
for (const auto &iter : d_symbol_history)
{ {
if (iter.Prompt_I < 0.0) // symbols clipping if (d_symbol_history[i].Prompt_I < 0.0) // symbols clipping
{ {
corr_value -= d_preambles_symbols[i]; corr_value -= d_preambles_symbols[i];
} }
@ -303,7 +300,6 @@ int glonass_l1_ca_telemetry_decoder_gs::general_work(int noutput_items __attribu
{ {
corr_value += d_preambles_symbols[i]; corr_value += d_preambles_symbols[i];
} }
i++;
} }
} }

10
src/algorithms/telemetry_decoder/gnuradio_blocks/glonass_l2_ca_telemetry_decoder_gs.cc
View File

@ -100,7 +100,7 @@ glonass_l2_ca_telemetry_decoder_gs::glonass_l2_ca_telemetry_decoder_gs(
} }
} }
d_symbol_history.set_capacity(GLONASS_GNAV_PREAMBLE_PERIOD_SYMBOLS); d_symbol_history.set_capacity(GLONASS_GNAV_STRING_SYMBOLS);
d_sample_counter = 0ULL; d_sample_counter = 0ULL;
d_stat = 0; d_stat = 0;
d_preamble_index = 0ULL; d_preamble_index = 0ULL;
@ -289,13 +289,12 @@ int glonass_l2_ca_telemetry_decoder_gs::general_work(int noutput_items __attribu
d_flag_preamble = false; d_flag_preamble = false;
if (d_symbol_history.size() == GLONASS_GNAV_PREAMBLE_PERIOD_SYMBOLS) if (static_cast<int32_t>(d_symbol_history.size()) >= d_symbols_per_preamble)
{ {
// ******* preamble correlation ******** // ******* preamble correlation ********
int i = 0; for (int32_t i = 0; i < d_symbols_per_preamble; i++)
for (const auto &iter : d_symbol_history)
{ {
if (iter.Prompt_I < 0.0) // symbols clipping if (d_symbol_history[i].Prompt_I < 0.0) // symbols clipping
{ {
corr_value -= d_preambles_symbols[i]; corr_value -= d_preambles_symbols[i];
} }
@ -303,7 +302,6 @@ int glonass_l2_ca_telemetry_decoder_gs::general_work(int noutput_items __attribu
{ {
corr_value += d_preambles_symbols[i]; corr_value += d_preambles_symbols[i];
} }
i++;
} }
} }