From 141a50e5091a1598f6f74cb2bd3451ef0f8de6fe Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Wed, 13 Jul 2022 23:45:51 +0000 Subject: [PATCH 1/9] Update oriole SVN to 33 Bug: 232157623 Change-Id: I57a53ccd46e0bed37f1778f6dd834893c89d145c (cherry picked from commit 510d08ff177cab13eeaba9e976a1c321c7f747d9) Merged-In: I57a53ccd46e0bed37f1778f6dd834893c89d145c --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 1346e8c..92fe3ed 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -168,7 +168,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=32 + ro.vendor.build.svn=33 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 677d319ac6684bf756dd1a762dba4e07bc8dfc91 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Wed, 13 Jul 2022 23:44:29 +0000 Subject: [PATCH 2/9] Update raven SVN to 33 Bug: 232157623 Change-Id: I399f59dd9469d051af756d4783e601b261bf17f6 (cherry picked from commit efd2691e1471df772542b044cd5260d667a38fbf) Merged-In: I399f59dd9469d051af756d4783e601b261bf17f6 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index bbc8733..043b850 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -178,7 +178,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=32 + ro.vendor.build.svn=33 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From dd1569927255afffa5c292831056087f0379141f Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 15 Jul 2022 02:37:10 +0000 Subject: [PATCH 3/9] Update raven SVN to 34 Bug: 231380374 Change-Id: I9bfa1cd9019ebf0ede5c59de02edc0165156a8c4 (cherry picked from commit dee4003b66b695a65df92c0ebbba37c668886b85) Merged-In: I9bfa1cd9019ebf0ede5c59de02edc0165156a8c4 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 043b850..9d3491f 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -178,7 +178,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=33 + ro.vendor.build.svn=34 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 2b1865a0141859d3abe33e860d292e181b1a103f Mon Sep 17 00:00:00 2001 From: Steve Berbary Date: Fri, 15 Jul 2022 02:35:30 +0000 Subject: [PATCH 4/9] Update oriole SVN to 34 Bug: 231380374 Change-Id: Ie68cb28fb6debb0457ba201de5081624cdfae42b (cherry picked from commit 3c1af6c55ee8a88c8cd6c6ae683c817aad4453a3) Merged-In: Ie68cb28fb6debb0457ba201de5081624cdfae42b --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 92fe3ed..4414ffa 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -168,7 +168,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=33 + ro.vendor.build.svn=34 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From d13f3a476beeba499b75b20e415d71bd68366ef8 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 15 Jul 2022 04:11:18 +0000 Subject: [PATCH 5/9] Update oriole SVN to 35 Bug: 232157623 Change-Id: Idb1851496006d7f264653dd340a9249996503214 (cherry picked from commit e84f193270a8f4399de3aafaadc44c23ffe9d68d) Merged-In: Idb1851496006d7f264653dd340a9249996503214 --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 4414ffa..4c62246 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -168,7 +168,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=34 + ro.vendor.build.svn=35 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 80ea4f0168dba47dd461e97d9f604141bfdbc67a Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Fri, 15 Jul 2022 04:14:07 +0000 Subject: [PATCH 6/9] Update raven SVN to 35 Bug: 232157623 Change-Id: Id92594cb62c6978848c8a0d3c7dd4c385e0352ff (cherry picked from commit b1c6546d064b0ff970fbfbeada380ec3b6723456) Merged-In: Id92594cb62c6978848c8a0d3c7dd4c385e0352ff --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 9d3491f..4599c00 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -178,7 +178,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=34 + ro.vendor.build.svn=35 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 3a35980c37cbf6d225d964d0835cbc69619ccc83 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Tue, 19 Jul 2022 18:24:17 +0000 Subject: [PATCH 7/9] Update raven SVN to 36 Bug: 232157623 Change-Id: If1887154a1928961a07d4d892f9bb12e76db5b36 (cherry picked from commit 1b8b0de9c8174636b327643fc1b3ac53c4d7d5eb) Merged-In: If1887154a1928961a07d4d892f9bb12e76db5b36 --- device-raven.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-raven.mk b/device-raven.mk index 4599c00..09900d8 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -178,7 +178,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 583ae0834abca6cf16477c255fb0c908acd99a18 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Tue, 19 Jul 2022 18:25:42 +0000 Subject: [PATCH 8/9] Update oriole SVN to 36 Bug: 232157623 Change-Id: Id6d742e62ffceb1db753a60a3ae0c376036e2afd (cherry picked from commit 9897aff89b8fca80323c7bfa7798059fd9eb6fd6) Merged-In: Id6d742e62ffceb1db753a60a3ae0c376036e2afd --- device-oriole.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-oriole.mk b/device-oriole.mk index 4c62246..b652ae5 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -168,7 +168,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=35 + ro.vendor.build.svn=36 # Set support hide display cutout feature PRODUCT_PRODUCT_PROPERTIES += \ From 231a75f14a8a4fb471397dd363a2c7b909b8a683 Mon Sep 17 00:00:00 2001 From: Rex Lin Date: Mon, 1 Aug 2022 15:16:20 +0800 Subject: [PATCH 9/9] uwb: support per device calibration for R4 Bug: 240199018 Test: Build pass Change-Id: I45512bba1e0821b4ba32a324aebc7e6b4ec15532 --- device-raven.mk | 1 - uwb/init.uwb.calib.xtal.sh | 26 ++++++++++++++++++++++++++ uwb/uwb_calibration.mk | 7 +++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 uwb/init.uwb.calib.xtal.sh diff --git a/device-raven.mk b/device-raven.mk index 53bbfcd..97fb567 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -41,7 +41,6 @@ include device/google/gs101/fingerprint/udfps_factory.mk endif ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) -include device/google/gs101/uwb/uwb.mk include device/google/raviole/uwb/uwb_calibration.mk endif diff --git a/uwb/init.uwb.calib.xtal.sh b/uwb/init.uwb.calib.xtal.sh new file mode 100644 index 0000000..1fcb876 --- /dev/null +++ b/uwb/init.uwb.calib.xtal.sh @@ -0,0 +1,26 @@ +#!/vendor/bin/sh +# only use xtal_trim from factory calibration +if [ -z "$2" ] +then + echo "usage is $0 input-calibration output_calibration" + exit 0 +fi +OUTPUT_CALIB="$2" +if [ ! -f "$OUTPUT_CALIB" ]; then + touch $OUTPUT_CALIB + chmod 0644 $OUTPUT_CALIB + file="$1" + while IFS=, read -r f1 f2 + do + case $f1 in + "UWB_cal_tx_xtal_reg_final_value") + if [ $((0x$f2)) -gt 63 ]; then + f2=63 + fi + echo 'xtal_trim=0x'$f2 >> $OUTPUT_CALIB + ;; + esac + done <"$file" + exit 0 +fi + diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index e29bea2..2661ad1 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -13,9 +13,16 @@ # See the License for the specific language governing permissions and # limitations under the License. +# UWB - ultra wide band +$(call inherit-product-if-exists, vendor/qorvo/uwb/uwb.mk) + LOCAL_UWB_CAL_DIR=device/google/raviole/uwb PRODUCT_COPY_FILES += \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-unknown.conf \ $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/uwb/UWB-calibration-default.conf \ + $(LOCAL_UWB_CAL_DIR)/init.uwb.calib.xtal.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.uwb.calib.sh \ + +PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.uwb.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.uwb.xml