1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 12:40:35 +00:00

Improve handling of E6 observables

This commit is contained in:
Carles Fernandez 2022-05-26 10:02:58 +02:00
parent ab40201783
commit 92b021f1b6
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D

View File

@ -529,7 +529,7 @@ bool Rtklib_Solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_
d_obs_data[i + glo_valid_obs] = insert_obs_to_rtklib(d_obs_data[i + glo_valid_obs], d_obs_data[i + glo_valid_obs] = insert_obs_to_rtklib(d_obs_data[i + glo_valid_obs],
gnss_observables_iter->second, gnss_observables_iter->second,
galileo_ephemeris_iter->second.WN, galileo_ephemeris_iter->second.WN,
0); // Band 1 (E6) 2); // Band E6
found_E1_obs = true; found_E1_obs = true;
break; break;
} }
@ -547,7 +547,7 @@ bool Rtklib_Solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_
d_obs_data[valid_obs + glo_valid_obs] = insert_obs_to_rtklib(newobs, d_obs_data[valid_obs + glo_valid_obs] = insert_obs_to_rtklib(newobs,
gnss_observables_iter->second, gnss_observables_iter->second,
galileo_ephemeris_iter->second.WN, galileo_ephemeris_iter->second.WN,
0); // Band 1 (E6) 2); // Band E6
// std::cout << "Week " << galileo_ephemeris_iter->second.WN << '\n'; // std::cout << "Week " << galileo_ephemeris_iter->second.WN << '\n';
valid_obs++; valid_obs++;
} }
@ -922,7 +922,7 @@ bool Rtklib_Solver::get_PVT(const std::map<int, Gnss_Synchro> &gnss_observables_
{ {
for (int j = 0; j < NFREQ; j++) for (int j = 0; j < NFREQ; j++)
{ {
if (j == 0 && gal_e6) if (j == 2 && gal_e6)
{ {
// frq = 3 corresponds to E6 in that function // frq = 3 corresponds to E6 in that function
nav_data.lam[i][j] = satwavelen(i + 1, 3, &nav_data); nav_data.lam[i][j] = satwavelen(i + 1, 3, &nav_data);