From 9d3387c8b5597f851136f8f3064f0a765754ab23 Mon Sep 17 00:00:00 2001 From: Stephen Crane Date: Thu, 1 Dec 2022 21:46:33 +0000 Subject: [PATCH 1/8] Revert "init: Delay trusty app loading until storage is ready" This reverts commit 0ca6773d8fb5f2b50fbbe3aa21a3898716264b51. Reason for revert: Fingerprint HAL crashes Change-Id: Idc3589cd3f7f09306d3a14d03d9529bdf5fdbdce (cherry picked from commit 25cc8824f0042afd6deafcdc0ac74fda5d37dc5e) Merged-In: Idc3589cd3f7f09306d3a14d03d9529bdf5fdbdce --- conf/init.tangorpro.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc index ad42c08..31ffdb5 100644 --- a/conf/init.tangorpro.rc +++ b/conf/init.tangorpro.rc @@ -82,13 +82,13 @@ on post-fs-data chown system system /sys/devices/platform/odm/odm:fp_fpc1020/irq chown system system /sys/devices/platform/odm/odm:fp_fpc1020/wakeup_enable -on property:ro.vendor.trusty.storage.fs_ready=1 +on fs exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/1540.app # Permissions for hwcomposer chown system system /sys/class/backlight/panel0-backlight/cabc_mode # Castauth -on property:ro.vendor.trusty.storage.fs_ready=1 +on post-fs-data exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/cast_auth.app # Wifi From 09fc54f28df725acdcdc58941b2257156c02f7f0 Mon Sep 17 00:00:00 2001 From: "T.J. Mercier" Date: Thu, 8 Dec 2022 00:16:00 +0000 Subject: [PATCH 2/8] Revert "[AudioProxy] Enable AudioProxy" This reverts commit f75c0dd43d58ae756f3dc4342e735b0c3ea820aa. Reason for revert: DroidMonitor: Potential culprit for Bug 261776026 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Change-Id: I7941dfe9235d843ac3a24034819ea6e0ffe00884 (cherry picked from commit 40e6ca666b02c6ea37ad648f599bbf33108409ed) Merged-In: I7941dfe9235d843ac3a24034819ea6e0ffe00884 --- device-tangorpro.mk | 9 ------ device_framework_matrix_product_tangorpro.xml | 29 ------------------- public.libraries-google-tangorpro.txt | 1 - 3 files changed, 39 deletions(-) delete mode 100644 device_framework_matrix_product_tangorpro.xml delete mode 100644 public.libraries-google-tangorpro.txt diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 8885301..d1d9de6 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -225,12 +225,3 @@ PRODUCT_SYSTEM_PROPERTIES += ro.odm.cast.ssid_suffix=ynn PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.camera.extended_launch_boost=1 \ persist.vendor.camera.raise_buf_allocation_priority=1 -# AudioProxy -PRODUCT_PACKAGES += \ - libaudio_proxy.google \ - device.google.atv.audio_proxy@7.1-service - -DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := device/google/tangorpro/device_framework_matrix_product_tangorpro.xml - -PRODUCT_COPY_FILES += \ - device/google/tangorpro/public.libraries-google-tangorpro.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/public.libraries-google.txt diff --git a/device_framework_matrix_product_tangorpro.xml b/device_framework_matrix_product_tangorpro.xml deleted file mode 100644 index 3974e7e..0000000 --- a/device_framework_matrix_product_tangorpro.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - hardware.google.bluetooth.ccc - 1.1 - - IBluetoothCcc - default - - - - - device.google.atv.audio_proxy - 1 - - IAudioProxy - mediashell - - - - android.hardware.audio - hwbinder - 7.1 - - IDevicesFactory - mediashell - - - - diff --git a/public.libraries-google-tangorpro.txt b/public.libraries-google-tangorpro.txt deleted file mode 100644 index 2a2d2fe..0000000 --- a/public.libraries-google-tangorpro.txt +++ /dev/null @@ -1 +0,0 @@ -libaudio_proxy.google.so From a3f8f19341018fabf91fa2820fb3de247ad33510 Mon Sep 17 00:00:00 2001 From: "T.J. Mercier" Date: Thu, 8 Dec 2022 00:16:00 +0000 Subject: [PATCH 3/8] Revert "[AudioProxy] Enable AudioProxy" This reverts commit f75c0dd43d58ae756f3dc4342e735b0c3ea820aa. Reason for revert: DroidMonitor: Potential culprit for Bug 261776026 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted. Change-Id: I7941dfe9235d843ac3a24034819ea6e0ffe00884 (cherry picked from commit 40e6ca666b02c6ea37ad648f599bbf33108409ed) Merged-In: I7941dfe9235d843ac3a24034819ea6e0ffe00884 --- device-tangorpro.mk | 9 ------ device_framework_matrix_product_tangorpro.xml | 29 ------------------- public.libraries-google-tangorpro.txt | 1 - 3 files changed, 39 deletions(-) delete mode 100644 device_framework_matrix_product_tangorpro.xml delete mode 100644 public.libraries-google-tangorpro.txt diff --git a/device-tangorpro.mk b/device-tangorpro.mk index 8885301..d1d9de6 100644 --- a/device-tangorpro.mk +++ b/device-tangorpro.mk @@ -225,12 +225,3 @@ PRODUCT_SYSTEM_PROPERTIES += ro.odm.cast.ssid_suffix=ynn PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.camera.extended_launch_boost=1 \ persist.vendor.camera.raise_buf_allocation_priority=1 -# AudioProxy -PRODUCT_PACKAGES += \ - libaudio_proxy.google \ - device.google.atv.audio_proxy@7.1-service - -DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := device/google/tangorpro/device_framework_matrix_product_tangorpro.xml - -PRODUCT_COPY_FILES += \ - device/google/tangorpro/public.libraries-google-tangorpro.txt:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/public.libraries-google.txt diff --git a/device_framework_matrix_product_tangorpro.xml b/device_framework_matrix_product_tangorpro.xml deleted file mode 100644 index 3974e7e..0000000 --- a/device_framework_matrix_product_tangorpro.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - hardware.google.bluetooth.ccc - 1.1 - - IBluetoothCcc - default - - - - - device.google.atv.audio_proxy - 1 - - IAudioProxy - mediashell - - - - android.hardware.audio - hwbinder - 7.1 - - IDevicesFactory - mediashell - - - - diff --git a/public.libraries-google-tangorpro.txt b/public.libraries-google-tangorpro.txt deleted file mode 100644 index 2a2d2fe..0000000 --- a/public.libraries-google-tangorpro.txt +++ /dev/null @@ -1 +0,0 @@ -libaudio_proxy.google.so From e39b2d2e1ed827d3ee018bbe8ea82b11bd2eaa04 Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Thu, 5 Jan 2023 20:49:05 +0000 Subject: [PATCH 4/8] Revert "Enable SAE upgrade offload" This reverts commit 41bff6c677e81ef753197cdd3b675ef0aae1051a. Reason for revert: Droidfood blocking bug: 264504981 Change-Id: I6a69ed326d777766b8798698b647122f1fd44216 (cherry picked from commit bc7fa7c91f240a9df93a1a5ec226ab9a472dd9ae) Merged-In: I6a69ed326d777766b8798698b647122f1fd44216 --- rro_overlays/WifiOverlay/res/values/config.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index df48439..8a92e98 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -120,7 +120,4 @@ 1: verbose logging on by default for userdebug 2: verbose logging on by default for all builds --> 1 - - - true From cda38a407edaca9fde2c08d9ab95c57bb8e6c269 Mon Sep 17 00:00:00 2001 From: Daniel Chapin Date: Thu, 5 Jan 2023 20:49:05 +0000 Subject: [PATCH 5/8] Revert "Enable SAE upgrade offload" This reverts commit 41bff6c677e81ef753197cdd3b675ef0aae1051a. Reason for revert: Droidfood blocking bug: 264504981 Change-Id: I6a69ed326d777766b8798698b647122f1fd44216 (cherry picked from commit bc7fa7c91f240a9df93a1a5ec226ab9a472dd9ae) Merged-In: I6a69ed326d777766b8798698b647122f1fd44216 --- rro_overlays/WifiOverlay/res/values/config.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index df48439..8a92e98 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -120,7 +120,4 @@ 1: verbose logging on by default for userdebug 2: verbose logging on by default for all builds --> 1 - - - true From 24014de57137825b35a695288c2b17b659dde5cf Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Wed, 28 Jun 2023 11:15:21 +0800 Subject: [PATCH 6/8] uwb: update uwb calibration for T6P - ant_delay ch5 ant_delay : from 16430 to 16460 ch9 ant_delay : from 16416 to 16445 - update channel restrction Bug: 287082706 Bug: 289062178 Test: build pass Signed-off-by: Rex Lin (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2ea4191313e01296dbc2891f9063e1fedf7ab464) Merged-In: I37b01320787301e77ff18889d6352c1ce22bbb93 Change-Id: I37b01320787301e77ff18889d6352c1ce22bbb93 --- uwb/UWB-calibration-ce.conf | 32 +++--- uwb/UWB-calibration-fcc.conf | 32 +++--- uwb/UWB-calibration-jp.conf | 32 +++--- uwb/UWB-calibration-restricted.conf | 148 ++++++++++++++++++++++++++++ uwb/UWB-calibration.conf | 32 +++--- uwb/uwb_calibration.mk | 2 +- uwb/uwb_country.conf | 18 ++++ 7 files changed, 231 insertions(+), 65 deletions(-) create mode 100644 uwb/UWB-calibration-restricted.conf diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index 0002568..8024b12 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -12,76 +12,76 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16430 +ant0.ch5.prf16.ant_delay=16460 ant0.ch5.prf16.tx_power=0x4f4f444f ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16430 +ant0.ch5.prf64.ant_delay=16460 ant0.ch5.prf64.tx_power=0x4f4f444f ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 -ant0.ch9.prf16.ant_delay=16416 +ant0.ch9.prf16.ant_delay=16445 ant0.ch9.prf16.tx_power=0x3e3e303e ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16416 +ant0.ch9.prf64.ant_delay=16445 ant0.ch9.prf64.tx_power=0x3e3e303e 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=16430 +ant1.ch5.prf16.ant_delay=16460 ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 ant1.ch5.prf16.pg_delay=0 -ant1.ch5.prf64.ant_delay=16430 +ant1.ch5.prf64.ant_delay=16460 ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0 -ant1.ch9.prf16.ant_delay=16416 +ant1.ch9.prf16.ant_delay=16445 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16416 +ant1.ch9.prf64.ant_delay=16445 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=16430 +ant2.ch5.prf16.ant_delay=16460 ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 ant2.ch5.prf16.pg_delay=0 -ant2.ch5.prf64.ant_delay=16430 +ant2.ch5.prf64.ant_delay=16460 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16416 +ant2.ch9.prf16.ant_delay=16445 ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0 -ant2.ch9.prf64.ant_delay=16416 +ant2.ch9.prf64.ant_delay=16445 ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16430 +ant3.ch5.prf16.ant_delay=16460 ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 ant3.ch5.prf16.pg_delay=0 -ant3.ch5.prf64.ant_delay=16430 +ant3.ch5.prf64.ant_delay=16460 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16416 +ant3.ch9.prf16.ant_delay=16445 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16416 +ant3.ch9.prf64.ant_delay=16445 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 4e7d2de..8325fe7 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -12,76 +12,76 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16430 +ant0.ch5.prf16.ant_delay=16460 ant0.ch5.prf16.tx_power=0x4f4f444f ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x28 -ant0.ch5.prf64.ant_delay=16430 +ant0.ch5.prf64.ant_delay=16460 ant0.ch5.prf64.tx_power=0x4f4f444f ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x28 -ant0.ch9.prf16.ant_delay=16416 +ant0.ch9.prf16.ant_delay=16445 ant0.ch9.prf16.tx_power=0x5e5e4c5e ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x28 -ant0.ch9.prf64.ant_delay=16416 +ant0.ch9.prf64.ant_delay=16445 ant0.ch9.prf64.tx_power=0x5e5e4c5e ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x28 ant0.port=0 ant0.selector_gpio=7 ant0.selector_gpio_value=0 -ant1.ch5.prf16.ant_delay=16430 +ant1.ch5.prf16.ant_delay=16460 ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 ant1.ch5.prf16.pg_delay=0 -ant1.ch5.prf64.ant_delay=16430 +ant1.ch5.prf64.ant_delay=16460 ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0 -ant1.ch9.prf16.ant_delay=16416 +ant1.ch9.prf16.ant_delay=16445 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16416 +ant1.ch9.prf64.ant_delay=16445 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=16430 +ant2.ch5.prf16.ant_delay=16460 ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 ant2.ch5.prf16.pg_delay=0 -ant2.ch5.prf64.ant_delay=16430 +ant2.ch5.prf64.ant_delay=16460 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16416 +ant2.ch9.prf16.ant_delay=16445 ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0 -ant2.ch9.prf64.ant_delay=16416 +ant2.ch9.prf64.ant_delay=16445 ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16430 +ant3.ch5.prf16.ant_delay=16460 ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 ant3.ch5.prf16.pg_delay=0 -ant3.ch5.prf64.ant_delay=16430 +ant3.ch5.prf64.ant_delay=16460 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16416 +ant3.ch9.prf16.ant_delay=16445 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16416 +ant3.ch9.prf64.ant_delay=16445 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 417f7f8..00201cd 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -12,76 +12,76 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16430 +ant0.ch5.prf16.ant_delay=16460 ant0.ch5.prf16.tx_power=0xffffffff ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16430 +ant0.ch5.prf64.ant_delay=16460 ant0.ch5.prf64.tx_power=0xffffffff ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 -ant0.ch9.prf16.ant_delay=16416 +ant0.ch9.prf16.ant_delay=16445 ant0.ch9.prf16.tx_power=0x2e2e242e ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16416 +ant0.ch9.prf64.ant_delay=16445 ant0.ch9.prf64.tx_power=0x2e2e242e 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=16430 +ant1.ch5.prf16.ant_delay=16460 ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 ant1.ch5.prf16.pg_delay=0 -ant1.ch5.prf64.ant_delay=16430 +ant1.ch5.prf64.ant_delay=16460 ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0 -ant1.ch9.prf16.ant_delay=16416 +ant1.ch9.prf16.ant_delay=16445 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16416 +ant1.ch9.prf64.ant_delay=16445 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=16430 +ant2.ch5.prf16.ant_delay=16460 ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 ant2.ch5.prf16.pg_delay=0 -ant2.ch5.prf64.ant_delay=16430 +ant2.ch5.prf64.ant_delay=16460 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16416 +ant2.ch9.prf16.ant_delay=16445 ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0 -ant2.ch9.prf64.ant_delay=16416 +ant2.ch9.prf64.ant_delay=16445 ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16430 +ant3.ch5.prf16.ant_delay=16460 ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 ant3.ch5.prf16.pg_delay=0 -ant3.ch5.prf64.ant_delay=16430 +ant3.ch5.prf64.ant_delay=16460 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16416 +ant3.ch9.prf16.ant_delay=16445 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16416 +ant3.ch9.prf64.ant_delay=16445 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf new file mode 100644 index 0000000..1c98823 --- /dev/null +++ b/uwb/UWB-calibration-restricted.conf @@ -0,0 +1,148 @@ +[CCC]version=3 +[CCC]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant2 +[CCC]alternate_pulse_shape=0x00 +ant0.ch5.prf16.ant_delay=16449 +ant0.ch5.prf16.tx_power=0xFFFFD4FF +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x28 +ant0.ch5.prf64.ant_delay=16449 +ant0.ch5.prf64.tx_power=0xFFFFD4FF +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x28 +ant0.ch9.prf16.ant_delay=16451 +ant0.ch9.prf16.tx_power=0xFEFEC0FE +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x28 +ant0.ch9.prf64.ant_delay=16451 +ant0.ch9.prf64.tx_power=0xFEFEC0FE +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x28 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16450 +ant1.ch5.prf16.tx_power=0xFFFFFFFF +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x26 +ant1.ch5.prf64.ant_delay=16450 +ant1.ch5.prf64.tx_power=0xFFFFFFFF +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x26 +ant1.ch9.prf16.ant_delay=16451 +ant1.ch9.prf16.tx_power=0x3E3E303E +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0x16 +ant1.ch9.prf64.ant_delay=16451 +ant1.ch9.prf64.tx_power=0x3E3E303E +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0x16 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16450 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16450 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16451 +ant2.ch9.prf16.tx_power=0x8E8E748E +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x28 +ant2.ch9.prf64.ant_delay=16451 +ant2.ch9.prf64.tx_power=0x8E8E748E +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x28 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16450 +ant3.ch5.prf16.tx_power=0 +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16450 +ant3.ch5.prf64.tx_power=0 +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16450 +ant3.ch9.prf16.tx_power=0 +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0 +ant3.ch9.prf64.ant_delay=16450 +ant3.ch9.prf64.tx_power=0 +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0 +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=2421 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=0 +ant1.ant3.ch9.pdoa_offset=-6159 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant2.ch5.pdoa_lut=0a:f4:77:0a:d9:f4:c5:09:c1:f5:12:09:df:f5:60:08:7f:f6:ac:07:dd:f6:fa:06:f2:f6:48:06:89:f7:96:05:d1:f7:e3:04:54:f8:2f:04:f0:f8:7d:03:46:fa:cb:02:b0:fb:19:02:23:fd:64:01:a2:fe:b2:00:00:00:00:00:31:01:4e:ff:a6:02:9c:fe:0a:04:e7:fd:52:05:35:fd:73:06:83:fc:cb:07:d1:fb:be:08:1d:fb:f8:09:6a:fa:39:0b:b8:f9:81:0c:06:f9:1b:0d:54:f8:87:0d:a0:f7:a0:0e:ee:f6:06:0f:3b:f6:2d:0f:89:f5 +ant1.ant2.ch9.pdoa_lut=d7:f1:85:f5:66:f2:3d:f6:b8:f2:f6:f6:48:f3:9a:f7:9a:f3:52:f8:00:f4:0a:f9:a4:f4:ae:f9:85:f5:66:fa:b8:f6:1f:fb:ec:f7:d7:fb:ae:f9:7b:fc:33:fb:33:fd:e1:fc:ec:fd:29:fe:a4:fe:e1:fe:48:ff:d7:ff:00:00:b8:00:b8:00:d7:01:5c:01:5c:03:14:02:1f:05:cd:02:52:06:85:03:d7:07:29:04:0a:09:e1:04:3d:0a:9a:05:33:0b:52:06:29:0c:f6:06:c3:0d:ae:07:5c:0f:66:08:1f:11:0a:09:66:12:c3:09:00:14:7b:0a +ant1.ant3.ch5.pdoa_lut=89:f4:ac:07:a2:f4:60:08:ae:f4:77:0a:0a:f5:12:09:7d:f5:c5:09:8d:f5:fa:06:0a:f7:48:06:9a:f7:96:05:fa:f7:e3:04:68:f8:2f:04:f0:f9:7d:03:fa:fb:cb:02:6d:fd:19:02:2f:fe:64:01:98:fe:b2:00:00:00:00:00:1d:02:4e:ff:2d:02:e7:fd:33:02:9c:fe:0a:03:35:fd:6f:04:83:fc:db:05:d1:fb:85:07:1d:fb:b0:08:6a:fa:06:09:b8:f9:71:09:06:f9:48:0a:54:f8:4e:0b:a0:f7:58:0c:3b:f6:62:0c:ee:f6:c5:0c:89:f5 +ant1.ant3.ch9.pdoa_lut=3d:f2:85:f5:52:f2:3d:f6:cd:f2:f6:f6:e1:f2:9a:f7:0a:f3:52:f8:1f:f3:0a:f9:33:f3:ae:f9:71:f3:66:fa:52:f4:1f:fb:85:f5:d7:fb:9a:f7:7b:fc:0a:f9:33:fd:29:fa:ec:fd:ae:fb:a4:fe:ec:fd:48:ff:1f:ff:00:00:cd:00:b8:00:0a:03:5c:01:8f:04:14:02:b8:06:cd:02:66:08:85:03:3d:0a:29:04:7b:0c:e1:04:0a:0d:9a:05:29:0e:52:06:8f:0e:f6:06:a4:0e:ae:07:b8:0e:66:08:cd:0e:0a:09:33:0f:c3:09:c3:0f:7b:0a +xtal_trim=23 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +alternate_pulse_shape=0x00 +restricted_channels=0xFFFF +[HAL]aoa_restricted_channels=0x20 +[HAL]aoa_capability=2 +[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=3 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4 +[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=4 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8 +[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3 +[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3 +[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4 +[HAL]ant_sets.ch5.azimuth_elevation.tx_ant_set_nonranging=0 +[HAL]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging=0 +[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3 +[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3 +[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.azimuth_elevation.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 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index 4e7d2de..8325fe7 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -12,76 +12,76 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16430 +ant0.ch5.prf16.ant_delay=16460 ant0.ch5.prf16.tx_power=0x4f4f444f ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x28 -ant0.ch5.prf64.ant_delay=16430 +ant0.ch5.prf64.ant_delay=16460 ant0.ch5.prf64.tx_power=0x4f4f444f ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x28 -ant0.ch9.prf16.ant_delay=16416 +ant0.ch9.prf16.ant_delay=16445 ant0.ch9.prf16.tx_power=0x5e5e4c5e ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x28 -ant0.ch9.prf64.ant_delay=16416 +ant0.ch9.prf64.ant_delay=16445 ant0.ch9.prf64.tx_power=0x5e5e4c5e ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x28 ant0.port=0 ant0.selector_gpio=7 ant0.selector_gpio_value=0 -ant1.ch5.prf16.ant_delay=16430 +ant1.ch5.prf16.ant_delay=16460 ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 ant1.ch5.prf16.pg_delay=0 -ant1.ch5.prf64.ant_delay=16430 +ant1.ch5.prf64.ant_delay=16460 ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0 -ant1.ch9.prf16.ant_delay=16416 +ant1.ch9.prf16.ant_delay=16445 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16416 +ant1.ch9.prf64.ant_delay=16445 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=16430 +ant2.ch5.prf16.ant_delay=16460 ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 ant2.ch5.prf16.pg_delay=0 -ant2.ch5.prf64.ant_delay=16430 +ant2.ch5.prf64.ant_delay=16460 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16416 +ant2.ch9.prf16.ant_delay=16445 ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0 -ant2.ch9.prf64.ant_delay=16416 +ant2.ch9.prf64.ant_delay=16445 ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16430 +ant3.ch5.prf16.ant_delay=16460 ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 ant3.ch5.prf16.pg_delay=0 -ant3.ch5.prf64.ant_delay=16430 +ant3.ch5.prf64.ant_delay=16460 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16416 +ant3.ch9.prf16.ant_delay=16445 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16416 +ant3.ch9.prf64.ant_delay=16445 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index c7075bf..4a00743 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -20,7 +20,7 @@ LOCAL_UWB_CAL_DIR=device/google/tangorpro/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-restricted.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 \ diff --git a/uwb/uwb_country.conf b/uwb/uwb_country.conf index 7ba69f2..92e7ecc 100644 --- a/uwb/uwb_country.conf +++ b/uwb/uwb_country.conf @@ -16,3 +16,21 @@ *JP "Japan": "jp" + +*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 4198b63132888ea7c2b01eda3d9dfed00bbcc17e Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Wed, 28 Jun 2023 11:15:21 +0800 Subject: [PATCH 7/8] uwb: update uwb calibration for T6P - ant_delay ch5 ant_delay : from 16430 to 16460 ch9 ant_delay : from 16416 to 16445 - update channel restrction Bug: 287082706 Bug: 289062178 Test: build pass Signed-off-by: Rex Lin (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2ea4191313e01296dbc2891f9063e1fedf7ab464) Merged-In: I37b01320787301e77ff18889d6352c1ce22bbb93 Change-Id: I37b01320787301e77ff18889d6352c1ce22bbb93 --- uwb/UWB-calibration-ce.conf | 32 +++--- uwb/UWB-calibration-fcc.conf | 32 +++--- uwb/UWB-calibration-jp.conf | 32 +++--- uwb/UWB-calibration-restricted.conf | 148 ++++++++++++++++++++++++++++ uwb/UWB-calibration.conf | 32 +++--- uwb/uwb_calibration.mk | 2 +- uwb/uwb_country.conf | 18 ++++ 7 files changed, 231 insertions(+), 65 deletions(-) create mode 100644 uwb/UWB-calibration-restricted.conf diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index 0002568..8024b12 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -12,76 +12,76 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16430 +ant0.ch5.prf16.ant_delay=16460 ant0.ch5.prf16.tx_power=0x4f4f444f ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16430 +ant0.ch5.prf64.ant_delay=16460 ant0.ch5.prf64.tx_power=0x4f4f444f ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 -ant0.ch9.prf16.ant_delay=16416 +ant0.ch9.prf16.ant_delay=16445 ant0.ch9.prf16.tx_power=0x3e3e303e ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16416 +ant0.ch9.prf64.ant_delay=16445 ant0.ch9.prf64.tx_power=0x3e3e303e 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=16430 +ant1.ch5.prf16.ant_delay=16460 ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 ant1.ch5.prf16.pg_delay=0 -ant1.ch5.prf64.ant_delay=16430 +ant1.ch5.prf64.ant_delay=16460 ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0 -ant1.ch9.prf16.ant_delay=16416 +ant1.ch9.prf16.ant_delay=16445 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16416 +ant1.ch9.prf64.ant_delay=16445 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=16430 +ant2.ch5.prf16.ant_delay=16460 ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 ant2.ch5.prf16.pg_delay=0 -ant2.ch5.prf64.ant_delay=16430 +ant2.ch5.prf64.ant_delay=16460 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16416 +ant2.ch9.prf16.ant_delay=16445 ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0 -ant2.ch9.prf64.ant_delay=16416 +ant2.ch9.prf64.ant_delay=16445 ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16430 +ant3.ch5.prf16.ant_delay=16460 ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 ant3.ch5.prf16.pg_delay=0 -ant3.ch5.prf64.ant_delay=16430 +ant3.ch5.prf64.ant_delay=16460 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16416 +ant3.ch9.prf16.ant_delay=16445 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16416 +ant3.ch9.prf64.ant_delay=16445 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 4e7d2de..8325fe7 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -12,76 +12,76 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16430 +ant0.ch5.prf16.ant_delay=16460 ant0.ch5.prf16.tx_power=0x4f4f444f ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x28 -ant0.ch5.prf64.ant_delay=16430 +ant0.ch5.prf64.ant_delay=16460 ant0.ch5.prf64.tx_power=0x4f4f444f ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x28 -ant0.ch9.prf16.ant_delay=16416 +ant0.ch9.prf16.ant_delay=16445 ant0.ch9.prf16.tx_power=0x5e5e4c5e ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x28 -ant0.ch9.prf64.ant_delay=16416 +ant0.ch9.prf64.ant_delay=16445 ant0.ch9.prf64.tx_power=0x5e5e4c5e ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x28 ant0.port=0 ant0.selector_gpio=7 ant0.selector_gpio_value=0 -ant1.ch5.prf16.ant_delay=16430 +ant1.ch5.prf16.ant_delay=16460 ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 ant1.ch5.prf16.pg_delay=0 -ant1.ch5.prf64.ant_delay=16430 +ant1.ch5.prf64.ant_delay=16460 ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0 -ant1.ch9.prf16.ant_delay=16416 +ant1.ch9.prf16.ant_delay=16445 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16416 +ant1.ch9.prf64.ant_delay=16445 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=16430 +ant2.ch5.prf16.ant_delay=16460 ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 ant2.ch5.prf16.pg_delay=0 -ant2.ch5.prf64.ant_delay=16430 +ant2.ch5.prf64.ant_delay=16460 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16416 +ant2.ch9.prf16.ant_delay=16445 ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0 -ant2.ch9.prf64.ant_delay=16416 +ant2.ch9.prf64.ant_delay=16445 ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16430 +ant3.ch5.prf16.ant_delay=16460 ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 ant3.ch5.prf16.pg_delay=0 -ant3.ch5.prf64.ant_delay=16430 +ant3.ch5.prf64.ant_delay=16460 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16416 +ant3.ch9.prf16.ant_delay=16445 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16416 +ant3.ch9.prf64.ant_delay=16445 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 417f7f8..00201cd 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -12,76 +12,76 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16430 +ant0.ch5.prf16.ant_delay=16460 ant0.ch5.prf16.tx_power=0xffffffff ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16430 +ant0.ch5.prf64.ant_delay=16460 ant0.ch5.prf64.tx_power=0xffffffff ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 -ant0.ch9.prf16.ant_delay=16416 +ant0.ch9.prf16.ant_delay=16445 ant0.ch9.prf16.tx_power=0x2e2e242e ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x34 -ant0.ch9.prf64.ant_delay=16416 +ant0.ch9.prf64.ant_delay=16445 ant0.ch9.prf64.tx_power=0x2e2e242e 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=16430 +ant1.ch5.prf16.ant_delay=16460 ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 ant1.ch5.prf16.pg_delay=0 -ant1.ch5.prf64.ant_delay=16430 +ant1.ch5.prf64.ant_delay=16460 ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0 -ant1.ch9.prf16.ant_delay=16416 +ant1.ch9.prf16.ant_delay=16445 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16416 +ant1.ch9.prf64.ant_delay=16445 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=16430 +ant2.ch5.prf16.ant_delay=16460 ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 ant2.ch5.prf16.pg_delay=0 -ant2.ch5.prf64.ant_delay=16430 +ant2.ch5.prf64.ant_delay=16460 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16416 +ant2.ch9.prf16.ant_delay=16445 ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0 -ant2.ch9.prf64.ant_delay=16416 +ant2.ch9.prf64.ant_delay=16445 ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16430 +ant3.ch5.prf16.ant_delay=16460 ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 ant3.ch5.prf16.pg_delay=0 -ant3.ch5.prf64.ant_delay=16430 +ant3.ch5.prf64.ant_delay=16460 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16416 +ant3.ch9.prf16.ant_delay=16445 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16416 +ant3.ch9.prf64.ant_delay=16445 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf new file mode 100644 index 0000000..1c98823 --- /dev/null +++ b/uwb/UWB-calibration-restricted.conf @@ -0,0 +1,148 @@ +[CCC]version=3 +[CCC]wifi_coex_time_gap=10 +[CCC]ap_coop_mode=1 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant2 +[CCC]alternate_pulse_shape=0x00 +ant0.ch5.prf16.ant_delay=16449 +ant0.ch5.prf16.tx_power=0xFFFFD4FF +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x28 +ant0.ch5.prf64.ant_delay=16449 +ant0.ch5.prf64.tx_power=0xFFFFD4FF +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x28 +ant0.ch9.prf16.ant_delay=16451 +ant0.ch9.prf16.tx_power=0xFEFEC0FE +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x28 +ant0.ch9.prf64.ant_delay=16451 +ant0.ch9.prf64.tx_power=0xFEFEC0FE +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x28 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16450 +ant1.ch5.prf16.tx_power=0xFFFFFFFF +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x26 +ant1.ch5.prf64.ant_delay=16450 +ant1.ch5.prf64.tx_power=0xFFFFFFFF +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x26 +ant1.ch9.prf16.ant_delay=16451 +ant1.ch9.prf16.tx_power=0x3E3E303E +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0x16 +ant1.ch9.prf64.ant_delay=16451 +ant1.ch9.prf64.tx_power=0x3E3E303E +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0x16 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16450 +ant2.ch5.prf16.tx_power=0 +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0 +ant2.ch5.prf64.ant_delay=16450 +ant2.ch5.prf64.tx_power=0 +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0 +ant2.ch9.prf16.ant_delay=16451 +ant2.ch9.prf16.tx_power=0x8E8E748E +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x28 +ant2.ch9.prf64.ant_delay=16451 +ant2.ch9.prf64.tx_power=0x8E8E748E +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x28 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16450 +ant3.ch5.prf16.tx_power=0 +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0 +ant3.ch5.prf64.ant_delay=16450 +ant3.ch5.prf64.tx_power=0 +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0 +ant3.ch9.prf16.ant_delay=16450 +ant3.ch9.prf16.tx_power=0 +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0 +ant3.ch9.prf64.ant_delay=16450 +ant3.ch9.prf64.tx_power=0 +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0 +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=2421 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=0 +ant1.ant3.ch9.pdoa_offset=-6159 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant2.ch5.pdoa_lut=0a:f4:77:0a:d9:f4:c5:09:c1:f5:12:09:df:f5:60:08:7f:f6:ac:07:dd:f6:fa:06:f2:f6:48:06:89:f7:96:05:d1:f7:e3:04:54:f8:2f:04:f0:f8:7d:03:46:fa:cb:02:b0:fb:19:02:23:fd:64:01:a2:fe:b2:00:00:00:00:00:31:01:4e:ff:a6:02:9c:fe:0a:04:e7:fd:52:05:35:fd:73:06:83:fc:cb:07:d1:fb:be:08:1d:fb:f8:09:6a:fa:39:0b:b8:f9:81:0c:06:f9:1b:0d:54:f8:87:0d:a0:f7:a0:0e:ee:f6:06:0f:3b:f6:2d:0f:89:f5 +ant1.ant2.ch9.pdoa_lut=d7:f1:85:f5:66:f2:3d:f6:b8:f2:f6:f6:48:f3:9a:f7:9a:f3:52:f8:00:f4:0a:f9:a4:f4:ae:f9:85:f5:66:fa:b8:f6:1f:fb:ec:f7:d7:fb:ae:f9:7b:fc:33:fb:33:fd:e1:fc:ec:fd:29:fe:a4:fe:e1:fe:48:ff:d7:ff:00:00:b8:00:b8:00:d7:01:5c:01:5c:03:14:02:1f:05:cd:02:52:06:85:03:d7:07:29:04:0a:09:e1:04:3d:0a:9a:05:33:0b:52:06:29:0c:f6:06:c3:0d:ae:07:5c:0f:66:08:1f:11:0a:09:66:12:c3:09:00:14:7b:0a +ant1.ant3.ch5.pdoa_lut=89:f4:ac:07:a2:f4:60:08:ae:f4:77:0a:0a:f5:12:09:7d:f5:c5:09:8d:f5:fa:06:0a:f7:48:06:9a:f7:96:05:fa:f7:e3:04:68:f8:2f:04:f0:f9:7d:03:fa:fb:cb:02:6d:fd:19:02:2f:fe:64:01:98:fe:b2:00:00:00:00:00:1d:02:4e:ff:2d:02:e7:fd:33:02:9c:fe:0a:03:35:fd:6f:04:83:fc:db:05:d1:fb:85:07:1d:fb:b0:08:6a:fa:06:09:b8:f9:71:09:06:f9:48:0a:54:f8:4e:0b:a0:f7:58:0c:3b:f6:62:0c:ee:f6:c5:0c:89:f5 +ant1.ant3.ch9.pdoa_lut=3d:f2:85:f5:52:f2:3d:f6:cd:f2:f6:f6:e1:f2:9a:f7:0a:f3:52:f8:1f:f3:0a:f9:33:f3:ae:f9:71:f3:66:fa:52:f4:1f:fb:85:f5:d7:fb:9a:f7:7b:fc:0a:f9:33:fd:29:fa:ec:fd:ae:fb:a4:fe:ec:fd:48:ff:1f:ff:00:00:cd:00:b8:00:0a:03:5c:01:8f:04:14:02:b8:06:cd:02:66:08:85:03:3d:0a:29:04:7b:0c:e1:04:0a:0d:9a:05:29:0e:52:06:8f:0e:f6:06:a4:0e:ae:07:b8:0e:66:08:cd:0e:0a:09:33:0f:c3:09:c3:0f:7b:0a +xtal_trim=23 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +alternate_pulse_shape=0x00 +restricted_channels=0xFFFF +[HAL]aoa_restricted_channels=0x20 +[HAL]aoa_capability=2 +[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=3 +[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0 +[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8 +[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4 +[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4 +[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=4 +[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3 +[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8 +[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3 +[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3 +[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4 +[HAL]ant_sets.ch5.azimuth_elevation.tx_ant_set_nonranging=0 +[HAL]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging=0 +[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3 +[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3 +[HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8 +[HAL]ant_sets.ch9.azimuth_elevation.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 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index 4e7d2de..8325fe7 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -12,76 +12,76 @@ [CCC]ap_coop_mode=1 [CCC]antenna_selection=4 [CCC]wifi_coex_min_spacing=0x08 -ant0.ch5.prf16.ant_delay=16430 +ant0.ch5.prf16.ant_delay=16460 ant0.ch5.prf16.tx_power=0x4f4f444f ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x28 -ant0.ch5.prf64.ant_delay=16430 +ant0.ch5.prf64.ant_delay=16460 ant0.ch5.prf64.tx_power=0x4f4f444f ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x28 -ant0.ch9.prf16.ant_delay=16416 +ant0.ch9.prf16.ant_delay=16445 ant0.ch9.prf16.tx_power=0x5e5e4c5e ant0.ch9.prf16.pg_count=0 ant0.ch9.prf16.pg_delay=0x28 -ant0.ch9.prf64.ant_delay=16416 +ant0.ch9.prf64.ant_delay=16445 ant0.ch9.prf64.tx_power=0x5e5e4c5e ant0.ch9.prf64.pg_count=0 ant0.ch9.prf64.pg_delay=0x28 ant0.port=0 ant0.selector_gpio=7 ant0.selector_gpio_value=0 -ant1.ch5.prf16.ant_delay=16430 +ant1.ch5.prf16.ant_delay=16460 ant1.ch5.prf16.tx_power=0 ant1.ch5.prf16.pg_count=0 ant1.ch5.prf16.pg_delay=0 -ant1.ch5.prf64.ant_delay=16430 +ant1.ch5.prf64.ant_delay=16460 ant1.ch5.prf64.tx_power=0 ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0 -ant1.ch9.prf16.ant_delay=16416 +ant1.ch9.prf16.ant_delay=16445 ant1.ch9.prf16.tx_power=0 ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16416 +ant1.ch9.prf64.ant_delay=16445 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=16430 +ant2.ch5.prf16.ant_delay=16460 ant2.ch5.prf16.tx_power=0 ant2.ch5.prf16.pg_count=0 ant2.ch5.prf16.pg_delay=0 -ant2.ch5.prf64.ant_delay=16430 +ant2.ch5.prf64.ant_delay=16460 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16416 +ant2.ch9.prf16.ant_delay=16445 ant2.ch9.prf16.tx_power=0 ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0 -ant2.ch9.prf64.ant_delay=16416 +ant2.ch9.prf64.ant_delay=16445 ant2.ch9.prf64.tx_power=0 ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16430 +ant3.ch5.prf16.ant_delay=16460 ant3.ch5.prf16.tx_power=0 ant3.ch5.prf16.pg_count=0 ant3.ch5.prf16.pg_delay=0 -ant3.ch5.prf64.ant_delay=16430 +ant3.ch5.prf64.ant_delay=16460 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16416 +ant3.ch9.prf16.ant_delay=16445 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16416 +ant3.ch9.prf64.ant_delay=16445 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index c7075bf..4a00743 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -20,7 +20,7 @@ LOCAL_UWB_CAL_DIR=device/google/tangorpro/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-restricted.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 \ diff --git a/uwb/uwb_country.conf b/uwb/uwb_country.conf index 7ba69f2..92e7ecc 100644 --- a/uwb/uwb_country.conf +++ b/uwb/uwb_country.conf @@ -16,3 +16,21 @@ *JP "Japan": "jp" + +*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 3fe5b37b93a586d014d586ff71ed27cfc3110a30 Mon Sep 17 00:00:00 2001 From: Gaurav Sarode Date: Thu, 13 Jul 2023 17:12:26 -0700 Subject: [PATCH 8/8] Fix tangorpro_car build file path bug: 291147977 Test: local build (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cb039ba50208e943fdc9bd722ef6457073e3db84) Merged-In: I54c9e4d7523ce2d6f9faf50fdc126163e9547593 Change-Id: I54c9e4d7523ce2d6f9faf50fdc126163e9547593 --- tangorpro/BoardConfig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tangorpro/BoardConfig.mk b/tangorpro/BoardConfig.mk index 0aca763..a38dff3 100644 --- a/tangorpro/BoardConfig.mk +++ b/tangorpro/BoardConfig.mk @@ -23,7 +23,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 ifdef PHONE_CAR_BOARD_PRODUCT - include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk + include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk else TARGET_SCREEN_DENSITY := 320 endif