diff --git a/audio/felix/config/audio_platform_configuration.xml b/audio/felix/config/audio_platform_configuration.xml
index 16976b4..bd62349 100644
--- a/audio/felix/config/audio_platform_configuration.xml
+++ b/audio/felix/config/audio_platform_configuration.xml
@@ -295,7 +295,7 @@
 
     <device_handle>
         <handler libname="audio_bt_aoc.so"/>
-        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE"/>
+        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=192000,UnsupportedFormat=S24_LE,MaxCapPacketInterval=125,MaxCapSampleRate=192000,MaxCapBitWidth=32,MaxCapChannel=2,EnableHifi192kMultichannel=0"/>
     </device_handle>
 
     <external_module>
diff --git a/device-felix.mk b/device-felix.mk
index 3e8eb1d..4661a25 100644
--- a/device-felix.mk
+++ b/device-felix.mk
@@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \
 
 # Increment the SVN for any official public releases
 PRODUCT_VENDOR_PROPERTIES += \
-    ro.vendor.build.svn=1
+    ro.vendor.build.svn=2
 
 # Vibrator HAL
 PRODUCT_VENDOR_PROPERTIES +=\
diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf
index 73c92d8..6468d80 100644
--- a/uwb/UWB-calibration-ce.conf
+++ b/uwb/UWB-calibration-ce.conf
@@ -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=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.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.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=7
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
 [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 3971daf..7838414 100644
--- a/uwb/UWB-calibration-default.conf
+++ b/uwb/UWB-calibration-default.conf
@@ -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=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.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.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=7
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
 [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 3971daf..7838414 100644
--- a/uwb/UWB-calibration-fcc.conf
+++ b/uwb/UWB-calibration-fcc.conf
@@ -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=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.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.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=7
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
 [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 c363098..82bb3ca 100644
--- a/uwb/UWB-calibration-jp.conf
+++ b/uwb/UWB-calibration-jp.conf
@@ -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=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.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.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=7
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
 [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 746c76f..7e5bf55 100644
--- a/uwb/UWB-calibration-restricted.conf
+++ b/uwb/UWB-calibration-restricted.conf
@@ -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=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.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.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=7
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
 [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 9d00708..1f6c32c 100644
--- a/uwb/UWB-calibration-tw.conf
+++ b/uwb/UWB-calibration-tw.conf
@@ -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=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.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.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=7
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
 [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 3971daf..7838414 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -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=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.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.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=7
-[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8
 [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=7
-[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8
 [HAL]minimum_system_offset_uwbtime0=250
 coex_gpio=4
 coex_delay_us=1000