From 941224c8451d391301ffa0fec6b8ab9565b361d0 Mon Sep 17 00:00:00 2001
From: Jia-yi Chen <jychen@google.com>
Date: Mon, 27 Sep 2021 17:53:49 -0700
Subject: [PATCH] thermal: update thermal config

1) Lower CRITICAL temperature of VIRTUAL-SKIN to 46.5
2) Update the virtual-sensor formula based on latest data

Bug: 201020972
Test: Boot
Change-Id: I5dd45635828932b4561ab1deafe10de66a924dcd
---
 thermal_info_config_oriole.json | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index 16e5a16..2c7fdc8 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -205,6 +205,31 @@
             "VrThreshold":"NAN",
             "Multiplier":0.001
         },
+        {
+            "Name":"VIRTUAL-QI-QUIET",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":[
+                "qi_therm",
+                "quiet_therm"
+            ],
+            "Coefficient":[
+                "0.25",
+                "0.75"
+            ],
+            "HotThreshold":[
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN",
+                "NAN"
+            ],
+            "VrThreshold":"NAN",
+            "Multiplier":0.001
+        },
         {
             "Name":"VIRTUAL-QI-BATT",
             "Type":"UNKNOWN",
@@ -291,7 +316,7 @@
             "Formula":"MAXIMUM",
             "Combination":[
                 "VIRTUAL-QI-GNSS",
-                "VIRTUAL-QI-BATT",
+                "VIRTUAL-QI-QUIET",
                 "VIRTUAL-USB2-DISP",
                 "VIRTUAL-QUIET-BATT"
             ],
@@ -306,7 +331,7 @@
                 "39.0",
                 "43.0",
                 "45.0",
-                "47.0",
+                "46.5",
                 "52.0",
                 "55.0"
             ],
@@ -315,7 +340,7 @@
                 1.9,
                 1.9,
                 1.9,
-                1.9,
+                1.4,
                 1.9,
                 1.9
             ],
@@ -458,7 +483,7 @@
             "Formula":"MAXIMUM",
             "Combination":[
                 "VIRTUAL-QI-GNSS",
-                "VIRTUAL-QI-BATT",
+                "VIRTUAL-QI-QUIET",
                 "VIRTUAL-USB2-DISP",
                 "VIRTUAL-QUIET-BATT"
             ],