From c6c9da6c90206d8c24c23a1c1312ecce3ffa95ab Mon Sep 17 00:00:00 2001 From: Lokesh Kumar Goel Date: Thu, 29 Jun 2023 20:57:20 +0000 Subject: [PATCH 01/16] Update felix SVN to 19 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f3a64b8eb7fbcdaeda0c6b49f782051fae885115) Merged-In: I9419048ef2456f8edc5ddf7adcde1f532857a1e1 Change-Id: I9419048ef2456f8edc5ddf7adcde1f532857a1e1 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index d90f252..29ce0f0 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=18 + ro.vendor.build.svn=19 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From cda49c53f57ca2fa1cf1273cd36bdd8919d87fca Mon Sep 17 00:00:00 2001 From: Rick Chen Date: Thu, 29 Jun 2023 15:02:18 +0800 Subject: [PATCH 02/16] hall_sensor: Disable hall sensor input when bootmode is unknown Bug: 284431215 Test: 1. No hall sensor in getevent. 2. Inner/outer screen can be switched in offmode charging, recovery, fastboot mode. Signed-off-by: Rick Chen (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:508fa1bcb45f6f5b75fc9e5475f2e8658588809e) Merged-In: Id9f93b4687898cf23601516cf69d0338df14e2aa Change-Id: Id9f93b4687898cf23601516cf69d0338df14e2aa --- conf/init.felix.rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/init.felix.rc b/conf/init.felix.rc index 891865b..34059f0 100644 --- a/conf/init.felix.rc +++ b/conf/init.felix.rc @@ -117,6 +117,9 @@ on post-fs-data on init && property:ro.bootmode=normal write /sys/devices/platform/hall_sensor/enable 0 +on init && property:ro.bootmode=unknown + write /sys/devices/platform/hall_sensor/enable 0 + on init && property:ro.bootmode=factory write /sys/devices/platform/hall_sensor/enable 0 From a38c59118f1534fc697c0db85b15972195c57c76 Mon Sep 17 00:00:00 2001 From: Zoey Hsieh Date: Tue, 11 Jul 2023 03:51:39 +0000 Subject: [PATCH 03/16] Update felix SVN to 20 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:06f834e2a8850e2463cf468e9b9c3a137d81ad0c) Merged-In: I82a61ec7c74690f30af32ff2e48f69fb91d0062c Change-Id: I82a61ec7c74690f30af32ff2e48f69fb91d0062c --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 29ce0f0..86f55cd 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=19 + ro.vendor.build.svn=20 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From fbe12053106b7390175371c889123bac5e3aa718 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Fri, 7 Jul 2023 14:20:25 -0700 Subject: [PATCH 04/16] thermal: modify emergency and shutdown threshold Bug: 289752109 Test: adb shell cat /dev/thermal/tz-by-name/skin_therm/trip_point_*_temp Test: adb shell dumpsys android.hardware.thermal.IThermal/default (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b486f5a3ee3fc3c7ac98e8a51377dce7cbb22a6b) Merged-In: I619fd5a5ee4e668430b4002c58123525e9b14812 Change-Id: I619fd5a5ee4e668430b4002c58123525e9b14812 --- conf/init.felix.rc | 4 ++++ thermal_info_config_felix.json | 10 +++++----- thermal_info_config_proactive_skin_felix.json | 10 +++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/conf/init.felix.rc b/conf/init.felix.rc index 34059f0..1b5ce74 100644 --- a/conf/init.felix.rc +++ b/conf/init.felix.rc @@ -106,6 +106,10 @@ on property:vendor.mfgapi.touchpanel.permission=1 on property:persist.device_config.vendor_system_native_boot.thermal_proactive_skin=1 setprop vendor.thermal.config "thermal_info_config_proactive_skin.json" +on property:vendor.thermal.link_ready=1 + write /dev/thermal/tz-by-name/skin_therm/trip_point_1_temp 61000 + write /dev/thermal/tz-by-name/skin_therm/trip_point_2_temp 63000 + # Bluetooth on post-fs-data chown bluetooth system /proc/bluetooth/timesync diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json index 6bbb5b0..6a35aab 100644 --- a/thermal_info_config_felix.json +++ b/thermal_info_config_felix.json @@ -270,7 +270,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 51.0, 54.0], + "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "SendPowerHint":true, @@ -285,7 +285,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 52.5, "NAN"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 55.0, "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, "PollingDelay":300000, @@ -301,7 +301,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 51.0, 54.0], + "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 53.0, 57.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, @@ -362,7 +362,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 51.0, 54.0], + "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, @@ -427,7 +427,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 54.0], + "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 57.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9], "Multiplier":0.001, "PollingDelay":60000, diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json index 1b7c446..1a6321f 100644 --- a/thermal_info_config_proactive_skin_felix.json +++ b/thermal_info_config_proactive_skin_felix.json @@ -270,7 +270,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 51.0, 54.0], + "HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 53.0, 57.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "SendPowerHint":true, @@ -285,7 +285,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 52.5, "NAN"], + "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 55.0, "NAN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, "PollingDelay":300000, @@ -301,7 +301,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 51.0, 54.0], + "HotThreshold":["NAN", 37.0, 39.0, 41.0, 46.5, 53.0, 57.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, @@ -362,7 +362,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 51.0, 54.0], + "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 53.0, 57.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, @@ -427,7 +427,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 54.0], + "HotThreshold":["NAN", 25.0, 39.0, 41.0, 45.0, 46.5, 57.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.9, 1.4, 1.9], "Multiplier":0.001, "PollingDelay":60000, From 6c2cd58841b3e8e93041573ec17f8e748e90355c Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Wed, 5 Jul 2023 23:26:34 -0700 Subject: [PATCH 05/16] thermal: Update VSKIN equation V06.2 Bug: 289752109 Test: adb shell dumpsys android.hardware.thermal.IThermal/default (cherry picked from commit 68182cb0cbe267f6162b33b37f09ee80e314010e) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6a3ea3d37c70c8d3b47310c70c1c1d5dbc64e1f8) Merged-In: Ib957fae2db39f421c0b11c3b3b106f3ec333e4f5 Change-Id: Ib957fae2db39f421c0b11c3b3b106f3ec333e4f5 --- thermal_info_config_charge_felix.json | 6 +++--- thermal_info_config_felix.json | 8 ++++---- thermal_info_config_proactive_skin_felix.json | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/thermal_info_config_charge_felix.json b/thermal_info_config_charge_felix.json index ceb9181..80cd32c 100644 --- a/thermal_info_config_charge_felix.json +++ b/thermal_info_config_charge_felix.json @@ -204,9 +204,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], - "Coefficient":[0.15, 1.05, -0.65, 1, -0.55], - "Offset":3540, + "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"], + "Coefficient":[0.429, 0.314, 0.205], + "Offset":2600, "Multiplier":0.001 }, { diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json index 6a35aab..e55585e 100644 --- a/thermal_info_config_felix.json +++ b/thermal_info_config_felix.json @@ -210,9 +210,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], - "Coefficient":[0.15, 1.05, -0.65, 1, -0.55], - "Offset":3540, + "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"], + "Coefficient":[0.429, 0.314, 0.205], + "Offset":2600, "Multiplier":0.001 }, { @@ -238,7 +238,7 @@ { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"0.5", + "Version":"6.2", "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM", diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json index 1a6321f..a603558 100644 --- a/thermal_info_config_proactive_skin_felix.json +++ b/thermal_info_config_proactive_skin_felix.json @@ -210,9 +210,9 @@ "Hidden":true, "VirtualSensor":true, "Formula":"WEIGHTED_AVG", - "Combination":["neutral_therm", "skin_therm", "usb_pwr_therm", "usb_pwr_therm2", "inner_disp_therm"], - "Coefficient":[0.15, 1.05, -0.65, 1, -0.55], - "Offset":3540, + "Combination":["quiet_therm", "skin_therm", "usb_pwr_therm"], + "Coefficient":[0.429, 0.314, 0.205], + "Offset":2600, "Multiplier":0.001 }, { @@ -238,7 +238,7 @@ { "Name":"VIRTUAL-SKIN", "Type":"SKIN", - "Version":"0.5", + "Version":"6.2", "VirtualSensor":true, "TriggerSensor":"skin_therm", "Formula":"MAXIMUM", From e98accf2e3bc8202b278f0818c47d39d09df4efe Mon Sep 17 00:00:00 2001 From: Victor Liu Date: Fri, 21 Jul 2023 09:35:12 -0700 Subject: [PATCH 06/16] uwb calibration: fix distance range bias Bug: 289884022 Signed-of-by: Victor Liu (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ebd32fad386de9ae8b9a581109210a9e54cf6b4a) Merged-In: Ieda9b4b866026632fdcf798ca7a871319cb47647 Change-Id: Ieda9b4b866026632fdcf798ca7a871319cb47647 --- uwb/UWB-calibration-ce.conf | 36 +++++++++++------------ uwb/UWB-calibration-default.conf | 36 +++++++++++------------ uwb/UWB-calibration-fcc.conf | 36 +++++++++++------------ uwb/UWB-calibration-jp.conf | 36 +++++++++++------------ uwb/UWB-calibration-restricted.conf | 36 +++++++++++------------ uwb/UWB-calibration-tw.conf | 36 +++++++++++------------ uwb/UWB-calibration.conf | 44 ++++++++++++++--------------- 7 files changed, 130 insertions(+), 130 deletions(-) diff --git a/uwb/UWB-calibration-ce.conf b/uwb/UWB-calibration-ce.conf index ddc9fca..7e025ad 100644 --- a/uwb/UWB-calibration-ce.conf +++ b/uwb/UWB-calibration-ce.conf @@ -5,11 +5,11 @@ [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=16459 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x34 -ant0.ch5.prf64.ant_delay=16449 +ant0.ch5.prf64.ant_delay=16459 ant0.ch5.prf64.tx_power=0xFFFFD4FF ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x34 @@ -32,11 +32,11 @@ ant1.ch5.prf64.ant_delay=16450 ant1.ch5.prf64.tx_power=0xFFFFFFFF ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0x26 -ant1.ch9.prf16.ant_delay=16451 +ant1.ch9.prf16.ant_delay=16436 ant1.ch9.prf16.tx_power=0x7E7E687E ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x34 -ant1.ch9.prf64.ant_delay=16451 +ant1.ch9.prf64.ant_delay=16436 ant1.ch9.prf64.tx_power=0x7E7E687E ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x34 @@ -51,11 +51,11 @@ ant2.ch5.prf64.ant_delay=16450 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16451 +ant2.ch9.prf16.ant_delay=16437 ant2.ch9.prf16.tx_power=0x9E9E7C9E ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0x34 -ant2.ch9.prf64.ant_delay=16451 +ant2.ch9.prf64.ant_delay=16437 ant2.ch9.prf64.tx_power=0x9E9E7C9E ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0x34 @@ -70,11 +70,11 @@ ant3.ch5.prf64.ant_delay=16450 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16450 +ant3.ch9.prf16.ant_delay=16459 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16450 +ant3.ch9.prf64.ant_delay=16459 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 @@ -115,22 +115,22 @@ restricted_channels=0 [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0 -[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4 -[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4 @@ -139,8 +139,8 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7 [HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 diff --git a/uwb/UWB-calibration-default.conf b/uwb/UWB-calibration-default.conf index f3b70dd..1798e58 100644 --- a/uwb/UWB-calibration-default.conf +++ b/uwb/UWB-calibration-default.conf @@ -5,11 +5,11 @@ [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=16459 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x28 -ant0.ch5.prf64.ant_delay=16449 +ant0.ch5.prf64.ant_delay=16459 ant0.ch5.prf64.tx_power=0xFFFFD4FF ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x28 @@ -32,11 +32,11 @@ ant1.ch5.prf64.ant_delay=16450 ant1.ch5.prf64.tx_power=0xFFFFFFFF ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0x26 -ant1.ch9.prf16.ant_delay=16451 +ant1.ch9.prf16.ant_delay=16436 ant1.ch9.prf16.tx_power=0x3E3E303E ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x16 -ant1.ch9.prf64.ant_delay=16451 +ant1.ch9.prf64.ant_delay=16436 ant1.ch9.prf64.tx_power=0x3E3E303E ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x16 @@ -51,11 +51,11 @@ ant2.ch5.prf64.ant_delay=16450 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16451 +ant2.ch9.prf16.ant_delay=16437 ant2.ch9.prf16.tx_power=0x8E8E748E ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0x28 -ant2.ch9.prf64.ant_delay=16451 +ant2.ch9.prf64.ant_delay=16437 ant2.ch9.prf64.tx_power=0x8E8E748E ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0x28 @@ -70,11 +70,11 @@ ant3.ch5.prf64.ant_delay=16450 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16450 +ant3.ch9.prf16.ant_delay=16459 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16450 +ant3.ch9.prf64.ant_delay=16459 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 @@ -115,22 +115,22 @@ restricted_channels=0 [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0 -[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4 -[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4 @@ -139,8 +139,8 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7 [HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 diff --git a/uwb/UWB-calibration-fcc.conf b/uwb/UWB-calibration-fcc.conf index f3b70dd..1798e58 100644 --- a/uwb/UWB-calibration-fcc.conf +++ b/uwb/UWB-calibration-fcc.conf @@ -5,11 +5,11 @@ [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=16459 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x28 -ant0.ch5.prf64.ant_delay=16449 +ant0.ch5.prf64.ant_delay=16459 ant0.ch5.prf64.tx_power=0xFFFFD4FF ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x28 @@ -32,11 +32,11 @@ ant1.ch5.prf64.ant_delay=16450 ant1.ch5.prf64.tx_power=0xFFFFFFFF ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0x26 -ant1.ch9.prf16.ant_delay=16451 +ant1.ch9.prf16.ant_delay=16436 ant1.ch9.prf16.tx_power=0x3E3E303E ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x16 -ant1.ch9.prf64.ant_delay=16451 +ant1.ch9.prf64.ant_delay=16436 ant1.ch9.prf64.tx_power=0x3E3E303E ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x16 @@ -51,11 +51,11 @@ ant2.ch5.prf64.ant_delay=16450 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16451 +ant2.ch9.prf16.ant_delay=16437 ant2.ch9.prf16.tx_power=0x8E8E748E ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0x28 -ant2.ch9.prf64.ant_delay=16451 +ant2.ch9.prf64.ant_delay=16437 ant2.ch9.prf64.tx_power=0x8E8E748E ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0x28 @@ -70,11 +70,11 @@ ant3.ch5.prf64.ant_delay=16450 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16450 +ant3.ch9.prf16.ant_delay=16459 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16450 +ant3.ch9.prf64.ant_delay=16459 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 @@ -115,22 +115,22 @@ restricted_channels=0 [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0 -[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4 -[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4 @@ -139,8 +139,8 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7 [HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 diff --git a/uwb/UWB-calibration-jp.conf b/uwb/UWB-calibration-jp.conf index 1612133..3d5cfe4 100644 --- a/uwb/UWB-calibration-jp.conf +++ b/uwb/UWB-calibration-jp.conf @@ -5,11 +5,11 @@ [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=16459 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x28 -ant0.ch5.prf64.ant_delay=16449 +ant0.ch5.prf64.ant_delay=16459 ant0.ch5.prf64.tx_power=0xFFFFD4FF ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x28 @@ -32,11 +32,11 @@ ant1.ch5.prf64.ant_delay=16450 ant1.ch5.prf64.tx_power=0xFFFFFFFF ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0x26 -ant1.ch9.prf16.ant_delay=16451 +ant1.ch9.prf16.ant_delay=16436 ant1.ch9.prf16.tx_power=0x5E5E4C5E ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x27 -ant1.ch9.prf64.ant_delay=16451 +ant1.ch9.prf64.ant_delay=16436 ant1.ch9.prf64.tx_power=0x5E5E4C5E ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x27 @@ -51,11 +51,11 @@ ant2.ch5.prf64.ant_delay=16450 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16451 +ant2.ch9.prf16.ant_delay=16437 ant2.ch9.prf16.tx_power=0x5E5E4C5E ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0x27 -ant2.ch9.prf64.ant_delay=16451 +ant2.ch9.prf64.ant_delay=16437 ant2.ch9.prf64.tx_power=0x5E5E4C5E ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0x27 @@ -70,11 +70,11 @@ ant3.ch5.prf64.ant_delay=16450 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16450 +ant3.ch9.prf16.ant_delay=16459 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16450 +ant3.ch9.prf64.ant_delay=16459 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 @@ -115,22 +115,22 @@ restricted_channels=0x20 [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0 -[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4 -[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4 @@ -139,8 +139,8 @@ restricted_channels=0x20 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7 [HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 diff --git a/uwb/UWB-calibration-restricted.conf b/uwb/UWB-calibration-restricted.conf index 1c98823..7f2da15 100644 --- a/uwb/UWB-calibration-restricted.conf +++ b/uwb/UWB-calibration-restricted.conf @@ -5,11 +5,11 @@ [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=16459 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x28 -ant0.ch5.prf64.ant_delay=16449 +ant0.ch5.prf64.ant_delay=16459 ant0.ch5.prf64.tx_power=0xFFFFD4FF ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x28 @@ -32,11 +32,11 @@ ant1.ch5.prf64.ant_delay=16450 ant1.ch5.prf64.tx_power=0xFFFFFFFF ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0x26 -ant1.ch9.prf16.ant_delay=16451 +ant1.ch9.prf16.ant_delay=16436 ant1.ch9.prf16.tx_power=0x3E3E303E ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x16 -ant1.ch9.prf64.ant_delay=16451 +ant1.ch9.prf64.ant_delay=16436 ant1.ch9.prf64.tx_power=0x3E3E303E ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x16 @@ -51,11 +51,11 @@ ant2.ch5.prf64.ant_delay=16450 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16451 +ant2.ch9.prf16.ant_delay=16437 ant2.ch9.prf16.tx_power=0x8E8E748E ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0x28 -ant2.ch9.prf64.ant_delay=16451 +ant2.ch9.prf64.ant_delay=16437 ant2.ch9.prf64.tx_power=0x8E8E748E ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0x28 @@ -70,11 +70,11 @@ ant3.ch5.prf64.ant_delay=16450 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16450 +ant3.ch9.prf16.ant_delay=16459 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16450 +ant3.ch9.prf64.ant_delay=16459 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 @@ -115,22 +115,22 @@ restricted_channels=0xFFFF [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0 -[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4 -[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4 @@ -139,8 +139,8 @@ restricted_channels=0xFFFF [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7 [HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 diff --git a/uwb/UWB-calibration-tw.conf b/uwb/UWB-calibration-tw.conf index 5a348b2..b1c667c 100644 --- a/uwb/UWB-calibration-tw.conf +++ b/uwb/UWB-calibration-tw.conf @@ -5,11 +5,11 @@ [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=16459 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x28 -ant0.ch5.prf64.ant_delay=16449 +ant0.ch5.prf64.ant_delay=16459 ant0.ch5.prf64.tx_power=0xFFFFD4FF ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x28 @@ -32,11 +32,11 @@ ant1.ch5.prf64.ant_delay=16450 ant1.ch5.prf64.tx_power=0xFFFFFFFF ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0x26 -ant1.ch9.prf16.ant_delay=16451 +ant1.ch9.prf16.ant_delay=16436 ant1.ch9.prf16.tx_power=0x3E3E303E ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x16 -ant1.ch9.prf64.ant_delay=16451 +ant1.ch9.prf64.ant_delay=16436 ant1.ch9.prf64.tx_power=0x3E3E303E ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x16 @@ -51,11 +51,11 @@ ant2.ch5.prf64.ant_delay=16450 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16451 +ant2.ch9.prf16.ant_delay=16437 ant2.ch9.prf16.tx_power=0x8E8E748E ant2.ch9.prf16.pg_count=0 ant2.ch9.prf16.pg_delay=0x28 -ant2.ch9.prf64.ant_delay=16451 +ant2.ch9.prf64.ant_delay=16437 ant2.ch9.prf64.tx_power=0x8E8E748E ant2.ch9.prf64.pg_count=0 ant2.ch9.prf64.pg_delay=0x28 @@ -70,11 +70,11 @@ ant3.ch5.prf64.ant_delay=16450 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16450 +ant3.ch9.prf16.ant_delay=16459 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16450 +ant3.ch9.prf64.ant_delay=16459 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 @@ -115,22 +115,22 @@ restricted_channels=0x20 [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0 -[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4 -[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4 @@ -139,8 +139,8 @@ restricted_channels=0x20 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7 [HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf index f3b70dd..76181f3 100644 --- a/uwb/UWB-calibration.conf +++ b/uwb/UWB-calibration.conf @@ -5,11 +5,11 @@ [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=16459 ant0.ch5.prf16.tx_power=0xFFFFD4FF ant0.ch5.prf16.pg_count=0 ant0.ch5.prf16.pg_delay=0x28 -ant0.ch5.prf64.ant_delay=16449 +ant0.ch5.prf64.ant_delay=16459 ant0.ch5.prf64.tx_power=0xFFFFD4FF ant0.ch5.prf64.pg_count=0 ant0.ch5.prf64.pg_delay=0x28 @@ -32,11 +32,11 @@ ant1.ch5.prf64.ant_delay=16450 ant1.ch5.prf64.tx_power=0xFFFFFFFF ant1.ch5.prf64.pg_count=0 ant1.ch5.prf64.pg_delay=0x26 -ant1.ch9.prf16.ant_delay=16451 +ant1.ch9.prf16.ant_delay=16436 ant1.ch9.prf16.tx_power=0x3E3E303E ant1.ch9.prf16.pg_count=0 ant1.ch9.prf16.pg_delay=0x16 -ant1.ch9.prf64.ant_delay=16451 +ant1.ch9.prf64.ant_delay=16436 ant1.ch9.prf64.tx_power=0x3E3E303E ant1.ch9.prf64.pg_count=0 ant1.ch9.prf64.pg_delay=0x16 @@ -51,14 +51,14 @@ ant2.ch5.prf64.ant_delay=16450 ant2.ch5.prf64.tx_power=0 ant2.ch5.prf64.pg_count=0 ant2.ch5.prf64.pg_delay=0 -ant2.ch9.prf16.ant_delay=16451 -ant2.ch9.prf16.tx_power=0x8E8E748E +ant2.ch9.prf16.ant_delay=16437 +ant2.ch9.prf16.tx_power=0x5E5E4C5E ant2.ch9.prf16.pg_count=0 -ant2.ch9.prf16.pg_delay=0x28 -ant2.ch9.prf64.ant_delay=16451 -ant2.ch9.prf64.tx_power=0x8E8E748E +ant2.ch9.prf16.pg_delay=0x27 +ant2.ch9.prf64.ant_delay=16437 +ant2.ch9.prf64.tx_power=0x5E5E4C5E ant2.ch9.prf64.pg_count=0 -ant2.ch9.prf64.pg_delay=0x28 +ant2.ch9.prf64.pg_delay=0x27 ant2.port=1 ant2.selector_gpio=6 ant2.selector_gpio_value=0 @@ -70,11 +70,11 @@ ant3.ch5.prf64.ant_delay=16450 ant3.ch5.prf64.tx_power=0 ant3.ch5.prf64.pg_count=0 ant3.ch5.prf64.pg_delay=0 -ant3.ch9.prf16.ant_delay=16450 +ant3.ch9.prf16.ant_delay=16459 ant3.ch9.prf16.tx_power=0 ant3.ch9.prf16.pg_count=0 ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16450 +ant3.ch9.prf64.ant_delay=16459 ant3.ch9.prf64.tx_power=0 ant3.ch9.prf64.pg_count=0 ant3.ch9.prf64.pg_delay=0 @@ -115,22 +115,22 @@ restricted_channels=0 [HAL]ant_sets.ch5.azimuth.rx_ant_set_ranging=3 [HAL]ant_sets.ch5.azimuth.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.azimuth.tx_ant_set_ranging=0 -[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.rx_ant_set_ranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.range.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.range.rx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.rx_ant_set_ranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.range.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch5.elevation.rx_ant_set_ranging=4 [HAL]ant_sets.ch5.elevation.tx_ant_set_nonranging=0 [HAL]ant_sets.ch5.elevation.tx_ant_set_ranging=0 [HAL]ant_sets.ch9.elevation.rx_ant_set_nonranging=4 [HAL]ant_sets.ch9.elevation.rx_ant_set_ranging=4 -[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging=7 [HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging=3 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging=7 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation=4 @@ -139,8 +139,8 @@ restricted_channels=0 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth=3 [HAL]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation=4 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=8 -[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=8 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging=7 +[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=7 [HAL]minimum_system_offset_uwbtime0=250 coex_gpio=4 coex_delay_us=1000 From 8b62cc5ed80b944dcc5109393156ed1683813851 Mon Sep 17 00:00:00 2001 From: TeYuan Wang Date: Thu, 20 Jul 2023 09:53:54 -0700 Subject: [PATCH 07/16] thermal: modify emergency and shutdown threshold for VIRTUAL-SKIN Bug: 289752109 Test: adb shell dumpsys android.hardware.thermal.IThermal/default | grep VIRTUAL-SKIN | grep hotThrottlingThreshold (cherry picked from commit 3a0c866fa5e0a20c61c9102d33f70168b7973535) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:be8156e83f9c002df8fe8f17dbd62fb6533737f7) Merged-In: I1327be31f164a9e4263fb9c5381adc09378b19c5 Change-Id: I1327be31f164a9e4263fb9c5381adc09378b19c5 --- thermal_info_config_felix.json | 2 +- thermal_info_config_proactive_skin_felix.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/thermal_info_config_felix.json b/thermal_info_config_felix.json index e55585e..f5637ca 100644 --- a/thermal_info_config_felix.json +++ b/thermal_info_config_felix.json @@ -244,7 +244,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], - "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 51.0, 54.0], + "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 53.0, 57.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, diff --git a/thermal_info_config_proactive_skin_felix.json b/thermal_info_config_proactive_skin_felix.json index a603558..2edacde 100644 --- a/thermal_info_config_proactive_skin_felix.json +++ b/thermal_info_config_proactive_skin_felix.json @@ -244,7 +244,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CLOSE", "VIRTUAL-SKIN-OPEN"], "Coefficient":[1.0, 1.0], - "HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 51.0, 54.0], + "HotThreshold":["NAN", 37.0, 41.0, 45.0, 46.5, 53.0, 57.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, From 35d0c6ce8ffca29b375d592cec9552d5b2670195 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Tue, 25 Jul 2023 04:05:02 +0000 Subject: [PATCH 08/16] Update felix SVN to 21 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:29203a354d62370c5bd4e6e92592a00eead176e6) Merged-In: Ib78cdb211e25b1ae28d120a974514de4c6db8d43 Change-Id: Ib78cdb211e25b1ae28d120a974514de4c6db8d43 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 86f55cd..c25c2e2 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=20 + ro.vendor.build.svn=21 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 227e1a2bf7bcc04cee7fbf2fdfbe6f78bed532ca Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Mon, 17 Jul 2023 12:26:12 +0000 Subject: [PATCH 09/16] Fix layout issue of pattern set up page in F10 Set the pattern view size to 290dp for F10 Bug: 285290323 Bug: 290721507 Test: manual Test: Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=\ SetupChooseLockPatternTest (cherry picked from commit f3e62f0321753a6740d7b871a5fc9a90c096c63c) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:84485a4bded56ebfa94fd95120820cec40048854) Merged-In: I0bd45ad6f793afdec96ffd4a538539d040ad4993 Change-Id: I0bd45ad6f793afdec96ffd4a538539d040ad4993 --- .../Settings/res/values-sw410dp/dimens.xml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 felix/overlay/packages/apps/Settings/res/values-sw410dp/dimens.xml diff --git a/felix/overlay/packages/apps/Settings/res/values-sw410dp/dimens.xml b/felix/overlay/packages/apps/Settings/res/values-sw410dp/dimens.xml new file mode 100644 index 0000000..179dcc5 --- /dev/null +++ b/felix/overlay/packages/apps/Settings/res/values-sw410dp/dimens.xml @@ -0,0 +1,21 @@ + + + + + + 290dp + + From 9407daa064af641020e9e1250ec42ce2ecb31932 Mon Sep 17 00:00:00 2001 From: Neha Jain Date: Wed, 2 Aug 2023 00:43:02 +0000 Subject: [PATCH 10/16] Revert "Update felix SVN to 21" This reverts commit 29203a354d62370c5bd4e6e92592a00eead176e6. Reason for revert: b/289414927 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b6fc908043b39da2ab21fe95ff9b4899dc323449) Merged-In: I37230a6d768bd2293b7c9fb4bf9659b9a31f5ae8 Change-Id: I37230a6d768bd2293b7c9fb4bf9659b9a31f5ae8 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index c25c2e2..86f55cd 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=21 + ro.vendor.build.svn=20 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From b96cf63bba751d1c17b90400fdcd4eaa2303c7b9 Mon Sep 17 00:00:00 2001 From: Neha Jain Date: Sun, 6 Aug 2023 22:07:17 +0000 Subject: [PATCH 11/16] Revert "Revert "Update felix SVN to 21"" This reverts commit b6fc908043b39da2ab21fe95ff9b4899dc323449. Reason for revert: Need the SVN for F10 KDDI build Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5ee36bd203f098b21b90e43ae9967a93f493ddb9) Merged-In: I09e8877ac2325a0056c931ce01602fffb7e68c35 Change-Id: I09e8877ac2325a0056c931ce01602fffb7e68c35 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 86f55cd..c25c2e2 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=20 + ro.vendor.build.svn=21 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 1bcf28495ae1cbb9aa50d89a47d63d3a8a54a6d6 Mon Sep 17 00:00:00 2001 From: Neha Jain Date: Sun, 6 Aug 2023 22:07:17 +0000 Subject: [PATCH 12/16] Revert "Revert "Update felix SVN to 21"" This reverts commit b6fc908043b39da2ab21fe95ff9b4899dc323449. Reason for revert: Need the SVN for F10 KDDI build Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:5ee36bd203f098b21b90e43ae9967a93f493ddb9) Merged-In: I09e8877ac2325a0056c931ce01602fffb7e68c35 Change-Id: I09e8877ac2325a0056c931ce01602fffb7e68c35 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 86f55cd..c25c2e2 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=20 + ro.vendor.build.svn=21 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 5c1deed09f2a3a9d37b26a27f622ab4253ad942d Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Tue, 25 Jul 2023 04:05:02 +0000 Subject: [PATCH 13/16] Update felix SVN to 21 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:29203a354d62370c5bd4e6e92592a00eead176e6) Merged-In: Ib78cdb211e25b1ae28d120a974514de4c6db8d43 Change-Id: Ib78cdb211e25b1ae28d120a974514de4c6db8d43 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index 86f55cd..c25c2e2 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=20 + ro.vendor.build.svn=21 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 3eca26b6a70e7b95f63d0b57e12c69374e8296f7 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Wed, 9 Aug 2023 18:11:30 +0000 Subject: [PATCH 14/16] Update felix SVN to 22 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:64da307f5ff10d31859213a49f3dc71874da3f6d) Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe Change-Id: I4890e0ed2191993887aa550053a827c2aca3aafe --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index c25c2e2..e3cd7f5 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=21 + ro.vendor.build.svn=22 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From da7b44023143309997a7bfb05c1b66ed653b4d0e Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Wed, 9 Aug 2023 18:11:30 +0000 Subject: [PATCH 15/16] Update felix SVN to 22 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:64da307f5ff10d31859213a49f3dc71874da3f6d) Merged-In: I4890e0ed2191993887aa550053a827c2aca3aafe Change-Id: I4890e0ed2191993887aa550053a827c2aca3aafe --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index c25c2e2..e3cd7f5 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=21 + ro.vendor.build.svn=22 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\ From 8a804d7012421f0c17d90f422a436cdc67f96382 Mon Sep 17 00:00:00 2001 From: Bassem Khalife Date: Thu, 10 Aug 2023 19:58:11 +0000 Subject: [PATCH 16/16] Update felix SVN to 23 Bug: 289414927 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:4ecf2187a2dc4a314562289ed2528d787eb28e74) Merged-In: I3f4936d26b869ca400be05386fc009d95cf003c2 Change-Id: I3f4936d26b869ca400be05386fc009d95cf003c2 --- device-felix.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device-felix.mk b/device-felix.mk index e3cd7f5..6dbe580 100644 --- a/device-felix.mk +++ b/device-felix.mk @@ -205,7 +205,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=22 + ro.vendor.build.svn=23 # Vibrator HAL PRODUCT_VENDOR_PROPERTIES +=\