MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Provide correct SV used_in_fix flag for QZSS"

Browse source
This commit is contained in:
Linux Build Service Account 2017-05-28 00:59:59 -07:00 committed by Gerrit - the friendly Code Review server
commit 25008877c3
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/LocApiBase.cpp
View file

@ -237,7 +237,7 @@ void LocApiBase::reportPosition(UlpLocation& location,
"altitude: %f\n speed: %f\n bearing: %f\n accuracy: %f\n "
"timestamp: %lld\n rawDataSize: %d\n rawData: %p\n "
"Session status: %d\n Technology mask: %u\n "
"SV used in fix (gps/glo/bds/gal) : (%x/%x/%x/%x)",
"SV used in fix (gps/glo/bds/gal/qzss) : (%x/%x/%x/%x/%x)",
location.gpsLocation.flags, location.position_source,
location.gpsLocation.latitude, location.gpsLocation.longitude,
location.gpsLocation.altitude, location.gpsLocation.speed,
@ -247,7 +247,8 @@ void LocApiBase::reportPosition(UlpLocation& location,
locationExtended.gnss_sv_used_ids.gps_sv_used_ids_mask,
locationExtended.gnss_sv_used_ids.glo_sv_used_ids_mask,
locationExtended.gnss_sv_used_ids.bds_sv_used_ids_mask,
locationExtended.gnss_sv_used_ids.gal_sv_used_ids_mask);
locationExtended.gnss_sv_used_ids.gal_sv_used_ids_mask,
locationExtended.gnss_sv_used_ids.qzss_sv_used_ids_mask);
// loop through adapters, and deliver to all adapters.
TO_ALL_LOCADAPTERS(
mLocAdapters[i]->reportPositionEvent(location, locationExtended,

3
gnss/GnssAdapter.cpp
View file

@ -1951,6 +1951,9 @@ GnssAdapter::reportSv(GnssSvNotification& svNotify)
case GNSS_SV_TYPE_GALILEO:
svUsedIdMask = mGnssSvIdUsedInPosition.gal_sv_used_ids_mask;
break;
case GNSS_SV_TYPE_QZSS:
svUsedIdMask = mGnssSvIdUsedInPosition.qzss_sv_used_ids_mask;
break;
default:
svUsedIdMask = 0;
break;

3
utils/gps_extended_c.h
View file

@ -306,6 +306,8 @@ typedef uint32_t LocNavSolutionMask;
#define GPS_SV_PRN_MAX 32
#define GLO_SV_PRN_MIN 65
#define GLO_SV_PRN_MAX 96
#define QZSS_SV_PRN_MIN 193
#define QZSS_SV_PRN_MAX 197
#define BDS_SV_PRN_MIN 201
#define BDS_SV_PRN_MAX 235
#define GAL_SV_PRN_MIN 301
@ -342,6 +344,7 @@ typedef struct {
uint64_t glo_sv_used_ids_mask;
uint64_t gal_sv_used_ids_mask;
uint64_t bds_sv_used_ids_mask;
uint64_t qzss_sv_used_ids_mask;
} GnssSvUsedInPosition;
/** Represents gps location extended. */