From 4a40152e898f38f6af0479ef9a928a73e6c649f8 Mon Sep 17 00:00:00 2001 From: David Chao Date: Fri, 8 Nov 2024 07:54:11 +0000 Subject: [PATCH] thermal: update thermal config thb_hda behavior is changed to align with P24 devices, update WLC_CHECK with thb_hda changed. Flag: EXEMPT config update Bug: 377595455 Test: boot to home and thermal throttling worked properly Change-Id: I83005da7543c5886dc695bcee11bcc245588c88e --- thermal/thermal_info_config_charge_husky.json | 21 ++++++++++++++----- thermal/thermal_info_config_charge_shiba.json | 21 ++++++++++++++----- thermal/thermal_info_config_husky.json | 21 ++++++++++++++----- thermal/thermal_info_config_shiba.json | 21 ++++++++++++++----- 4 files changed, 64 insertions(+), 20 deletions(-) diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index 66b949d..bbbf891 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -127,13 +127,23 @@ "Multiplier":1 }, { - "Name":"IS_WLC", + "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 }, { @@ -153,8 +163,9 @@ "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], - "Coefficient":[1.0, -1000000], + "Combination":["VIRTUAL-SKIN-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], "Multiplier":0.001, diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json index 25fa05d..d539875 100644 --- a/thermal/thermal_info_config_charge_shiba.json +++ b/thermal/thermal_info_config_charge_shiba.json @@ -160,13 +160,23 @@ "Multiplier":1 }, { - "Name":"IS_WLC", + "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 }, { @@ -186,8 +196,9 @@ "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], - "Coefficient":[1.0, -1000000], + "Combination":["VIRTUAL-SKIN-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], "Multiplier":0.001, diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 29c24cd..4697c5e 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -717,13 +717,23 @@ "Multiplier":1 }, { - "Name":"IS_WLC", + "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 }, { @@ -743,8 +753,9 @@ "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], - "Coefficient":[1.0, -1000000], + "Combination":["VIRTUAL-SKIN-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], "Multiplier":0.001, diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 82c6fbc..0d59047 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -729,13 +729,23 @@ "Multiplier":1 }, { - "Name":"IS_WLC", + "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 }, { @@ -755,8 +765,9 @@ "VirtualSensor":true, "TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], - "Coefficient":[1.0, -1000000], + "Combination":["VIRTUAL-SKIN-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], "Multiplier":0.001,