commit 2f3691eb67d0d39afaa2633afcbe0f752425a34e
author jlask <jason972000@gmail.com> Tue Apr 28 22:28:57 2020 +0200
committer rohan <purohit.rohan@gmail.com> Wed Jul 01 09:00:38 2020 -0400
tree 753764746d75dea7b2adeba19fc0fb3bb65486b7
parent ab88bd1b19b824c739b2cfec35bbf0c5e95edede

gnss-legacy: Bring back GLONASS

Change-Id: I139337039a53c757818b75139276859092d66157

gnss/1.0-legacy/Gnss.cpp

diff --git a/gnss/1.0-legacy/Gnss.cpp b/gnss/1.0-legacy/Gnss.cpp
index 32c131c..1ab465c 100644
--- a/gnss/1.0-legacy/Gnss.cpp
+++ b/gnss/1.0-legacy/Gnss.cpp
@@ -198,6 +198,8 @@
     uint32_t ephemerisMask = svInfo->ephemeris_mask;
     uint32_t almanacMask = svInfo->almanac_mask;
     uint32_t usedInFixMask = svInfo->used_in_fix_mask;
+    // Our HALs report a bigger svinfo struct, HaxxSvStatus, which includes a GLONASS usage mask
+    uint32_t gloUsedInFixMask = *(&(svInfo->used_in_fix_mask) + 1); // the next int
     /*
      * Conversion from GpsSvInfo to IGnssCallback::GnssSvInfo happens below.
      */
@@ -231,10 +233,11 @@
         info.svFlag = static_cast<uint8_t>(IGnssCallback::GnssSvFlags::NONE);
 
         /*
-         * Only GPS info is valid for these fields, as these masks are just 32
-         * bits, by GPS prn.
+         * GPS and GLONASS info is valid for these fields, as these masks are just 32
+         * bits, by GPS prn and another for GLONASS prn.
          */
-        if (info.constellation == GnssConstellationType::GPS) {
+        if (info.constellation == GnssConstellationType::GPS ||
+            info.constellation == GnssConstellationType::GLONASS) {
             int32_t svidMask = (1 << (info.svid - 1));
             if ((ephemerisMask & svidMask) != 0) {
                 info.svFlag |= IGnssCallback::GnssSvFlags::HAS_EPHEMERIS_DATA;
@@ -242,7 +245,10 @@
             if ((almanacMask & svidMask) != 0) {
                 info.svFlag |= IGnssCallback::GnssSvFlags::HAS_ALMANAC_DATA;
             }
-            if ((usedInFixMask & svidMask) != 0) {
+            if ((info.constellation == GnssConstellationType::GPS &&
+                 (usedInFixMask & svidMask) != 0) ||
+                (info.constellation == GnssConstellationType::GLONASS &&
+                 (gloUsedInFixMask & svidMask) != 0)) {
                 info.svFlag |= IGnssCallback::GnssSvFlags::USED_IN_FIX;
             }
         }