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

Fix E5b processing. E5a and E5b have data in the Inphase component

Browse Source
This commit is contained in:
Carles Fernandez 2022-02-05 15:03:25 +01:00
parent 5da56b1d80
commit c468b64ac0
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
3 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -662,30 +662,8 @@ int galileo_telemetry_decoder_gs::general_work(int noutput_items __attribute__((
d_band = current_symbol.Signal[0]; d_band = current_symbol.Signal[0];
// add new symbol to the symbol queue // add new symbol to the symbol queue
switch (d_frame_type)
{
case 1: // INAV
{
d_symbol_history.push_back(current_symbol.Prompt_I); d_symbol_history.push_back(current_symbol.Prompt_I);
break;
}
case 2: // FNAV
{
d_symbol_history.push_back(current_symbol.Prompt_Q);
break;
}
case 3: // CNAV
{
d_symbol_history.push_back(current_symbol.Prompt_I);
break;
}
default:
{
LOG(WARNING) << "Frame type " << d_frame_type << " is not defined";
d_symbol_history.push_back(current_symbol.Prompt_I);
break;
}
}
d_sample_counter++; // count for the processed symbols d_sample_counter++; // count for the processed symbols
// Time Tags from signal source (optional feature) // Time Tags from signal source (optional feature)

4
src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking.cc
View File

@ -305,6 +305,7 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_)
// remove data secondary code // remove data secondary code
d_data_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_I_SECONDARY_CODE_LENGTH); d_data_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_I_SECONDARY_CODE_LENGTH);
d_data_secondary_code_string = GALILEO_E5A_I_SECONDARY_CODE; d_data_secondary_code_string = GALILEO_E5A_I_SECONDARY_CODE;
d_interchange_iq = true;
} }
else else
{ {
@ -312,7 +313,6 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_)
d_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_I_SECONDARY_CODE_LENGTH); d_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_I_SECONDARY_CODE_LENGTH);
d_secondary_code_string = GALILEO_E5A_I_SECONDARY_CODE; d_secondary_code_string = GALILEO_E5A_I_SECONDARY_CODE;
d_signal_pretty_name = d_signal_pretty_name + "I"; d_signal_pretty_name = d_signal_pretty_name + "I";
d_interchange_iq = true;
} }
} }
else if (d_signal_type == "7X") else if (d_signal_type == "7X")
@ -336,6 +336,7 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_)
// remove data secondary code // remove data secondary code
d_data_secondary_code_length = static_cast<uint32_t>(GALILEO_E5B_I_SECONDARY_CODE_LENGTH); d_data_secondary_code_length = static_cast<uint32_t>(GALILEO_E5B_I_SECONDARY_CODE_LENGTH);
d_data_secondary_code_string = GALILEO_E5B_I_SECONDARY_CODE; d_data_secondary_code_string = GALILEO_E5B_I_SECONDARY_CODE;
d_interchange_iq = true;
} }
else else
{ {
@ -343,7 +344,6 @@ dll_pll_veml_tracking::dll_pll_veml_tracking(const Dll_Pll_Conf &conf_)
d_secondary_code_length = static_cast<uint32_t>(GALILEO_E5B_I_SECONDARY_CODE_LENGTH); d_secondary_code_length = static_cast<uint32_t>(GALILEO_E5B_I_SECONDARY_CODE_LENGTH);
d_secondary_code_string = GALILEO_E5B_I_SECONDARY_CODE; d_secondary_code_string = GALILEO_E5B_I_SECONDARY_CODE;
d_signal_pretty_name = d_signal_pretty_name + "I"; d_signal_pretty_name = d_signal_pretty_name + "I";
d_interchange_iq = true;
} }
} }
else if (d_signal_type == "E6") else if (d_signal_type == "E6")

3
src/algorithms/tracking/gnuradio_blocks/dll_pll_veml_tracking_fpga.cc
View File

@ -303,7 +303,7 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
// remove data secondary code // remove data secondary code
d_data_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_I_SECONDARY_CODE_LENGTH); d_data_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_I_SECONDARY_CODE_LENGTH);
d_data_secondary_code_string = GALILEO_E5A_I_SECONDARY_CODE; d_data_secondary_code_string = GALILEO_E5A_I_SECONDARY_CODE;
d_interchange_iq = true;
// the pilot secondary code depends on PRN and it is initialized later // the pilot secondary code depends on PRN and it is initialized later
} }
else else
@ -312,7 +312,6 @@ dll_pll_veml_tracking_fpga::dll_pll_veml_tracking_fpga(const Dll_Pll_Conf_Fpga &
d_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_I_SECONDARY_CODE_LENGTH); d_secondary_code_length = static_cast<uint32_t>(GALILEO_E5A_I_SECONDARY_CODE_LENGTH);
d_secondary_code_string = GALILEO_E5A_I_SECONDARY_CODE; d_secondary_code_string = GALILEO_E5A_I_SECONDARY_CODE;
d_signal_pretty_name = d_signal_pretty_name + "I"; d_signal_pretty_name = d_signal_pretty_name + "I";
d_interchange_iq = true;
} }
} }
else else