From 64514a57344208890eea76e10c460e9457fb2730 Mon Sep 17 00:00:00 2001 From: Mike Cailean Date: Mon, 10 Jun 2019 13:48:15 -0700 Subject: SV used in fix satellites are not updated for B2A-Q Change-Id: If9d6f4ff694572f22b95b3ccb6015ebcb6310ffa CRs-fixed: 2468528 --- gnss/GnssAdapter.cpp | 3 +++ location/LocationDataTypes.h | 9 ++++++--- utils/gps_extended_c.h | 3 +++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gnss/GnssAdapter.cpp b/gnss/GnssAdapter.cpp index 8e1bf5f..4d329d8 100644 --- a/gnss/GnssAdapter.cpp +++ b/gnss/GnssAdapter.cpp @@ -3332,6 +3332,9 @@ GnssAdapter::reportSv(GnssSvNotification& svNotify) case GNSS_SIGNAL_BEIDOU_B2AI: svUsedIdMask = mGnssMbSvIdUsedInPosition.bds_b2ai_sv_used_ids_mask; break; + case GNSS_SIGNAL_BEIDOU_B2AQ: + svUsedIdMask = mGnssMbSvIdUsedInPosition.bds_b2aq_sv_used_ids_mask; + break; } } else { svUsedIdMask = mGnssSvIdUsedInPosition.bds_sv_used_ids_mask; diff --git a/location/LocationDataTypes.h b/location/LocationDataTypes.h index d6abda2..4571a88 100644 --- a/location/LocationDataTypes.h +++ b/location/LocationDataTypes.h @@ -583,7 +583,9 @@ typedef enum { /** SBAS L1 RF Band */ GNSS_SIGNAL_SBAS_L1 = (1<<17), /** NAVIC L5 RF Band */ - GNSS_SIGNAL_NAVIC_L5 = (1<<18) + GNSS_SIGNAL_NAVIC_L5 = (1<<18), + /** BEIDOU B2A_Q RF Band */ + GNSS_SIGNAL_BEIDOU_B2AQ = (1<<19) } GnssSignalTypeBits; #define GNSS_SIGNAL_TYPE_MASK_ALL\ @@ -593,7 +595,7 @@ typedef enum { GNSS_SIGNAL_BEIDOU_B1I | GNSS_SIGNAL_BEIDOU_B1C | GNSS_SIGNAL_BEIDOU_B2I|\ GNSS_SIGNAL_BEIDOU_B2AI | GNSS_SIGNAL_QZSS_L1CA | GNSS_SIGNAL_QZSS_L1S |\ GNSS_SIGNAL_QZSS_L2| GNSS_SIGNAL_QZSS_L5 | GNSS_SIGNAL_SBAS_L1 |\ - GNSS_SIGNAL_NAVIC_L5) + GNSS_SIGNAL_NAVIC_L5) | GNSS_SIGNAL_BEIDOU_B2AQ typedef enum { @@ -635,7 +637,8 @@ typedef enum { GNSS_LOC_SIGNAL_TYPE_QZSS_L5_Q = 16, /**< QZSS L5_Q RF Band */ GNSS_LOC_SIGNAL_TYPE_SBAS_L1_CA = 17, /**< SBAS L1_CA RF Band */ GNSS_LOC_SIGNAL_TYPE_NAVIC_L5 = 18, /**< NAVIC L5 RF Band */ - GNSS_LOC_MAX_NUMBER_OF_SIGNAL_TYPES = 19 /**< Maximum number of signal types */ + GNSS_LOC_SIGNAL_TYPE_BEIDOU_B2A_Q = 19, /**< BEIDOU B2A_Q RF Band */ + GNSS_LOC_MAX_NUMBER_OF_SIGNAL_TYPES = 20 /**< Maximum number of signal types */ } Gnss_LocSignalEnumType; typedef uint64_t GnssDataMask; diff --git a/utils/gps_extended_c.h b/utils/gps_extended_c.h index 9f4c13c..7fce3d7 100644 --- a/utils/gps_extended_c.h +++ b/utils/gps_extended_c.h @@ -492,6 +492,7 @@ typedef struct { uint64_t qzss_l2_sv_used_ids_mask; // QZSS L2 uint64_t qzss_l5_sv_used_ids_mask; // QZSS L5 uint64_t sbas_l1_sv_used_ids_mask; // SBAS L1 + uint64_t bds_b2aq_sv_used_ids_mask; // BDS B2AQ } GnssSvMbUsedInPosition; /* Body Frame parameters */ @@ -600,6 +601,8 @@ typedef uint32_t GnssSignalTypeMask; #define GNSS_SIGNAL_SBAS_L1 ((GnssSignalTypeMask)0x00020000ul) /** NAVIC L5 RF Band */ #define GNSS_SIGNAL_NAVIC_L5 ((GnssSignalTypeMask)0x00040000ul) +/** BEIDOU B2A_Q RF Band */ +#define GNSS_SIGNAL_BEIDOU_B2AQ ((GnssSignalTypeMask)0x00080000ul) typedef uint16_t GnssMeasUsageStatusBitMask; /** Used in fix */ -- cgit v1.2.3