Merge "thermal: Update VSKIN equation V06.2" into udc-dev am: 5d53d59375
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/24116711 Change-Id: I7335e9693b8426407f8b218e4b3f9532f35d5879 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
6ce2efaa39
3 changed files with 11 additions and 11 deletions
|
@ -204,9 +204,9 @@
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"],
|
"Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
|
||||||
"Coefficient":[0.15, 1.05, -0.65, 1, -0.55],
|
"Coefficient":[0.429, 0.314, 0.205],
|
||||||
"Offset":3540,
|
"Offset":2600,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -210,9 +210,9 @@
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"],
|
"Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
|
||||||
"Coefficient":[0.15, 1.05, -0.65, 1, -0.55],
|
"Coefficient":[0.429, 0.314, 0.205],
|
||||||
"Offset":3540,
|
"Offset":2600,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -238,7 +238,7 @@
|
||||||
{
|
{
|
||||||
"Name":"VIRTUAL-SKIN",
|
"Name":"VIRTUAL-SKIN",
|
||||||
"Type":"SKIN",
|
"Type":"SKIN",
|
||||||
"Version":"0.5",
|
"Version":"6.2",
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"TriggerSensor":"skin_therm",
|
"TriggerSensor":"skin_therm",
|
||||||
"Formula":"MAXIMUM",
|
"Formula":"MAXIMUM",
|
||||||
|
|
|
@ -210,9 +210,9 @@
|
||||||
"Hidden":true,
|
"Hidden":true,
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula":"WEIGHTED_AVG",
|
||||||
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"],
|
"Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
|
||||||
"Coefficient":[0.15, 1.05, -0.65, 1, -0.55],
|
"Coefficient":[0.429, 0.314, 0.205],
|
||||||
"Offset":3540,
|
"Offset":2600,
|
||||||
"Multiplier":0.001
|
"Multiplier":0.001
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -238,7 +238,7 @@
|
||||||
{
|
{
|
||||||
"Name":"VIRTUAL-SKIN",
|
"Name":"VIRTUAL-SKIN",
|
||||||
"Type":"SKIN",
|
"Type":"SKIN",
|
||||||
"Version":"0.5",
|
"Version":"6.2",
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"TriggerSensor":"skin_therm",
|
"TriggerSensor":"skin_therm",
|
||||||
"Formula":"MAXIMUM",
|
"Formula":"MAXIMUM",
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue