From 1845dfddbc34e8b9fadabf3d900c38384ef6f642 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 27 Oct 2021 12:41:22 +0800 Subject: [PATCH 1/3] [DO NOT MERGE] Jump SVN to 6 for Non-VZW EMR Bug: 204262150 Change-Id: Idb329167c988188f5c499bc580d5ba0be0a3a1f5 Merged-In: I2b2cb7e6564b9633ce2055e2de59ba9de2fdc006 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index e10f126..2614ae2 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -143,7 +143,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=5 + ro.vendor.build.svn=6 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 7c6e4b6..145a2af 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=5 + ro.vendor.build.svn=6 # Hide cutout overlays PRODUCT_PACKAGES += \ From 2bc9d4dab11b2c06a71dbaaf2e6ce4459ed1c75d Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Wed, 27 Oct 2021 12:41:59 +0800 Subject: [PATCH 2/3] [DO NOT MERGE] Jump SVN to 7 for VZW EMR Bug: 204262119 Change-Id: I02bc60f4e3aad3e83db7ef0d2e471b82d9d13a34 Merged-In: I2b2cb7e6564b9633ce2055e2de59ba9de2fdc006 --- device-oriole.mk | 2 +- device-raven.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device-oriole.mk b/device-oriole.mk index 2614ae2..74019d2 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -143,7 +143,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=6 + ro.vendor.build.svn=7 # Hide cutout overlays PRODUCT_PACKAGES += \ diff --git a/device-raven.mk b/device-raven.mk index 145a2af..7f79ff8 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -144,7 +144,7 @@ endif # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=6 + ro.vendor.build.svn=7 # Hide cutout overlays PRODUCT_PACKAGES += \ From 49d231b50da5a282ede7edf5b5ba68034a18abd3 Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Tue, 26 Oct 2021 12:00:09 -0700 Subject: [PATCH 3/3] uwb: remove device name from gs101 Move device uwb calibration into device specific folder Bug: 203746316 Test: build, on device files exist Change-Id: Ic7a46ea7150d2723747b8d943d80f53c84215b93 --- device-raven.mk | 1 + uwb/UWB-calibration.conf | 116 +++++++++++++++++++++++++++++++++++++++ uwb/uwb_calibration.mk | 21 +++++++ 3 files changed, 138 insertions(+) create mode 100644 uwb/UWB-calibration.conf create mode 100644 uwb/uwb_calibration.mk diff --git a/device-raven.mk b/device-raven.mk index e0eca5f..2449322 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -40,6 +40,7 @@ endif ifeq ($(filter factory_raven, $(TARGET_PRODUCT)),) include device/google/gs101/uwb/uwb.mk +include device/google/raviole/uwb/uwb_calibration.mk endif include hardware/google/pixel/vibrator/cs40l25/device.mk diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf new file mode 100644 index 0000000..1d89698 --- /dev/null +++ b/uwb/UWB-calibration.conf @@ -0,0 +1,116 @@ +[CCC]format=1 +[CCC]kind=0 +[CCC]settings=1 +[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]ap_coop_mode=1 +[CCC]antenna_selection=4 +ant0.ch5.prf16.ant_delay=16450 +ant0.ch5.prf16.tx_power=0x4E4E4E4E +ant0.ch5.prf16.pg_count=0 +ant0.ch5.prf16.pg_delay=0x26 +ant0.ch5.prf64.ant_delay=16450 +ant0.ch5.prf64.tx_power=0x4E4E4E4E +ant0.ch5.prf64.pg_count=0 +ant0.ch5.prf64.pg_delay=0x26 +ant0.ch9.prf16.ant_delay=16450 +ant0.ch9.prf16.tx_power=0x56565656 +ant0.ch9.prf16.pg_count=0 +ant0.ch9.prf16.pg_delay=0x26 +ant0.ch9.prf64.ant_delay=16450 +ant0.ch9.prf64.tx_power=0x56565656 +ant0.ch9.prf64.pg_count=0 +ant0.ch9.prf64.pg_delay=0x26 +ant0.port=0 +ant0.selector_gpio=7 +ant0.selector_gpio_value=0 +ant1.ch5.prf16.ant_delay=16450 +ant1.ch5.prf16.tx_power=0x4E4E4E4E +ant1.ch5.prf16.pg_count=0 +ant1.ch5.prf16.pg_delay=0x26 +ant1.ch5.prf64.ant_delay=16450 +ant1.ch5.prf64.tx_power=0x4E4E4E4E +ant1.ch5.prf64.pg_count=0 +ant1.ch5.prf64.pg_delay=0x26 +ant1.ch9.prf16.ant_delay=16450 +ant1.ch9.prf16.tx_power=0x56565656 +ant1.ch9.prf16.pg_count=0 +ant1.ch9.prf16.pg_delay=0x26 +ant1.ch9.prf64.ant_delay=16450 +ant1.ch9.prf64.tx_power=0x56565656 +ant1.ch9.prf64.pg_count=0 +ant1.ch9.prf64.pg_delay=0x26 +ant1.port=0 +ant1.selector_gpio=7 +ant1.selector_gpio_value=1 +ant2.ch5.prf16.ant_delay=16450 +ant2.ch5.prf16.tx_power=0x4E4E4E4E +ant2.ch5.prf16.pg_count=0 +ant2.ch5.prf16.pg_delay=0x26 +ant2.ch5.prf64.ant_delay=16450 +ant2.ch5.prf64.tx_power=0x4E4E4E4E +ant2.ch5.prf64.pg_count=0 +ant2.ch5.prf64.pg_delay=0x26 +ant2.ch9.prf16.ant_delay=16450 +ant2.ch9.prf16.tx_power=0x56565656 +ant2.ch9.prf16.pg_count=0 +ant2.ch9.prf16.pg_delay=0x26 +ant2.ch9.prf64.ant_delay=16450 +ant2.ch9.prf64.tx_power=0x56565656 +ant2.ch9.prf64.pg_count=0 +ant2.ch9.prf64.pg_delay=0x26 +ant2.port=1 +ant2.selector_gpio=6 +ant2.selector_gpio_value=0 +ant3.ch5.prf16.ant_delay=16450 +ant3.ch5.prf16.tx_power=0x4E4E4E4E +ant3.ch5.prf16.pg_count=0 +ant3.ch5.prf16.pg_delay=0x26 +ant3.ch5.prf64.ant_delay=16450 +ant3.ch5.prf64.tx_power=0x4E4E4E4E +ant3.ch5.prf64.pg_count=0 +ant3.ch5.prf64.pg_delay=0x26 +ant3.ch9.prf16.ant_delay=16450 +ant3.ch9.prf16.tx_power=0x56565656 +ant3.ch9.prf16.pg_count=0 +ant3.ch9.prf16.pg_delay=0x26 +ant3.ch9.prf64.ant_delay=16450 +ant3.ch9.prf64.tx_power=0x56565656 +ant3.ch9.prf64.pg_count=0 +ant3.ch9.prf64.pg_delay=0x26 +ant3.port=1 +ant3.selector_gpio=6 +ant3.selector_gpio_value=1 +ant0.ant1.ch5.pdoa_offset=0 +ant0.ant1.ch9.pdoa_offset=0 +ant0.ant2.ch5.pdoa_offset=0 +ant0.ant2.ch9.pdoa_offset=0 +ant1.ant2.ch5.pdoa_offset=0 +ant1.ant2.ch9.pdoa_offset=0 +ant0.ant3.ch5.pdoa_offset=0 +ant0.ant3.ch9.pdoa_offset=0 +ant1.ant3.ch5.pdoa_offset=-4710 +ant1.ant3.ch9.pdoa_offset=-6144 +ant2.ant3.ch5.pdoa_offset=0 +ant2.ant3.ch9.pdoa_offset=0 +ch5.pll_locking_code=0 +ch9.pll_locking_code=0 +ant1.ant3.ch5.pdoa_lut=e1:f2:85:f5:ae:f3:3d:f6:52:f4:f6:f6:8f:f4:9a:f7:48:f5:52:f8:d7:f5:0a:f9:66:f6:ae:f9:85:f7:66:fa:8f:f8:1f:fb:48:f9:d7:fb:8f:fa:7b:fc:ec:fb:33:fd:0a:fd:ec:fd:66:fe:a4:fe:00:00:48:ff:71:01:00:00:b8:02:b8:00:29:04:64:01:ae:05:19:02:85:07:cb:02:33:09:7d:03:f6:0a:2f:04:0a:0d:e3:04:cd:0e:96:05:14:10:48:06:71:11:fa:06:66:12:ac:07:33:13:60:08:3d:14:12:09:85:15:c5:09:ec:15:77:0a +ant1.ant3.ch9.pdoa_lut=e1:ec:f6:f6:48:ed:3d:f6:85:ed:85:f5:14:ee:9a:f7:3d:ee:52:f8:e1:ee:0a:f9:3d:f0:ae:f9:85:f1:66:fa:85:f3:1f:fb:00:f6:d7:fb:9a:f7:7b:fc:14:fa:33:fd:ec:fb:ec:fd:71:fd:a4:fe:cd:fe:48:ff:a4:00:00:00:85:01:b8:00:7b:02:5c:01:d7:03:14:02:cd:04:cd:02:48:07:85:03:ae:09:29:04:e1:0c:e1:04:7b:10:9a:05:cd:12:52:06:f6:14:f6:06:a4:16:ae:07:ae:17:0a:09:d7:17:c3:09:52:18:66:08:7b:18:7b:0a +xtal_trim=31 +temperature_reference=85 +smart_tx_power=1 +auto_sleep_margin=20000 +[HAL]antenna_pair_azimuth=4 +[HAL]antenna_pair_elevation=4 +[HAL]tx_antenna=0 +[HAL]minimum_system_offset_uwbtime0=200 +restricted_channels=0 diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk new file mode 100644 index 0000000..d0585d9 --- /dev/null +++ b/uwb/uwb_calibration.mk @@ -0,0 +1,21 @@ +# +# Copyright (C) 2021 The Android Open-Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +LOCAL_UWB_CAL_DIR=device/google/raviole/uwb + +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 \