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

thermal: update thermal config with v2 coefficients

Browse source 
Update with v2 virtual coefficients
Update trigger sensors
Align hot thresholds with P22
Use VIRTUAL-SKIN as combination where applicable

Bug: 259450323
Test: Build and boot on device. Check thermal service
adb shell dumpsys thermalservice

Change-Id: I5f738a1cc1fe3735f5fae41dd42d27e6bd305e05
Signed-off-by: Sayanna Chandula <sayanna@google.com>
This commit is contained in:
Sayanna Chandula 2022-12-19 12:40:03 -08:00
parent d37ec46ab6
commit b92b81e178
2 changed files with 67 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

98
thermal_info_config_husky.json
View file

@ -54,7 +54,7 @@
{ {
"Name":"quiet_therm", "Name":"quiet_therm",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"HotThreshold":["NAN", 32.9, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NAN", 31.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/quiet_therm/tz_temp", "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -62,14 +62,25 @@
"PassiveDelay":7000 "PassiveDelay":7000
}, },
{ {
"Name":"VIRTUAL-CHARGE-CAM", "Name":"VIRTUAL-CAM-QUIET",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["charge_therm", "cam_therm"], "Combination":["cam_therm", "quiet_therm"],
"Coefficient":[0.540, 0.460], "Coefficient":[1.04, -0.04],
"Offset":-2000, "Offset":-770,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NORTH-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["north_therm", "soc_therm"],
"Coefficient":[0.850, 0.150],
"Offset":-1710,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -79,30 +90,8 @@
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["disp_therm", "usb_pwr_therm"], "Combination":["disp_therm", "usb_pwr_therm"],
"Coefficient":[0.710, 0.290], "Coefficient":[0.720, 0.280],
"Offset":-1580, "Offset":-1830,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-CAM-SOC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["cam_therm", "soc_therm"],
"Coefficient":[0.850, 0.150],
"Offset":-1640,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-NORTH-CHARGE",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["north_therm", "charge_therm"],
"Coefficient":[0.550, 0.450],
"Offset":-1970,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -112,21 +101,32 @@
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["disp_therm", "neutral_therm"], "Combination":["disp_therm", "neutral_therm"],
"Coefficient":[0.780, 0.220], "Coefficient":[0.680, 0.320],
"Offset":-1960, "Offset":-1900,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-CHARGE-DISP",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["charge_therm", "disp_therm"],
"Coefficient":[0.580, 0.420],
"Offset":-1390,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"VIRTUAL-SKIN", "Name":"VIRTUAL-SKIN",
"Type":"SKIN", "Type":"SKIN",
"Version":"1.1", "Version":"2.0",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"], "Combination":["VIRTUAL-CAM-QUIET", "VIRTUAL-NORTH-SOC", "VIRTUAL-DISP-USB", "VIRTUAL-DISP-NEUTRAL", "VIRTUAL-CHARGE-DISP"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 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.9, 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,
"SendCallback":true, "SendCallback":true,
"PollingDelay":300000, "PollingDelay":300000,
@ -141,10 +141,10 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 47.0, 52.0, 55.0], "HotThreshold":["NAN", 37.0, 43.0, 45.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.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"SendPowerHint":true, "SendPowerHint":true,
"PollingDelay":300000, "PollingDelay":300000,
@ -157,10 +157,10 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 39.0, 41.0, 47.0, 52.0, 55.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 0.9, 0.9, 0.9, 1.9, 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,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
@ -213,9 +213,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 47, 52.0, 55.0], "HotThreshold":["NAN", 37.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,
"PollingDelay":300000, "PollingDelay":300000,
@ -253,7 +253,7 @@
"Combination":["soc_therm", "disp_therm"], "Combination":["soc_therm", "disp_therm"],
"Coefficient":[0.520, 0.480], "Coefficient":[0.520, 0.480],
"Offset":-1990, "Offset":-1990,
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.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],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
@ -272,8 +272,8 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-CHARGE-CAM", "VIRTUAL-DISP-USB", "VIRTUAL-CAM-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-DISP-NEUTRAL"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[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,

36
thermal_info_config_shiba.json
View file

@ -54,7 +54,7 @@
{ {
"Name":"quiet_therm", "Name":"quiet_therm",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"HotThreshold":["NAN", 32.9, "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NAN", 31.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/quiet_therm/tz_temp", "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -119,14 +119,14 @@
{ {
"Name":"VIRTUAL-SKIN", "Name":"VIRTUAL-SKIN",
"Type":"SKIN", "Type":"SKIN",
"Version":"1.1", "Version":"1.0",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"], "Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 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.9, 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,
"SendCallback":true, "SendCallback":true,
"PollingDelay":300000, "PollingDelay":300000,
@ -141,10 +141,10 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 47.0, 52.0, 55.0], "HotThreshold":["NAN", 37.0, 43.0, 45.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.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"SendPowerHint":true, "SendPowerHint":true,
"PollingDelay":300000, "PollingDelay":300000,
@ -157,10 +157,10 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 39.0, 41.0, 47.0, 52.0, 55.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 0.9, 0.9, 0.9, 1.9, 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,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
@ -213,9 +213,9 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 47, 52.0, 55.0], "HotThreshold":["NAN", 37.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,
"PollingDelay":300000, "PollingDelay":300000,
@ -253,7 +253,7 @@
"Combination":["neutral_therm", "soc_therm"], "Combination":["neutral_therm", "soc_therm"],
"Coefficient":[0.680, 0.320], "Coefficient":[0.680, 0.320],
"Offset":-830, "Offset":-830,
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 47.0, 52.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],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
@ -272,8 +272,8 @@
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"quiet_therm", "TriggerSensor":"quiet_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-CHARGE-DISP", "VIRTUAL-NEUTRAL-NORTH", "VIRTUAL-NORTH-SOC", "VIRTUAL-NORTH-CHARGE", "VIRTUAL-QUIET-NEUTRAL"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[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,