From 6c2cd58841b3e8e93041573ec17f8e748e90355c Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 5 Jul 2023 23:26:34 -0700 Subject: [PATCH] thermal: Update VSKIN equation V06.2 Bug: 289752109 Test: adb shell dumpsys android.hardware.thermal.IThermal/default (cherry picked from commit 68182cb0cbe267f6162b33b37f09ee80e314010e) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6a3ea3d37c70c8d3b47310c70c1c1d5dbc64e1f8) Merged-In: Ib957fae2db39f421c0b11c3b3b106f3ec333e4f5 Change-Id: Ib957fae2db39f421c0b11c3b3b106f3ec333e4f5 --- thermal_info_config_charge_felix.json | 6 +++--- thermal_info_config_felix.json | 8 ++++---- thermal_info_config_proactive_skin_felix.json | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/thermal_info_config_charge_felix.json b/thermal_info_config_charge_felix.json index ceb9181..80cd32c 100644 --- a/thermal_info_config_charge_felix.json +++ b/thermal_info_config_charge_felix.json @@ -204,9 +204,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], - "Coefficient":[0.15, 1.05, -0.65, 1, -0.55], - "Offset":3540, + "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"], + "Coefficient":[0.429, 0.314, 0.205], + "Offset":2600, "Multiplier":0.001 }, { diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json index 6a35aab..e55585e 100644 --- a/thermal_info_config_felix.json +++ b/thermal_info_config_felix.json @@ -210,9 +210,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], - "Coefficient":[0.15, 1.05, -0.65, 1, -0.55], - "Offset":3540, + "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"], + "Coefficient":[0.429, 0.314, 0.205], + "Offset":2600, "Multiplier":0.001 }, { @@ -238,7 +238,7 @@ { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"0.5", + "Version":"6.2", "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM", diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json index 1a6321f..a603558 100644 --- a/thermal_info_config_proactive_skin_felix.json +++ b/thermal_info_config_proactive_skin_felix.json @@ -210,9 +210,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], - "Coefficient":[0.15, 1.05, -0.65, 1, -0.55], - "Offset":3540, + "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"], + "Coefficient":[0.429, 0.314, 0.205], + "Offset":2600, "Multiplier":0.001 }, { @@ -238,7 +238,7 @@ { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"0.5", + "Version":"6.2", "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM",