From efe0cba01459310ccceaffa47a832bee52ec22e2 Mon Sep 17 00:00:00 2001 From: Sayanna Chandula Date: Mon, 16 Oct 2023 13:48:44 -0700 Subject: [PATCH] thermal: enable virtual-skin-model Bug: 298225131 Test: Build and boot on device Change-Id: Ib28499b42ab7ed6c46f9a6956d4cb33c98b15ddc Signed-off-by: Sayanna Chandula --- device-caiman.mk | 4 ++++ device-caimito-common.mk | 3 ++- thermal/thermal_info_config_caiman.json | 16 ++++++++++++++++ thermal/thermal_info_config_caiman_proto.json | 16 ++++++++++++++++ thermal/vt_estimation_model_caiman.tflite | Bin 0 -> 1920 bytes 5 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 thermal/vt_estimation_model_caiman.tflite diff --git a/device-caiman.mk b/device-caiman.mk index b115970b..26eb98a3 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -210,6 +210,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 \ diff --git a/device-caimito-common.mk b/device-caimito-common.mk index 164bc639..4646e850 100644 --- a/device-caimito-common.mk +++ b/device-caimito-common.mk @@ -22,7 +22,8 @@ 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)/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 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 9b797ca7..cece0053 100644 --- a/thermal/thermal_info_config_caiman.json +++ b/thermal/thermal_info_config_caiman.json @@ -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", 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 f9355bda..3fe84f4b 100644 --- a/thermal/thermal_info_config_caiman_proto.json +++ b/thermal/thermal_info_config_caiman_proto.json @@ -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", 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 new file mode 100644 index 0000000000000000000000000000000000000000..dd6d8bebb02170324acafe39763942bbab0621e3 GIT binary patch literal 1920 zcmZ`)e@ss1-DO=e8u<`r(gNj9R&@Z10b@tjx@S*XMiR59ec@?Q_59e$V-S zzUO<+_j`_sF;=~?JSUMQGZRZo{DMT`vtYZfyG!J>c!fU!8; zifrQWNA_g*9Pk*>t~htw9gS9-(jdE4mu?pW{h;6PkAm_)p*VF_#D2kr9uslWyzKO>ob*h_=7apim6e`Hs&Mn%_xq0lE9L`hScQ?FroYgB zoINfo?`BDRCiiI@ij3m=3vWtm#!{srQyqUf_pJBr-g8n-(549oI5;Y44f{^Tq+?=b`%^l=-Ixq9)(h=@)j*D#im5XC+8$WdAF89^Wcu&{e z5t~j#i=TOp3d^5Wc}r}M*!9jQ1s_etN_7{u2wyffXfX#&lK5McR@0rx_hkOV^HY8m zGjooM&s^Ff_E){O?&wpgQr;z1w4HEEZEZ({Yrju=H(QPTXZ5~!?^jnZe)wm!w?~N6 z&d8Jey=DEpPsx_97oGHG_f(00+$s|$2J$3fQ>tj0sn=$VmwC_B$GpJRA!QE?c)PAo zit$5z+UV$*Fn?CzLnkd_a#yA{@z>Ylr^r(}Upl8QpK(2e-lPM2HR{}cdQRGU?}$YG zl(`md<@xn?p#7p8 z^1vs>63K1N3VOv@C>G*rj^LqvO9f`YvkWqlC&WS=WKVbOTM-;|UbM$1=vP86;0Q*P zQK`tb8rf-=UsRQfHvN2wlObd1#R+7MLD$g9Q68a%W2QCGTha|bX^@eA5cB_d0tpcT z