From 4dafc1777b30d77b6db3d0eb7bd88f5188ccf0f1 Mon Sep 17 00:00:00 2001 From: Jikai Ma Date: Fri, 29 Sep 2023 07:17:03 +0000 Subject: [PATCH] thermal: update VSKIN equation for CM4/KM4/TK4 P1 should work with ag/24907329 that allow thermalHAL to config trip of btmskpr_therm Bug: 296476775 Test: boot to home Change-Id: I05e65c3f3ccce9d06640735b23976006cd99495e --- thermal/thermal_info_config_caiman.json | 288 +++++++-------- .../thermal_info_config_charge_caiman.json | 51 +-- .../thermal_info_config_charge_komodo.json | 51 +-- thermal/thermal_info_config_charge_tokay.json | 41 ++- thermal/thermal_info_config_komodo.json | 313 +++++++++------- thermal/thermal_info_config_tokay.json | 346 +++++++++--------- 6 files changed, 530 insertions(+), 560 deletions(-) diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index 7d5c405c..abd6398c 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -7,7 +7,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -17,7 +17,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -27,7 +27,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -37,7 +37,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -47,7 +47,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -63,7 +63,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -73,7 +73,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -82,7 +82,7 @@ "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -194,9 +194,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.27, 0.17, 0.11, 0, 0.2, 0.01, 0.06, 0.08], - "Offset":2110, + "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 }, { @@ -205,9 +205,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.46, 0, 0.14, 0.28, 0, 0.06, 0.02, 0.14, 0], - "Offset":-7280, + "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 }, { @@ -216,9 +216,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.07, 0, 0, 0, 0, 0.28, 0.15, 0.02, 0.3], - "Offset":4010, + "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 }, { @@ -227,99 +227,21 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.27, 0.06, 0.3, 0, 0, 0.2, 0.03, 0.02, 0.04], - "Offset":10, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-4", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.9, 0, 0.05, 0, 0, 0, 0.01, 0, 0], - "Offset":730, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-5", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.08, 0.02, 0.24, 0.23, 0, 0.29, 0.01, 0, 0], - "Offset":1870, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-6", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0, 0, 0.04, 0.2, 0.07, 0.15, 0.3, 0.16], - "Offset":-440, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-7", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.01, 0, 0, 0.07, 0.28, 0.25, 0.02, 0.08], - "Offset":9170, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-8", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.1, 0.16, 0.11, 0.19, 0.26, 0, 0, 0.11, 0], - "Offset":1140, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-9", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.02, 0.05, 0.21, 0.13, 0.02, 0.29, 0.09, 0, 0], - "Offset":5160, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-10", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0, 0.16, 0, 0.49, 0.35, 0, 0, 0], - "Offset":-1500, + "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", "Type":"SKIN", - "Version":"5.0", + "Version":"1.0", "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", "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", - "VIRTUAL-SKIN-SUB-6", "VIRTUAL-SKIN-SUB-7", "VIRTUAL-SKIN-SUB-8", "VIRTUAL-SKIN-SUB-9", "VIRTUAL-SKIN-SUB-10"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "VIRTUAL-SKIN-SUB-3"], + "Coefficient":[1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 49.0, 53.0, 55.0, 56.5, 62.0, 75.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -342,7 +264,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -358,7 +280,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -410,7 +332,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -481,7 +403,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -572,7 +494,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -626,7 +548,7 @@ "Name":"cellular-emergency", "Type":"POWER_AMPLIFIER", "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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -643,9 +565,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.14, 0, 0.15, 0, 0, 0, 0.88, 0], - "Offset":-11750, + "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 }, { @@ -654,20 +576,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.01, 0.18, 0, 0, 0, 0.24, 0, 0.01, 0.35], - "Offset":3600, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SPEAKER-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.01, 0, 0, 0.13, 0.31, 0.11, 0.18, 0.09], - "Offset":2140, + "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 }, { @@ -675,10 +586,10 @@ "Type":"UNKNOWN", "Version":"2.0", "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", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1", "VIRTUAL-SKIN-SPEAKER-SUB-2"], - "Coefficient":[1, 1, 1], + "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"], + "Coefficient":[1, 1], "HotThreshold":["NAN", 47.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, @@ -690,9 +601,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.04, 0.03, 0.1, 0.05, 0.35, 0.3, 0, 0, 0.04], - "Offset":1850, + "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 }, { @@ -701,20 +612,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0, 0.35, 0.22, 0.22, 0.07, 0.03, 0, 0], - "Offset":-560, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-FRONT-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.05, 0.13, 0.12, 0.07, 0.37, 0.06, 0.01, 0.01, 0], - "Offset":5070, + "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 }, { @@ -722,12 +622,88 @@ "Type":"UNKNOWN", "Version":"1.0", "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", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"], - "Coefficient":[1, 1, 1], + "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1"], + "Coefficient":[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-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-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", + "Type":"UNKNOWN", + "Version":"4.0", + "VirtualSensor":true, + "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_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], + "HotThreshold":["NAN", 44.0, 48.0, 51.0, 55.0, 57.0, 75.0], + "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1302 + }, + "ExcludedPowerInfo": [ + { + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + } + ], + "BindedCdevInfo": [ + { + "CdevRequest": "chg_mdis", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 25, 25, 25, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 1, 26, 26] + } + ] + }, { "Name":"LITTLE", "Type":"CPU", @@ -851,22 +827,6 @@ { "Name": "VIRTUAL-SKIN-SUB-3", "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-4", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-5", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-6", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-7", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] } ] }, diff --git a/thermal/thermal_info_config_charge_caiman.json b/thermal/thermal_info_config_charge_caiman.json index 642c9420..85dacdaa 100644 --- a/thermal/thermal_info_config_charge_caiman.json +++ b/thermal/thermal_info_config_charge_caiman.json @@ -7,7 +7,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -17,7 +17,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -27,7 +27,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -37,7 +37,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -47,7 +47,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -63,7 +63,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -73,7 +73,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -82,7 +82,7 @@ "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -91,9 +91,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.04, 0.16, 0.19, 0.16, 0.17, 0, 0.01, 0.24, 0], - "Offset":-820, + "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 }, { @@ -102,9 +102,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.02, 0.01, 0.04, 0.04, 0.4, 0.14, 0.1, 0.02, 0.12], - "Offset":1840, + "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 }, { @@ -113,20 +113,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.18, 0.1, 0.15, 0.13, 0.22, 0.16, 0.02, 0.04, 0.01], - "Offset":-2810, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-3", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.1, 0.16, 0.11, 0.19, 0.26, 0, 0, 0.11, 0], - "Offset":1140, + "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 }, { @@ -134,10 +123,10 @@ "Type":"UNKNOWN", "Version":"4.0", "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", "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"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"], + "Coefficient":[1.0, 1.0, 1.0], "HotThreshold":["NAN", 44.0, 48.0, 51.0, 55.0, 57.0, 75.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, diff --git a/thermal/thermal_info_config_charge_komodo.json b/thermal/thermal_info_config_charge_komodo.json index 111db7ac..369a1bda 100644 --- a/thermal/thermal_info_config_charge_komodo.json +++ b/thermal/thermal_info_config_charge_komodo.json @@ -7,7 +7,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -17,7 +17,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -27,7 +27,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -37,7 +37,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -47,7 +47,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -63,7 +63,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -73,7 +73,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -82,7 +82,7 @@ "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -91,9 +91,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.04, 0.16, 0.19, 0.16, 0.17, 0, 0.01, 0.24, 0], - "Offset":-820, + "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, "Multiplier":0.001 }, { @@ -102,9 +102,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.02, 0.01, 0.04, 0.04, 0.4, 0.14, 0.1, 0.02, 0.12], - "Offset":1840, + "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, "Multiplier":0.001 }, { @@ -113,20 +113,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.18, 0.1, 0.15, 0.13, 0.22, 0.16, 0.02, 0.04, 0.01], - "Offset":-2810, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-CHARGE-SUB-3", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.1, 0.16, 0.11, 0.19, 0.26, 0, 0, 0.11, 0], - "Offset":1140, + "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, "Multiplier":0.001 }, { @@ -134,10 +123,10 @@ "Type":"UNKNOWN", "Version":"4.0", "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", "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"], - "Coefficient":[1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2"], + "Coefficient":[1.0, 1.0, 1.0], "HotThreshold":["NAN", 44.0, 48.0, 51.0, 55.0, 57.0, 75.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, diff --git a/thermal/thermal_info_config_charge_tokay.json b/thermal/thermal_info_config_charge_tokay.json index 642c9420..f5572271 100644 --- a/thermal/thermal_info_config_charge_tokay.json +++ b/thermal/thermal_info_config_charge_tokay.json @@ -91,9 +91,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.04, 0.16, 0.19, 0.16, 0.17, 0, 0.01, 0.24, 0], - "Offset":-820, + "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 }, { @@ -102,9 +102,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.02, 0.01, 0.04, 0.04, 0.4, 0.14, 0.1, 0.02, 0.12], - "Offset":1840, + "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 }, { @@ -113,9 +113,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.18, 0.1, 0.15, 0.13, 0.22, 0.16, 0.02, 0.04, 0.01], - "Offset":-2810, + "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 }, { @@ -124,9 +124,20 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.1, 0.16, 0.11, 0.19, 0.26, 0, 0, 0.11, 0], - "Offset":1140, + "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-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 }, { @@ -134,10 +145,10 @@ "Type":"UNKNOWN", "Version":"4.0", "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", "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"], - "Coefficient":[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"], + "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "HotThreshold":["NAN", 44.0, 48.0, 51.0, 55.0, 57.0, 75.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 7d5c405c..fb9dd134 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -7,7 +7,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -17,7 +17,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -27,7 +27,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -37,7 +37,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -47,7 +47,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -63,7 +63,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -73,7 +73,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -82,7 +82,7 @@ "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -194,9 +194,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.27, 0.17, 0.11, 0, 0.2, 0.01, 0.06, 0.08], - "Offset":2110, + "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, "Multiplier":0.001 }, { @@ -205,9 +205,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.46, 0, 0.14, 0.28, 0, 0.06, 0.02, 0.14, 0], - "Offset":-7280, + "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, "Multiplier":0.001 }, { @@ -216,9 +216,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.07, 0, 0, 0, 0, 0.28, 0.15, 0.02, 0.3], - "Offset":4010, + "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, "Multiplier":0.001 }, { @@ -227,9 +227,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.27, 0.06, 0.3, 0, 0, 0.2, 0.03, 0.02, 0.04], - "Offset":10, + "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, "Multiplier":0.001 }, { @@ -238,9 +238,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.9, 0, 0.05, 0, 0, 0, 0.01, 0, 0], - "Offset":730, + "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, "Multiplier":0.001 }, { @@ -249,64 +249,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.08, 0.02, 0.24, 0.23, 0, 0.29, 0.01, 0, 0], - "Offset":1870, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-6", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0, 0, 0.04, 0.2, 0.07, 0.15, 0.3, 0.16], - "Offset":-440, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-7", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.01, 0, 0, 0.07, 0.28, 0.25, 0.02, 0.08], - "Offset":9170, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-8", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.1, 0.16, 0.11, 0.19, 0.26, 0, 0, 0.11, 0], - "Offset":1140, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-9", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.02, 0.05, 0.21, 0.13, 0.02, 0.29, 0.09, 0, 0], - "Offset":5160, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-10", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0, 0.16, 0, 0.49, 0.35, 0, 0, 0], - "Offset":-1500, + "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, "Multiplier":0.001 }, { @@ -314,12 +259,11 @@ "Type":"SKIN", "Version":"5.0", "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", "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", - "VIRTUAL-SKIN-SUB-6", "VIRTUAL-SKIN-SUB-7", "VIRTUAL-SKIN-SUB-8", "VIRTUAL-SKIN-SUB-9", "VIRTUAL-SKIN-SUB-10"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "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], "HotThreshold":["NAN", 49.0, 53.0, 55.0, 56.5, 62.0, 75.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -342,7 +286,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -358,7 +302,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -410,7 +354,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -481,7 +425,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -572,7 +516,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -626,7 +570,7 @@ "Name":"cellular-emergency", "Type":"POWER_AMPLIFIER", "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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -643,31 +587,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.14, 0, 0.15, 0, 0, 0, 0.88, 0], - "Offset":-11750, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SPEAKER-SUB-1", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.01, 0.18, 0, 0, 0, 0.24, 0, 0.01, 0.35], - "Offset":3600, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SPEAKER-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.01, 0, 0, 0.13, 0.31, 0.11, 0.18, 0.09], - "Offset":2140, + "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, "Multiplier":0.001 }, { @@ -675,10 +597,10 @@ "Type":"UNKNOWN", "Version":"2.0", "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", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1", "VIRTUAL-SKIN-SPEAKER-SUB-2"], - "Coefficient":[1, 1, 1], + "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0"], + "Coefficient":[1], "HotThreshold":["NAN", 47.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, @@ -690,9 +612,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.04, 0.03, 0.1, 0.05, 0.35, 0.3, 0, 0, 0.04], - "Offset":1850, + "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, "Multiplier":0.001 }, { @@ -701,9 +623,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0, 0.35, 0.22, 0.22, 0.07, 0.03, 0, 0], - "Offset":-560, + "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, "Multiplier":0.001 }, { @@ -712,9 +634,53 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.05, 0.13, 0.12, 0.07, 0.37, 0.06, 0.01, 0.01, 0], - "Offset":5070, + "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, + "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.28, 0.08, 0.01, 0.06, 0.09, 0.28, 0.09, 0.06], + "Offset":-730, + "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.06, 0.02, 0, 0.44, 0.19, 0.25, 0, 0], + "Offset":770, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-FRONT-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", "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, "Multiplier":0.001 }, { @@ -722,12 +688,89 @@ "Type":"UNKNOWN", "Version":"1.0", "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", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"], - "Coefficient":[1, 1, 1], + "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], "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.2, 0.15, 0, 0, 0.3, 0.22, 0.02, 0.02], + "Offset":1310, + "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, 0.12, 0.03, 0.32, 0.04, 0.12, 0.27], + "Offset":2470, + "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.02, 0, 0, 0.15, 0.06, 0.06, 0.32, 0.48], + "Offset":-2260, + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE", + "Type":"UNKNOWN", + "Version":"4.0", + "VirtualSensor":true, + "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_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], + "HotThreshold":["NAN", 44.0, 48.0, 51.0, 55.0, 57.0, 75.0], + "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1302 + }, + "ExcludedPowerInfo": [ + { + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + } + ], + "BindedCdevInfo": [ + { + "CdevRequest": "chg_mdis", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 25, 25, 25, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 1, 26, 26] + } + ] + }, { "Name":"LITTLE", "Type":"CPU", @@ -859,14 +902,6 @@ { "Name": "VIRTUAL-SKIN-SUB-5", "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-6", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-7", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] } ] }, diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index c7f7fbbf..76bef6bb 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -7,7 +7,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -17,7 +17,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/rfpa_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -27,7 +27,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -37,7 +37,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/charging_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -47,7 +47,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -63,7 +63,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/btmspkr_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -73,7 +73,7 @@ "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -82,7 +82,7 @@ "HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, - "PollingDelay":60000, + "PollingDelay":300000, "PassiveDelay":7000 }, { @@ -194,9 +194,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.27, 0.17, 0.11, 0, 0.2, 0.01, 0.06, 0.08], - "Offset":2110, + "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 }, { @@ -205,108 +205,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.46, 0, 0.14, 0.28, 0, 0.06, 0.02, 0.14, 0], - "Offset":-7280, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.07, 0, 0, 0, 0, 0.28, 0.15, 0.02, 0.3], - "Offset":4010, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-3", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.27, 0.06, 0.3, 0, 0, 0.2, 0.03, 0.02, 0.04], - "Offset":10, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-4", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.9, 0, 0.05, 0, 0, 0, 0.01, 0, 0], - "Offset":730, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-5", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.08, 0.02, 0.24, 0.23, 0, 0.29, 0.01, 0, 0], - "Offset":1870, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-6", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0, 0, 0.04, 0.2, 0.07, 0.15, 0.3, 0.16], - "Offset":-440, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-7", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.01, 0, 0, 0.07, 0.28, 0.25, 0.02, 0.08], - "Offset":9170, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-8", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.1, 0.16, 0.11, 0.19, 0.26, 0, 0, 0.11, 0], - "Offset":1140, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-9", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.02, 0.05, 0.21, 0.13, 0.02, 0.29, 0.09, 0, 0], - "Offset":5160, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SUB-10", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0, 0.16, 0, 0.49, 0.35, 0, 0, 0], - "Offset":-1500, + "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 }, { @@ -314,12 +215,10 @@ "Type":"SKIN", "Version":"5.0", "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", "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", - "VIRTUAL-SKIN-SUB-6", "VIRTUAL-SKIN-SUB-7", "VIRTUAL-SKIN-SUB-8", "VIRTUAL-SKIN-SUB-9", "VIRTUAL-SKIN-SUB-10"], - "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1"], + "Coefficient":[1.0, 1.0], "HotThreshold":["NAN", 49.0, 53.0, 55.0, 56.5, 62.0, 75.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, @@ -342,7 +241,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -358,7 +257,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -410,7 +309,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -481,7 +380,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -572,7 +471,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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -626,7 +525,7 @@ "Name":"cellular-emergency", "Type":"POWER_AMPLIFIER", "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", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -643,9 +542,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.14, 0, 0.15, 0, 0, 0, 0.88, 0], - "Offset":-11750, + "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 }, { @@ -654,20 +553,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.01, 0.18, 0, 0, 0, 0.24, 0, 0.01, 0.35], - "Offset":3600, - "Multiplier":0.001 - }, - { - "Name":"VIRTUAL-SKIN-SPEAKER-SUB-2", - "Type":"UNKNOWN", - "Hidden":true, - "VirtualSensor":true, - "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0.01, 0, 0, 0.13, 0.31, 0.11, 0.18, 0.09], - "Offset":2140, + "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 }, { @@ -675,10 +563,10 @@ "Type":"UNKNOWN", "Version":"2.0", "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", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1", "VIRTUAL-SKIN-SPEAKER-SUB-2"], - "Coefficient":[1, 1, 1], + "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"], + "Coefficient":[1, 1], "HotThreshold":["NAN", 47.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, @@ -690,9 +578,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.04, 0.03, 0.1, 0.05, 0.35, 0.3, 0, 0, 0.04], - "Offset":1850, + "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 }, { @@ -701,9 +589,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0, 0, 0.35, 0.22, 0.22, 0.07, 0.03, 0, 0], - "Offset":-560, + "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 }, { @@ -712,22 +600,144 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"], - "Coefficient":[0.05, 0.13, 0.12, 0.07, 0.37, 0.06, 0.01, 0.01, 0], - "Offset":5070, + "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-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-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", "Type":"UNKNOWN", "Version":"1.0", "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", "btmspkr_therm"], "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"], - "Coefficient":[1, 1, 1], + "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"], + "Coefficient":[1, 1, 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.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-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-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-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-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", + "Type":"UNKNOWN", + "Version":"4.0", + "VirtualSensor":true, + "TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_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], + "HotThreshold":["NAN", 44.0, 48.0, 51.0, 55.0, 57.0, 75.0], + "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], + "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], + "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], + "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], + "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1302 + }, + "ExcludedPowerInfo": [ + { + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + } + ], + "BindedCdevInfo": [ + { + "CdevRequest": "chg_mdis", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 25, 25, 25, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 1, 26, 26] + } + ] + }, { "Name":"LITTLE", "Type":"CPU", @@ -843,30 +853,6 @@ { "Name": "VIRTUAL-SKIN-SUB-1", "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-2", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-3", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-4", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-5", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-6", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] - }, - { - "Name": "VIRTUAL-SKIN-SUB-7", - "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] } ] },