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

Merge "thermal: Update VSKIN equation V06.2" into udc-dev am: 5d53d59375 am: 89726e4cc1

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

Change-Id: I448b935a8d535f2f1eda5a2f168f440a0e7cbd13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Nick Lee 2023-07-19 06:12:19 +00:00 • committed by Automerger Merge Worker
commit ec1d25f23b
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
thermal_info_config_charge_felix.json
View file

@ -204,9 +204,9 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
"Coefficient":[0.15, 1.05, -0.65, 1, -0.55], "Coefficient":[0.429, 0.314, 0.205],
"Offset":3540, "Offset":2600,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {

8
thermal_info_config_felix.json
View file

@ -210,9 +210,9 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
"Coefficient":[0.15, 1.05, -0.65, 1, -0.55], "Coefficient":[0.429, 0.314, 0.205],
"Offset":3540, "Offset":2600,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -238,7 +238,7 @@
{ {
"Name":"VIRTUAL-SKIN", "Name":"VIRTUAL-SKIN",
"Type":"SKIN", "Type":"SKIN",
"Version":"0.5", "Version":"6.2",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm", "TriggerSensor":"skin_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",

8
thermal_info_config_proactive_skin_felix.json
View file

@ -210,9 +210,9 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
"Coefficient":[0.15, 1.05, -0.65, 1, -0.55], "Coefficient":[0.429, 0.314, 0.205],
"Offset":3540, "Offset":2600,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -238,7 +238,7 @@
{ {
"Name":"VIRTUAL-SKIN", "Name":"VIRTUAL-SKIN",
"Type":"SKIN", "Type":"SKIN",
"Version":"0.5", "Version":"6.2",
"VirtualSensor":true, "VirtualSensor":true,
"TriggerSensor":"skin_therm", "TriggerSensor":"skin_therm",
"Formula":"MAXIMUM", "Formula":"MAXIMUM",