diff --git a/device-cheetah.mk b/device-cheetah.mk
index 01439b0..02762df 100644
--- a/device-cheetah.mk
+++ b/device-cheetah.mk
@@ -96,7 +96,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
- android.hardware.nfc@1.2-service.st
+ android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@@ -110,7 +110,6 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \
- device/google/pantah/nfc/manifest_nfc.xml \
device/google/pantah/nfc/manifest_se.xml
# Thermal Config
diff --git a/device-cloudripper.mk b/device-cloudripper.mk
index 0356a70..6f6fdcb 100644
--- a/device-cloudripper.mk
+++ b/device-cloudripper.mk
@@ -60,7 +60,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
- android.hardware.nfc@1.2-service.st
+ android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@@ -74,7 +74,6 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \
- device/google/pantah/nfc/manifest_nfc.xml \
device/google/pantah/nfc/manifest_se.xml
# Thermal Config
diff --git a/device-panther.mk b/device-panther.mk
index 0ec7270..01892d0 100644
--- a/device-panther.mk
+++ b/device-panther.mk
@@ -81,7 +81,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
- android.hardware.nfc@1.2-service.st
+ android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@@ -95,7 +95,6 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \
- device/google/pantah/nfc/manifest_nfc.xml \
device/google/pantah/nfc/manifest_se.xml
# Thermal Config
diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk
index e4d9223..a749564 100644
--- a/device-ravenclaw.mk
+++ b/device-ravenclaw.mk
@@ -65,7 +65,7 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
NfcNci \
Tag \
- android.hardware.nfc@1.2-service.st
+ android.hardware.nfc-service.st
# SecureElement
PRODUCT_PACKAGES += \
@@ -79,7 +79,6 @@ PRODUCT_COPY_FILES += \
device/google/pantah/nfc/libse-gto-hal2.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libse-gto-hal2.conf
DEVICE_MANIFEST_FILE += \
- device/google/pantah/nfc/manifest_nfc.xml \
device/google/pantah/nfc/manifest_se.xml
# Thermal Config
diff --git a/manifest.xml b/manifest.xml
index 73b4e42..aafe372 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -113,15 +113,6 @@
hwbinder
@1.3::IDevice/google-edgetpu
-
- android.hardware.nfc
- hwbinder
- 1.2
-
- INfc
- default
-
-
android.hardware.health
hwbinder
diff --git a/nfc/libnfc-hal-st-proto1.conf b/nfc/libnfc-hal-st-proto1.conf
index ed1f57b..feb933a 100644
--- a/nfc/libnfc-hal-st-proto1.conf
+++ b/nfc/libnfc-hal-st-proto1.conf
@@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc"
###############################################################################
-# White list to be set at startup.
-DEVICE_HOST_WHITE_LIST={02:C0}
+# Allow list to be set at startup.
+DEVICE_HOST_ALLOW_LIST={02:C0}
###############################################################################
# BAIL OUT value for P2P
diff --git a/nfc/libnfc-hal-st.conf b/nfc/libnfc-hal-st.conf
index 60e84ac..f553e3d 100644
--- a/nfc/libnfc-hal-st.conf
+++ b/nfc/libnfc-hal-st.conf
@@ -60,8 +60,8 @@ PRESENCE_CHECK_ALGORITHM=5
NCI_HAL_MODULE="nfc_nci.st21nfc"
###############################################################################
-# White list to be set at startup.
-DEVICE_HOST_WHITE_LIST={02:C0}
+# Allow list to be set at startup.
+DEVICE_HOST_ALLOW_LIST={02:C0}
###############################################################################
# BAIL OUT value for P2P
diff --git a/thermal_info_config_cheetah.json b/thermal_info_config_cheetah.json
index 39d6a26..c4b5d65 100644
--- a/thermal_info_config_cheetah.json
+++ b/thermal_info_config_cheetah.json
@@ -501,7 +501,7 @@
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
+ "LimitInfo": [0, 0, 0, 0, 6, 6, 6]
}
]
},
@@ -517,6 +517,14 @@
{
"CdevRequest": "thermal-cpufreq-2",
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
+ },
+ {
+ "CdevRequest": "thermal-gpufreq-0",
+ "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
+ },
+ {
+ "CdevRequest": "tpu_cooling",
+ "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
}
]
},
diff --git a/thermal_info_config_cloudripper.json b/thermal_info_config_cloudripper.json
index 662ecfc..35476e5 100644
--- a/thermal_info_config_cloudripper.json
+++ b/thermal_info_config_cloudripper.json
@@ -178,15 +178,15 @@
"BindedCdevInfo": [
{
"CdevRequest": "thermal-cpufreq-2",
- "LimitInfo": [0, 0, 0, 0, 7, 10, 10]
+ "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
},
{
"CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 10, 11, 11]
+ "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
},
{
"CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
+ "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
}
]
},
diff --git a/thermal_info_config_panther.json b/thermal_info_config_panther.json
index 1c0ff89..57347dd 100644
--- a/thermal_info_config_panther.json
+++ b/thermal_info_config_panther.json
@@ -500,7 +500,7 @@
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
+ "LimitInfo": [0, 0, 0, 0, 6, 6, 6]
}
]
},
@@ -516,6 +516,14 @@
{
"CdevRequest": "thermal-cpufreq-2",
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
+ },
+ {
+ "CdevRequest": "thermal-gpufreq-0",
+ "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
+ },
+ {
+ "CdevRequest": "tpu_cooling",
+ "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
}
]
},
diff --git a/thermal_info_config_ravenclaw.json b/thermal_info_config_ravenclaw.json
index dff8af5..5d46864 100644
--- a/thermal_info_config_ravenclaw.json
+++ b/thermal_info_config_ravenclaw.json
@@ -355,7 +355,7 @@
"BindedCdevInfo": [
{
"CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
+ "LimitInfo": [0, 0, 0, 0, 6, 6, 6]
}
]
},
@@ -388,6 +388,14 @@
{
"CdevRequest": "thermal-cpufreq-2",
"LimitInfo": [0, 0, 0, 0, 7, 7, 7]
+ },
+ {
+ "CdevRequest": "thermal-gpufreq-0",
+ "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
+ },
+ {
+ "CdevRequest": "tpu_cooling",
+ "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
}
]
},
diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf
index bdf1426..554cf01 100644
--- a/uwb/UWB-calibration.conf
+++ b/uwb/UWB-calibration.conf
@@ -135,6 +135,16 @@ restricted_channels=0
[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 3
[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 3
[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 3
+[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
+[HAL]ant_sets.ch5.azimuth_elevation.tx_ant_set_nonranging=0
+[HAL]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging=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=3
+[HAL]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging=3
[HAL]minimum_system_offset_uwbtime0=500
coex_gpio=4
coex_delay_us=1000