From 2b0b39e63efe1a8a6b95be7274f90044eb0ab00f Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Mon, 26 Feb 2024 06:25:00 +0000 Subject: [PATCH 1/4] gps: update gps makefile Test: on-device Bug: 326527903 Change-Id: Ib4c9e9251e3d3dbb5b7bdfc24477cdc2e106a5e0 Merged-In: Ib4c9e9251e3d3dbb5b7bdfc24477cdc2e106a5e0 --- device-caiman.mk | 1 - device-komodo.mk | 1 - device-ripcurrent24.mk | 1 - device-ripcurrentpro.mk | 1 - device-tokay.mk | 1 - 5 files changed, 5 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 999cb551..0ee889cb 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -248,7 +248,6 @@ PRODUCT_SOONG_NAMESPACES += \ # Location # iGNSS -include device/google/gs-common/gps/lsi/s5400.mk # gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/caiman $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) diff --git a/device-komodo.mk b/device-komodo.mk index 31dd79ab..9261c8ad 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -271,7 +271,6 @@ PRODUCT_SOONG_NAMESPACES += \ # Location # iGNSS -include device/google/gs-common/gps/lsi/s5400.mk # gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/komodo $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk index f6970e68..8cf2cfa1 100644 --- a/device-ripcurrent24.mk +++ b/device-ripcurrent24.mk @@ -203,7 +203,6 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location # iGNSS -include device/google/gs-common/gps/lsi/s5400.mk # gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrent24 $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index c0332e19..4c6b4d5e 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -205,7 +205,6 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location # iGNSS -include device/google/gs-common/gps/lsi/s5400.mk # gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/ripcurrentpro $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) diff --git a/device-tokay.mk b/device-tokay.mk index 29da70f4..18e1ef8b 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -237,7 +237,6 @@ PRODUCT_SOONG_NAMESPACES += vendor/google_devices/caimito/prebuilts # Location # iGNSS -include device/google/gs-common/gps/lsi/s5400.mk # gps.cfg PRODUCT_SOONG_NAMESPACES += device/google/caimito/location/tokay $(call soong_config_set, gpssdk, buildtype, $(TARGET_BUILD_VARIANT)) From 8d92c0418299dafc4858979b2cef1955f623b17d Mon Sep 17 00:00:00 2001 From: Shinru Han Date: Wed, 17 Apr 2024 05:47:03 +0000 Subject: [PATCH 2/4] Disable RILC_REQ_GPS_GNSS_LPP_PROFILE_SET Disabling RILC_REQ_GPS_GNSS_LPP_PROFILE_SET because this is not needed and may cause CP reset after NTN to NT mode switch. Test: NTN test Bug: 333902499 Change-Id: I0d195c1dff3623d1b4a6560f0e0e7e6e8c3af904 --- location/caiman/user/gps.cfg | 2 +- location/caiman/userdebug/gps.cfg | 2 +- location/komodo/user/gps.cfg | 2 +- location/komodo/userdebug/gps.cfg | 2 +- location/ripcurrent24/user/gps.cfg | 2 +- location/ripcurrent24/userdebug/gps.cfg | 2 +- location/ripcurrentpro/user/gps.cfg | 2 +- location/ripcurrentpro/userdebug/gps.cfg | 2 +- location/tokay/user/gps.cfg | 2 +- location/tokay/userdebug/gps.cfg | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index 27becc0b..71631755 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -41,7 +41,7 @@ Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 PosReq_Supl2Params_SuplNiUdpPort=7275 -GlueLayer_LPPCpBitmask=0x17 +GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index 7c67135a..e0abe41b 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -165,7 +165,7 @@ Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 PosReq_Supl2Params_SuplNiUdpPort=7275 -GlueLayer_LPPCpBitmask=0x17 +GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index e1792b9d..e7d9f9cb 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -41,7 +41,7 @@ Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 PosReq_Supl2Params_SuplNiUdpPort=7275 -GlueLayer_LPPCpBitmask=0x17 +GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index e484f7c4..ff3d7568 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -165,7 +165,7 @@ Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 PosReq_Supl2Params_SuplNiUdpPort=7275 -GlueLayer_LPPCpBitmask=0x17 +GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index 4f22c7c4..f5a3d05f 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -41,7 +41,7 @@ Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 PosReq_Supl2Params_SuplNiUdpPort=7275 -GlueLayer_LPPCpBitmask=0x17 +GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index 3b476738..28228b88 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -165,7 +165,7 @@ Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 PosReq_Supl2Params_SuplNiUdpPort=7275 -GlueLayer_LPPCpBitmask=0x17 +GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index 4f22c7c4..f5a3d05f 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -41,7 +41,7 @@ Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 PosReq_Supl2Params_SuplNiUdpPort=7275 -GlueLayer_LPPCpBitmask=0x17 +GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index 3b476738..28228b88 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -165,7 +165,7 @@ Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 PosReq_Supl2Params_SuplNiUdpPort=7275 -GlueLayer_LPPCpBitmask=0x17 +GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 439480ea..1c555f46 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -41,7 +41,7 @@ Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 PosReq_Supl2Params_SuplNiUdpPort=7275 -GlueLayer_LPPCpBitmask=0x17 +GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index 81c1ff16..ecdb7434 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -165,7 +165,7 @@ Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 PosReq_Supl2Params_SuplNiUdpPort=7275 -GlueLayer_LPPCpBitmask=0x17 +GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 From c9ea059e76b32262102d9b1cfda0837c18817780 Mon Sep 17 00:00:00 2001 From: Kyle Hsiao Date: Mon, 22 Apr 2024 12:40:05 +0000 Subject: [PATCH 3/4] Add antenna position coordinates Bug: 336231717 Test: manual Merged-In: Ifc002eb234cf5df8b0fcbc7a78f2790fdd98496b Change-Id: Ifc002eb234cf5df8b0fcbc7a78f2790fdd98496b --- caiman/rro_overlays/NfcOverlay/res/values/config.xml | 10 ++++++++++ komodo/rro_overlays/NfcOverlay/res/values/config.xml | 10 ++++++++++ tokay/rro_overlays/NfcOverlay/res/values/config.xml | 10 ++++++++++ 3 files changed, 30 insertions(+) diff --git a/caiman/rro_overlays/NfcOverlay/res/values/config.xml b/caiman/rro_overlays/NfcOverlay/res/values/config.xml index 2036ad56..6ca3d091 100644 --- a/caiman/rro_overlays/NfcOverlay/res/values/config.xml +++ b/caiman/rro_overlays/NfcOverlay/res/values/config.xml @@ -23,4 +23,14 @@ true true + + 72 + 152 + false + + 36 + + + 108 + diff --git a/komodo/rro_overlays/NfcOverlay/res/values/config.xml b/komodo/rro_overlays/NfcOverlay/res/values/config.xml index 7a4fd608..1f9d2c41 100644 --- a/komodo/rro_overlays/NfcOverlay/res/values/config.xml +++ b/komodo/rro_overlays/NfcOverlay/res/values/config.xml @@ -23,4 +23,14 @@ true true + + 76 + 162 + false + + 38 + + + 112 + diff --git a/tokay/rro_overlays/NfcOverlay/res/values/config.xml b/tokay/rro_overlays/NfcOverlay/res/values/config.xml index bd074feb..15af9e0e 100644 --- a/tokay/rro_overlays/NfcOverlay/res/values/config.xml +++ b/tokay/rro_overlays/NfcOverlay/res/values/config.xml @@ -23,4 +23,14 @@ true true + + 72 + 152 + false + + 31 + + + 111 + From abf6f68528412eed7f65d6f8939275f66d52cd40 Mon Sep 17 00:00:00 2001 From: James Huang Date: Tue, 23 Apr 2024 14:10:43 +0800 Subject: [PATCH 4/4] gps: Update GNSS FW 4.15.1_5_P4 with config change for P24 Add Chip_Configuration_FeatureCfg_MTPL = 0 to disable MTPL Bug: 336179125 Test: CTS/VTS, GNSS sanity test and SST in b/336424148 Change-Id: I56c9859a13dba388321b499d11e16cd4ec2bf56e --- location/caiman/user/gps.cfg | 1 + location/caiman/userdebug/gps.cfg | 3 +++ location/komodo/user/gps.cfg | 1 + location/komodo/userdebug/gps.cfg | 3 +++ location/ripcurrent24/user/gps.cfg | 1 + location/ripcurrent24/userdebug/gps.cfg | 3 +++ location/ripcurrentpro/user/gps.cfg | 1 + location/ripcurrentpro/userdebug/gps.cfg | 5 ++++- location/tokay/user/gps.cfg | 1 + location/tokay/userdebug/gps.cfg | 3 +++ 10 files changed, 21 insertions(+), 1 deletion(-) diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index dad81cbe..04ed9616 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -23,6 +23,7 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 +Chip_Configuration_FeatureCfg_MTPL = 0 Chip_Configuration_GNSSConstConstraintDef = 0x60BF LocTech_Constraints = 0x60BF Chip_Configuration_RfMiscCtrl = 0x80008001 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index 700fcef1..168ead5c 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -92,6 +92,9 @@ Chip_Configuration_DCXO_CrystalType=0x11 # Range should be 2000 to 3100 #Chip_Configuration_DCXO_InflectionPoint=2855 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 + # L1 + L5 MCW Chip_Configuration_GNSSConstConstraintDef = 0x60BF LocTech_Constraints = 0x60BF diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index 89fae3f4..6afc375e 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -23,6 +23,7 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 +Chip_Configuration_FeatureCfg_MTPL = 0 Chip_Configuration_GNSSConstConstraintDef = 0x60BF LocTech_Constraints = 0x60BF Chip_Configuration_RfMiscCtrl = 0x80008001 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index e4919def..f08a8994 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -92,6 +92,9 @@ Chip_Configuration_DCXO_CrystalType=0x11 # Range should be 2000 to 3100 #Chip_Configuration_DCXO_InflectionPoint=2855 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 + # L1 + L5 MCW Chip_Configuration_GNSSConstConstraintDef = 0x60BF LocTech_Constraints = 0x60BF diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index a1d4e878..f254591c 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -23,6 +23,7 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 +Chip_Configuration_FeatureCfg_MTPL = 0 Chip_Configuration_GNSSConstConstraintDef = 0x60BF LocTech_Constraints = 0x60BF Chip_Configuration_RfMiscCtrl = 0x80008001 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index 3f75603a..27a7024e 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -92,6 +92,9 @@ Chip_Configuration_DCXO_CrystalType=0x11 # Range should be 2000 to 3100 #Chip_Configuration_DCXO_InflectionPoint=2855 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 + # L1 + L5 MCW Chip_Configuration_GNSSConstConstraintDef = 0x60BF LocTech_Constraints = 0x60BF diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index a1d4e878..f254591c 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -23,6 +23,7 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 +Chip_Configuration_FeatureCfg_MTPL = 0 Chip_Configuration_GNSSConstConstraintDef = 0x60BF LocTech_Constraints = 0x60BF Chip_Configuration_RfMiscCtrl = 0x80008001 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index 3f75603a..bf4434d5 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -92,6 +92,9 @@ Chip_Configuration_DCXO_CrystalType=0x11 # Range should be 2000 to 3100 #Chip_Configuration_DCXO_InflectionPoint=2855 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 + # L1 + L5 MCW Chip_Configuration_GNSSConstConstraintDef = 0x60BF LocTech_Constraints = 0x60BF @@ -171,7 +174,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x7 +Chip_Configuration_mems_data_Configuration=0x37 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=0x81 diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index d9da0bc0..109e63c6 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -23,6 +23,7 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 +Chip_Configuration_FeatureCfg_MTPL = 0 Chip_Configuration_GNSSConstConstraintDef = 0x60BF LocTech_Constraints = 0x60BF Chip_Configuration_RfMiscCtrl = 0x80008001 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index a8df3ad6..b9fc5134 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -92,6 +92,9 @@ Chip_Configuration_DCXO_CrystalType=0x11 # Range should be 2000 to 3100 #Chip_Configuration_DCXO_InflectionPoint=2855 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 + # L1 + L5 MCW Chip_Configuration_GNSSConstConstraintDef = 0x60BF LocTech_Constraints = 0x60BF