Snap for 12235283 from d0a87d4497
to 25D4-release
Change-Id: I1f81a91832c751937c46677d3a7eb9feeba36eec
This commit is contained in:
commit
1a778408a6
3 changed files with 24 additions and 40 deletions
|
@ -115,6 +115,7 @@ PRODUCT_PACKAGES += \
|
||||||
TARGET_VENDOR_THERMAL_CONFIG_PATH := device/google/tegu/thermal
|
TARGET_VENDOR_THERMAL_CONFIG_PATH := device/google/tegu/thermal
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_tegu.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \
|
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_tegu.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite \
|
||||||
|
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_speaker_estimation_model_tegu.tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_speaker_estimation_model.tflite \
|
||||||
|
|
||||||
# Bluetooth HAL
|
# Bluetooth HAL
|
||||||
PRODUCT_COPY_FILES += \
|
PRODUCT_COPY_FILES += \
|
||||||
|
|
|
@ -704,50 +704,29 @@
|
||||||
"PassiveDelay":7000
|
"PassiveDelay":7000
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name":"VIRTUAL-SKIN-SPEAKER-SUB-0",
|
"Name": "VIRTUAL-SKIN-SPEAKER-MODEL",
|
||||||
"Type":"UNKNOWN",
|
"Type": "UNKNOWN",
|
||||||
"Hidden":true,
|
"VirtualSensor": true,
|
||||||
"VirtualSensor":true,
|
"ModelPath": "vt_speaker_estimation_model.tflite",
|
||||||
"Formula":"WEIGHTED_AVG",
|
"Formula": "USE_ML_MODEL",
|
||||||
"Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"],
|
"Combination": ["battery", "btmspkr_therm", "charging_therm", "disp_therm", "north_therm", "quiet_therm", "rfpa_therm", "soc_therm", "usb_pwr_therm"],
|
||||||
"Coefficient":[0, 0.14, 0, 0.15, 0, 0, 0, 0.88, 0],
|
"Multiplier": 0.001,
|
||||||
"Offset":-11750,
|
"PreviousSampleCount": 1
|
||||||
"Multiplier":0.001
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name":"VIRTUAL-SKIN-SPEAKER-SUB-1",
|
|
||||||
"Type":"UNKNOWN",
|
|
||||||
"Hidden":true,
|
|
||||||
"VirtualSensor":true,
|
|
||||||
"Formula":"WEIGHTED_AVG",
|
|
||||||
"Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"],
|
|
||||||
"Coefficient":[0.01, 0.18, 0, 0, 0, 0.24, 0, 0.01, 0.35],
|
|
||||||
"Offset":3600,
|
|
||||||
"Multiplier":0.001
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Name":"VIRTUAL-SKIN-SPEAKER-SUB-2",
|
|
||||||
"Type":"UNKNOWN",
|
|
||||||
"Hidden":true,
|
|
||||||
"VirtualSensor":true,
|
|
||||||
"Formula":"WEIGHTED_AVG",
|
|
||||||
"Combination":["north_therm", "rfpa_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "btmspkr_therm", "quiet_therm", "usb_pwr_therm"],
|
|
||||||
"Coefficient":[0, 0.01, 0, 0, 0.13, 0.31, 0.11, 0.18, 0.09],
|
|
||||||
"Offset":2140,
|
|
||||||
"Multiplier":0.001
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name":"VIRTUAL-SKIN-SPEAKER",
|
"Name":"VIRTUAL-SKIN-SPEAKER",
|
||||||
"Type":"UNKNOWN",
|
"Type":"UNKNOWN",
|
||||||
"Version":"2.0",
|
"Version":"2.0",
|
||||||
"VirtualSensor":true,
|
"VirtualSensor":true,
|
||||||
"TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
|
"Formula": "MAXIMUM",
|
||||||
"Formula":"MAXIMUM",
|
"Combination": ["VIRTUAL-SKIN-SPEAKER-MODEL"],
|
||||||
"Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1", "VIRTUAL-SKIN-SPEAKER-SUB-2"],
|
"Coefficient": [1.0],
|
||||||
"Coefficient":[1, 1, 1],
|
"HotThreshold": ["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
|
||||||
"HotThreshold":["NAN", 47.0, "NAN", "NAN", "NAN", "NAN", "NAN"],
|
"HotHysteresis": [0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
|
||||||
"HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
|
|
||||||
"Multiplier":0.001,
|
"Multiplier":0.001,
|
||||||
|
"StepRatio": 0.4,
|
||||||
|
"PollingDelay": 300000,
|
||||||
|
"PassiveDelay": 7000,
|
||||||
"SendCallback":true
|
"SendCallback":true
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -1050,8 +1029,8 @@
|
||||||
"QUIET_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52", "QUIET_THERM-VSKIN-DIFF-DURING-QUIET_THERM-OVER-THRESHOLD",
|
"QUIET_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52", "QUIET_THERM-VSKIN-DIFF-DURING-QUIET_THERM-OVER-THRESHOLD",
|
||||||
"SOC_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52", "SOC_THERM-VSKIN-DIFF-DURING-SOC_THERM-OVER-THRESHOLD",
|
"SOC_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52", "SOC_THERM-VSKIN-DIFF-DURING-SOC_THERM-OVER-THRESHOLD",
|
||||||
"NORTH_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52", "NORTH_THERM-VSKIN-DIFF-DURING-NORTH_THERM-OVER-THRESHOLD",
|
"NORTH_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52", "NORTH_THERM-VSKIN-DIFF-DURING-NORTH_THERM-OVER-THRESHOLD",
|
||||||
"RFPA_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52", "RFPA_THERM-VSKIN-DIFF-DURING-RFPA_THERM-OVER-THRESHOLD"],
|
"RFPA_THERM-VSKIN-DIFF-DURING-VSKIN-OVER-52", "RFPA_THERM-VSKIN-DIFF-DURING-RFPA_THERM-OVER-THRESHOLD", "VIRTUAL-SKIN-SPEAKER-MODEL"],
|
||||||
"Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
|
"Coefficient": [0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
|
||||||
"Multiplier": 1,
|
"Multiplier": 1,
|
||||||
"SendPowerHint": true,
|
"SendPowerHint": true,
|
||||||
"PollingDelay": 300000,
|
"PollingDelay": 300000,
|
||||||
|
@ -1176,7 +1155,7 @@
|
||||||
"Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
|
"Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"Name": "VIRTUAL-SKIN-SPEAKER",
|
"Name": "VIRTUAL-SKIN-SPEAKER-MODEL",
|
||||||
"Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
|
"Thresholds": [41, 43, 45, 47, 49, 51, 53, 55, 57, 59, 75]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -1270,6 +1249,10 @@
|
||||||
{
|
{
|
||||||
"Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],
|
"Monitor": ["VIRTUAL-SKIN-MODEL-LEGACY-DIFF"],
|
||||||
"TempRange": [-7000, 7000]
|
"TempRange": [-7000, 7000]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"Monitor": ["VIRTUAL-SKIN-SPEAKER"],
|
||||||
|
"TempRange": [-20.0, 55.0]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
BIN
thermal/vt_speaker_estimation_model_tegu.tflite
Normal file
BIN
thermal/vt_speaker_estimation_model_tegu.tflite
Normal file
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue