From 35bdb22a0a35a9c9de62179bfe8e264094d869b7 Mon Sep 17 00:00:00 2001 From: Ramya Subramanian Date: Mon, 23 Oct 2023 22:15:20 +0000 Subject: [PATCH] thermal: updated BTS equations Bug: 297083757 Test: Tested on CM4/KM4, boot to home and with thermal recorder Change-Id: I489613010ae04851bd713d3d9c74ede15661d191 Signed-off-by: Ramya Subramanian --- thermal/thermal_info_config_caiman.json | 6 +++--- thermal/thermal_info_config_caiman_proto.json | 6 +++--- thermal/thermal_info_config_komodo.json | 6 +++--- thermal/thermal_info_config_komodo_proto.json | 6 +++--- thermal/thermal_info_config_tokay.json | 14 -------------- thermal/thermal_info_config_tokay_proto.json | 14 -------------- 6 files changed, 12 insertions(+), 40 deletions(-) diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 9e17ac10..9b168bcf 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -169,9 +169,9 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["rfpa_therm", "north_therm"], - "Coefficient":[0.05, 0.14], - "Offset":560, + "Combination":["quiet_therm"], + "Coefficient":[0.105], + "Offset":2576, "Multiplier":0.001 }, { diff --git a/thermal/thermal_info_config_caiman_proto.json b/thermal/thermal_info_config_caiman_proto.json index 3072359c..53d57b41 100644 --- a/thermal/thermal_info_config_caiman_proto.json +++ b/thermal/thermal_info_config_caiman_proto.json @@ -169,9 +169,9 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["rfpa_therm", "north_therm"], - "Coefficient":[0.05, 0.14], - "Offset":560, + "Combination":["quiet_therm"], + "Coefficient":[0.105], + "Offset":2576, "Multiplier":0.001 }, { diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 1de469f2..77a1ede5 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -169,9 +169,9 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["rfpa_therm", "north_therm"], - "Coefficient":[0.05, 0.14], - "Offset":560, + "Combination":["quiet_therm"], + "Coefficient":[0.088], + "Offset":1882, "Multiplier":0.001 }, { diff --git a/thermal/thermal_info_config_komodo_proto.json b/thermal/thermal_info_config_komodo_proto.json index 95f60ca9..61ecc970 100644 --- a/thermal/thermal_info_config_komodo_proto.json +++ b/thermal/thermal_info_config_komodo_proto.json @@ -169,9 +169,9 @@ "Type":"UNKNOWN", "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["rfpa_therm", "north_therm"], - "Coefficient":[0.05, 0.14], - "Offset":560, + "Combination":["quiet_therm"], + "Coefficient":[0.088], + "Offset":1882, "Multiplier":0.001 }, { diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index 33d117ca..bd500de0 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -164,16 +164,6 @@ "PollingDelay":0, "PassiveDelay":1000 }, - { - "Name":"VIRTUAL-BTS-WINDOW-PARTIAL", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["rfpa_therm", "north_therm"], - "Coefficient":[0.05, 0.14], - "Offset":560, - "Multiplier":0.001 - }, { "Name":"VIRTUAL-SKIN-SUB-0", "Type":"UNKNOWN", @@ -867,10 +857,6 @@ "Sensors": { "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], "RecordWithThreshold": [ - { - "Name": "VIRTUAL-BTS-WINDOW-PARTIAL", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, { "Name": "VIRTUAL-SKIN-SPEAKER", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] diff --git a/thermal/thermal_info_config_tokay_proto.json b/thermal/thermal_info_config_tokay_proto.json index 3493a589..76ac445f 100644 --- a/thermal/thermal_info_config_tokay_proto.json +++ b/thermal/thermal_info_config_tokay_proto.json @@ -164,16 +164,6 @@ "PollingDelay":0, "PassiveDelay":1000 }, - { - "Name":"VIRTUAL-BTS-WINDOW-PARTIAL", - "Type":"UNKNOWN", - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["rfpa_therm", "north_therm"], - "Coefficient":[0.05, 0.14], - "Offset":560, - "Multiplier":0.001 - }, { "Name":"VIRTUAL-SKIN-SUB-0", "Type":"UNKNOWN", @@ -867,10 +857,6 @@ "Sensors": { "RecordWithDefaultThreshold": ["VIRTUAL-SKIN"], "RecordWithThreshold": [ - { - "Name": "VIRTUAL-BTS-WINDOW-PARTIAL", - "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] - }, { "Name": "VIRTUAL-SKIN-SPEAKER", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55]