Merge changes from topic "wlc_41C-udc-qpr-dev" into udc-qpr-dev am: 5d252098f4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/shusky/+/24683800 Change-Id: Iaf6b317b7488692fe0ebf5aa4a2a189e4e41afca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
8c0ff115c6
4 changed files with 276 additions and 4 deletions
|
@ -129,15 +129,40 @@
|
|||
"Offset":1140,
|
||||
"Multiplier":0.001
|
||||
},
|
||||
{
|
||||
"Name":"thb_hda",
|
||||
"Type":"UNKNOWN",
|
||||
"Multiplier":1
|
||||
},
|
||||
{
|
||||
"Name":"IS_WLC",
|
||||
"Type":"UNKNOWN",
|
||||
"Hidden":true,
|
||||
"VirtualSensor":true,
|
||||
"Formula":"COUNT_THRESHOLD",
|
||||
"Combination":["thb_hda"],
|
||||
"Coefficient":[1],
|
||||
"Multiplier":1
|
||||
},
|
||||
{
|
||||
"Name":"VIRTUAL-SKIN-CHARGE",
|
||||
"Type":"UNKNOWN",
|
||||
"Version":"4.0",
|
||||
"VirtualSensor":true,
|
||||
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_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", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
|
||||
"Formula":"WEIGHTED_AVG",
|
||||
"Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"],
|
||||
"Coefficient":[1.0, -1000000],
|
||||
"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,
|
||||
|
@ -172,6 +197,49 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name":"VIRTUAL-SKIN-CHARGE-PERSIST",
|
||||
"Type":"UNKNOWN",
|
||||
"Hidden":true,
|
||||
"VirtualSensor":true,
|
||||
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
|
||||
"Formula":"MAXIMUM",
|
||||
"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":60000,
|
||||
"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":"USB-MINUS-NEUTRAL",
|
||||
"Type":"UNKNOWN",
|
||||
|
|
|
@ -162,15 +162,40 @@
|
|||
"Offset":-5080,
|
||||
"Multiplier":0.001
|
||||
},
|
||||
{
|
||||
"Name":"thb_hda",
|
||||
"Type":"UNKNOWN",
|
||||
"Multiplier":1
|
||||
},
|
||||
{
|
||||
"Name":"IS_WLC",
|
||||
"Type":"UNKNOWN",
|
||||
"Hidden":true,
|
||||
"VirtualSensor":true,
|
||||
"Formula":"COUNT_THRESHOLD",
|
||||
"Combination":["thb_hda"],
|
||||
"Coefficient":[1],
|
||||
"Multiplier":1
|
||||
},
|
||||
{
|
||||
"Name":"VIRTUAL-SKIN-CHARGE",
|
||||
"Type":"UNKNOWN",
|
||||
"Version":"4.0",
|
||||
"VirtualSensor":true,
|
||||
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_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.0, 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", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
|
||||
"Formula":"WEIGHTED_AVG",
|
||||
"Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"],
|
||||
"Coefficient":[1.0, -1000000],
|
||||
"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,
|
||||
|
@ -205,6 +230,49 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name":"VIRTUAL-SKIN-CHARGE-PERSIST",
|
||||
"Type":"UNKNOWN",
|
||||
"Hidden":true,
|
||||
"VirtualSensor":true,
|
||||
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
|
||||
"Formula":"MAXIMUM",
|
||||
"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":60000,
|
||||
"PassiveDelay":7000,
|
||||
"PIDInfo": {
|
||||
"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", 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", 6412, "NAN", "NAN", "NAN", "NAN"],
|
||||
"I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"],
|
||||
"I_Default":1066
|
||||
},
|
||||
"ExcludedPowerInfo": [
|
||||
{
|
||||
"PowerRail": "PARTIAL_SYSTEM_POWER",
|
||||
"PowerWeight": [0.16, 0.16, 0.16, 0.16, 0.32, 0.32, 0.32]
|
||||
}
|
||||
],
|
||||
"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":"USB-MINUS-NEUTRAL",
|
||||
"Type":"UNKNOWN",
|
||||
|
|
|
@ -796,15 +796,40 @@
|
|||
"Offset":1140,
|
||||
"Multiplier":0.001
|
||||
},
|
||||
{
|
||||
"Name":"thb_hda",
|
||||
"Type":"UNKNOWN",
|
||||
"Multiplier":1
|
||||
},
|
||||
{
|
||||
"Name":"IS_WLC",
|
||||
"Type":"UNKNOWN",
|
||||
"Hidden":true,
|
||||
"VirtualSensor":true,
|
||||
"Formula":"COUNT_THRESHOLD",
|
||||
"Combination":["thb_hda"],
|
||||
"Coefficient":[1],
|
||||
"Multiplier":1
|
||||
},
|
||||
{
|
||||
"Name":"VIRTUAL-SKIN-CHARGE",
|
||||
"Type":"UNKNOWN",
|
||||
"Version":"4.0",
|
||||
"VirtualSensor":true,
|
||||
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_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", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
|
||||
"Formula":"WEIGHTED_AVG",
|
||||
"Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"],
|
||||
"Coefficient":[1.0, -1000000],
|
||||
"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,
|
||||
|
@ -839,6 +864,49 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name":"VIRTUAL-SKIN-CHARGE-PERSIST",
|
||||
"Type":"UNKNOWN",
|
||||
"Hidden":true,
|
||||
"VirtualSensor":true,
|
||||
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
|
||||
"Formula":"MAXIMUM",
|
||||
"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":60000,
|
||||
"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-SKIN-FRONT-SUB-0",
|
||||
"Type":"UNKNOWN",
|
||||
|
|
|
@ -808,15 +808,40 @@
|
|||
"Offset":-5080,
|
||||
"Multiplier":0.001
|
||||
},
|
||||
{
|
||||
"Name":"thb_hda",
|
||||
"Type":"UNKNOWN",
|
||||
"Multiplier":1
|
||||
},
|
||||
{
|
||||
"Name":"IS_WLC",
|
||||
"Type":"UNKNOWN",
|
||||
"Hidden":true,
|
||||
"VirtualSensor":true,
|
||||
"Formula":"COUNT_THRESHOLD",
|
||||
"Combination":["thb_hda"],
|
||||
"Coefficient":[1],
|
||||
"Multiplier":1
|
||||
},
|
||||
{
|
||||
"Name":"VIRTUAL-SKIN-CHARGE",
|
||||
"Type":"UNKNOWN",
|
||||
"Version":"4.0",
|
||||
"VirtualSensor":true,
|
||||
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_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.0, 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", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
|
||||
"Formula":"WEIGHTED_AVG",
|
||||
"Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"],
|
||||
"Coefficient":[1.0, -1000000],
|
||||
"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,
|
||||
|
@ -851,6 +876,49 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"Name":"VIRTUAL-SKIN-CHARGE-PERSIST",
|
||||
"Type":"UNKNOWN",
|
||||
"Hidden":true,
|
||||
"VirtualSensor":true,
|
||||
"TriggerSensor":["north_therm", "cam_therm", "soc_therm", "charge_therm", "disp_therm", "neutral_therm", "quiet_therm", "usb_pwr_therm"],
|
||||
"Formula":"MAXIMUM",
|
||||
"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":60000,
|
||||
"PassiveDelay":7000,
|
||||
"PIDInfo": {
|
||||
"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", 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", 6412, "NAN", "NAN", "NAN", "NAN"],
|
||||
"I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"],
|
||||
"I_Default":1066
|
||||
},
|
||||
"ExcludedPowerInfo": [
|
||||
{
|
||||
"PowerRail": "PARTIAL_SYSTEM_POWER",
|
||||
"PowerWeight": [0.16, 0.16, 0.16, 0.16, 0.32, 0.32, 0.32]
|
||||
}
|
||||
],
|
||||
"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-SKIN-FRONT-SUB-0",
|
||||
"Type":"UNKNOWN",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue