1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-31 11:19:18 +00:00

Fix for gnsstk > 9.0.0

This commit is contained in:
Carles Fernandez 2022-07-04 13:47:05 +02:00
parent d94778b27a
commit b48ef135a7
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D

View File

@ -178,13 +178,11 @@ int main(int argc, char** argv)
gps_utc_model.valid = (hdr.valid > 2147483648) ? true : false; gps_utc_model.valid = (hdr.valid > 2147483648) ? true : false;
gps_utc_model.A1 = hdr.mapTimeCorr["GPUT"].A0; gps_utc_model.A1 = hdr.mapTimeCorr["GPUT"].A0;
gps_utc_model.A0 = hdr.mapTimeCorr["GPUT"].A1; gps_utc_model.A0 = hdr.mapTimeCorr["GPUT"].A1;
if (std::find(hdr.commentList.begin(), hdr.commentList.end(), "GPUT") != hdr.commentList.end()) if (hdr.mapTimeCorr["GPUT"].refTime != gnsstk::CommonTime::BEGINNING_OF_TIME)
{ {
gnsstk::GPSWeekSecond ct; gnsstk::GPSWeekSecond gws(hdr.mapTimeCorr["GPUT"].refTime);
ct = gnsstk::GPSWeekSecond(hdr.mapTimeCorr["GPUT"].refTime); gps_utc_model.tot = gws.getSOW();
// std::cout << "gps sow: " << ct.sow << '\n'; gps_utc_model.WN_T = gws.getWeek();
gps_utc_model.tot = ct.sow;
gps_utc_model.WN_T = ct.week;
} }
gps_utc_model.DeltaT_LS = hdr.leapSeconds; gps_utc_model.DeltaT_LS = hdr.leapSeconds;
gps_utc_model.WN_LSF = hdr.leapWeek; gps_utc_model.WN_LSF = hdr.leapWeek;
@ -207,13 +205,11 @@ int main(int argc, char** argv)
gal_utc_model.A0 = hdr.mapTimeCorr["GAUT"].A0; gal_utc_model.A0 = hdr.mapTimeCorr["GAUT"].A0;
gal_utc_model.A1 = hdr.mapTimeCorr["GAUT"].A1; gal_utc_model.A1 = hdr.mapTimeCorr["GAUT"].A1;
gal_utc_model.Delta_tLS = hdr.leapSeconds; gal_utc_model.Delta_tLS = hdr.leapSeconds;
if (std::find(hdr.commentList.begin(), hdr.commentList.end(), "GAUT") != hdr.commentList.end()) if (hdr.mapTimeCorr["GAUT"].refTime != gnsstk::CommonTime::BEGINNING_OF_TIME)
{ {
gnsstk::GALWeekSecond ct; gnsstk::GPSWeekSecond gws(hdr.mapTimeCorr["GAUT"].refTime);
ct = gnsstk::GALWeekSecond(hdr.mapTimeCorr["GAUT"].refTime); gal_utc_model.tot = gws.getSOW();
// std::cout << "gal sow: " << ct.sow << '\n'; gal_utc_model.WNot = gws.getWeek();
gal_utc_model.tot = ct.sow;
gal_utc_model.WNot = ct.week;
} }
gal_utc_model.WN_LSF = hdr.leapWeek; gal_utc_model.WN_LSF = hdr.leapWeek;
gal_utc_model.DN = hdr.leapDay; gal_utc_model.DN = hdr.leapDay;