diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index ef8ca764..9b797ca7 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -185,57 +185,58 @@ "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-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-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-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-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-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-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-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", "Type":"SKIN", - "Version":"2.0", + "Version":"1.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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"], + "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", + "VIRTUAL-SKIN-SUB-3"], "Coefficient":[1.0, 1.0, 1.0, 1.0], "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], @@ -259,7 +260,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -275,7 +276,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -309,7 +310,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "BindedPowerRail": "S3M_VDD_CPUCL1", + "BindedPowerRail": "S2M_VDD_CPUCL1", "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] }, { @@ -317,7 +318,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "BindedPowerRail": "S2M_VDD_CPUCL2", + "BindedPowerRail": "S3M_VDD_CPUCL2", "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] } ] @@ -327,7 +328,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -418,7 +419,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -515,7 +516,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -550,7 +551,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "BindedPowerRail": "S3M_VDD_CPUCL1", + "BindedPowerRail": "S2M_VDD_CPUCL1", "CdevCeiling": [0, 11, 11, 11, 11, 14, 14], "LimitInfo": [0, 0, 0, 0, 0, 14, 14] }, @@ -559,7 +560,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "BindedPowerRail": "S2M_VDD_CPUCL2", + "BindedPowerRail": "S3M_VDD_CPUCL2", "CdevCeiling": [0, 13, 13, 13, 13, 14, 14], "LimitInfo": [0, 0, 0, 0, 0, 14, 14] }, @@ -579,7 +580,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -611,7 +612,7 @@ "Name":"cellular-emergency", "Type":"POWER_AMPLIFIER", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -623,33 +624,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", "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-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-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-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", "Type":"UNKNOWN", - "Version":"3.0", + "Version":"2.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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"], "Coefficient":[1, 1], @@ -661,106 +662,84 @@ "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", "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-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-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-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", "Type":"UNKNOWN", - "Version":"2.0", + "Version":"1.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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", "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-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", "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-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", "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-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":"5.0", + "Version":"4.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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, 1, 1, 1], + "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", 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":300000, + "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], @@ -859,12 +838,12 @@ ], "PowerRails":[ { - "Name":"S2M_VDD_CPUCL2", + "Name":"S2M_VDD_CPUCL1", "PowerSampleDelay":7000, "PowerSampleCount":1 }, { - "Name":"S3M_VDD_CPUCL1", + "Name":"S3M_VDD_CPUCL2", "PowerSampleDelay":7000, "PowerSampleCount":1 }, @@ -882,7 +861,7 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM"], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL1", "S3M_VDD_CPUCL2", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM"], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 63f4ad88..9050e418 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -157,7 +157,7 @@ { "Name":"vdroop2", "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "SendCallback":true, @@ -190,9 +190,9 @@ "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.09, 0.0, 0.0, 0.24, 0.31, 0.19, 0.01, 0.0], - "Offset": 5590.0, + "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 }, { @@ -201,9 +201,9 @@ "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.21, 0.02, 0.15, 0.22, 0.03, 0.05, 0.26], - "Offset": 410.0, + "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 }, { @@ -212,9 +212,9 @@ "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.01, 0.4, 0.0, 0.0, 0.01, 0.13, 0.09], - "Offset": 2240.0, + "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 }, { @@ -223,9 +223,9 @@ "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.0, 0.15, 0.18, 0.02, 0.04, 0.26, 0.04, 0.28], - "Offset": 1290.0, + "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 }, { @@ -234,9 +234,9 @@ "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.34, 0.0, 0.0, 0.0, 0.14, 0.0, 0.0, 0.31, 0.0], - "Offset": 8080.0, + "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 }, { @@ -245,32 +245,21 @@ "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.2, 0.02, 0.0, 0.16, 0.0, 0.27, 0.1, 0.19], - "Offset": 1220.0, + "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 }, - { - "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":"6.0", + "Version":"5.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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"], - "Coefficient": [1, 1, 1, 1, 1, 1, 1], + "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], "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, @@ -293,7 +282,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -309,7 +298,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -343,7 +332,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "BindedPowerRail": "S3M_VDD_CPUCL1", + "BindedPowerRail": "S2M_VDD_CPUCL1", "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] }, { @@ -351,7 +340,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "BindedPowerRail": "S2M_VDD_CPUCL2", + "BindedPowerRail": "S3M_VDD_CPUCL2", "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] } ] @@ -361,7 +350,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -452,7 +441,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -549,7 +538,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -584,7 +573,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "BindedPowerRail": "S3M_VDD_CPUCL1", + "BindedPowerRail": "S2M_VDD_CPUCL1", "CdevCeiling": [0, 11, 11, 11, 11, 14, 14], "LimitInfo": [0, 0, 0, 0, 0, 14, 14] }, @@ -593,7 +582,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "BindedPowerRail": "S2M_VDD_CPUCL2", + "BindedPowerRail": "S3M_VDD_CPUCL2", "CdevCeiling": [0, 13, 13, 13, 13, 14, 14], "LimitInfo": [0, 0, 0, 0, 0, 14, 14] }, @@ -613,7 +602,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -645,7 +634,7 @@ "Name":"cellular-emergency", "Type":"POWER_AMPLIFIER", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -662,17 +651,17 @@ "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.03, 0.09, 0.0, 0.04, 0.0, 0.07, 0.17, 0.0, 0.83], - "Offset": -11820.0, + "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 }, { "Name":"VIRTUAL-SKIN-SPEAKER", "Type":"UNKNOWN", - "Version":"3.0", + "Version":"2.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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"], "Coefficient":[1], @@ -689,9 +678,9 @@ "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.02, 0.0, 0.09, 0.18, 0.37, 0.08, 0.05, 0.06], - "Offset": 2350.0, + "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 }, { @@ -700,9 +689,9 @@ "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.03, 0.13, 0.06, 0.28, 0.3, 0.0, 0.05, 0.07, 0.01], - "Offset": 1130.0, + "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 }, { @@ -711,9 +700,9 @@ "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.06, 0.0, 0.63, 0.1, 0.03, 0.0, 0.06, 0.0], - "Offset": 2680.0, + "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 }, { @@ -722,9 +711,9 @@ "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.11, 0.01, 0.0, 0.54, 0.0, 0.0, 0.08, 0.0, 0.11], - "Offset": 5900.0, + "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 }, { @@ -733,9 +722,9 @@ "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.03, 0.02, 0.38, 0.15, 0.24, 0.02, 0.05, 0.0], - "Offset": 1810.0, + "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 }, { @@ -744,21 +733,32 @@ "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.33, 0.0, 0.0, 0.12, 0.04, 0.17, 0.02, 0.04, 0.16], - "Offset": 3140.0, + "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 }, { "Name":"VIRTUAL-SKIN-FRONT", "Type":"UNKNOWN", - "Version":"2.0", + "Version":"1.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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", - "VIRTUAL-SKIN-FRONT-SUB-3", "VIRTUAL-SKIN-FRONT-SUB-4", "VIRTUAL-SKIN-FRONT-SUB-5"], - "Coefficient":[1, 1, 1, 1, 1, 1], + "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 }, { @@ -767,9 +767,9 @@ "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.0, 0.24, 0.02, 0.14, 0.04, 0.08, 0.38], - "Offset": -660.0, + "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 }, { @@ -778,9 +778,9 @@ "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.0, 0.15, 0.18, 0.02, 0.04, 0.26, 0.04, 0.28], - "Offset": 1290.0, + "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 }, { @@ -789,81 +789,24 @@ "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.08, 0.01, 0.05, 0.37, 0.07, 0.02, 0.25, 0.07], - "Offset": 1360.0, + "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-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":"5.0", + "Version":"4.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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", "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], + "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", 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":300000, + "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], @@ -962,12 +905,12 @@ ], "PowerRails":[ { - "Name":"S2M_VDD_CPUCL2", + "Name":"S2M_VDD_CPUCL1", "PowerSampleDelay":7000, "PowerSampleCount":1 }, { - "Name":"S3M_VDD_CPUCL1", + "Name":"S3M_VDD_CPUCL2", "PowerSampleDelay":7000, "PowerSampleCount":1 }, @@ -985,7 +928,7 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM"], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL1", "S3M_VDD_CPUCL2", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM"], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 @@ -1030,10 +973,6 @@ { "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.json b/thermal/thermal_info_config_tokay.json index 10ff0c92..656f4766 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -175,48 +175,36 @@ "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", "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-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-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-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-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":"6.0", + "Version":"5.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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"], - "Coefficient": [1, 1, 1], + "Combination":["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1"], + "Coefficient":[1.0, 1.0], "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, @@ -239,7 +227,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -255,7 +243,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -289,7 +277,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "BindedPowerRail": "S3M_VDD_CPUCL1", + "BindedPowerRail": "S2M_VDD_CPUCL1", "CdevCeiling": [0, 6, 6, 6, 6, 6, 6] }, { @@ -297,7 +285,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "BindedPowerRail": "S2M_VDD_CPUCL2", + "BindedPowerRail": "S3M_VDD_CPUCL2", "CdevCeiling": [0, 8, 8, 8, 8, 8, 8] } ] @@ -307,7 +295,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -398,7 +386,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -495,7 +483,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -530,7 +518,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "BindedPowerRail": "S3M_VDD_CPUCL1", + "BindedPowerRail": "S2M_VDD_CPUCL1", "CdevCeiling": [0, 11, 11, 11, 11, 14, 14], "LimitInfo": [0, 0, 0, 0, 0, 14, 14] }, @@ -539,7 +527,7 @@ "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], "MaxReleaseStep": 1, "MaxThrottleStep": 2, - "BindedPowerRail": "S2M_VDD_CPUCL2", + "BindedPowerRail": "S3M_VDD_CPUCL2", "CdevCeiling": [0, 13, 13, 13, 13, 14, 14], "LimitInfo": [0, 0, 0, 0, 0, 14, 14] }, @@ -559,7 +547,7 @@ "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"], "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], @@ -591,7 +579,7 @@ "Name":"cellular-emergency", "Type":"POWER_AMPLIFIER", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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], @@ -603,25 +591,36 @@ "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", "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-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", "Type":"UNKNOWN", - "Version":"3.0", + "Version":"2.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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"], - "Coefficient":[1], + "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1"], + "Coefficient":[1, 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, @@ -630,66 +629,67 @@ "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", "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-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-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-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-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-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-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-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", "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-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":"2.0", + "Version":"1.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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", "VIRTUAL-SKIN-FRONT-SUB-3", "VIRTUAL-SKIN-FRONT-SUB-4"], @@ -697,95 +697,73 @@ "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-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", "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-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", "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-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", "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-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", "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-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":"5.0", + "Version":"4.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_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", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5", "VIRTUAL-SKIN-CHARGE-SUB-6"], - "Coefficient": [1, 1, 1, 1, 1, 1, 1], + "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", 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":300000, + "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], @@ -884,12 +862,12 @@ ], "PowerRails":[ { - "Name":"S2M_VDD_CPUCL2", + "Name":"S2M_VDD_CPUCL1", "PowerSampleDelay":7000, "PowerSampleCount":1 }, { - "Name":"S3M_VDD_CPUCL1", + "Name":"S3M_VDD_CPUCL2", "PowerSampleDelay":7000, "PowerSampleCount":1 }, @@ -907,7 +885,7 @@ "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, "Formula":"WEIGHTED_AVG", - "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL2", "S3M_VDD_CPUCL1", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM"], + "Combination":["S1S_VDD_CAM", "S2S_VDD_G3D", "S4S_VDD2H_MEM", "S5S_VDDQ_MEM", "S8S_VDD_G3D_L2", "S9S_VDD_AOC", "L2S_PLL_MIPI_UFS", "L9S_GNSS_CORE", "L21S_VDD2L_MEM", "VSYS_PWR_DISPLAY", "VSYS_PWR_WLAN_BT", "S1M_VDD_MIF", "S2M_VDD_CPUCL1", "S3M_VDD_CPUCL2", "S4M_VDD_CPUCL0", "S5M_VDD_INT", "S6M_LLDO1", "S7M_VDD_TPU", "S8M_LLDO2", "VSYS_PWR_MODEM"], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], "PowerSampleDelay":7000, "PowerSampleCount":5 @@ -932,10 +910,6 @@ { "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] } ] },