From 18d853c2949a307b1d0b96e469000a6b970774ff Mon Sep 17 00:00:00 2001 From: James Huang Date: Wed, 20 Mar 2024 10:03:10 +0800 Subject: [PATCH 1/2] gps: Update FW 4.15.0.153 with gps.cfg change Add Chip_Configuration_mems_data_Configuration=0x37 Bug: 330421581 Test: Do VTS/CTS and GNSS sanity test. Change-Id: I5fd215f417476be20917fffbc18611236db5af97 --- 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 de418752..7cc3539c 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/user/gps.cfg @@ -43,7 +43,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x17 +Chip_Configuration_mems_data_Configuration=0x37 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 diff --git a/location/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index e6bc3084..1e3a52b2 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/userdebug/gps.cfg @@ -166,7 +166,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x17 +Chip_Configuration_mems_data_Configuration=0x37 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 diff --git a/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index 08e8f987..57b55a8b 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/user/gps.cfg @@ -43,7 +43,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x17 +Chip_Configuration_mems_data_Configuration=0x37 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 diff --git a/location/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index de916911..f162f4dd 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/userdebug/gps.cfg @@ -166,7 +166,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x17 +Chip_Configuration_mems_data_Configuration=0x37 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 diff --git a/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index 7d825ebf..734c4595 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/user/gps.cfg @@ -43,7 +43,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x17 +Chip_Configuration_mems_data_Configuration=0x37 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index e7a5c08d..a89b6f51 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/userdebug/gps.cfg @@ -166,7 +166,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x17 +Chip_Configuration_mems_data_Configuration=0x37 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index 7d825ebf..734c4595 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/user/gps.cfg @@ -43,7 +43,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x17 +Chip_Configuration_mems_data_Configuration=0x37 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index e7a5c08d..a89b6f51 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/userdebug/gps.cfg @@ -166,7 +166,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x17 +Chip_Configuration_mems_data_Configuration=0x37 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 935172d5..3092ec56 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/user/gps.cfg @@ -43,7 +43,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x17 +Chip_Configuration_mems_data_Configuration=0x37 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 diff --git a/location/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index b52b9397..0e3861d2 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/userdebug/gps.cfg @@ -166,7 +166,7 @@ GlueLayer_isReqDBHFromFwRefLoc=1 GlueLayer_isReqUBPFromPressureSensor=1 GlueLayer_IsMemsEnable=1 GlueLayer_MeasCorrCap=7 -Chip_Configuration_mems_data_Configuration=0x17 +Chip_Configuration_mems_data_Configuration=0x37 Chip_Configuration_FeatureCfg_ANDRD_MEAS_CORR_ENABLE=1 CP_LocTech_PrimaryConst=0 CP_LocTech_Constraints=1 From 37b99c032de932e024eae5da71c4130204b42191 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 8 Mar 2024 19:24:20 +0000 Subject: [PATCH 2/2] thermal: update rule to identify non WLC scenarios Change the rule to identify wireless charge according to the latest hda definition from bms driver pa/2736243 Bug: 324267311 Test: boot to home Change-Id: Ice9b38201cbbe868784ac389e799cc24e8f8b7ff --- thermal/thermal_info_config_caiman.json | 18 ++++++++++++++---- thermal/thermal_info_config_charge_caiman.json | 18 ++++++++++++++---- thermal/thermal_info_config_charge_komodo.json | 18 ++++++++++++++---- thermal/thermal_info_config_charge_tokay.json | 18 ++++++++++++++---- thermal/thermal_info_config_komodo.json | 18 ++++++++++++++---- thermal/thermal_info_config_tokay.json | 18 ++++++++++++++---- 6 files changed, 84 insertions(+), 24 deletions(-) diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 01851059..b264c94d 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -800,13 +800,23 @@ "Multiplier":1 }, { - "Name":"IS_WIRED_CHARGE", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[-1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -817,7 +827,7 @@ "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", "Combination":["VIRTUAL-SKIN-CHARGE"], - "Coefficient":["IS_WIRED_CHARGE"], + "Coefficient":["NO_WLC"], "CoefficientType": ["SENSOR"], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], diff --git a/thermal/thermal_info_config_charge_caiman.json b/thermal/thermal_info_config_charge_caiman.json index 647f240b..128bd6ef 100644 --- a/thermal/thermal_info_config_charge_caiman.json +++ b/thermal/thermal_info_config_charge_caiman.json @@ -137,13 +137,23 @@ "Multiplier":1 }, { - "Name":"IS_WIRED_CHARGE", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[-1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -154,7 +164,7 @@ "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", "Combination":["VIRTUAL-SKIN-CHARGE"], - "Coefficient":["IS_WIRED_CHARGE"], + "Coefficient":["NO_WLC"], "CoefficientType": ["SENSOR"], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], diff --git a/thermal/thermal_info_config_charge_komodo.json b/thermal/thermal_info_config_charge_komodo.json index 43e12c1a..e198b676 100644 --- a/thermal/thermal_info_config_charge_komodo.json +++ b/thermal/thermal_info_config_charge_komodo.json @@ -137,13 +137,23 @@ "Multiplier":1 }, { - "Name":"IS_WIRED_CHARGE", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[-1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -154,7 +164,7 @@ "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", "Combination":["VIRTUAL-SKIN-CHARGE"], - "Coefficient":["IS_WIRED_CHARGE"], + "Coefficient":["NO_WLC"], "CoefficientType": ["SENSOR"], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], diff --git a/thermal/thermal_info_config_charge_tokay.json b/thermal/thermal_info_config_charge_tokay.json index ab492166..80ec6191 100644 --- a/thermal/thermal_info_config_charge_tokay.json +++ b/thermal/thermal_info_config_charge_tokay.json @@ -159,13 +159,23 @@ "Multiplier":1 }, { - "Name":"IS_WIRED_CHARGE", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[-1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -176,7 +186,7 @@ "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", "Combination":["VIRTUAL-SKIN-CHARGE"], - "Coefficient":["IS_WIRED_CHARGE"], + "Coefficient":["NO_WLC"], "CoefficientType": ["SENSOR"], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index a3adb6ec..09df8723 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -798,13 +798,23 @@ "Multiplier":1 }, { - "Name":"IS_WIRED_CHARGE", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[-1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -815,7 +825,7 @@ "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", "Combination":["VIRTUAL-SKIN-CHARGE"], - "Coefficient":["IS_WIRED_CHARGE"], + "Coefficient":["NO_WLC"], "CoefficientType": ["SENSOR"], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index 39106fda..fef7e9c1 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -858,13 +858,23 @@ "Multiplier":1 }, { - "Name":"IS_WIRED_CHARGE", + "Name":"WLC_CHECK", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"COUNT_THRESHOLD", - "Combination":["thb_hda"], - "Coefficient":[-1], + "Combination":["thb_hda", "thb_hda"], + "Coefficient":[1, -51], + "Multiplier":1 + }, + { + "Name":"NO_WLC", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["WLC_CHECK"], + "Coefficient":[-2], "Multiplier":1 }, { @@ -875,7 +885,7 @@ "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"WEIGHTED_AVG", "Combination":["VIRTUAL-SKIN-CHARGE"], - "Coefficient":["IS_WIRED_CHARGE"], + "Coefficient":["NO_WLC"], "CoefficientType": ["SENSOR"], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],