From 69e44dc03b73f3b1f7c8b3b7e7828f80ad60572e Mon Sep 17 00:00:00 2001 From: Hasan Awais Date: Thu, 14 Dec 2023 19:27:47 +0000 Subject: [PATCH] Revert "uwb: set calibrations for v6.3" This reverts commit f39e1b74ccba4c736b5da874f7d30d83e4939464. Reason for revert: b/327447971 Bug: 327447971 Change-Id: Ie82683fe1a89040af8ff01dc921c6d58995e9eb6 --- device-husky.mk | 2 +- uwb/calibration-CE.conf | 6 +++--- uwb/calibration-FCC.conf | 6 +++--- uwb/calibration-JP.conf | 4 ++-- uwb/calibration-TW.conf | 6 +++--- uwb/calibration-default.conf | 6 +++--- uwb/calibration.conf | 4 +++- uwb/configuration.conf | 15 ++++++++++++++- 8 files changed, 32 insertions(+), 17 deletions(-) diff --git a/device-husky.mk b/device-husky.mk index a8bb47a..6971a68 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -35,7 +35,7 @@ $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-ve $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/husky/device-vendor-husky.mk) $(call inherit-product-if-exists, vendor/google_devices/husky/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal-r63/Device.mk) +$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersHusky.mk) # display diff --git a/uwb/calibration-CE.conf b/uwb/calibration-CE.conf index e1a45aa..e1365d4 100644 --- a/uwb/calibration-CE.conf +++ b/uwb/calibration-CE.conf @@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33 ant0.ch5.ref_frame4.tx_power_index=37:37:37:37 ant0.ch5.ref_frame5.tx_power_index=37:37:37:37 ant0.ch5.ref_frame6.tx_power_index=32:32:32:32 -ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch5.ref_frame0.post_tx_power_index=0xff @@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=36:36:36:36 ant0.ch9.ref_frame4.tx_power_index=32:32:32:32 ant0.ch9.ref_frame5.tx_power_index=31:31:31:31 ant0.ch9.ref_frame6.tx_power_index=37:37:37:37 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0xff @@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=37:37:37:37 ant1.ch9.ref_frame4.tx_power_index=40:40:40:40 ant1.ch9.ref_frame5.tx_power_index=3B:3B:3B:3B ant1.ch9.ref_frame6.tx_power_index=39:39:39:39 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0xff diff --git a/uwb/calibration-FCC.conf b/uwb/calibration-FCC.conf index f579c20..0b44c81 100644 --- a/uwb/calibration-FCC.conf +++ b/uwb/calibration-FCC.conf @@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33 ant0.ch5.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch5.ref_frame5.tx_power_index=3B:3B:3B:3B ant0.ch5.ref_frame6.tx_power_index=32:32:32:32 -ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch5.ref_frame0.post_tx_power_index=0x34 @@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=3B:3B:3B:3B ant0.ch9.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch9.ref_frame5.tx_power_index=37:37:37:37 ant0.ch9.ref_frame6.tx_power_index=39:39:39:39 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0x32 @@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=3A:3A:3A:3A ant1.ch9.ref_frame4.tx_power_index=40:40:40:40 ant1.ch9.ref_frame5.tx_power_index=3E:3E:3E:3E ant1.ch9.ref_frame6.tx_power_index=34:34:34:34 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0x32 diff --git a/uwb/calibration-JP.conf b/uwb/calibration-JP.conf index 463dada..f1b54e2 100644 --- a/uwb/calibration-JP.conf +++ b/uwb/calibration-JP.conf @@ -16,7 +16,7 @@ ant0.ch9.ref_frame3.tx_power_index=32:32:32:32 ant0.ch9.ref_frame4.tx_power_index=41:41:41:41 ant0.ch9.ref_frame5.tx_power_index=40:40:40:40 ant0.ch9.ref_frame6.tx_power_index=35:35:35:35 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0xff @@ -65,7 +65,7 @@ ant1.ch9.ref_frame3.tx_power_index=34:34:34:34 ant1.ch9.ref_frame4.tx_power_index=3C:3C:3C:3C ant1.ch9.ref_frame5.tx_power_index=3B:3B:3B:3B ant1.ch9.ref_frame6.tx_power_index=30:30:30:30 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0xff diff --git a/uwb/calibration-TW.conf b/uwb/calibration-TW.conf index fcac264..5287210 100644 --- a/uwb/calibration-TW.conf +++ b/uwb/calibration-TW.conf @@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33 ant0.ch5.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch5.ref_frame5.tx_power_index=3B:3B:3B:3B ant0.ch5.ref_frame6.tx_power_index=32:32:32:32 -ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch5.ref_frame0.post_tx_power_index=0x34 @@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=3B:3B:3B:3B ant0.ch9.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch9.ref_frame5.tx_power_index=37:37:37:37 ant0.ch9.ref_frame6.tx_power_index=39:39:39:39 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0x32 @@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=3A:3A:3A:3A ant1.ch9.ref_frame4.tx_power_index=40:40:40:40 ant1.ch9.ref_frame5.tx_power_index=3E:3E:3E:3E ant1.ch9.ref_frame6.tx_power_index=34:34:34:34 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0x32 diff --git a/uwb/calibration-default.conf b/uwb/calibration-default.conf index f579c20..0b44c81 100644 --- a/uwb/calibration-default.conf +++ b/uwb/calibration-default.conf @@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33 ant0.ch5.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch5.ref_frame5.tx_power_index=3B:3B:3B:3B ant0.ch5.ref_frame6.tx_power_index=32:32:32:32 -ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch5.ref_frame0.post_tx_power_index=0x34 @@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=3B:3B:3B:3B ant0.ch9.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch9.ref_frame5.tx_power_index=37:37:37:37 ant0.ch9.ref_frame6.tx_power_index=39:39:39:39 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0x32 @@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=3A:3A:3A:3A ant1.ch9.ref_frame4.tx_power_index=40:40:40:40 ant1.ch9.ref_frame5.tx_power_index=3E:3E:3E:3E ant1.ch9.ref_frame6.tx_power_index=34:34:34:34 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0x32 diff --git a/uwb/calibration.conf b/uwb/calibration.conf index a985e8a..4c16545 100644 --- a/uwb/calibration.conf +++ b/uwb/calibration.conf @@ -34,6 +34,8 @@ ant3.ch9.pa_gain_offset=0x00 #Coex wifi_coex_mode=01 -wifi_coex_time_gap_t1=01 +wifi_coex_time_gap=01 ch5.wifi_coex_enabled=01 ch9.wifi_coex_enabled=01 + +dual_rx_auto.accum_period=0x00 \ No newline at end of file diff --git a/uwb/configuration.conf b/uwb/configuration.conf index 16b9f36..68d3cab 100644 --- a/uwb/configuration.conf +++ b/uwb/configuration.conf @@ -2,6 +2,19 @@ [FIRA]ant_sets.ch5.range.rx_ant_set_ranging = 0 [FIRA]ant_sets.ch5.range.tx_ant_set_nonranging = 0 [FIRA]ant_sets.ch5.range.tx_ant_set_ranging = 0 +[FIRA]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth.rx_ant_set_ranging = 1 +[FIRA]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth.tx_ant_set_ranging = 1 +[FIRA]ant_sets.ch5.elevation.rx_ant_set_nonranging = 2 +[FIRA]ant_sets.ch5.elevation.rx_ant_set_ranging = 2 +[FIRA]ant_sets.ch5.elevation.tx_ant_set_nonranging = 2 +[FIRA]ant_sets.ch5.elevation.tx_ant_set_ranging = 2 +[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth = 1 +[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation = 2 +[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging = 1 [FIRA]ant_sets.ch9.range.rx_ant_set_nonranging = 0 [FIRA]ant_sets.ch9.range.rx_ant_set_ranging = 0 [FIRA]ant_sets.ch9.range.tx_ant_set_nonranging = 0 @@ -119,4 +132,4 @@ post_tx.pattern_data=DD:DD:DD:DD:77:77:77:77 post_tx.pattern_repetitions=0x0002 # Ipatov / STS time difference threshold -ip_sts_sanity_thres_q2=0x48 +ip_sts_sanity_thres_q2=0x0A