From 231a75f14a8a4fb471397dd363a2c7b909b8a683 Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Mon, 1 Aug 2022 15:16:20 +0800 Subject: [PATCH 01/26] uwb: support per device calibration for R4 Bug: 240199018 Test: Build pass Change-Id: I45512bba1e0821b4ba32a324aebc7e6b4ec15532 --- device-raven.mk | 1 - uwb/init.uwb.calib.xtal.sh | 26 ++++++++++++++++++++++++++ uwb/uwb_calibration.mk | 7 +++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 uwb/init.uwb.calib.xtal.sh diff --git a/device-raven.mk b/device-raven.mk index 53bbfcd..97fb567 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -41,7 +41,6 @@ include device/google/gs101/fingerprint/udfps_factory.mk endif ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) -include device/google/gs101/uwb/uwb.mk include device/google/raviole/uwb/uwb_calibration.mk endif diff --git a/uwb/init.uwb.calib.xtal.sh b/uwb/init.uwb.calib.xtal.sh new file mode 100644 index 0000000..1fcb876 --- /dev/null +++ b/uwb/init.uwb.calib.xtal.sh @@ -0,0 +1,26 @@ +#!/vendor/bin/sh +# only use xtal_trim from factory calibration +if [ -z "$2" ] +then + echo "usage is $0 input-calibration output_calibration" + exit 0 +fi +OUTPUT_CALIB="$2" +if [ ! -f "$OUTPUT_CALIB" ]; then + touch $OUTPUT_CALIB + chmod 0644 $OUTPUT_CALIB + file="$1" + while IFS=, read -r f1 f2 + do + case $f1 in + "UWB_cal_tx_xtal_reg_final_value") + if [ $((0x$f2)) -gt 63 ]; then + f2=63 + fi + echo 'xtal_trim=0x'$f2 >> $OUTPUT_CALIB + ;; + esac + done <"$file" + exit 0 +fi + diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index e29bea2..2661ad1 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -13,9 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. +# UWB - ultra wide band +$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk) + LOCAL_UWB_CAL_DIR=device/google/raviole/uwb PRODUCT_COPY_FILES += \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-unknown.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-default.conf \ + $(LOCAL_UWB_CAL_DIR)/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \ + +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.uwb.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.uwb.xml From 9ac564fbd01c885b15fbd96a46ec5b96602ee1d5 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 16 Aug 2022 03:26:17 +0000 Subject: [PATCH 02/26] Update oriole SVN to 38 Bug: 242323332 Change-Id: I6dff900e91090b39fc8ed13c935c1a3349be553b --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 5302e26..59a9d63 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -168,7 +168,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=37 + ro.vendor.build.svn=38 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From f045ccd24a1d1b9ffac0c0951b2f158258563b0b Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 16 Aug 2022 03:27:48 +0000 Subject: [PATCH 03/26] Update raven SVN to 38 Bug: 242323332 Change-Id: Ib18dd0e90128a5023d3956a6442747736464595f --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index d63decc..059ed83 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -178,7 +178,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=37 + ro.vendor.build.svn=38 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 17a8dde89ab81c31b56a564bdc42a60f307d5e00 Mon Sep 17 00:00:00 2001 From: Wei Wang Date: Wed, 3 Aug 2022 23:10:38 -0700 Subject: [PATCH 04/26] Remove FPS boost Bug: 241312961 Test: Build Change-Id: I5fbdc1063d2ac0c468d2a8c5b00293adac7d4179 Signed-off-by: Wei Wang --- powerhint-oriole.json | 7 +++---- powerhint-raven.json | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 52b054f..b3da82b 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -144,8 +144,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "1", - "55" + "1" ], "ResetOnInit": true }, @@ -1287,13 +1286,13 @@ "PowerHint": "REFRESH_90FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", diff --git a/powerhint-raven.json b/powerhint-raven.json index c06d670..ab0fc4e 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -143,8 +143,7 @@ "Path": "/proc/vendor_sched/ta_uclamp_min", "Values": [ "553", - "1", - "55" + "1" ], "ResetOnInit": true }, @@ -1279,13 +1278,13 @@ "PowerHint": "REFRESH_120FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "REFRESH_60FPS", "Node": "TAUClampBoost", "Duration": 0, - "Value": "55" + "Value": "1" }, { "PowerHint": "REFRESH_60FPS", From 6c2519cd60c01b45c2638db430b69af3319ac4cb Mon Sep 17 00:00:00 2001 From: David Chao Date: Mon, 15 Aug 2022 18:56:43 +0800 Subject: [PATCH 05/26] thermal: seperate thermal config for charging - Separate thermal config for charger mode and remove the unused thermal throttling. Bug: 240897207 Test: usbc overheating protection and charging throttling worked properly in charger. Change-Id: I63d951575bbd5d5e1ff676fde061f98b0a607881 --- device-oriole.mk | 1 + device-raven.mk | 3 +- thermal_info_config_charge_oriole.json | 483 ++++++++++++++++++++++++ thermal_info_config_charge_raven.json | 499 +++++++++++++++++++++++++ 4 files changed, 985 insertions(+), 1 deletion(-) create mode 100644 thermal_info_config_charge_oriole.json create mode 100644 thermal_info_config_charge_raven.json diff --git a/device-oriole.mk b/device-oriole.mk index 5caee88..0c28cc1 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -60,6 +60,7 @@ PRODUCT_COPY_FILES += \ # Thermal Config PRODUCT_COPY_FILES += \ device/google/raviole/thermal_info_config_oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ + device/google/raviole/thermal_info_config_charge_oriole.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json \ device/google/raviole/thermal_info_config_oriole_WHI_A.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_WHI_A.json # Power HAL config diff --git a/device-raven.mk b/device-raven.mk index 28c0ef8..40a8dc6 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -67,7 +67,8 @@ PRODUCT_COPY_FILES += \ # Thermal Config PRODUCT_COPY_FILES += \ - device/google/raviole/thermal_info_config_raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json + device/google/raviole/thermal_info_config_raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \ + device/google/raviole/thermal_info_config_charge_raven.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config_charge.json # Power HAL config PRODUCT_COPY_FILES += \ diff --git a/thermal_info_config_charge_oriole.json b/thermal_info_config_charge_oriole.json new file mode 100644 index 0000000..280dd33 --- /dev/null +++ b/thermal_info_config_charge_oriole.json @@ -0,0 +1,483 @@ +{ + "Sensors":[ + { + "Name":"battery", + "Type":"BATTERY", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "60.0" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"gnss_tcxo_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"qi_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"usb_pwr_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"usb_pwr_therm2", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "35.0", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"quiet_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "32.9", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"VIRTUAL-QI-GNSS", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "qi_therm", + "gnss_tcxo_therm" + ], + "Coefficient":[ + "0.25", + "0.75" + ], + "Offset":-4500, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-QI-BATT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "qi_therm", + "battery" + ], + "Coefficient":[ + "0.22", + "0.78" + ], + "Offset":-500, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB2-DISP", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "disp_therm" + ], + "Coefficient":[ + "0.16", + "0.84" + ], + "Offset":1500, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-QUIET-BATT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "quiet_therm", + "battery" + ], + "Coefficient":[ + "2.15", + "-1.15" + ], + "Offset":-2000, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":[ + "VIRTUAL-QI-GNSS", + "VIRTUAL-QI-BATT", + "VIRTUAL-USB2-DISP", + "VIRTUAL-QUIET-BATT" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0", + "1.0" + ], + "HotThreshold":[ + "NAN", + "39.0", + "41.0", + "43.0", + "45.0", + "47.0", + "55.0" + ], + "HotHysteresis":[ + 0.0, + 1.9, + 1.9, + 1.9, + 1.9, + 1.9, + 1.9 + ], + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "fcc", + "LimitInfo": [0, 2, 3, 3, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 0, 2, 2, 4 ,4 ,4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "dc_icl", + "LimitInfo": [0, 1, 2, 3, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 4, 4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "wlc_fcc", + "LimitInfo": [0, 2, 2, 4, 5, 5, 5], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 0, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 1, 2, 5, 5, 5], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + } + ] + }, + { + "Name":"USB2-MINUS-USB", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "usb_pwr_therm" + ], + "Coefficient":[ + "1.0", + "-1.0" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"USB2-MINUS-QI", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "qi_therm" + ], + "Coefficient":[ + "1.0", + "-1.0" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB-THROTTLING", + "Type":"USB_PORT", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "usb_pwr_therm2", + "Combination":[ + "usb_pwr_therm2", + "USB2-MINUS-USB", + "USB2-MINUS-QI" + ], + "Coefficient":[ + "35000", + "2000", + "10000" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "3.0", + "NAN", + "NAN" + ], + "BindedCdevInfo": [ + { + "CdevRequest": "usbc-port", + "LimitInfo": [0, 0, 0, 0, 1, 1, 1] + } + ], + "VrThreshold":"NAN", + "Multiplier":1, + "PollingDelay":60000, + "PassiveDelay":7000 + } + ], + "CoolingDevices":[ + { + "Name":"fcc", + "Type":"BATTERY" + }, + { + "Name":"dc_icl", + "Type":"BATTERY" + }, + { + "Name":"wlc_fcc", + "Type":"BATTERY" + }, + { + "Name":"usbc-port", + "Type":"BATTERY" + } + ], + "PowerRails":[ + { + "Name":"PPVAR_VSYS_PWR_DISP" + }, + { + "Name":"VSYS_PWR_MODEM" + }, + { + "Name":"S2M_VDD_CPUCL2", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + + }, + { + "Name":"S3M_VDD_CPUCL1", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S4M_VDD_CPUCL0", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S5M_VDD_INT" + }, + { + "Name":"S1M_VDD_MIF" + }, + { + "Name":"S2S_VDD_G3D", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"POWER_FOR_CHARGING_THROTTLING", + "VirtualRails":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "VSYS_PWR_MODEM", + "S2M_VDD_CPUCL2", + "S3M_VDD_CPUCL1", + "S4M_VDD_CPUCL0", + "S5M_VDD_INT", + "S1M_VDD_MIF", + "S2S_VDD_G3D" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0" + ], + "PowerSampleDelay":14000, + "PowerSampleCount":5 + } + ] +} diff --git a/thermal_info_config_charge_raven.json b/thermal_info_config_charge_raven.json new file mode 100644 index 0000000..411383b --- /dev/null +++ b/thermal_info_config_charge_raven.json @@ -0,0 +1,499 @@ +{ + "Sensors":[ + { + "Name":"battery", + "Type":"BATTERY", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "60.0" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"neutral_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"gnss_tcxo_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"qi_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"quiet_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "32.2", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"usb_pwr_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"usb_pwr_therm2", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "40.0", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "HotHysteresis":[ + 0.0, + 0.9, + 0.0, + 0.0, + 0.0, + 0.0, + 0.0 + ], + "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":60000, + "PassiveDelay":7000 + }, + { + "Name":"disp_therm", + "Type":"UNKNOWN", + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp", + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-NEUTRAL-QI", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "neutral_therm", + "qi_therm" + ], + "Coefficient":[ + "0.6", + "0.4" + ], + "Offset":-3000, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB2-BATT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "battery" + ], + "Coefficient":[ + "0.05", + "0.95" + ], + "Offset":1000, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-GNSS-BATT", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "gnss_tcxo_therm", + "battery" + ], + "Coefficient":[ + "0.50", + "0.50" + ], + "Offset":1500, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-QI-DISP", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "qi_therm", + "disp_therm" + ], + "Coefficient":[ + "0.15", + "0.85" + ], + "Offset":2000, + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-SKIN-CHARGE", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "TriggerSensor":"quiet_therm", + "Formula":"MAXIMUM", + "Combination":[ + "VIRTUAL-NEUTRAL-QI", + "VIRTUAL-USB2-BATT", + "VIRTUAL-GNSS-BATT", + "VIRTUAL-QI-DISP" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0", + "1.0" + ], + "HotThreshold":[ + "NAN", + "39.0", + "41.0", + "43.0", + "45.0", + "47.0", + "55.0" + ], + "HotHysteresis":[ + 0.0, + 1.9, + 1.9, + 1.9, + 1.9, + 1.9, + 1.9 + ], + "VrThreshold":"NAN", + "Multiplier":0.001, + "PollingDelay":300000, + "PassiveDelay":7000, + "BindedCdevInfo": [ + { + "CdevRequest": "fcc", + "LimitInfo": [0, 2, 3, 3, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], + "CdevFloorWithPowerLink": [0, 0, 2, 2, 3 ,4 ,4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "dc_icl", + "LimitInfo": [0, 1, 2, 3, 4, 4, 4], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 2, 3, 3, 4, 4], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + }, + { + "CdevRequest": "wlc_fcc", + "LimitInfo": [0, 3, 3, 4, 5, 5, 5], + "BindedPowerRail": "POWER_FOR_CHARGING_THROTTLING", + "PowerThreshold": [500, 500, 500, 500, 500, 0, 0], + "CdevFloorWithPowerLink": [0, 1, 2, 3, 4, 5, 5], + "ReleaseLogic": "RELEASE_TO_FLOOR", + "ThrottlingWithPowerLink":true + } + ] + }, + { + "Name":"USB2-MINUS-USB", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "usb_pwr_therm" + ], + "Coefficient":[ + "1.0", + "-1.0" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"USB2-MINUS-QI", + "Type":"UNKNOWN", + "Hidden":true, + "VirtualSensor":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "usb_pwr_therm2", + "qi_therm" + ], + "Coefficient":[ + "1.0", + "-1.0" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN", + "NAN" + ], + "VrThreshold":"NAN", + "Multiplier":0.001 + }, + { + "Name":"VIRTUAL-USB-THROTTLING", + "Type":"USB_PORT", + "Hidden":true, + "VirtualSensor":true, + "Formula":"COUNT_THRESHOLD", + "TriggerSensor": "usb_pwr_therm2", + "Combination":[ + "usb_pwr_therm2", + "USB2-MINUS-USB", + "USB2-MINUS-QI" + ], + "Coefficient":[ + "40000", + "4500", + "9000" + ], + "HotThreshold":[ + "NAN", + "NAN", + "NAN", + "NAN", + "3.0", + "NAN", + "NAN" + ], + "BindedCdevInfo": [ + { + "CdevRequest": "usbc-port", + "LimitInfo": [0, 0, 0, 0, 1, 1, 1] + } + ], + "VrThreshold":"NAN", + "Multiplier":1, + "PollingDelay":60000, + "PassiveDelay":7000 + } + ], + "CoolingDevices":[ + { + "Name":"fcc", + "Type":"BATTERY" + }, + { + "Name":"dc_icl", + "Type":"BATTERY" + }, + { + "Name":"wlc_fcc", + "Type":"BATTERY" + }, + { + "Name":"usbc-port", + "Type":"BATTERY" + } + ], + "PowerRails":[ + { + "Name":"PPVAR_VSYS_PWR_DISP" + }, + { + "Name":"VSYS_PWR_MODEM" + }, + { + "Name":"S2M_VDD_CPUCL2", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + + }, + { + "Name":"S3M_VDD_CPUCL1", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S4M_VDD_CPUCL0", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"S5M_VDD_INT" + }, + { + "Name":"S1M_VDD_MIF" + }, + { + "Name":"S2S_VDD_G3D", + "PowerSampleDelay":14000, + "PowerSampleCount":5 + }, + { + "Name":"POWER_FOR_CHARGING_THROTTLING", + "VirtualRails":true, + "Formula":"WEIGHTED_AVG", + "Combination":[ + "VSYS_PWR_MODEM", + "S2M_VDD_CPUCL2", + "S3M_VDD_CPUCL1", + "S4M_VDD_CPUCL0", + "S5M_VDD_INT", + "S1M_VDD_MIF", + "S2S_VDD_G3D" + ], + "Coefficient":[ + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0", + "1.0" + ], + "PowerSampleDelay":14000, + "PowerSampleCount":5 + } + ] +} From e756c1ac0b9b66cb7d57ccfed5c33ec0317140f8 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 23 Aug 2022 17:47:08 +0000 Subject: [PATCH 06/26] Update raven SVN to 39 Bug: 242323332 Change-Id: Ie2fa1633ae2638688993ee8b58148b4f48b85dc8 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 059ed83..d6e54e7 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -178,7 +178,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=38 + ro.vendor.build.svn=39 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From c9c61f444fb3a9fc7b4fa227874aea5c677122e9 Mon Sep 17 00:00:00 2001 From: Matt Buckley Date: Wed, 10 Aug 2022 18:59:17 +0000 Subject: [PATCH 07/26] Enable ADPF CPU hints for SF Allow these devices to send CPU hints to PowerHAL from SF to reduce drops and save power. Bug: 195990840 Test: manual Change-Id: I915bf64a669c176e53542752760f21e3a696a57b Merged-In: I915bf64a669c176e53542752760f21e3a696a57b (cherry picked from commit 0f365e08b67aefc8519f224561ef4530460ad4b9) --- conf/init.raviole.rc | 8 ++++++++ device-oriole.mk | 4 ++++ device-raven.mk | 4 ++++ powerhint-oriole.json | 22 ---------------------- powerhint-raven.json | 28 ---------------------------- 5 files changed, 16 insertions(+), 50 deletions(-) diff --git a/conf/init.raviole.rc b/conf/init.raviole.rc index 31ff159..1437c49 100644 --- a/conf/init.raviole.rc +++ b/conf/init.raviole.rc @@ -66,3 +66,11 @@ on property:persist.vendor.se.ese2.mode=ctsmode on property:sys.retaildemo.enabled=1 setprop persist.vendor.charge.stop.level 35 setprop persist.vendor.charge.start.level 30 + +# Override SF and RE uclamps to 0 on boot after being set elsewhere, for adpf cpu hints +on property:sys.boot_completed=1 + trigger override-sf-uclamp + +on override-sf-uclamp + write /proc/vendor_sched/rt_uclamp_min 0 + write /proc/vendor_sched/sf_uclamp_min 0 diff --git a/device-oriole.mk b/device-oriole.mk index 0c28cc1..0fccfe3 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -259,3 +259,7 @@ PRODUCT_COPY_FILES := \ $(PRODUCT_COPY_FILES) PRODUCT_RESTRICT_VENDOR_FILES := false + +# Enable adpf cpu hint session for SurfaceFlinger +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + debug.sf.enable_adpf_cpu_hint=true diff --git a/device-raven.mk b/device-raven.mk index 40a8dc6..466e07a 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -272,3 +272,7 @@ PRODUCT_COPY_FILES := \ $(PRODUCT_COPY_FILES) PRODUCT_RESTRICT_VENDOR_FILES := false + +# Enable adpf cpu hint session for SurfaceFlinger +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + debug.sf.enable_adpf_cpu_hint=true diff --git a/powerhint-oriole.json b/powerhint-oriole.json index b3da82b..3df86a4 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -157,16 +157,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "161", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -484,12 +474,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -508,12 +492,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-raven.json b/powerhint-raven.json index ab0fc4e..d3bd49c 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -156,16 +156,6 @@ ], "ResetOnInit": true }, - { - "Name": "SFUClampBoost", - "Path": "/proc/vendor_sched/sf_uclamp_min", - "Values": [ - "161", - "85", - "39" - ], - "ResetOnInit": true - }, { "Name": "MLUclampBoost", "Path": "/proc/vendor_sched/nnapi_uclamp_min", @@ -483,12 +473,6 @@ } ], "Actions": [ - { - "PowerHint": "INTERACTION", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "UClampThreshold", @@ -501,12 +485,6 @@ "Duration": 5000, "Value": "0" }, - { - "PowerHint": "LAUNCH_120FPS", - "Node": "SFUClampBoost", - "Duration": 1000, - "Value": "161" - }, { "PowerHint": "LAUNCH", "Node": "FGPreferIdle", @@ -518,12 +496,6 @@ "Type": "DoHint", "Value": "LAUNCH_120FPS" }, - { - "PowerHint": "LAUNCH", - "Node": "SFUClampBoost", - "Duration": 5000, - "Value": "85" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", From 73f513b4c7421681178d8eb473e680701c6c8d28 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Tue, 23 Aug 2022 17:45:47 +0000 Subject: [PATCH 08/26] Update oriole SVN to 39 Bug: 242323332 Change-Id: I52d214c492b7dc2ee2699b248cac0b8e67bfc996 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 59a9d63..aa541dc 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -168,7 +168,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=38 + ro.vendor.build.svn=39 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From faeed09cb525bb4d566c07135fec0f9e65eaf516 Mon Sep 17 00:00:00 2001 From: Yang Qi Date: Tue, 23 Aug 2022 22:15:41 +0000 Subject: [PATCH 09/26] calibration: update CCC minimum system offset for raven Change the value to wait on the get session state and start command on SE side to an optimal value after tuning Bug: 237644730 Test: see b/237644730 Change-Id: Id5c743e71008c414398afb8750d2adafedee9a04 --- uwb/UWB-calibration.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index e8061b2..061fed9 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -134,7 +134,7 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0 -[HAL]minimum_system_offset_uwbtime0=500 +[HAL]minimum_system_offset_uwbtime0=120 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 From b47b3032b1ed6dc9d43ae0fe2b1927f9054464d2 Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Mon, 1 Aug 2022 15:14:30 +0800 Subject: [PATCH 10/26] uwb: update country configs for R4 Bug: 240199018 Test: Build pass Signed-off-by: Rex Lin Change-Id: Ief481c3f14dbce4c3d8a65d12960f4a76dd9d3f6 --- uwb/Android.mk | 26 ++++ uwb/UWB-calibration-ce.conf | 141 ++++++++++++++++++ uwb/UWB-calibration-default.conf | 141 ++++++++++++++++++ uwb/UWB-calibration-fcc.conf | 141 ++++++++++++++++++ ...libration.conf => UWB-calibration-jp.conf} | 99 ++++++------ uwb/UWB-calibration-restricted.conf | 141 ++++++++++++++++++ uwb/UWB-calibration-tw.conf | 141 ++++++++++++++++++ uwb/country_conf_gen.sh | 31 ++++ uwb/uwb_calibration.mk | 6 +- uwb/uwb_country.conf | 62 ++++++++ 10 files changed, 877 insertions(+), 52 deletions(-) create mode 100644 uwb/Android.mk create mode 100644 uwb/UWB-calibration-ce.conf create mode 100644 uwb/UWB-calibration-default.conf create mode 100644 uwb/UWB-calibration-fcc.conf rename uwb/{UWB-calibration.conf => UWB-calibration-jp.conf} (70%) create mode 100644 uwb/UWB-calibration-restricted.conf create mode 100644 uwb/UWB-calibration-tw.conf create mode 100755 uwb/country_conf_gen.sh create mode 100644 uwb/uwb_country.conf diff --git a/uwb/Android.mk b/uwb/Android.mk new file mode 100644 index 0000000..3a1cac4 --- /dev/null +++ b/uwb/Android.mk @@ -0,0 +1,26 @@ + +# +# Copyright (C) 2022 The Android Open-Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# WARNING: Everything listed here will be built on ALL platforms, +# including x86, the universal, and the SDK. Modules must be uniquely +# named (liblights.panda), and must build everywhere, or limit themselves +# to only building on ARM if they include assembly. Individual makefiles +# are responsible for having their own logic, for fine-grained control. +LOCAL_PATH:= $(call my-dir) +LOCAL_UWB_CAL_DIR=$(LOCAL_PATH) +DEVICE_UWB_CAL_DIR=$(TARGET_OUT_VENDOR)/etc/uwb +$(shell ($(LOCAL_UWB_CAL_DIR)/country_conf_gen.sh $(LOCAL_UWB_CAL_DIR) $(DEVICE_UWB_CAL_DIR))) + diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf new file mode 100644 index 0000000..1117a6a --- /dev/null +++ b/uwb/UWB-calibration-ce.conf @@ -0,0 +1,141 @@ +[CCC]version=2 +[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 +[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 +[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch5.prf64.pdoa_offset=0 +[CCC]ant0.ch9.prf64.pdoa_offset=0 +[CCC]ant0.ch5.prf64.pll_locking_code=0 +[CCC]ant0.ch9.prf64.pll_locking_code=0 +[CCC]id=0 +[CCC]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +ant0.ch5.prf16.ant_delay=16414 +ant0.ch5.prf16.tx_power=0x4B4B234B +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x34 +ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.tx_power=0x4B4B234B +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x34 +ant0.ch9.prf16.ant_delay=16426 +ant0.ch9.prf16.tx_power=0x53532B53 +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x34 +ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.tx_power=0x53532B53 +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x34 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16446 +ant1.ch5.prf16.tx_power=0x6B6B336B +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x34 +ant1.ch5.prf64.ant_delay=16446 +ant1.ch5.prf64.tx_power=0x6B6B336B +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x34 +ant1.ch9.prf16.ant_delay=16429 +ant1.ch9.prf16.tx_power=0 +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0 +ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.tx_power=0 +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16446 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16446 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16429 +ant2.ch9.prf16.tx_power=0x47472347 +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x34 +ant2.ch9.prf64.ant_delay=16429 +ant2.ch9.prf64.tx_power=0x47472347 +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x34 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16446 +ant3.ch5.prf16.tx_power=0 +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16446 +ant3.ch5.prf64.tx_power=0 +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16429 +ant3.ch9.prf16.tx_power=0x47472347 +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0x34 +ant3.ch9.prf64.ant_delay=16429 +ant3.ch9.prf64.tx_power=0x47472347 +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0x34 +ant3.port=1 +ant3.selector_gpio=6 +ant3.selector_gpio_value=1 +ant0.ant1.ch5.pdoa_offset=0 +ant0.ant1.ch9.pdoa_offset=0 +ant0.ant2.ch5.pdoa_offset=0 +ant0.ant2.ch9.pdoa_offset=0 +ant1.ant2.ch5.pdoa_offset=0 +ant1.ant2.ch9.pdoa_offset=0 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=-4710 +ant1.ant3.ch9.pdoa_offset=-6144 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant3.ch5.pdoa_lut=e1:f2:85:f5:ae:f3:3d:f6:52:f4:f6:f6:8f:f4:9a:f7:48:f5:52:f8:d7:f5:0a:f9:66:f6:ae:f9:85:f7:66:fa:8f:f8:1f:fb:48:f9:d7:fb:8f:fa:7b:fc:ec:fb:33:fd:0a:fd:ec:fd:66:fe:a4:fe:00:00:48:ff:71:01:00:00:b8:02:b8:00:29:04:64:01:ae:05:19:02:85:07:cb:02:33:09:7d:03:f6:0a:2f:04:0a:0d:e3:04:cd:0e:96:05:14:10:48:06:71:11:fa:06:66:12:ac:07:33:13:60:08:3d:14:12:09:85:15:c5:09:ec:15:77:0a +ant1.ant3.ch9.pdoa_lut=e1:ec:f6:f6:48:ed:3d:f6:85:ed:85:f5:14:ee:9a:f7:3d:ee:52:f8:e1:ee:0a:f9:3d:f0:ae:f9:85:f1:66:fa:85:f3:1f:fb:00:f6:d7:fb:9a:f7:7b:fc:14:fa:33:fd:ec:fb:ec:fd:71:fd:a4:fe:cd:fe:48:ff:a4:00:00:00:85:01:b8:00:7b:02:5c:01:d7:03:14:02:cd:04:cd:02:48:07:85:03:ae:09:29:04:e1:0c:e1:04:7b:10:9a:05:cd:12:52:06:f6:14:f6:06:a4:16:ae:07:ae:17:0a:09:d7:17:c3:09:52:18:66:08:7b:18:7b:0a +xtal_trim=31 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +restricted_channels=0 +[HAL]aoa_capability=1 +[HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 +[HAL]minimum_system_offset_uwbtime0=120 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf new file mode 100644 index 0000000..b08a0f4 --- /dev/null +++ b/uwb/UWB-calibration-default.conf @@ -0,0 +1,141 @@ +[CCC]version=2 +[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 +[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 +[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch5.prf64.pdoa_offset=0 +[CCC]ant0.ch9.prf64.pdoa_offset=0 +[CCC]ant0.ch5.prf64.pll_locking_code=0 +[CCC]ant0.ch9.prf64.pll_locking_code=0 +[CCC]id=0 +[CCC]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +ant0.ch5.prf16.ant_delay=16414 +ant0.ch5.prf16.tx_power=0x47472347 +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x34 +ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.tx_power=0x47472347 +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x34 +ant0.ch9.prf16.ant_delay=16426 +ant0.ch9.prf16.tx_power=0x47472347 +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x34 +ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.tx_power=0x47472347 +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x34 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16446 +ant1.ch5.prf16.tx_power=0x5B5B2B5B +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x20 +ant1.ch5.prf64.ant_delay=16446 +ant1.ch5.prf64.tx_power=0x5B5B2B5B +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x20 +ant1.ch9.prf16.ant_delay=16429 +ant1.ch9.prf16.tx_power=0 +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0 +ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.tx_power=0 +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16446 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16446 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16429 +ant2.ch9.prf16.tx_power=0x5F5F2F5F +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x26 +ant2.ch9.prf64.ant_delay=16429 +ant2.ch9.prf64.tx_power=0x5F5F2F5F +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x26 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16446 +ant3.ch5.prf16.tx_power=0 +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16446 +ant3.ch5.prf64.tx_power=0 +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16429 +ant3.ch9.prf16.tx_power=0x5F5F2F5F +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0x26 +ant3.ch9.prf64.ant_delay=16429 +ant3.ch9.prf64.tx_power=0x5F5F2F5F +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0x26 +ant3.port=1 +ant3.selector_gpio=6 +ant3.selector_gpio_value=1 +ant0.ant1.ch5.pdoa_offset=0 +ant0.ant1.ch9.pdoa_offset=0 +ant0.ant2.ch5.pdoa_offset=0 +ant0.ant2.ch9.pdoa_offset=0 +ant1.ant2.ch5.pdoa_offset=0 +ant1.ant2.ch9.pdoa_offset=0 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=-4710 +ant1.ant3.ch9.pdoa_offset=-6144 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant3.ch5.pdoa_lut=e1:f2:85:f5:ae:f3:3d:f6:52:f4:f6:f6:8f:f4:9a:f7:48:f5:52:f8:d7:f5:0a:f9:66:f6:ae:f9:85:f7:66:fa:8f:f8:1f:fb:48:f9:d7:fb:8f:fa:7b:fc:ec:fb:33:fd:0a:fd:ec:fd:66:fe:a4:fe:00:00:48:ff:71:01:00:00:b8:02:b8:00:29:04:64:01:ae:05:19:02:85:07:cb:02:33:09:7d:03:f6:0a:2f:04:0a:0d:e3:04:cd:0e:96:05:14:10:48:06:71:11:fa:06:66:12:ac:07:33:13:60:08:3d:14:12:09:85:15:c5:09:ec:15:77:0a +ant1.ant3.ch9.pdoa_lut=e1:ec:f6:f6:48:ed:3d:f6:85:ed:85:f5:14:ee:9a:f7:3d:ee:52:f8:e1:ee:0a:f9:3d:f0:ae:f9:85:f1:66:fa:85:f3:1f:fb:00:f6:d7:fb:9a:f7:7b:fc:14:fa:33:fd:ec:fb:ec:fd:71:fd:a4:fe:cd:fe:48:ff:a4:00:00:00:85:01:b8:00:7b:02:5c:01:d7:03:14:02:cd:04:cd:02:48:07:85:03:ae:09:29:04:e1:0c:e1:04:7b:10:9a:05:cd:12:52:06:f6:14:f6:06:a4:16:ae:07:ae:17:0a:09:d7:17:c3:09:52:18:66:08:7b:18:7b:0a +xtal_trim=31 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +restricted_channels=0 +[HAL]aoa_capability=1 +[HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 +[HAL]minimum_system_offset_uwbtime0=120 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf new file mode 100644 index 0000000..b08a0f4 --- /dev/null +++ b/uwb/UWB-calibration-fcc.conf @@ -0,0 +1,141 @@ +[CCC]version=2 +[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 +[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 +[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch5.prf64.pdoa_offset=0 +[CCC]ant0.ch9.prf64.pdoa_offset=0 +[CCC]ant0.ch5.prf64.pll_locking_code=0 +[CCC]ant0.ch9.prf64.pll_locking_code=0 +[CCC]id=0 +[CCC]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +ant0.ch5.prf16.ant_delay=16414 +ant0.ch5.prf16.tx_power=0x47472347 +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x34 +ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.tx_power=0x47472347 +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x34 +ant0.ch9.prf16.ant_delay=16426 +ant0.ch9.prf16.tx_power=0x47472347 +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x34 +ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.tx_power=0x47472347 +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x34 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16446 +ant1.ch5.prf16.tx_power=0x5B5B2B5B +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x20 +ant1.ch5.prf64.ant_delay=16446 +ant1.ch5.prf64.tx_power=0x5B5B2B5B +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x20 +ant1.ch9.prf16.ant_delay=16429 +ant1.ch9.prf16.tx_power=0 +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0 +ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.tx_power=0 +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16446 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16446 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16429 +ant2.ch9.prf16.tx_power=0x5F5F2F5F +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x26 +ant2.ch9.prf64.ant_delay=16429 +ant2.ch9.prf64.tx_power=0x5F5F2F5F +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x26 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16446 +ant3.ch5.prf16.tx_power=0 +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16446 +ant3.ch5.prf64.tx_power=0 +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16429 +ant3.ch9.prf16.tx_power=0x5F5F2F5F +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0x26 +ant3.ch9.prf64.ant_delay=16429 +ant3.ch9.prf64.tx_power=0x5F5F2F5F +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0x26 +ant3.port=1 +ant3.selector_gpio=6 +ant3.selector_gpio_value=1 +ant0.ant1.ch5.pdoa_offset=0 +ant0.ant1.ch9.pdoa_offset=0 +ant0.ant2.ch5.pdoa_offset=0 +ant0.ant2.ch9.pdoa_offset=0 +ant1.ant2.ch5.pdoa_offset=0 +ant1.ant2.ch9.pdoa_offset=0 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=-4710 +ant1.ant3.ch9.pdoa_offset=-6144 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant3.ch5.pdoa_lut=e1:f2:85:f5:ae:f3:3d:f6:52:f4:f6:f6:8f:f4:9a:f7:48:f5:52:f8:d7:f5:0a:f9:66:f6:ae:f9:85:f7:66:fa:8f:f8:1f:fb:48:f9:d7:fb:8f:fa:7b:fc:ec:fb:33:fd:0a:fd:ec:fd:66:fe:a4:fe:00:00:48:ff:71:01:00:00:b8:02:b8:00:29:04:64:01:ae:05:19:02:85:07:cb:02:33:09:7d:03:f6:0a:2f:04:0a:0d:e3:04:cd:0e:96:05:14:10:48:06:71:11:fa:06:66:12:ac:07:33:13:60:08:3d:14:12:09:85:15:c5:09:ec:15:77:0a +ant1.ant3.ch9.pdoa_lut=e1:ec:f6:f6:48:ed:3d:f6:85:ed:85:f5:14:ee:9a:f7:3d:ee:52:f8:e1:ee:0a:f9:3d:f0:ae:f9:85:f1:66:fa:85:f3:1f:fb:00:f6:d7:fb:9a:f7:7b:fc:14:fa:33:fd:ec:fb:ec:fd:71:fd:a4:fe:cd:fe:48:ff:a4:00:00:00:85:01:b8:00:7b:02:5c:01:d7:03:14:02:cd:04:cd:02:48:07:85:03:ae:09:29:04:e1:0c:e1:04:7b:10:9a:05:cd:12:52:06:f6:14:f6:06:a4:16:ae:07:ae:17:0a:09:d7:17:c3:09:52:18:66:08:7b:18:7b:0a +xtal_trim=31 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +restricted_channels=0 +[HAL]aoa_capability=1 +[HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 +[HAL]minimum_system_offset_uwbtime0=120 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration-jp.conf similarity index 70% rename from uwb/UWB-calibration.conf rename to uwb/UWB-calibration-jp.conf index 061fed9..6b5dd3f 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration-jp.conf @@ -12,79 +12,79 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16450 -ant0.ch5.prf16.tx_power=0x4E4E4E4E +ant0.ch5.prf16.ant_delay=16414 +ant0.ch5.prf16.tx_power=0 ant0.ch5.prf16.pg_count=0 -ant0.ch5.prf16.pg_delay=0x26 -ant0.ch5.prf64.ant_delay=16450 -ant0.ch5.prf64.tx_power=0x4E4E4E4E +ant0.ch5.prf16.pg_delay=0 +ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.tx_power=0 ant0.ch5.prf64.pg_count=0 -ant0.ch5.prf64.pg_delay=0x26 -ant0.ch9.prf16.ant_delay=16410 -ant0.ch9.prf16.tx_power=0x56565656 +ant0.ch5.prf64.pg_delay=0 +ant0.ch9.prf16.ant_delay=16426 +ant0.ch9.prf16.tx_power=0x2A2A2A2A ant0.ch9.prf16.pg_count=0 -ant0.ch9.prf16.pg_delay=0x26 -ant0.ch9.prf64.ant_delay=16410 -ant0.ch9.prf64.tx_power=0x56565656 +ant0.ch9.prf16.pg_delay=0x20 +ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.tx_power=0x2A2A2A2A ant0.ch9.prf64.pg_count=0 -ant0.ch9.prf64.pg_delay=0x26 +ant0.ch9.prf64.pg_delay=0x20 ant0.port=0 ant0.selector_gpio=7 ant0.selector_gpio_value=0 -ant1.ch5.prf16.ant_delay=16450 -ant1.ch5.prf16.tx_power=0x4E4E4E4E +ant1.ch5.prf16.ant_delay=16446 +ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 -ant1.ch5.prf16.pg_delay=0x26 -ant1.ch5.prf64.ant_delay=16450 -ant1.ch5.prf64.tx_power=0x4E4E4E4E +ant1.ch5.prf16.pg_delay=0 +ant1.ch5.prf64.ant_delay=16446 +ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 -ant1.ch5.prf64.pg_delay=0x26 -ant1.ch9.prf16.ant_delay=16410 -ant1.ch9.prf16.tx_power=0x56565656 +ant1.ch5.prf64.pg_delay=0 +ant1.ch9.prf16.ant_delay=16429 +ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 -ant1.ch9.prf16.pg_delay=0x26 -ant1.ch9.prf64.ant_delay=16410 -ant1.ch9.prf64.tx_power=0x56565656 +ant1.ch9.prf16.pg_delay=0 +ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.tx_power=0 ant1.ch9.prf64.pg_count=0 -ant1.ch9.prf64.pg_delay=0x26 +ant1.ch9.prf64.pg_delay=0 ant1.port=0 ant1.selector_gpio=7 ant1.selector_gpio_value=1 -ant2.ch5.prf16.ant_delay=16450 -ant2.ch5.prf16.tx_power=0x4E4E4E4E +ant2.ch5.prf16.ant_delay=16446 +ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 -ant2.ch5.prf16.pg_delay=0x26 -ant2.ch5.prf64.ant_delay=16450 -ant2.ch5.prf64.tx_power=0x4E4E4E4E +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16446 +ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 -ant2.ch5.prf64.pg_delay=0x26 -ant2.ch9.prf16.ant_delay=16410 -ant2.ch9.prf16.tx_power=0x56565656 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16429 +ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 -ant2.ch9.prf16.pg_delay=0x26 -ant2.ch9.prf64.ant_delay=16410 -ant2.ch9.prf64.tx_power=0x56565656 +ant2.ch9.prf16.pg_delay=0 +ant2.ch9.prf64.ant_delay=16429 +ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 -ant2.ch9.prf64.pg_delay=0x26 +ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16450 -ant3.ch5.prf16.tx_power=0x4E4E4E4E +ant3.ch5.prf16.ant_delay=16446 +ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 -ant3.ch5.prf16.pg_delay=0x26 -ant3.ch5.prf64.ant_delay=16450 -ant3.ch5.prf64.tx_power=0x4E4E4E4E +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16446 +ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 -ant3.ch5.prf64.pg_delay=0x26 -ant3.ch9.prf16.ant_delay=16410 -ant3.ch9.prf16.tx_power=0x56565656 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16429 +ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 -ant3.ch9.prf16.pg_delay=0x26 -ant3.ch9.prf64.ant_delay=16410 -ant3.ch9.prf64.tx_power=0x56565656 +ant3.ch9.prf16.pg_delay=0 +ant3.ch9.prf64.ant_delay=16429 +ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 -ant3.ch9.prf64.pg_delay=0x26 +ant3.ch9.prf64.pg_delay=0 ant3.port=1 ant3.selector_gpio=6 ant3.selector_gpio_value=1 @@ -108,7 +108,8 @@ xtal_trim=31 temperature_reference=85 smart_tx_power=1 auto_sleep_margin=20000 -restricted_channels=0 +alternate_pulse_shape=0x01 +restricted_channels=0x20 [HAL]aoa_capability=1 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf new file mode 100644 index 0000000..14552c3 --- /dev/null +++ b/uwb/UWB-calibration-restricted.conf @@ -0,0 +1,141 @@ +[CCC]version=2 +[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 +[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 +[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch5.prf64.pdoa_offset=0 +[CCC]ant0.ch9.prf64.pdoa_offset=0 +[CCC]ant0.ch5.prf64.pll_locking_code=0 +[CCC]ant0.ch9.prf64.pll_locking_code=0 +[CCC]id=0 +[CCC]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +ant0.ch5.prf16.ant_delay=16414 +ant0.ch5.prf16.tx_power=0x47472347 +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x34 +ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.tx_power=0x47472347 +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x34 +ant0.ch9.prf16.ant_delay=16426 +ant0.ch9.prf16.tx_power=0x47472347 +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x34 +ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.tx_power=0x47472347 +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x34 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16446 +ant1.ch5.prf16.tx_power=0x5B5B2B5B +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x20 +ant1.ch5.prf64.ant_delay=16446 +ant1.ch5.prf64.tx_power=0x5B5B2B5B +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x20 +ant1.ch9.prf16.ant_delay=16429 +ant1.ch9.prf16.tx_power=0 +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0 +ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.tx_power=0 +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16446 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16446 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16429 +ant2.ch9.prf16.tx_power=0x5F5F2F5F +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x26 +ant2.ch9.prf64.ant_delay=16429 +ant2.ch9.prf64.tx_power=0x5F5F2F5F +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x26 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16446 +ant3.ch5.prf16.tx_power=0 +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16446 +ant3.ch5.prf64.tx_power=0 +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16429 +ant3.ch9.prf16.tx_power=0x5F5F2F5F +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0x26 +ant3.ch9.prf64.ant_delay=16429 +ant3.ch9.prf64.tx_power=0x5F5F2F5F +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0x26 +ant3.port=1 +ant3.selector_gpio=6 +ant3.selector_gpio_value=1 +ant0.ant1.ch5.pdoa_offset=0 +ant0.ant1.ch9.pdoa_offset=0 +ant0.ant2.ch5.pdoa_offset=0 +ant0.ant2.ch9.pdoa_offset=0 +ant1.ant2.ch5.pdoa_offset=0 +ant1.ant2.ch9.pdoa_offset=0 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=-4710 +ant1.ant3.ch9.pdoa_offset=-6144 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant3.ch5.pdoa_lut=e1:f2:85:f5:ae:f3:3d:f6:52:f4:f6:f6:8f:f4:9a:f7:48:f5:52:f8:d7:f5:0a:f9:66:f6:ae:f9:85:f7:66:fa:8f:f8:1f:fb:48:f9:d7:fb:8f:fa:7b:fc:ec:fb:33:fd:0a:fd:ec:fd:66:fe:a4:fe:00:00:48:ff:71:01:00:00:b8:02:b8:00:29:04:64:01:ae:05:19:02:85:07:cb:02:33:09:7d:03:f6:0a:2f:04:0a:0d:e3:04:cd:0e:96:05:14:10:48:06:71:11:fa:06:66:12:ac:07:33:13:60:08:3d:14:12:09:85:15:c5:09:ec:15:77:0a +ant1.ant3.ch9.pdoa_lut=e1:ec:f6:f6:48:ed:3d:f6:85:ed:85:f5:14:ee:9a:f7:3d:ee:52:f8:e1:ee:0a:f9:3d:f0:ae:f9:85:f1:66:fa:85:f3:1f:fb:00:f6:d7:fb:9a:f7:7b:fc:14:fa:33:fd:ec:fb:ec:fd:71:fd:a4:fe:cd:fe:48:ff:a4:00:00:00:85:01:b8:00:7b:02:5c:01:d7:03:14:02:cd:04:cd:02:48:07:85:03:ae:09:29:04:e1:0c:e1:04:7b:10:9a:05:cd:12:52:06:f6:14:f6:06:a4:16:ae:07:ae:17:0a:09:d7:17:c3:09:52:18:66:08:7b:18:7b:0a +xtal_trim=31 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +restricted_channels=0xffff +[HAL]aoa_capability=1 +[HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 +[HAL]minimum_system_offset_uwbtime0=120 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf new file mode 100644 index 0000000..95c0d2a --- /dev/null +++ b/uwb/UWB-calibration-tw.conf @@ -0,0 +1,141 @@ +[CCC]version=2 +[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 +[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 +[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 +[CCC]ant0.ch5.prf64.pdoa_offset=0 +[CCC]ant0.ch9.prf64.pdoa_offset=0 +[CCC]ant0.ch5.prf64.pll_locking_code=0 +[CCC]ant0.ch9.prf64.pll_locking_code=0 +[CCC]id=0 +[CCC]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +ant0.ch5.prf16.ant_delay=16414 +ant0.ch5.prf16.tx_power=0x47472347 +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x34 +ant0.ch5.prf64.ant_delay=16414 +ant0.ch5.prf64.tx_power=0x47472347 +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x34 +ant0.ch9.prf16.ant_delay=16426 +ant0.ch9.prf16.tx_power=0x47472347 +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x34 +ant0.ch9.prf64.ant_delay=16426 +ant0.ch9.prf64.tx_power=0x47472347 +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x34 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16446 +ant1.ch5.prf16.tx_power=0x5B5B2B5B +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x20 +ant1.ch5.prf64.ant_delay=16446 +ant1.ch5.prf64.tx_power=0x5B5B2B5B +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x20 +ant1.ch9.prf16.ant_delay=16429 +ant1.ch9.prf16.tx_power=0 +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0 +ant1.ch9.prf64.ant_delay=16429 +ant1.ch9.prf64.tx_power=0 +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16446 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16446 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16429 +ant2.ch9.prf16.tx_power=0x5F5F2F5F +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x26 +ant2.ch9.prf64.ant_delay=16429 +ant2.ch9.prf64.tx_power=0x5F5F2F5F +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x26 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16446 +ant3.ch5.prf16.tx_power=0 +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16446 +ant3.ch5.prf64.tx_power=0 +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16429 +ant3.ch9.prf16.tx_power=0x5F5F2F5F +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0x26 +ant3.ch9.prf64.ant_delay=16429 +ant3.ch9.prf64.tx_power=0x5F5F2F5F +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0x26 +ant3.port=1 +ant3.selector_gpio=6 +ant3.selector_gpio_value=1 +ant0.ant1.ch5.pdoa_offset=0 +ant0.ant1.ch9.pdoa_offset=0 +ant0.ant2.ch5.pdoa_offset=0 +ant0.ant2.ch9.pdoa_offset=0 +ant1.ant2.ch5.pdoa_offset=0 +ant1.ant2.ch9.pdoa_offset=0 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=-4710 +ant1.ant3.ch9.pdoa_offset=-6144 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant3.ch5.pdoa_lut=e1:f2:85:f5:ae:f3:3d:f6:52:f4:f6:f6:8f:f4:9a:f7:48:f5:52:f8:d7:f5:0a:f9:66:f6:ae:f9:85:f7:66:fa:8f:f8:1f:fb:48:f9:d7:fb:8f:fa:7b:fc:ec:fb:33:fd:0a:fd:ec:fd:66:fe:a4:fe:00:00:48:ff:71:01:00:00:b8:02:b8:00:29:04:64:01:ae:05:19:02:85:07:cb:02:33:09:7d:03:f6:0a:2f:04:0a:0d:e3:04:cd:0e:96:05:14:10:48:06:71:11:fa:06:66:12:ac:07:33:13:60:08:3d:14:12:09:85:15:c5:09:ec:15:77:0a +ant1.ant3.ch9.pdoa_lut=e1:ec:f6:f6:48:ed:3d:f6:85:ed:85:f5:14:ee:9a:f7:3d:ee:52:f8:e1:ee:0a:f9:3d:f0:ae:f9:85:f1:66:fa:85:f3:1f:fb:00:f6:d7:fb:9a:f7:7b:fc:14:fa:33:fd:ec:fb:ec:fd:71:fd:a4:fe:cd:fe:48:ff:a4:00:00:00:85:01:b8:00:7b:02:5c:01:d7:03:14:02:cd:04:cd:02:48:07:85:03:ae:09:29:04:e1:0c:e1:04:7b:10:9a:05:cd:12:52:06:f6:14:f6:06:a4:16:ae:07:ae:17:0a:09:d7:17:c3:09:52:18:66:08:7b:18:7b:0a +xtal_trim=31 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +restricted_channels=0x20 +[HAL]aoa_capability=1 +[HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 4 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging = 6 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging = 1 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging = 0 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 0 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 4 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 +[HAL]minimum_system_offset_uwbtime0=120 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000 diff --git a/uwb/country_conf_gen.sh b/uwb/country_conf_gen.sh new file mode 100755 index 0000000..7e398c0 --- /dev/null +++ b/uwb/country_conf_gen.sh @@ -0,0 +1,31 @@ +#!/bin/bash + +# This script is used to generate uwb conuntry configuration file, +# and the PRODUCT_COPY_FILES list in uwb.mk based on uwb_country.conf +# Bug: 196073172, 233619860 + +count=1 + +mkdir -p $2 + +while read line ; do + if [[ "$line" =~ ^"*" ]]; then + header=${line:1} + elif [[ "$line" =~ ^"\"" ]]; then + #line=$(echo ${line/,} | tr -d "\"") + country[count]=$(echo $line | cut -d ':' -f1 | tr -d "\"") + code[count]=$(echo $line | cut -d ':' -f2 | tr -d "\"" | tr -d " ") + if [ "$header" = "FCC" ]; then + cp $1/UWB-calibration-fcc.conf $2/UWB-calibration-${code[$count]}.conf + elif [ "$header" = "CE" ]; then + cp $1/UWB-calibration-ce.conf $2/UWB-calibration-${code[$count]}.conf + elif [ "$header" = "JP" ]; then + cp $1/UWB-calibration-jp.conf $2/UWB-calibration-${code[$count]}.conf + elif [ "$header" = "TW" ]; then + cp $1/UWB-calibration-tw.conf $2/UWB-calibration-${code[$count]}.conf + elif [ "$header" = "Restricted" ]; then + cp $1/UWB-calibration-restricted.conf $2/UWB-calibration-${code[$count]}.conf + fi + fi +((count++)) +done < $1/uwb_country.conf diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index 2661ad1..3889a08 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -19,9 +19,9 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk) LOCAL_UWB_CAL_DIR=device/google/raviole/uwb PRODUCT_COPY_FILES += \ - $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \ - $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-unknown.conf \ - $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-default.conf \ + $(LOCAL_UWB_CAL_DIR)/UWB-calibration-restricted.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-unknown.conf \ + $(LOCAL_UWB_CAL_DIR)/UWB-calibration-default.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-default.conf \ + $(LOCAL_UWB_CAL_DIR)/UWB-calibration-default.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \ $(LOCAL_UWB_CAL_DIR)/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \ PRODUCT_COPY_FILES += \ diff --git a/uwb/uwb_country.conf b/uwb/uwb_country.conf new file mode 100644 index 0000000..93a5e2e --- /dev/null +++ b/uwb/uwb_country.conf @@ -0,0 +1,62 @@ +*FCC +"United States": "us" +"Canada": "ca" + +*CE +"Austria": "at" +"Belgium": "be" +"Bulgaria": "bg" +"Croatia": "hr" +"Cyprus": "cy" +"Czech Republic": "cz" +"Denmark": "dk" +"Estonia": "ee" +"Finland": "fi" +"France": "fr" +"Germany": "de" +"Greece": "gr" +"Hungary": "hu" +"Ireland Republic of (EIRE)": "ie" +"Italy": "it" +"Latvia": "lv" +"Lithuania": "lt" +"Luxembourg": "lu" +"Malta": "mt" +"Netherlands": "nl" +"Poland": "pl" +"Portugal": "pt" +"Romania": "ro" +"Slovakia": "sk" +"Slovenia": "si" +"Spain": "es" +"Sweden": "se" +"United Kingdom (Great Britain)": "gb" +"Northern Ireland": "ni" +"Iceland": "is" +"Liechtenstein": "li" +"Norway": "no" +"Switzerland": "ch" + +*JP +"Japan": "jp" + +*TW +"Taiwan": "tw" + +*Restricted +"Argentina": "ar" +"Armenia": "am" +"Azerbaijan": "az" +"Belarus": "by" +"Indonesia": "id" +"Kazakhstan": "kz" +"Kyrgyzstan": "kg" +"Nepal": "np" +"Pakistan": "pk" +"Paraguay": "py" +"Russia": "ru" +"Solomon Islands": "sb" +"Tajikistan": "tj" +"Turkmenistanr": "tm" +"Ukraine": "ua" +"Uzbekistan": "uz" From f256ffbd631c4e7e8ac03c42a46957620192cf65 Mon Sep 17 00:00:00 2001 From: linpeter Date: Fri, 19 Aug 2022 15:17:11 +0800 Subject: [PATCH 11/26] update dimming usage property Bug: 234327328 test: check value of property Change-Id: I7e927908cb534fd111820eae74471d459fbe7434 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index f472089..16b8cb7 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -109,7 +109,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/raven/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb #config of display brightness dimming -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.brightness.dimming.usage=1 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.dimming.usage=1 # NFC PRODUCT_COPY_FILES += \ From 0ada3b4ed6145d0f2ee03f015a56e5c09cac8b03 Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Wed, 31 Aug 2022 19:24:48 +0800 Subject: [PATCH 12/26] bt: update bt a2dp offload capabilities * set BtA2dpOffloadCap value to sbc-aac-aptx-aptxhd-ldac-opus in bt_vendor_overlay.conf to suppot OPUS offloading. Bug: 243958304 Test: manully Change-Id: I0a8aee4d42446213f158856a2f2777958893df82 --- bluetooth/bt_vendor_overlay.conf | 3 +++ device-oriole.mk | 2 ++ device-raven.mk | 2 ++ 3 files changed, 7 insertions(+) create mode 100644 bluetooth/bt_vendor_overlay.conf diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf new file mode 100644 index 0000000..d5212db --- /dev/null +++ b/bluetooth/bt_vendor_overlay.conf @@ -0,0 +1,3 @@ +# This is BTBCM HAL overlay configuration file. + +BtA2dpOffloadCap = sbc-aac-aptx-aptxhd-ldac-opus diff --git a/device-oriole.mk b/device-oriole.mk index 4e922c7..4b03e1b 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -214,6 +214,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # Bluetooth HAL PRODUCT_PACKAGES += \ bt_vendor.conf +PRODUCT_COPY_FILES += \ + device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf # tetheroffload HAL PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 16b8cb7..6077922 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -227,6 +227,8 @@ PRODUCT_VENDOR_PROPERTIES += \ # Bluetooth HAL PRODUCT_PACKAGES += \ bt_vendor.conf +PRODUCT_COPY_FILES += \ + device/google/raviole/bluetooth/bt_vendor_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_vendor_overlay.conf # tetheroffload HAL PRODUCT_PACKAGES += \ From 166cece76f9e1c0c143080196beb4d7125fe62a5 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 30 Aug 2022 03:03:26 +0000 Subject: [PATCH 13/26] Config dex2oat according to thermal status Config dex2oat cpuset and thread count according to thermal status. LIGHT cpuset = 0,1,2,3,4,5 thread = 6 MODERATE cpuset = 0,1,2,3 thread = 4 SEVERE cpuset = 0,1,2,3 thread = 4 CRITICAL cpuset = 0,1,2,3 thread = 2 EMERGENCY cpuset = 0,1,2,3 thread = 1 Bug: 242948832 Test: build pass Change-Id: I96d7f010254f8c3d826ed09da18e32d6055d4bb5 --- powerhint-oriole.json | 394 +++++++++++++++++++++++++++++++++--------- powerhint-raven.json | 394 +++++++++++++++++++++++++++++++++--------- 2 files changed, 632 insertions(+), 156 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 3df86a4..c21ee8c 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -471,6 +471,28 @@ "1" ], "DefaultIndex": 0 + }, + { + "Name": "Dex2oatThreads", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-threads", + "Values": [ + "1", + "2", + "4", + "6", + "8" + ], + "Type": "Property" + }, + { + "Name": "Dex2oatCPUSet", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-cpu-set", + "Values": [ + "0,1,2,3", + "0,1,2,3,4,5", + "0,1,2,3,4,5,6,7" + ], + "Type": "Property" } ], "Actions": [ @@ -1330,6 +1352,138 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "6" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3,4,5" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "Node": "PMU_POLL", @@ -1384,6 +1538,168 @@ "Duration": 0, "Value": "60000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", @@ -1456,78 +1772,6 @@ "Duration": 1000, "Value": "1" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, { "PowerHint": "ML_ACC", "Node": "MLUclampBoost", @@ -1551,12 +1795,6 @@ "Node": "RestrictedCpuset", "Duration": 0, "Value": "0-3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" } ], "AdpfConfig": [ diff --git a/powerhint-raven.json b/powerhint-raven.json index d3bd49c..64bc60a 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -470,6 +470,28 @@ "1" ], "DefaultIndex": 0 + }, + { + "Name": "Dex2oatThreads", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-threads", + "Values": [ + "1", + "2", + "4", + "6", + "8" + ], + "Type": "Property" + }, + { + "Name": "Dex2oatCPUSet", + "Path": "vendor.powerhal.dalvik.vm.dex2oat-cpu-set", + "Values": [ + "0,1,2,3", + "0,1,2,3,4,5", + "0,1,2,3,4,5,6,7" + ], + "Type": "Property" } ], "Actions": [ @@ -1321,6 +1343,138 @@ "Duration": 0, "Value": "400000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "6" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3,4,5" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_MODERATE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, { "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", "Node": "PMU_POLL", @@ -1375,6 +1529,168 @@ "Duration": 0, "Value": "60000" }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "4" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_SEVERE", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "2" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_CRITICAL", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "PMU_POLL", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_LITTLE_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_MID_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "CPU_BIG_TSKIN_BYPASS", + "Duration": 0, + "Value": "0" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dControlTempSet", + "Duration": 0, + "Value": "80000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "BigSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "MidSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "LittleSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "G3dSwitchOnTempSet", + "Duration": 0, + "Value": "60000" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatThreads", + "Duration": 0, + "Value": "1" + }, + { + "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", + "Node": "Dex2oatCPUSet", + "Duration": 0, + "Value": "0,1,2,3" + }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", @@ -1447,78 +1763,6 @@ "Duration": 1000, "Value": "1" }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_LITTLE_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_MID_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "CPU_BIG_TSKIN_BYPASS", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_EMERGENCY", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, { "PowerHint": "ML_ACC", "Node": "MLUclampBoost", @@ -1542,12 +1786,6 @@ "Node": "RestrictedCpuset", "Duration": 0, "Value": "0-3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN_LIGHT", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" } ], "AdpfConfig": [ From 47d623aeff9f33cfabc25d81d832a4ec0673ca5e Mon Sep 17 00:00:00 2001 From: juyuchen Date: Wed, 31 Aug 2022 12:33:25 +0800 Subject: [PATCH 14/26] audio: enable gapless offload for trimming data Bug: 233723867 Test: manual audio tests Signed-off-by: juyuchen Change-Id: I4e67b18abde5b6d33ddd62776722a252ac1dfacd --- audio/oriole/config/mixer_paths.xml | 2 +- audio/raven/config/mixer_paths.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml index b7fb719..d877752 100644 --- a/audio/oriole/config/mixer_paths.xml +++ b/audio/oriole/config/mixer_paths.xml @@ -31,7 +31,7 @@ - + diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml index b7fb719..d877752 100644 --- a/audio/raven/config/mixer_paths.xml +++ b/audio/raven/config/mixer_paths.xml @@ -31,7 +31,7 @@ - + From 493ca504256e0a884b2f81b428342d2c71d1fe04 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Thu, 18 Aug 2022 03:16:52 +0000 Subject: [PATCH 15/26] Remove RestrictedCpuset hint With systemui now changed its cpuset in early stage, we no longer need RestrictedCpuset hint as workaround. Bug: 242775562 Test: build pass Change-Id: If041b589a9df7de0a932df59ee3436adcb449fd9 --- powerhint-oriole.json | 21 --------------------- powerhint-raven.json | 21 --------------------- 2 files changed, 42 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index c21ee8c..6114e8a 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -212,15 +212,6 @@ ], "ResetOnInit": true }, - { - "Name": "RestrictedCpuset", - "Path": "/dev/cpuset/restricted/cpus", - "Values": [ - "0-3", - "0-7" - ], - "ResetOnInit": false - }, { "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", @@ -1783,18 +1774,6 @@ "Node": "PMQoSCpuDmaLatency", "Duration": 2000, "Value": "44" - }, - { - "PowerHint": "DEVICE_IDLE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" } ], "AdpfConfig": [ diff --git a/powerhint-raven.json b/powerhint-raven.json index 64bc60a..18d1324 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -211,15 +211,6 @@ ], "ResetOnInit": true }, - { - "Name": "RestrictedCpuset", - "Path": "/dev/cpuset/restricted/cpus", - "Values": [ - "0-3", - "0-7" - ], - "ResetOnInit": false - }, { "Name": "CDHighCpusetCpus", "Path": "/dev/cpuset/camera-daemon-high-group/cpus", @@ -1774,18 +1765,6 @@ "Node": "PMQoSCpuDmaLatency", "Duration": 2000, "Value": "44" - }, - { - "PowerHint": "DEVICE_IDLE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" - }, - { - "PowerHint": "DISPLAY_INACTIVE", - "Node": "RestrictedCpuset", - "Duration": 0, - "Value": "0-3" } ], "AdpfConfig": [ From eec44318a5d34ff7773803c0ace71dc3ffbd5fa4 Mon Sep 17 00:00:00 2001 From: millerliang Date: Wed, 7 Sep 2022 13:59:37 +0800 Subject: [PATCH 16/26] audio: adjust the latency for immersive playback To meet the av sync, we need to adjust the uc latency for immersive playback. Bug: 243645548 Test: Test with av sync video Change-Id: I5980c8833e168f859b541eeab7d093c206857233 --- audio/oriole/config/audio_platform_configuration.xml | 4 ++++ audio/raven/config/audio_platform_configuration.xml | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index 5923cb9..35bf66f 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -219,6 +219,10 @@ + + + + diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index e376ee6..35bf66f 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + @@ -218,6 +219,10 @@ + + + + From 773d299c592f99895a445431404ee02fd457d5b9 Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 9 Sep 2022 19:18:06 +0000 Subject: [PATCH 17/26] Update raven SVN to 40 Bug: 244460991 Change-Id: I8ea100a65a16413c660087a9a2eb2282a3f179a4 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index d6e54e7..0f62834 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -178,7 +178,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=39 + ro.vendor.build.svn=40 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 00838c077ce811ba7da99e8dd4ceab694e85753e Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 9 Sep 2022 19:16:57 +0000 Subject: [PATCH 18/26] Update oriole SVN to 40 Bug: 244460991 Change-Id: Idfb4a5de8e33727367abc8df9342b44bbc4bd64b --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index aa541dc..f65f3e6 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -168,7 +168,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=39 + ro.vendor.build.svn=40 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 8b8e4a89cadd2d594a411d72fdb4a924ee70f51f Mon Sep 17 00:00:00 2001 From: Yang Qi Date: Wed, 7 Sep 2022 21:07:58 +0000 Subject: [PATCH 19/26] calibration: update CCC minimum system offset to 250 for raven Bug: 244622298 Test: see b/244622298 Change-Id: I9c46b8e740f0d389264dd64b866a264d65d2d122 --- uwb/UWB-calibration-ce.conf | 2 +- uwb/UWB-calibration-default.conf | 2 +- uwb/UWB-calibration-fcc.conf | 2 +- uwb/UWB-calibration-jp.conf | 2 +- uwb/UWB-calibration-restricted.conf | 2 +- uwb/UWB-calibration-tw.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index 1117a6a..231e286 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -134,7 +134,7 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 -[HAL]minimum_system_offset_uwbtime0=120 +[HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf index b08a0f4..5e99376 100644 --- a/uwb/UWB-calibration-default.conf +++ b/uwb/UWB-calibration-default.conf @@ -134,7 +134,7 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 -[HAL]minimum_system_offset_uwbtime0=120 +[HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index b08a0f4..5e99376 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -134,7 +134,7 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 -[HAL]minimum_system_offset_uwbtime0=120 +[HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 6b5dd3f..9dfc069 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -135,7 +135,7 @@ restricted_channels=0x20 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0 -[HAL]minimum_system_offset_uwbtime0=120 +[HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf index 14552c3..338d4f6 100644 --- a/uwb/UWB-calibration-restricted.conf +++ b/uwb/UWB-calibration-restricted.conf @@ -134,7 +134,7 @@ restricted_channels=0xffff [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 -[HAL]minimum_system_offset_uwbtime0=120 +[HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf index 95c0d2a..685469d 100644 --- a/uwb/UWB-calibration-tw.conf +++ b/uwb/UWB-calibration-tw.conf @@ -134,7 +134,7 @@ restricted_channels=0x20 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 4 [HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 8 [HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 8 -[HAL]minimum_system_offset_uwbtime0=120 +[HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 From 681e2c28c9ed592f3fcf68a81c9df9bf96b8e765 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 15 Sep 2022 22:21:05 +0800 Subject: [PATCH 20/26] Remove frequency boost of big cores for FACE_UNLOCK Bug: 245619770 Test: build Change-Id: I75d0f1a73b194124030d3c7ddbcea56631031943 --- powerhint-oriole.json | 12 ------------ powerhint-raven.json | 12 ------------ powerhint-slider.json | 12 ------------ powerhint-whitefin.json | 12 ------------ 4 files changed, 48 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index 6114e8a..ff13f2a 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1691,18 +1691,6 @@ "Duration": 0, "Value": "0,1,2,3" }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_LITTLE_TSKIN_BYPASS", diff --git a/powerhint-raven.json b/powerhint-raven.json index 18d1324..2ec1508 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -1682,18 +1682,6 @@ "Duration": 0, "Value": "0,1,2,3" }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPU_LITTLE_TSKIN_BYPASS", diff --git a/powerhint-slider.json b/powerhint-slider.json index 26af88f..4c50d32 100644 --- a/powerhint-slider.json +++ b/powerhint-slider.json @@ -1347,18 +1347,6 @@ "Duration": 0, "Value": "60000" }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json index 3b10212..b7f5dea 100644 --- a/powerhint-whitefin.json +++ b/powerhint-whitefin.json @@ -1326,18 +1326,6 @@ "Duration": 0, "Value": "60000" }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMaxFreq", - "Duration": 1000, - "Value": "9999999" - }, - { - "PowerHint": "FACE_UNLOCK_BOOST", - "Node": "CPUBigClusterMinFreq", - "Duration": 1000, - "Value": "9999999" - }, { "PowerHint": "FP_BOOST", "Node": "CPUBigClusterMaxFreq", From d8637b8ac47ea0354b2b155d379205acaa753e05 Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Mon, 12 Sep 2022 16:58:17 -0700 Subject: [PATCH 21/26] raven: remove unused udfps_illumination_transition_ms Bug: 243818429 Test: N/A Change-Id: I4d0be5127c251b0d414fd5defae77609673c03ed Merged-In: I4d0be5127c251b0d414fd5defae77609673c03ed --- raven/overlay/frameworks/base/core/res/res/values/config.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml index 9a49278..7c7b5b7 100644 --- a/raven/overlay/frameworks/base/core/res/res/values/config.xml +++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml @@ -183,11 +183,6 @@ http://www.gstatic.com/android/sms/G8V0U.xml - - 25 - 0.3 From 0f700d6226e540a4f9a41cc7251f40b380b40977 Mon Sep 17 00:00:00 2001 From: Ilya Matyukhin Date: Mon, 12 Sep 2022 16:57:07 -0700 Subject: [PATCH 22/26] oriole: remove unused udfps_illumination_transition_ms Bug: 243818429 Test: N/A Change-Id: Ied840bbf22a52a96e8d1df58058ff091aad776e5 Merged-In: Ied840bbf22a52a96e8d1df58058ff091aad776e5 --- .../overlay/frameworks/base/core/res/res/values/config.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml index dcb4e39..13aa728 100644 --- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml +++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml @@ -217,11 +217,6 @@ 60 - - 34 - 0.3 From 7570035fe78e4edf00290baedf5def32ef38334d Mon Sep 17 00:00:00 2001 From: vincenttew Date: Tue, 20 Sep 2022 07:45:15 +0000 Subject: [PATCH 23/26] audio: extand the period number of hifi usecase extend this to prevent alsa trigger stop playback and causing pop Bug: 238056484 Signed-off-by: vincenttew Change-Id: I3f422169a8bccbeece0c97b3ba515d99f7dab2e2 --- audio/oriole/config/audio_platform_configuration.xml | 4 ++-- audio/raven/config/audio_platform_configuration.xml | 4 ++-- audio/slider/config/audio_platform_configuration.xml | 4 ++-- audio/whitefin/config/audio_platform_configuration.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index 35bf66f..fa5571c 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -200,8 +200,8 @@ - - + + diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index 35bf66f..fa5571c 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -200,8 +200,8 @@ - - + + diff --git a/audio/slider/config/audio_platform_configuration.xml b/audio/slider/config/audio_platform_configuration.xml index bc63066..3d183b0 100644 --- a/audio/slider/config/audio_platform_configuration.xml +++ b/audio/slider/config/audio_platform_configuration.xml @@ -136,8 +136,8 @@ - - + + diff --git a/audio/whitefin/config/audio_platform_configuration.xml b/audio/whitefin/config/audio_platform_configuration.xml index bc63066..3d183b0 100644 --- a/audio/whitefin/config/audio_platform_configuration.xml +++ b/audio/whitefin/config/audio_platform_configuration.xml @@ -136,8 +136,8 @@ - - + + From 45c70632925cb5538cca72d762b5f483291738f0 Mon Sep 17 00:00:00 2001 From: Richard Chang Date: Fri, 16 Sep 2022 07:36:50 +0000 Subject: [PATCH 24/26] powerhint: clean up unused hints in R4/O6 INTERACTION and LAUNCH_120FPS are removed but some actions still use them. Bug: 246738037 Test: pts-tradefed run commandAndExit pts -m PtsPerformanceTestCases -t com.google.android.perf.pts.PowerHintJsonVerifyTest Change-Id: I6747ad6b0e953f063aad083218a86024c41999a6 --- powerhint-oriole.json | 5 ----- powerhint-raven.json | 15 --------------- 2 files changed, 20 deletions(-) diff --git a/powerhint-oriole.json b/powerhint-oriole.json index ff13f2a..cbbbbae 100644 --- a/powerhint-oriole.json +++ b/powerhint-oriole.json @@ -1303,11 +1303,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", diff --git a/powerhint-raven.json b/powerhint-raven.json index 2ec1508..a232909 100644 --- a/powerhint-raven.json +++ b/powerhint-raven.json @@ -504,11 +504,6 @@ "Duration": 5000, "Value": "1" }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "Value": "LAUNCH_120FPS" - }, { "PowerHint": "LAUNCH", "Node": "CPUBigClusterMaxFreq", @@ -1271,11 +1266,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "REFRESH_60FPS", - "Type": "MaskHint", - "Value": "LAUNCH_120FPS" - }, { "PowerHint": "ADPF_DISABLE_TA_BOOST", "Node": "TAUClampBoost", @@ -1294,11 +1284,6 @@ "Duration": 0, "Value": "1" }, - { - "PowerHint": "DISPLAY_IDLE", - "Type": "EndHint", - "Value": "INTERACTION" - }, { "PowerHint": "DISPLAY_IDLE", "Type": "EndHint", From 3967133ce01a5f2da685c5b2dd99a97d9272d4bc Mon Sep 17 00:00:00 2001 From: Taeju Park Date: Wed, 21 Sep 2022 18:25:15 -0700 Subject: [PATCH 25/26] Add Ownership to powerhint files Bug: 248115959 Signed-off-by: Taeju Park Change-Id: I9ba486e3be19b90e44583f2a3b8ec9d7050c7ceb --- OWNERS | 1 + 1 file changed, 1 insertion(+) create mode 100644 OWNERS diff --git a/OWNERS b/OWNERS new file mode 100644 index 0000000..5aee848 --- /dev/null +++ b/OWNERS @@ -0,0 +1 @@ +per-file powerhint-*.json = jychen@google.com,jenhaochen@google.com,wvw@google.com,joaodias@google.com From f0d6b36e9a7e9a9206eeaac5ac651ff73e453469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Kosi=C5=84ski?= Date: Tue, 13 Sep 2022 01:56:24 +0000 Subject: [PATCH 26/26] Set Lyric camera_hardware variable. Bug: 240478511 Test: presubmit Change-Id: Iaf6682c9677353b6caecd0f31effa41abee7bc8a Merged-In: Iaf6682c9677353b6caecd0f31effa41abee7bc8a --- device-oriole.mk | 2 ++ device-raven.mk | 2 ++ device-slider.mk | 2 ++ device-whitefin.mk | 2 ++ 4 files changed, 8 insertions(+) diff --git a/device-oriole.mk b/device-oriole.mk index f375829..a3e81fb 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -41,6 +41,8 @@ else include device/google/gs101/fingerprint/udfps_factory.mk endif +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,oriole) $(call soong_config_set,lyric,tuning_product,oriole) $(call soong_config_set,google3a_config,target_device,oriole) diff --git a/device-raven.mk b/device-raven.mk index 15ea022..63abc9d 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -46,6 +46,8 @@ endif include hardware/google/pixel/vibrator/cs40l25/device.mk +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,raven) $(call soong_config_set,lyric,tuning_product,raven) $(call soong_config_set,google3a_config,target_device,raven) diff --git a/device-slider.mk b/device-slider.mk index a1662de..07834b4 100644 --- a/device-slider.mk +++ b/device-slider.mk @@ -29,6 +29,8 @@ include device/google/raviole/audio/slider/audio-tables.mk include hardware/google/pixel/vibrator/cs40l25/device.mk include device/google/gs101/bluetooth/bluetooth.mk +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,slider) $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider) diff --git a/device-whitefin.mk b/device-whitefin.mk index df3ce52..41f5da2 100644 --- a/device-whitefin.mk +++ b/device-whitefin.mk @@ -29,6 +29,8 @@ include hardware/google/pixel/vibrator/drv2624/device.mk include device/google/raviole/audio/whitefin/audio-tables.mk include device/google/gs101/bluetooth/bluetooth.mk +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,slider) $(call soong_config_set,lyric,tuning_product,slider) $(call soong_config_set,google3a_config,target_device,slider)