Merge "thermal: register sensor for thermal diff between right and left inner display" into tm-qpr-dev am: 25f4d660db am: c35914c39c

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

Change-Id: I916158bb87f91cf1bc1d2406b7cac72653b2357a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
NT Tsai 2023-03-03 17:57:14 +00:00 committed by Automerger Merge Worker
commit 58554e130d
2 changed files with 62 additions and 0 deletions

View file

@ -517,6 +517,37 @@
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000 "PassiveDelay":7000
}, },
{
"Name":"LEFT-INNER-DISPLAY",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["outer_disp_therm"],
"Coefficient":[1.56],
"Offset":-14540,
"Multiplier":0.001
},
{
"Name":"RIGHT-INNER-DISPLAY",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"],
"Coefficient":[0.35, -0.2, 0.55, -0.95, 0.35, 0.8],
"Offset":3110,
"Multiplier":0.001
},
{
"Name":"INNER-DISPLAY-DIFF",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["LEFT-INNER-DISPLAY", "RIGHT-INNER-DISPLAY"],
"Coefficient":[1.0, -1.0],
"Multiplier":0.001
},
{ {
"Name":"LITTLE", "Name":"LITTLE",
"Type":"CPU", "Type":"CPU",

View file

@ -517,6 +517,37 @@
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000 "PassiveDelay":7000
}, },
{
"Name":"LEFT-INNER-DISPLAY",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["outer_disp_therm"],
"Coefficient":[1.56],
"Offset":-14540,
"Multiplier":0.001
},
{
"Name":"RIGHT-INNER-DISPLAY",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"],
"Coefficient":[0.35, -0.2, 0.55, -0.95, 0.35, 0.8],
"Offset":3110,
"Multiplier":0.001
},
{
"Name":"INNER-DISPLAY-DIFF",
"Type":"UNKNOWN",
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["LEFT-INNER-DISPLAY", "RIGHT-INNER-DISPLAY"],
"Coefficient":[1.0, -1.0],
"Multiplier":0.001
},
{ {
"Name":"LITTLE", "Name":"LITTLE",
"Type":"CPU", "Type":"CPU",