diff --git a/uwb/UWB-calibration_ce.conf b/uwb/UWB-calibration-ce.conf
similarity index 58%
rename from uwb/UWB-calibration_ce.conf
rename to uwb/UWB-calibration-ce.conf
index 81a487c..bdb8ff5 100644
--- a/uwb/UWB-calibration_ce.conf
+++ b/uwb/UWB-calibration-ce.conf
@@ -11,39 +11,39 @@
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
 [CCC]antenna_selection=4
-ant0.ch5.prf16.ant_delay=16450
-ant0.ch5.prf16.tx_power=0x43433843
+ant0.ch5.prf16.ant_delay=16447
+ant0.ch5.prf16.tx_power=0x53532B53
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x34
-ant0.ch5.prf64.ant_delay=16450
-ant0.ch5.prf64.tx_power=0x43433843
+ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.tx_power=0x53532B53
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x34
-ant0.ch9.prf16.ant_delay=16450
-ant0.ch9.prf16.tx_power=0x4A4A3C4A
+ant0.ch9.prf16.ant_delay=16409
+ant0.ch9.prf16.tx_power=0x53532753
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x34
-ant0.ch9.prf64.ant_delay=16450
-ant0.ch9.prf64.tx_power=0x4A4A3C4A
+ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.tx_power=0x53532753
 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=16450
+ant1.ch5.prf16.ant_delay=16465
 ant1.ch5.prf16.tx_power=0
 ant1.ch5.prf16.pg_count=0
 ant1.ch5.prf16.pg_delay=0
-ant1.ch5.prf64.ant_delay=16450
+ant1.ch5.prf64.ant_delay=16465
 ant1.ch5.prf64.tx_power=0
 ant1.ch5.prf64.pg_count=0
 ant1.ch5.prf64.pg_delay=0
-ant1.ch9.prf16.ant_delay=16450
-ant1.ch9.prf16.tx_power=0x3E3E303E
+ant1.ch9.prf16.ant_delay=16414
+ant1.ch9.prf16.tx_power=0x47472347
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x34
-ant1.ch9.prf64.ant_delay=16450
-ant1.ch9.prf64.tx_power=0x3E3E303E
+ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.tx_power=0x47472347
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x34
 ant1.port=0
@@ -69,11 +69,11 @@ ant2.port=1
 ant2.selector_gpio=6
 ant2.selector_gpio_value=0
 ant3.ch5.prf16.ant_delay=16450
-ant3.ch5.prf16.tx_power=0x5B5B4C5B
+ant3.ch5.prf16.tx_power=0x6B6B336B
 ant3.ch5.prf16.pg_count=0
 ant3.ch5.prf16.pg_delay=0x34
 ant3.ch5.prf64.ant_delay=16450
-ant3.ch5.prf64.tx_power=0x5B5B4C5B
+ant3.ch5.prf64.tx_power=0x6B6B336B
 ant3.ch5.prf64.pg_count=0
 ant3.ch5.prf64.pg_delay=0x34
 ant3.ch9.prf16.ant_delay=16450
