thermal: update virtual coefficients to 0.5 version

Update virtual-skin, virtual-skin-charge and cellular-emergency
sensors to 0.5 version coefficients.
Added "Version" field for virtual-skin node for identifying the
version of coefficients.

Bug: 229418131, 227477863
Test: Build and boot on device. Check virtual-skin readings
Signed-off-by: Sayanna Chandula <sayanna@google.com>
Change-Id: I709fa1dfa5304416335bba1a7cb21a267e00c744
This commit is contained in:
Sayanna Chandula 2022-04-19 20:44:35 +00:00
parent 54f8cd48f0
commit 09b55b3d91
2 changed files with 78 additions and 183 deletions

View file

@ -83,9 +83,9 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "usb_pwr_therm2"], "Combination":["quiet_therm","usb_pwr_therm2"],
"Coefficient":[1.208, -0.208], "Coefficient":[1.1, -0.1],
"Offset":-874, "Offset":-900,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -95,29 +95,41 @@
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "quiet_therm"], "Combination":["neutral_therm", "quiet_therm"],
"Coefficient":[0.6, 0.4], "Coefficient":[0.378, 0.622],
"Offset":-500, "Offset":-453,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-NEUTRAL-USB", "Name":"VIRTUAL-QI-QUIET",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "usb_pwr_therm"], "Combination":["qi_therm","quiet_therm"],
"Coefficient":[0.460, 0.540], "Coefficient":[0.3, 0.7],
"Offset":-3200, "Offset":-500,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-QI-DISP",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["qi_therm", "disp_therm"],
"Coefficient":[0.257, 0.743],
"Offset":-268,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN", "Name":"VIRTUAL-SKIN",
"Type":"SKIN", "Type":"SKIN",
"Version":"0.5",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2"], "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":[1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
@ -142,8 +154,8 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2"], "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":[1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 42.0, 44.0, 46.5, 52.0, 55.0], "HotThreshold":["NAN", 39.0, 42.0, 44.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
@ -202,7 +214,7 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-NEUTRAL-QUIET", "VIRTUAL-NEUTRAL-USB"], "Combination":["VIRTUAL-QI-QUIET", "VIRTUAL-QI-DISP"],
"Coefficient":[1.0, 1.0], "Coefficient":[1.0, 1.0],
"HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
@ -246,8 +258,8 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2"], "Combination":["VIRTUAL-GNSS-DISP", "VIRTUAL-USB2-QUIET", "VIRTUAL-QUIET-USB2", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":["1.0", "1.0", "1.0"], "Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
@ -260,24 +272,8 @@
"Type":"UNKNOWN", "Type":"UNKNOWN",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":[ "Combination":["usb_pwr_therm", "usb_pwr_therm2"],
"usb_pwr_therm", "Coefficient":[1.0, -1.0],
"usb_pwr_therm2"
],
"Coefficient":[
"1.0",
"-1.0"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -285,24 +281,8 @@
"Type":"UNKNOWN", "Type":"UNKNOWN",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":[ "Combination":["usb_pwr_therm", "neutral_therm"],
"usb_pwr_therm", "Coefficient":[1.0, -1.0],
"neutral_therm"
],
"Coefficient":[
"1.0",
"-1.0"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -311,25 +291,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":[ "Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"],
"usb_pwr_therm", "Coefficient":[42000, 4000,7000],
"USB-MINUS-USB2", "HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"],
"USB-MINUS-NEUTRAL"
],
"Coefficient":[
"42000",
"4000",
"7000"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"3.0",
"NAN",
"NAN"
],
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "usbc-port", "CdevRequest": "usbc-port",
@ -347,25 +311,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":[ "Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"],
"usb_pwr_therm", "Coefficient":[47000, 4500, 8000],
"USB-MINUS-USB2", "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"],
"USB-MINUS-NEUTRAL"
],
"Coefficient":[
"47000",
"4500",
"8000"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"3.0",
"NAN"
],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true, "Monitor":true,

View file

