From 0418ec59b622fc1ad7143f5d4f99605d9e4040c1 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Tue, 29 Aug 2023 13:28:21 -0700 Subject: [PATCH] thermal: optimize charging thermal parameters Bug: 290828382 Test: adb shell dumpsys android.hardware.thermal.IThermal/default Change-Id: Ib1ca94f81e8325ab2b40bffd62308998296a18d4 --- thermal/thermal_info_config_charge_husky.json | 20 +++++++++---------- thermal/thermal_info_config_charge_shiba.json | 18 ++++++++--------- thermal/thermal_info_config_husky.json | 20 +++++++++---------- thermal/thermal_info_config_shiba.json | 18 ++++++++--------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index dd6af4a..626c2b4 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -206,27 +206,27 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE"], "Coefficient":[1.0], - "HotThreshold":["NAN", 34.0, 41.0, 45.0, 47.0, 51.0, 55.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":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_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", 1302, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2527, "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", 6219, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], - "I_Default":1302 + "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.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + "PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42] } ], "BindedCdevInfo": [ diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json index 9d5dc07..a7d5436 100644 --- a/thermal/thermal_info_config_charge_shiba.json +++ b/thermal/thermal_info_config_charge_shiba.json @@ -239,27 +239,27 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE"], "Coefficient":[1.0], - "HotThreshold":["NAN", 34.0, 41.0, 45.0, 47.0, 51.0, 55.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":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1066, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2066, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], - "I_Default":1099 + "MaxAllocPower":["NAN", "NAN", 6412, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1066 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2] + "PowerWeight": [0.16, 0.16, 0.16, 0.16, 0.32, 0.32, 0.32] } ], "BindedCdevInfo": [ diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 4703935..7fae7b7 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -827,27 +827,27 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE"], "Coefficient":[1.0], - "HotThreshold":["NAN", 34.0, 41.0, 45.0, 47.0, 51.0, 55.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":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_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", 1302, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2527, "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", 6219, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], - "I_Default":1302 + "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.12, 0.12, 0.06, 0.06, 0.24, 0.24, 0.24] + "PowerWeight": [0.21, 0.21, 0.21, 0.21, 0.42, 0.42, 0.42] } ], "BindedCdevInfo": [ diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 4d24a0b..e5582fc 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -839,27 +839,27 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE"], "Coefficient":[1.0], - "HotThreshold":["NAN", 34.0, 41.0, 45.0, 47.0, 51.0, 55.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":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], + "K_Pu":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"], + "I_Max":["NAN", "NAN", 1066, "NAN", "NAN", "NAN", "NAN"], + "S_Power":["NAN", "NAN", 2066, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], - "I_Default":1099 + "MaxAllocPower":["NAN", "NAN", 6412, "NAN", "NAN", "NAN", "NAN"], + "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "I_Default":1066 }, "ExcludedPowerInfo": [ { "PowerRail": "PARTIAL_SYSTEM_POWER", - "PowerWeight": [0.1, 0.1, 0.05, 0.05, 0.2, 0.2, 0.2] + "PowerWeight": [0.16, 0.16, 0.16, 0.16, 0.32, 0.32, 0.32] } ], "BindedCdevInfo": [