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

Merge changes from topic "p24-vt-dvt" into 24D1-dev

Browse source 
* changes:
  thermal: update vt models with dvt data
  thermal: add smooth transition from model to legacy vt
This commit is contained in:
Sayanna Chandula 2024-04-29 20:30:39 +00:00 • committed by Android (Google) Code Review
commit 670fd87775
6 changed files with 204 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

71
thermal/thermal_info_config_caiman.json
View file

@ -173,10 +173,31 @@
"Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
"Multiplier": 0.001,
"PreviousSampleCount": 3,
"BackupSensor" : "VIRTUAL-SKIN-LEGACY",
"OffsetThresholds" : [50000, 53000],
"OffsetValues" : [500, 1000],
"ValidateInput": true
"SupportUnderStampling": true
},
{
"Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "MINIMUM",
"Combination": ["55000", "VIRTUAL-SKIN-MODEL"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, 1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-CLAMPED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "MAXIMUM",
"Combination": ["20000", "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, 1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -188,6 +209,50 @@
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-LEGACY-MODEL-DIFF",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VT_LEGACY_WEIGHT",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "COUNT_THRESHOLD",
"StepRatio": 0.2,
"Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"],
"Coefficient": [7000, 7000],
"Multiplier": 1,
"PassiveDelay": 7000
},
{
"Name": "VT_MODEL_WEIGHT",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["1", "VT_LEGACY_WEIGHT"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-UPDATED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-CLAMPED"],
"Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"],
"CoefficientType": ["SENSOR", "SENSOR"],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-LSTM-MODEL",
"Type": "UNKNOWN",
@ -222,7 +287,7 @@
"VirtualSensor": true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"],
"Combination": ["VIRTUAL-SKIN-MODEL-UPDATED", "VIRTUAL-SKIN-LEGACY"],
"Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"],
"CoefficientType":["CONSTANT", "SENSOR"],
"HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],

71
thermal/thermal_info_config_komodo.json
View file

@ -196,10 +196,31 @@
"Multiplier": 0.001,
"Offset": 500,
"PreviousSampleCount": 3,
"BackupSensor" : "VIRTUAL-SKIN-LEGACY",
"OffsetThresholds" : [50000, 53000],
"OffsetValues" : [500, 1000],
"ValidateInput": true
"SupportUnderSampling": true
},
{
"Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "MINIMUM",
"Combination": ["55000", "VIRTUAL-SKIN-MODEL"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, 1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-CLAMPED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "MAXIMUM",
"Combination": ["20000", "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, 1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -211,6 +232,50 @@
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-LEGACY-MODEL-DIFF",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VT_LEGACY_WEIGHT",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "COUNT_THRESHOLD",
"StepRatio": 0.2,
"Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"],
"Coefficient": [7000, 7000],
"Multiplier": 1,
"PassiveDelay": 7000
},
{
"Name": "VT_MODEL_WEIGHT",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["1", "VT_LEGACY_WEIGHT"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-UPDATED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-CLAMPED"],
"Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"],
"CoefficientType": ["SENSOR", "SENSOR"],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-LSTM-MODEL",
"Type": "UNKNOWN",
@ -245,7 +310,7 @@
"VirtualSensor": true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"],
"Combination": ["VIRTUAL-SKIN-MODEL-UPDATED", "VIRTUAL-SKIN-LEGACY"],
"Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"],
"CoefficientType":["CONSTANT", "SENSOR"],
"HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],

71
thermal/thermal_info_config_tokay.json
View file

@ -163,10 +163,31 @@
"Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
"Multiplier": 0.001,
"PreviousSampleCount": 3,
"BackupSensor" : "VIRTUAL-SKIN-LEGACY",
"OffsetThresholds" : [50000, 53000],
"OffsetValues" : [500, 1000],
"ValidateInput": true
"SupportUnderSampling": true
},
{
"Name": "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "MINIMUM",
"Combination": ["55000", "VIRTUAL-SKIN-MODEL"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, 1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-CLAMPED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "MAXIMUM",
"Combination": ["20000", "VIRTUAL-SKIN-MODEL-UPPER-CLAMPED"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, 1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-LEGACY-DIFF",
@ -178,6 +199,50 @@
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-LEGACY-MODEL-DIFF",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VT_LEGACY_WEIGHT",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "COUNT_THRESHOLD",
"StepRatio": 0.2,
"Combination": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF", "VIRTUAL-SKIN-LEGACY-MODEL-DIFF"],
"Coefficient": [7000, 7000],
"Multiplier": 1,
"PassiveDelay": 7000
},
{
"Name": "VT_MODEL_WEIGHT",
"Type": "UNKNOWN",
"Hidden": true,
"VirtualSensor": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["1", "VT_LEGACY_WEIGHT"],
"CombinationType": ["CONSTANT", "SENSOR"],
"Coefficient": [1.0, -1.0],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-MODEL-UPDATED",
"Type": "UNKNOWN",
"VirtualSensor": true,
"Hidden": true,
"Formula": "WEIGHTED_AVG",
"Combination": ["VIRTUAL-SKIN-LEGACY", "VIRTUAL-SKIN-MODEL-CLAMPED"],
"Coefficient": ["VT_LEGACY_WEIGHT", "VT_MODEL_WEIGHT"],
"CoefficientType": ["SENSOR", "SENSOR"],
"Multiplier": 1
},
{
"Name": "VIRTUAL-SKIN-LSTM-MODEL",
"Type": "UNKNOWN",
@ -212,7 +277,7 @@
"VirtualSensor": true,
"TriggerSensor": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Formula": "MAXIMUM",
"Combination": ["VIRTUAL-SKIN-MODEL", "VIRTUAL-SKIN-LEGACY"],
"Combination": ["VIRTUAL-SKIN-MODEL-UPDATED", "VIRTUAL-SKIN-LEGACY"],
"Coefficient": [1.0, "VIRTUAL-SKIN-LEGACY-SHUTDOWN"],
"CoefficientType":["CONSTANT", "SENSOR"],
"HotThreshold": ["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],

BIN
thermal/vt_estimation_model_caiman.tflite
View file

Binary file not shown.

BIN
thermal/vt_estimation_model_komodo.tflite
View file

Binary file not shown.

BIN
thermal/vt_estimation_model_tokay.tflite
View file

Binary file not shown.