From 85b00d60b9a2b3c42d193ffcd065242587aeb29d Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 28 Oct 2022 17:57:34 +0800 Subject: [PATCH] thermal: update thermal table v3 Fix the correlation issue for high RF power case Bug: 254735947 Test: build Change-Id: Ic1e3e8f49324e8169417da695192fa786521e583 --- thermal_info_config_charge_felix.json | 126 ++++++++++++++++++----- thermal_info_config_felix.json | 138 ++++++++++++++++++++------ 2 files changed, 210 insertions(+), 54 deletions(-) diff --git a/thermal_info_config_charge_felix.json b/thermal_info_config_charge_felix.json index 345e4c3..d00234c 100644 --- a/thermal_info_config_charge_felix.json +++ b/thermal_info_config_charge_felix.json @@ -63,7 +63,7 @@ "Multiplier":0.001 }, { - "Name":"IS_UNFOLD", + "Name":"IS_OPEN", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -73,7 +73,7 @@ "Multiplier":1 }, { - "Name":"IS_FOLD", + "Name":"IS_CLOSE", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -83,74 +83,152 @@ "Multiplier":1 }, { - "Name":"UNFOLD-NEUTRAL-SKIN-USB", + "Name":"CLOSE-SUB1", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm"], - "Coefficient":[0.15, 0.6, 0.2], - "Offset":2000, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[0.06, 0.06, 0.7, 0.06, 0.06, 0.06], + "Offset":-1800, "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-UNFOLD-SUB", + "Name":"CLOSE-SUB2", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-0.3, -0.3, -0.3, 2.5, -0.3, -0.3], + "Offset":-18000, + "Multiplier":0.001 + }, + { + "Name":"CLOSE-SUB3", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-0.05, -0.05, 1.25, -0.05, -0.05, -0.05], + "Offset":-5000, + "Multiplier":0.001 + }, + { + "Name":"CLOSE-SUB4", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-0.09, -0.09, -0.09, -0.09, 1.45, -0.09], + "Offset":0, + "Multiplier":0.001 + }, + { + "Name":"CLOSE-SUB5", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-1.45, 0.49, 0.49, 0.49, 0.49, 0.49], + "Offset":-2000, + "Multiplier":0.001 + }, + { + "Name":"CLOSE-SUB-MAX", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"MAXIMUM", - "Combination":["UNFOLD-NEUTRAL-SKIN-USB", "neutral_therm", "skin_therm"], - "Coefficient":[1.0, 0.84, 0.955], + "Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-UNFOLD", + "Name":"VIRTUAL-SKIN-CLOSE", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-UNFOLD-SUB", "IS_FOLD"], + "Combination":["CLOSE-SUB-MAX", "IS_OPEN"], "Coefficient":[1.0, -1000000], "Multiplier":0.001 }, { - "Name":"FOLD-SKIN-QUIET-NEUTRAL", + "Name":"OPEN-SUB1", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["skin_therm", "quiet_therm", "neutral_therm"], - "Coefficient":[0.6, 0.1, 0.3], + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-0.55, 0.31, 0.31, 0.31, 0.31, 0.31], + "Offset":1000, "Multiplier":0.001 }, { - "Name":"FOLD-SKIN-MINUS-2.2", + "Name":"OPEN-SUB2", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["skin_therm"], - "Coefficient":[1], - "Offset":-2200, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[0.01, 0.01, 0.95, 0.01, 0.01, 0.01], + "Offset":-2500, "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-FOLD-SUB", + "Name":"OPEN-SUB3", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[0.09, 0.09, 0.09, 0.09, 0.055, 0.09], + "Offset":500, + "Multiplier":0.001 + }, + { + "Name":"OPEN-SUB4", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-0.03, -0.03, -0.03, -0.03, -0.03, 1.15], + "Offset":500, + "Multiplier":0.001 + }, + { + "Name":"OPEN-SUB5", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-0.5, 0.3, 0.3, 0.3, 0.3, 0.3], + "Offset":1200, + "Multiplier":0.001 + }, + { + "Name":"OPEN-SUB-MAX", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"MAXIMUM", - "Combination":["FOLD-SKIN-QUIET-NEUTRAL", "neutral_therm", "FOLD-SKIN-MINUS-2.2"], - "Coefficient":[1.0, 1.0, 1.0], + "Combination":["OPEN-SUB1", "OPEN-SUB2", "OPEN-SUB3", "OPEN-SUB4", "OPEN-SUB5"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-FOLD", + "Name":"VIRTUAL-SKIN-OPEN", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-FOLD-SUB", "IS_UNFOLD"], + "Combination":["OPEN-SUB-MAX", "IS_CLOSE"], "Coefficient":[1.0, -1000000], "Multiplier":0.001 }, @@ -161,7 +239,7 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-UNFOLD", "VIRTUAL-SKIN-FOLD"], + "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json index 556ebb8..10d864b 100644 --- a/thermal_info_config_felix.json +++ b/thermal_info_config_felix.json @@ -69,7 +69,7 @@ "Multiplier":0.001 }, { - "Name":"IS_UNFOLD", + "Name":"IS_OPEN", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -79,7 +79,7 @@ "Multiplier":1 }, { - "Name":"IS_FOLD", + "Name":"IS_CLOSE", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -89,85 +89,163 @@ "Multiplier":1 }, { - "Name":"UNFOLD-NEUTRAL-SKIN-USB", + "Name":"CLOSE-SUB1", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm"], - "Coefficient":[0.15, 0.6, 0.2], - "Offset":2000, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[0.06, 0.06, 0.7, 0.06, 0.06, 0.06], + "Offset":-1800, "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-UNFOLD-SUB", + "Name":"CLOSE-SUB2", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-0.3, -0.3, -0.3, 2.5, -0.3, -0.3], + "Offset":-18000, + "Multiplier":0.001 + }, + { + "Name":"CLOSE-SUB3", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-0.05, -0.05, 1.25, -0.05, -0.05, -0.05], + "Offset":-5000, + "Multiplier":0.001 + }, + { + "Name":"CLOSE-SUB4", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-0.09, -0.09, -0.09, -0.09, 1.45, -0.09], + "Offset":0, + "Multiplier":0.001 + }, + { + "Name":"CLOSE-SUB5", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-1.45, 0.49, 0.49, 0.49, 0.49, 0.49], + "Offset":-2000, + "Multiplier":0.001 + }, + { + "Name":"CLOSE-SUB-MAX", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"MAXIMUM", - "Combination":["UNFOLD-NEUTRAL-SKIN-USB", "neutral_therm", "skin_therm"], - "Coefficient":[1.0, 0.84, 0.955], + "Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-UNFOLD", + "Name":"VIRTUAL-SKIN-CLOSE", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-UNFOLD-SUB", "IS_FOLD"], + "Combination":["CLOSE-SUB-MAX", "IS_OPEN"], "Coefficient":[1.0, -1000000], "Multiplier":0.001 }, { - "Name":"FOLD-SKIN-QUIET-NEUTRAL", + "Name":"OPEN-SUB1", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["skin_therm", "quiet_therm", "neutral_therm"], - "Coefficient":[0.6, 0.1, 0.3], + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-0.55, 0.31, 0.31, 0.31, 0.31, 0.31], + "Offset":1000, "Multiplier":0.001 }, { - "Name":"FOLD-SKIN-MINUS-2.2", + "Name":"OPEN-SUB2", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["skin_therm"], - "Coefficient":[1], - "Offset":-2200, + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[0.01, 0.01, 0.95, 0.01, 0.01, 0.01], + "Offset":-2500, "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-FOLD-SUB", + "Name":"OPEN-SUB3", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[0.09, 0.09, 0.09, 0.09, 0.055, 0.09], + "Offset":500, + "Multiplier":0.001 + }, + { + "Name":"OPEN-SUB4", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-0.03, -0.03, -0.03, -0.03, -0.03, 1.15], + "Offset":500, + "Multiplier":0.001 + }, + { + "Name":"OPEN-SUB5", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "gnss_tcxo_therm"], + "Coefficient":[-0.5, 0.3, 0.3, 0.3, 0.3, 0.3], + "Offset":1200, + "Multiplier":0.001 + }, + { + "Name":"OPEN-SUB-MAX", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"MAXIMUM", - "Combination":["FOLD-SKIN-QUIET-NEUTRAL", "neutral_therm", "FOLD-SKIN-MINUS-2.2"], - "Coefficient":[1.0, 1.0, 1.0], + "Combination":["OPEN-SUB1", "OPEN-SUB2", "OPEN-SUB3", "OPEN-SUB4", "OPEN-SUB5"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-FOLD", + "Name":"VIRTUAL-SKIN-OPEN", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["VIRTUAL-SKIN-FOLD-SUB", "IS_UNFOLD"], + "Combination":["OPEN-SUB-MAX", "IS_CLOSE"], "Coefficient":[1.0, -1000000], "Multiplier":0.001 }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"1.1", + "Version":"0.3", "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-UNFOLD", "VIRTUAL-SKIN-FOLD"], + "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 140.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], @@ -189,7 +267,7 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-UNFOLD", "VIRTUAL-SKIN-FOLD"], + "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], @@ -204,7 +282,7 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-UNFOLD", "VIRTUAL-SKIN-FOLD"], + "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[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], @@ -220,7 +298,7 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-UNFOLD", "VIRTUAL-SKIN-FOLD"], + "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], @@ -276,7 +354,7 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-UNFOLD", "VIRTUAL-SKIN-FOLD"], + "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 140.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], @@ -314,7 +392,7 @@ "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-UNFOLD", "VIRTUAL-SKIN-FOLD"], + "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],