Merge "thermal: Adjust CLOSE-SUB1 VSKIN equation" into tm-qpr-dev am: 745b90ab70
am: a11996d468
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/23048298 Change-Id: I45454d8019f19182087509740029ecec2dabc019 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
4bb706c88f
3 changed files with 33 additions and 3 deletions
|
@ -80,7 +80,7 @@
|
||||||
"Multiplier":1
|
"Multiplier":1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name":"CLOSE-SUB1",
|
"Name":"CLOSE-SUB1-RAW",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
|
@ -90,6 +90,16 @@
|
||||||
"Offset":-670,
|
"Offset":-670,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"Name":"CLOSE-SUB1",
|
||||||
|
"Type":"UNKNOWN",
|
||||||
|
"Hidden":true,
|
||||||
|
"VirtualSensor":true,
|
||||||
|
"Formula":"MINIMUM",
|
||||||
|
"Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
|
||||||
|
"Coefficient":[1.0, 49000.0],
|
||||||
|
"Multiplier":0.001
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"Name":"CLOSE-SUB2",
|
"Name":"CLOSE-SUB2",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
|
|
|
@ -86,7 +86,7 @@
|
||||||
"Multiplier":1
|
"Multiplier":1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name":"CLOSE-SUB1",
|
"Name":"CLOSE-SUB1-RAW",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
|
@ -96,6 +96,16 @@
|
||||||
"Offset":-670,
|
"Offset":-670,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"Name":"CLOSE-SUB1",
|
||||||
|
"Type":"UNKNOWN",
|
||||||
|
"Hidden":true,
|
||||||
|
"VirtualSensor":true,
|
||||||
|
"Formula":"MINIMUM",
|
||||||
|
"Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
|
||||||
|
"Coefficient":[1.0, 49000.0],
|
||||||
|
"Multiplier":0.001
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"Name":"CLOSE-SUB2",
|
"Name":"CLOSE-SUB2",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
|
|
|
@ -86,7 +86,7 @@
|
||||||
"Multiplier":1
|
"Multiplier":1
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name":"CLOSE-SUB1",
|
"Name":"CLOSE-SUB1-RAW",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
|
@ -96,6 +96,16 @@
|
||||||
"Offset":-670,
|
"Offset":-670,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"Name":"CLOSE-SUB1",
|
||||||
|
"Type":"UNKNOWN",
|
||||||
|
"Hidden":true,
|
||||||
|
"VirtualSensor":true,
|
||||||
|
"Formula":"MINIMUM",
|
||||||
|
"Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
|
||||||
|
"Coefficient":[1.0, 49000.0],
|
||||||
|
"Multiplier":0.001
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"Name":"CLOSE-SUB2",
|
"Name":"CLOSE-SUB2",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue