Merge "thermal: refer inner display brightness for VSKIN equation" into tm-qpr-dev

This commit is contained in:
TreeHugger Robot 2022-12-30 08:07:29 +00:00 committed by Android (Google) Code Review
commit 28ba1240c5
3 changed files with 18 additions and 33 deletions

View file

@ -55,14 +55,9 @@
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN-OUTER-INNER",
"Name":"inner-disp",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["outer_disp_therm", "inner_disp_therm"],
"Coefficient":[2.5, -1.0],
"Multiplier":0.001
"Multiplier":1
},
{
"Name":"IS_OPEN",
@ -70,8 +65,8 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN-OUTER-INNER"],
"Coefficient":[-40000.0],
"Combination":["inner-disp"],
"Coefficient":[1.0],
"Multiplier":1
},
{
@ -80,8 +75,8 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN-OUTER-INNER"],
"Coefficient":[40000.0],
"Combination":["inner-disp"],
"Coefficient":[-1.0],
"Multiplier":1
},
{

View file

@ -61,14 +61,9 @@
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN-OUTER-INNER",
"Name":"inner-disp",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["outer_disp_therm", "inner_disp_therm"],
"Coefficient":[2.5, -1.0],
"Multiplier":0.001
"Multiplier":1
},
{
"Name":"IS_OPEN",
@ -76,8 +71,8 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN-OUTER-INNER"],
"Coefficient":[-40000.0],
"Combination":["inner-disp"],
"Coefficient":[1.0],
"Multiplier":1
},
{
@ -86,8 +81,8 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN-OUTER-INNER"],
"Coefficient":[40000.0],
"Combination":["inner-disp"],
"Coefficient":[-1.0],
"Multiplier":1
},
{

View file

@ -61,14 +61,9 @@
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN-OUTER-INNER",
"Name":"inner-disp",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["outer_disp_therm", "inner_disp_therm"],
"Coefficient":[2.5, -1.0],
"Multiplier":0.001
"Multiplier":1
},
{
"Name":"IS_OPEN",
@ -76,8 +71,8 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN-OUTER-INNER"],
"Coefficient":[-40000.0],
"Combination":["inner-disp"],
"Coefficient":[1.0],
"Multiplier":1
},
{
@ -86,8 +81,8 @@
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN-OUTER-INNER"],
"Coefficient":[40000.0],
"Combination":["inner-disp"],
"Coefficient":[-1.0],
"Multiplier":1
},
{