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.conf b/uwb/UWB-calibration-ce.conf
similarity index 65%
copy from uwb/UWB-calibration.conf
copy to uwb/UWB-calibration-ce.conf
index 061fed9..1117a6a 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration-ce.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=0x4B4B234B
 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=0x34
+ant0.ch5.prf64.ant_delay=16414
+ant0.ch5.prf64.tx_power=0x4B4B234B
 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=0x34
+ant0.ch9.prf16.ant_delay=16426
+ant0.ch9.prf16.tx_power=0x53532B53
 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=0x34
+ant0.ch9.prf64.ant_delay=16426
+ant0.ch9.prf64.tx_power=0x53532B53
 ant0.ch9.prf64.pg_count=0
-ant0.ch9.prf64.pg_delay=0x26
+ant0.ch9.prf64.pg_delay=0x34
 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=0x6B6B336B
 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=0x34
+ant1.ch5.prf64.ant_delay=16446
+ant1.ch5.prf64.tx_power=0x6B6B336B
 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=0x34
+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=0x47472347
 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=0x34
+ant2.ch9.prf64.ant_delay=16429
+ant2.ch9.prf64.tx_power=0x47472347
 ant2.ch9.prf64.pg_count=0
-ant2.ch9.prf64.pg_delay=0x26
+ant2.ch9.prf64.pg_delay=0x34
 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=0x47472347
 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=0x34
+ant3.ch9.prf64.ant_delay=16429
+ant3.ch9.prf64.tx_power=0x47472347
 ant3.ch9.prf64.pg_count=0
-ant3.ch9.prf64.pg_delay=0x26
+ant3.ch9.prf64.pg_delay=0x34
 ant3.port=1
 ant3.selector_gpio=6
 ant3.selector_gpio_value=1
@@ -114,10 +114,10 @@
 [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 = 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 = 0
-[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 0
+[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
@@ -130,10 +130,10 @@
 [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 = 6
+[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 = 0
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0
+[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
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration-default.conf
similarity index 67%
copy from uwb/UWB-calibration.conf
copy to uwb/UWB-calibration-default.conf
index 061fed9..b08a0f4 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration-default.conf
@@ -12,77 +12,77 @@
 [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=0x47472347
 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=0x34
+ant0.ch5.prf64.ant_delay=16414
+ant0.ch5.prf64.tx_power=0x47472347
 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=0x34
+ant0.ch9.prf16.ant_delay=16426
+ant0.ch9.prf16.tx_power=0x47472347
 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=0x34
+ant0.ch9.prf64.ant_delay=16426
+ant0.ch9.prf64.tx_power=0x47472347
 ant0.ch9.prf64.pg_count=0
-ant0.ch9.prf64.pg_delay=0x26
+ant0.ch9.prf64.pg_delay=0x34
 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=0x5B5B2B5B
 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=0x20
+ant1.ch5.prf64.ant_delay=16446
+ant1.ch5.prf64.tx_power=0x5B5B2B5B
 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=0x20
+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=0x5F5F2F5F
 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.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=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=0x5F5F2F5F
 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.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
@@ -114,10 +114,10 @@
 [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 = 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 = 0
-[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 0
+[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
@@ -130,10 +130,10 @@
 [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 = 6
+[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 = 0
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0
+[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
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration-fcc.conf
similarity index 67%
copy from uwb/UWB-calibration.conf
copy to uwb/UWB-calibration-fcc.conf
index 061fed9..b08a0f4 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration-fcc.conf
@@ -12,77 +12,77 @@
 [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=0x47472347
 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=0x34
+ant0.ch5.prf64.ant_delay=16414
+ant0.ch5.prf64.tx_power=0x47472347
 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=0x34
+ant0.ch9.prf16.ant_delay=16426
+ant0.ch9.prf16.tx_power=0x47472347
 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=0x34
+ant0.ch9.prf64.ant_delay=16426
+ant0.ch9.prf64.tx_power=0x47472347
 ant0.ch9.prf64.pg_count=0
-ant0.ch9.prf64.pg_delay=0x26
+ant0.ch9.prf64.pg_delay=0x34
 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=0x5B5B2B5B
 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=0x20
+ant1.ch5.prf64.ant_delay=16446
+ant1.ch5.prf64.tx_power=0x5B5B2B5B
 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=0x20
+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=0x5F5F2F5F
 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.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=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=0x5F5F2F5F
 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.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
@@ -114,10 +114,10 @@
 [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 = 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 = 0
-[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 0
+[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
@@ -130,10 +130,10 @@
 [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 = 6
+[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 = 0
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0
+[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
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 @@
 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.conf b/uwb/UWB-calibration-restricted.conf
similarity index 66%
copy from uwb/UWB-calibration.conf
copy to uwb/UWB-calibration-restricted.conf
index 061fed9..14552c3 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration-restricted.conf
@@ -12,77 +12,77 @@
 [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=0x47472347
 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=0x34
+ant0.ch5.prf64.ant_delay=16414
+ant0.ch5.prf64.tx_power=0x47472347
 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=0x34
+ant0.ch9.prf16.ant_delay=16426
+ant0.ch9.prf16.tx_power=0x47472347
 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=0x34
+ant0.ch9.prf64.ant_delay=16426
+ant0.ch9.prf64.tx_power=0x47472347
 ant0.ch9.prf64.pg_count=0
-ant0.ch9.prf64.pg_delay=0x26
+ant0.ch9.prf64.pg_delay=0x34
 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=0x5B5B2B5B
 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=0x20
+ant1.ch5.prf64.ant_delay=16446
+ant1.ch5.prf64.tx_power=0x5B5B2B5B
 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=0x20
+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=0x5F5F2F5F
 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.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=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=0x5F5F2F5F
 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.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
@@ -108,16 +108,16 @@
 temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
-restricted_channels=0
+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 = 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 = 0
-[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 0
+[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
@@ -130,10 +130,10 @@
 [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 = 6
+[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 = 0
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0
+[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
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration-tw.conf
similarity index 66%
copy from uwb/UWB-calibration.conf
copy to uwb/UWB-calibration-tw.conf
index 061fed9..95c0d2a 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration-tw.conf
@@ -12,77 +12,77 @@
 [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=0x47472347
 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=0x34
+ant0.ch5.prf64.ant_delay=16414
+ant0.ch5.prf64.tx_power=0x47472347
 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=0x34
+ant0.ch9.prf16.ant_delay=16426
+ant0.ch9.prf16.tx_power=0x47472347
 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=0x34
+ant0.ch9.prf64.ant_delay=16426
+ant0.ch9.prf64.tx_power=0x47472347
 ant0.ch9.prf64.pg_count=0
-ant0.ch9.prf64.pg_delay=0x26
+ant0.ch9.prf64.pg_delay=0x34
 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=0x5B5B2B5B
 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=0x20
+ant1.ch5.prf64.ant_delay=16446
+ant1.ch5.prf64.tx_power=0x5B5B2B5B
 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=0x20
+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=0x5F5F2F5F
 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.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=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=0x5F5F2F5F
 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.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
@@ -108,16 +108,16 @@
 temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
-restricted_channels=0
+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 = 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 = 0
-[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging = 0
+[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
@@ -130,10 +130,10 @@
 [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 = 6
+[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 = 0
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0
+[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
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 @@
 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"