From faee7a6ae6caf514d6c02b285c7ee6ebcf6b59e5 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 4 May 2023 16:09:24 -0700 Subject: [PATCH] thermal: Adjust CLOSE-SUB1 VSKIN equation CLOSE-SUB1 will cause 5 degC VSKIN correlation gap for solar loading case, so adding a check to prevent over prediction Bug: 280447982 Test: adb shell "echo 50000 > dev/thermal/tz-by-name/outer_disp_therm/emul_temp" adb shell "echo 0 > dev/thermal/tz-by-name/outer_disp_therm/emul_temp" Change-Id: I3679ca4a72aa3585a0a0718013006fff54918893 --- thermal_info_config_charge_felix.json | 12 +++++++++++- thermal_info_config_felix.json | 12 +++++++++++- thermal_info_config_proactive_skin_felix.json | 12 +++++++++++- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/thermal_info_config_charge_felix.json b/thermal_info_config_charge_felix.json index fc256cf..ca67d3d 100644 --- a/thermal_info_config_charge_felix.json +++ b/thermal_info_config_charge_felix.json @@ -80,7 +80,7 @@ "Multiplier":1 }, { - "Name":"CLOSE-SUB1", + "Name":"CLOSE-SUB1-RAW", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -90,6 +90,16 @@ "Offset":-670, "Multiplier":0.001 }, + { + "Name":"CLOSE-SUB1", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"MINIMUM", + "Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"], + "Coefficient":[1.0, 49000.0], + "Multiplier":0.001 + }, { "Name":"CLOSE-SUB2", "Type":"UNKNOWN", diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json index 3920569..775e60f 100644 --- a/thermal_info_config_felix.json +++ b/thermal_info_config_felix.json @@ -86,7 +86,7 @@ "Multiplier":1 }, { - "Name":"CLOSE-SUB1", + "Name":"CLOSE-SUB1-RAW", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -96,6 +96,16 @@ "Offset":-670, "Multiplier":0.001 }, + { + "Name":"CLOSE-SUB1", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"MINIMUM", + "Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"], + "Coefficient":[1.0, 49000.0], + "Multiplier":0.001 + }, { "Name":"CLOSE-SUB2", "Type":"UNKNOWN", diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json index 32e4176..bd7b388 100644 --- a/thermal_info_config_proactive_skin_felix.json +++ b/thermal_info_config_proactive_skin_felix.json @@ -86,7 +86,7 @@ "Multiplier":1 }, { - "Name":"CLOSE-SUB1", + "Name":"CLOSE-SUB1-RAW", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -96,6 +96,16 @@ "Offset":-670, "Multiplier":0.001 }, + { + "Name":"CLOSE-SUB1", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"MINIMUM", + "Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"], + "Coefficient":[1.0, 49000.0], + "Multiplier":0.001 + }, { "Name":"CLOSE-SUB2", "Type":"UNKNOWN",