Merge "thermal: modify emergency and shutdown threshold for VIRTUAL-SKIN" into udc-dev
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
