diff --git a/device-felix.mk b/device-felix.mk
index d7d5704..83d116d 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -147,8 +147,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # declare use of spatial audio
 PRODUCT_PROPERTY_OVERRIDES += \
-       ro.audio.spatializer_enabled=true \
-       persist.vendor.audio.spatializer.speaker_enabled=true
+       ro.audio.spatializer_enabled=true
 
 # Bluetooth SAR test tool
 PRODUCT_PACKAGES_DEBUG += \
@@ -206,7 +205,7 @@ PRODUCT_VENDOR_PROPERTIES += \
     ro.vendor.build.svn=1
 
 # Vibrator HAL
-PRODUCT_PRODUCT_PROPERTIES +=\
+PRODUCT_VENDOR_PROPERTIES +=\
     ro.vendor.vibrator.hal.long.frequency.shift=0 \
     ro.vendor.vibrator.hal.gpio.num=44 \
     ro.vendor.vibrator.hal.gpio.shift=2
diff --git a/powerhint.json b/powerhint.json
index a887ce5..558b490 100644
--- a/powerhint.json
+++ b/powerhint.json
@@ -812,13 +812,13 @@
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUBigClusterMaxFreq",
       "Duration": 1000,
-      "Value": "1426000"
+      "Value": "1826000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
       "Node": "CPUMidClusterMaxFreq",
       "Duration": 1000,
