From 4605069564b6f72972cf99f68667f30b3b01826c Mon Sep 17 00:00:00 2001 From: "Peter (YM)" Date: Mon, 9 Sep 2024 07:47:55 +0000 Subject: [PATCH 1/2] thermal: update VSKIN-CHARGE v2 This version is based on the CHARGING HOTSPOT in following cases - Idle charging - Charging + workload (Modem RFFE / WiFi / CPU / Display ) - Non charging case (correlate charging hotspot) Bug: 362394314 Test: Build and Boot to home Flag: EXEMPT config update Change-Id: I5594cfaefa70b633a2344e9b3460007055f2db2f Signed-off-by: Peter (YM) --- thermal/thermal_info_config_charge_tegu.json | 23 +++++++++++++++----- thermal/thermal_info_config_tegu.json | 23 +++++++++++++++----- 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/thermal/thermal_info_config_charge_tegu.json b/thermal/thermal_info_config_charge_tegu.json index 74badb4..6c20d9f 100644 --- a/thermal/thermal_info_config_charge_tegu.json +++ b/thermal/thermal_info_config_charge_tegu.json @@ -83,20 +83,31 @@ "Hidden": true, "VirtualSensor": true, "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0, 0, -0.155, 0, 0, 0.503, 0, 0.559, 0], - "Offset": 2614, + "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm"], + "Coefficient": [0.094, 0.14, 0.162, 0.236, 0.282, 0.06, 0.115, 0.015], + "Offset": -4114.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm"], + "Coefficient": [0.106, 0.162, 0.169, 0.24, 0.086, 0.012, 0.189, 0.036], + "Offset": -971.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"1.0", + "Version":"2.0", "VirtualSensor":true, "TriggerSensor":"charging_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0"], - "Coefficient":[1.0], + "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"], + "Coefficient":[1.0, 1.0], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, diff --git a/thermal/thermal_info_config_tegu.json b/thermal/thermal_info_config_tegu.json index 22cf0a8..acfdaec 100644 --- a/thermal/thermal_info_config_tegu.json +++ b/thermal/thermal_info_config_tegu.json @@ -746,20 +746,31 @@ "Hidden": true, "VirtualSensor": true, "Formula": "WEIGHTED_AVG", - "Combination": ["north_therm", "soc_therm", "charging_therm", "disp_therm", "battery", "quiet_therm", "usb_pwr_therm", "rfpa_therm", "btmspkr_therm"], - "Coefficient": [0, 0, -0.155, 0, 0, 0.503, 0, 0.559, 0], - "Offset": 2614, + "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm"], + "Coefficient": [0.094, 0.14, 0.162, 0.236, 0.282, 0.06, 0.115, 0.015], + "Offset": -4114.0, + "Multiplier": 0.001 + }, + { + "Name": "VIRTUAL-SKIN-CHARGE-SUB-1", + "Type": "UNKNOWN", + "Hidden": true, + "VirtualSensor": true, + "Formula": "WEIGHTED_AVG", + "Combination": ["rfpa_therm", "quiet_therm", "charging_therm", "usb_pwr_therm", "btmspkr_therm", "disp_therm", "north_therm", "soc_therm"], + "Coefficient": [0.106, 0.162, 0.169, 0.24, 0.086, 0.012, 0.189, 0.036], + "Offset": -971.0, "Multiplier": 0.001 }, { "Name":"VIRTUAL-SKIN-CHARGE", "Type":"UNKNOWN", - "Version":"1.0", + "Version":"2.0", "VirtualSensor":true, "TriggerSensor":"charging_therm", "Formula":"MAXIMUM", - "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0"], - "Coefficient":[1.0], + "Combination":["VIRTUAL-SKIN-CHARGE-SUB-0", "VIRTUAL-SKIN-CHARGE-SUB-1"], + "Coefficient":[1.0, 1.0], "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, From a0b4ea8b52e64889400b2f4f34cecfb0f96999d3 Mon Sep 17 00:00:00 2001 From: Neo Yu Date: Mon, 16 Sep 2024 10:50:29 +0800 Subject: [PATCH 2/2] Enable radioext 2.0 and include gril_aidl.mk for tegu Bug: 283064367 Test: verify with test ROMs Flag: EXEMPT HAL interface change Change-Id: I032ae6a414e29df0dfbb5833d625425b8605f8b7 --- device-tegu.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/device-tegu.mk b/device-tegu.mk index 4546988..82d2c93 100644 --- a/device-tegu.mk +++ b/device-tegu.mk @@ -15,6 +15,8 @@ # SHIPPING_API_LEVEL := 34 +USES_RADIOEXT_V1_7 = false +USES_RADIOEXT_V2_0 = true ifdef RELEASE_GOOGLE_TEGU_RADIO_DIR RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_TEGU_RADIO_DIR) @@ -54,8 +56,7 @@ include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/gti/predump_gti.mk include device/google/gs-common/touch/syna/predump_syna20.mk -include device/google/gs-common/modem/radio_ext/radio_ext.mk -include device/google/gs-common/gril/hidl/1.7/gril_hidl.mk +include device/google/gs-common/gril/aidl/2.0/gril_aidl.mk include device/google/gs-common/esim/esim.mk # go/lyric-soong-variables