From 4264124fdc3278cab43eb7d27c79e3c59b543a11 Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Mon, 14 Nov 2022 13:29:53 +0800 Subject: [PATCH 1/2] uwb: update country configs for R4 QPR2 Bug: 258863234 Test: local build pass Signed-off-by: Rex Lin Change-Id: I569295f5bc9cf3bbef10f191c85d48df50c6b0e0 --- uwb/UWB-calibration-ce.conf | 1 + uwb/UWB-calibration-default.conf | 1 + uwb/UWB-calibration-fcc.conf | 1 + uwb/UWB-calibration-restricted.conf | 1 + uwb/UWB-calibration-tw.conf | 1 + uwb/UWB-calibration.conf | 142 ++++++++++++++++++++++++++++ uwb/uwb_calibration.mk | 2 +- 7 files changed, 148 insertions(+), 1 deletion(-) create mode 100644 uwb/UWB-calibration.conf diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index 231e286..12b7f47 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -139,3 +139,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 +alternate_pulse_shape=0x00 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf index 5e99376..25b1bb1 100644 --- a/uwb/UWB-calibration-default.conf +++ b/uwb/UWB-calibration-default.conf @@ -139,3 +139,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 +alternate_pulse_shape=0x00 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 5e99376..25b1bb1 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -139,3 +139,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 +alternate_pulse_shape=0x00 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf index 338d4f6..681a5f3 100644 --- a/uwb/UWB-calibration-restricted.conf +++ b/uwb/UWB-calibration-restricted.conf @@ -139,3 +139,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 +alternate_pulse_shape=0x00 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf index 685469d..7bd68dc 100644 --- a/uwb/UWB-calibration-tw.conf +++ b/uwb/UWB-calibration-tw.conf @@ -139,3 +139,4 @@ coex_gpio=4 coex_delay_us=1000 coex_margin_us=500 coex_interval_us=2000 +alternate_pulse_shape=0x00 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf new file mode 100644 index 0000000..47d917c --- /dev/null +++ b/uwb/UWB-calibration.conf @@ -0,0 +1,142 @@ +[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=0x2A2A2A2A +ant0.ch9.prf16.pg_count=0 +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=0x20 +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=250 +coex_gpio=4 +coex_delay_us=1000 +coex_margin_us=500 +coex_interval_us=2000 +alternate_pulse_shape=0x01 diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index 3889a08..f6dc7c7 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -21,7 +21,7 @@ LOCAL_UWB_CAL_DIR=device/google/raviole/uwb PRODUCT_COPY_FILES += \ $(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)/UWB-calibration.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 += \ From 81330ea59802b79ea4ef0ca6fbc5cbf08a556392 Mon Sep 17 00:00:00 2001 From: joenchen Date: Wed, 7 Sep 2022 12:59:12 +0000 Subject: [PATCH 2/2] RRS: Apply the default config from persist prop vendor_config plays as another role to control the display config during the boot time. To change the default configuration of the user selected mode, we use persist config to store the value. Bug: 244492960 Test: Boot w/ and w/o user selected configs and check the resolution Change-Id: I8839db59fd0b3e352ddea69e3539a7eaadaa29d2 --- device-raven.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/device-raven.mk b/device-raven.mk index 1712beb..baf9129 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -281,6 +281,9 @@ PRODUCT_RESTRICT_VENDOR_FILES := false PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ debug.sf.enable_adpf_cpu_hint=true +# Display RRS default Config +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += persist.vendor.display.primary.boot_config=1440x3120@120 + # Bluetooth OPUS codec PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.opus.enabled=true