Merge "uwb: update uwb calibration for CCC antenna config" into udc-dev am: 7808249006 am: 1dbdb79250

Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22949561

Change-Id: Ife1275f619d15fac8542994614e674d569a555ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-05-11 20:16:41 +00:00 committed by Automerger Merge Worker
commit cd5e47dcaa
7 changed files with 42 additions and 77 deletions

View file

@ -1,16 +1,10 @@
[CCC]version=2 [CCC]version=3
[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]wifi_coex_time_gap=10 [CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1 [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.ant_delay=16449
ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.tx_power=0xFFFFD4FF
ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_count=0
@ -111,6 +105,7 @@ smart_tx_power=1
auto_sleep_margin=20000 auto_sleep_margin=20000
alternate_pulse_shape=0x00 alternate_pulse_shape=0x00
restricted_channels=0 restricted_channels=0
[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2 [HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6

View file

@ -1,16 +1,10 @@
[CCC]version=2 [CCC]version=3
[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]wifi_coex_time_gap=10 [CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1 [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.ant_delay=16449
ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.tx_power=0xFFFFD4FF
ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_count=0
@ -111,6 +105,7 @@ smart_tx_power=1
auto_sleep_margin=20000 auto_sleep_margin=20000
alternate_pulse_shape=0x00 alternate_pulse_shape=0x00
restricted_channels=0 restricted_channels=0
[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2 [HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6

View file

@ -1,16 +1,10 @@
[CCC]version=2 [CCC]version=3
[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]wifi_coex_time_gap=10 [CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1 [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.ant_delay=16449
ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.tx_power=0xFFFFD4FF
ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_count=0
@ -111,6 +105,7 @@ smart_tx_power=1
auto_sleep_margin=20000 auto_sleep_margin=20000
alternate_pulse_shape=0x00 alternate_pulse_shape=0x00
restricted_channels=0 restricted_channels=0
[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2 [HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6

View file

@ -1,16 +1,10 @@
[CCC]version=2 [CCC]version=3
[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]wifi_coex_time_gap=10 [CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1 [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.ant_delay=16449
ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.tx_power=0xFFFFD4FF
ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_count=0
@ -111,6 +105,7 @@ smart_tx_power=1
auto_sleep_margin=20000 auto_sleep_margin=20000
alternate_pulse_shape=0x01 alternate_pulse_shape=0x01
restricted_channels=0x20 restricted_channels=0x20
[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2 [HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6

View file

@ -1,16 +1,10 @@
[CCC]version=2 [CCC]version=3
[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]wifi_coex_time_gap=10 [CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1 [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.ant_delay=16449
ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.tx_power=0xFFFFD4FF
ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_count=0
@ -111,6 +105,7 @@ smart_tx_power=1
auto_sleep_margin=20000 auto_sleep_margin=20000
alternate_pulse_shape=0x00 alternate_pulse_shape=0x00
restricted_channels=0xFFFF restricted_channels=0xFFFF
[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2 [HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6

View file

@ -1,16 +1,10 @@
[CCC]version=2 [CCC]version=3
[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]wifi_coex_time_gap=10 [CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1 [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.ant_delay=16449
ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.tx_power=0xFFFFD4FF
ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_count=0
@ -111,6 +105,7 @@ smart_tx_power=1
auto_sleep_margin=20000 auto_sleep_margin=20000
alternate_pulse_shape=0x00 alternate_pulse_shape=0x00
restricted_channels=0x20 restricted_channels=0x20
[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2 [HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6

View file

@ -1,16 +1,10 @@
[CCC]version=2 [CCC]version=3
[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]wifi_coex_time_gap=10 [CCC]wifi_coex_time_gap=10
[CCC]ap_coop_mode=1 [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.ant_delay=16449
ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.tx_power=0xFFFFD4FF
ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_count=0
@ -111,6 +105,7 @@ smart_tx_power=1
auto_sleep_margin=20000 auto_sleep_margin=20000
alternate_pulse_shape=0x00 alternate_pulse_shape=0x00
restricted_channels=0 restricted_channels=0
[HAL]aoa_restricted_channels=0x20
[HAL]aoa_capability=2 [HAL]aoa_capability=2
[HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_nonranging=6
[HAL]ant_sets.ch5.range.rx_ant_set_ranging=6 [HAL]ant_sets.ch5.range.rx_ant_set_ranging=6