From 807c27a95efdd10454f7ffb0ee1f35d4e6d6acc4 Mon Sep 17 00:00:00 2001
From: sashwinbalaji <sashwinbalaji@google.com>
Date: Thu, 12 Jan 2023 10:47:58 +0800
Subject: [PATCH 1/2] thermal: Update trigger sensors

- Add disp_therm, neutral_therm as VSkin trigger sensors.
- Remove quiet_therm as trigger sensor.

Bug: 261149274
Test: Update local config and use emul_temp
Change-Id: I904af100ad5e684a24cfdeb3f600cf28ed2ccd78
---
 thermal_info_config_tangorpro.json | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/thermal_info_config_tangorpro.json b/thermal_info_config_tangorpro.json
index 6dd33f0..5c6708d 100644
--- a/thermal_info_config_tangorpro.json
+++ b/thermal_info_config_tangorpro.json
@@ -3,17 +3,17 @@
         {
             "Name":"neutral_therm",
             "Type":"UNKNOWN",
+            "HotThreshold":["NAN", "50.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
-            "Multiplier":0.001
+            "Multiplier":0.001,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
         },
         {
             "Name":"quiet_therm",
             "Type":"UNKNOWN",
-            "HotThreshold":["NAN", "35.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
-            "Multiplier":0.001,
-            "PollingDelay":60000,
-            "PassiveDelay":7000
+            "Multiplier":0.001
         },
         {
             "Name":"charger_skin_therm",
@@ -27,8 +27,11 @@
         {
             "Name":"disp_therm",
             "Type":"UNKNOWN",
+            "HotThreshold":["NAN", "37.0", "NAN", "NAN", "NAN", "NAN", "NAN"],
             "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
-            "Multiplier":0.001
+            "Multiplier":0.001,
+            "PollingDelay":60000,
+            "PassiveDelay":7000
         },
         {
             "Name":"battery",
@@ -106,7 +109,7 @@
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
             "VirtualSensor":true,
-            "TriggerSensor":"quiet_therm",
+            "TriggerSensor":["disp_therm", "neutral_therm"],
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"],
             "Coefficient":["1.0", "1.0", "1.0", "1.0"],
@@ -122,7 +125,7 @@
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
-            "TriggerSensor":"quiet_therm",
+            "TriggerSensor":["disp_therm", "neutral_therm"],
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"],
             "Coefficient":["1.0", "1.0", "1.0", "1.0"],
@@ -138,7 +141,7 @@
             "Type":"UNKNOWN",
             "Hidden":true,
             "VirtualSensor":true,
-            "TriggerSensor":"quiet_therm",
+            "TriggerSensor":["disp_therm", "neutral_therm"],
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"],
             "Coefficient":["1.0", "1.0", "1.0", "1.0"],

From cdee1127cfe7e22add5c916b4b1b9c4ff37147b6 Mon Sep 17 00:00:00 2001
From: sashwinbalaji <sashwinbalaji@google.com>
Date: Thu, 12 Jan 2023 11:48:24 +0800
Subject: [PATCH 2/2] thermal: Update Vskin shutdown threshold

Bug: 254021613
Test: use to emul_temp to trigger shutdown
Change-Id: Idba86c31cc49463e81f23577acacf261ea926600
---
 thermal_info_config_tangorpro.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/thermal_info_config_tangorpro.json b/thermal_info_config_tangorpro.json
index 5c6708d..300cc43 100644
--- a/thermal_info_config_tangorpro.json
+++ b/thermal_info_config_tangorpro.json
@@ -113,7 +113,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"],
             "Coefficient":["1.0", "1.0", "1.0", "1.0"],
-            "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "51.0", "140.0"],
+            "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "51.5", "56.0"],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
             "SendCallback":true,
@@ -129,7 +129,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"],
             "Coefficient":["1.0", "1.0", "1.0", "1.0"],
-            "HotThreshold":["NAN", "37.0", "43.0", "45.0", "47.0", "51.0", "140.0"],
+            "HotThreshold":["NAN", "37.0", "43.0", "45.0", "47.0", "51.5", "56.0"],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
             "SendPowerHint":true,
@@ -145,7 +145,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"],
             "Coefficient":["1.0", "1.0", "1.0", "1.0"],
-            "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "51.0", "140.0"],
+            "HotThreshold":["NAN", "39.0", "43.0", "45.0", "47.0", "51.5", "56.0"],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -210,7 +210,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-FRONT-SOC", "VIRTUAL-FRONT-BL", "VIRTUAL-BACK-SOC", "VIRTUAL-BACK-CHARGER"],
             "Coefficient":["1.0", "1.0", "1.0", "1.0"],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "138.0", "NAN"],
+            "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,
             "Monitor":true,