Merge "thermal: monitor more sensor for backup shutdown" into main

This commit is contained in:
Peter (YM) 2024-07-12 02:30:56 +00:00 committed by Android (Google) Code Review
commit baa8d765a3

View file

@ -824,6 +824,7 @@
{ {
"Name":"VSKIN-SKIN-UNDER-52", "Name":"VSKIN-SKIN-UNDER-52",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
@ -831,8 +832,9 @@
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"QUIET_THERM-MODEL-DIFF-DURING-MODEL-OVER-52", "Name":"QUIET_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "VIRTUAL-SKIN", -1000000], "Combination":["quiet_therm", "VIRTUAL-SKIN", -1000000],
@ -841,6 +843,131 @@
"CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"], "CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"],
"Multiplier":0.001 "Multiplier":0.001
}, },
{
"Name":"SOC_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["soc_therm", "VIRTUAL-SKIN", -1000000],
"CombinationType":["SENSOR", "SENSOR", "CONSTANT"],
"Coefficient":[1, -1, "VSKIN-SKIN-UNDER-52"],
"CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"],
"Multiplier":0.001
},
{
"Name":"NORTH_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["north_therm", "VIRTUAL-SKIN", -1000000],
"CombinationType":["SENSOR", "SENSOR", "CONSTANT"],
"Coefficient":[1, -1, "VSKIN-SKIN-UNDER-52"],
"CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"],
"Multiplier":0.001
},
{
"Name":"RFPA_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["rfpa_therm", "VIRTUAL-SKIN", -1000000],
"CombinationType":["SENSOR", "SENSOR", "CONSTANT"],
"Coefficient":[1, -1, "VSKIN-SKIN-UNDER-52"],
"CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"],
"Multiplier":0.001
},
{
"Name":"QUIET_THERM-UNDER-THRESHOLD",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["quiet_therm"],
"Coefficient":[-59000],
"Multiplier":1
},
{
"Name":"SOC_THERM-UNDER-THRESHOLD",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["soc_therm"],
"Coefficient":[-64000],
"Multiplier":1
},
{
"Name":"NORTH_THERM-UNDER-THRESHOLD",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["north_therm"],
"Coefficient":[-60000],
"Multiplier":1
},
{
"Name":"RFPA_THERM-UNDER-THRESHOLD",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["rfpa_therm"],
"Coefficient":[-55000],
"Multiplier":1
},
{
"Name":"QUIET_THERM-VSKIN-DIFF-DURING-QUIET_THERM-OVER-THRESHOLD",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "VIRTUAL-SKIN", -1000000],
"CombinationType":["SENSOR", "SENSOR", "CONSTANT"],
"Coefficient":[1, -1, "QUIET_THERM-UNDER-THRESHOLD"],
"CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"],
"Multiplier":0.001
},
{
"Name":"SOC_THERM-VSKIN-DIFF-DURING-SOC_THERM-OVER-THRESHOLD",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["soc_therm", "VIRTUAL-SKIN", -1000000],
"CombinationType":["SENSOR", "SENSOR", "CONSTANT"],
"Coefficient":[1, -1, "SOC_THERM-UNDER-THRESHOLD"],
"CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"],
"Multiplier":0.001
},
{
"Name":"NORTH_THERM-VSKIN-DIFF-DURING-NORTH_THERM-OVER-THRESHOLD",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["north_therm", "VIRTUAL-SKIN", -1000000],
"CombinationType":["SENSOR", "SENSOR", "CONSTANT"],
"Coefficient":[1, -1, "NORTH_THERM-UNDER-THRESHOLD"],
"CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"],
"Multiplier":0.001
},
{
"Name":"RFPA_THERM-VSKIN-DIFF-DURING-RFPA_THERM-OVER-THRESHOLD",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["rfpa_therm", "VIRTUAL-SKIN", -1000000],
"CombinationType":["SENSOR", "SENSOR", "CONSTANT"],
"Coefficient":[1, -1, "RFPA_THERM-UNDER-THRESHOLD"],
"CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"],
"Multiplier":0.001
},
{ {
"Name": "STATS-UPDATOR", "Name": "STATS-UPDATOR",
"Type": "UNKNOWN", "Type": "UNKNOWN",
@ -848,8 +975,12 @@
"Hidden": true, "Hidden": true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], "TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula": "WEIGHTED_AVG", "Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "QUIET_THERM-MODEL-DIFF-DURING-MODEL-OVER-52", "VSKIN-SKIN-UNDER-52"], "Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
"Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0], "QUIET_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52", "QUIET_THERM-VSKIN-DIFF-DURING-QUIET_THERM-OVER-THRESHOLD",
"SOC_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52", "SOC_THERM-VSKIN-DIFF-DURING-SOC_THERM-OVER-THRESHOLD",
"NORTH_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52", "NORTH_THERM-VSKIN-DIFF-DURING-NORTH_THERM-OVER-THRESHOLD",
"RFPA_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52", "RFPA_THERM-VSKIN-DIFF-DURING-RFPA_THERM-OVER-THRESHOLD"],
"Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
"Multiplier": 1, "Multiplier": 1,
"SendPowerHint": true, "SendPowerHint": true,
"PollingDelay": 300000, "PollingDelay": 300000,
@ -1002,8 +1133,36 @@
"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", "Name": "QUIET_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52",
"Thresholds": [-200, -30, -25, -20, -15, -10, -5, 0, 5, 10, 15, 20, 25, 30, 35, 40] "Thresholds": [-18, -16, -14, -12, -10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18]
},
{
"Name": "QUIET_THERM-VSKIN-DIFF-DURING-QUIET_THERM-OVER-THRESHOLD",
"Thresholds": [-18, -16, -14, -12, -10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18]
},
{
"Name": "SOC_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52",
"Thresholds": [-18, -16, -14, -12, -10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18]
},
{
"Name": "SOC_THERM-VSKIN-DIFF-DURING-SOC_THERM-OVER-THRESHOLD",
"Thresholds": [-18, -16, -14, -12, -10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18]
},
{
"Name": "RFPA_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52",
"Thresholds": [-18, -16, -14, -12, -10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18]
},
{
"Name": "RFPA_THERM-VSKIN-DIFF-DURING-RFPA_THERM-OVER-THRESHOLD",
"Thresholds": [-18, -16, -14, -12, -10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18]
},
{
"Name": "NORTH_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52",
"Thresholds": [-18, -16, -14, -12, -10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18]
},
{
"Name": "NORTH_THERM-VSKIN-DIFF-DURING-NORTH_THERM-OVER-THRESHOLD",
"Thresholds": [-18, -16, -14, -12, -10, -8, -6, -4, -2, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18]
}, },
{ {
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -1023,7 +1182,19 @@
}, },
{ {
"Monitor": ["quiet_therm"], "Monitor": ["quiet_therm"],
"TempRange": [-20.0, 59.0]
},
{
"Monitor": ["soc_therm"],
"TempRange": [-20.0, 64.0]
},
{
"Monitor": ["north_therm"],
"TempRange": [-20.0, 55.0] "TempRange": [-20.0, 55.0]
},
{
"Monitor": ["rfpa_therm"],
"TempRange": [-20.0, 60.0]
} }
] ]
} }