From b14b8d75861ab3a9c97a2531a03fc6c6e46d19f4 Mon Sep 17 00:00:00 2001 From: Jikai Ma Date: Mon, 6 Nov 2023 23:38:49 +0000 Subject: [PATCH] thermal: update virtual skin sensor formula formulas updated with P1.1 test data Bug: 296476775 Test: boot to home Sign-off-by: jikai@google.com Change-Id: I88febd4792f9c32c6fcbd3d27490cdac80f00311 --- thermal/thermal_info_config_caiman_proto.json | 262 +++++++------- .../thermal_info_config_charge_caiman.json | 75 ++-- .../thermal_info_config_charge_komodo.json | 85 ++++- thermal/thermal_info_config_charge_tokay.json | 122 ++++--- thermal/thermal_info_config_komodo_proto.json | 225 +++++++----- thermal/thermal_info_config_tokay_proto.json | 328 ++++++++++-------- 6 files changed, 649 insertions(+), 448 deletions(-) diff --git a/thermal/thermal_info_config_caiman_proto.json b/thermal/thermal_info_config_caiman_proto.json index c8a29f14..8abd9e2a 100644 --- a/thermal/thermal_info_config_caiman_proto.json +++ b/thermal/thermal_info_config_caiman_proto.json @@ -175,55 +175,55 @@ "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.32, 0, 0.08, 0, 0.21, 0.22, 0.04, 0], - "Offset":2230, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SUB-0", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.1, 0.06, 0.01, 0.0, 0.33, 0.28, 0.06, 0.04, 0.03], + "Offset": 2060.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.13, 0, 0, 0.34, 0, 0, 0.28, 0.33], - "Offset":-490, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.31, 0.0, 0.09, 0.03, 0.0, 0.18, 0.15, 0.0, 0.21], + "Offset": 850.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.07, 0.1, 0, 0.07, 0.36, 0.28, 0.04, 0], - "Offset":1240, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SUB-2", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.3, 0.07, 0.15, 0.12, 0.23, 0.02, 0.02, 0.0, 0.02], + "Offset": 1270.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-SUB-3", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.22, 0.03, 0.04, 0, 0.45, 0.08, 0.04, 0.04], - "Offset":3720, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SUB-3", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.07, 0.0, 0.0, 0.01, 0.34, 0.29, 0.02, 0.12, 0.08], + "Offset": 1330.0, + "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"1.0", + "Version":"2.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3"], @@ -250,7 +250,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -266,7 +266,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -318,7 +318,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -389,7 +389,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -480,7 +480,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -544,7 +544,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -576,7 +576,7 @@ "Name":"cellular-emergency", "Type":"POWER_AMPLIFIER", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -588,33 +588,33 @@ "PassiveDelay":7000 }, { - "Name":"VIRTUAL-SKIN-SPEAKER-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0, 0, 0, 0, 0, 0, 0.93, 0.32], - "Offset":-11740, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SPEAKER-SUB-0", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.02, 0.04, 0.03, 0.33, 0.03, 0.16, 0.06, 0.33], + "Offset": -630.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-SPEAKER-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0, 0, 0, 0, 0, 0, 0.41, 0.09], - "Offset":-13890, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SPEAKER-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.02, 0.15, 0.01, 0.03, 0.0, 0.23, 0.07, 0.38], + "Offset": 3900.0, + "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-SPEAKER", "Type":"UNKNOWN", - "Version":"2.0", + "Version":"3.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"], "Coefficient":[1, 1], @@ -626,84 +626,108 @@ "PassiveDelay":7000 }, { - "Name":"VIRTUAL-SKIN-FRONT-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.21, 0.25, 0, 0.08, 0.16, 0.21, 0.11, 0.02], - "Offset":-9160, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-FRONT-SUB-0", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.32, 0.0, 0.0, 0.0, 0.01, 0.12, 0.12, 0.04, 0.31], + "Offset": 2680.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-FRONT-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.28, 0, 0.03, 0, 0.43, 0, 0, 0.16], - "Offset":3090, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-FRONT-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.29, 0.0, 0.05, 0.0, 0.28, 0.08, 0.06, 0.01, 0.12], + "Offset": 3280.0, + "Multiplier": 0.001 }, + { + "Name": "VIRTUAL-SKIN-FRONT-SUB-2", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.25, 0.0, 0.03, 0.0, 0.36, 0.0, 0.0, 0.02, 0.24], + "Offset": 3300.0, + "Multiplier": 0.001 + }, + { "Name":"VIRTUAL-SKIN-FRONT", "Type":"UNKNOWN", - "Version":"1.0", + "Version":"2.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1"], - "Coefficient":[1, 1], + "Combination": ["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"], + "Coefficient": [1, 1, 1], "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.31, 0.01, 0.09, 0, 0.28, 0.17, 0.03, 0], - "Offset":1.67, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-0", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.31, 0.05, 0.05, 0.02, 0.18, 0.17, 0.04, 0.06, 0.0], + "Offset": 2000.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.28, 0.02, 0.18, 0.04, 0.07, 0.1, 0.1, 0.17], - "Offset":320, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.18, 0.02, 0.06, 0.16, 0.27, 0.2, 0.0, 0.07, 0.0], + "Offset": -30.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.28, 0, 0.12, 0.16, 0.22, 0.16, 0, 0.01], - "Offset":390, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-2", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.17, 0.0, 0.14, 0.04, 0.18, 0.11, 0.04, 0.04, 0.23], + "Offset": 1200.0, + "Multiplier": 0.001 }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.04, 0.02, 0.05, 0.08, 0.32, 0.18, 0.0, 0.14, 0.05], + "Offset": 3110.0, + "Multiplier": 0.001 + }, + { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"4.0", + "Version":"5.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"], - "Coefficient":[1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"], + "Coefficient": [1, 1, 1, 1], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], diff --git a/thermal/thermal_info_config_charge_caiman.json b/thermal/thermal_info_config_charge_caiman.json index 350b128f..54cb5a53 100644 --- a/thermal/thermal_info_config_charge_caiman.json +++ b/thermal/thermal_info_config_charge_caiman.json @@ -86,51 +86,62 @@ "PassiveDelay":7000 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.31, 0.01, 0.09, 0, 0.28, 0.17, 0.03, 0], - "Offset":1.67, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-0", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.31, 0.05, 0.05, 0.02, 0.18, 0.17, 0.04, 0.06, 0.0], + "Offset": 2000.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.28, 0.02, 0.18, 0.04, 0.07, 0.1, 0.1, 0.17], - "Offset":320, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.18, 0.02, 0.06, 0.16, 0.27, 0.2, 0.0, 0.07, 0.0], + "Offset": -30.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.28, 0, 0.12, 0.16, 0.22, 0.16, 0, 0.01], - "Offset":390, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-2", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.17, 0.0, 0.14, 0.04, 0.18, 0.11, 0.04, 0.04, 0.23], + "Offset": 1200.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.04, 0.02, 0.05, 0.08, 0.32, 0.18, 0.0, 0.14, 0.05], + "Offset": 3110.0, + "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"4.0", + "Version":"5.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"], - "Coefficient":[1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"], + "Coefficient": [1, 1, 1, 1], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], diff --git a/thermal/thermal_info_config_charge_komodo.json b/thermal/thermal_info_config_charge_komodo.json index bc57f47d..6384ac03 100644 --- a/thermal/thermal_info_config_charge_komodo.json +++ b/thermal/thermal_info_config_charge_komodo.json @@ -91,9 +91,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.2, 0.15, 0, 0, 0.3, 0.22, 0.02, 0.02], - "Offset":1310, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.11, 0.0, 0.24, 0.02, 0.14, 0.04, 0.08, 0.38], + "Offset": -660.0, "Multiplier":0.001 }, { @@ -102,9 +102,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.04, 0, 0.12, 0.03, 0.32, 0.04, 0.12, 0.27], - "Offset":2470, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.01, 0.0, 0.15, 0.18, 0.02, 0.04, 0.26, 0.04, 0.28], + "Offset": 1290.0, "Multiplier":0.001 }, { @@ -113,24 +113,81 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.02, 0, 0, 0.15, 0.06, 0.06, 0.32, 0.48], - "Offset":-2260, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.08, 0.01, 0.05, 0.37, 0.07, 0.02, 0.25, 0.07], + "Offset": 1360.0, "Multiplier":0.001 }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.04, 0.04, 0.04, 0.0, 0.23, 0.01, 0.07, 0.52, 0.02], + "Offset": -3910.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-4", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.05, 0.14, 0.0, 0.07, 0.01, 0.0, 0.2, 0.23, 0.25], + "Offset": 1190.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-5", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.0, 0.04, 0.2, 0.28, 0.31, 0.05, 0.0, 0.01], + "Offset": 3850.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-6", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.11, 0.02, 0.44, 0.0, 0.33, 0.12, 0.05, 0.05], + "Offset": -7060.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-7", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.37, 0.0, 0.0, 0.13, 0.0, 0.01, 0.03, 0.17, 0.2], + "Offset": 2190.0, + "Multiplier": 0.001 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"4.0", + "Version":"5.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"], - "Coefficient":[1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", + "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5", + "VIRTUAL-SKIN-CHARGE-SUB-6", "VIRTUAL-SKIN-CHARGE-SUB-7"], + "Coefficient": [1, 1, 1, 1, 1, 1, 1, 1], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], diff --git a/thermal/thermal_info_config_charge_tokay.json b/thermal/thermal_info_config_charge_tokay.json index 3ca80625..b8d9127e 100644 --- a/thermal/thermal_info_config_charge_tokay.json +++ b/thermal/thermal_info_config_charge_tokay.json @@ -86,73 +86,95 @@ "PassiveDelay":7000 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.18, 0.1, 0.13, 0.04, 0.02, 0.17, 0.01, 0.29], - "Offset":-240, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-0", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.04, 0.0, 0.17, 0.02, 0.49, 0.07, 0.03, 0.11, 0.01], + "Offset": -1090.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.04, 0.28, 0, 0, 0.21, 0.18, 0.04, 0.16], - "Offset":-660, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.02, 0.0, 0.0, 0.13, 0.17, 0.38, 0.03, 0.0, 0.18], + "Offset": 2210.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.01, 0.01, 0, 0.18, 0.26, 0.36, 0.01, 0.07], - "Offset":2500, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-2", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.01, 0.07, 0.01, 0.33, 0.23, 0.01, 0.0, 0.24], + "Offset": 3220.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-3", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.05, 0.01, 0.08, 0.34, 0.1, 0.12, 0.01, 0.29], - "Offset":670, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.22, 0.09, 0.17, 0.04, 0.2, 0.2, 0.01, 0.11, 0.01], + "Offset": -9850.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-4", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.36, 0, 0.04, 0.02, 0.01, 0.17, 0.39, 0.06], - "Offset":-4300, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-4", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.07, 0.1, 0.0, 0.03, 0.26, 0.24, 0.18, 0.0, 0.06], + "Offset": 770.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-5", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.24, 0.04, 0.07, 0.19, 0.28, 0.0, 0.06, 0.01, 0.08], + "Offset": -320.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-6", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.07, 0.03, 0.12, 0.0, 0.28, 0.26, 0.04, 0.05, 0.09], + "Offset": -1120.0, + "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"4.0", + "Version":"5.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5", "VIRTUAL-SKIN-CHARGE-SUB-6"], + "Coefficient": [1, 1, 1, 1, 1, 1, 1], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], diff --git a/thermal/thermal_info_config_komodo_proto.json b/thermal/thermal_info_config_komodo_proto.json index 1fb641df..e70ed452 100644 --- a/thermal/thermal_info_config_komodo_proto.json +++ b/thermal/thermal_info_config_komodo_proto.json @@ -180,9 +180,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.13, 0.04, 0, 0, 0.32, 0.4, 0, 0], - "Offset":2810, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.09, 0.0, 0.0, 0.24, 0.31, 0.19, 0.01, 0.0], + "Offset": 5590.0, "Multiplier":0.001 }, { @@ -191,9 +191,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.32, 0.29, 0.03, 0.03, 0.21, 0, 0.07, 0.01], - "Offset":-2590, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.0, 0.21, 0.02, 0.15, 0.22, 0.03, 0.05, 0.26], + "Offset": 410.0, "Multiplier":0.001 }, { @@ -202,9 +202,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.06, 0, 0, 0.77, 0.06, 0.03, 0.03, 0.01], - "Offset":2240, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.32, 0.0, 0.01, 0.4, 0.0, 0.0, 0.01, 0.13, 0.09], + "Offset": 2240.0, "Multiplier":0.001 }, { @@ -213,9 +213,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.18, 0.02, 0, 0.28, 0.05, 0.05, 0.27, 0.18], - "Offset":390, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.01, 0.0, 0.15, 0.18, 0.02, 0.04, 0.26, 0.04, 0.28], + "Offset": 1290.0, "Multiplier":0.001 }, { @@ -224,9 +224,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.37, 0.02, 0, 0.01, 0.19, 0.16, 0.08, 0.1], - "Offset":1460, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.34, 0.0, 0.0, 0.0, 0.14, 0.0, 0.0, 0.31, 0.0], + "Offset": 8080.0, "Multiplier":0.001 }, { @@ -235,21 +235,32 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0, 0.01, 0.12, 0.06, 0.04, 0.12, 0.29, 0.33], - "Offset":1600, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.2, 0.02, 0.0, 0.16, 0.0, 0.27, 0.1, 0.19], + "Offset": 1220.0, "Multiplier":0.001 }, + { + "Name": "VIRTUAL-SKIN-SUB-6", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.14, 0.03, 0.02, 0.0, 0.0, 0.22, 0.22, 0.34], + "Offset": 500.0, + "Multiplier": 0.001 + }, { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"5.0", + "Version":"6.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", - "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", + "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5", "VIRTUAL-SKIN-SUB-6"], + "Coefficient": [1, 1, 1, 1, 1, 1, 1], "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -272,7 +283,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -288,7 +299,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -340,7 +351,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -411,7 +422,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -502,7 +513,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -566,7 +577,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -598,7 +609,7 @@ "Name":"cellular-emergency", "Type":"POWER_AMPLIFIER", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -615,17 +626,17 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.01, 0.01, 0, 0, 0, 0.1, 0.19, 0.8], - "Offset":-5720, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.03, 0.09, 0.0, 0.04, 0.0, 0.07, 0.17, 0.0, 0.83], + "Offset": -11820.0, "Multiplier":0.001 }, { "Name":"VIRTUAL-SKIN-SPEAKER", "Type":"UNKNOWN", - "Version":"2.0", + "Version":"3.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0"], "Coefficient":[1], @@ -642,9 +653,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.14, 0.06, 0, 0.07, 0.26, 0.27, 0.07, 0], - "Offset":3320, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.05, 0.02, 0.0, 0.09, 0.18, 0.37, 0.08, 0.05, 0.06], + "Offset": 2350.0, "Multiplier":0.001 }, { @@ -653,9 +664,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.31, 0.15, 0.01, 0, 0.28, 0, 0, 0.18], - "Offset":130, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.03, 0.13, 0.06, 0.28, 0.3, 0.0, 0.05, 0.07, 0.01], + "Offset": 1130.0, "Multiplier":0.001 }, { @@ -664,9 +675,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.02, 0, 0, 0.84, 0, 0, 0.02, 0.03], - "Offset":3940, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.05, 0.06, 0.0, 0.63, 0.1, 0.03, 0.0, 0.06, 0.0], + "Offset": 2680.0, "Multiplier":0.001 }, { @@ -675,9 +686,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.28, 0.08, 0.01, 0.06, 0.09, 0.28, 0.09, 0.06], - "Offset":-730, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.11, 0.01, 0.0, 0.54, 0.0, 0.0, 0.08, 0.0, 0.11], + "Offset": 5900.0, "Multiplier":0.001 }, { @@ -686,9 +697,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.06, 0.02, 0, 0.44, 0.19, 0.25, 0, 0], - "Offset":770, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.04, 0.03, 0.02, 0.38, 0.15, 0.24, 0.02, 0.05, 0.0], + "Offset": 1810.0, "Multiplier":0.001 }, { @@ -697,32 +708,21 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.36, 0, 0, 0.05, 0.02, 0.29, 0.02, 0.17], - "Offset":620, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-FRONT-SUB-6", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.07, 0.05, 0, 0.4, 0.12, 0.15, 0, 0.15], - "Offset":2090, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.33, 0.0, 0.0, 0.12, 0.04, 0.17, 0.02, 0.04, 0.16], + "Offset": 3140.0, "Multiplier":0.001 }, { "Name":"VIRTUAL-SKIN-FRONT", "Type":"UNKNOWN", - "Version":"1.0", + "Version":"2.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2", - "VIRTUAL-SKIN-FRONT-SUB-3", "VIRTUAL-SKIN-FRONT-SUB-4", "VIRTUAL-SKIN-FRONT-SUB-5", "VIRTUAL-SKIN-FRONT-SUB-6"], - "Coefficient":[1, 1, 1, 1, 1, 1, 1], + "VIRTUAL-SKIN-FRONT-SUB-3", "VIRTUAL-SKIN-FRONT-SUB-4", "VIRTUAL-SKIN-FRONT-SUB-5"], + "Coefficient":[1, 1, 1, 1, 1, 1], "Multiplier":0.001 }, { @@ -731,9 +731,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.2, 0.15, 0, 0, 0.3, 0.22, 0.02, 0.02], - "Offset":1310, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.11, 0.0, 0.24, 0.02, 0.14, 0.04, 0.08, 0.38], + "Offset": -660.0, "Multiplier":0.001 }, { @@ -742,9 +742,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.04, 0, 0.12, 0.03, 0.32, 0.04, 0.12, 0.27], - "Offset":2470, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.01, 0.0, 0.15, 0.18, 0.02, 0.04, 0.26, 0.04, 0.28], + "Offset": 1290.0, "Multiplier":0.001 }, { @@ -753,24 +753,81 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.02, 0, 0, 0.15, 0.06, 0.06, 0.32, 0.48], - "Offset":-2260, + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.08, 0.01, 0.05, 0.37, 0.07, 0.02, 0.25, 0.07], + "Offset": 1360.0, "Multiplier":0.001 }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.04, 0.04, 0.04, 0.0, 0.23, 0.01, 0.07, 0.52, 0.02], + "Offset": -3910.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-4", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.05, 0.14, 0.0, 0.07, 0.01, 0.0, 0.2, 0.23, 0.25], + "Offset": 1190.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-5", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.0, 0.04, 0.2, 0.28, 0.31, 0.05, 0.0, 0.01], + "Offset": 3850.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-6", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.11, 0.02, 0.44, 0.0, 0.33, 0.12, 0.05, 0.05], + "Offset": -7060.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-7", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.37, 0.0, 0.0, 0.13, 0.0, 0.01, 0.03, 0.17, 0.2], + "Offset": 2190.0, + "Multiplier": 0.001 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"4.0", + "Version":"5.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"], - "Coefficient":[1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", + "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5", + "VIRTUAL-SKIN-CHARGE-SUB-6", "VIRTUAL-SKIN-CHARGE-SUB-7"], + "Coefficient": [1, 1, 1, 1, 1, 1, 1, 1], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], @@ -937,6 +994,10 @@ { "Name": "VIRTUAL-SKIN-SUB-5", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] + }, + { + "Name": "VIRTUAL-SKIN-SUB-6", + "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 80a9fdca..0cd18ff8 100644 --- a/thermal/thermal_info_config_tokay_proto.json +++ b/thermal/thermal_info_config_tokay_proto.json @@ -165,36 +165,48 @@ "PassiveDelay":1000 }, { - "Name":"VIRTUAL-SKIN-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0, 0.04, 0.08, 0.03, 0.46, 0.22, 0.05, 0.01], - "Offset":3340, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SUB-0", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.12, 0.19, 0.0, 0.03, 0.02, 0.0, 0.27, 0.14, 0.17], + "Offset": 740.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.62, 0.05, 0.09, 0.21, 0.02, 0, 0.05, 0.01], - "Offset":-6140, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.13, 0.01, 0.09, 0.17, 0.3, 0.11, 0.0, 0.06], + "Offset": 4150.0, + "Multiplier": 0.001 }, + { + "Name": "VIRTUAL-SKIN-SUB-2", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.1, 0.01, 0.0, 0.07, 0.1, 0.59, 0.0, 0.0, 0.0], + "Offset": 4130.0, + "Multiplier": 0.001 + }, + { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"5.0", + "Version":"6.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1"], - "Coefficient":[1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2"], + "Coefficient": [1, 1, 1], "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -217,7 +229,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -233,7 +245,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -285,7 +297,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -356,7 +368,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -447,7 +459,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -511,7 +523,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -543,7 +555,7 @@ "Name":"cellular-emergency", "Type":"POWER_AMPLIFIER", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -555,36 +567,25 @@ "PassiveDelay":7000 }, { - "Name":"VIRTUAL-SKIN-SPEAKER-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0, 0, 0, 0.02, 0, 0, 0.79, 0.45], - "Offset":-10830, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SPEAKER-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0, 0, 0, 0, 0, 0, 1.07, 0.12], - "Offset":-8240, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-SPEAKER-SUB-0", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.32, 0.0, 0.0, 0.0, 0.0, 0.38, 0.0, 0.0], + "Offset": 8390.0, + "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-SPEAKER", "Type":"UNKNOWN", - "Version":"2.0", + "Version":"3.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"], - "Coefficient":[1, 1], + "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0"], + "Coefficient":[1], "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, @@ -593,67 +594,66 @@ "PassiveDelay":7000 }, { - "Name":"VIRTUAL-SKIN-FRONT-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.04, 0.18, 0.03, 0.02, 0.4, 0.13, 0.01, 0.08], - "Offset":1310, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-FRONT-SUB-0", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.09, 0.04, 0.24, 0.04, 0.35, 0.12, 0.07, 0.02, 0.01], + "Offset": -3990.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-FRONT-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.28, 0.02, 0.26, 0.05, 0.22, 0.03, 0.07, 0.04], - "Offset":-3490, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-FRONT-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.0, 0.0, 0.29, 0.07, 0.46, 0.04, 0.0, 0.04], + "Offset": 2170.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-FRONT-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.01, 0, 0, 0.22, 0.29, 0.37, 0, 0], - "Offset":2630, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-FRONT-SUB-2", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.01, 0.21, 0.0, 0.07, 0.18, 0.0, 0.3, 0.13, 0.04], + "Offset": 860.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-FRONT-SUB-3", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.03, 0.13, 0.01, 0.18, 0.38, 0.11, 0, 0], - "Offset":5550, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-FRONT-SUB-3", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.01, 0.11, 0.08, 0.54, 0.0, 0.2, 0.0, 0.0, 0.0], + "Offset": 2450.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-FRONT-SUB-4", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.25, 0, 0.19, 0.04, 0.09, 0.27, 0.02, 0.03], - "Offset":-590, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-FRONT-SUB-4", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.16, 0.02, 0.18, 0.25, 0.2, 0.05, 0.0, 0.03], + "Offset": 3410.0, + "Multiplier": 0.001 }, - { "Name":"VIRTUAL-SKIN-FRONT", "Type":"UNKNOWN", - "Version":"1.0", + "Version":"2.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2", "VIRTUAL-SKIN-FRONT-SUB-3", "VIRTUAL-SKIN-FRONT-SUB-4"], @@ -661,73 +661,95 @@ "Multiplier":0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.18, 0.1, 0.13, 0.04, 0.02, 0.17, 0.01, 0.29], - "Offset":-240, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-0", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.04, 0.0, 0.17, 0.02, 0.49, 0.07, 0.03, 0.11, 0.01], + "Offset": -1090.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.04, 0.28, 0, 0, 0.21, 0.18, 0.04, 0.16], - "Offset":-660, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.02, 0.0, 0.0, 0.13, 0.17, 0.38, 0.03, 0.0, 0.18], + "Offset": 2210.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.01, 0.01, 0, 0.18, 0.26, 0.36, 0.01, 0.07], - "Offset":2500, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-2", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.0, 0.01, 0.07, 0.01, 0.33, 0.23, 0.01, 0.0, 0.24], + "Offset": 3220.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-3", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.05, 0.01, 0.08, 0.34, 0.1, 0.12, 0.01, 0.29], - "Offset":670, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-3", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.22, 0.09, 0.17, 0.04, 0.2, 0.2, 0.01, 0.11, 0.01], + "Offset": -9850.0, + "Multiplier": 0.001 }, { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-4", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], - "Coefficient":[0.36, 0, 0.04, 0.02, 0.01, 0.17, 0.39, 0.06], - "Offset":-4300, - "Multiplier":0.001 + "Name": "VIRTUAL-SKIN-CHARGE-SUB-4", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.07, 0.1, 0.0, 0.03, 0.26, 0.24, 0.18, 0.0, 0.06], + "Offset": 770.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-5", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.24, 0.04, 0.07, 0.19, 0.28, 0.0, 0.06, 0.01, 0.08], + "Offset": -320.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-6", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Coefficient": [0.07, 0.03, 0.12, 0.0, 0.28, 0.26, 0.04, 0.05, 0.09], + "Offset": -1120.0, + "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"4.0", + "Version":"5.0", "VirtualSensor":true, - "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"], + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], + "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5", "VIRTUAL-SKIN-CHARGE-SUB-6"], + "Coefficient": [1, 1, 1, 1, 1, 1, 1], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], @@ -874,6 +896,10 @@ { "Name": "VIRTUAL-SKIN-SUB-1", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] + }, + { + "Name": "VIRTUAL-SKIN-SUB-2", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 55] } ] },