-      "Value": "1197000"
+      "Value": "1491000"
     },
     {
       "PowerHint": "CAMERA_CAPTURE_CPU_THROTTLE",
diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf
index 7b5605a..73c92d8 100644
--- a/uwb/UWB-calibration-ce.conf
+++ b/uwb/UWB-calibration-ce.conf
@@ -14,19 +14,19 @@
 ant0.ch5.prf16.ant_delay=16449
 ant0.ch5.prf16.tx_power=0xFFFFD4FF
 ant0.ch5.prf16.pg_count=0
-ant0.ch5.prf16.pg_delay=0x28
+ant0.ch5.prf16.pg_delay=0x34
 ant0.ch5.prf64.ant_delay=16449
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
-ant0.ch5.prf64.pg_delay=0x28
-ant0.ch9.prf16.ant_delay=16450
+ant0.ch5.prf64.pg_delay=0x34
+ant0.ch9.prf16.ant_delay=16451
 ant0.ch9.prf16.tx_power=0xFEFEC0FE
 ant0.ch9.prf16.pg_count=0
-ant0.ch9.prf16.pg_delay=0x31
-ant0.ch9.prf64.ant_delay=16450
+ant0.ch9.prf16.pg_delay=0x34
+ant0.ch9.prf64.ant_delay=16451
 ant0.ch9.prf64.tx_power=0xFEFEC0FE
 ant0.ch9.prf64.pg_count=0
-ant0.ch9.prf64.pg_delay=0x31
+ant0.ch9.prf64.pg_delay=0x34
 ant0.port=0
 ant0.selector_gpio=7
 ant0.selector_gpio_value=0
@@ -39,13 +39,13 @@ ant1.ch5.prf64.tx_power=0xFFFFFFFF
 ant1.ch5.prf64.pg_count=0
 ant1.ch5.prf64.pg_delay=0x26
 ant1.ch9.prf16.ant_delay=16451
-ant1.ch9.prf16.tx_power=0x8E8E748E
+ant1.ch9.prf16.tx_power=0x7E7E687E
 ant1.ch9.prf16.pg_count=0
-ant1.ch9.prf16.pg_delay=0x10
+ant1.ch9.prf16.pg_delay=0x34
 ant1.ch9.prf64.ant_delay=16451
-ant1.ch9.prf64.tx_power=0x8E8E748E
+ant1.ch9.prf64.tx_power=0x7E7E687E
 ant1.ch9.prf64.pg_count=0
-ant1.ch9.prf64.pg_delay=0x10
+ant1.ch9.prf64.pg_delay=0x34
 ant1.port=0
 ant1.selector_gpio=7
 ant1.selector_gpio_value=1
@@ -60,11 +60,11 @@ ant2.ch5.prf64.pg_delay=0
 ant2.ch9.prf16.ant_delay=16451
 ant2.ch9.prf16.tx_power=0x9E9E7C9E
 ant2.ch9.prf16.pg_count=0
-ant2.ch9.prf16.pg_delay=0x28
+ant2.ch9.prf16.pg_delay=0x34
 ant2.ch9.prf64.ant_delay=16451
 ant2.ch9.prf64.tx_power=0x9E9E7C9E
 ant2.ch9.prf64.pg_count=0
-ant2.ch9.prf64.pg_delay=0x28
+ant2.ch9.prf64.pg_delay=0x34
 ant2.port=1
 ant2.selector_gpio=6
 ant2.selector_gpio_value=0
@@ -96,7 +96,7 @@ ant1.ant2.ch9.pdoa_offset=2421
 ant0.ant3.ch5.pdoa_offset=0
 ant0.ant3.ch9.pdoa_offset=0
 ant1.ant3.ch5.pdoa_offset=0
-ant1.ant3.ch9.pdoa_offset=-4342
+ant1.ant3.ch9.pdoa_offset=-6159
 ant2.ant3.ch5.pdoa_offset=0
 ant2.ant3.ch9.pdoa_offset=0
 ch5.pll_locking_code=0
@@ -104,7 +104,7 @@ ch9.pll_locking_code=0
 ant1.ant2.ch5.pdoa_lut=0a:f4:77:0a:d9:f4:c5:09:c1:f5:12:09:df:f5:60:08:7f:f6:ac:07:dd:f6:fa:06:f2:f6:48:06:89:f7:96:05:d1:f7:e3:04:54:f8:2f:04:f0:f8:7d:03:46:fa:cb:02:b0:fb:19:02:23:fd:64:01:a2:fe:b2:00:00:00:00:00:31:01:4e:ff:a6:02:9c:fe:0a:04:e7:fd:52:05:35:fd:73:06:83:fc:cb:07:d1:fb:be:08:1d:fb:f8:09:6a:fa:39:0b:b8:f9:81:0c:06:f9:1b:0d:54:f8:87:0d:a0:f7:a0:0e:ee:f6:06:0f:3b:f6:2d:0f:89:f5
 ant1.ant2.ch9.pdoa_lut=d7:f1:85:f5:66:f2:3d:f6:b8:f2:f6:f6:48:f3:9a:f7:9a:f3:52:f8:00:f4:0a:f9:a4:f4:ae:f9:85:f5:66:fa:b8:f6:1f:fb:ec:f7:d7:fb:ae:f9:7b:fc:33:fb:33:fd:e1:fc:ec:fd:29:fe:a4:fe:e1:fe:48:ff:d7:ff:00:00:b8:00:b8:00:d7:01:5c:01:5c:03:14:02:1f:05:cd:02:52:06:85:03:d7:07:29:04:0a:09:e1:04:3d:0a:9a:05:33:0b:52:06:29:0c:f6:06:c3:0d:ae:07:5c:0f:66:08:1f:11:0a:09:66:12:c3:09:00:14:7b:0a
 ant1.ant3.ch5.pdoa_lut=89:f4:ac:07:a2:f4:60:08:ae:f4:77:0a:0a:f5:12:09:7d:f5:c5:09:8d:f5:fa:06:0a:f7:48:06:9a:f7:96:05:fa:f7:e3:04:68:f8:2f:04:f0:f9:7d:03:fa:fb:cb:02:6d:fd:19:02:2f:fe:64:01:98:fe:b2:00:00:00:00:00:1d:02:4e:ff:2d:02:e7:fd:33:02:9c:fe:0a:03:35:fd:6f:04:83:fc:db:05:d1:fb:85:07:1d:fb:b0:08:6a:fa:06:09:b8:f9:71:09:06:f9:48:0a:54:f8:4e:0b:a0:f7:58:0c:3b:f6:62:0c:ee:f6:c5:0c:89:f5
-ant1.ant3.ch9.pdoa_lut=00:ee:7b:0a:3d:ee:c3:09:a4:ee:0a:09:cd:ee:66:08:f6:ee:ae:07:7b:f0:f6:06:29:f2:52:06:9a:f3:9a:05:a4:f4:e1:04:9a:f5:29:04:f6:f6:85:03:8f:f8:cd:02:14:fa:14:02:d7:fb:5c:01:c3:fd:b8:00:00:00:00:00:d7:01:48:ff:c3:03:a4:fe:9a:05:ec:fd:71:07:33:fd:b8:08:7b:fc:85:09:d7:fb:ae:09:1f:fb:c3:09:66:fa:ec:09:ae:f9:66:0a:0a:f9:33:0b:52:f8:8f:0c:9a:f7:ec:0d:f6:f6:29:0e:3d:f6:3d:0e:85:f5
+ant1.ant3.ch9.pdoa_lut=3d:f2:85:f5:52:f2:3d:f6:cd:f2:f6:f6:e1:f2:9a:f7:0a:f3:52:f8:1f:f3:0a:f9:33:f3:ae:f9:71:f3:66:fa:52:f4:1f:fb:85:f5:d7:fb:9a:f7:7b:fc:0a:f9:33:fd:29:fa:ec:fd:ae:fb:a4:fe:ec:fd:48:ff:1f:ff:00:00:cd:00:b8:00:0a:03:5c:01:8f:04:14:02:b8:06:cd:02:66:08:85:03:3d:0a:29:04:7b:0c:e1:04:0a:0d:9a:05:29:0e:52:06:8f:0e:f6:06:a4:0e:ae:07:b8:0e:66:08:cd:0e:0a:09:33:0f:c3:09:c3:0f:7b:0a
 xtal_trim=23
 temperature_reference=85
 smart_tx_power=1
@@ -120,22 +120,22 @@ restricted_channels=0
 [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0
-[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4
 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0
 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4
-[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4
@@ -144,8 +144,8 @@ restricted_channels=0
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
 [HAL]minimum_system_offset_uwbtime0=250
 coex_gpio=4
 coex_delay_us=1000
diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf
index 7b5605a..3971daf 100644
--- a/uwb/UWB-calibration-default.conf
+++ b/uwb/UWB-calibration-default.conf
@@ -19,14 +19,14 @@ ant0.ch5.prf64.ant_delay=16449
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x28
-ant0.ch9.prf16.ant_delay=16450
+ant0.ch9.prf16.ant_delay=16451
 ant0.ch9.prf16.tx_power=0xFEFEC0FE
 ant0.ch9.prf16.pg_count=0
-ant0.ch9.prf16.pg_delay=0x31
-ant0.ch9.prf64.ant_delay=16450
+ant0.ch9.prf16.pg_delay=0x28
+ant0.ch9.prf64.ant_delay=16451
 ant0.ch9.prf64.tx_power=0xFEFEC0FE
 ant0.ch9.prf64.pg_count=0
-ant0.ch9.prf64.pg_delay=0x31
+ant0.ch9.prf64.pg_delay=0x28
 ant0.port=0
 ant0.selector_gpio=7
 ant0.selector_gpio_value=0
@@ -39,13 +39,13 @@ ant1.ch5.prf64.tx_power=0xFFFFFFFF
 ant1.ch5.prf64.pg_count=0
 ant1.ch5.prf64.pg_delay=0x26
 ant1.ch9.prf16.ant_delay=16451
-ant1.ch9.prf16.tx_power=0x8E8E748E
+ant1.ch9.prf16.tx_power=0x3E3E303E
 ant1.ch9.prf16.pg_count=0
-ant1.ch9.prf16.pg_delay=0x10
+ant1.ch9.prf16.pg_delay=0x16
 ant1.ch9.prf64.ant_delay=16451
-ant1.ch9.prf64.tx_power=0x8E8E748E
+ant1.ch9.prf64.tx_power=0x3E3E303E
 ant1.ch9.prf64.pg_count=0
-ant1.ch9.prf64.pg_delay=0x10
+ant1.ch9.prf64.pg_delay=0x16
 ant1.port=0
 ant1.selector_gpio=7
 ant1.selector_gpio_value=1
@@ -58,11 +58,11 @@ ant2.ch5.prf64.tx_power=0
 ant2.ch5.prf64.pg_count=0
 ant2.ch5.prf64.pg_delay=0
 ant2.ch9.prf16.ant_delay=16451
-ant2.ch9.prf16.tx_power=0x9E9E7C9E
+ant2.ch9.prf16.tx_power=0x8E8E748E
 ant2.ch9.prf16.pg_count=0
 ant2.ch9.prf16.pg_delay=0x28
 ant2.ch9.prf64.ant_delay=16451
-ant2.ch9.prf64.tx_power=0x9E9E7C9E
+ant2.ch9.prf64.tx_power=0x8E8E748E
 ant2.ch9.prf64.pg_count=0
 ant2.ch9.prf64.pg_delay=0x28
 ant2.port=1
@@ -96,7 +96,7 @@ ant1.ant2.ch9.pdoa_offset=2421
 ant0.ant3.ch5.pdoa_offset=0
 ant0.ant3.ch9.pdoa_offset=0
 ant1.ant3.ch5.pdoa_offset=0
-ant1.ant3.ch9.pdoa_offset=-4342
+ant1.ant3.ch9.pdoa_offset=-6159
 ant2.ant3.ch5.pdoa_offset=0
 ant2.ant3.ch9.pdoa_offset=0
 ch5.pll_locking_code=0
@@ -104,7 +104,7 @@ ch9.pll_locking_code=0
 ant1.ant2.ch5.pdoa_lut=0a:f4:77:0a:d9:f4:c5:09:c1:f5:12:09:df:f5:60:08:7f:f6:ac:07:dd:f6:fa:06:f2:f6:48:06:89:f7:96:05:d1:f7:e3:04:54:f8:2f:04:f0:f8:7d:03:46:fa:cb:02:b0:fb:19:02:23:fd:64:01:a2:fe:b2:00:00:00:00:00:31:01:4e:ff:a6:02:9c:fe:0a:04:e7:fd:52:05:35:fd:73:06:83:fc:cb:07:d1:fb:be:08:1d:fb:f8:09:6a:fa:39:0b:b8:f9:81:0c:06:f9:1b:0d:54:f8:87:0d:a0:f7:a0:0e:ee:f6:06:0f:3b:f6:2d:0f:89:f5
 ant1.ant2.ch9.pdoa_lut=d7:f1:85:f5:66:f2:3d:f6:b8:f2:f6:f6:48:f3:9a:f7:9a:f3:52:f8:00:f4:0a:f9:a4:f4:ae:f9:85:f5:66:fa:b8:f6:1f:fb:ec:f7:d7:fb:ae:f9:7b:fc:33:fb:33:fd:e1:fc:ec:fd:29:fe:a4:fe:e1:fe:48:ff:d7:ff:00:00:b8:00:b8:00:d7:01:5c:01:5c:03:14:02:1f:05:cd:02:52:06:85:03:d7:07:29:04:0a:09:e1:04:3d:0a:9a:05:33:0b:52:06:29:0c:f6:06:c3:0d:ae:07:5c:0f:66:08:1f:11:0a:09:66:12:c3:09:00:14:7b:0a
 ant1.ant3.ch5.pdoa_lut=89:f4:ac:07:a2:f4:60:08:ae:f4:77:0a:0a:f5:12:09:7d:f5:c5:09:8d:f5:fa:06:0a:f7:48:06:9a:f7:96:05:fa:f7:e3:04:68:f8:2f:04:f0:f9:7d:03:fa:fb:cb:02:6d:fd:19:02:2f:fe:64:01:98:fe:b2:00:00:00:00:00:1d:02:4e:ff:2d:02:e7:fd:33:02:9c:fe:0a:03:35:fd:6f:04:83:fc:db:05:d1:fb:85:07:1d:fb:b0:08:6a:fa:06:09:b8:f9:71:09:06:f9:48:0a:54:f8:4e:0b:a0:f7:58:0c:3b:f6:62:0c:ee:f6:c5:0c:89:f5
-ant1.ant3.ch9.pdoa_lut=00:ee:7b:0a:3d:ee:c3:09:a4:ee:0a:09:cd:ee:66:08:f6:ee:ae:07:7b:f0:f6:06:29:f2:52:06:9a:f3:9a:05:a4:f4:e1:04:9a:f5:29:04:f6:f6:85:03:8f:f8:cd:02:14:fa:14:02:d7:fb:5c:01:c3:fd:b8:00:00:00:00:00:d7:01:48:ff:c3:03:a4:fe:9a:05:ec:fd:71:07:33:fd:b8:08:7b:fc:85:09:d7:fb:ae:09:1f:fb:c3:09:66:fa:ec:09:ae:f9:66:0a:0a:f9:33:0b:52:f8:8f:0c:9a:f7:ec:0d:f6:f6:29:0e:3d:f6:3d:0e:85:f5
+ant1.ant3.ch9.pdoa_lut=3d:f2:85:f5:52:f2:3d:f6:cd:f2:f6:f6:e1:f2:9a:f7:0a:f3:52:f8:1f:f3:0a:f9:33:f3:ae:f9:71:f3:66:fa:52:f4:1f:fb:85:f5:d7:fb:9a:f7:7b:fc:0a:f9:33:fd:29:fa:ec:fd:ae:fb:a4:fe:ec:fd:48:ff:1f:ff:00:00:cd:00:b8:00:0a:03:5c:01:8f:04:14:02:b8:06:cd:02:66:08:85:03:3d:0a:29:04:7b:0c:e1:04:0a:0d:9a:05:29:0e:52:06:8f:0e:f6:06:a4:0e:ae:07:b8:0e:66:08:cd:0e:0a:09:33:0f:c3:09:c3:0f:7b:0a
 xtal_trim=23
 temperature_reference=85
 smart_tx_power=1
@@ -120,22 +120,22 @@ restricted_channels=0
 [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0
-[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4
 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0
 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4
-[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4
@@ -144,8 +144,8 @@ restricted_channels=0
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
 [HAL]minimum_system_offset_uwbtime0=250
 coex_gpio=4
 coex_delay_us=1000
diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf
index 7b5605a..3971daf 100644
--- a/uwb/UWB-calibration-fcc.conf
+++ b/uwb/UWB-calibration-fcc.conf
@@ -19,14 +19,14 @@ ant0.ch5.prf64.ant_delay=16449
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x28
-ant0.ch9.prf16.ant_delay=16450
+ant0.ch9.prf16.ant_delay=16451
 ant0.ch9.prf16.tx_power=0xFEFEC0FE
 ant0.ch9.prf16.pg_count=0
-ant0.ch9.prf16.pg_delay=0x31
-ant0.ch9.prf64.ant_delay=16450
+ant0.ch9.prf16.pg_delay=0x28
+ant0.ch9.prf64.ant_delay=16451
 ant0.ch9.prf64.tx_power=0xFEFEC0FE
 ant0.ch9.prf64.pg_count=0
-ant0.ch9.prf64.pg_delay=0x31
+ant0.ch9.prf64.pg_delay=0x28
 ant0.port=0
 ant0.selector_gpio=7
 ant0.selector_gpio_value=0
@@ -39,13 +39,13 @@ ant1.ch5.prf64.tx_power=0xFFFFFFFF
 ant1.ch5.prf64.pg_count=0
 ant1.ch5.prf64.pg_delay=0x26
 ant1.ch9.prf16.ant_delay=16451
-ant1.ch9.prf16.tx_power=0x8E8E748E
+ant1.ch9.prf16.tx_power=0x3E3E303E
 ant1.ch9.prf16.pg_count=0
-ant1.ch9.prf16.pg_delay=0x10
+ant1.ch9.prf16.pg_delay=0x16
 ant1.ch9.prf64.ant_delay=16451
-ant1.ch9.prf64.tx_power=0x8E8E748E
+ant1.ch9.prf64.tx_power=0x3E3E303E
 ant1.ch9.prf64.pg_count=0
-ant1.ch9.prf64.pg_delay=0x10
+ant1.ch9.prf64.pg_delay=0x16
 ant1.port=0
 ant1.selector_gpio=7
 ant1.selector_gpio_value=1
@@ -58,11 +58,11 @@ ant2.ch5.prf64.tx_power=0
 ant2.ch5.prf64.pg_count=0
 ant2.ch5.prf64.pg_delay=0
 ant2.ch9.prf16.ant_delay=16451
-ant2.ch9.prf16.tx_power=0x9E9E7C9E
+ant2.ch9.prf16.tx_power=0x8E8E748E
 ant2.ch9.prf16.pg_count=0
 ant2.ch9.prf16.pg_delay=0x28
 ant2.ch9.prf64.ant_delay=16451
-ant2.ch9.prf64.tx_power=0x9E9E7C9E
+ant2.ch9.prf64.tx_power=0x8E8E748E
 ant2.ch9.prf64.pg_count=0
 ant2.ch9.prf64.pg_delay=0x28
 ant2.port=1
@@ -96,7 +96,7 @@ ant1.ant2.ch9.pdoa_offset=2421
 ant0.ant3.ch5.pdoa_offset=0
 ant0.ant3.ch9.pdoa_offset=0
 ant1.ant3.ch5.pdoa_offset=0
-ant1.ant3.ch9.pdoa_offset=-4342
+ant1.ant3.ch9.pdoa_offset=-6159
 ant2.ant3.ch5.pdoa_offset=0
 ant2.ant3.ch9.pdoa_offset=0
 ch5.pll_locking_code=0
@@ -104,7 +104,7 @@ ch9.pll_locking_code=0
 ant1.ant2.ch5.pdoa_lut=0a:f4:77:0a:d9:f4:c5:09:c1:f5:12:09:df:f5:60:08:7f:f6:ac:07:dd:f6:fa:06:f2:f6:48:06:89:f7:96:05:d1:f7:e3:04:54:f8:2f:04:f0:f8:7d:03:46:fa:cb:02:b0:fb:19:02:23:fd:64:01:a2:fe:b2:00:00:00:00:00:31:01:4e:ff:a6:02:9c:fe:0a:04:e7:fd:52:05:35:fd:73:06:83:fc:cb:07:d1:fb:be:08:1d:fb:f8:09:6a:fa:39:0b:b8:f9:81:0c:06:f9:1b:0d:54:f8:87:0d:a0:f7:a0:0e:ee:f6:06:0f:3b:f6:2d:0f:89:f5
 ant1.ant2.ch9.pdoa_lut=d7:f1:85:f5:66:f2:3d:f6:b8:f2:f6:f6:48:f3:9a:f7:9a:f3:52:f8:00:f4:0a:f9:a4:f4:ae:f9:85:f5:66:fa:b8:f6:1f:fb:ec:f7:d7:fb:ae:f9:7b:fc:33:fb:33:fd:e1:fc:ec:fd:29:fe:a4:fe:e1:fe:48:ff:d7:ff:00:00:b8:00:b8:00:d7:01:5c:01:5c:03:14:02:1f:05:cd:02:52:06:85:03:d7:07:29:04:0a:09:e1:04:3d:0a:9a:05:33:0b:52:06:29:0c:f6:06:c3:0d:ae:07:5c:0f:66:08:1f:11:0a:09:66:12:c3:09:00:14:7b:0a
 ant1.ant3.ch5.pdoa_lut=89:f4:ac:07:a2:f4:60:08:ae:f4:77:0a:0a:f5:12:09:7d:f5:c5:09:8d:f5:fa:06:0a:f7:48:06:9a:f7:96:05:fa:f7:e3:04:68:f8:2f:04:f0:f9:7d:03:fa:fb:cb:02:6d:fd:19:02:2f:fe:64:01:98:fe:b2:00:00:00:00:00:1d:02:4e:ff:2d:02:e7:fd:33:02:9c:fe:0a:03:35:fd:6f:04:83:fc:db:05:d1:fb:85:07:1d:fb:b0:08:6a:fa:06:09:b8:f9:71:09:06:f9:48:0a:54:f8:4e:0b:a0:f7:58:0c:3b:f6:62:0c:ee:f6:c5:0c:89:f5
-ant1.ant3.ch9.pdoa_lut=00:ee:7b:0a:3d:ee:c3:09:a4:ee:0a:09:cd:ee:66:08:f6:ee:ae:07:7b:f0:f6:06:29:f2:52:06:9a:f3:9a:05:a4:f4:e1:04:9a:f5:29:04:f6:f6:85:03:8f:f8:cd:02:14:fa:14:02:d7:fb:5c:01:c3:fd:b8:00:00:00:00:00:d7:01:48:ff:c3:03:a4:fe:9a:05:ec:fd:71:07:33:fd:b8:08:7b:fc:85:09:d7:fb:ae:09:1f:fb:c3:09:66:fa:ec:09:ae:f9:66:0a:0a:f9:33:0b:52:f8:8f:0c:9a:f7:ec:0d:f6:f6:29:0e:3d:f6:3d:0e:85:f5
+ant1.ant3.ch9.pdoa_lut=3d:f2:85:f5:52:f2:3d:f6:cd:f2:f6:f6:e1:f2:9a:f7:0a:f3:52:f8:1f:f3:0a:f9:33:f3:ae:f9:71:f3:66:fa:52:f4:1f:fb:85:f5:d7:fb:9a:f7:7b:fc:0a:f9:33:fd:29:fa:ec:fd:ae:fb:a4:fe:ec:fd:48:ff:1f:ff:00:00:cd:00:b8:00:0a:03:5c:01:8f:04:14:02:b8:06:cd:02:66:08:85:03:3d:0a:29:04:7b:0c:e1:04:0a:0d:9a:05:29:0e:52:06:8f:0e:f6:06:a4:0e:ae:07:b8:0e:66:08:cd:0e:0a:09:33:0f:c3:09:c3:0f:7b:0a
 xtal_trim=23
 temperature_reference=85
 smart_tx_power=1
@@ -120,22 +120,22 @@ restricted_channels=0
 [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0
-[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4
 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0
 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4
-[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4
@@ -144,8 +144,8 @@ restricted_channels=0
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
 [HAL]minimum_system_offset_uwbtime0=250
 coex_gpio=4
 coex_delay_us=1000
diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf
index 9b5c399..c363098 100644
--- a/uwb/UWB-calibration-jp.conf
+++ b/uwb/UWB-calibration-jp.conf
@@ -19,11 +19,11 @@ ant0.ch5.prf64.ant_delay=16449
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x28
-ant0.ch9.prf16.ant_delay=16450
+ant0.ch9.prf16.ant_delay=16451
 ant0.ch9.prf16.tx_power=0xFEFEC0FE
 ant0.ch9.prf16.pg_count=0
 ant0.ch9.prf16.pg_delay=0x31
-ant0.ch9.prf64.ant_delay=16450
+ant0.ch9.prf64.ant_delay=16451
 ant0.ch9.prf64.tx_power=0xFEFEC0FE
 ant0.ch9.prf64.pg_count=0
 ant0.ch9.prf64.pg_delay=0x31
@@ -96,7 +96,7 @@ ant1.ant2.ch9.pdoa_offset=2421
 ant0.ant3.ch5.pdoa_offset=0
 ant0.ant3.ch9.pdoa_offset=0
 ant1.ant3.ch5.pdoa_offset=0
-ant1.ant3.ch9.pdoa_offset=-4342
+ant1.ant3.ch9.pdoa_offset=-6159
 ant2.ant3.ch5.pdoa_offset=0
 ant2.ant3.ch9.pdoa_offset=0
 ch5.pll_locking_code=0
@@ -104,7 +104,7 @@ ch9.pll_locking_code=0
 ant1.ant2.ch5.pdoa_lut=0a:f4:77:0a:d9:f4:c5:09:c1:f5:12:09:df:f5:60:08:7f:f6:ac:07:dd:f6:fa:06:f2:f6:48:06:89:f7:96:05:d1:f7:e3:04:54:f8:2f:04:f0:f8:7d:03:46:fa:cb:02:b0:fb:19:02:23:fd:64:01:a2:fe:b2:00:00:00:00:00:31:01:4e:ff:a6:02:9c:fe:0a:04:e7:fd:52:05:35:fd:73:06:83:fc:cb:07:d1:fb:be:08:1d:fb:f8:09:6a:fa:39:0b:b8:f9:81:0c:06:f9:1b:0d:54:f8:87:0d:a0:f7:a0:0e:ee:f6:06:0f:3b:f6:2d:0f:89:f5
 ant1.ant2.ch9.pdoa_lut=d7:f1:85:f5:66:f2:3d:f6:b8:f2:f6:f6:48:f3:9a:f7:9a:f3:52:f8:00:f4:0a:f9:a4:f4:ae:f9:85:f5:66:fa:b8:f6:1f:fb:ec:f7:d7:fb:ae:f9:7b:fc:33:fb:33:fd:e1:fc:ec:fd:29:fe:a4:fe:e1:fe:48:ff:d7:ff:00:00:b8:00:b8:00:d7:01:5c:01:5c:03:14:02:1f:05:cd:02:52:06:85:03:d7:07:29:04:0a:09:e1:04:3d:0a:9a:05:33:0b:52:06:29:0c:f6:06:c3:0d:ae:07:5c:0f:66:08:1f:11:0a:09:66:12:c3:09:00:14:7b:0a
 ant1.ant3.ch5.pdoa_lut=89:f4:ac:07:a2:f4:60:08:ae:f4:77:0a:0a:f5:12:09:7d:f5:c5:09:8d:f5:fa:06:0a:f7:48:06:9a:f7:96:05:fa:f7:e3:04:68:f8:2f:04:f0:f9:7d:03:fa:fb:cb:02:6d:fd:19:02:2f:fe:64:01:98:fe:b2:00:00:00:00:00:1d:02:4e:ff:2d:02:e7:fd:33:02:9c:fe:0a:03:35:fd:6f:04:83:fc:db:05:d1:fb:85:07:1d:fb:b0:08:6a:fa:06:09:b8:f9:71:09:06:f9:48:0a:54:f8:4e:0b:a0:f7:58:0c:3b:f6:62:0c:ee:f6:c5:0c:89:f5
-ant1.ant3.ch9.pdoa_lut=00:ee:7b:0a:3d:ee:c3:09:a4:ee:0a:09:cd:ee:66:08:f6:ee:ae:07:7b:f0:f6:06:29:f2:52:06:9a:f3:9a:05:a4:f4:e1:04:9a:f5:29:04:f6:f6:85:03:8f:f8:cd:02:14:fa:14:02:d7:fb:5c:01:c3:fd:b8:00:00:00:00:00:d7:01:48:ff:c3:03:a4:fe:9a:05:ec:fd:71:07:33:fd:b8:08:7b:fc:85:09:d7:fb:ae:09:1f:fb:c3:09:66:fa:ec:09:ae:f9:66:0a:0a:f9:33:0b:52:f8:8f:0c:9a:f7:ec:0d:f6:f6:29:0e:3d:f6:3d:0e:85:f5
+ant1.ant3.ch9.pdoa_lut=3d:f2:85:f5:52:f2:3d:f6:cd:f2:f6:f6:e1:f2:9a:f7:0a:f3:52:f8:1f:f3:0a:f9:33:f3:ae:f9:71:f3:66:fa:52:f4:1f:fb:85:f5:d7:fb:9a:f7:7b:fc:0a:f9:33:fd:29:fa:ec:fd:ae:fb:a4:fe:ec:fd:48:ff:1f:ff:00:00:cd:00:b8:00:0a:03:5c:01:8f:04:14:02:b8:06:cd:02:66:08:85:03:3d:0a:29:04:7b:0c:e1:04:0a:0d:9a:05:29:0e:52:06:8f:0e:f6:06:a4:0e:ae:07:b8:0e:66:08:cd:0e:0a:09:33:0f:c3:09:c3:0f:7b:0a
 xtal_trim=23
 temperature_reference=85
 smart_tx_power=1
@@ -120,22 +120,22 @@ restricted_channels=0x20
 [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0
-[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4
 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0
 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4
-[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4
@@ -144,8 +144,8 @@ restricted_channels=0x20
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
 [HAL]minimum_system_offset_uwbtime0=250
 coex_gpio=4
 coex_delay_us=1000
diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf
index c0c0ff0..746c76f 100644
--- a/uwb/UWB-calibration-restricted.conf
+++ b/uwb/UWB-calibration-restricted.conf
@@ -19,14 +19,14 @@ ant0.ch5.prf64.ant_delay=16449
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x28
-ant0.ch9.prf16.ant_delay=16450
+ant0.ch9.prf16.ant_delay=16451
 ant0.ch9.prf16.tx_power=0xFEFEC0FE
 ant0.ch9.prf16.pg_count=0
-ant0.ch9.prf16.pg_delay=0x31
-ant0.ch9.prf64.ant_delay=16450
+ant0.ch9.prf16.pg_delay=0x28
+ant0.ch9.prf64.ant_delay=16451
 ant0.ch9.prf64.tx_power=0xFEFEC0FE
 ant0.ch9.prf64.pg_count=0
-ant0.ch9.prf64.pg_delay=0x31
+ant0.ch9.prf64.pg_delay=0x28
 ant0.port=0
 ant0.selector_gpio=7
 ant0.selector_gpio_value=0
@@ -39,13 +39,13 @@ ant1.ch5.prf64.tx_power=0xFFFFFFFF
 ant1.ch5.prf64.pg_count=0
 ant1.ch5.prf64.pg_delay=0x26
 ant1.ch9.prf16.ant_delay=16451
-ant1.ch9.prf16.tx_power=0x8E8E748E
+ant1.ch9.prf16.tx_power=0x3E3E303E
 ant1.ch9.prf16.pg_count=0
-ant1.ch9.prf16.pg_delay=0x10
+ant1.ch9.prf16.pg_delay=0x16
 ant1.ch9.prf64.ant_delay=16451
-ant1.ch9.prf64.tx_power=0x8E8E748E
+ant1.ch9.prf64.tx_power=0x3E3E303E
 ant1.ch9.prf64.pg_count=0
-ant1.ch9.prf64.pg_delay=0x10
+ant1.ch9.prf64.pg_delay=0x16
 ant1.port=0
 ant1.selector_gpio=7
 ant1.selector_gpio_value=1
@@ -58,11 +58,11 @@ ant2.ch5.prf64.tx_power=0
 ant2.ch5.prf64.pg_count=0
 ant2.ch5.prf64.pg_delay=0
 ant2.ch9.prf16.ant_delay=16451
-ant2.ch9.prf16.tx_power=0x9E9E7C9E
+ant2.ch9.prf16.tx_power=0x8E8E748E
 ant2.ch9.prf16.pg_count=0
 ant2.ch9.prf16.pg_delay=0x28
 ant2.ch9.prf64.ant_delay=16451
-ant2.ch9.prf64.tx_power=0x9E9E7C9E
+ant2.ch9.prf64.tx_power=0x8E8E748E
 ant2.ch9.prf64.pg_count=0
 ant2.ch9.prf64.pg_delay=0x28
 ant2.port=1
@@ -96,7 +96,7 @@ ant1.ant2.ch9.pdoa_offset=2421
 ant0.ant3.ch5.pdoa_offset=0
 ant0.ant3.ch9.pdoa_offset=0
 ant1.ant3.ch5.pdoa_offset=0
-ant1.ant3.ch9.pdoa_offset=-4342
+ant1.ant3.ch9.pdoa_offset=-6159
 ant2.ant3.ch5.pdoa_offset=0
 ant2.ant3.ch9.pdoa_offset=0
 ch5.pll_locking_code=0
@@ -104,7 +104,7 @@ ch9.pll_locking_code=0
 ant1.ant2.ch5.pdoa_lut=0a:f4:77:0a:d9:f4:c5:09:c1:f5:12:09:df:f5:60:08:7f:f6:ac:07:dd:f6:fa:06:f2:f6:48:06:89:f7:96:05:d1:f7:e3:04:54:f8:2f:04:f0:f8:7d:03:46:fa:cb:02:b0:fb:19:02:23:fd:64:01:a2:fe:b2:00:00:00:00:00:31:01:4e:ff:a6:02:9c:fe:0a:04:e7:fd:52:05:35:fd:73:06:83:fc:cb:07:d1:fb:be:08:1d:fb:f8:09:6a:fa:39:0b:b8:f9:81:0c:06:f9:1b:0d:54:f8:87:0d:a0:f7:a0:0e:ee:f6:06:0f:3b:f6:2d:0f:89:f5
 ant1.ant2.ch9.pdoa_lut=d7:f1:85:f5:66:f2:3d:f6:b8:f2:f6:f6:48:f3:9a:f7:9a:f3:52:f8:00:f4:0a:f9:a4:f4:ae:f9:85:f5:66:fa:b8:f6:1f:fb:ec:f7:d7:fb:ae:f9:7b:fc:33:fb:33:fd:e1:fc:ec:fd:29:fe:a4:fe:e1:fe:48:ff:d7:ff:00:00:b8:00:b8:00:d7:01:5c:01:5c:03:14:02:1f:05:cd:02:52:06:85:03:d7:07:29:04:0a:09:e1:04:3d:0a:9a:05:33:0b:52:06:29:0c:f6:06:c3:0d:ae:07:5c:0f:66:08:1f:11:0a:09:66:12:c3:09:00:14:7b:0a
 ant1.ant3.ch5.pdoa_lut=89:f4:ac:07:a2:f4:60:08:ae:f4:77:0a:0a:f5:12:09:7d:f5:c5:09:8d:f5:fa:06:0a:f7:48:06:9a:f7:96:05:fa:f7:e3:04:68:f8:2f:04:f0:f9:7d:03:fa:fb:cb:02:6d:fd:19:02:2f:fe:64:01:98:fe:b2:00:00:00:00:00:1d:02:4e:ff:2d:02:e7:fd:33:02:9c:fe:0a:03:35:fd:6f:04:83:fc:db:05:d1:fb:85:07:1d:fb:b0:08:6a:fa:06:09:b8:f9:71:09:06:f9:48:0a:54:f8:4e:0b:a0:f7:58:0c:3b:f6:62:0c:ee:f6:c5:0c:89:f5
-ant1.ant3.ch9.pdoa_lut=00:ee:7b:0a:3d:ee:c3:09:a4:ee:0a:09:cd:ee:66:08:f6:ee:ae:07:7b:f0:f6:06:29:f2:52:06:9a:f3:9a:05:a4:f4:e1:04:9a:f5:29:04:f6:f6:85:03:8f:f8:cd:02:14:fa:14:02:d7:fb:5c:01:c3:fd:b8:00:00:00:00:00:d7:01:48:ff:c3:03:a4:fe:9a:05:ec:fd:71:07:33:fd:b8:08:7b:fc:85:09:d7:fb:ae:09:1f:fb:c3:09:66:fa:ec:09:ae:f9:66:0a:0a:f9:33:0b:52:f8:8f:0c:9a:f7:ec:0d:f6:f6:29:0e:3d:f6:3d:0e:85:f5
+ant1.ant3.ch9.pdoa_lut=3d:f2:85:f5:52:f2:3d:f6:cd:f2:f6:f6:e1:f2:9a:f7:0a:f3:52:f8:1f:f3:0a:f9:33:f3:ae:f9:71:f3:66:fa:52:f4:1f:fb:85:f5:d7:fb:9a:f7:7b:fc:0a:f9:33:fd:29:fa:ec:fd:ae:fb:a4:fe:ec:fd:48:ff:1f:ff:00:00:cd:00:b8:00:0a:03:5c:01:8f:04:14:02:b8:06:cd:02:66:08:85:03:3d:0a:29:04:7b:0c:e1:04:0a:0d:9a:05:29:0e:52:06:8f:0e:f6:06:a4:0e:ae:07:b8:0e:66:08:cd:0e:0a:09:33:0f:c3:09:c3:0f:7b:0a
 xtal_trim=23
 temperature_reference=85
 smart_tx_power=1
@@ -120,22 +120,22 @@ restricted_channels=0xFFFF
 [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0
-[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4
 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0
 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4
-[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4
@@ -144,8 +144,8 @@ restricted_channels=0xFFFF
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
 [HAL]minimum_system_offset_uwbtime0=250
 coex_gpio=4
 coex_delay_us=1000
diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf
index d8ef963..9d00708 100644
--- a/uwb/UWB-calibration-tw.conf
+++ b/uwb/UWB-calibration-tw.conf
@@ -19,14 +19,14 @@ ant0.ch5.prf64.ant_delay=16449
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x28
-ant0.ch9.prf16.ant_delay=16450
+ant0.ch9.prf16.ant_delay=16451
 ant0.ch9.prf16.tx_power=0xFEFEC0FE
 ant0.ch9.prf16.pg_count=0
-ant0.ch9.prf16.pg_delay=0x31
-ant0.ch9.prf64.ant_delay=16450
+ant0.ch9.prf16.pg_delay=0x28
+ant0.ch9.prf64.ant_delay=16451
 ant0.ch9.prf64.tx_power=0xFEFEC0FE
 ant0.ch9.prf64.pg_count=0
-ant0.ch9.prf64.pg_delay=0x31
+ant0.ch9.prf64.pg_delay=0x28
 ant0.port=0
 ant0.selector_gpio=7
 ant0.selector_gpio_value=0
@@ -39,13 +39,13 @@ ant1.ch5.prf64.tx_power=0xFFFFFFFF
 ant1.ch5.prf64.pg_count=0
 ant1.ch5.prf64.pg_delay=0x26
 ant1.ch9.prf16.ant_delay=16451
-ant1.ch9.prf16.tx_power=0x8E8E748E
+ant1.ch9.prf16.tx_power=0x3E3E303E
 ant1.ch9.prf16.pg_count=0
-ant1.ch9.prf16.pg_delay=0x10
+ant1.ch9.prf16.pg_delay=0x16
 ant1.ch9.prf64.ant_delay=16451
-ant1.ch9.prf64.tx_power=0x8E8E748E
+ant1.ch9.prf64.tx_power=0x3E3E303E
 ant1.ch9.prf64.pg_count=0
-ant1.ch9.prf64.pg_delay=0x10
+ant1.ch9.prf64.pg_delay=0x16
 ant1.port=0
 ant1.selector_gpio=7
 ant1.selector_gpio_value=1
@@ -58,11 +58,11 @@ ant2.ch5.prf64.tx_power=0
 ant2.ch5.prf64.pg_count=0
 ant2.ch5.prf64.pg_delay=0
 ant2.ch9.prf16.ant_delay=16451
-ant2.ch9.prf16.tx_power=0x9E9E7C9E
+ant2.ch9.prf16.tx_power=0x8E8E748E
 ant2.ch9.prf16.pg_count=0
 ant2.ch9.prf16.pg_delay=0x28
 ant2.ch9.prf64.ant_delay=16451
-ant2.ch9.prf64.tx_power=0x9E9E7C9E
+ant2.ch9.prf64.tx_power=0x8E8E748E
 ant2.ch9.prf64.pg_count=0
 ant2.ch9.prf64.pg_delay=0x28
 ant2.port=1
@@ -96,7 +96,7 @@ ant1.ant2.ch9.pdoa_offset=2421
 ant0.ant3.ch5.pdoa_offset=0
 ant0.ant3.ch9.pdoa_offset=0
 ant1.ant3.ch5.pdoa_offset=0
-ant1.ant3.ch9.pdoa_offset=-4342
+ant1.ant3.ch9.pdoa_offset=-6159
 ant2.ant3.ch5.pdoa_offset=0
 ant2.ant3.ch9.pdoa_offset=0
 ch5.pll_locking_code=0
@@ -104,7 +104,7 @@ ch9.pll_locking_code=0
 ant1.ant2.ch5.pdoa_lut=0a:f4:77:0a:d9:f4:c5:09:c1:f5:12:09:df:f5:60:08:7f:f6:ac:07:dd:f6:fa:06:f2:f6:48:06:89:f7:96:05:d1:f7:e3:04:54:f8:2f:04:f0:f8:7d:03:46:fa:cb:02:b0:fb:19:02:23:fd:64:01:a2:fe:b2:00:00:00:00:00:31:01:4e:ff:a6:02:9c:fe:0a:04:e7:fd:52:05:35:fd:73:06:83:fc:cb:07:d1:fb:be:08:1d:fb:f8:09:6a:fa:39:0b:b8:f9:81:0c:06:f9:1b:0d:54:f8:87:0d:a0:f7:a0:0e:ee:f6:06:0f:3b:f6:2d:0f:89:f5
 ant1.ant2.ch9.pdoa_lut=d7:f1:85:f5:66:f2:3d:f6:b8:f2:f6:f6:48:f3:9a:f7:9a:f3:52:f8:00:f4:0a:f9:a4:f4:ae:f9:85:f5:66:fa:b8:f6:1f:fb:ec:f7:d7:fb:ae:f9:7b:fc:33:fb:33:fd:e1:fc:ec:fd:29:fe:a4:fe:e1:fe:48:ff:d7:ff:00:00:b8:00:b8:00:d7:01:5c:01:5c:03:14:02:1f:05:cd:02:52:06:85:03:d7:07:29:04:0a:09:e1:04:3d:0a:9a:05:33:0b:52:06:29:0c:f6:06:c3:0d:ae:07:5c:0f:66:08:1f:11:0a:09:66:12:c3:09:00:14:7b:0a
 ant1.ant3.ch5.pdoa_lut=89:f4:ac:07:a2:f4:60:08:ae:f4:77:0a:0a:f5:12:09:7d:f5:c5:09:8d:f5:fa:06:0a:f7:48:06:9a:f7:96:05:fa:f7:e3:04:68:f8:2f:04:f0:f9:7d:03:fa:fb:cb:02:6d:fd:19:02:2f:fe:64:01:98:fe:b2:00:00:00:00:00:1d:02:4e:ff:2d:02:e7:fd:33:02:9c:fe:0a:03:35:fd:6f:04:83:fc:db:05:d1:fb:85:07:1d:fb:b0:08:6a:fa:06:09:b8:f9:71:09:06:f9:48:0a:54:f8:4e:0b:a0:f7:58:0c:3b:f6:62:0c:ee:f6:c5:0c:89:f5
-ant1.ant3.ch9.pdoa_lut=00:ee:7b:0a:3d:ee:c3:09:a4:ee:0a:09:cd:ee:66:08:f6:ee:ae:07:7b:f0:f6:06:29:f2:52:06:9a:f3:9a:05:a4:f4:e1:04:9a:f5:29:04:f6:f6:85:03:8f:f8:cd:02:14:fa:14:02:d7:fb:5c:01:c3:fd:b8:00:00:00:00:00:d7:01:48:ff:c3:03:a4:fe:9a:05:ec:fd:71:07:33:fd:b8:08:7b:fc:85:09:d7:fb:ae:09:1f:fb:c3:09:66:fa:ec:09:ae:f9:66:0a:0a:f9:33:0b:52:f8:8f:0c:9a:f7:ec:0d:f6:f6:29:0e:3d:f6:3d:0e:85:f5
+ant1.ant3.ch9.pdoa_lut=3d:f2:85:f5:52:f2:3d:f6:cd:f2:f6:f6:e1:f2:9a:f7:0a:f3:52:f8:1f:f3:0a:f9:33:f3:ae:f9:71:f3:66:fa:52:f4:1f:fb:85:f5:d7:fb:9a:f7:7b:fc:0a:f9:33:fd:29:fa:ec:fd:ae:fb:a4:fe:ec:fd:48:ff:1f:ff:00:00:cd:00:b8:00:0a:03:5c:01:8f:04:14:02:b8:06:cd:02:66:08:85:03:3d:0a:29:04:7b:0c:e1:04:0a:0d:9a:05:29:0e:52:06:8f:0e:f6:06:a4:0e:ae:07:b8:0e:66:08:cd:0e:0a:09:33:0f:c3:09:c3:0f:7b:0a
 xtal_trim=23
 temperature_reference=85
 smart_tx_power=1
@@ -120,22 +120,22 @@ restricted_channels=0x20
 [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0
-[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4
 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0
 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4
-[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4
@@ -144,8 +144,8 @@ restricted_channels=0x20
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
 [HAL]minimum_system_offset_uwbtime0=250
 coex_gpio=4
 coex_delay_us=1000
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf
index 7b5605a..3971daf 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -19,14 +19,14 @@ ant0.ch5.prf64.ant_delay=16449
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x28
-ant0.ch9.prf16.ant_delay=16450
+ant0.ch9.prf16.ant_delay=16451
 ant0.ch9.prf16.tx_power=0xFEFEC0FE
 ant0.ch9.prf16.pg_count=0
-ant0.ch9.prf16.pg_delay=0x31
-ant0.ch9.prf64.ant_delay=16450
+ant0.ch9.prf16.pg_delay=0x28
+ant0.ch9.prf64.ant_delay=16451
 ant0.ch9.prf64.tx_power=0xFEFEC0FE
 ant0.ch9.prf64.pg_count=0
-ant0.ch9.prf64.pg_delay=0x31
+ant0.ch9.prf64.pg_delay=0x28
 ant0.port=0
 ant0.selector_gpio=7
 ant0.selector_gpio_value=0
@@ -39,13 +39,13 @@ ant1.ch5.prf64.tx_power=0xFFFFFFFF
 ant1.ch5.prf64.pg_count=0
 ant1.ch5.prf64.pg_delay=0x26
 ant1.ch9.prf16.ant_delay=16451
-ant1.ch9.prf16.tx_power=0x8E8E748E
+ant1.ch9.prf16.tx_power=0x3E3E303E
 ant1.ch9.prf16.pg_count=0
-ant1.ch9.prf16.pg_delay=0x10
+ant1.ch9.prf16.pg_delay=0x16
 ant1.ch9.prf64.ant_delay=16451
-ant1.ch9.prf64.tx_power=0x8E8E748E
+ant1.ch9.prf64.tx_power=0x3E3E303E
 ant1.ch9.prf64.pg_count=0
-ant1.ch9.prf64.pg_delay=0x10
+ant1.ch9.prf64.pg_delay=0x16
 ant1.port=0
 ant1.selector_gpio=7
 ant1.selector_gpio_value=1
@@ -58,11 +58,11 @@ ant2.ch5.prf64.tx_power=0
 ant2.ch5.prf64.pg_count=0
 ant2.ch5.prf64.pg_delay=0
 ant2.ch9.prf16.ant_delay=16451
-ant2.ch9.prf16.tx_power=0x9E9E7C9E
+ant2.ch9.prf16.tx_power=0x8E8E748E
 ant2.ch9.prf16.pg_count=0
 ant2.ch9.prf16.pg_delay=0x28
 ant2.ch9.prf64.ant_delay=16451
-ant2.ch9.prf64.tx_power=0x9E9E7C9E
+ant2.ch9.prf64.tx_power=0x8E8E748E
 ant2.ch9.prf64.pg_count=0
 ant2.ch9.prf64.pg_delay=0x28
 ant2.port=1
@@ -96,7 +96,7 @@ ant1.ant2.ch9.pdoa_offset=2421
 ant0.ant3.ch5.pdoa_offset=0
 ant0.ant3.ch9.pdoa_offset=0
 ant1.ant3.ch5.pdoa_offset=0
-ant1.ant3.ch9.pdoa_offset=-4342
+ant1.ant3.ch9.pdoa_offset=-6159
 ant2.ant3.ch5.pdoa_offset=0
 ant2.ant3.ch9.pdoa_offset=0
 ch5.pll_locking_code=0
@@ -104,7 +104,7 @@ ch9.pll_locking_code=0
 ant1.ant2.ch5.pdoa_lut=0a:f4:77:0a:d9:f4:c5:09:c1:f5:12:09:df:f5:60:08:7f:f6:ac:07:dd:f6:fa:06:f2:f6:48:06:89:f7:96:05:d1:f7:e3:04:54:f8:2f:04:f0:f8:7d:03:46:fa:cb:02:b0:fb:19:02:23:fd:64:01:a2:fe:b2:00:00:00:00:00:31:01:4e:ff:a6:02:9c:fe:0a:04:e7:fd:52:05:35:fd:73:06:83:fc:cb:07:d1:fb:be:08:1d:fb:f8:09:6a:fa:39:0b:b8:f9:81:0c:06:f9:1b:0d:54:f8:87:0d:a0:f7:a0:0e:ee:f6:06:0f:3b:f6:2d:0f:89:f5
 ant1.ant2.ch9.pdoa_lut=d7:f1:85:f5:66:f2:3d:f6:b8:f2:f6:f6:48:f3:9a:f7:9a:f3:52:f8:00:f4:0a:f9:a4:f4:ae:f9:85:f5:66:fa:b8:f6:1f:fb:ec:f7:d7:fb:ae:f9:7b:fc:33:fb:33:fd:e1:fc:ec:fd:29:fe:a4:fe:e1:fe:48:ff:d7:ff:00:00:b8:00:b8:00:d7:01:5c:01:5c:03:14:02:1f:05:cd:02:52:06:85:03:d7:07:29:04:0a:09:e1:04:3d:0a:9a:05:33:0b:52:06:29:0c:f6:06:c3:0d:ae:07:5c:0f:66:08:1f:11:0a:09:66:12:c3:09:00:14:7b:0a
 ant1.ant3.ch5.pdoa_lut=89:f4:ac:07:a2:f4:60:08:ae:f4:77:0a:0a:f5:12:09:7d:f5:c5:09:8d:f5:fa:06:0a:f7:48:06:9a:f7:96:05:fa:f7:e3:04:68:f8:2f:04:f0:f9:7d:03:fa:fb:cb:02:6d:fd:19:02:2f:fe:64:01:98:fe:b2:00:00:00:00:00:1d:02:4e:ff:2d:02:e7:fd:33:02:9c:fe:0a:03:35:fd:6f:04:83:fc:db:05:d1:fb:85:07:1d:fb:b0:08:6a:fa:06:09:b8:f9:71:09:06:f9:48:0a:54:f8:4e:0b:a0:f7:58:0c:3b:f6:62:0c:ee:f6:c5:0c:89:f5
-ant1.ant3.ch9.pdoa_lut=00:ee:7b:0a:3d:ee:c3:09:a4:ee:0a:09:cd:ee:66:08:f6:ee:ae:07:7b:f0:f6:06:29:f2:52:06:9a:f3:9a:05:a4:f4:e1:04:9a:f5:29:04:f6:f6:85:03:8f:f8:cd:02:14:fa:14:02:d7:fb:5c:01:c3:fd:b8:00:00:00:00:00:d7:01:48:ff:c3:03:a4:fe:9a:05:ec:fd:71:07:33:fd:b8:08:7b:fc:85:09:d7:fb:ae:09:1f:fb:c3:09:66:fa:ec:09:ae:f9:66:0a:0a:f9:33:0b:52:f8:8f:0c:9a:f7:ec:0d:f6:f6:29:0e:3d:f6:3d:0e:85:f5
+ant1.ant3.ch9.pdoa_lut=3d:f2:85:f5:52:f2:3d:f6:cd:f2:f6:f6:e1:f2:9a:f7:0a:f3:52:f8:1f:f3:0a:f9:33:f3:ae:f9:71:f3:66:fa:52:f4:1f:fb:85:f5:d7:fb:9a:f7:7b:fc:0a:f9:33:fd:29:fa:ec:fd:ae:fb:a4:fe:ec:fd:48:ff:1f:ff:00:00:cd:00:b8:00:0a:03:5c:01:8f:04:14:02:b8:06:cd:02:66:08:85:03:3d:0a:29:04:7b:0c:e1:04:0a:0d:9a:05:29:0e:52:06:8f:0e:f6:06:a4:0e:ae:07:b8:0e:66:08:cd:0e:0a:09:33:0f:c3:09:c3:0f:7b:0a
 xtal_trim=23
 temperature_reference=85
 smart_tx_power=1
@@ -120,22 +120,22 @@ restricted_channels=0
 [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0
-[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4
 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0
 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0
 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4
 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4
-[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4
@@ -144,8 +144,8 @@ restricted_channels=0
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3
 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
 [HAL]minimum_system_offset_uwbtime0=250
 coex_gpio=4
 coex_delay_us=1000