From 6a3ea3d37c70c8d3b47310c70c1c1d5dbc64e1f8 Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
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
Change-Id: Ib957fae2db39f421c0b11c3b3b106f3ec333e4f5
(cherry picked from commit 68182cb0cbe267f6162b33b37f09ee80e314010e)
---
 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 6bbb5b0..d22c6fc 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 1b7c446..d1f0a8b 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",