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

Fix nmea sentence generation method of --GSV

Browse source 
Generate --GSV sentences from SVs in view
instead of generate them from SVs used in fix

Change-Id: I1de113e86b987b6ea01b50d800e5e13e7277baff
CRs-Fixed: 2015049
This commit is contained in:
Baili Feng 2017-03-07 13:37:46 +08:00
parent 06e6d68aee
commit ce66a81a3d
1 changed files with 3 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
utils/loc_nmea.cpp
View file

@ -110,35 +110,6 @@ static loc_nmea_sv_meta* loc_nmea_sv_meta_init(loc_nmea_sv_meta& sv_meta,
return &sv_meta; return &sv_meta;
} }
/*===========================================================================
FUNCTION loc_nmea_count_bits
DESCRIPTION
Count how many bits are set in mask
DEPENDENCIES
NONE
RETURN VALUE
Bits number set in mask
SIDE EFFECTS
N/A
===========================================================================*/
static uint32_t loc_nmea_count_bits(uint32_t mask)
{
uint32_t count = 0;
while (mask)
{
if (mask & 1)
count++;
mask = mask >> 1;
}
return count;
}
/*=========================================================================== /*===========================================================================
FUNCTION loc_nmea_put_checksum FUNCTION loc_nmea_put_checksum
@ -337,8 +308,7 @@ static void loc_nmea_generate_GSV(const GnssSvNotification &svNotify,
const char* talker = sv_meta_p->talker; const char* talker = sv_meta_p->talker;
uint32_t svIdOffset = sv_meta_p->svIdOffset; uint32_t svIdOffset = sv_meta_p->svIdOffset;
uint32_t mask = sv_meta_p->mask; int svCount = svNotify.count;
uint32_t svCount = loc_nmea_count_bits(mask);
if (svCount <= 0) if (svCount <= 0)
@ -370,12 +340,12 @@ static void loc_nmea_generate_GSV(const GnssSvNotification &svNotify,
pMarker += length; pMarker += length;
lengthRemaining -= length; lengthRemaining -= length;
for (int i=0; (svNumber <= svNotify.count) && (i < 4); svNumber++) for (int i=0; (svNumber <= svCount) && (i < 4); svNumber++)
{ {
if (sv_meta_p->svType == svNotify.gnssSvs[svNumber - 1].type) if (sv_meta_p->svType == svNotify.gnssSvs[svNumber - 1].type)
{ {
length = snprintf(pMarker, lengthRemaining,",%02d,%02d,%03d,", length = snprintf(pMarker, lengthRemaining,",%02d,%02d,%03d,",
svNotify.gnssSvs[svNumber - 1].svId, svNotify.gnssSvs[svNumber - 1].svId + svIdOffset,
(int)(0.5 + svNotify.gnssSvs[svNumber - 1].elevation), //float to int (int)(0.5 + svNotify.gnssSvs[svNumber - 1].elevation), //float to int
(int)(0.5 + svNotify.gnssSvs[svNumber - 1].azimuth)); //float to int (int)(0.5 + svNotify.gnssSvs[svNumber - 1].azimuth)); //float to int