From b3683e372e68529fef0a5a5c0121e17a2bd50f98 Mon Sep 17 00:00:00 2001 From: James Huang Date: Sun, 5 May 2024 23:17:26 +0800 Subject: [PATCH] gps: Update gps: Update GNSS FW 4.15.1_7_P2_R3 + config for P24 Enable Navic (Chip_Configuration_GNSSConstConstraintDef = 0x60FF) Disable 1PPS feature by default (Is1PPSTimeSyncEnable=0) Bug: 336693604 Bug: 321020637 Test: Verify CTS/VTS, sanity test and SST in b/338492673 Change-Id: If23397117be814eec89195090a15e61b28240a10 --- location/caiman/user/gps.cfg | 7 ++++--- location/caiman/userdebug/gps.cfg | 12 +++++++----- location/komodo/user/gps.cfg | 7 ++++--- location/komodo/userdebug/gps.cfg | 12 +++++++----- location/ripcurrent24/user/gps.cfg | 8 +++++--- location/ripcurrent24/userdebug/gps.cfg | 13 ++++++++----- location/ripcurrentpro/user/gps.cfg | 8 +++++--- location/ripcurrentpro/userdebug/gps.cfg | 13 ++++++++----- location/tokay/user/gps.cfg | 7 ++++--- location/tokay/userdebug/gps.cfg | 12 +++++++----- 10 files changed, 59 insertions(+), 40 deletions(-) diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index cdef97f7..f756cfeb 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -9,6 +9,7 @@ gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +Is1PPSTimeSyncEnable=0 MaxNtnRefLocAgeSecs=600 GlueLayer_IsPlatformRefTimeEnable=1 chpp_betp_client=1 @@ -23,9 +24,8 @@ 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_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 @@ -33,6 +33,7 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +Chip_Configuration_FeatureCfg_MTPL = 0 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index cd2c428f..523b35b9 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -24,6 +24,9 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +# Enable/Disable 1PPS Time Sync policy +Is1PPSTimeSyncEnable=0 + MaxNtnRefLocAgeSecs=600 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK #Chip_Configuration_Io_Options=0x9 @@ -92,12 +95,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 +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 ### 2C48 L1 only MCW ### @@ -122,6 +122,8 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled, 1 = Enabled (default) Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index c678ba6f..189a0986 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -9,6 +9,7 @@ gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +Is1PPSTimeSyncEnable=0 MaxNtnRefLocAgeSecs=600 GlueLayer_IsPlatformRefTimeEnable=1 chpp_betp_client=1 @@ -23,9 +24,8 @@ 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_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 @@ -33,6 +33,7 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +Chip_Configuration_FeatureCfg_MTPL = 0 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index d4d70cf4..cae080f1 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -24,6 +24,9 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +# Enable/Disable 1PPS Time Sync policy +Is1PPSTimeSyncEnable=0 + MaxNtnRefLocAgeSecs=600 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK #Chip_Configuration_Io_Options=0x9 @@ -92,12 +95,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 +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 ### 2C48 L1 only MCW ### @@ -122,6 +122,8 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled, 1 = Enabled (default) Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index b0b1821f..9ee0f5cc 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -9,6 +9,7 @@ gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +Is1PPSTimeSyncEnable=0 MaxNtnRefLocAgeSecs=600 GlueLayer_IsPlatformRefTimeEnable=1 chpp_betp_client=1 @@ -23,9 +24,8 @@ 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_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 @@ -33,6 +33,7 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +Chip_Configuration_FeatureCfg_MTPL = 0 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 @@ -41,6 +42,7 @@ Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index 989b98a6..d21c4474 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -24,6 +24,9 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +# Enable/Disable 1PPS Time Sync policy +Is1PPSTimeSyncEnable=0 + MaxNtnRefLocAgeSecs=600 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK #Chip_Configuration_Io_Options=0x9 @@ -92,12 +95,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 +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 ### 2C48 L1 only MCW ### @@ -122,6 +122,8 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled, 1 = Enabled (default) Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 @@ -167,6 +169,7 @@ Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index b0b1821f..9ee0f5cc 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -9,6 +9,7 @@ gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +Is1PPSTimeSyncEnable=0 MaxNtnRefLocAgeSecs=600 GlueLayer_IsPlatformRefTimeEnable=1 chpp_betp_client=1 @@ -23,9 +24,8 @@ 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_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 @@ -33,6 +33,7 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +Chip_Configuration_FeatureCfg_MTPL = 0 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 @@ -41,6 +42,7 @@ Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index 989b98a6..d21c4474 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -24,6 +24,9 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +# Enable/Disable 1PPS Time Sync policy +Is1PPSTimeSyncEnable=0 + MaxNtnRefLocAgeSecs=600 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK #Chip_Configuration_Io_Options=0x9 @@ -92,12 +95,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 +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 ### 2C48 L1 only MCW ### @@ -122,6 +122,8 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled, 1 = Enabled (default) Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 @@ -167,6 +169,7 @@ Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 96dc360c..a4ffcb57 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -9,6 +9,7 @@ gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +Is1PPSTimeSyncEnable=0 MaxNtnRefLocAgeSecs=600 GlueLayer_IsPlatformRefTimeEnable=1 chpp_betp_client=1 @@ -23,9 +24,8 @@ 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_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 @@ -33,6 +33,7 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +Chip_Configuration_FeatureCfg_MTPL = 0 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index 5911e0c8..dff542f6 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -24,6 +24,9 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +# Enable/Disable 1PPS Time Sync policy +Is1PPSTimeSyncEnable=0 + MaxNtnRefLocAgeSecs=600 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK #Chip_Configuration_Io_Options=0x9 @@ -92,12 +95,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 +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 ### 2C48 L1 only MCW ### @@ -122,6 +122,8 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled, 1 = Enabled (default) Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1