From ce66a81a3d23519f1fe44e0371d00048b2e2e40b Mon Sep 17 00:00:00 2001
From: Baili Feng <bailif@codeaurora.org>
Date: Tue, 7 Mar 2017 13:37:46 +0800
Subject: Fix nmea sentence generation method of --GSV

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

Change-Id: I1de113e86b987b6ea01b50d800e5e13e7277baff
CRs-Fixed: 2015049
---
 utils/loc_nmea.cpp | 36 +++---------------------------------
 1 file changed, 3 insertions(+), 33 deletions(-)

(limited to 'utils/loc_nmea.cpp')

diff --git a/utils/loc_nmea.cpp b/utils/loc_nmea.cpp
index 7932562..3ce6792 100644
--- a/utils/loc_nmea.cpp
+++ b/utils/loc_nmea.cpp
@@ -110,35 +110,6 @@ static loc_nmea_sv_meta* loc_nmea_sv_meta_init(loc_nmea_sv_meta& 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
 
@@ -337,8 +308,7 @@ static void loc_nmea_generate_GSV(const GnssSvNotification &svNotify,
 
     const char* talker = sv_meta_p->talker;
     uint32_t svIdOffset = sv_meta_p->svIdOffset;
-    uint32_t mask = sv_meta_p->mask;
-    uint32_t svCount = loc_nmea_count_bits(mask);
+    int svCount = svNotify.count;
 
 
     if (svCount <= 0)
@@ -370,12 +340,12 @@ static void loc_nmea_generate_GSV(const GnssSvNotification &svNotify,
         pMarker += 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)
             {
                 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].azimuth)); //float to int
 
-- 
cgit v1.2.3