From 9c2acb7847b04715917950e7d61815012e4b83ee Mon Sep 17 00:00:00 2001 From: Katz Yamada Date: Fri, 7 Jul 2017 15:00:10 -0700 Subject: [PATCH] Fix incorrect sv id offset for bugreport Fixed incorrect sv id offset for adb bugreport. Ephemeris type, source and age information of BDS, GAL and QZSS reported through PQWPE7 NMEA are incorrectly mapped to adb bugreport. Bug: 63178209 Change-Id: I9f4b7942adadda8949e040ee59bed9c027e080c2 CRs-Fixed: 2073107 --- gnss/GnssAdapter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp index d08f8c2d..9beb66d9 100644 --- a/gnss/GnssAdapter.cpp +++ b/gnss/GnssAdapter.cpp @@ -2700,7 +2700,7 @@ void GnssAdapter::convertSatelliteInfo(std::vector& out, case GNSS_SV_TYPE_QZSS: svid_min = GNSS_BUGREPORT_QZSS_MIN; svid_num = QZSS_NUM; - svid_idx = GPS_NUM+GLO_NUM; + svid_idx = GPS_NUM+GLO_NUM+BDS_NUM+GAL_NUM; if (!in.mSvHealth.empty()) { eph_health_good_mask = in.mSvHealth.back().mQzssGoodMask; eph_health_bad_mask = in.mSvHealth.back().mQzssBadMask; @@ -2713,7 +2713,7 @@ void GnssAdapter::convertSatelliteInfo(std::vector& out, case GNSS_SV_TYPE_BEIDOU: svid_min = GNSS_BUGREPORT_BDS_MIN; svid_num = BDS_NUM; - svid_idx = GPS_NUM+GLO_NUM+QZSS_NUM; + svid_idx = GPS_NUM+GLO_NUM; if (!in.mSvHealth.empty()) { eph_health_good_mask = in.mSvHealth.back().mBdsGoodMask; eph_health_bad_mask = in.mSvHealth.back().mBdsBadMask; @@ -2726,7 +2726,7 @@ void GnssAdapter::convertSatelliteInfo(std::vector& out, case GNSS_SV_TYPE_GALILEO: svid_min = GNSS_BUGREPORT_GAL_MIN; svid_num = GAL_NUM; - svid_idx = GPS_NUM+GLO_NUM+QZSS_NUM+BDS_NUM; + svid_idx = GPS_NUM+GLO_NUM+BDS_NUM; if (!in.mSvHealth.empty()) { eph_health_good_mask = in.mSvHealth.back().mGalGoodMask; eph_health_bad_mask = in.mSvHealth.back().mGalBadMask;