mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-31 11:19:18 +00:00
Code Issues Releases Wiki Activity

Make ASAN compilation mode happy

Browse Source
This commit is contained in:
Carles Fernandez 2021-09-23 19:06:00 +02:00
parent 38cffe480b
commit 9384c8c303
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.cc
View File

@ -86,6 +86,9 @@ galileo_telemetry_decoder_gs::galileo_telemetry_decoder_gs(
d_remove_dat = conf.remove_dat; d_remove_dat = conf.remove_dat;
d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN()); d_satellite = Gnss_Satellite(satellite.get_system(), satellite.get_PRN());
d_frame_type = frame_type; d_frame_type = frame_type;
d_nn = 2;
d_KK = 7;
d_mm = d_KK - 1;
DLOG(INFO) << "Initializing GALILEO UNIFIED TELEMETRY DECODER"; DLOG(INFO) << "Initializing GALILEO UNIFIED TELEMETRY DECODER";
d_dump_crc_stats = conf.dump_crc_stats; d_dump_crc_stats = conf.dump_crc_stats;
@ -110,7 +113,7 @@ galileo_telemetry_decoder_gs::galileo_telemetry_decoder_gs(
d_preamble_period_symbols = GALILEO_INAV_PREAMBLE_PERIOD_SYMBOLS; d_preamble_period_symbols = GALILEO_INAV_PREAMBLE_PERIOD_SYMBOLS;
d_required_symbols = GALILEO_INAV_PAGE_SYMBOLS + d_samples_per_preamble; d_required_symbols = GALILEO_INAV_PAGE_SYMBOLS + d_samples_per_preamble;
// preamble bits to sampled symbols // preamble bits to sampled symbols
d_preamble_samples.reserve(d_samples_per_preamble); d_preamble_samples = std::vector<int32_t>(d_samples_per_preamble);
d_frame_length_symbols = GALILEO_INAV_PAGE_PART_SYMBOLS - GALILEO_INAV_PREAMBLE_LENGTH_BITS; d_frame_length_symbols = GALILEO_INAV_PAGE_PART_SYMBOLS - GALILEO_INAV_PREAMBLE_LENGTH_BITS;
d_codelength = static_cast<int32_t>(d_frame_length_symbols); d_codelength = static_cast<int32_t>(d_frame_length_symbols);
d_datalength = (d_codelength / d_nn) - d_mm; d_datalength = (d_codelength / d_nn) - d_mm;
@ -130,7 +133,7 @@ galileo_telemetry_decoder_gs::galileo_telemetry_decoder_gs(
d_preamble_period_symbols = GALILEO_FNAV_SYMBOLS_PER_PAGE; d_preamble_period_symbols = GALILEO_FNAV_SYMBOLS_PER_PAGE;
d_required_symbols = static_cast<uint32_t>(GALILEO_FNAV_SYMBOLS_PER_PAGE) + d_samples_per_preamble; d_required_symbols = static_cast<uint32_t>(GALILEO_FNAV_SYMBOLS_PER_PAGE) + d_samples_per_preamble;
// preamble bits to sampled symbols // preamble bits to sampled symbols
d_preamble_samples.reserve(d_samples_per_preamble); d_preamble_samples = std::vector<int32_t>(d_samples_per_preamble);
d_frame_length_symbols = GALILEO_FNAV_SYMBOLS_PER_PAGE - GALILEO_FNAV_PREAMBLE_LENGTH_BITS; d_frame_length_symbols = GALILEO_FNAV_SYMBOLS_PER_PAGE - GALILEO_FNAV_PREAMBLE_LENGTH_BITS;
d_codelength = static_cast<int32_t>(d_frame_length_symbols); d_codelength = static_cast<int32_t>(d_frame_length_symbols);
d_datalength = (d_codelength / d_nn) - d_mm; d_datalength = (d_codelength / d_nn) - d_mm;
@ -144,7 +147,7 @@ galileo_telemetry_decoder_gs::galileo_telemetry_decoder_gs(
d_samples_per_preamble = GALILEO_CNAV_PREAMBLE_LENGTH_BITS; d_samples_per_preamble = GALILEO_CNAV_PREAMBLE_LENGTH_BITS;
d_preamble_period_symbols = GALILEO_CNAV_SYMBOLS_PER_PAGE; d_preamble_period_symbols = GALILEO_CNAV_SYMBOLS_PER_PAGE;
d_required_symbols = static_cast<uint32_t>(GALILEO_CNAV_SYMBOLS_PER_PAGE) + d_samples_per_preamble; d_required_symbols = static_cast<uint32_t>(GALILEO_CNAV_SYMBOLS_PER_PAGE) + d_samples_per_preamble;
d_preamble_samples.reserve(d_samples_per_preamble); d_preamble_samples = std::vector<int32_t>(d_samples_per_preamble);
d_frame_length_symbols = GALILEO_CNAV_SYMBOLS_PER_PAGE - GALILEO_CNAV_PREAMBLE_LENGTH_BITS; d_frame_length_symbols = GALILEO_CNAV_SYMBOLS_PER_PAGE - GALILEO_CNAV_PREAMBLE_LENGTH_BITS;
d_codelength = static_cast<int32_t>(d_frame_length_symbols); d_codelength = static_cast<int32_t>(d_frame_length_symbols);
d_datalength = (d_codelength / d_nn) - d_mm; d_datalength = (d_codelength / d_nn) - d_mm;
@ -164,7 +167,8 @@ galileo_telemetry_decoder_gs::galileo_telemetry_decoder_gs(
std::cout << "Galileo unified telemetry decoder error: Unknown frame type\n"; std::cout << "Galileo unified telemetry decoder error: Unknown frame type\n";
} }
d_page_part_symbols.reserve(d_frame_length_symbols); d_page_part_symbols = std::vector<float>(d_frame_length_symbols);
for (int32_t i = 0; i < d_bits_per_preamble; i++) for (int32_t i = 0; i < d_bits_per_preamble; i++)
{ {
switch (d_frame_type) switch (d_frame_type)
@ -229,10 +233,11 @@ galileo_telemetry_decoder_gs::galileo_telemetry_decoder_gs(
// vars for Viterbi decoder // vars for Viterbi decoder
const int32_t max_states = 1U << static_cast<uint32_t>(d_mm); // 2^d_mm const int32_t max_states = 1U << static_cast<uint32_t>(d_mm); // 2^d_mm
std::array<int32_t, 2> g_encoder{{121, 91}}; // Polynomial G1 and G2 std::array<int32_t, 2> g_encoder{{121, 91}}; // Polynomial G1 and G2
d_out0.reserve(max_states);
d_out1.reserve(max_states); d_out0 = std::vector<int32_t>(max_states);
d_state0.reserve(max_states); d_out1 = std::vector<int32_t>(max_states);
d_state1.reserve(max_states); d_state0 = std::vector<int32_t>(max_states);
d_state1 = std::vector<int32_t>(max_states);
d_inav_nav.init_PRN(d_satellite.get_PRN()); d_inav_nav.init_PRN(d_satellite.get_PRN());
d_first_eph_sent = false; d_first_eph_sent = false;

6
src/algorithms/telemetry_decoder/gnuradio_blocks/galileo_telemetry_decoder_gs.h
View File

@ -79,8 +79,8 @@ private:
galileo_telemetry_decoder_gs(const Gnss_Satellite &satellite, const Tlm_Conf &conf, int frame_type); galileo_telemetry_decoder_gs(const Gnss_Satellite &satellite, const Tlm_Conf &conf, int frame_type);
const int32_t d_nn = 2; // Coding rate 1/n int32_t d_nn; // Coding rate 1/n
const int32_t d_KK = 7; // Constraint Length int32_t d_KK; // Constraint Length
void viterbi_decoder(float *page_part_symbols, int32_t *page_part_bits); void viterbi_decoder(float *page_part_symbols, int32_t *page_part_bits);
void deinterleaver(int32_t rows, int32_t cols, const float *in, float *out); void deinterleaver(int32_t rows, int32_t cols, const float *in, float *out);
@ -117,7 +117,7 @@ private:
uint64_t d_preamble_index; uint64_t d_preamble_index;
uint64_t d_last_valid_preamble; uint64_t d_last_valid_preamble;
int32_t d_mm = d_KK - 1; int32_t d_mm;
int32_t d_codelength; int32_t d_codelength;
int32_t d_datalength; int32_t d_datalength;
int32_t d_frame_type; int32_t d_frame_type;