thermal: update vskin formula v0.2

based on EE side test result, update the skin formula to v0.2

Bug: 280552152
Test: run nurn8 to verify behavior
Change-Id: I31b6ffd4c62e0f4eaef0cb37b2c4703117c49626
Signed-off-by: Peter (YM) <peterym@google.com>
This commit is contained in:
Peter (YM) 2023-07-17 07:41:46 +00:00
parent 3e907681dc
commit 53a79734c9
2 changed files with 75 additions and 75 deletions

View file

@ -8,8 +8,11 @@
{ {
"Name":"modem_therm", "Name":"modem_therm",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"HotThreshold":["NAN", 35.5, "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp", "TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp",
"Multiplier":0.001 "Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
}, },
{ {
"Name":"gnss_tcxo_therm", "Name":"gnss_tcxo_therm",
@ -35,7 +38,7 @@
{ {
"Name":"soc_therm", "Name":"soc_therm",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"HotThreshold":["NAN", 27.9, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NAN", 36.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -45,8 +48,12 @@
{ {
"Name":"charger_therm", "Name":"charger_therm",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"HotThreshold":["NAN", 39.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp", "TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp",
"Multiplier":0.001 "Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
}, },
{ {
"Name":"display_therm", "Name":"display_therm",
@ -61,58 +68,69 @@
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-1", "Name":"VIRTUAL-SKIN-SUB-1",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["modem_therm", "quiet_therm", "soc_therm", "charger_therm", "usb_conn_therm", "rffe_therm", "gnss_tcxo_therm"], "Combination":["quiet_therm", "soc_therm", "gnss_tcxo_therm"],
"Coefficient":[0.05, 0.05, 0.7, 0.05, 0.05, 0.05, 0.05], "Coefficient":[0.05, 0.7, 0.25],
"Offset":-1500, "Offset":-220,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-QUT-CHARGER-USB-RFFE-2", "Name":"VIRTUAL-SKIN-SUB-2",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "charger_therm", "usb_conn_therm", "rffe_therm"], "Combination":["modem_therm", "rffe_therm", "soc_therm"],
"Coefficient":[0.15, 0.15, 0.15, 0.55], "Coefficient":[0.626, 0.203, 0.052],
"Offset": 0,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN-SUB-3",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "rffe_therm", "usb_conn_therm", "charger_therm"],
"Coefficient":[0.15, 0.55, 0.15, 0.15],
"Offset":-1000, "Offset":-1000,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-QUT-CHARGER-USB-GNSS-3", "Name":"VIRTUAL-SKIN-CHARGE-SUB-1",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "charger_therm", "usb_conn_therm", "gnss_tcxo_therm"], "Combination":["modem_therm", "rffe_therm", "charger_therm"],
"Coefficient":[0.166, 0.45, 0.217, 0.167], "Coefficient":[0.482, 0.206, 0.208],
"Offset":-1950, "Offset":-120,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-4", "Name":"VIRTUAL-SKIN-CHARGE-WLC-SUB-1",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["modem_therm", "quiet_therm", "soc_therm", "charger_therm", "usb_conn_therm", "rffe_therm", "gnss_tcxo_therm"], "Combination":["modem_therm", "rffe_therm", "charger_therm"],
"Coefficient":[-0.05, -0.05, 1.3, -0.05, -0.05, -0.05, -0.05], "Coefficient":[0.362, 0.244, 0.317],
"Offset":-1950, "Offset":125,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN", "Name":"VIRTUAL-SKIN",
"Type":"SKIN", "Type":"SKIN",
"Version":"0.7", "Version":"0.2",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"soc_therm", "TriggerSensor":"soc_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-1", "VIRTUAL-QUT-CHARGER-USB-RFFE-2", "VIRTUAL-QUT-CHARGER-USB-GNSS-3", "VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-4"], "Combination":["VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3"],
"Coefficient":[1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 125.0], "HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.0, 125.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,
@ -307,9 +325,9 @@
"Name":"VIRTUAL-SKIN-CHARGE", "Name":"VIRTUAL-SKIN-CHARGE",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"soc_therm", "TriggerSensor":"charger_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN-CHARGE-SUB-1"],
"Coefficient":[1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0], "HotThreshold":["NAN", 35.0, 39.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],
@ -348,10 +366,10 @@
"Name":"VIRTUAL-SKIN-CHARGE-WLC", "Name":"VIRTUAL-SKIN-CHARGE-WLC",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"soc_therm", "TriggerSensor":"modem_therm",
"Formula":"WEIGHTED_AVG", "Formula":"MAXIMUM",
"Combination":["charger_therm", "rffe_therm", "display_therm"], "Combination":["VIRTUAL-SKIN-CHARGE-WLC-SUB-1"],
"Coefficient":[0.51, 0.25, 0.24], "Coefficient":[1.0],
"HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0], "HotThreshold":["NAN", 35.0, 39.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],
"Multiplier":0.001, "Multiplier":0.001,

View file

@ -8,8 +8,12 @@
{ {
"Name":"modem_therm", "Name":"modem_therm",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"HotThreshold":["NAN", 35.5, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp", "TempPath":"/dev/thermal/tz-by-name/modem_therm/tz_temp",
"Multiplier":0.001 "Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
}, },
{ {
"Name":"gnss_tcxo_therm", "Name":"gnss_tcxo_therm",
@ -20,11 +24,7 @@
{ {
"Name":"usb_conn_therm", "Name":"usb_conn_therm",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"HotThreshold":["NAN", 46.0, "NAN", "NAN", "NAN", "NAN", "NAN"], "Multiplier":0.001
"TempPath":"/dev/thermal/tz-by-name/usb_conn_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
}, },
{ {
"Name":"rffe_therm", "Name":"rffe_therm",
@ -35,7 +35,7 @@
{ {
"Name":"soc_therm", "Name":"soc_therm",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"HotThreshold":["NAN", 29.9, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NAN", 36.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -45,8 +45,12 @@
{ {
"Name":"charger_therm", "Name":"charger_therm",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"HotThreshold":["NAN", 35.5, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp", "TempPath":"/dev/thermal/tz-by-name/charger_therm/tz_temp",
"Multiplier":0.001 "Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
}, },
{ {
"Name":"display_therm", "Name":"display_therm",
@ -61,47 +65,25 @@
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-1", "Name":"VIRTUAL-SKIN-CHARGE-SUB-1",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["modem_therm", "quiet_therm", "soc_therm", "charger_therm", "usb_conn_therm", "rffe_therm", "gnss_tcxo_therm"], "Combination":["modem_therm", "rffe_therm", "charger_therm"],
"Coefficient":[0.05, 0.05, 0.7, 0.05, 0.05, 0.05, 0.05], "Coefficient":[0.482, 0.206, 0.208],
"Offset":-1500, "Offset":-120,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-QUT-CHARGER-USB-RFFE-2", "Name":"VIRTUAL-SKIN-CHARGE-WLC-SUB-1",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "charger_therm", "usb_conn_therm", "rffe_therm"], "Combination":["modem_therm", "rffe_therm", "charger_therm"],
"Coefficient":[0.15, 0.15, 0.15, 0.55], "Coefficient":[0.362, 0.244, 0.317],
"Offset":-1000, "Offset":125,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-QUT-CHARGER-USB-GNSS-3",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "charger_therm", "usb_conn_therm", "gnss_tcxo_therm"],
"Coefficient":[0.166, 0.45, 0.217, 0.167],
"Offset":-1950,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-4",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["modem_therm", "quiet_therm", "soc_therm", "charger_therm", "usb_conn_therm", "rffe_therm", "gnss_tcxo_therm"],
"Coefficient":[-0.05, -0.05, 1.3, -0.05, -0.05, -0.05, -0.05],
"Offset":-1950,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -109,10 +91,10 @@
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"soc_therm", "TriggerSensor":"charger_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-1", "VIRTUAL-QUT-CHARGER-USB-RFFE-2", "VIRTUAL-QUT-CHARGER-USB-GNSS-3", "VIRTUAL-MODEM-QUT-SOC-CHARGER-USB-RFFE-GNSS-4"], "Combination":["VIRTUAL-SKIN-CHARGE-SUB-1"],
"Coefficient":[1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0], "HotThreshold":["NAN", 35.0, 39.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],
"Multiplier":0.001, "Multiplier":0.001,
@ -151,10 +133,10 @@
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"soc_therm", "TriggerSensor":"modem_therm",
"Formula":"WEIGHTED_AVG", "Formula":"MAXIMUM",
"Combination":["charger_therm", "rffe_therm", "display_therm"], "Combination":["VIRTUAL-SKIN-CHARGE-WLC-SUB-1"],
"Coefficient":[0.51, 0.25, 0.24], "Coefficient":[1.0],
"HotThreshold":["NAN", 35.0, 39.0, 43.0, 45.0, 47.0, 55.0], "HotThreshold":["NAN", 35.0, 39.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],
"Multiplier":0.001, "Multiplier":0.001,