diff --git a/device-oriole.mk b/device-oriole.mk
index 2e3b023..3ee0368 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -238,3 +238,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.leaudio_offload.disabled=true \
persist.bluetooth.le_audio_test=true
endif
+
+# Device features
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
diff --git a/device-raven.mk b/device-raven.mk
index 96ddd12..91e3942 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -255,3 +255,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.leaudio_offload.disabled=true \
persist.bluetooth.le_audio_test=true
endif
+
+# Device features
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
diff --git a/device-slider.mk b/device-slider.mk
index 26f8798..647ee73 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -116,3 +116,7 @@ PRODUCT_COPY_FILES += \
# This device is shipped with 31 (Android S)
PRODUCT_SHIPPING_API_LEVEL := 31
+
+# Device features
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
diff --git a/device-whitefin.mk b/device-whitefin.mk
index 69f129d..577092e 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -97,3 +97,7 @@ PRODUCT_COPY_FILES += \
# This device is shipped with 31 (Android S)
PRODUCT_SHIPPING_API_LEVEL := 31
+
+# Device features
+PRODUCT_COPY_FILES += \
+ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml
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 ed02d61..0b63462 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -236,35 +236,35 @@
-->
- 0.0
- - 160.0
+ - 60.0
- 0.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 100.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 100.0
- 0.0
- - 160.0
+ - 60.0
- 100.0
- 0.0
- - 160.0
+ - 60.0
- 100.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 100.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 100.0
- 0.0
- - 160.0
+ - 60.0
- 100.0
@@ -277,35 +277,35 @@
-->
- 0.0
- - 160.0
+ - 60.0
- 0.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 50.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 100.0
- 0.0
- - 160.0
+ - 60.0
- 50.0
- 0.0
- - 160.0
+ - 60.0
- 100.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 50.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 100.0
- 0.0
- - 160.0
+ - 60.0
- 50.0
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 966332c..36b7fdf 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -204,35 +204,35 @@
-->
- 0.0
- - 160.0
+ - 60.0
- 0.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 100.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 100.0
- 0.0
- - 160.0
+ - 60.0
- 100.0
- 0.0
- - 160.0
+ - 60.0
- 100.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 100.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 100.0
- 0.0
- - 160.0
+ - 60.0
- 100.0
@@ -245,35 +245,35 @@
-->
- 0.0
- - 160.0
+ - 60.0
- 0.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 50.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 100.0
- 0.0
- - 160.0
+ - 60.0
- 50.0
- 0.0
- - 160.0
+ - 60.0
- 100.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 50.0
- - 0.24
- - 200.0
+ - 0.4
+ - 120.0
- 100.0
- 0.0
- - 160.0
+ - 60.0
- 50.0
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf
index 614093a..dbda3f4 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -1,6 +1,4 @@
-[CCC]format=1
-[CCC]kind=0
-[CCC]settings=1
+[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
@@ -110,8 +108,26 @@ xtal_trim=31
temperature_reference=85
smart_tx_power=1
auto_sleep_margin=20000
-[HAL]antenna_pair_azimuth=4
-[HAL]antenna_pair_elevation=0xff
-[HAL]tx_antenna=0
-[HAL]minimum_system_offset_uwbtime0=300
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 = 4
+[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 0
+[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 0
+[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 6
+[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging = 4
+[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 = 6
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 4
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 0
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 0
+[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 6
+[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=300
+coex_gpio=4
+coex_delay_us=1000
+coex_margin_us=500
+coex_interval_us=2000