thermal: update vskin correlation to v2

- Model: based on evt 1.0 50 case and Proto 1.1 150 case
- Legacy: based on evt 1.0 50 case, also update the trigger temp based on legacy report (b/333834000#6)

Bug: 333834000
Test: Build and boot to home
Change-Id: Ibe4988ec2e9944a81c7a64a0315727a6c942e2e0
Signed-off-by: Peter (YM) <peterym@google.com>
This commit is contained in:
Peter (YM) 2024-06-07 04:48:47 +00:00
parent b1cec3fd6d
commit 61a7a29145
2 changed files with 26 additions and 23 deletions

View file

@ -3,7 +3,7 @@
{
"Name":"north_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 42.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotThreshold":["NAN", 36.4, "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/north_therm/tz_temp",
"Multiplier":0.001,
@ -13,7 +13,7 @@
{
"Name":"rfpa_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 43.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotThreshold":["NAN", 37.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/rfpa_therm/tz_temp",
"Multiplier":0.001,
@ -23,7 +23,7 @@
{
"Name":"soc_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 57.2, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotThreshold":["NAN", 36.2, "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/soc_therm/tz_temp",
"Multiplier":0.001,
@ -33,7 +33,7 @@
{
"Name":"charging_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 58.4, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotThreshold":["NAN", 37.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/charging_therm/tz_temp",
"Multiplier":0.001,
@ -43,7 +43,7 @@
{
"Name":"disp_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 41.7, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotThreshold":["NAN", 27.7, "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/disp_therm/tz_temp",
"Multiplier":0.001,
@ -59,7 +59,7 @@
{
"Name":"btmspkr_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 54.1, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotThreshold":["NAN", 27.8, "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/btmspkr_therm/tz_temp",
"Multiplier":0.001,
@ -69,7 +69,7 @@
{
"Name":"quiet_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 44.6, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotThreshold":["NAN", 36.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/quiet_therm/tz_temp",
"Multiplier":0.001,
@ -79,7 +79,7 @@
{
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
"HotThreshold":["NAN", 45.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotThreshold":["NAN", 28.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
"TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001,
"PollingDelay":60000,
@ -126,8 +126,8 @@
"VirtualSensor": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"],
"Coefficient": [0.187, 0.091, 0.004, 0.062, 0.091, 0.215, 0.228, 0.114, 0.007],
"Offset": 59.0,
"Coefficient": [0.194, 0.185, 0.084, 0.004, 0.036, 0.202, 0.069, 0.208, 0.019],
"Offset": -1967.0,
"Multiplier": 0.001
},
{
@ -137,8 +137,8 @@
"VirtualSensor": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"],
"Coefficient": [0.032, 0.187, 0.216, 0.0, 0.036, 0.004, 0.194, 0.046, 0.286],
"Offset": -71.0,
"Coefficient": [0.117, 0.015, 0.013, 0.112, 0.185, 0.279, 0.157, 0.013, 0.136],
"Offset": -686.0,
"Multiplier": 0.001
},
{
@ -148,8 +148,8 @@
"VirtualSensor": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"],
"Coefficient": [0.213, 0.122, 0.014, 0.01, 0.117, 0.019, 0.208, 0.187, 0.11],
"Offset": -241.0,
"Coefficient": [0.17, 0.029, 0.01, 0.004, 0.008, 0.252, 0.37, 0.129, 0.027],
"Offset": -913.0,
"Multiplier": 0.001
},
{
@ -159,8 +159,8 @@
"VirtualSensor": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"],
"Coefficient": [0.124, 0.168, 0.153, 0.017, 0.064, 0.006, 0.248, 0.051, 0.169],
"Offset": 63.0,
"Coefficient": [0.138, 0.071, 0.035, 0.107, 0.009, 0.204, 0.338, 0.049, 0.048],
"Offset": -358.0,
"Multiplier": 0.001
},
{
@ -170,8 +170,8 @@
"VirtualSensor": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"],
"Coefficient": [0.017, 0.098, 0.062, 0.222, 0.157, 0.0, 0.215, 0.013, 0.217],
"Offset": 595.0,
"Coefficient": [0.009, 0.084, 0.0, 0.261, 0.247, 0.008, 0.007, 0.051, 0.332],
"Offset": 365.0,
"Multiplier": 0.001
},
{
@ -188,12 +188,15 @@
{
"Name": "VIRTUAL-SKIN-MODEL",
"Type": "UNKNOWN",
"VirtualSensor":true,
"Version": "2.0",
"VirtualSensor": true,
"ModelPath": "vt_estimation_model.tflite",
"Formula": "USE_ML_MODEL",
"Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
"Coefficient": [1.0],
"Multiplier": 0.001
"Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm"],
"Multiplier": 0.001,
"PreviousSampleCount": 3,
"BackupSensor" : "VIRTUAL-SKIN-LEGACY",
"TimeResolution": 7000
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -209,7 +212,7 @@
{
"Name":"VIRTUAL-SKIN",
"Type":"SKIN",
"Version":"1.0",
"Version": "2.0",
"VirtualSensor":true,
"TriggerSensor":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
"Formula":"MAXIMUM",