Merge changes I66a85036,Id45dbc2e into tm-qpr-dev
* changes: thermal: add cellular-emergency policy thermal: correct the typo for sensor equation of fold mode
This commit is contained in:
commit
e5f0fa4162
2 changed files with 18 additions and 3 deletions
|
@ -151,7 +151,7 @@
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["VIRTUAL-SKIN-UNFOLD-SUB1", "IS_UNFOLD"],
|
"Combination":["VIRTUAL-SKIN-FOLD-SUB1", "IS_UNFOLD"],
|
||||||
"Coefficient":[1.0, -1000000],
|
"Coefficient":[1.0, -1000000],
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
|
|
|
@ -157,7 +157,7 @@
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["VIRTUAL-SKIN-UNFOLD-SUB1", "IS_UNFOLD"],
|
"Combination":["VIRTUAL-SKIN-FOLD-SUB1", "IS_UNFOLD"],
|
||||||
"Coefficient":[1.0, -1000000],
|
"Coefficient":[1.0, -1000000],
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
|
@ -181,7 +181,22 @@
|
||||||
"LimitInfo": [0, 2, 3, 4, 5, 5, 5]
|
"LimitInfo": [0, 2, 3, 4, 5, 5, 5]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"Name":"cellular-emergency",
|
||||||
|
"Type":"POWER_AMPLIFIER",
|
||||||
|
"VirtualSensor":true,
|
||||||
|
"TriggerSensor":"skin_therm",
|
||||||
|
"Formula":"MAXIMUM",
|
||||||
|
"Combination":["VIRTUAL-SKIN-UNFOLD", "VIRTUAL-SKIN-FOLD"],
|
||||||
|
"Coefficient":[1.0, 1.0],
|
||||||
|
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
|
||||||
|
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
|
||||||
|
"Multiplier":0.001,
|
||||||
|
"PollingDelay":60000,
|
||||||
|
"PassiveDelay":7000,
|
||||||
|
"SendCallback":true
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"Name":"VIRTUAL-SKIN-CPU-GPU",
|
"Name":"VIRTUAL-SKIN-CPU-GPU",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue