commit 25f4d660db1ab16deaa90b560ca7908e4efa3760
author NT Tsai <nttsai@google.com> Fri Mar 03 13:29:37 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 03 13:29:37 2023 +0000
tree 3093de5703e49c9e047e2aa19192cb704953cfe1
parent 3587b2707a45aac12f764276c2d154ca15f2f98f
parent e6898a29f3c7e14990740788e591d4d5397b7b0e

Merge "thermal: register sensor for thermal diff between right and left inner display" into tm-qpr-dev

thermal_info_config_felix.json

diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json
index 733df89..77036e3 100644
--- a/thermal_info_config_felix.json
+++ b/thermal_info_config_felix.json
@@ -518,6 +518,37 @@
             "PassiveDelay":7000
         },
         {
+            "Name":"LEFT-INNER-DISPLAY",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["outer_disp_therm"],
+            "Coefficient":[1.56],
+            "Offset":-14540,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"RIGHT-INNER-DISPLAY",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"],
+            "Coefficient":[0.35, -0.2, 0.55, -0.95, 0.35, 0.8],
+            "Offset":3110,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"INNER-DISPLAY-DIFF",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["LEFT-INNER-DISPLAY", "RIGHT-INNER-DISPLAY"],
+            "Coefficient":[1.0, -1.0],
+            "Multiplier":0.001
+        },
+        {
             "Name":"LITTLE",
             "Type":"CPU",
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"],

thermal_info_config_proactive_skin_felix.json

diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json
index c719af2..0008d87 100644
--- a/thermal_info_config_proactive_skin_felix.json
+++ b/thermal_info_config_proactive_skin_felix.json
@@ -518,6 +518,37 @@
             "PassiveDelay":7000
         },
         {
+            "Name":"LEFT-INNER-DISPLAY",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["outer_disp_therm"],
+            "Coefficient":[1.56],
+            "Offset":-14540,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"RIGHT-INNER-DISPLAY",
+            "Type":"UNKNOWN",
+            "Hidden":true,
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"],
+            "Coefficient":[0.35, -0.2, 0.55, -0.95, 0.35, 0.8],
+            "Offset":3110,
+            "Multiplier":0.001
+        },
+        {
+            "Name":"INNER-DISPLAY-DIFF",
+            "Type":"UNKNOWN",
+            "VirtualSensor":true,
+            "Formula":"WEIGHTED_AVG",
+            "Combination":["LEFT-INNER-DISPLAY", "RIGHT-INNER-DISPLAY"],
+            "Coefficient":[1.0, -1.0],
+            "Multiplier":0.001
+        },
+        {
             "Name":"LITTLE",
             "Type":"CPU",
             "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"],