Merge "thermal: remove vdroop1/2 for canopy compatibility" into sc-dev am: 9270a6ea38

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/13842398

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cd966c3f11be976e80f13a614061b8977f0fd64
This commit is contained in:
TreeHugger Robot 2021-03-12 02:30:08 +00:00 committed by Automerger Merge Worker
commit 2bd67205ec
2 changed files with 6 additions and 70 deletions

View file

@ -107,16 +107,16 @@
"Type":"UNKNOWN", "Type":"UNKNOWN",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"TriggerSensor": "vdroop1", "TriggerSensor": "smpl_gm",
"Combination":[ "Combination":[
"battery", "battery",
"battery_cycle", "battery_cycle",
"vdroop1" "smpl_gm"
], ],
"Coefficient":[ "Coefficient":[
"-10000", "-10000",
"400", "400",
"1200" "1400"
], ],
"HotThreshold":[ "HotThreshold":[
"NAN", "NAN",
@ -148,38 +148,6 @@
"Multiplier":1, "Multiplier":1,
"Monitor":false "Monitor":false
}, },
{
"Name":"vdroop1",
"Type":"BCL_VOLTAGE",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
1200,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":1,
"Monitor":true
},
{
"Name":"vdroop2",
"Type":"BCL_VOLTAGE",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
1200,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":1,
"Monitor":true
},
{ {
"Name":"smpl_gm", "Name":"smpl_gm",
"Type":"BCL_VOLTAGE", "Type":"BCL_VOLTAGE",

View file

@ -107,16 +107,16 @@
"Type":"UNKNOWN", "Type":"UNKNOWN",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"TriggerSensor": "vdroop1", "TriggerSensor": "smpl_gm",
"Combination":[ "Combination":[
"battery", "battery",
"battery_cycle", "battery_cycle",
"vdroop1" "smpl_gm"
], ],
"Coefficient":[ "Coefficient":[
"-10000", "-10000",
"400", "400",
"1200" "1400"
], ],
"HotThreshold":[ "HotThreshold":[
"NAN", "NAN",
@ -148,38 +148,6 @@
"Multiplier":1, "Multiplier":1,
"Monitor":false "Monitor":false
}, },
{
"Name":"vdroop1",
"Type":"BCL_VOLTAGE",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
1200,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":1,
"Monitor":true
},
{
"Name":"vdroop2",
"Type":"BCL_VOLTAGE",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
1200,
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":1,
"Monitor":true
},
{ {
"Name":"smpl_gm", "Name":"smpl_gm",
"Type":"BCL_VOLTAGE", "Type":"BCL_VOLTAGE",