@@ -103,43 +103,43 @@ 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:ec:77:0a:d9:ed:c5:09:73:ee:12:09:58:ef:60:08:73:f0:ac:07:f0:f1:fa:06:d7:f2:48:06:f6:f3:96:05:cf:f5:e3:04:2d:f7:2f:04:23:f8:7d:03:a4:f9:cb:02:4c:fb:19:02:cb:fc:64:01:33:fe:b2:00:00:00:00:00:f6:01:4e:ff:ba:03:9c:fe:83:05:e7:fd:21:07:35:fd:6d:08:83:fc:71:09:d1:fb:ba:0a:1d:fb:c3:0b:6a:fa:f0:0c:b8:f9:c7:0d:06:f9:77:0e:54:f8:42:0f:a0:f7:89:0f:ee:f6:87:10:3b:f6:c7:10:89:f5
-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=4e:ec:77:0a:9c:ee:c5:09:04:f0:12:09:44:f1:60:08:c3:f2:ac:07:54:f3:fa:06:4c:f4:48:06:12:f5:96:05:0a:f6:e3:04:21:f7:2f:04:19:f8:7d:03:79:f9:cb:02:ba:fa:19:02:73:fc:64:01:0e:fe:b2:00:00:00:00:00:d7:00:4e:ff:f6:01:9c:fe:21:04:e7:fd:60:04:35:fd:37:05:83:fc:0a:07:d1:fb:c5:07:1d:fb:fc:07:6a:fa:8f:08:b8:f9:b0:09:06:f9:39:0a:54:f8:c9:0a:a0:f7:58:0b:ee:f6:75:0b:89:f5:83:0b:3b:f6
+ant1.ant3.ch5.pdoa_lut=89:f4:54:f8:a2:f4:a0:f7:ae:f4:89:f5:0a:f5:ee:f6:7d:f5:3b:f6:8d:f5:06:f9:0a:f7:b8:f9:9a:f7:6a:fa:fa:f7:1d:fb:68:f8:d1:fb:f0:f9:83:fc:fa:fb:35:fd:6d:fd:e7:fd:2f:fe:9c:fe:98:fe:4e:ff:00:00:00:00:1d:02:b2:00:2d:02:19:02:33:02:64:01:0a:03:cb:02:6f:04:7d:03:db:05:2f:04:85:07:e3:04:b0:08:96:05:06:09:48:06:71:09:fa:06:48:0a:ac:07:4e:0b:60:08:58:0c:c5:09:62:0c:12:09:c5:0c:77:0a
+ant1.ant3.ch9.pdoa_lut=4e:ec:89:f5:9c:ee:3b:f6:04:f0:ee:f6:44:f1:a0:f7:c3:f2:54:f8:54:f3:06:f9:4c:f4:b8:f9:12:f5:6a:fa:0a:f6:1d:fb:21:f7:d1:fb:19:f8:83:fc:79:f9:35:fd:ba:fa:e7:fd:73:fc:9c:fe:0e:fe:4e:ff:00:00:00:00:d7:00:b2:00:f6:01:64:01:21:04:19:02:60:04:cb:02:37:05:7d:03:0a:07:2f:04:c5:07:e3:04:fc:07:96:05:8f:08:48:06:b0:09:fa:06:39:0a:ac:07:c9:0a:60:08:58:0b:12:09:75:0b:77:0a:83:0b:c5:09
 xtal_trim=23
 temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0
 [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 = 6
-[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6
-[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6
-[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6
-[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 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 = 4
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 4
-[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 = 3
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 3
-[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3
+[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=9
+[HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3
+[HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=9
+[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=9
+[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=6
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging=6
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=6
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging=6
+[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=9
+[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4
+[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=9
+[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=9
+[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=4
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=4
+[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=3
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=3
+[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=9
 [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.ch5.azimuth_elevation.tx_ant_set_nonranging=9
+[HAL]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging=9
 [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
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration-default.conf
similarity index 64%
rename from uwb/UWB-calibration.conf
rename to uwb/UWB-calibration-default.conf
index 8c69eff..0152159 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration-default.conf
@@ -12,19 +12,19 @@
 [CCC]ap_coop_mode=1
 [CCC]antenna_selection=4
 ant0.ch5.prf16.ant_delay=16447
-ant0.ch5.prf16.tx_power=0x4F4F444F
+ant0.ch5.prf16.tx_power=0x67672F67
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x26
 ant0.ch5.prf64.ant_delay=16447
-ant0.ch5.prf64.tx_power=0x4F4F444F
+ant0.ch5.prf64.tx_power=0x67672F67
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x26
 ant0.ch9.prf16.ant_delay=16409
-ant0.ch9.prf16.tx_power=0x66665466
+ant0.ch9.prf16.tx_power=0x57572B57
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x26
 ant0.ch9.prf64.ant_delay=16409
-ant0.ch9.prf64.tx_power=0x66665466
+ant0.ch9.prf64.tx_power=0x57572B57
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x26
 ant0.port=0
@@ -39,11 +39,11 @@ ant1.ch5.prf64.tx_power=0
 ant1.ch5.prf64.pg_count=0
 ant1.ch5.prf64.pg_delay=0
 ant1.ch9.prf16.ant_delay=16414
-ant1.ch9.prf16.tx_power=0x62625062
+ant1.ch9.prf16.tx_power=0x47472347
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x26
 ant1.ch9.prf64.ant_delay=16414
-ant1.ch9.prf64.tx_power=0x62625062
+ant1.ch9.prf64.tx_power=0x47472347
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x26
 ant1.port=0
@@ -69,11 +69,11 @@ ant2.port=1
 ant2.selector_gpio=6
 ant2.selector_gpio_value=0
 ant3.ch5.prf16.ant_delay=16450
-ant3.ch5.prf16.tx_power=0x23231C23
+ant3.ch5.prf16.tx_power=0x2B2B172B
 ant3.ch5.prf16.pg_count=0
 ant3.ch5.prf16.pg_delay=0x20
 ant3.ch5.prf64.ant_delay=16450
-ant3.ch5.prf64.tx_power=0x23231C23
+ant3.ch5.prf64.tx_power=0x2B2B172B
 ant3.ch5.prf64.pg_count=0
 ant3.ch5.prf64.pg_delay=0x20
 ant3.ch9.prf16.ant_delay=16450
@@ -103,39 +103,39 @@ 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:ec:77:0a:d9:ed:c5:09:73:ee:12:09:58:ef:60:08:73:f0:ac:07:f0:f1:fa:06:d7:f2:48:06:f6:f3:96:05:cf:f5:e3:04:2d:f7:2f:04:23:f8:7d:03:a4:f9:cb:02:4c:fb:19:02:cb:fc:64:01:33:fe:b2:00:00:00:00:00:f6:01:4e:ff:ba:03:9c:fe:83:05:e7:fd:21:07:35:fd:6d:08:83:fc:71:09:d1:fb:ba:0a:1d:fb:c3:0b:6a:fa:f0:0c:b8:f9:c7:0d:06:f9:77:0e:54:f8:42:0f:a0:f7:89:0f:ee:f6:87:10:3b:f6:c7:10:89:f5
-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=4e:ec:77:0a:9c:ee:c5:09:04:f0:12:09:44:f1:60:08:c3:f2:ac:07:54:f3:fa:06:4c:f4:48:06:12:f5:96:05:0a:f6:e3:04:21:f7:2f:04:19:f8:7d:03:79:f9:cb:02:ba:fa:19:02:73:fc:64:01:0e:fe:b2:00:00:00:00:00:d7:00:4e:ff:f6:01:9c:fe:21:04:e7:fd:60:04:35:fd:37:05:83:fc:0a:07:d1:fb:c5:07:1d:fb:fc:07:6a:fa:8f:08:b8:f9:b0:09:06:f9:39:0a:54:f8:c9:0a:a0:f7:58:0b:ee:f6:75:0b:89:f5:83:0b:3b:f6
+ant1.ant3.ch5.pdoa_lut=89:f4:54:f8:a2:f4:a0:f7:ae:f4:89:f5:0a:f5:ee:f6:7d:f5:3b:f6:8d:f5:06:f9:0a:f7:b8:f9:9a:f7:6a:fa:fa:f7:1d:fb:68:f8:d1:fb:f0:f9:83:fc:fa:fb:35:fd:6d:fd:e7:fd:2f:fe:9c:fe:98:fe:4e:ff:00:00:00:00:1d:02:b2:00:2d:02:19:02:33:02:64:01:0a:03:cb:02:6f:04:7d:03:db:05:2f:04:85:07:e3:04:b0:08:96:05:06:09:48:06:71:09:fa:06:48:0a:ac:07:4e:0b:60:08:58:0c:c5:09:62:0c:12:09:c5:0c:77:0a
+ant1.ant3.ch9.pdoa_lut=4e:ec:89:f5:9c:ee:3b:f6:04:f0:ee:f6:44:f1:a0:f7:c3:f2:54:f8:54:f3:06:f9:4c:f4:b8:f9:12:f5:6a:fa:0a:f6:1d:fb:21:f7:d1:fb:19:f8:83:fc:79:f9:35:fd:ba:fa:e7:fd:73:fc:9c:fe:0e:fe:4e:ff:00:00:00:00:d7:00:b2:00:f6:01:64:01:21:04:19:02:60:04:cb:02:37:05:7d:03:0a:07:2f:04:c5:07:e3:04:fc:07:96:05:8f:08:48:06:b0:09:fa:06:39:0a:ac:07:c9:0a:60:08:58:0b:12:09:75:0b:77:0a:83:0b:c5:09
 xtal_trim=23
 temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0
 [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 = 6
-[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6
-[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6
-[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6
-[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 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 = 4
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 4
-[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 = 3
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 3
-[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3
+[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_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=6
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging=6
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=6
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging=6
+[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=6
+[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=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=4
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=4
+[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=3
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=3
+[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=6
 [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
diff --git a/uwb/UWB-calibration_fcc.conf b/uwb/UWB-calibration-fcc.conf
similarity index 59%
rename from uwb/UWB-calibration_fcc.conf
rename to uwb/UWB-calibration-fcc.conf
index 3211ced..0152159 100644
--- a/uwb/UWB-calibration_fcc.conf
+++ b/uwb/UWB-calibration-fcc.conf
@@ -11,41 +11,41 @@
 [CCC]wifi_coex_time_gap=10
 [CCC]ap_coop_mode=1
 [CCC]antenna_selection=4
-ant0.ch5.prf16.ant_delay=16450
-ant0.ch5.prf16.tx_power=0x4F4F444F
+ant0.ch5.prf16.ant_delay=16447
+ant0.ch5.prf16.tx_power=0x67672F67
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x26
-ant0.ch5.prf64.ant_delay=16450
-ant0.ch5.prf64.tx_power=0x4F4F444F
+ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.tx_power=0x67672F67
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x26
-ant0.ch9.prf16.ant_delay=16450
-ant0.ch9.prf16.tx_power=0x4A4A3C4A
+ant0.ch9.prf16.ant_delay=16409
+ant0.ch9.prf16.tx_power=0x57572B57
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.ant_delay=16450
-ant0.ch9.prf64.tx_power=0x4A4A3C4A
+ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.tx_power=0x57572B57
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x26
 ant0.port=0
 ant0.selector_gpio=7
 ant0.selector_gpio_value=0
-ant1.ch5.prf16.ant_delay=16450
+ant1.ch5.prf16.ant_delay=16465
 ant1.ch5.prf16.tx_power=0
 ant1.ch5.prf16.pg_count=0
 ant1.ch5.prf16.pg_delay=0
-ant1.ch5.prf64.ant_delay=16450
+ant1.ch5.prf64.ant_delay=16465
 ant1.ch5.prf64.tx_power=0
 ant1.ch5.prf64.pg_count=0
 ant1.ch5.prf64.pg_delay=0
-ant1.ch9.prf16.ant_delay=16450
-ant1.ch9.prf16.tx_power=0x42423442
+ant1.ch9.prf16.ant_delay=16414
+ant1.ch9.prf16.tx_power=0x47472347
 ant1.ch9.prf16.pg_count=0
-ant1.ch9.prf16.pg_delay=0x20
-ant1.ch9.prf64.ant_delay=16450
-ant1.ch9.prf64.tx_power=0x42423442
+ant1.ch9.prf16.pg_delay=0x26
+ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.tx_power=0x47472347
 ant1.ch9.prf64.pg_count=0
-ant1.ch9.prf64.pg_delay=0x20
+ant1.ch9.prf64.pg_delay=0x26
 ant1.port=0
 ant1.selector_gpio=7
 ant1.selector_gpio_value=1
@@ -69,11 +69,11 @@ ant2.port=1
 ant2.selector_gpio=6
 ant2.selector_gpio_value=0
 ant3.ch5.prf16.ant_delay=16450
-ant3.ch5.prf16.tx_power=0x23231C23
+ant3.ch5.prf16.tx_power=0x2B2B172B
 ant3.ch5.prf16.pg_count=0
 ant3.ch5.prf16.pg_delay=0x20
 ant3.ch5.prf64.ant_delay=16450
-ant3.ch5.prf64.tx_power=0x23231C23
+ant3.ch5.prf64.tx_power=0x2B2B172B
 ant3.ch5.prf64.pg_count=0
 ant3.ch5.prf64.pg_delay=0x20
 ant3.ch9.prf16.ant_delay=16450
@@ -103,39 +103,39 @@ 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:ec:77:0a:d9:ed:c5:09:73:ee:12:09:58:ef:60:08:73:f0:ac:07:f0:f1:fa:06:d7:f2:48:06:f6:f3:96:05:cf:f5:e3:04:2d:f7:2f:04:23:f8:7d:03:a4:f9:cb:02:4c:fb:19:02:cb:fc:64:01:33:fe:b2:00:00:00:00:00:f6:01:4e:ff:ba:03:9c:fe:83:05:e7:fd:21:07:35:fd:6d:08:83:fc:71:09:d1:fb:ba:0a:1d:fb:c3:0b:6a:fa:f0:0c:b8:f9:c7:0d:06:f9:77:0e:54:f8:42:0f:a0:f7:89:0f:ee:f6:87:10:3b:f6:c7:10:89:f5
-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=4e:ec:77:0a:9c:ee:c5:09:04:f0:12:09:44:f1:60:08:c3:f2:ac:07:54:f3:fa:06:4c:f4:48:06:12:f5:96:05:0a:f6:e3:04:21:f7:2f:04:19:f8:7d:03:79:f9:cb:02:ba:fa:19:02:73:fc:64:01:0e:fe:b2:00:00:00:00:00:d7:00:4e:ff:f6:01:9c:fe:21:04:e7:fd:60:04:35:fd:37:05:83:fc:0a:07:d1:fb:c5:07:1d:fb:fc:07:6a:fa:8f:08:b8:f9:b0:09:06:f9:39:0a:54:f8:c9:0a:a0:f7:58:0b:ee:f6:75:0b:89:f5:83:0b:3b:f6
+ant1.ant3.ch5.pdoa_lut=89:f4:54:f8:a2:f4:a0:f7:ae:f4:89:f5:0a:f5:ee:f6:7d:f5:3b:f6:8d:f5:06:f9:0a:f7:b8:f9:9a:f7:6a:fa:fa:f7:1d:fb:68:f8:d1:fb:f0:f9:83:fc:fa:fb:35:fd:6d:fd:e7:fd:2f:fe:9c:fe:98:fe:4e:ff:00:00:00:00:1d:02:b2:00:2d:02:19:02:33:02:64:01:0a:03:cb:02:6f:04:7d:03:db:05:2f:04:85:07:e3:04:b0:08:96:05:06:09:48:06:71:09:fa:06:48:0a:ac:07:4e:0b:60:08:58:0c:c5:09:62:0c:12:09:c5:0c:77:0a
+ant1.ant3.ch9.pdoa_lut=4e:ec:89:f5:9c:ee:3b:f6:04:f0:ee:f6:44:f1:a0:f7:c3:f2:54:f8:54:f3:06:f9:4c:f4:b8:f9:12:f5:6a:fa:0a:f6:1d:fb:21:f7:d1:fb:19:f8:83:fc:79:f9:35:fd:ba:fa:e7:fd:73:fc:9c:fe:0e:fe:4e:ff:00:00:00:00:d7:00:b2:00:f6:01:64:01:21:04:19:02:60:04:cb:02:37:05:7d:03:0a:07:2f:04:c5:07:e3:04:fc:07:96:05:8f:08:48:06:b0:09:fa:06:39:0a:ac:07:c9:0a:60:08:58:0b:12:09:75:0b:77:0a:83:0b:c5:09
 xtal_trim=23
 temperature_reference=85
 smart_tx_power=1
 auto_sleep_margin=20000
 restricted_channels=0
 [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 = 6
-[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 6
-[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 6
-[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 6
-[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 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 = 4
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 4
-[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 = 3
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 3
-[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3
+[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_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=6
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging=6
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=6
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging=6
+[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=6
+[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=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=4
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=4
+[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=3
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=3
+[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=6
 [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
diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf
new file mode 100644
index 0000000..82ab648
--- /dev/null
+++ b/uwb/UWB-calibration-jp.conf
@@ -0,0 +1,154 @@
+[CCC]version=2
+[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
+[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
+[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
+[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
+[CCC]ant0.ch5.prf64.pdoa_offset=0
+[CCC]ant0.ch9.prf64.pdoa_offset=0
+[CCC]ant0.ch5.prf64.pll_locking_code=0
+[CCC]ant0.ch9.prf64.pll_locking_code=0
+[CCC]id=0
+[CCC]wifi_coex_time_gap=10
+[CCC]ap_coop_mode=1
+[CCC]antenna_selection=4
+ant0.ch5.prf16.ant_delay=16447
+ant0.ch5.prf16.tx_power=0
+ant0.ch5.prf16.pg_count=0
+ant0.ch5.prf16.pg_delay=0
+ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.tx_power=0
+ant0.ch5.prf64.pg_count=0
+ant0.ch5.prf64.pg_delay=0
+ant0.ch9.prf16.ant_delay=16409
+ant0.ch9.prf16.tx_power=0x5F5F2F5F
+ant0.ch9.prf16.pg_count=0
+ant0.ch9.prf16.pg_delay=0x26
+ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.tx_power=0x5F5F2F5F
+ant0.ch9.prf64.pg_count=0
+ant0.ch9.prf64.pg_delay=0x26
+ant0.port=0
+ant0.selector_gpio=7
+ant0.selector_gpio_value=0
+ant1.ch5.prf16.ant_delay=16465
+ant1.ch5.prf16.tx_power=0
+ant1.ch5.prf16.pg_count=0
+ant1.ch5.prf16.pg_delay=0
+ant1.ch5.prf64.ant_delay=16465
+ant1.ch5.prf64.tx_power=0
+ant1.ch5.prf64.pg_count=0
+ant1.ch5.prf64.pg_delay=0
+ant1.ch9.prf16.ant_delay=16414
+ant1.ch9.prf16.tx_power=0x3B3B1F3B
+ant1.ch9.prf16.pg_count=0
+ant1.ch9.prf16.pg_delay=0x26
+ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.tx_power=0x3B3B1F3B
+ant1.ch9.prf64.pg_count=0
+ant1.ch9.prf64.pg_delay=0x26
+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=16450
+ant2.ch9.prf16.tx_power=0
+ant2.ch9.prf16.pg_count=0
+ant2.ch9.prf16.pg_delay=0
+ant2.ch9.prf64.ant_delay=16450
+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=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=-2520
+ant1.ant2.ch9.pdoa_offset=1874
+ant0.ant3.ch5.pdoa_offset=0
+ant0.ant3.ch9.pdoa_offset=0
+ant1.ant3.ch5.pdoa_offset=-3080
+ant1.ant3.ch9.pdoa_offset=3214
+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:ec:77:0a:d9:ed:c5:09:73:ee:12:09:58:ef:60:08:73:f0:ac:07:f0:f1:fa:06:d7:f2:48:06:f6:f3:96:05:cf:f5:e3:04:2d:f7:2f:04:23:f8:7d:03:a4:f9:cb:02:4c:fb:19:02:cb:fc:64:01:33:fe:b2:00:00:00:00:00:f6:01:4e:ff:ba:03:9c:fe:83:05:e7:fd:21:07:35:fd:6d:08:83:fc:71:09:d1:fb:ba:0a:1d:fb:c3:0b:6a:fa:f0:0c:b8:f9:c7:0d:06:f9:77:0e:54:f8:42:0f:a0:f7:89:0f:ee:f6:87:10:3b:f6:c7:10:89:f5
+ant1.ant3.ch5.pdoa_lut=89:f4:54:f8:a2:f4:a0:f7:ae:f4:89:f5:0a:f5:ee:f6:7d:f5:3b:f6:8d:f5:06:f9:0a:f7:b8:f9:9a:f7:6a:fa:fa:f7:1d:fb:68:f8:d1:fb:f0:f9:83:fc:fa:fb:35:fd:6d:fd:e7:fd:2f:fe:9c:fe:98:fe:4e:ff:00:00:00:00:1d:02:b2:00:2d:02:19:02:33:02:64:01:0a:03:cb:02:6f:04:7d:03:db:05:2f:04:85:07:e3:04:b0:08:96:05:06:09:48:06:71:09:fa:06:48:0a:ac:07:4e:0b:60:08:58:0c:c5:09:62:0c:12:09:c5:0c:77:0a
+ant1.ant3.ch9.pdoa_lut=4e:ec:89:f5:9c:ee:3b:f6:04:f0:ee:f6:44:f1:a0:f7:c3:f2:54:f8:54:f3:06:f9:4c:f4:b8:f9:12:f5:6a:fa:0a:f6:1d:fb:21:f7:d1:fb:19:f8:83:fc:79:f9:35:fd:ba:fa:e7:fd:73:fc:9c:fe:0e:fe:4e:ff:00:00:00:00:d7:00:b2:00:f6:01:64:01:21:04:19:02:60:04:cb:02:37:05:7d:03:0a:07:2f:04:c5:07:e3:04:fc:07:96:05:8f:08:48:06:b0:09:fa:06:39:0a:ac:07:c9:0a:60:08:58:0b:12:09:75:0b:77:0a:83:0b:c5:09
+xtal_trim=23
+temperature_reference=85
+smart_tx_power=1
+auto_sleep_margin=20000
+alternate_pulse_shape=0x01
+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=3
+[HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=3
+[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=6
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging=6
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=6
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging=6
+[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4
+[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4
+[HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=4
+[HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=4
+[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=4
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=4
+[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=3
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=3
+[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=6
+[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=3
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=3
+[HAL]minimum_system_offset_uwbtime0=120
+coex_gpio=4
+coex_delay_us=1000
+coex_margin_us=500
+coex_interval_us=2000
+
diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf
new file mode 100644
index 0000000..9ccf267
--- /dev/null
+++ b/uwb/UWB-calibration-restricted.conf
@@ -0,0 +1,152 @@
+[CCC]version=2
+[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
+[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
+[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
+[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
+[CCC]ant0.ch5.prf64.pdoa_offset=0
+[CCC]ant0.ch9.prf64.pdoa_offset=0
+[CCC]ant0.ch5.prf64.pll_locking_code=0
+[CCC]ant0.ch9.prf64.pll_locking_code=0
+[CCC]id=0
+[CCC]wifi_coex_time_gap=10
+[CCC]ap_coop_mode=1
+[CCC]antenna_selection=4
+ant0.ch5.prf16.ant_delay=16447
+ant0.ch5.prf16.tx_power=0x67672F67
+ant0.ch5.prf16.pg_count=0
+ant0.ch5.prf16.pg_delay=0x26
+ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.tx_power=0x67672F67
+ant0.ch5.prf64.pg_count=0
+ant0.ch5.prf64.pg_delay=0x26
+ant0.ch9.prf16.ant_delay=16409
+ant0.ch9.prf16.tx_power=0x57572B57
+ant0.ch9.prf16.pg_count=0
+ant0.ch9.prf16.pg_delay=0x26
+ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.tx_power=0x57572B57
+ant0.ch9.prf64.pg_count=0
+ant0.ch9.prf64.pg_delay=0x26
+ant0.port=0
+ant0.selector_gpio=7
+ant0.selector_gpio_value=0
+ant1.ch5.prf16.ant_delay=16465
+ant1.ch5.prf16.tx_power=0
+ant1.ch5.prf16.pg_count=0
+ant1.ch5.prf16.pg_delay=0
+ant1.ch5.prf64.ant_delay=16465
+ant1.ch5.prf64.tx_power=0
+ant1.ch5.prf64.pg_count=0
+ant1.ch5.prf64.pg_delay=0
+ant1.ch9.prf16.ant_delay=16414
+ant1.ch9.prf16.tx_power=0x47472347
+ant1.ch9.prf16.pg_count=0
+ant1.ch9.prf16.pg_delay=0x26
+ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.tx_power=0x47472347
+ant1.ch9.prf64.pg_count=0
+ant1.ch9.prf64.pg_delay=0x26
+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=16450
+ant2.ch9.prf16.tx_power=0
+ant2.ch9.prf16.pg_count=0
+ant2.ch9.prf16.pg_delay=0
+ant2.ch9.prf64.ant_delay=16450
+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=16450
+ant3.ch5.prf16.tx_power=0x2B2B172B
+ant3.ch5.prf16.pg_count=0
+ant3.ch5.prf16.pg_delay=0x20
+ant3.ch5.prf64.ant_delay=16450
+ant3.ch5.prf64.tx_power=0x2B2B172B
+ant3.ch5.prf64.pg_count=0
+ant3.ch5.prf64.pg_delay=0x20
+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=-2520
+ant1.ant2.ch9.pdoa_offset=1874
+ant0.ant3.ch5.pdoa_offset=0
+ant0.ant3.ch9.pdoa_offset=0
+ant1.ant3.ch5.pdoa_offset=-3080
+ant1.ant3.ch9.pdoa_offset=3214
+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:ec:77:0a:d9:ed:c5:09:73:ee:12:09:58:ef:60:08:73:f0:ac:07:f0:f1:fa:06:d7:f2:48:06:f6:f3:96:05:cf:f5:e3:04:2d:f7:2f:04:23:f8:7d:03:a4:f9:cb:02:4c:fb:19:02:cb:fc:64:01:33:fe:b2:00:00:00:00:00:f6:01:4e:ff:ba:03:9c:fe:83:05:e7:fd:21:07:35:fd:6d:08:83:fc:71:09:d1:fb:ba:0a:1d:fb:c3:0b:6a:fa:f0:0c:b8:f9:c7:0d:06:f9:77:0e:54:f8:42:0f:a0:f7:89:0f:ee:f6:87:10:3b:f6:c7:10:89:f5
+ant1.ant3.ch5.pdoa_lut=89:f4:54:f8:a2:f4:a0:f7:ae:f4:89:f5:0a:f5:ee:f6:7d:f5:3b:f6:8d:f5:06:f9:0a:f7:b8:f9:9a:f7:6a:fa:fa:f7:1d:fb:68:f8:d1:fb:f0:f9:83:fc:fa:fb:35:fd:6d:fd:e7:fd:2f:fe:9c:fe:98:fe:4e:ff:00:00:00:00:1d:02:b2:00:2d:02:19:02:33:02:64:01:0a:03:cb:02:6f:04:7d:03:db:05:2f:04:85:07:e3:04:b0:08:96:05:06:09:48:06:71:09:fa:06:48:0a:ac:07:4e:0b:60:08:58:0c:c5:09:62:0c:12:09:c5:0c:77:0a
+ant1.ant3.ch9.pdoa_lut=4e:ec:89:f5:9c:ee:3b:f6:04:f0:ee:f6:44:f1:a0:f7:c3:f2:54:f8:54:f3:06:f9:4c:f4:b8:f9:12:f5:6a:fa:0a:f6:1d:fb:21:f7:d1:fb:19:f8:83:fc:79:f9:35:fd:ba:fa:e7:fd:73:fc:9c:fe:0e:fe:4e:ff:00:00:00:00:d7:00:b2:00:f6:01:64:01:21:04:19:02:60:04:cb:02:37:05:7d:03:0a:07:2f:04:c5:07:e3:04:fc:07:96:05:8f:08:48:06:b0:09:fa:06:39:0a:ac:07:c9:0a:60:08:58:0b:12:09:75:0b:77:0a:83:0b:c5:09
+xtal_trim=23
+temperature_reference=85
+smart_tx_power=1
+auto_sleep_margin=20000
+restricted_channels=0xFFFF
+[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=6
+[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=6
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging=6
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=6
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging=6
+[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=6
+[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=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=4
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=4
+[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=3
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=3
+[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=6
+[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=3
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=3
+[HAL]minimum_system_offset_uwbtime0=120
+coex_gpio=4
+coex_delay_us=1000
+coex_margin_us=500
+coex_interval_us=2000
diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf
new file mode 100644
index 0000000..3699d7a
--- /dev/null
+++ b/uwb/UWB-calibration-tw.conf
@@ -0,0 +1,152 @@
+[CCC]version=2
+[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0
+[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0
+[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0
+[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0
+[CCC]ant0.ch5.prf64.pdoa_offset=0
+[CCC]ant0.ch9.prf64.pdoa_offset=0
+[CCC]ant0.ch5.prf64.pll_locking_code=0
+[CCC]ant0.ch9.prf64.pll_locking_code=0
+[CCC]id=0
+[CCC]wifi_coex_time_gap=10
+[CCC]ap_coop_mode=1
+[CCC]antenna_selection=4
+ant0.ch5.prf16.ant_delay=16447
+ant0.ch5.prf16.tx_power=0x67672F67
+ant0.ch5.prf16.pg_count=0
+ant0.ch5.prf16.pg_delay=0x26
+ant0.ch5.prf64.ant_delay=16447
+ant0.ch5.prf64.tx_power=0x67672F67
+ant0.ch5.prf64.pg_count=0
+ant0.ch5.prf64.pg_delay=0x26
+ant0.ch9.prf16.ant_delay=16409
+ant0.ch9.prf16.tx_power=0x57572B57
+ant0.ch9.prf16.pg_count=0
+ant0.ch9.prf16.pg_delay=0x26
+ant0.ch9.prf64.ant_delay=16409
+ant0.ch9.prf64.tx_power=0x57572B57
+ant0.ch9.prf64.pg_count=0
+ant0.ch9.prf64.pg_delay=0x26
+ant0.port=0
+ant0.selector_gpio=7
+ant0.selector_gpio_value=0
+ant1.ch5.prf16.ant_delay=16465
+ant1.ch5.prf16.tx_power=0
+ant1.ch5.prf16.pg_count=0
+ant1.ch5.prf16.pg_delay=0
+ant1.ch5.prf64.ant_delay=16465
+ant1.ch5.prf64.tx_power=0
+ant1.ch5.prf64.pg_count=0
+ant1.ch5.prf64.pg_delay=0
+ant1.ch9.prf16.ant_delay=16414
+ant1.ch9.prf16.tx_power=0x47472347
+ant1.ch9.prf16.pg_count=0
+ant1.ch9.prf16.pg_delay=0x26
+ant1.ch9.prf64.ant_delay=16414
+ant1.ch9.prf64.tx_power=0x47472347
+ant1.ch9.prf64.pg_count=0
+ant1.ch9.prf64.pg_delay=0x26
+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=16450
+ant2.ch9.prf16.tx_power=0
+ant2.ch9.prf16.pg_count=0
+ant2.ch9.prf16.pg_delay=0
+ant2.ch9.prf64.ant_delay=16450
+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=16450
+ant3.ch5.prf16.tx_power=0x2B2B172B
+ant3.ch5.prf16.pg_count=0
+ant3.ch5.prf16.pg_delay=0x20
+ant3.ch5.prf64.ant_delay=16450
+ant3.ch5.prf64.tx_power=0x2B2B172B
+ant3.ch5.prf64.pg_count=0
+ant3.ch5.prf64.pg_delay=0x20
+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=-2520
+ant1.ant2.ch9.pdoa_offset=1874
+ant0.ant3.ch5.pdoa_offset=0
+ant0.ant3.ch9.pdoa_offset=0
+ant1.ant3.ch5.pdoa_offset=-3080
+ant1.ant3.ch9.pdoa_offset=3214
+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:ec:77:0a:d9:ed:c5:09:73:ee:12:09:58:ef:60:08:73:f0:ac:07:f0:f1:fa:06:d7:f2:48:06:f6:f3:96:05:cf:f5:e3:04:2d:f7:2f:04:23:f8:7d:03:a4:f9:cb:02:4c:fb:19:02:cb:fc:64:01:33:fe:b2:00:00:00:00:00:f6:01:4e:ff:ba:03:9c:fe:83:05:e7:fd:21:07:35:fd:6d:08:83:fc:71:09:d1:fb:ba:0a:1d:fb:c3:0b:6a:fa:f0:0c:b8:f9:c7:0d:06:f9:77:0e:54:f8:42:0f:a0:f7:89:0f:ee:f6:87:10:3b:f6:c7:10:89:f5
+ant1.ant3.ch5.pdoa_lut=89:f4:54:f8:a2:f4:a0:f7:ae:f4:89:f5:0a:f5:ee:f6:7d:f5:3b:f6:8d:f5:06:f9:0a:f7:b8:f9:9a:f7:6a:fa:fa:f7:1d:fb:68:f8:d1:fb:f0:f9:83:fc:fa:fb:35:fd:6d:fd:e7:fd:2f:fe:9c:fe:98:fe:4e:ff:00:00:00:00:1d:02:b2:00:2d:02:19:02:33:02:64:01:0a:03:cb:02:6f:04:7d:03:db:05:2f:04:85:07:e3:04:b0:08:96:05:06:09:48:06:71:09:fa:06:48:0a:ac:07:4e:0b:60:08:58:0c:c5:09:62:0c:12:09:c5:0c:77:0a
+ant1.ant3.ch9.pdoa_lut=4e:ec:89:f5:9c:ee:3b:f6:04:f0:ee:f6:44:f1:a0:f7:c3:f2:54:f8:54:f3:06:f9:4c:f4:b8:f9:12:f5:6a:fa:0a:f6:1d:fb:21:f7:d1:fb:19:f8:83:fc:79:f9:35:fd:ba:fa:e7:fd:73:fc:9c:fe:0e:fe:4e:ff:00:00:00:00:d7:00:b2:00:f6:01:64:01:21:04:19:02:60:04:cb:02:37:05:7d:03:0a:07:2f:04:c5:07:e3:04:fc:07:96:05:8f:08:48:06:b0:09:fa:06:39:0a:ac:07:c9:0a:60:08:58:0b:12:09:75:0b:77:0a:83:0b:c5:09
+xtal_trim=23
+temperature_reference=85
+smart_tx_power=1
+auto_sleep_margin=20000
+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=6
+[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=6
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging=6
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=6
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging=6
+[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=6
+[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=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=4
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=4
+[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=3
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=3
+[HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=6
+[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=3
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=3
+[HAL]minimum_system_offset_uwbtime0=120
+coex_gpio=4
+coex_delay_us=1000
+coex_margin_us=500
+coex_interval_us=2000
diff --git a/uwb/UWB-calibration_jp.conf b/uwb/UWB-calibration_jp.conf
deleted file mode 100644
index fc6af1d..0000000
--- a/uwb/UWB-calibration_jp.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-ant0.ch5.prf16.tx_power=0
-ant0.ch5.prf16.pg_delay=0
-ant0.ch5.prf64.tx_power=0
-ant0.ch5.prf64.pg_delay=0
-ant0.ch9.prf16.tx_power=0x56564856
-ant0.ch9.prf16.pg_delay=0x26
-ant0.ch9.prf64.tx_power=0x56564856
-ant0.ch9.prf64.pg_delay=0x26
-ant1.ch5.prf16.tx_power=0
-ant1.ch5.prf16.pg_delay=0
-ant1.ch5.prf64.tx_power=0
-ant1.ch5.prf64.pg_delay=0
-ant1.ch9.prf16.tx_power=0x36362c36
-ant1.ch9.prf16.pg_delay=0x26
-ant1.ch9.prf64.tx_power=0x36362c36
-ant1.ch9.prf64.pg_delay=0x26
-ant2.ch5.prf16.tx_power=0
-ant2.ch5.prf16.pg_delay=0
-ant2.ch5.prf64.tx_power=0
-ant2.ch5.prf64.pg_delay=0
-ant2.ch9.prf16.tx_power=0
-ant2.ch9.prf16.pg_delay=0
-ant2.ch9.prf64.tx_power=0
-ant2.ch9.prf64.pg_delay=0
-ant3.ch5.prf16.tx_power=0
-ant3.ch5.prf16.pg_delay=0
-ant3.ch5.prf64.tx_power=0
-ant3.ch5.prf64.pg_delay=0
-ant3.ch9.prf16.tx_power=0
-ant3.ch9.prf16.pg_delay=0
-ant3.ch9.prf64.tx_power=0
-ant3.ch9.prf64.pg_delay=0
-alternate_pulse_shape=0x01
-restricted_channels=0x20
diff --git a/uwb/country_conf_gen.sh b/uwb/country_conf_gen.sh
index 3a367a7..7e398c0 100755
--- a/uwb/country_conf_gen.sh
+++ b/uwb/country_conf_gen.sh
@@ -15,13 +15,16 @@ while read line ; do
         #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
+                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
+                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
+                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++))
diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk
index bb99b48..eb2bfe0 100644
--- a/uwb/uwb_calibration.mk
+++ b/uwb/uwb_calibration.mk
@@ -19,9 +19,9 @@ $(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk)
 LOCAL_UWB_CAL_DIR=device/google/pantah/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
index d6863f6..93a5e2e 100644
--- a/uwb/uwb_country.conf
+++ b/uwb/uwb_country.conf
@@ -1,20 +1,6 @@
 *FCC
-"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"
+"United States": "us"
+"Canada": "ca"
 
 *CE
 "Austria": "at"
@@ -53,4 +39,24 @@
 
 *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"