Merge "thermal: Update VSKIN equation V06.2" into udc-dev

This commit is contained in:
Nick Lee 2023-07-19 04:00:06 +00:00 committed by Android (Google) Code Review
commit 5d53d59375
3 changed files with 11 additions and 11 deletions

View file

@ -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
}, },
{ {

View file

@ -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",

View file

@ -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",