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

Fixing reading of UTC and IONO data in Galileo

Browse Source
This commit is contained in:
Carles Fernandez 2015-03-04 16:15:59 +01:00
parent 6cf4b35988
commit d72d853843
3 changed files with 123 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/algorithms/PVT/gnuradio_blocks/galileo_e1_pvt_cc.cc
View File

@ -155,22 +155,62 @@ int galileo_e1_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_it
if (global_galileo_utc_model_map.size() > 0) if (global_galileo_utc_model_map.size() > 0)
{ {
// UTC MODEL data is shared for all the Galileo satellites. Read always at ID=0 // UTC MODEL data is shared for all the Galileo satellites. Read always at a locked channel
global_galileo_utc_model_map.read(0, d_ls_pvt->galileo_utc_model); signed int i = 0;
while(true)
{
if (in[i][0].Flag_valid_pseudorange == true)
{
global_galileo_utc_model_map.read(0, d_ls_pvt->galileo_utc_model);
break;
}
i++;
if (i == (signed int)d_nchannels - 1)
{
break;
}
}
} }
if (global_galileo_iono_map.size() > 0) if (global_galileo_iono_map.size() > 0)
{ {
// IONO data is shared for all the Galileo satellites. Read always at ID=0 // IONO data is shared for all Galileo satellites. Read always at a locked channel
global_galileo_iono_map.read(0, d_ls_pvt->galileo_iono); signed int i = 0;
while(true)
{
if (in[i][0].Flag_valid_pseudorange == true)
{
global_galileo_iono_map.read(i, d_ls_pvt->galileo_iono);
break;
}
i++;
if (i == (signed int)d_nchannels - 1)
{
break;
}
}
} }
if (global_galileo_almanac_map.size() > 0) if (global_galileo_almanac_map.size() > 0)
{ {
// Almanac data is shared for all the Galileo satellites. Read always at ID=0 // ALMANAC data is shared for all Galileo satellites. Read always at a locked channel
global_galileo_almanac_map.read(0, d_ls_pvt->galileo_almanac); signed int i = 0;
while(true)
{
if (in[i][0].Flag_valid_pseudorange == true)
{
global_galileo_almanac_map.read(i, d_ls_pvt->galileo_almanac);
break;
}
i++;
if (i == (signed int)d_nchannels - 1)
{
break;
}
}
} }
// ############ 2 COMPUTE THE PVT ################################ // ############ 2 COMPUTE THE PVT ################################
if (gnss_pseudoranges_map.size() > 0 and d_ls_pvt->galileo_ephemeris_map.size() > 0) if (gnss_pseudoranges_map.size() > 0 and d_ls_pvt->galileo_ephemeris_map.size() > 0)
{ {

4
src/algorithms/PVT/gnuradio_blocks/gps_l1_ca_pvt_cc.cc
View File

@ -178,7 +178,7 @@ int gps_l1_ca_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_ite
break; break;
} }
i++; i++;
if (i == d_nchannels - 1) if (i == (signed int)d_nchannels - 1)
{ {
break; break;
} }
@ -197,7 +197,7 @@ int gps_l1_ca_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_ite
break; break;
} }
i++; i++;
if (i == d_nchannels - 1) if (i == (signed int)d_nchannels - 1)
{ {
break; break;
} }

85
src/algorithms/PVT/gnuradio_blocks/hybrid_pvt_cc.cc
View File

@ -164,20 +164,59 @@ int hybrid_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_items,
if (global_galileo_utc_model_map.size() > 0) if (global_galileo_utc_model_map.size() > 0)
{ {
// UTC MODEL data is shared for all the Galileo satellites. Read always at ID=0 // UTC MODEL data is shared for all the Galileo satellites. Read always at a locked channel
global_galileo_utc_model_map.read(0, d_ls_pvt->galileo_utc_model); signed int i = 0;
while(true)
{
if (in[i][0].Flag_valid_pseudorange == true)
{
global_galileo_utc_model_map.read(0, d_ls_pvt->galileo_utc_model);
break;
}
i++;
if (i == (signed int)d_nchannels - 1)
{
break;
}
}
} }
if (global_galileo_iono_map.size() > 0) if (global_galileo_iono_map.size() > 0)
{ {
// IONO data is shared for all the Galileo satellites. Read always at ID=0 // IONO data is shared for all Galileo satellites. Read always at a locked channel
global_galileo_iono_map.read(0, d_ls_pvt->galileo_iono); signed int i = 0;
while(true)
{
if (in[i][0].Flag_valid_pseudorange == true)
{
global_galileo_iono_map.read(i, d_ls_pvt->galileo_iono);
break;
}
i++;
if (i == (signed int)d_nchannels - 1)
{
break;
}
}
} }
if (global_galileo_almanac_map.size() > 0) if (global_galileo_almanac_map.size() > 0)
{ {
// Almanac data is shared for all the Galileo satellites. Read always at ID=0 // ALMANAC data is shared for all Galileo satellites. Read always at a locked channel
arrived_galileo_almanac = global_galileo_almanac_map.read(0, d_ls_pvt->galileo_almanac); signed int i = 0;
while(true)
{
if (in[i][0].Flag_valid_pseudorange == true)
{
arrived_galileo_almanac = global_galileo_almanac_map.read(i, d_ls_pvt->galileo_almanac);
break;
}
i++;
if (i == (signed int)d_nchannels - 1)
{
break;
}
}
} }
// ############ 1. READ GPS EPHEMERIS/UTC_MODE/IONO FROM GLOBAL MAPS #### // ############ 1. READ GPS EPHEMERIS/UTC_MODE/IONO FROM GLOBAL MAPS ####
@ -189,14 +228,40 @@ int hybrid_pvt_cc::general_work (int noutput_items, gr_vector_int &ninput_items,
if (global_gps_utc_model_map.size() > 0) if (global_gps_utc_model_map.size() > 0)
{ {
// UTC MODEL data is shared for all the Galileo satellites. Read always at ID=0 // UTC MODEL data is shared for all the GPS satellites. Read always at a locked channel
global_gps_utc_model_map.read(0, d_ls_pvt->gps_utc_model); signed int i = 0;
while(true)
{
if (in[i][0].Flag_valid_pseudorange == true)
{
global_gps_utc_model_map.read(i, d_ls_pvt->gps_utc_model);
break;
}
i++;
if (i == (signed int)d_nchannels - 1)
{
break;
}
}
} }
if (global_gps_iono_map.size() > 0) if (global_gps_iono_map.size() > 0)
{ {
// IONO data is shared for all the Galileo satellites. Read always at ID=0 // IONO data is shared for all the GPS satellites. Read always at a locked channel
global_gps_iono_map.read(0, d_ls_pvt->gps_iono); signed int i = 0;
while(true)
{
if (in[i][0].Flag_valid_pseudorange == true)
{
global_gps_iono_map.read(i, d_ls_pvt->gps_iono);
break;
}
i++;
if (i == (signed int)d_nchannels - 1)
{
break;
}
}
} }