From 17a92076b4a580ee29a1c3d3f7786c91c4b3ef1f Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Tue, 11 Apr 2023 13:41:04 +0800 Subject: [PATCH] uwb: update uwb calibration for CCC antenna config Bug: 249170179 Test: build pass Change-Id: I89692bf8b7f19e01e91c7f7f50ba9eae83bced8a Signed-off-by: Rex Lin --- uwb/UWB-calibration-ce.conf | 17 ++++++----------- uwb/UWB-calibration-default.conf | 17 ++++++----------- uwb/UWB-calibration-fcc.conf | 17 ++++++----------- uwb/UWB-calibration-jp.conf | 17 ++++++----------- uwb/UWB-calibration-restricted.conf | 17 ++++++----------- uwb/UWB-calibration-tw.conf | 17 ++++++----------- uwb/UWB-calibration.conf | 17 ++++++----------- 7 files changed, 42 insertions(+), 77 deletions(-) diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index 6468d80..ddc9fca 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant2 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16449 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 @@ -111,6 +105,7 @@ smart_tx_power=1 auto_sleep_margin=20000 alternate_pulse_shape=0x00 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf index 7838414..f3b70dd 100644 --- a/uwb/UWB-calibration-default.conf +++ b/uwb/UWB-calibration-default.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant2 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16449 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 @@ -111,6 +105,7 @@ smart_tx_power=1 auto_sleep_margin=20000 alternate_pulse_shape=0x00 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index 7838414..f3b70dd 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant2 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16449 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 @@ -111,6 +105,7 @@ smart_tx_power=1 auto_sleep_margin=20000 alternate_pulse_shape=0x00 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 82bb3ca..1612133 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=12 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant2 +[CCC]alternate_pulse_shape=0x01 ant0.ch5.prf16.ant_delay=16449 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 @@ -111,6 +105,7 @@ smart_tx_power=1 auto_sleep_margin=20000 alternate_pulse_shape=0x01 restricted_channels=0x20 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf index 7e5bf55..1c98823 100644 --- a/uwb/UWB-calibration-restricted.conf +++ b/uwb/UWB-calibration-restricted.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant2 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16449 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 @@ -111,6 +105,7 @@ smart_tx_power=1 auto_sleep_margin=20000 alternate_pulse_shape=0x00 restricted_channels=0xFFFF +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf index 1f6c32c..5a348b2 100644 --- a/uwb/UWB-calibration-tw.conf +++ b/uwb/UWB-calibration-tw.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=12 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant2 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16449 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 @@ -111,6 +105,7 @@ smart_tx_power=1 auto_sleep_margin=20000 alternate_pulse_shape=0x00 restricted_channels=0x20 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index 7838414..f3b70dd 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -1,16 +1,10 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 +[CCC]version=3 [CCC]wifi_coex_time_gap=10 [CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 +[CCC]wifi_coex_min_spacing=0x08 +[CCC]ch5.antenna_selection=ant0 +[CCC]ch9.antenna_selection=ant2 +[CCC]alternate_pulse_shape=0x00 ant0.ch5.prf16.ant_delay=16449 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 @@ -111,6 +105,7 @@ smart_tx_power=1 auto_sleep_margin=20000 alternate_pulse_shape=0x00 restricted_channels=0 +[HAL]aoa_restricted_channels=0x20 [HAL]aoa_capability=2 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6