From ea8c58d2d1a97deca3c9138308596d2253ddbe76 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 22 Feb 2024 06:00:17 +0000 Subject: [PATCH] thermal: update WLC charging throttling policy Bug: 323435751 Test: run the charging test with D250 Change-Id: I028f809f54fdb0c9675c82f34f6aab989b99cb65 --- thermal/thermal_info_config_caiman.json | 71 ++++++++++++++++++- .../thermal_info_config_charge_caiman.json | 71 ++++++++++++++++++- .../thermal_info_config_charge_komodo.json | 71 ++++++++++++++++++- thermal/thermal_info_config_charge_tokay.json | 71 ++++++++++++++++++- thermal/thermal_info_config_komodo.json | 71 ++++++++++++++++++- thermal/thermal_info_config_tokay.json | 71 ++++++++++++++++++- 6 files changed, 420 insertions(+), 6 deletions(-) diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index baaa93c9..44cde33e 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -774,15 +774,41 @@ "Offset": -458.0, "Multiplier": 0.001 }, + { + "Name":"thb_hda", + "Type":"UNKNOWN", + "Multiplier":1 + }, + { + "Name":"IS_WIRED_CHARGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda"], + "Coefficient":[-1], + "Multiplier":1 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"6.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"], "Coefficient": [1.0, 1.0, 1.0, 1.0], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-WIRED", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["IS_WIRED_CHARGE"], + "CoefficientType": ["SENSOR"], "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, @@ -817,6 +843,49 @@ } ] }, + { + "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":[1.0], + "HotThreshold":["NaN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 27, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1383, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2383, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 8022, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"], + "I_Default":1383 + }, + "ExcludedPowerInfo": [ + { + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42] + } + ], + "BindedCdevInfo": [ + { + "CdevRequest": "chg_mdis", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] + } + ] + }, { "Name": "VIRTUAL-USB-THROTTLING", "Type": "UNKNOWN", diff --git a/thermal/thermal_info_config_charge_caiman.json b/thermal/thermal_info_config_charge_caiman.json index a47ae730..92cb973c 100644 --- a/thermal/thermal_info_config_charge_caiman.json +++ b/thermal/thermal_info_config_charge_caiman.json @@ -121,15 +121,41 @@ "Offset": -458.0, "Multiplier": 0.001 }, + { + "Name":"thb_hda", + "Type":"UNKNOWN", + "Multiplier":1 + }, + { + "Name":"IS_WIRED_CHARGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda"], + "Coefficient":[-1], + "Multiplier":1 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"6.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3"], "Coefficient": [1.0, 1.0, 1.0, 1.0], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-WIRED", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["IS_WIRED_CHARGE"], + "CoefficientType": ["SENSOR"], "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, @@ -164,6 +190,49 @@ } ] }, + { + "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":[1.0], + "HotThreshold":["NaN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 27, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1383, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2383, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 8022, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"], + "I_Default":1383 + }, + "ExcludedPowerInfo": [ + { + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42] + } + ], + "BindedCdevInfo": [ + { + "CdevRequest": "chg_mdis", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] + } + ] + }, { "Name": "VIRTUAL-USB-THROTTLING", "Type": "UNKNOWN", diff --git a/thermal/thermal_info_config_charge_komodo.json b/thermal/thermal_info_config_charge_komodo.json index 1cdad975..9ceec2d6 100644 --- a/thermal/thermal_info_config_charge_komodo.json +++ b/thermal/thermal_info_config_charge_komodo.json @@ -143,15 +143,41 @@ "Offset": -2069.0, "Multiplier": 0.001 }, + { + "Name":"thb_hda", + "Type":"UNKNOWN", + "Multiplier":1 + }, + { + "Name":"IS_WIRED_CHARGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda"], + "Coefficient":[-1], + "Multiplier":1 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"7.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-WIRED", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["IS_WIRED_CHARGE"], + "CoefficientType": ["SENSOR"], "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, @@ -186,6 +212,49 @@ } ] }, + { + "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":[1.0], + "HotThreshold":["NaN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 27, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1383, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2383, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 8022, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"], + "I_Default":1383 + }, + "ExcludedPowerInfo": [ + { + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42] + } + ], + "BindedCdevInfo": [ + { + "CdevRequest": "chg_mdis", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] + } + ] + }, { "Name": "VIRTUAL-USB-THROTTLING", "Type": "UNKNOWN", diff --git a/thermal/thermal_info_config_charge_tokay.json b/thermal/thermal_info_config_charge_tokay.json index fc053d08..6e7f06fa 100644 --- a/thermal/thermal_info_config_charge_tokay.json +++ b/thermal/thermal_info_config_charge_tokay.json @@ -143,15 +143,41 @@ "Offset": -2083.0, "Multiplier": 0.001 }, + { + "Name":"thb_hda", + "Type":"UNKNOWN", + "Multiplier":1 + }, + { + "Name":"IS_WIRED_CHARGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda"], + "Coefficient":[-1], + "Multiplier":1 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"7.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-WIRED", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["IS_WIRED_CHARGE"], + "CoefficientType": ["SENSOR"], "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, @@ -186,6 +212,49 @@ } ] }, + { + "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":[1.0], + "HotThreshold":["NaN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 27, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1383, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2383, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 8022, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"], + "I_Default":1383 + }, + "ExcludedPowerInfo": [ + { + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42] + } + ], + "BindedCdevInfo": [ + { + "CdevRequest": "chg_mdis", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] + } + ] + }, { "Name": "VIRTUAL-USB-THROTTLING", "Type": "UNKNOWN", diff --git a/thermal/thermal_info_config_komodo.json b/thermal/thermal_info_config_komodo.json index 882378b5..64b81829 100644 --- a/thermal/thermal_info_config_komodo.json +++ b/thermal/thermal_info_config_komodo.json @@ -834,15 +834,41 @@ "Offset": -2069.0, "Multiplier": 0.001 }, + { + "Name":"thb_hda", + "Type":"UNKNOWN", + "Multiplier":1 + }, + { + "Name":"IS_WIRED_CHARGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda"], + "Coefficient":[-1], + "Multiplier":1 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"7.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-WIRED", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["IS_WIRED_CHARGE"], + "CoefficientType": ["SENSOR"], "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, @@ -877,6 +903,49 @@ } ] }, + { + "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":[1.0], + "HotThreshold":["NaN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 27, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1383, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2383, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 8022, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"], + "I_Default":1383 + }, + "ExcludedPowerInfo": [ + { + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42] + } + ], + "BindedCdevInfo": [ + { + "CdevRequest": "chg_mdis", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] + } + ] + }, { "Name": "VIRTUAL-USB-THROTTLING", "Type": "UNKNOWN", diff --git a/thermal/thermal_info_config_tokay.json b/thermal/thermal_info_config_tokay.json index e190afdd..e670d745 100644 --- a/thermal/thermal_info_config_tokay.json +++ b/thermal/thermal_info_config_tokay.json @@ -788,15 +788,41 @@ "Offset": -2083.0, "Multiplier": 0.001 }, + { + "Name":"thb_hda", + "Type":"UNKNOWN", + "Multiplier":1 + }, + { + "Name":"IS_WIRED_CHARGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "Combination":["thb_hda"], + "Coefficient":[-1], + "Multiplier":1 + }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", "Version":"7.0", "VirtualSensor":true, - "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "Formula":"MAXIMUM", "Combination": ["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1", "VIRTUAL-SKIN-CHARGE-SUB-2", "VIRTUAL-SKIN-CHARGE-SUB-3", "VIRTUAL-SKIN-CHARGE-SUB-4", "VIRTUAL-SKIN-CHARGE-SUB-5"], "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0], + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE-WIRED", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":["IS_WIRED_CHARGE"], + "CoefficientType": ["SENSOR"], "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, @@ -831,6 +857,49 @@ } ] }, + { + "Name":"VIRTUAL-SKIN-CHARGE-PERSIST", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], + "Formula":"WEIGHTED_AVG", + "Combination":["VIRTUAL-SKIN-CHARGE"], + "Coefficient":[1.0], + "HotThreshold":["NaN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "PIDInfo": { + "K_Po":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 27, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1383, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2383, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 8022, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"], + "I_Default":1383 + }, + "ExcludedPowerInfo": [ + { + "PowerRail": "PARTIAL_SYSTEM_POWER", + "PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42] + } + ], + "BindedCdevInfo": [ + { + "CdevRequest": "chg_mdis", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "CdevCeiling": [0, 25, 25, 26, 26, 26, 26], + "LimitInfo": [0, 0, 1, 1, 26, 26, 26] + } + ] + }, { "Name": "VIRTUAL-USB-THROTTLING", "Type": "UNKNOWN",