From 8818de994605607e174f7f02d6b580be638007ee Mon Sep 17 00:00:00 2001
From: James Huang <jamesshhuang@google.com>
Date: Wed, 20 Nov 2024 14:07:55 +0800
Subject: [PATCH] gps: Update official release 4.15.3_8_241114_R3 config on CT3

Update GNSS Power Stats
Update Chip_Configuration_AidingConfiguration to support Extend BE collection
Update
  Agnss_IsGloAidingEnable=0
  Agnss_IsGalAidingEnable=0
  Agnss_IsBdsAidingEnable=0

Bug: 372776707
Flag: EXEMPT Update GNSS configuration items
Test: CTS/VTS, basic validation test/Stress test/SST field test
Change-Id: I14af2a125ab7961951758bd4599666bfb8d6ec2b
---
 location/user/gps.cfg      | 36 ++++++++++++++------------
 location/userdebug/gps.cfg | 52 ++++++++++++++++++++++++--------------
 2 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/location/user/gps.cfg b/location/user/gps.cfg
index d41a982..0911a17 100644
--- a/location/user/gps.cfg
+++ b/location/user/gps.cfg
@@ -23,17 +23,17 @@ ChipCfg_VDR_high_end_Distance = 200
 ChipCfg_VDR_low_end_Distance = 200
 ChipCfg_VDR_high_end_Time = 20
 ChipCfg_VDR_low_end_Time = 20
-Chip_Configuration_AidingConfiguration=0x00020046
+Chip_Configuration_AidingConfiguration=0x000200C6
 Chip_Configuration_RefClkControl=0x24
 Chip_Configuration_DCXO_CrystalType=0x11
 Chip_Configuration_GNSSConstConstraintDef = 0x60FF
 LocTech_Constraints = 0x60FF
 Chip_Configuration_RfMiscCtrl = 0x80008001
 Chip_Configuration_ntn_option=2
-bdsUsedInUSPolicy=2
-sbasUsedInUSPolicy=2
-qzssUsedInUSPolicy=2
-navicUsedInUSPolicy=2
+bdsUsedPolicy=2
+sbasUsedPolicy=2
+qzssUsedPolicy=2
+navicUsedPolicy=2
 Chip_Configuration_FeatureCfg_DVS = 1
 Chip_Configuration_FeatureCfg_DFS = 1
 Chip_Configuration_FeatureCfg_MTPL = 1
@@ -43,7 +43,6 @@ gnss_rfic_chip_id=55400000
 UseRtcForAiding=1
 additional_rtc_uncertainty_ms=10
 Sif_UseFwXtraInterface=1
-Agnss_IsGloAidingEnable=0
 SETCaps_IsOtdoa=1
 SETCaps_IsLpp=1
 SETCaps_SuplUT1=20
@@ -70,16 +69,20 @@ UP_LocTech_PrimaryConst=0
 UP_LocTech_Constraints=1
 UP_LocTech_Requirements=0
 SpotLogger_Allowed=0
-SingleBandAcqPower=69
-MultiBandAcqPower=90
-SingleBandFullTrkPower=55
-MultiBandFullTrkPower=70
-SingleBandDutyCycleTrkPower=50
-MultiBandDutyCycleTrkPower=65
-SingleBandNmTrkPower=20
-MultiBandNmTrkPower=28
-SingleBandUdTrkPower=14
-MultiBandUdTrkPower=18
+SingleBandAcq=474
+MultiBandAcq=586
+SingleBandFullTrkNm=432
+SingleBandFullTrkUd=390
+MultiBandFullTrkNm=572
+MultiBandFullTrkUd=509
+SingleBandDutyCycleTrkNm=390
+SingleBandDutyCycleTrkUd=355
+MultiBandDutyCycleTrkNm=509
+MultiBandDutyCycleTrkUd=453
+SingleBandVddGnssNmTrk=145
+MultiBandVddGnssNmTrk=187
+SingleBandVddGnssUdTrk=103
+MultiBandVddGnssUdTrk=131
 path_delay_glo_12fx_cm = -5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455
 path_delay_gps_2fx_cm = 12342
 path_delay_bds_4fx_cm = 123
@@ -88,6 +91,7 @@ RfPathLossDb_Ap=3600
 RfPathLossDb_Cp=3600
 RfPathLossDb_L5_Ap=4300
 RfPathLossDb_L5_Cp=4300
