From 96ab71498cef8b482946dc0365b0b16b27828bcb Mon Sep 17 00:00:00 2001 From: David Chao Date: Mon, 17 Oct 2022 17:19:18 +0800 Subject: [PATCH] thermal: update thermal config for EVT1.0 Based on Safety results to modify thermal formula V0.6 for EVT1.0. Bug: 253992204 Test: boot to home and thermal throttling worked properly. Change-Id: I545fd4d0fce8dadbf82c45f4f867eb06e811719b --- thermal_info_config_charge_lynx.json | 14 ++++++++++-- thermal_info_config_lynx.json | 32 ++++++++++++++++++---------- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/thermal_info_config_charge_lynx.json b/thermal_info_config_charge_lynx.json index 73b1e7a..edcd76d 100644 --- a/thermal_info_config_charge_lynx.json +++ b/thermal_info_config_charge_lynx.json @@ -101,6 +101,16 @@ "Coefficient":[0.35, 0.25, 0.2, 0.2], "Multiplier":0.001 }, + { + "Name":"VIRTUAL-SKIN2-USB2-DISP", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["skin_therm2", "usb_pwr_therm2", "disp_therm"], + "Coefficient":[0.42, 0.29, 0.29], + "Multiplier":0.001 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", @@ -108,8 +118,8 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm1", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP", "VIRTUAL-SKIN2-USB2-DISP"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, diff --git a/thermal_info_config_lynx.json b/thermal_info_config_lynx.json index 3d9c538..3ed30e3 100644 --- a/thermal_info_config_lynx.json +++ b/thermal_info_config_lynx.json @@ -101,15 +101,25 @@ "Coefficient":[0.35, 0.25, 0.2, 0.2], "Multiplier":0.001 }, + { + "Name":"VIRTUAL-SKIN2-USB2-DISP", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["skin_therm2", "usb_pwr_therm2", "disp_therm"], + "Coefficient":[0.42, 0.29, 0.29], + "Multiplier":0.001 + }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"0.5", + "Version":"0.6", "VirtualSensor":true, "TriggerSensor":"skin_therm1", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP", "VIRTUAL-SKIN2-USB2-DISP"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 39.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, @@ -129,8 +139,8 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm1", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP", "VIRTUAL-SKIN2-USB2-DISP"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 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, @@ -145,8 +155,8 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm1", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP", "VIRTUAL-SKIN2-USB2-DISP"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 37.0, 39.0, 41.0, 47.0, 52.0, 55.0], "HotHysteresis":[0.0, 0.9, 0.9, 0.9, 1.9, 1.9, 1.9], "Multiplier":0.001, @@ -209,8 +219,8 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm1", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP", "VIRTUAL-SKIN2-USB2-DISP"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "Multiplier":0.001, @@ -291,8 +301,8 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm1", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-NEU-QUT-DISP-GNSS-BATT", "VIRTUAL-NEU-DISP-SKIN1-GNSS-BATT", "VIRTUAL-SKIN2-USB2-DISP-BATT", "VIRTUAL-QUT-SKIN2-USB2-DISP", "VIRTUAL-SKIN2-USB2-DISP"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "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,