Merge "thermal: Update thermal config" into sc-v2-dev am: b44be5bff4

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

Change-Id: I81d32944c5d02e135dede07d936e3ae66aa55af1
This commit is contained in:
TreeHugger Robot 2021-12-10 16:53:37 +00:00 committed by Automerger Merge Worker
commit 87d7147b24

View file

@ -5,7 +5,7 @@
"Type":"UNKNOWN", "Type":"UNKNOWN",
"HotThreshold":[ "HotThreshold":[
"NAN", "NAN",
"33.0", "32.0",
"NAN", "NAN",
"NAN", "NAN",
"NAN", "NAN",
@ -132,6 +132,47 @@
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
}, },
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
{
"Name":"VIRTUAL-QUIET-NEUTRAL",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":[
"quiet_therm",
"neutral_therm"
],
"Coefficient":[
"0.7",
"0.3"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001
},
{ {
"Name":"VIRTUAL-NEUTRAL-SKIN2", "Name":"VIRTUAL-NEUTRAL-SKIN2",
"Type":"UNKNOWN", "Type":"UNKNOWN",
@ -142,8 +183,8 @@
"skin_therm2" "skin_therm2"
], ],
"Coefficient":[ "Coefficient":[
"0.62", "0.7",
"0.38" "0.3"
], ],
"HotThreshold":[ "HotThreshold":[
"NAN", "NAN",
@ -196,9 +237,11 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":[ "Combination":[
"VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL-SKIN2",
"VIRTUAL-NEUTRAL" "VIRTUAL-NEUTRAL",
"VIRTUAL-QUIET-NEUTRAL"
], ],
"Coefficient":[ "Coefficient":[
"1.0",
"1.0", "1.0",
"1.0" "1.0"
], ],
@ -288,9 +331,11 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":[ "Combination":[
"VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL-SKIN2",
"VIRTUAL-NEUTRAL" "VIRTUAL-NEUTRAL",
"VIRTUAL-QUIET-NEUTRAL"
], ],
"Coefficient":[ "Coefficient":[
"1.0",
"1.0", "1.0",
"1.0" "1.0"
], ],
@ -337,9 +382,11 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":[ "Combination":[
"VIRTUAL-NEUTRAL-SKIN2", "VIRTUAL-NEUTRAL-SKIN2",
"VIRTUAL-NEUTRAL" "VIRTUAL-NEUTRAL",
"VIRTUAL-QUIET-NEUTRAL"
], ],
"Coefficient":[ "Coefficient":[
"1.0",
"1.0", "1.0",
"1.0" "1.0"
], ],