diff --git a/device-caiman.mk b/device-caiman.mk index c583346c..4be6abd8 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -213,10 +213,6 @@ 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 \ diff --git a/device-caimito-common.mk b/device-caimito-common.mk index 4646e850..164bc639 100644 --- a/device-caimito-common.mk +++ b/device-caimito-common.mk @@ -22,8 +22,7 @@ endif PRODUCT_COPY_FILES += \ $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_$(TARGET_DEVICE).json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ - $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_charge_$(TARGET_DEVICE).json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json \ - $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/vt_estimation_model_$(TARGET_DEVICE).tflite:$(TARGET_COPY_OUT_VENDOR)/etc/vt_estimation_model.tflite + $(TARGET_VENDOR_THERMAL_CONFIG_PATH)/thermal_info_config_charge_$(TARGET_DEVICE).json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json ifneq (,$(filter $(TARGET_DEVICE),komodo caiman tokay)) PRODUCT_COPY_FILES += \ diff --git a/thermal/thermal_info_config_caiman.json b/thermal/thermal_info_config_caiman.json index ed703314..ef8ca764 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -254,22 +254,6 @@ } ] }, - { - "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", 37.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, - "SendCallback":true, - "PollingDelay":300000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-HINT", "Type":"UNKNOWN", diff --git a/thermal/thermal_info_config_caiman_proto.json b/thermal/thermal_info_config_caiman_proto.json index 3fe84f4b..f9355bda 100644 --- a/thermal/thermal_info_config_caiman_proto.json +++ b/thermal/thermal_info_config_caiman_proto.json @@ -245,22 +245,6 @@ } ] }, - { - "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", 37.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, - "SendCallback":true, - "PollingDelay":300000, - "PassiveDelay":7000 - }, { "Name":"VIRTUAL-SKIN-HINT", "Type":"UNKNOWN", diff --git a/thermal/vt_estimation_model_caiman.tflite b/thermal/vt_estimation_model_caiman.tflite deleted file mode 100644 index dd6d8beb..00000000 Binary files a/thermal/vt_estimation_model_caiman.tflite and /dev/null differ