Merge "thermal: enable quiet_therm mointor for backup shutdown" into main

This commit is contained in:
Treehugger Robot 2024-06-13 08:53:23 +00:00 committed by Android (Google) Code Review
commit bd74564d02

View file

@ -218,7 +218,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-LEGACY"], "Combination":["VIRTUAL-SKIN-LEGACY"],
"Coefficient":[1.0], "Coefficient":[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, 60.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,
"SendCallback":true, "SendCallback":true,
@ -240,7 +240,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "Coefficient":[1.0],
"HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 60.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,
"SendPowerHint":true, "SendPowerHint":true,
@ -866,6 +866,27 @@
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000 "PassiveDelay":7000
}, },
{
"Name":"VSKIN-SKIN-OVER-52",
"Type":"UNKNOWN",
"VirtualSensor":true,
"TriggerSensor": ["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
"Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN"],
"Coefficient":[-52000],
"Multiplier":1
},
{
"Name":"QUIET_THERM-MODEL-DIFF-DURING-MODEL-OVER-52",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "VIRTUAL-SKIN", -1000000],
"CombinationType":["SENSOR", "SENSOR", "CONSTANT"],
"Coefficient":[1, -1, "VSKIN-SKIN-OVER-52"],
"CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"],
"Multiplier":0.001
},
{ {
"Name":"LITTLE", "Name":"LITTLE",
"Type":"CPU", "Type":"CPU",
@ -1012,6 +1033,10 @@
"Name": "VIRTUAL-SKIN-SUB-4", "Name": "VIRTUAL-SKIN-SUB-4",
"Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75] "Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
}, },
{
"Name": "QUIET_THERM-MODEL-DIFF-DURING-MODEL-OVER-52",
"Thresholds": [-200, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20, 25, 30, 35, 40]
},
{ {
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
"LoggingName": "MODEL-LEGACY-1", "LoggingName": "MODEL-LEGACY-1",
@ -1027,6 +1052,10 @@
{ {
"Monitor": ["VIRTUAL-SKIN-MODEL"], "Monitor": ["VIRTUAL-SKIN-MODEL"],
"TempRange": [-20.0, 55.0] "TempRange": [-20.0, 55.0]
},
{
"Monitor": ["quiet_therm"],
"TempRange": [-20.0, 55.0]
} }
] ]
} }
@ -1038,4 +1067,4 @@
} }
} }
} }
} }