diff --git a/conf/init.felix.rc b/conf/init.felix.rc
index 34059f0..1b5ce74 100644
--- a/conf/init.felix.rc
+++ b/conf/init.felix.rc
@@ -106,6 +106,10 @@
 on property:persist.device_config.vendor_system_native_boot.thermal_proactive_skin=1
     setprop vendor.thermal.config "thermal_info_config_proactive_skin.json"
 
+on property:vendor.thermal.link_ready=1
+    write /dev/thermal/tz-by-name/skin_therm/trip_point_1_temp 61000
+    write /dev/thermal/tz-by-name/skin_therm/trip_point_2_temp 63000
+
 # Bluetooth
 on post-fs-data
     chown bluetooth system /proc/bluetooth/timesync
diff --git a/device-felix.mk b/device-felix.mk
index 86f55cd..826e8f6 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -205,7 +205,7 @@
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=20
+    ro.vendor.build.svn=27
 
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES +=\
diff --git a/felix/overlay/packages/apps/Settings/res/values-sw410dp/dimens.xml b/felix/overlay/packages/apps/Settings/res/values-sw410dp/dimens.xml
new file mode 100644
index 0000000..179dcc5
--- /dev/null
+++ b/felix/overlay/packages/apps/Settings/res/values-sw410dp/dimens.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<resources>
+    <!-- Lock pattern view size, align sysui biometric_auth_pattern_view_size -->
+    <dimen name="biometric_auth_pattern_view_size">290dp</dimen>
+
+</resources>
diff --git a/location/gps.xml.f10 b/location/gps.xml.f10
index 6e005ae..3758532 100644
--- a/location/gps.xml.f10
+++ b/location/gps.xml.f10
@@ -35,7 +35,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/location/gps_user.xml.f10 b/location/gps_user.xml.f10
index 02afd01..528cab0 100644
--- a/location/gps_user.xml.f10
+++ b/location/gps_user.xml.f10
@@ -34,7 +34,7 @@
        SuplVersion="2"
        SuplMinorVersion="0"
        SuplOtdoaCapable="true"
-       SuplOtdoaCapable2="true"
+       SuplOtdoaCapable2="false"
        SuplGlonassCapable = "true"
        SuplGalileoCapable = "true"
        SuplBdsCapable = "true"
diff --git a/thermal_info_config_charge_felix.json b/thermal_info_config_charge_felix.json
index ceb9181..80cd32c 100644
--- a/thermal_info_config_charge_felix.json
+++ b/thermal_info_config_charge_felix.json
@@ -204,9 +204,9 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"],
-            "Coefficient":[0.15, 1.05, -0.65, 1, -0.55],
-            "Offset":3540,
+            "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
+            "Coefficient":[0.429, 0.314, 0.205],
+            "Offset":2600,
             "Multiplier":0.001
         },
         {
diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json
index 6bbb5b0..f5637ca 100644
--- a/thermal_info_config_felix.json
+++ b/thermal_info_config_felix.json
@@ -210,9 +210,9 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"],
-            "Coefficient":[0.15, 1.05, -0.65, 1, -0.55],
-            "Offset":3540,
+            "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
+            "Coefficient":[0.429, 0.314, 0.205],
+            "Offset":2600,
             "Multiplier":0.001
         },
         {
@@ -238,13 +238,13 @@
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"0.5",
+            "Version":"6.2",
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm",
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"],
             "Coefficient":[1.0, 1.0],
-            "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 51.0, 54.0],
+            "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -270,7 +270,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 51.0, 54.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendPowerHint":true,
@@ -285,7 +285,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 52.5, "NAN"],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 55.0, "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -301,7 +301,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 51.0, 54.0],
+            "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 53.0, 57.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -362,7 +362,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 51.0, 54.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -427,7 +427,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 54.0],
+            "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 57.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9],
             "Multiplier":0.001,
             "PollingDelay":60000,
diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json
index 1b7c446..2edacde 100644
--- a/thermal_info_config_proactive_skin_felix.json
+++ b/thermal_info_config_proactive_skin_felix.json
@@ -210,9 +210,9 @@
             "Hidden":true,
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
-            "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"],
-            "Coefficient":[0.15, 1.05, -0.65, 1, -0.55],
-            "Offset":3540,
+            "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"],
+            "Coefficient":[0.429, 0.314, 0.205],
+            "Offset":2600,
             "Multiplier":0.001
         },
         {
@@ -238,13 +238,13 @@
         {
             "Name":"VIRTUAL-SKIN",
             "Type":"SKIN",
-            "Version":"0.5",
+            "Version":"6.2",
             "VirtualSensor":true,
             "TriggerSensor":"skin_therm",
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"],
             "Coefficient":[1.0, 1.0],
-            "HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 51.0, 54.0],
+            "HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 53.0, 57.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -270,7 +270,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 51.0, 54.0],
+            "HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 53.0, 57.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "SendPowerHint":true,
@@ -285,7 +285,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 52.5, "NAN"],
+            "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 55.0, "NAN"],
             "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -301,7 +301,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 51.0, 54.0],
+            "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 53.0, 57.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -362,7 +362,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 51.0, 54.0],
+            "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
             "Multiplier":0.001,
             "PollingDelay":300000,
@@ -427,7 +427,7 @@
             "Formula":"MAXIMUM",
             "Combination":["VIRTUAL-SKIN"],
             "Coefficient":[1.0],
-            "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 54.0],
+            "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 57.0],
             "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9],
             "Multiplier":0.001,
             "PollingDelay":60000,
diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf
index ddc9fca..7e025ad 100644
--- a/uwb/UWB-calibration-ce.conf
+++ b/uwb/UWB-calibration-ce.conf
@@ -5,11 +5,11 @@
 [CCC]ch5.antenna_selection=ant0
 [CCC]ch9.antenna_selection=ant2
 [CCC]alternate_pulse_shape=0x00
-ant0.ch5.prf16.ant_delay=16449
+ant0.ch5.prf16.ant_delay=16459
 ant0.ch5.prf16.tx_power=0xFFFFD4FF
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x34
-ant0.ch5.prf64.ant_delay=16449
+ant0.ch5.prf64.ant_delay=16459
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x34
@@ -32,11 +32,11 @@
 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.ant_delay=16436
 ant1.ch9.prf16.tx_power=0x7E7E687E
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x34
-ant1.ch9.prf64.ant_delay=16451
+ant1.ch9.prf64.ant_delay=16436
 ant1.ch9.prf64.tx_power=0x7E7E687E
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x34
@@ -51,11 +51,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.ant_delay=16437
 ant2.ch9.prf16.tx_power=0x9E9E7C9E
 ant2.ch9.prf16.pg_count=0
 ant2.ch9.prf16.pg_delay=0x34
-ant2.ch9.prf64.ant_delay=16451
+ant2.ch9.prf64.ant_delay=16437
 ant2.ch9.prf64.tx_power=0x9E9E7C9E
 ant2.ch9.prf64.pg_count=0
 ant2.ch9.prf64.pg_delay=0x34
@@ -70,11 +70,11 @@
 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.ant_delay=16459
 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.ant_delay=16459
 ant3.ch9.prf64.tx_power=0
 ant3.ch9.prf64.pg_count=0
 ant3.ch9.prf64.pg_delay=0
@@ -115,22 +115,22 @@
 [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
@@ -139,8 +139,8 @@
 [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 f3b70dd..1798e58 100644
--- a/uwb/UWB-calibration-default.conf
+++ b/uwb/UWB-calibration-default.conf
@@ -5,11 +5,11 @@
 [CCC]ch5.antenna_selection=ant0
 [CCC]ch9.antenna_selection=ant2
 [CCC]alternate_pulse_shape=0x00
-ant0.ch5.prf16.ant_delay=16449
+ant0.ch5.prf16.ant_delay=16459
 ant0.ch5.prf16.tx_power=0xFFFFD4FF
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x28
-ant0.ch5.prf64.ant_delay=16449
+ant0.ch5.prf64.ant_delay=16459
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x28
@@ -32,11 +32,11 @@
 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.ant_delay=16436
 ant1.ch9.prf16.tx_power=0x3E3E303E
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x16
-ant1.ch9.prf64.ant_delay=16451
+ant1.ch9.prf64.ant_delay=16436
 ant1.ch9.prf64.tx_power=0x3E3E303E
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x16
@@ -51,11 +51,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.ant_delay=16437
 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.ant_delay=16437
 ant2.ch9.prf64.tx_power=0x8E8E748E
 ant2.ch9.prf64.pg_count=0
 ant2.ch9.prf64.pg_delay=0x28
@@ -70,11 +70,11 @@
 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.ant_delay=16459
 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.ant_delay=16459
 ant3.ch9.prf64.tx_power=0
 ant3.ch9.prf64.pg_count=0
 ant3.ch9.prf64.pg_delay=0
@@ -115,22 +115,22 @@
 [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
@@ -139,8 +139,8 @@
 [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 f3b70dd..1798e58 100644
--- a/uwb/UWB-calibration-fcc.conf
+++ b/uwb/UWB-calibration-fcc.conf
@@ -5,11 +5,11 @@
 [CCC]ch5.antenna_selection=ant0
 [CCC]ch9.antenna_selection=ant2
 [CCC]alternate_pulse_shape=0x00
-ant0.ch5.prf16.ant_delay=16449
+ant0.ch5.prf16.ant_delay=16459
 ant0.ch5.prf16.tx_power=0xFFFFD4FF
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x28
-ant0.ch5.prf64.ant_delay=16449
+ant0.ch5.prf64.ant_delay=16459
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x28
@@ -32,11 +32,11 @@
 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.ant_delay=16436
 ant1.ch9.prf16.tx_power=0x3E3E303E
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x16
-ant1.ch9.prf64.ant_delay=16451
+ant1.ch9.prf64.ant_delay=16436
 ant1.ch9.prf64.tx_power=0x3E3E303E
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x16
@@ -51,11 +51,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.ant_delay=16437
 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.ant_delay=16437
 ant2.ch9.prf64.tx_power=0x8E8E748E
 ant2.ch9.prf64.pg_count=0
 ant2.ch9.prf64.pg_delay=0x28
@@ -70,11 +70,11 @@
 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.ant_delay=16459
 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.ant_delay=16459
 ant3.ch9.prf64.tx_power=0
 ant3.ch9.prf64.pg_count=0
 ant3.ch9.prf64.pg_delay=0
@@ -115,22 +115,22 @@
 [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
@@ -139,8 +139,8 @@
 [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 1612133..3d5cfe4 100644
--- a/uwb/UWB-calibration-jp.conf
+++ b/uwb/UWB-calibration-jp.conf
@@ -5,11 +5,11 @@
 [CCC]ch5.antenna_selection=ant0
 [CCC]ch9.antenna_selection=ant2
 [CCC]alternate_pulse_shape=0x01
-ant0.ch5.prf16.ant_delay=16449
+ant0.ch5.prf16.ant_delay=16459
 ant0.ch5.prf16.tx_power=0xFFFFD4FF
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x28
-ant0.ch5.prf64.ant_delay=16449
+ant0.ch5.prf64.ant_delay=16459
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x28
@@ -32,11 +32,11 @@
 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.ant_delay=16436
 ant1.ch9.prf16.tx_power=0x5E5E4C5E
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x27
-ant1.ch9.prf64.ant_delay=16451
+ant1.ch9.prf64.ant_delay=16436
 ant1.ch9.prf64.tx_power=0x5E5E4C5E
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x27
@@ -51,11 +51,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.ant_delay=16437
 ant2.ch9.prf16.tx_power=0x5E5E4C5E
 ant2.ch9.prf16.pg_count=0
 ant2.ch9.prf16.pg_delay=0x27
-ant2.ch9.prf64.ant_delay=16451
+ant2.ch9.prf64.ant_delay=16437
 ant2.ch9.prf64.tx_power=0x5E5E4C5E
 ant2.ch9.prf64.pg_count=0
 ant2.ch9.prf64.pg_delay=0x27
@@ -70,11 +70,11 @@
 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.ant_delay=16459
 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.ant_delay=16459
 ant3.ch9.prf64.tx_power=0
 ant3.ch9.prf64.pg_count=0
 ant3.ch9.prf64.pg_delay=0
@@ -115,22 +115,22 @@
 [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
@@ -139,8 +139,8 @@
 [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 1c98823..7f2da15 100644
--- a/uwb/UWB-calibration-restricted.conf
+++ b/uwb/UWB-calibration-restricted.conf
@@ -5,11 +5,11 @@
 [CCC]ch5.antenna_selection=ant0
 [CCC]ch9.antenna_selection=ant2
 [CCC]alternate_pulse_shape=0x00
-ant0.ch5.prf16.ant_delay=16449
+ant0.ch5.prf16.ant_delay=16459
 ant0.ch5.prf16.tx_power=0xFFFFD4FF
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x28
-ant0.ch5.prf64.ant_delay=16449
+ant0.ch5.prf64.ant_delay=16459
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x28
@@ -32,11 +32,11 @@
 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.ant_delay=16436
 ant1.ch9.prf16.tx_power=0x3E3E303E
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x16
-ant1.ch9.prf64.ant_delay=16451
+ant1.ch9.prf64.ant_delay=16436
 ant1.ch9.prf64.tx_power=0x3E3E303E
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x16
@@ -51,11 +51,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.ant_delay=16437
 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.ant_delay=16437
 ant2.ch9.prf64.tx_power=0x8E8E748E
 ant2.ch9.prf64.pg_count=0
 ant2.ch9.prf64.pg_delay=0x28
@@ -70,11 +70,11 @@
 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.ant_delay=16459
 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.ant_delay=16459
 ant3.ch9.prf64.tx_power=0
 ant3.ch9.prf64.pg_count=0
 ant3.ch9.prf64.pg_delay=0
@@ -115,22 +115,22 @@
 [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
@@ -139,8 +139,8 @@
 [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 5a348b2..b1c667c 100644
--- a/uwb/UWB-calibration-tw.conf
+++ b/uwb/UWB-calibration-tw.conf
@@ -5,11 +5,11 @@
 [CCC]ch5.antenna_selection=ant0
 [CCC]ch9.antenna_selection=ant2
 [CCC]alternate_pulse_shape=0x00
-ant0.ch5.prf16.ant_delay=16449
+ant0.ch5.prf16.ant_delay=16459
 ant0.ch5.prf16.tx_power=0xFFFFD4FF
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x28
-ant0.ch5.prf64.ant_delay=16449
+ant0.ch5.prf64.ant_delay=16459
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x28
@@ -32,11 +32,11 @@
 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.ant_delay=16436
 ant1.ch9.prf16.tx_power=0x3E3E303E
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x16
-ant1.ch9.prf64.ant_delay=16451
+ant1.ch9.prf64.ant_delay=16436
 ant1.ch9.prf64.tx_power=0x3E3E303E
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x16
@@ -51,11 +51,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.ant_delay=16437
 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.ant_delay=16437
 ant2.ch9.prf64.tx_power=0x8E8E748E
 ant2.ch9.prf64.pg_count=0
 ant2.ch9.prf64.pg_delay=0x28
@@ -70,11 +70,11 @@
 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.ant_delay=16459
 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.ant_delay=16459
 ant3.ch9.prf64.tx_power=0
 ant3.ch9.prf64.pg_count=0
 ant3.ch9.prf64.pg_delay=0
@@ -115,22 +115,22 @@
 [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
@@ -139,8 +139,8 @@
 [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 f3b70dd..76181f3 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -5,11 +5,11 @@
 [CCC]ch5.antenna_selection=ant0
 [CCC]ch9.antenna_selection=ant2
 [CCC]alternate_pulse_shape=0x00
-ant0.ch5.prf16.ant_delay=16449
+ant0.ch5.prf16.ant_delay=16459
 ant0.ch5.prf16.tx_power=0xFFFFD4FF
 ant0.ch5.prf16.pg_count=0
 ant0.ch5.prf16.pg_delay=0x28
-ant0.ch5.prf64.ant_delay=16449
+ant0.ch5.prf64.ant_delay=16459
 ant0.ch5.prf64.tx_power=0xFFFFD4FF
 ant0.ch5.prf64.pg_count=0
 ant0.ch5.prf64.pg_delay=0x28
@@ -32,11 +32,11 @@
 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.ant_delay=16436
 ant1.ch9.prf16.tx_power=0x3E3E303E
 ant1.ch9.prf16.pg_count=0
 ant1.ch9.prf16.pg_delay=0x16
-ant1.ch9.prf64.ant_delay=16451
+ant1.ch9.prf64.ant_delay=16436
 ant1.ch9.prf64.tx_power=0x3E3E303E
 ant1.ch9.prf64.pg_count=0
 ant1.ch9.prf64.pg_delay=0x16
@@ -51,14 +51,14 @@
 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=0x8E8E748E
+ant2.ch9.prf16.ant_delay=16437
+ant2.ch9.prf16.tx_power=0x5E5E4C5E
 ant2.ch9.prf16.pg_count=0
-ant2.ch9.prf16.pg_delay=0x28
-ant2.ch9.prf64.ant_delay=16451
-ant2.ch9.prf64.tx_power=0x8E8E748E
+ant2.ch9.prf16.pg_delay=0x27
+ant2.ch9.prf64.ant_delay=16437
+ant2.ch9.prf64.tx_power=0x5E5E4C5E
 ant2.ch9.prf64.pg_count=0
-ant2.ch9.prf64.pg_delay=0x28
+ant2.ch9.prf64.pg_delay=0x27
 ant2.port=1
 ant2.selector_gpio=6
 ant2.selector_gpio_value=0
@@ -70,11 +70,11 @@
 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.ant_delay=16459
 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.ant_delay=16459
 ant3.ch9.prf64.tx_power=0
 ant3.ch9.prf64.pg_count=0
 ant3.ch9.prf64.pg_delay=0
@@ -115,22 +115,22 @@
 [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
@@ -139,8 +139,8 @@
 [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