diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf
index 12b7f47..8514ffa 100644
--- a/uwb/UWB-calibration-ce.conf
+++ b/uwb/UWB-calibration-ce.conf
@@ -1,17 +1,10 @@
-[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]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0x4B4B234B
 ant0.ch5.prf16.pg_count=0
@@ -109,6 +102,7 @@ temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0
+[HAL]aoa_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-default.conf b/uwb/UWB-calibration-default.conf
index 25b1bb1..7f02b49 100644
--- a/uwb/UWB-calibration-default.conf
+++ b/uwb/UWB-calibration-default.conf
@@ -1,17 +1,10 @@
-[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]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0x47472347
 ant0.ch5.prf16.pg_count=0
@@ -109,6 +102,7 @@ temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0
+[HAL]aoa_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-fcc.conf b/uwb/UWB-calibration-fcc.conf
index 25b1bb1..7f02b49 100644
--- a/uwb/UWB-calibration-fcc.conf
+++ b/uwb/UWB-calibration-fcc.conf
@@ -1,17 +1,10 @@
-[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]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0x47472347
 ant0.ch5.prf16.pg_count=0
@@ -109,6 +102,7 @@ temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0
+[HAL]aoa_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-jp.conf b/uwb/UWB-calibration-jp.conf
index 9dfc069..6eba206 100644
--- a/uwb/UWB-calibration-jp.conf
+++ b/uwb/UWB-calibration-jp.conf
@@ -1,17 +1,10 @@
-[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]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x01
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0
 ant0.ch5.prf16.pg_count=0
@@ -110,6 +103,7 @@ smart_tx_power=1
 auto_sleep_margin=20000
 alternate_pulse_shape=0x01
 restricted_channels=0x20
+[HAL]aoa_restricted_channels=0x20
 [HAL]aoa_capability=1
 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6
 [HAL]ant_sets.ch5.range.rx_ant_set_ranging = 6
diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf
index 681a5f3..f492db3 100644
--- a/uwb/UWB-calibration-restricted.conf
+++ b/uwb/UWB-calibration-restricted.conf
@@ -1,17 +1,10 @@
-[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]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0x47472347
 ant0.ch5.prf16.pg_count=0
@@ -109,6 +102,7 @@ temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0xffff
+[HAL]aoa_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-tw.conf b/uwb/UWB-calibration-tw.conf
index 7bd68dc..c709cec 100644
--- a/uwb/UWB-calibration-tw.conf
+++ b/uwb/UWB-calibration-tw.conf
@@ -1,17 +1,10 @@
-[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]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0x47472347
 ant0.ch5.prf16.pg_count=0
@@ -109,6 +102,7 @@ temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0x20
+[HAL]aoa_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.conf
index 47d917c..5972577 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -1,17 +1,10 @@
-[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]version=3
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
-[CCC]antenna_selection=4
 [CCC]wifi_coex_min_spacing=0x08
+[CCC]ch5.antenna_selection=ant0
+[CCC]ch9.antenna_selection=ant0
+[CCC]alternate_pulse_shape=0x00
 ant0.ch5.prf16.ant_delay=16414
 ant0.ch5.prf16.tx_power=0x47472347
 ant0.ch5.prf16.pg_count=0
@@ -109,6 +102,7 @@ temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0
+[HAL]aoa_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
@@ -139,4 +133,4 @@ coex_gpio=4
 coex_delay_us=1000
 coex_margin_us=500
 coex_interval_us=2000
-alternate_pulse_shape=0x01
+alternate_pulse_shape=0x00