Evolution-X-Tensor/device_google_felix
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "thermal: update VIRTUAL-SKIN equation v1.1" into tm-qpr-dev

Browse source
This commit is contained in:
Kame(TeYuan) Wang 2022-09-26 15:54:16 +00:00 • committed by Android (Google) Code Review
commit 8e9d2775bf
2 changed files with 31 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

31
thermal_info_config_charge_felix.json
View file

@ -83,7 +83,7 @@
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"VIRTUAL-SKIN-UNFOLD-SUB1-0", "Name":"UNFOLD-NEUTRAL-SKIN-USB",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
@ -94,12 +94,12 @@
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN-UNFOLD-SUB1", "Name":"VIRTUAL-SKIN-UNFOLD-SUB",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-UNFOLD-SUB1-0", "neutral_therm", "skin_therm"], "Combination":["UNFOLD-NEUTRAL-SKIN-USB", "neutral_therm", "skin_therm"],
"Coefficient":[1.0, 0.84, 0.955], "Coefficient":[1.0, 0.84, 0.955],
"Multiplier":0.001 "Multiplier":0.001
}, },
@ -109,40 +109,39 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-UNFOLD-SUB1", "IS_FOLD"], "Combination":["VIRTUAL-SKIN-UNFOLD-SUB", "IS_FOLD"],
"Coefficient":[1.0, -1000000], "Coefficient":[1.0, -1000000],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN-FOLD-SUB1-0", "Name":"FOLD-SKIN-QUIET-NEUTRAL",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "quiet_therm", "skin_therm"], "Combination":["skin_therm", "quiet_therm", "neutral_therm"],
"Coefficient":[0.3, 0.05, 0.6], "Coefficient":[0.6, 0.1, 0.3],
"Offset":2500,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN-FOLD-SUB1-1", "Name":"FOLD-SKIN-MINUS-2.2",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["skin_therm", "usb_pwr_therm"], "Combination":["skin_therm"],
"Coefficient":[0.55, 0.45], "Coefficient":[1],
"Offset":-2300, "Offset":-2200,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN-FOLD-SUB1", "Name":"VIRTUAL-SKIN-FOLD-SUB",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-FOLD-SUB1-0", "VIRTUAL-SKIN-FOLD-SUB1-1", "neutral_therm"], "Combination":["FOLD-SKIN-QUIET-NEUTRAL", "neutral_therm", "FOLD-SKIN-MINUS-2.2"],
"Coefficient":[1.0, 1.0, 0.83], "Coefficient":[1.0, 1.0, 1.0],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -151,7 +150,7 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-FOLD-SUB1", "IS_UNFOLD"], "Combination":["VIRTUAL-SKIN-FOLD-SUB", "IS_UNFOLD"],
"Coefficient":[1.0, -1000000], "Coefficient":[1.0, -1000000],
"Multiplier":0.001 "Multiplier":0.001
}, },

32
thermal_info_config_felix.json
View file

@ -89,7 +89,7 @@
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"VIRTUAL-SKIN-UNFOLD-SUB1-0", "Name":"UNFOLD-NEUTRAL-SKIN-USB",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
@ -100,12 +100,12 @@
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN-UNFOLD-SUB1", "Name":"VIRTUAL-SKIN-UNFOLD-SUB",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-UNFOLD-SUB1-0", "neutral_therm", "skin_therm"], "Combination":["UNFOLD-NEUTRAL-SKIN-USB", "neutral_therm", "skin_therm"],
"Coefficient":[1.0, 0.84, 0.955], "Coefficient":[1.0, 0.84, 0.955],
"Multiplier":0.001 "Multiplier":0.001
}, },
@ -115,40 +115,39 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-UNFOLD-SUB1", "IS_FOLD"], "Combination":["VIRTUAL-SKIN-UNFOLD-SUB", "IS_FOLD"],
"Coefficient":[1.0, -1000000], "Coefficient":[1.0, -1000000],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN-FOLD-SUB1-0", "Name":"FOLD-SKIN-QUIET-NEUTRAL",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "quiet_therm", "skin_therm"], "Combination":["skin_therm", "quiet_therm", "neutral_therm"],
"Coefficient":[0.3, 0.05, 0.6], "Coefficient":[0.6, 0.1, 0.3],
"Offset":2500,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN-FOLD-SUB1-1", "Name":"FOLD-SKIN-MINUS-2.2",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["skin_therm", "usb_pwr_therm"], "Combination":["skin_therm"],
"Coefficient":[0.55, 0.45], "Coefficient":[1],
"Offset":-2300, "Offset":-2200,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN-FOLD-SUB1", "Name":"VIRTUAL-SKIN-FOLD-SUB",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-FOLD-SUB1-0", "VIRTUAL-SKIN-FOLD-SUB1-1", "neutral_therm"], "Combination":["FOLD-SKIN-QUIET-NEUTRAL", "neutral_therm", "FOLD-SKIN-MINUS-2.2"],
"Coefficient":[1.0, 1.0, 0.83], "Coefficient":[1.0, 1.0, 1.0],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -157,13 +156,14 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-FOLD-SUB1", "IS_UNFOLD"], "Combination":["VIRTUAL-SKIN-FOLD-SUB", "IS_UNFOLD"],
"Coefficient":[1.0, -1000000], "Coefficient":[1.0, -1000000],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN", "Name":"VIRTUAL-SKIN",
"Type":"SKIN", "Type":"SKIN",
"Version":"1.1",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm", "TriggerSensor":"skin_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",