Evolution-X-Tensor/device_google_akita
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "thermal: update vskin charge" into udc-qpr-dev am: 5c8c846237

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/akita/+/25455112

Change-Id: I1d3cfd4b4b6d04a77a54ce997c511f631c16a642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peter (YM) 2023-12-08 02:12:40 +00:00 • committed by Automerger Merge Worker
commit 14b301ee1a
2 changed files with 30 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

38
thermal_info_config_akita.json
View file

@ -612,16 +612,16 @@
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 310, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 310, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 2224, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1600, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 2577, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2200, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
"I_Default":2224 "I_Default":1600
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
{ {
@ -641,41 +641,31 @@
] ]
}, },
{ {
"Name":"VIRTUAL-SKIN-CHARGE-WLC-SUB-1", "Name":"VIRTUAL-SKIN-CHARGE-WLC",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Version":"0.4",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"charger_therm",
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["modem_therm", "rffe_therm", "soc_therm", "charger_therm"], "Combination":["modem_therm", "rffe_therm", "soc_therm", "charger_therm"],
"Coefficient":[0.214, 0.373, 0.266, 0.151], "Coefficient":[0.214, 0.373, 0.266, 0.151],
"Offset":170, "Offset":170,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN-CHARGE-WLC",
"Type":"UNKNOWN",
"Version":"0.3e",
"VirtualSensor":true,
"TriggerSensor":"charger_therm",
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE-WLC-SUB-1"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.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], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 310, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 310, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 2224, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 2577, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 1400, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
"I_Default":2224 "I_Default":400
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
{ {
@ -690,7 +680,7 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"CdevCeiling": [0, 25, 25, 25, 26, 26, 26], "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
"LimitInfo": [0, 0, 1, 1, 1, 26, 26] "LimitInfo": [0, 1, 1, 1, 1, 26, 26]
} }
] ]
}, },

31
thermal_info_config_charge_akita.json
View file

@ -97,16 +97,16 @@
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 310, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 310, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 2224, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 1600, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 2577, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 2200, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
"I_Default":2224 "I_Default":1600
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
{ {
@ -139,28 +139,29 @@
{ {
"Name":"VIRTUAL-SKIN-CHARGE-WLC", "Name":"VIRTUAL-SKIN-CHARGE-WLC",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Version":"0.3e", "Version":"0.4",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"charger_therm", "TriggerSensor":"charger_therm",
"Formula":"MAXIMUM", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-CHARGE-WLC-SUB-1"], "Combination":["modem_therm", "rffe_therm", "soc_therm", "charger_therm"],
"Coefficient":[1.0], "Coefficient":[0.214, 0.373, 0.266, 0.151],
"Offset":170,
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.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], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 310, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"],
"K_Pu":["NAN", "NAN", 310, "NAN", "NAN", "NAN", "NAN"], "K_Pu":["NAN", "NAN", 200, "NAN", "NAN", "NAN", "NAN"],
"K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"],
"I_Max":["NAN", "NAN", 2224, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"],
"S_Power":["NAN", "NAN", 2577, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NAN", "NAN", 1400, "NAN", "NAN", "NAN", "NAN"],
"MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NAN", "NAN", 300, "NAN", "NAN", "NAN", "NAN"],
"MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NAN", "NAN", 6000, "NAN", "NAN", "NAN", "NAN"],
"I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"],
"I_Default":2224 "I_Default":400
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
{ {
@ -175,7 +176,7 @@
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"MaxThrottleStep": 1, "MaxThrottleStep": 1,
"CdevCeiling": [0, 25, 25, 25, 26, 26, 26], "CdevCeiling": [0, 25, 25, 25, 26, 26, 26],
"LimitInfo": [0, 0, 1, 1, 1, 26, 26] "LimitInfo": [0, 1, 1, 1, 1, 26, 26]
} }
] ]
}, },