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

Merge "thermal: update rule to identify non WLC scenarios" into 24D1-dev am: 4d48b7c9a3

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/caimito/+/26585316

Change-Id: I74f918e5f428cb38a18bdfd7cc7275285315cb97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-03-26 17:49:32 +00:00 • committed by Automerger Merge Worker
commit 4d1cc9f345
6 changed files with 84 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
thermal/thermal_info_config_caiman.json
View file

@ -800,13 +800,23 @@
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"IS_WIRED_CHARGE", "Name":"WLC_CHECK",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["thb_hda"], "Combination":["thb_hda", "thb_hda"],
"Coefficient":[-1], "Coefficient":[1, -51],
"Multiplier":1
},
{
"Name":"NO_WLC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["WLC_CHECK"],
"Coefficient":[-2],
"Multiplier":1 "Multiplier":1
}, },
{ {
@ -817,7 +827,7 @@
"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-CHARGE"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":["IS_WIRED_CHARGE"], "Coefficient":["NO_WLC"],
"CoefficientType": ["SENSOR"], "CoefficientType": ["SENSOR"],
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],

18
thermal/thermal_info_config_charge_caiman.json
View file

@ -137,13 +137,23 @@
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"IS_WIRED_CHARGE", "Name":"WLC_CHECK",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["thb_hda"], "Combination":["thb_hda", "thb_hda"],
"Coefficient":[-1], "Coefficient":[1, -51],
"Multiplier":1
},
{
"Name":"NO_WLC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["WLC_CHECK"],
"Coefficient":[-2],
"Multiplier":1 "Multiplier":1
}, },
{ {
@ -154,7 +164,7 @@
"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-CHARGE"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":["IS_WIRED_CHARGE"], "Coefficient":["NO_WLC"],
"CoefficientType": ["SENSOR"], "CoefficientType": ["SENSOR"],
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],

18
thermal/thermal_info_config_charge_komodo.json
View file

@ -137,13 +137,23 @@
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"IS_WIRED_CHARGE", "Name":"WLC_CHECK",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["thb_hda"], "Combination":["thb_hda", "thb_hda"],
"Coefficient":[-1], "Coefficient":[1, -51],
"Multiplier":1
},
{
"Name":"NO_WLC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["WLC_CHECK"],
"Coefficient":[-2],
"Multiplier":1 "Multiplier":1
}, },
{ {
@ -154,7 +164,7 @@
"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-CHARGE"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":["IS_WIRED_CHARGE"], "Coefficient":["NO_WLC"],
"CoefficientType": ["SENSOR"], "CoefficientType": ["SENSOR"],
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],

18
thermal/thermal_info_config_charge_tokay.json
View file

@ -159,13 +159,23 @@
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"IS_WIRED_CHARGE", "Name":"WLC_CHECK",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["thb_hda"], "Combination":["thb_hda", "thb_hda"],
"Coefficient":[-1], "Coefficient":[1, -51],
"Multiplier":1
},
{
"Name":"NO_WLC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["WLC_CHECK"],
"Coefficient":[-2],
"Multiplier":1 "Multiplier":1
}, },
{ {
@ -176,7 +186,7 @@
"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-CHARGE"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":["IS_WIRED_CHARGE"], "Coefficient":["NO_WLC"],
"CoefficientType": ["SENSOR"], "CoefficientType": ["SENSOR"],
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],

18
thermal/thermal_info_config_komodo.json
View file

@ -798,13 +798,23 @@
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"IS_WIRED_CHARGE", "Name":"WLC_CHECK",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["thb_hda"], "Combination":["thb_hda", "thb_hda"],
"Coefficient":[-1], "Coefficient":[1, -51],
"Multiplier":1
},
{
"Name":"NO_WLC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["WLC_CHECK"],
"Coefficient":[-2],
"Multiplier":1 "Multiplier":1
}, },
{ {
@ -815,7 +825,7 @@
"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-CHARGE"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":["IS_WIRED_CHARGE"], "Coefficient":["NO_WLC"],
"CoefficientType": ["SENSOR"], "CoefficientType": ["SENSOR"],
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],

18
thermal/thermal_info_config_tokay.json
View file

@ -858,13 +858,23 @@
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"IS_WIRED_CHARGE", "Name":"WLC_CHECK",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"COUNT_THRESHOLD", "Formula":"COUNT_THRESHOLD",
"Combination":["thb_hda"], "Combination":["thb_hda", "thb_hda"],
"Coefficient":[-1], "Coefficient":[1, -51],
"Multiplier":1
},
{
"Name":"NO_WLC",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"COUNT_THRESHOLD",
"Combination":["WLC_CHECK"],
"Coefficient":[-2],
"Multiplier":1 "Multiplier":1
}, },
{ {
@ -875,7 +885,7 @@
"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-CHARGE"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":["IS_WIRED_CHARGE"], "Coefficient":["NO_WLC"],
"CoefficientType": ["SENSOR"], "CoefficientType": ["SENSOR"],
"HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0],
"HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],