Merge "thermal: Add step ratio for IS_WLC" into 24D1-dev am: 2d73f97fb4

Original change: https://googleplex-android-review.googlesource.com/c/device/google/comet/+/27018000

Change-Id: I9a6624d1a5ddf8fdbfd4c51de7eb1ffa2c75abb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-05-17 06:56:48 +00:00 committed by Automerger Merge Worker
commit 74c4c2c36c
2 changed files with 16 additions and 10 deletions

View file

@ -123,18 +123,21 @@
"Type": "UNKNOWN", "Type": "UNKNOWN",
"VirtualSensor": true, "VirtualSensor": true,
"Formula": "COUNT_THRESHOLD", "Formula": "COUNT_THRESHOLD",
"StepRatio": 0.2,
"Combination": ["WLC_CHECK"], "Combination": ["WLC_CHECK"],
"Coefficient": [2], "Coefficient": [2],
"Multiplier": 1 "Multiplier": 1,
"PassiveDelay": 7000
}, },
{ {
"Name": "NO_WLC", "Name": "NO_WLC",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"Hidden": true, "Hidden": true,
"VirtualSensor": true, "VirtualSensor": true,
"Formula": "COUNT_THRESHOLD", "Formula": "WEIGHTED_AVG",
"Combination": ["WLC_CHECK"], "Combination": ["1", "IS_WLC"],
"Coefficient": [-2], "CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1 "Multiplier": 1
}, },
{ {
@ -231,7 +234,7 @@
"Version": "2.0", "Version": "2.0",
"VirtualSensor": true, "VirtualSensor": true,
"TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
"Formula": "MAXIMUM", "Formula": "WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", "VIRTUAL-SKIN-CHARGE-WIRED-EQ"], "Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", "VIRTUAL-SKIN-CHARGE-WIRED-EQ"],
"Coefficient":["IS_WLC", "NO_WLC"], "Coefficient":["IS_WLC", "NO_WLC"],
"CoefficientType": ["SENSOR", "SENSOR"], "CoefficientType": ["SENSOR", "SENSOR"],

View file

@ -726,18 +726,21 @@
"Type": "UNKNOWN", "Type": "UNKNOWN",
"VirtualSensor": true, "VirtualSensor": true,
"Formula": "COUNT_THRESHOLD", "Formula": "COUNT_THRESHOLD",
"StepRatio": 0.2,
"Combination": ["WLC_CHECK"], "Combination": ["WLC_CHECK"],
"Coefficient": [2], "Coefficient": [2],
"Multiplier": 1 "Multiplier": 1,
"PassiveDelay": 7000
}, },
{ {
"Name": "NO_WLC", "Name": "NO_WLC",
"Type": "UNKNOWN", "Type": "UNKNOWN",
"Hidden": true, "Hidden": true,
"VirtualSensor": true, "VirtualSensor": true,
"Formula": "COUNT_THRESHOLD", "Formula": "WEIGHTED_AVG",
"Combination": ["WLC_CHECK"], "Combination": ["1", "IS_WLC"],
"Coefficient": [-2], "CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1 "Multiplier": 1
}, },
{ {
@ -834,7 +837,7 @@
"Version": "2.0", "Version": "2.0",
"VirtualSensor": true, "VirtualSensor": true,
"TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"], "TriggerSensor": ["soc_therm", "rffe_therm", "charger_therm", "modem_therm", "gnss_tcxo_therm"],
"Formula": "MAXIMUM", "Formula": "WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", "VIRTUAL-SKIN-CHARGE-WIRED-EQ"], "Combination":["VIRTUAL-SKIN-CHARGE-WLC-EQ", "VIRTUAL-SKIN-CHARGE-WIRED-EQ"],
"Coefficient":["IS_WLC", "NO_WLC"], "Coefficient":["IS_WLC", "NO_WLC"],
"CoefficientType": ["SENSOR", "SENSOR"], "CoefficientType": ["SENSOR", "SENSOR"],