From a039a3d3ec1cdbfd44486b02d4b6e4443bfa2c09 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 20 Oct 2023 11:29:25 -0700 Subject: [PATCH] thermal: align the setting VSKIN related sensors Bug: 302435949 Test: emul_temp Change-Id: Ib2436ef6c715d0ddbe7f46afa1514a5a7f138477 --- thermal_info_config_cheetah.json | 12 ++++++------ thermal_info_config_panther.json | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json index 6ef7ea7..a492fd2 100644 --- a/thermal_info_config_cheetah.json +++ b/thermal_info_config_cheetah.json @@ -143,8 +143,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -159,8 +159,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -214,8 +214,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json index f0abf68..b786da2 100644 --- a/thermal_info_config_panther.json +++ b/thermal_info_config_panther.json @@ -143,8 +143,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -159,8 +159,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -214,8 +214,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -319,8 +319,8 @@ "VirtualSensor":true, "TriggerSensor":"quiet_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-QUIET-QI", "VIRTUAL-USB-QUIET", "VIRTUAL-QUIET-DISP", "VIRTUAL-NEUTRAL-QUIET"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN"], + "Coefficient":[1.0], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001,