From 40237117655607889fdcfd9ef1869740c122673e Mon Sep 17 00:00:00 2001 From: James Huang Date: Wed, 28 Aug 2024 17:25:09 +0800 Subject: [PATCH] gps: Update official release 4.15.3_6_240905_R2 config Add ENABLE_NLP_ALONG_WITH_UBP=0 in default carrier config Add ChipCfg_Timemark_Option=1 to enable 1pps timemark output Support follwoing cfg items to change sampling rate. AccelSamplingPeriodUs=10000 MagnSamplingPeriodUs=10000 GyroSamplingPeriodUs=10000 PressSamplingPeriodUs=50000 OrientationSamplingPeriodUs=10000 StepCounterSamplingPeriodUs=1000000 Bug: 321229708 Bug: 355590184 Bug: 362556705 Test: CTS/VTS, basic validation test/stress test/SST/field test Change-Id: I6a843679c21c01033d74658d7e28a4b2931b54f5 --- location/caiman/user/gps.cfg | 8 ++++++++ location/caiman/userdebug/gps.cfg | 10 ++++++++++ location/komodo/user/gps.cfg | 8 ++++++++ location/komodo/userdebug/gps.cfg | 10 ++++++++++ location/ripcurrent24/user/gps.cfg | 8 ++++++++ location/ripcurrent24/userdebug/gps.cfg | 10 ++++++++++ location/ripcurrentpro/user/gps.cfg | 8 ++++++++ location/ripcurrentpro/userdebug/gps.cfg | 10 ++++++++++ location/tokay/user/gps.cfg | 8 ++++++++ location/tokay/userdebug/gps.cfg | 10 ++++++++++ 10 files changed, 90 insertions(+) diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index 1a96deab..ea069019 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -18,6 +18,7 @@ gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc gnss_device_data_port_chpp_present=1 GlueLayer_YearOfHW=2023 scheduling_enabled=1 +ChipCfg_Timemark_Option=1 ChipCfg_VDR_high_end_Distance = 200 ChipCfg_VDR_low_end_Distance = 200 ChipCfg_VDR_high_end_Time = 20 @@ -54,6 +55,12 @@ GlueLayer_IsRilCIDReqEnable=0 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x25 +AccelSamplingPeriodUs=10000 +MagnSamplingPeriodUs=10000 +GyroSamplingPeriodUs=10000 +PressSamplingPeriodUs=50000 +OrientationSamplingPeriodUs=10000 +StepCounterSamplingPeriodUs=1000000 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 @@ -110,6 +117,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index b8c7e9fb..4c2c539d 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -53,6 +53,9 @@ gnss_device_data_port_chpp_present=1 GlueLayer_YearOfHW=2023 scheduling_enabled=1 +# 1pps timemark output: 0: disable 1: enable +ChipCfg_Timemark_Option=1 + # VDR End condition (meter, meter, sec, sec) ChipCfg_VDR_high_end_Distance = 200 ChipCfg_VDR_low_end_Distance = 200 @@ -189,6 +192,12 @@ GlueLayer_MeasCorrCap=7 # 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE # 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE Chip_Configuration_mems_data_Configuration=0x25 +AccelSamplingPeriodUs=10000 +MagnSamplingPeriodUs=10000 +GyroSamplingPeriodUs=10000 +PressSamplingPeriodUs=50000 +OrientationSamplingPeriodUs=10000 +StepCounterSamplingPeriodUs=1000000 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 @@ -266,6 +275,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index 7a3e0de5..807b489c 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -18,6 +18,7 @@ gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc gnss_device_data_port_chpp_present=1 GlueLayer_YearOfHW=2023 scheduling_enabled=1 +ChipCfg_Timemark_Option=1 ChipCfg_VDR_high_end_Distance = 200 ChipCfg_VDR_low_end_Distance = 200 ChipCfg_VDR_high_end_Time = 20 @@ -54,6 +55,12 @@ GlueLayer_IsRilCIDReqEnable=0 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x25 +AccelSamplingPeriodUs=10000 +MagnSamplingPeriodUs=10000 +GyroSamplingPeriodUs=10000 +PressSamplingPeriodUs=50000 +OrientationSamplingPeriodUs=10000 +StepCounterSamplingPeriodUs=1000000 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 @@ -110,6 +117,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index b512d8e4..555d1179 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -53,6 +53,9 @@ gnss_device_data_port_chpp_present=1 GlueLayer_YearOfHW=2023 scheduling_enabled=1 +# 1pps timemark output: 0: disable 1: enable +ChipCfg_Timemark_Option=1 + # VDR End condition (meter, meter, sec, sec) ChipCfg_VDR_high_end_Distance = 200 ChipCfg_VDR_low_end_Distance = 200 @@ -189,6 +192,12 @@ GlueLayer_MeasCorrCap=7 # 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE # 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE Chip_Configuration_mems_data_Configuration=0x25 +AccelSamplingPeriodUs=10000 +MagnSamplingPeriodUs=10000 +GyroSamplingPeriodUs=10000 +PressSamplingPeriodUs=50000 +OrientationSamplingPeriodUs=10000 +StepCounterSamplingPeriodUs=1000000 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 @@ -266,6 +275,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index cc216cd0..554454cd 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -18,6 +18,7 @@ gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc gnss_device_data_port_chpp_present=1 GlueLayer_YearOfHW=2023 scheduling_enabled=1 +ChipCfg_Timemark_Option=1 ChipCfg_VDR_high_end_Distance = 200 ChipCfg_VDR_low_end_Distance = 200 ChipCfg_VDR_high_end_Time = 20 @@ -54,6 +55,12 @@ GlueLayer_IsRilCIDReqEnable=0 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x25 +AccelSamplingPeriodUs=10000 +MagnSamplingPeriodUs=10000 +GyroSamplingPeriodUs=10000 +PressSamplingPeriodUs=50000 +OrientationSamplingPeriodUs=10000 +StepCounterSamplingPeriodUs=1000000 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 @@ -106,6 +113,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index db39bfff..d99fc8e0 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -53,6 +53,9 @@ gnss_device_data_port_chpp_present=1 GlueLayer_YearOfHW=2023 scheduling_enabled=1 +# 1pps timemark output: 0: disable 1: enable +ChipCfg_Timemark_Option=1 + # VDR End condition (meter, meter, sec, sec) ChipCfg_VDR_high_end_Distance = 200 ChipCfg_VDR_low_end_Distance = 200 @@ -189,6 +192,12 @@ GlueLayer_MeasCorrCap=7 # 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE # 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE Chip_Configuration_mems_data_Configuration=0x25 +AccelSamplingPeriodUs=10000 +MagnSamplingPeriodUs=10000 +GyroSamplingPeriodUs=10000 +PressSamplingPeriodUs=50000 +OrientationSamplingPeriodUs=10000 +StepCounterSamplingPeriodUs=1000000 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 @@ -262,6 +271,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index cc216cd0..554454cd 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -18,6 +18,7 @@ gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc gnss_device_data_port_chpp_present=1 GlueLayer_YearOfHW=2023 scheduling_enabled=1 +ChipCfg_Timemark_Option=1 ChipCfg_VDR_high_end_Distance = 200 ChipCfg_VDR_low_end_Distance = 200 ChipCfg_VDR_high_end_Time = 20 @@ -54,6 +55,12 @@ GlueLayer_IsRilCIDReqEnable=0 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x25 +AccelSamplingPeriodUs=10000 +MagnSamplingPeriodUs=10000 +GyroSamplingPeriodUs=10000 +PressSamplingPeriodUs=50000 +OrientationSamplingPeriodUs=10000 +StepCounterSamplingPeriodUs=1000000 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 @@ -106,6 +113,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index db39bfff..d99fc8e0 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -53,6 +53,9 @@ gnss_device_data_port_chpp_present=1 GlueLayer_YearOfHW=2023 scheduling_enabled=1 +# 1pps timemark output: 0: disable 1: enable +ChipCfg_Timemark_Option=1 + # VDR End condition (meter, meter, sec, sec) ChipCfg_VDR_high_end_Distance = 200 ChipCfg_VDR_low_end_Distance = 200 @@ -189,6 +192,12 @@ GlueLayer_MeasCorrCap=7 # 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE # 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE Chip_Configuration_mems_data_Configuration=0x25 +AccelSamplingPeriodUs=10000 +MagnSamplingPeriodUs=10000 +GyroSamplingPeriodUs=10000 +PressSamplingPeriodUs=50000 +OrientationSamplingPeriodUs=10000 +StepCounterSamplingPeriodUs=1000000 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 @@ -262,6 +271,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index e96d6dda..d843d3d8 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -18,6 +18,7 @@ gnss_device_data_port_chpp_spi_device=/dev/gnss_ipc gnss_device_data_port_chpp_present=1 GlueLayer_YearOfHW=2023 scheduling_enabled=1 +ChipCfg_Timemark_Option=1 ChipCfg_VDR_high_end_Distance = 200 ChipCfg_VDR_low_end_Distance = 200 ChipCfg_VDR_high_end_Time = 20 @@ -54,6 +55,12 @@ GlueLayer_IsRilCIDReqEnable=0 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 Chip_Configuration_mems_data_Configuration=0x25 +AccelSamplingPeriodUs=10000 +MagnSamplingPeriodUs=10000 +GyroSamplingPeriodUs=10000 +PressSamplingPeriodUs=50000 +OrientationSamplingPeriodUs=10000 +StepCounterSamplingPeriodUs=1000000 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 @@ -110,6 +117,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index 7ecd28c8..e1b6c8df 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -53,6 +53,9 @@ gnss_device_data_port_chpp_present=1 GlueLayer_YearOfHW=2023 scheduling_enabled=1 +# 1pps timemark output: 0: disable 1: enable +ChipCfg_Timemark_Option=1 + # VDR End condition (meter, meter, sec, sec) ChipCfg_VDR_high_end_Distance = 200 ChipCfg_VDR_low_end_Distance = 200 @@ -189,6 +192,12 @@ GlueLayer_MeasCorrCap=7 # 0x0010: CHIP_CONFIG_MEMS_ORIENTATION_AVAILABLE # 0x0020: CHIP_CONFIG_MEMS_STEPCOUNTER_AVAILABLE Chip_Configuration_mems_data_Configuration=0x25 +AccelSamplingPeriodUs=10000 +MagnSamplingPeriodUs=10000 +GyroSamplingPeriodUs=10000 +PressSamplingPeriodUs=50000 +OrientationSamplingPeriodUs=10000 +StepCounterSamplingPeriodUs=1000000 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 @@ -266,6 +275,7 @@ ENABLE_LPP_CP=1 ENABLE_LPP_UP=0 ENABLE_LPPE_CP=3 ENABLE_LPPE_UP=0 +ENABLE_NLP_ALONG_WITH_UBP=0 ENABLE_NLP_IN_LPPE=1 ENABLE_NLP_IN_AGNSS=0 ENABLE_LPP_HA_GAD_SHAPE=0