+NmeaBitmask=0x010003fff
 IsUseEntireRespTime911=1
 isForceHighAccuracyMode=1
 cp_partial_reset_disable=1
diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg
index 0641d1f..6d08a8d 100644
--- a/location/userdebug/gps.cfg
+++ b/location/userdebug/gps.cfg
@@ -62,8 +62,17 @@ ChipCfg_VDR_low_end_Distance = 200
 ChipCfg_VDR_high_end_Time = 20
 ChipCfg_VDR_low_end_Time = 20
 
+# 0x01 = Precise time aiding
+# 0x02 = Coarse time aiding *
+# 0x04 = Local time aiding *
+# 0x08 = CP time aiding
+# 0x10 = Frequency counter aiding
+# 0x20 = Frequency non-counter aiding
+# 0x40 = CP Frequency aiding *
+# 0x80 = Extend BE collection  *
+# 0xFFFF0000  Frequency aiding PPM mask  (example - 0x00020000 is .2PPM)
 ### temporarily disable precise time aiding ###
-Chip_Configuration_AidingConfiguration=0x00020046
+Chip_Configuration_AidingConfiguration=0x000200C6
 
 # set shared reference clock for freq aiding (0x20)
 # enable dcxo (0x04)
@@ -120,13 +129,15 @@ Chip_Configuration_RfMiscCtrl = 0x80008001
 #Chip_Configuration_ntn_option=2 means turning GNSS off during NTN blackout period.
 Chip_Configuration_ntn_option=2
 
-# Disable BDS in the U.S.
-# 0-enabled (default), 1-disabled, 2-auto(disabled in US)
-#gloUsedInUSPolicy=2
-bdsUsedInUSPolicy=2
-sbasUsedInUSPolicy=2
-qzssUsedInUSPolicy=2
-navicUsedInUSPolicy=2
+# Certain constellation permission overriding LocTech config setting: only to possibly
+# disallow constellations allowed in LocTech, not vice versa. Note: GPS and GAL are
+# allowed in all markets so no such overriding.
+# 0: not to override (default), 1-disabled, 2- disabled if in US
+#gloUsedPolicy=2
+bdsUsedPolicy=2
+sbasUsedPolicy=2
+qzssUsedPolicy=2
+navicUsedPolicy=2
 
 # DVS: 0 = Disabled, 1 = Enabled (default)
 # DFS: 0 = Disabled, 1 = Enabled (default)
@@ -178,7 +189,6 @@ Sif_UseFwXtraInterface=1
 # The above sets the correct operation when the true week is between 1024 and 2048
 # ChipCfg_GetGpsWeekFloor=0
 
-Agnss_IsGloAidingEnable=0
 SETCaps_IsOtdoa=1
 SETCaps_IsLpp=1
 SETCaps_SuplUT1=20
@@ -213,16 +223,20 @@ UP_LocTech_Requirements=0
 SpotLogger_Allowed=0
 
 # GNSS power values in "mW"
-SingleBandAcqPower=69
-MultiBandAcqPower=90
-SingleBandFullTrkPower=55
-MultiBandFullTrkPower=70
-SingleBandDutyCycleTrkPower=50
-MultiBandDutyCycleTrkPower=65
-SingleBandNmTrkPower=20
-MultiBandNmTrkPower=28
-SingleBandUdTrkPower=14
-MultiBandUdTrkPower=18
+SingleBandAcq=474
+MultiBandAcq=586
+SingleBandFullTrkNm=432
+SingleBandFullTrkUd=390
+MultiBandFullTrkNm=572
+MultiBandFullTrkUd=509
+SingleBandDutyCycleTrkNm=390
+SingleBandDutyCycleTrkUd=355
+MultiBandDutyCycleTrkNm=509
+MultiBandDutyCycleTrkUd=453
+SingleBandVddGnssNmTrk=145
+MultiBandVddGnssNmTrk=187
+SingleBandVddGnssUdTrk=103
+MultiBandVddGnssUdTrk=131
 
 path_delay_glo_12fx_cm = -5070,-5042,-5004,-4986,-4938,-4886,-4829,-4758,-4662,-4578,-4484,-4459,-4436,-4455
 path_delay_gps_2fx_cm = 12342