From 0f5a142a125758fc6841ab9ba12d67b5ce7afee9 Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Thu, 10 Feb 2022 16:09:22 -0800 Subject: [PATCH] uwb: use per device factory calibration Use device specific script to select which factory calibration values to use. Bug: 218719905 Test: build Signed-off-by: Victor Liu Change-Id: I1750cb6c17de69dc3a86ce01fa1e023194591358 --- device-felix.mk | 2 +- uwb/uwb_calibration.mk | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 6711c0a..9ee8feb 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -30,8 +30,8 @@ include device/google/felix/audio/felix/audio-tables.mk include hardware/google/pixel/vibrator/cs40l25/device-stereo-specific-revision.mk include hardware/google/pixel/vibrator/cs40l26/device-stereo-specific-revision.mk include device/google/gs101/bluetooth/bluetooth.mk -include device/google/gs201/uwb/uwb.mk ifeq ($(filter factory_felix, $(TARGET_PRODUCT)),) +include device/google/gs101/uwb/uwb.mk include device/google/felix/uwb/uwb_calibration.mk endif diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index d2340e7..5ef15ce 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -19,3 +19,4 @@ PRODUCT_COPY_FILES += \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-unknown.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-default.conf \ + vendor/qorvo/uwb/aosp/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \