From bfec851399a5377709e75f1c1069676bdcb01270 Mon Sep 17 00:00:00 2001
From: TeYuan Wang <kamewang@google.com>
Date: Fri, 20 Oct 2023 11:48:30 -0700
Subject: [PATCH] thermal: align the setting VSKIN related sensors

Bug: 302435949
Test: emul_temp
Change-Id: Ib8ca404fe575ade08146e612354f8f06734eab72
---
 thermal_info_config_bluejay.json | 38 +++++++++-----------------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/thermal_info_config_bluejay.json b/thermal_info_config_bluejay.json
index 6d90a20..a8a1166 100644
--- a/thermal_info_config_bluejay.json
+++ b/thermal_info_config_bluejay.json
@@ -261,8 +261,8 @@
             "VirtualSensor":true,
             "TriggerSensor":"neutral_therm",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL", "VIRTUAL-QUIET-NEUTRAL"],
-            "Coefficient":["1.0", "1.0", "1.0"],
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":["1.0"],
             "HotThreshold":["NAN", 37.0, 43.0, 45.0, 47.0, 52.0, 55.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
@@ -277,8 +277,8 @@
             "VirtualSensor":true,
             "TriggerSensor":"neutral_therm",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL", "VIRTUAL-QUIET-NEUTRAL"],
-            "Coefficient":["1.0", "1.0", "1.0"],
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":["1.0"],
             "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 52.0, 140.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
@@ -333,8 +333,8 @@
             "VirtualSensor":true,
             "TriggerSensor":"neutral_therm",
             "Formula":"MAXIMUM",
-            "Combination":["VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL", "VIRTUAL-QUIET-NEUTRAL"],
-            "Coefficient":["1.0", "1.0", "1.0"],
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":["1.0"],
             "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
@@ -397,16 +397,8 @@
             "VirtualSensor":true,
             "TriggerSensor":"neutral_therm",
             "Formula":"MAXIMUM",
-            "Combination":[
-                "VIRTUAL-NEUTRAL-SKIN2",
-                "VIRTUAL-NEUTRAL",
-                "VIRTUAL-QUIET-NEUTRAL"
-            ],
-            "Coefficient":[
-                "1.0",
-                "1.0",
-                "1.0"
-            ],
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":["1.0"],
             "HotThreshold":[
                 "NAN",
                 "39.0",
@@ -447,16 +439,8 @@
             "VirtualSensor":true,
             "TriggerSensor":"neutral_therm",
             "Formula":"MAXIMUM",
-            "Combination":[
-                "VIRTUAL-NEUTRAL-SKIN2",
-                "VIRTUAL-NEUTRAL",
-                "VIRTUAL-QUIET-NEUTRAL"
-            ],
-            "Coefficient":[
-                "1.0",
-                "1.0",
-                "1.0"
-            ],
+            "Combination":["VIRTUAL-SKIN"],
+            "Coefficient":["1.0"],
             "HotThreshold":[
                 "NAN",
                 "NAN",
@@ -1210,4 +1194,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}