thermal: use stats-updator to trigger virtual sensor and remove unused virtual sensor

- Use stats-updator to ensure all the virutal sensor we want to monitor
can be trigger at the same time.

- Remove the un-used virtual sensor

- Update the name of VSKIN-SKIN-UNDER-52 to avoid confusion

Bug: 333834000
Test: Build on device and boot to home, b/333834000#comment8
Flag: EXEMPT (bug 337358613)
Change-Id: I9fc4df066b17417cee412d776a118ea1935fbc34
Signed-off-by: Peter (YM) <peterym@google.com>
This commit is contained in:
Peter (YM) 2024-06-19 09:03:08 +00:00
parent f00036a047
commit 1dd20df4df

View file

@ -180,7 +180,6 @@
"Version":"2.0", "Version":"2.0",
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"TriggerSensor": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm", "battery"],
"Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4"], "Combination": ["VIRTUAL-SKIN-SUB-0", "VIRTUAL-SKIN-SUB-1", "VIRTUAL-SKIN-SUB-2", "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4"],
"Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient": [1.0, 1.0, 1.0, 1.0, 1.0],
"Multiplier": 0.001 "Multiplier": 0.001
@ -680,50 +679,6 @@
"Multiplier":0.001, "Multiplier":0.001,
"SendCallback":true "SendCallback":true
}, },
{
"Name":"VIRTUAL-SKIN-FRONT-SUB-0",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"],
"Coefficient":[0.04, 0.03, 0.1, 0.05, 0.35, 0.3, 0, 0, 0.04],
"Offset":1850,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN-FRONT-SUB-1",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"],
"Coefficient":[0, 0, 0.35, 0.22, 0.22, 0.07, 0.03, 0, 0],
"Offset":-560,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN-FRONT-SUB-2",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"],
"Coefficient":[0.05, 0.13, 0.12, 0.07, 0.37, 0.06, 0.01, 0.01, 0],
"Offset":5070,
"Multiplier":0.001
},
{
"Name":"VIRTUAL-SKIN-FRONT",
"Type":"UNKNOWN",
"Version":"1.0",
"VirtualSensor":true,
"TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-FRONT-SUB-0", "VIRTUAL-SKIN-FRONT-SUB-1", "VIRTUAL-SKIN-FRONT-SUB-2"],
"Coefficient":[1, 1, 1],
"Multiplier":0.001
},
{ {
"Name": "VIRTUAL-SKIN-CHARGE-SUB-0", "Name": "VIRTUAL-SKIN-CHARGE-SUB-0",
"Type": "UNKNOWN", "Type": "UNKNOWN",
@ -867,10 +822,9 @@
"PassiveDelay":7000 "PassiveDelay":7000
}, },
{ {
"Name":"VSKIN-SKIN-OVER-52", "Name":"VSKIN-SKIN-UNDER-52",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor": ["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm"],
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[-52000], "Coefficient":[-52000],
@ -883,10 +837,24 @@
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["quiet_therm", "VIRTUAL-SKIN", -1000000], "Combination":["quiet_therm", "VIRTUAL-SKIN", -1000000],
"CombinationType":["SENSOR", "SENSOR", "CONSTANT"], "CombinationType":["SENSOR", "SENSOR", "CONSTANT"],
"Coefficient":[1, -1, "VSKIN-SKIN-OVER-52"], "Coefficient":[1, -1, "VSKIN-SKIN-UNDER-52"],
"CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"], "CoefficientType":["CONSTANT", "CONSTANT", "SENSOR"],
"Multiplier":0.001 "Multiplier":0.001
}, },
{
"Name": "STATS-UPDATOR",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"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"],
"Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0],
"Multiplier": 1,
"SendPowerHint": true,
"PollingDelay": 300000,
"PassiveDelay": 7000
},
{ {
"Name":"LITTLE", "Name":"LITTLE",
"Type":"CPU", "Type":"CPU",