Merge "thermal: enable virtual-skin-model" into main

This commit is contained in:
Sayanna Chandula 2023-12-13 21:06:57 +00:00 committed by Android (Google) Code Review
commit 0d8c55305e
13 changed files with 110 additions and 2 deletions

View file

@ -218,6 +218,10 @@ PRODUCT_PACKAGES += \
# Display LBE
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
#Thermal VT estimator
PRODUCT_PACKAGES += \
libthermal_tflite_wrapper
# Set zram size
PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=50p \

View file

@ -26,7 +26,8 @@ PRODUCT_COPY_FILES += \
ifneq (,$(filter $(TARGET_DEVICE),komodo caiman tokay))
PRODUCT_COPY_FILES += \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE)_proto.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_proto.json \
$(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite
endif
# Power HAL config

View file

@ -234,6 +234,10 @@ PRODUCT_PACKAGES += \
# Display LBE
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
#Thermal VT estimator
PRODUCT_PACKAGES += \
libthermal_tflite_wrapper
# Set zram size
PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=50p \

View file

@ -218,6 +218,10 @@ PRODUCT_PACKAGES += \
# Display LBE
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1
#Thermal VT estimator
PRODUCT_PACKAGES += \
libthermal_tflite_wrapper
# Set zram size
PRODUCT_VENDOR_PROPERTIES += \
vendor.zram.size=50p \

View file

@ -255,6 +255,22 @@
}
]
},
{
"Name":"VIRTUAL-SKIN-MODEL",
"Type":"UNKNOWN",
"VirtualSensor":true,
"ModelPath":"vt_estimation_model.tflite",
"TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"],
"Formula":"USE_ML_MODEL",
"Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001,
"SendPowerHint":true,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name":"VIRTUAL-SKIN-HINT",
"Type":"UNKNOWN",

View file

@ -245,6 +245,22 @@
}
]
},
{
"Name":"VIRTUAL-SKIN-MODEL",
"Type":"UNKNOWN",
"VirtualSensor":true,
"ModelPath":"vt_estimation_model.tflite",
"TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"],
"Formula":"USE_ML_MODEL",
"Combination":["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001,
"SendPowerHint":true,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name":"VIRTUAL-SKIN-HINT",
"Type":"UNKNOWN",

View file

@ -288,6 +288,22 @@
}
]
},
{
"Name":"VIRTUAL-SKIN-MODEL",
"Type":"UNKNOWN",
"VirtualSensor":true,
"ModelPath":"vt_estimation_model.tflite",
"TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"],
"Formula":"USE_ML_MODEL",
"Combination":["north_therm","soc_therm","charging_therm","disp_therm","battery","quiet_therm","usb_pwr_therm","rfpa_therm","btmspkr_therm"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001,
"SendPowerHint":true,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name":"VIRTUAL-SKIN-HINT",
"Type":"UNKNOWN",

View file

@ -278,6 +278,22 @@
}
]
},
{
"Name":"VIRTUAL-SKIN-MODEL",
"Type":"UNKNOWN",
"VirtualSensor":true,
"ModelPath":"vt_estimation_model.tflite",
"TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"],
"Formula":"USE_ML_MODEL",
"Combination":["north_therm","soc_therm","charging_therm","disp_therm","battery","quiet_therm","usb_pwr_therm","rfpa_therm","btmspkr_therm"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001,
"SendPowerHint":true,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name":"VIRTUAL-SKIN-HINT",
"Type":"UNKNOWN",

View file

@ -233,6 +233,22 @@
}
]
},
{
"Name":"VIRTUAL-SKIN-MODEL",
"Type":"UNKNOWN",
"VirtualSensor":true,
"ModelPath":"vt_estimation_model.tflite",
"TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"],
"Formula":"USE_ML_MODEL",
"Combination":["north_therm","soc_therm","charging_therm","disp_therm","battery","quiet_therm","usb_pwr_therm","rfpa_therm","btmspkr_therm"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001,
"SendPowerHint":true,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name":"VIRTUAL-SKIN-HINT",
"Type":"UNKNOWN",

View file

@ -197,7 +197,6 @@
"Offset": 4130.0,
"Multiplier": 0.001
},
{
"Name":"VIRTUAL-SKIN",
"Type":"SKIN",
@ -224,6 +223,22 @@
}
]
},
{
"Name":"VIRTUAL-SKIN-MODEL",
"Type":"UNKNOWN",
"VirtualSensor":true,
"ModelPath":"vt_estimation_model.tflite",
"TriggerSensor":["north_therm", "soc_therm", "charging_therm", "disp_therm", "quiet_therm", "usb_pwr_therm", "btmspkr_therm"],
"Formula":"USE_ML_MODEL",
"Combination":["north_therm","soc_therm","charging_therm","disp_therm","battery","quiet_therm","usb_pwr_therm","rfpa_therm","btmspkr_therm"],
"Coefficient":[1.0],
"HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0],
"HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001,
"SendPowerHint":true,
"PollingDelay":300000,
"PassiveDelay":7000
},
{
"Name":"VIRTUAL-SKIN-HINT",
"Type":"UNKNOWN",

Binary file not shown.

Binary file not shown.

Binary file not shown.