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

Merge "thermal: update the VSKIN equation V06" into udc-dev am: cc026d8a81 am: 2388e7c62f

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

Change-Id: I7e1ba768c097a95c7f15ee8160a9ec56ff269805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-27 06:49:52 +00:00 • committed by Automerger Merge Worker
commit 42f06ad7cd
3 changed files with 24 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

37
thermal_info_config_charge_felix.json
View file

@ -79,36 +79,15 @@
"Coefficient":[-1.0], "Coefficient":[-1.0],
"Multiplier":1 "Multiplier":1
}, },
{
"Name":"CLOSE-SUB1-RAW",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm"],
"Coefficient":[-0.15, -0.45, 0.2, 1.5],
"Offset":-670,
"Multiplier":0.001
},
{
"Name":"CLOSE-SUB1",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"MINIMUM",
"Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
"Coefficient":[1.0, 49000.0],
"Multiplier":0.001
},
{ {
"Name":"CLOSE-SUB2", "Name":"CLOSE-SUB2",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm", "gnss_tcxo_therm"], "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "gnss_tcxo_therm"],
"Coefficient":[0.3, 0.3, -0.1, 0.4, 0.1], "Coefficient":[0.259, 0.652, -0.161, 0.03],
"Offset":2500, "Offset":8450,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -161,8 +140,8 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"], "Combination":["CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -192,9 +171,9 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"], "Combination":["skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
"Coefficient":[-0.15, -1.05, 0.1, 0.25, 1.85, 0.05], "Coefficient":[0.385, 0.075, 0.348, 0.302],
"Offset":-990, "Offset":-4950,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {

37
thermal_info_config_felix.json
View file

@ -85,36 +85,15 @@
"Coefficient":[-1.0], "Coefficient":[-1.0],
"Multiplier":1 "Multiplier":1
}, },
{
"Name":"CLOSE-SUB1-RAW",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm"],
"Coefficient":[-0.15, -0.45, 0.2, 1.5],
"Offset":-670,
"Multiplier":0.001
},
{
"Name":"CLOSE-SUB1",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"MINIMUM",
"Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
"Coefficient":[1.0, 49000.0],
"Multiplier":0.001
},
{ {
"Name":"CLOSE-SUB2", "Name":"CLOSE-SUB2",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm", "gnss_tcxo_therm"], "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "gnss_tcxo_therm"],
"Coefficient":[0.3, 0.3, -0.1, 0.4, 0.1], "Coefficient":[0.259, 0.652, -0.161, 0.03],
"Offset":2500, "Offset":8450,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -167,8 +146,8 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"], "Combination":["CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -198,9 +177,9 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"], "Combination":["skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
"Coefficient":[-0.15, -1.05, 0.1, 0.25, 1.85, 0.05], "Coefficient":[0.385, 0.075, 0.348, 0.302],
"Offset":-990, "Offset":-4950,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {

37
thermal_info_config_proactive_skin_felix.json
View file

@ -85,36 +85,15 @@
"Coefficient":[-1.0], "Coefficient":[-1.0],
"Multiplier":1 "Multiplier":1
}, },
{
"Name":"CLOSE-SUB1-RAW",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm"],
"Coefficient":[-0.15, -0.45, 0.2, 1.5],
"Offset":-670,
"Multiplier":0.001
},
{
"Name":"CLOSE-SUB1",
"Type":"UNKNOWN",
"Hidden":true,
"VirtualSensor":true,
"Formula":"MINIMUM",
"Combination":["CLOSE-SUB1-RAW", "IS_CLOSE"],
"Coefficient":[1.0, 49000.0],
"Multiplier":0.001
},
{ {
"Name":"CLOSE-SUB2", "Name":"CLOSE-SUB2",
"Type":"UNKNOWN", "Type":"UNKNOWN",
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "outer_disp_therm", "gnss_tcxo_therm"], "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "gnss_tcxo_therm"],
"Coefficient":[0.3, 0.3, -0.1, 0.4, 0.1], "Coefficient":[0.259, 0.652, -0.161, 0.03],
"Offset":2500, "Offset":8450,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -167,8 +146,8 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["CLOSE-SUB1", "CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"], "Combination":["CLOSE-SUB2", "CLOSE-SUB3", "CLOSE-SUB4", "CLOSE-SUB5"],
"Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0], "Coefficient":[1.0, 1.0, 1.0, 1.0],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
@ -198,9 +177,9 @@
"Hidden":true, "Hidden":true,
"VirtualSensor":true, "VirtualSensor":true,
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["neutral_therm", "quiet_therm", "skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"], "Combination":["skin_therm", "usb_pwr_therm", "inner_disp_therm", "gnss_tcxo_therm"],
"Coefficient":[-0.15, -1.05, 0.1, 0.25, 1.85, 0.05], "Coefficient":[0.385, 0.075, 0.348, 0.302],
"Offset":-990, "Offset":-4950,
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {