diff --git a/AndroidProducts.mk b/AndroidProducts.mk index fb1ae52..b343f20 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -19,12 +19,10 @@ PRODUCT_MAKEFILES := \ $(LOCAL_DIR)/aosp_ripcurrent_fullmte.mk \ $(LOCAL_DIR)/factory_ripcurrent.mk \ $(LOCAL_DIR)/aosp_husky.mk \ - $(LOCAL_DIR)/aosp_husky_61_pgagnostic.mk \ $(LOCAL_DIR)/aosp_husky_fullmte.mk \ $(LOCAL_DIR)/aosp_husky_pgagnostic.mk \ $(LOCAL_DIR)/factory_husky.mk \ $(LOCAL_DIR)/aosp_shiba.mk \ - $(LOCAL_DIR)/aosp_shiba_61_pgagnostic.mk \ $(LOCAL_DIR)/aosp_shiba_fullmte.mk \ $(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \ $(LOCAL_DIR)/factory_shiba.mk diff --git a/BoardConfig-shusky-common.mk b/BoardConfig-shusky-common.mk new file mode 100644 index 0000000..f2ede26 --- /dev/null +++ b/BoardConfig-shusky-common.mk @@ -0,0 +1,33 @@ +# +# Copyright (C) 2024 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. +# + +ifeq ($(PRODUCT_16K_DEVELOPER_OPTION),true) +# Configures the 16kb kernel and modules for OTA updates. +TARGET_KERNEL_DIR_16K := $(TARGET_KERNEL_DIR)/16kb +BOARD_KERNEL_PATH_16K := $(TARGET_KERNEL_DIR_16K)/Image.lz4 + +BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_kernel_boot.modules.load) +BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/system_dlkm.modules.load) +BOARD_KERNEL_MODULES_16K += $(file < $(TARGET_KERNEL_DIR_16K)/vendor_dlkm.modules.load) +BOARD_KERNEL_MODULES_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(TARGET_KERNEL_DIR_16K)/$(notdir $(module))) + +# Shusky targets use exynos-bcm_dbg.ko module instead of bcm_dbg.ko. +BOARD_KERNEL_MODULES_16K := $(filter-out %/bcm_dbg.ko,$(BOARD_KERNEL_MODULES_16K)) +BOARD_KERNEL_MODULES_LOAD_16K := $(foreach module,$(BOARD_KERNEL_MODULES_16K),$(notdir $(module))) + +BOARD_16K_OTA_USE_INCREMENTAL := true +BOARD_16K_OTA_MOVE_VENDOR := true +endif \ No newline at end of file diff --git a/aosp_husky.mk b/aosp_husky.mk index 3ea1b08..47cf99b 100644 --- a/aosp_husky.mk +++ b/aosp_husky.mk @@ -20,7 +20,7 @@ USE_SWIFTSHADER := true BOARD_USES_SWIFTSHADER := true $(call inherit-product, device/google/zuma/aosp_common.mk) -$(call inherit-product, device/google/shusky/device-husky.mk) +$(call inherit-product, device/google/shusky/husky_generic.mk) PRODUCT_NAME := aosp_husky PRODUCT_DEVICE := husky diff --git a/aosp_ripcurrent.mk b/aosp_ripcurrent.mk index 83322c4..4a6c484 100644 --- a/aosp_ripcurrent.mk +++ b/aosp_ripcurrent.mk @@ -20,7 +20,7 @@ USE_SWIFTSHADER := true BOARD_USES_SWIFTSHADER := true $(call inherit-product, device/google/zuma/aosp_common.mk) -$(call inherit-product, device/google/shusky/device-ripcurrent.mk) +$(call inherit-product, device/google/shusky/ripcurrent_generic.mk) PRODUCT_NAME := aosp_ripcurrent PRODUCT_DEVICE := ripcurrent diff --git a/aosp_shiba.mk b/aosp_shiba.mk index 04a59a7..f9ec72f 100644 --- a/aosp_shiba.mk +++ b/aosp_shiba.mk @@ -20,7 +20,7 @@ USE_SWIFTSHADER := true BOARD_USES_SWIFTSHADER := true $(call inherit-product, device/google/zuma/aosp_common.mk) -$(call inherit-product, device/google/shusky/device-shiba.mk) +$(call inherit-product, device/google/shusky/shiba_generic.mk) PRODUCT_NAME := aosp_shiba PRODUCT_DEVICE := shiba diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index 9aa0c88..9695f70 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -1410,7 +1410,7 @@ - + @@ -1420,6 +1420,14 @@ + + + + + + + + diff --git a/audio/husky/config/audio_platform_configuration.xml b/audio/husky/config/audio_platform_configuration.xml index 60f0be3..3c403c1 100644 --- a/audio/husky/config/audio_platform_configuration.xml +++ b/audio/husky/config/audio_platform_configuration.xml @@ -308,7 +308,7 @@ - + diff --git a/audio/husky/config/audio_policy_configuration.xml b/audio/husky/config/audio_policy_configuration.xml index ac241e4..adb66a3 100644 --- a/audio/husky/config/audio_policy_configuration.xml +++ b/audio/husky/config/audio_policy_configuration.xml @@ -51,8 +51,8 @@ samplingRates="8000 16000 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - - - - @@ -161,8 +157,6 @@ - - + samplingRates="48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - - - - @@ -161,8 +157,6 @@ - - diff --git a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 0755fec..eccadf7 100644 --- a/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/husky/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -131,10 +131,6 @@ - - - - @@ -154,8 +150,6 @@ - - diff --git a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml index bfd76a7..d4f70a9 100644 --- a/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/husky/config/audio_policy_configuration_le_offload_disabled.xml @@ -51,8 +51,8 @@ samplingRates="8000 16000 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - - - - @@ -161,8 +157,6 @@ - - - + @@ -1420,6 +1420,14 @@ + + + + + + + + diff --git a/audio/shiba/config/audio_platform_configuration.xml b/audio/shiba/config/audio_platform_configuration.xml index 60f0be3..3c403c1 100644 --- a/audio/shiba/config/audio_platform_configuration.xml +++ b/audio/shiba/config/audio_platform_configuration.xml @@ -308,7 +308,7 @@ - + diff --git a/audio/shiba/config/audio_policy_configuration.xml b/audio/shiba/config/audio_policy_configuration.xml index 9c8f2f9..4c2445d 100644 --- a/audio/shiba/config/audio_policy_configuration.xml +++ b/audio/shiba/config/audio_policy_configuration.xml @@ -51,8 +51,8 @@ samplingRates="8000 16000 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - - - - @@ -161,8 +157,6 @@ - - + samplingRates="48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - - - - @@ -161,8 +157,6 @@ - - diff --git a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 0755fec..eccadf7 100644 --- a/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/shiba/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -131,10 +131,6 @@ - - - - @@ -154,8 +150,6 @@ - - diff --git a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml index 0f6f636..912e7a8 100644 --- a/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml +++ b/audio/shiba/config/audio_policy_configuration_le_offload_disabled.xml @@ -51,8 +51,8 @@ samplingRates="8000 16000 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> + samplingRates="48000" + channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - - - - @@ -161,8 +157,6 @@ - - The hardware support which offload capability +BtOffloadCap = AOC + +# The BT Offload Trunk Flag Group Name +BtOffloadTrunkGroup = 23P_AOC + # APM Uart skip suspend to aovid hold system too long when BT using AOC UART ApmUartSkipSuspend = true diff --git a/bluetooth/bt_vendor_overlay_ripcurrent.conf b/bluetooth/bt_vendor_overlay_ripcurrent.conf index 2473a1b..1cbbb1a 100644 --- a/bluetooth/bt_vendor_overlay_ripcurrent.conf +++ b/bluetooth/bt_vendor_overlay_ripcurrent.conf @@ -3,6 +3,19 @@ # Uart port name UartPort = /dev/ttySAC18 +# Priority of uart type +# HciUartSocket = 0 +# SerialUartPort = 1 +# SerialAocUartPort = 2 +# UserialInvalid = 3 +UserialTypePriority = 2-1 + +# The hardware support which offload capability +BtOffloadCap = AOC + +# The BT Offload Trunk Flag Group Name +BtOffloadTrunkGroup = 23P_AOC + # Sar backOff high resolution support SarBackOffHighResolution = true diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml index d988d1b..49e1f04 100644 --- a/bluetooth/le_audio_codec_capabilities.xml +++ b/bluetooth/le_audio_codec_capabilities.xml @@ -52,7 +52,6 @@ - @@ -76,7 +75,6 @@ - diff --git a/device-husky.mk b/device-husky.mk index de8d365..8e123ae 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -17,17 +17,10 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -TARGET_KERNEL_DIR ?= device/google/shusky-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers - -ifdef RELEASE_GOOGLE_HUSKY_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_HUSKY_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_HUSKY_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_HUSKY_KERNEL_DIR)/kernel-headers -endif +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_HUSKY_VERSION) +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_HUSKY_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_HUSKY_DIR)/kernel-headers LOCAL_PATH := device/google/shusky @@ -38,13 +31,22 @@ ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),) include device/google/shusky/uwb/uwb_calibration.mk endif +DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false) + +ifeq ($(DEVICE_PAGE_AGNOSTIC),true) +TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_KERNEL_DIR := $(RELEASE_KERNEL_HUSKY_DIR)/16kb +TARGET_RW_FILE_SYSTEM_TYPE := ext4 +else +PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_HUSKY_16K_DEVELOPER_OPTION) +endif $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-husky.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/husky/device-vendor-husky.mk) $(call inherit-product-if-exists, vendor/google_devices/husky/proprietary/device-vendor.mk) -$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal-r63/Device.mk) +$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersHusky.mk) # display @@ -118,6 +120,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +# Enable Bluetooth AutoOn feature +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.server.automatic_turn_on=true + # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_husky.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ @@ -235,6 +241,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.leaudio.dual_bidirection_swb.supported=true +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true @@ -282,13 +292,6 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk -endif # UWB PRODUCT_SOONG_NAMESPACES += \ @@ -319,14 +322,8 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2 -else -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk -endif GOODIX_CONFIG_BUILD_VERSION := g7_trusty +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) @@ -367,9 +364,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 # blocking zone for min idle refresh rate PRODUCT_VENDOR_PROPERTIES += \ - vendor.primarydisplay.min_idle_refresh_rate.default=1 \ - vendor.primarydisplay.min_idle_refresh_rate.blocking_zone=10 \ - vendor.primarydisplay.min_idle_refresh_rate.blocking_zone_dbv=492 + ro.vendor.primarydisplay.blocking_zone.min_refresh_rate_by_nits=15:10,:1 # Display ACL PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.acl.default=0 @@ -379,6 +374,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/husky/panel_config_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/panel_config_google-hk3_cal0.pb # Vibrator HAL +$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) ACTUATOR_MODEL := luxshare_ict_081545 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ @@ -400,7 +396,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=26 + ro.vendor.build.svn=27 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) @@ -470,4 +466,10 @@ PRODUCT_PACKAGES += \ NoCutoutOverlay \ AvoidAppsInCutoutOverlay +# ETM +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif + PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true +PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index f4b6590..a399216 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -17,17 +17,9 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -TARGET_KERNEL_DIR ?= device/google/shusky-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers - -ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_RIPCURRENT_KERNEL_DIR)/kernel-headers -endif +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RIPCURRENT_VERSION) +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RIPCURRENT_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_RIPCURRENT_DIR)/kernel-headers ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) USE_UWBFIELDTESTQM := true @@ -191,6 +183,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.leaudio.dual_bidirection_swb.supported=true +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service @@ -231,13 +227,6 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk -endif # UWB PRODUCT_SOONG_NAMESPACES += \ @@ -276,6 +265,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.front_720P_always_binning=true # Vibrator HAL +$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) ACTUATOR_MODEL := luxshare_ict_081545 PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.vibrator.hal.chirp.enabled=0 \ diff --git a/device-shiba.mk b/device-shiba.mk index d6c8dd0..8da0637 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -17,20 +17,23 @@ # Restrict the visibility of Android.bp files to improve build analysis time $(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk) -TARGET_KERNEL_DIR ?= device/google/shusky-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers - -ifdef RELEASE_GOOGLE_SHIBA_KERNEL_VERSION -TARGET_LINUX_KERNEL_VERSION := $(RELEASE_GOOGLE_SHIBA_KERNEL_VERSION) -endif - -ifdef RELEASE_GOOGLE_SHIBA_KERNEL_DIR -TARGET_KERNEL_DIR := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR) -TARGET_BOARD_KERNEL_HEADERS := $(RELEASE_GOOGLE_SHIBA_KERNEL_DIR)/kernel-headers -endif +TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_SHIBA_VERSION) +# Keeps flexibility for kasan and ufs builds +TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_SHIBA_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_SHIBA_DIR)/kernel-headers LOCAL_PATH := device/google/shusky +DEVICE_PAGE_AGNOSTIC ?= $(if $(filter %_pgagnostic,$(TARGET_PRODUCT)),true,false) + +ifeq ($(DEVICE_PAGE_AGNOSTIC),true) +TARGET_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_KERNEL_DIR := $(RELEASE_KERNEL_SHIBA_DIR)/16kb +TARGET_RW_FILE_SYSTEM_TYPE := ext4 +else +PRODUCT_16K_DEVELOPER_OPTION := $(RELEASE_GOOGLE_SHIBA_16K_DEVELOPER_OPTION) +endif + $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-shiba.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device-vendor.mk) @@ -102,6 +105,10 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus +# Enable Bluetooth AutoOn feature +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.server.automatic_turn_on=true + # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_shiba.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ @@ -222,6 +229,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ bluetooth.leaudio.dual_bidirection_swb.supported=true +# Support LE & Classic concurrent encryption (b/330704060) +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.ble.allow_enc_with_bredr=true + # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ ro.support_one_handed_mode=true @@ -268,13 +279,6 @@ PRODUCT_PACKAGES += \ # Trusty liboemcrypto.so PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/24Q2 -else -PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts/trusty/trunk -endif # Location # SDK build system @@ -301,14 +305,8 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2 -else -APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk -endif GOODIX_CONFIG_BUILD_VERSION := g7_trusty +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_common.mk) ifeq ($(filter factory%, $(TARGET_PRODUCT)),) $(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_shipping.mk) @@ -353,6 +351,7 @@ PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 # Vibrator HAL +$(call soong_config_set,haptics,kernel_ver,v$(subst .,_,$(TARGET_LINUX_KERNEL_VERSION))) ACTUATOR_MODEL := luxshare_ict_081545 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ @@ -374,7 +373,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=26 + ro.vendor.build.svn=27 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ @@ -436,4 +435,10 @@ PRODUCT_PACKAGES += \ NoCutoutOverlay \ AvoidAppsInCutoutOverlay +# ETM +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk) +endif + PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO := true +PRODUCT_CHECK_PREBUILT_MAX_PAGE_SIZE := true diff --git a/factory_husky.mk b/factory_husky.mk index 5c2c0ce..c44fc7e 100644 --- a/factory_husky.mk +++ b/factory_husky.mk @@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Factory binaries of camera PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/factory_ripcurrent.mk b/factory_ripcurrent.mk index b7c64c5..17cf8e8 100644 --- a/factory_ripcurrent.mk +++ b/factory_ripcurrent.mk @@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Factory binaries of camera PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_hk3_tele_hat_tool fatp_hk3_ultrawide_hat_tool fatp_sb3_ultrawide_hat_tool fatp_hk3_front_hat_tool factory_hk3sb3_main_cam_decompress_test + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/factory_shiba.mk b/factory_shiba.mk index d20f113..2564bfe 100644 --- a/factory_shiba.mk +++ b/factory_shiba.mk @@ -35,3 +35,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Factory binaries of camera PRODUCT_PACKAGES += fatp_hk3sb3_wide_hat_tool fatp_sb3_ultrawide_hat_tool factory_hk3sb3_main_cam_decompress_test sb3_ultrawide_af_fw_update + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/factory diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index cef3db2..31915d2 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -18,6 +18,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1 @@ -27,14 +28,9 @@ TARGET_BOOTLOADER_BOARD_NAME := husky RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_HUSKY_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif - +RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR) +$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_HUSKY_DIR)) ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk @@ -51,6 +47,7 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on WIFI_FEATURE_REAR_CAMERA_SAR := true $(call soong_config_set,wifi,feature_rear_camera_sar,$(WIFI_FEATURE_REAR_CAMERA_SAR)) +include device/google/shusky/BoardConfig-shusky-common.mk include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk @@ -59,11 +56,6 @@ include device/google/zuma/BoardConfig-common.mk include device/google/shusky-sepolicy/husky-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk -# Android Virtualization Framework (AVF) team is using husky with hypervisor in -# nvhe mode as a development platform to build infrastructure that supports -# assigning devices to guest VMs. -# -# TODO(b/278008514): remove this once we have builds from our kernel branch. -ifeq ($(HUSKY_ENABLE_DEVICE_ASSIGNMENT), true) -BOARD_KERNEL_CMDLINE += kvm-arm.mode=nvhe +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/5_15/BoardUserdebugModules.mk endif diff --git a/husky_generic.mk b/husky_generic.mk new file mode 100644 index 0000000..61489f4 --- /dev/null +++ b/husky_generic.mk @@ -0,0 +1,20 @@ +# +# Copyright 2024 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. +# + +$(call inherit-product, device/google/shusky/device-husky.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common diff --git a/location/gps.xml b/location/gps.xml index f3f5392..21d6109 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" @@ -68,7 +68,7 @@ 3 + + true + diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 116edac..2368ec1 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -18,6 +18,7 @@ BOARD_BOOTCONFIG += androidboot.load_modules_parallel=true # The modules which need to be loaded in sequential +BOARD_KERNEL_CMDLINE += fips140.load_sequential=1 BOARD_KERNEL_CMDLINE += exynos_drm.load_sequential=1 BOARD_KERNEL_CMDLINE += g2d.load_sequential=1 BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1 @@ -27,13 +28,9 @@ TARGET_BOOTLOADER_BOARD_NAME := shiba RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_SHIBA_RADIO_DIR) RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_HUSKY_RADIOCFG_DIR) -ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 -else ifneq (,$(filter AP2% AP3%,$(RELEASE_PLATFORM_VERSION))) -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 -else -RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk -endif +RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR ?= pdk# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR) +$(call soong_config_set,shusky_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_SHIBA_DIR)) ifdef PHONE_CAR_BOARD_PRODUCT include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk @@ -46,6 +43,7 @@ USES_DEVICE_GOOGLE_SHUSKY := true BOARD_KERNEL_CMDLINE += swiotlb=noforce BOARD_KERNEL_CMDLINE += disable_dma32=on +include device/google/shusky/BoardConfig-shusky-common.mk include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk @@ -53,3 +51,7 @@ include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/shiba/proprietary/BoardConfigVendor.mk include device/google/shusky-sepolicy/shiba-sepolicy.mk include device/google/shusky/wifi/BoardConfig-wifi.mk + +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +-include device/google/common/etm/5_15/BoardUserdebugModules.mk +endif diff --git a/shiba/rro_overlays/NfcOverlay/res/values/config.xml b/shiba/rro_overlays/NfcOverlay/res/values/config.xml index 81fbc45..a3497bf 100644 --- a/shiba/rro_overlays/NfcOverlay/res/values/config.xml +++ b/shiba/rro_overlays/NfcOverlay/res/values/config.xml @@ -16,11 +16,6 @@ false true - - GKWS6 - GZPF0 - GPJ41 - true 68 @@ -33,4 +28,5 @@ 97 true + true diff --git a/shiba_generic.mk b/shiba_generic.mk new file mode 100644 index 0000000..f08b683 --- /dev/null +++ b/shiba_generic.mk @@ -0,0 +1,20 @@ +# +# Copyright 2024 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. +# + +$(call inherit-product, device/google/shusky/device-shiba.mk) + +# preloaded_nanoapps.json +PRODUCT_SOONG_NAMESPACES += vendor/google_contexthub/devices/p23_common diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index b08761a..d25340f 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -327,10 +327,6 @@ "PollingDelay":300000, "PassiveDelay":7000, "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] - }, { "CdevRequest": "gxp-cooling", "LimitInfo": [0, 0, 0, 0, 0, 6, 6] @@ -603,7 +599,7 @@ ] }, { - "Name":"VIRTUAL-SKIN-CPU-GPU", + "Name":"VIRTUAL-SKIN-SOC", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -623,7 +619,7 @@ "K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], "I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"], "S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"], - "MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"], "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"], "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"] }, @@ -663,6 +659,15 @@ "BindedPowerRail": "S2S_VDD_G3D", "CdevCeiling": [0, 8, 8, 8, 9, 11, 11], "LimitInfo": [0, 0, 0, 0, 0, 11, 11] + }, + { + "CdevRequest": "tpu_cooling", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S7M_VDD_TPU", + "CdevCeiling": [0, 7, 7, 7, 7, 7, 7], + "LimitInfo": [0, 0, 0, 0, 0, 7, 7] } ] }, @@ -1138,6 +1143,11 @@ "PowerSampleDelay":7000, "PowerSampleCount":1 }, + { + "Name":"S7M_VDD_TPU", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, { "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index bc6bdf1..a46f42e 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -295,10 +295,6 @@ "PollingDelay":300000, "PassiveDelay":7000, "BindedCdevInfo": [ - { - "CdevRequest": "tpu_cooling", - "LimitInfo": [0, 2, 3, 4, 5, 5, 5] - }, { "CdevRequest": "gxp-cooling", "LimitInfo": [0, 0, 0, 0, 0, 6, 6] @@ -571,7 +567,7 @@ ] }, { - "Name":"VIRTUAL-SKIN-CPU-GPU", + "Name":"VIRTUAL-SKIN-SOC", "Type":"UNKNOWN", "Hidden":true, "VirtualSensor":true, @@ -591,7 +587,7 @@ "K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], "I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"], "S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"], - "MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"], "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"], "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"] }, @@ -631,6 +627,15 @@ "BindedPowerRail": "S2S_VDD_G3D", "CdevCeiling": [0, 9, 9, 9, 9, 11, 11], "LimitInfo": [0, 0, 0, 0, 0, 11, 11] + }, + { + "CdevRequest": "tpu_cooling", + "CdevWeightForPID": [1, 1, 1, 1, 1, 1, 1], + "MaxReleaseStep": 1, + "MaxThrottleStep": 1, + "BindedPowerRail": "S7M_VDD_TPU", + "CdevCeiling": [0, 7, 7, 7, 7, 7, 7], + "LimitInfo": [0, 0, 0, 0, 0, 7, 7] } ] }, @@ -1171,6 +1176,11 @@ "PowerSampleDelay":7000, "PowerSampleCount":1 }, + { + "Name":"S7M_VDD_TPU", + "PowerSampleDelay":7000, + "PowerSampleCount":1 + }, { "Name":"PARTIAL_SYSTEM_POWER", "VirtualRails":true, diff --git a/uwb/calibration-CE.conf b/uwb/calibration-CE.conf index e1a45aa..e1365d4 100644 --- a/uwb/calibration-CE.conf +++ b/uwb/calibration-CE.conf @@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33 ant0.ch5.ref_frame4.tx_power_index=37:37:37:37 ant0.ch5.ref_frame5.tx_power_index=37:37:37:37 ant0.ch5.ref_frame6.tx_power_index=32:32:32:32 -ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch5.ref_frame0.post_tx_power_index=0xff @@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=36:36:36:36 ant0.ch9.ref_frame4.tx_power_index=32:32:32:32 ant0.ch9.ref_frame5.tx_power_index=31:31:31:31 ant0.ch9.ref_frame6.tx_power_index=37:37:37:37 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0xff @@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=37:37:37:37 ant1.ch9.ref_frame4.tx_power_index=40:40:40:40 ant1.ch9.ref_frame5.tx_power_index=3B:3B:3B:3B ant1.ch9.ref_frame6.tx_power_index=39:39:39:39 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0xff diff --git a/uwb/calibration-FCC.conf b/uwb/calibration-FCC.conf index f579c20..0b44c81 100644 --- a/uwb/calibration-FCC.conf +++ b/uwb/calibration-FCC.conf @@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33 ant0.ch5.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch5.ref_frame5.tx_power_index=3B:3B:3B:3B ant0.ch5.ref_frame6.tx_power_index=32:32:32:32 -ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch5.ref_frame0.post_tx_power_index=0x34 @@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=3B:3B:3B:3B ant0.ch9.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch9.ref_frame5.tx_power_index=37:37:37:37 ant0.ch9.ref_frame6.tx_power_index=39:39:39:39 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0x32 @@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=3A:3A:3A:3A ant1.ch9.ref_frame4.tx_power_index=40:40:40:40 ant1.ch9.ref_frame5.tx_power_index=3E:3E:3E:3E ant1.ch9.ref_frame6.tx_power_index=34:34:34:34 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0x32 diff --git a/uwb/calibration-JP.conf b/uwb/calibration-JP.conf index 463dada..f1b54e2 100644 --- a/uwb/calibration-JP.conf +++ b/uwb/calibration-JP.conf @@ -16,7 +16,7 @@ ant0.ch9.ref_frame3.tx_power_index=32:32:32:32 ant0.ch9.ref_frame4.tx_power_index=41:41:41:41 ant0.ch9.ref_frame5.tx_power_index=40:40:40:40 ant0.ch9.ref_frame6.tx_power_index=35:35:35:35 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0xff @@ -65,7 +65,7 @@ ant1.ch9.ref_frame3.tx_power_index=34:34:34:34 ant1.ch9.ref_frame4.tx_power_index=3C:3C:3C:3C ant1.ch9.ref_frame5.tx_power_index=3B:3B:3B:3B ant1.ch9.ref_frame6.tx_power_index=30:30:30:30 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0xff diff --git a/uwb/calibration-TW.conf b/uwb/calibration-TW.conf index fcac264..5287210 100644 --- a/uwb/calibration-TW.conf +++ b/uwb/calibration-TW.conf @@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33 ant0.ch5.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch5.ref_frame5.tx_power_index=3B:3B:3B:3B ant0.ch5.ref_frame6.tx_power_index=32:32:32:32 -ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch5.ref_frame0.post_tx_power_index=0x34 @@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=3B:3B:3B:3B ant0.ch9.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch9.ref_frame5.tx_power_index=37:37:37:37 ant0.ch9.ref_frame6.tx_power_index=39:39:39:39 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0x32 @@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=3A:3A:3A:3A ant1.ch9.ref_frame4.tx_power_index=40:40:40:40 ant1.ch9.ref_frame5.tx_power_index=3E:3E:3E:3E ant1.ch9.ref_frame6.tx_power_index=34:34:34:34 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0x32 diff --git a/uwb/calibration-default.conf b/uwb/calibration-default.conf index f579c20..0b44c81 100644 --- a/uwb/calibration-default.conf +++ b/uwb/calibration-default.conf @@ -17,7 +17,7 @@ ant0.ch5.ref_frame3.tx_power_index=33:33:33:33 ant0.ch5.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch5.ref_frame5.tx_power_index=3B:3B:3B:3B ant0.ch5.ref_frame6.tx_power_index=32:32:32:32 -ant0.ch5.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch5.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch5.ref_frame0.post_tx_power_index=0x34 @@ -66,7 +66,7 @@ ant0.ch9.ref_frame3.tx_power_index=3B:3B:3B:3B ant0.ch9.ref_frame4.tx_power_index=3E:3E:3E:3E ant0.ch9.ref_frame5.tx_power_index=37:37:37:37 ant0.ch9.ref_frame6.tx_power_index=39:39:39:39 -ant0.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant0.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant0.ch9.ref_frame0.post_tx_power_index=0x32 @@ -115,7 +115,7 @@ ant1.ch9.ref_frame3.tx_power_index=3A:3A:3A:3A ant1.ch9.ref_frame4.tx_power_index=40:40:40:40 ant1.ch9.ref_frame5.tx_power_index=3E:3E:3E:3E ant1.ch9.ref_frame6.tx_power_index=34:34:34:34 -ant1.ch9.ref_frame7.tx_power_index=FF:FF:FF:FF +ant1.ch9.ref_frame7.tx_power_index=FE:FE:FE:FE # pp cw tx pwr ant1.ch9.ref_frame0.post_tx_power_index=0x32 diff --git a/uwb/calibration.conf b/uwb/calibration.conf index a985e8a..4c16545 100644 --- a/uwb/calibration.conf +++ b/uwb/calibration.conf @@ -34,6 +34,8 @@ ant3.ch9.pa_gain_offset=0x00 #Coex wifi_coex_mode=01 -wifi_coex_time_gap_t1=01 +wifi_coex_time_gap=01 ch5.wifi_coex_enabled=01 ch9.wifi_coex_enabled=01 + +dual_rx_auto.accum_period=0x00 \ No newline at end of file diff --git a/uwb/configuration.conf b/uwb/configuration.conf index 16b9f36..f84d1a4 100644 --- a/uwb/configuration.conf +++ b/uwb/configuration.conf @@ -2,6 +2,19 @@ [FIRA]ant_sets.ch5.range.rx_ant_set_ranging = 0 [FIRA]ant_sets.ch5.range.tx_ant_set_nonranging = 0 [FIRA]ant_sets.ch5.range.tx_ant_set_ranging = 0 +[FIRA]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth.rx_ant_set_ranging = 1 +[FIRA]ant_sets.ch5.azimuth.tx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth.tx_ant_set_ranging = 1 +[FIRA]ant_sets.ch5.elevation.rx_ant_set_nonranging = 2 +[FIRA]ant_sets.ch5.elevation.rx_ant_set_ranging = 2 +[FIRA]ant_sets.ch5.elevation.tx_ant_set_nonranging = 2 +[FIRA]ant_sets.ch5.elevation.tx_ant_set_ranging = 2 +[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_azimuth = 1 +[FIRA]ant_sets.ch5.azimuth_elevation.rx_ant_set_ranging_elevation = 2 +[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch5.azimuth_elevation.tx_ant_set_ranging = 1 [FIRA]ant_sets.ch9.range.rx_ant_set_nonranging = 0 [FIRA]ant_sets.ch9.range.rx_ant_set_ranging = 0 [FIRA]ant_sets.ch9.range.tx_ant_set_nonranging = 0 @@ -29,6 +42,8 @@ [CCC]ant_sets.ch9.range.tx_ant_set_nonranging = 0 [CCC]ant_sets.ch9.range.tx_ant_set_ranging = 0 +[HAL]session_error_monitor_enable = 1 + # Antenna Configuration ant0.config=01 ant1.config=02 @@ -119,4 +134,4 @@ post_tx.pattern_data=DD:DD:DD:DD:77:77:77:77 post_tx.pattern_repetitions=0x0002 # Ipatov / STS time difference threshold -ip_sts_sanity_thres_q2=0x48 +ip_sts_sanity_thres_q2=0x0A