@ -56,14 +56,14 @@
"PassiveDelay":7000 "PassiveDelay":7000
}, },
{ {
"Name":"VIRTUAL-QUIET-USB", "Name":"VIRTUAL-GNSS-QUIET",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "usb_pwr_therm"], "Combination":["gnss_tcxo_therm", "quiet_therm"],
"Coefficient":[0.973, 0.027], "Coefficient":[1.3, -0.3],
"Offset":-2200, "Offset":-1800,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -84,8 +84,8 @@
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["gnss_tcxo_therm", "disp_therm"], "Combination":["gnss_tcxo_therm", "disp_therm"],
"Coefficient":[0.550, 0.450], "Coefficient":[0.9, 0.1],
"Offset":3000, "Offset":-700,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -95,29 +95,40 @@
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "quiet_therm"], "Combination":["neutral_therm", "quiet_therm"],
"Coefficient":[0.6, 0.4], "Coefficient":[0.3, 0.7],
"Offset":-400, "Offset":-500,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-NEUTRAL-USB", "Name":"VIRTUAL-QI-QUIET",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "usb_pwr_therm"], "Combination":["qi_therm", "quiet_therm"],
"Coefficient":[0.6, 0.4], "Coefficient":[0.3, 0.7],
"Offset":-4000, "Offset":-1400,
},
{
"Name":"VIRTUAL-QI-DISP",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["qi_therm","disp_therm"],
"Coefficient":[0.2, 0.8],
"Offset":-900,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN", "Name":"VIRTUAL-SKIN",
"Type":"SKIN", "Type":"SKIN",
"Version":"0.5",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-QUIET-USB", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP"], "Combination":["VIRTUAL-GNSS-QUIET", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":[1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
@ -142,8 +153,8 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-QUIET-USB", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP"], "Combination":["VIRTUAL-GNSS-QUIET", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":[1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 42.0, 44.0, 46.5, 52.0, 55.0], "HotThreshold":["NAN", 39.0, 42.0, 44.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
@ -202,7 +213,7 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-NEUTRAL-QUIET", "VIRTUAL-NEUTRAL-USB"], "Combination":["VIRTUAL-QI-QUIET", "VIRTUAL-QI-DISP"],
"Coefficient":[1.0, 1.0], "Coefficient":[1.0, 1.0],
"HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0], "HotThreshold":["NAN", 39.0, 41.0, 43.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.9, 1.9],
@ -246,8 +257,8 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-QUIET-USB", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP"], "Combination":["VIRTUAL-GNSS-QUIET", "VIRTUAL-USB-QUIET", "VIRTUAL-GNSS-DISP", "VIRTUAL-NEUTRAL-QUIET"],
"Coefficient":[1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"], "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"],
"HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
@ -260,24 +271,8 @@
"Type":"UNKNOWN", "Type":"UNKNOWN",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":[ "Combination":["usb_pwr_therm", "usb_pwr_therm2"],
"usb_pwr_therm", "Coefficient":[1.0, -1.0],
"usb_pwr_therm2"
],
"Coefficient":[
"1.0",
"-1.0"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -285,24 +280,8 @@
"Type":"UNKNOWN", "Type":"UNKNOWN",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":[ "Combination":["usb_pwr_therm", "neutral_therm"],
"usb_pwr_therm", "Coefficient":[1.0, -1.0],
"neutral_therm"
],
"Coefficient":[
"1.0",
"-1.0"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"NAN"
],
"VrThreshold":"NAN",
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -311,25 +290,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":[ "Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"],
"usb_pwr_therm", "Coefficient":[40000, 1500, 3000],
"USB-MINUS-USB2", "HotThreshold":["NAN", "NAN", "NAN", "NAN", "3.0", "NAN", "NAN"],
"USB-MINUS-NEUTRAL"
],
"Coefficient":[
"40000",
"1500",
"3000"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"3.0",
"NAN",
"NAN"
],
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "usbc-port", "CdevRequest": "usbc-port",
@ -347,25 +310,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":[ "Combination":["usb_pwr_therm", "USB-MINUS-USB2", "USB-MINUS-NEUTRAL"],
"usb_pwr_therm", "Coefficient":[42000, 2000, 4000],
"USB-MINUS-USB2", "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "3.0", "NAN"],
"USB-MINUS-NEUTRAL"
],
"Coefficient":[
"42000",
"2000",
"4000"
],
"HotThreshold":[
"NAN",
"NAN",
"NAN",
"NAN",
"NAN",
"3.0",
"NAN"
],
"VrThreshold":"NAN", "VrThreshold":"NAN",
"Multiplier":1, "Multiplier":1,
"Monitor":true, "Monitor":true,