diff --git a/AndroidProducts.mk b/AndroidProducts.mk index b343f20..fb1ae52 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -19,10 +19,12 @@ 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/OWNERS b/OWNERS index 492973e..0914422 100644 --- a/OWNERS +++ b/OWNERS @@ -1,4 +1,4 @@ per-file perf/*,thermal/*= jenhaochen@google.com,wvw@google.com,joaodias@google.com # per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details. -per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:master:/OWNERS +per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 0000000..37ebb5e --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,2 @@ +[Builtin Hooks] +jsonlint = true diff --git a/aosp_husky_61_pgagnostic.mk b/aosp_husky_61_pgagnostic.mk new file mode 100644 index 0000000..5687be9 --- /dev/null +++ b/aosp_husky_61_pgagnostic.mk @@ -0,0 +1,22 @@ +# +# Copyright 2023 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/pixel_61/aosp_husky_61.mk) + +PRODUCT_NAME := aosp_husky_61_pgagnostic +PRODUCT_MODEL := AOSP page-size agnostic Husky 64K ELF + +PRODUCT_PAGE_SIZE_AGNOSTIC := true +PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 diff --git a/aosp_shiba_61_pgagnostic.mk b/aosp_shiba_61_pgagnostic.mk new file mode 100644 index 0000000..adf61d0 --- /dev/null +++ b/aosp_shiba_61_pgagnostic.mk @@ -0,0 +1,22 @@ +# +# Copyright 2023 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/pixel_61/aosp_shiba_61.mk) + +PRODUCT_NAME := aosp_shiba_61_pgagnostic +PRODUCT_MODEL := AOSP page-size agnostic Shiba 64K ELF + +PRODUCT_PAGE_SIZE_AGNOSTIC := true +PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 65536 diff --git a/audio/husky/aidl_config/Android.bp b/audio/husky/aidl_config/Android.bp new file mode 100644 index 0000000..223b678 --- /dev/null +++ b/audio/husky/aidl_config/Android.bp @@ -0,0 +1,63 @@ +// Copyright (C) 2023 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. + +soong_namespace { + imports: [ + "frameworks/av/services/audiopolicy/config", + ] +} + +package { + default_applicable_licenses: [ + "Android-Apache-2.0", + ], +} + +prebuilt_etc { + name: "audio_policy_volumes.xml", + src: "audio_policy_volumes.xml", + soc_specific: true, +} + +prebuilt_etc { + name: "imported_default_volume_tables.xml", + src: "//frameworks/av/services/audiopolicy/config:default_volume_tables.xml", + soc_specific: true, + filename_from_src: true, +} + +prebuilt_etc { + name: "audio_platform_configuration.xml", + src: "audio_platform_configuration.xml", + soc_specific: true, + required: [ + "audio_policy_volumes.xml", + "imported_default_volume_tables.xml", + ], +} + +prebuilt_etc { + name: "mixer_paths_aidl.xml", + src: "mixer_paths_aidl.xml", + soc_specific: true, +} + +phony { + name: "audio_aidl_configs", + soc_specific: true, + required: [ + "audio_platform_configuration.xml", + "mixer_paths_aidl.xml" + ], +} diff --git a/audio/husky/aidl_config/audio_platform_configuration.xml b/audio/husky/aidl_config/audio_platform_configuration.xml index 8707d44..1e775b2 100644 --- a/audio/husky/aidl_config/audio_platform_configuration.xml +++ b/audio/husky/aidl_config/audio_platform_configuration.xml @@ -15,10 +15,6 @@ --> - - - - @@ -26,7 +22,7 @@ - + @@ -47,15 +43,7 @@ - - - - - - - - - + @@ -66,7 +54,7 @@ - + diff --git a/audio/husky/aidl_config/mixer_paths_aidl.xml b/audio/husky/aidl_config/mixer_paths_aidl.xml index 48016b4..d22b97c 100644 --- a/audio/husky/aidl_config/mixer_paths_aidl.xml +++ b/audio/husky/aidl_config/mixer_paths_aidl.xml @@ -405,6 +405,14 @@ + + + + + + + + @@ -465,6 +473,14 @@ + + + + + + + + @@ -525,6 +541,14 @@ + + + + + + + + @@ -590,6 +614,14 @@ + + + + + + + + @@ -650,6 +682,14 @@ + + + + + + + + @@ -722,6 +762,14 @@ + + + + + + + + @@ -832,6 +880,14 @@ + + + + + + + + @@ -866,6 +922,14 @@ + + + + + + + + @@ -890,6 +954,10 @@ + + + + @@ -914,6 +982,10 @@ + + + + @@ -948,6 +1020,14 @@ + + + + + + + + @@ -988,6 +1068,10 @@ + + + + @@ -1052,6 +1136,10 @@ + + + + @@ -1222,6 +1310,10 @@ + + + + diff --git a/audio/husky/audio-tables.mk b/audio/husky/audio-tables.mk index 8aae616..e1b429a 100644 --- a/audio/husky/audio-tables.mk +++ b/audio/husky/audio-tables.mk @@ -16,14 +16,11 @@ AUDIO_TABLE_FOLDER := husky -# Enable this to build AIDL -# BUILD_AUDIO_AIDL_VERSION := true +# Choose AIDL config by build flag. +ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) +PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config +PRODUCT_PACKAGES += audio_aidl_configs -ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) -PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml else # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \ diff --git a/audio/husky/config/audio_policy_configuration.xml b/audio/husky/config/audio_policy_configuration.xml index 524f102..a9120dd 100644 --- a/audio/husky/config/audio_policy_configuration.xml +++ b/audio/husky/config/audio_policy_configuration.xml @@ -50,6 +50,9 @@ + + + - - - - @@ -26,7 +22,7 @@ - + @@ -47,15 +43,7 @@ - - - - - - - - - + @@ -66,7 +54,7 @@ - + diff --git a/audio/shiba/aidl_config/mixer_paths_aidl.xml b/audio/shiba/aidl_config/mixer_paths_aidl.xml index 48016b4..d22b97c 100644 --- a/audio/shiba/aidl_config/mixer_paths_aidl.xml +++ b/audio/shiba/aidl_config/mixer_paths_aidl.xml @@ -405,6 +405,14 @@ + + + + + + + + @@ -465,6 +473,14 @@ + + + + + + + + @@ -525,6 +541,14 @@ + + + + + + + + @@ -590,6 +614,14 @@ + + + + + + + + @@ -650,6 +682,14 @@ + + + + + + + + @@ -722,6 +762,14 @@ + + + + + + + + @@ -832,6 +880,14 @@ + + + + + + + + @@ -866,6 +922,14 @@ + + + + + + + + @@ -890,6 +954,10 @@ + + + + @@ -914,6 +982,10 @@ + + + + @@ -948,6 +1020,14 @@ + + + + + + + + @@ -988,6 +1068,10 @@ + + + + @@ -1052,6 +1136,10 @@ + + + + @@ -1222,6 +1310,10 @@ + + + + diff --git a/audio/shiba/audio-tables.mk b/audio/shiba/audio-tables.mk index 9beaa0c..b5e8045 100644 --- a/audio/shiba/audio-tables.mk +++ b/audio/shiba/audio-tables.mk @@ -16,14 +16,11 @@ AUDIO_TABLE_FOLDER := shiba -# Enable this to build AIDL -# BUILD_AUDIO_AIDL_VERSION := true +# Choose AIDL config by build flag. +ifeq ($(RELEASE_PIXEL_AIDL_AUDIO_HAL),true) +PRODUCT_SOONG_NAMESPACES += device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config +PRODUCT_PACKAGES += audio_aidl_configs -ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) -PRODUCT_COPY_FILES += \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml else # Platform Configuration for AudioHAL / SoundTriggerHAL PRODUCT_COPY_FILES += \ diff --git a/audio/shiba/config/audio_policy_configuration.xml b/audio/shiba/config/audio_policy_configuration.xml index 524f102..a9120dd 100644 --- a/audio/shiba/config/audio_policy_configuration.xml +++ b/audio/shiba/config/audio_policy_configuration.xml @@ -50,6 +50,9 @@ + + + + + + + eh + eh + /sys/bus/platform/devices/16d00000.eh + + diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index 82f1e65..e85c15f 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -3,9 +3,6 @@ # Uart port name UartPort = /dev/ttySAC18 -# Userial type -UserialType = 2 - # Enable check whether let aoc controls power pin AocPowerPinCtrlCheckEnable = true @@ -17,6 +14,9 @@ HwStageDoesNotCtrlPowerPinFromAoc = PROTO1.0-EVT1.0-EVT1.2 # supported by BT firmware. HwStageWithOldChipFwNoLongerSupport = PROTO1.0-PROTO1.1 +# APM Uart skip suspend to aovid hold system too long when BT using AOC UART +ApmUartSkipSuspend = true + # Sar backOff high resolution support SarBackOffHighResolution = true diff --git a/bluetooth/bt_vendor_overlay_ripcurrent.conf b/bluetooth/bt_vendor_overlay_ripcurrent.conf index a4a91d5..2473a1b 100644 --- a/bluetooth/bt_vendor_overlay_ripcurrent.conf +++ b/bluetooth/bt_vendor_overlay_ripcurrent.conf @@ -3,9 +3,6 @@ # Uart port name UartPort = /dev/ttySAC18 -# Userial type -UserialType = 2 - # Sar backOff high resolution support SarBackOffHighResolution = true diff --git a/bluetooth/le_audio_codec_capabilities.xml b/bluetooth/le_audio_codec_capabilities.xml index f277589..d988d1b 100644 --- a/bluetooth/le_audio_codec_capabilities.xml +++ b/bluetooth/le_audio_codec_capabilities.xml @@ -32,6 +32,9 @@ + + + @@ -44,6 +47,8 @@ + + @@ -62,8 +67,12 @@ + + + + diff --git a/camera/camera.mk b/camera/camera.mk new file mode 100644 index 0000000..6b2a553 --- /dev/null +++ b/camera/camera.mk @@ -0,0 +1,24 @@ +# +# Copyright (C) 2023 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 ($(CAMERA_PRODUCT),) +$(error CAMERA_PRODUCT is not set.) +endif + +# go/lyric-soong-variables +$(call soong_config_set,lyric,camera_hardware,$(CAMERA_PRODUCT)) +$(call soong_config_set,lyric,tuning_product,$(CAMERA_PRODUCT)) +$(call soong_config_set,google3a_config,target_device,$(CAMERA_PRODUCT)) diff --git a/conf/init.husky.rc b/conf/init.husky.rc index 1b81446..17b081e 100644 --- a/conf/init.husky.rc +++ b/conf/init.husky.rc @@ -1,9 +1,6 @@ # Husky specific init.rc import /vendor/etc/init/hw/init.zuma.rc -on early-init && property:ro.product.name=husky_fullmte - export SCUDO_OPTIONS allocation_ring_buffer_size=131072 - on init && property:ro.vendor.factory=1 import /vendor/etc/init/hw/init.factory.rc @@ -64,57 +61,23 @@ on property:vendor.all.modules.ready=1 chown system system /mnt/vendor/persist/haptics chown system system /mnt/vendor/persist/haptics/cs40l26.cal - chown system system /sys/bus/i2c/devices/6-0043/calibration/f0_stored - chown system system /sys/bus/i2c/devices/5-0043/calibration/f0_stored - chown system system /sys/bus/i2c/devices/4-0043/calibration/f0_stored - chown system system /sys/bus/i2c/devices/6-0043/calibration/q_stored - chown system system /sys/bus/i2c/devices/5-0043/calibration/q_stored - chown system system /sys/bus/i2c/devices/4-0043/calibration/q_stored - chown system system /sys/bus/i2c/devices/6-0043/calibration/redc_stored - chown system system /sys/bus/i2c/devices/5-0043/calibration/redc_stored - chown system system /sys/bus/i2c/devices/4-0043/calibration/redc_stored - chown system system /sys/bus/i2c/devices/6-0043/default/vibe_state - chown system system /sys/bus/i2c/devices/5-0043/default/vibe_state - chown system system /sys/bus/i2c/devices/4-0043/default/vibe_state - chown system system /sys/bus/i2c/devices/6-0043/default/num_waves - chown system system /sys/bus/i2c/devices/5-0043/default/num_waves - chown system system /sys/bus/i2c/devices/4-0043/default/num_waves - chown system system /sys/bus/i2c/devices/6-0043/default/f0_offset - chown system system /sys/bus/i2c/devices/5-0043/default/f0_offset - chown system system /sys/bus/i2c/devices/4-0043/default/f0_offset - chown system system /sys/bus/i2c/devices/6-0043/default/owt_free_space - chown system system /sys/bus/i2c/devices/5-0043/default/owt_free_space - chown system system /sys/bus/i2c/devices/4-0043/default/owt_free_space - chown system system /sys/bus/i2c/devices/6-0043/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/5-0043/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/4-0043/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/6-0043/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/5-0043/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/4-0043/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_env_rel_coef - chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_env_rel_coef - chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_env_rel_coef - chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_rise_headroom - chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_rise_headroom - chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_rise_headroom - chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_fall_headroom - chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_fall_headroom - chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_fall_headroom - chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_enable - chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_enable - chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_enable - chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_thresh_fs - chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_thresh_fs - chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_thresh_fs - chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_hold_off_ms - chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_hold_off_ms - chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_hold_off_ms - chown system system /sys/bus/i2c/devices/6-0043/default/pm_active_timeout_ms - chown system system /sys/bus/i2c/devices/5-0043/default/pm_active_timeout_ms - chown system system /sys/bus/i2c/devices/4-0043/default/pm_active_timeout_ms + chown system system /sys/bus/i2c/devices/0-0043/calibration/f0_stored + chown system system /sys/bus/i2c/devices/0-0043/calibration/q_stored + chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored + chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state + chown system system /sys/bus/i2c/devices/0-0043/default/num_waves + chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset + chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space + chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us + chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_env_rel_coef + chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_rise_headroom + chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_fall_headroom + chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_enable + chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_thresh_fs + chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_hold_off_ms + chown system system /sys/bus/i2c/devices/0-0043/default/pm_active_timeout_ms enable vendor.vibrator.cs40l26 diff --git a/conf/init.ripcurrent.rc b/conf/init.ripcurrent.rc index b4a3caf..bcb8c07 100644 --- a/conf/init.ripcurrent.rc +++ b/conf/init.ripcurrent.rc @@ -48,66 +48,26 @@ on property:vendor.all.modules.ready=1 chown system system /mnt/vendor/persist/haptics/cs40l26.cal chown system system /mnt/vendor/persist/haptics/cs40l26_dual.cal - chown system system /sys/bus/i2c/devices/6-0043/calibration/f0_stored - chown system system /sys/bus/i2c/devices/5-0043/calibration/f0_stored - chown system system /sys/bus/i2c/devices/4-0043/calibration/f0_stored - chown system system /sys/bus/i2c/devices/6-0042/calibration/f0_stored - chown system system /sys/bus/i2c/devices/5-0042/calibration/f0_stored - chown system system /sys/bus/i2c/devices/4-0042/calibration/f0_stored - chown system system /sys/bus/i2c/devices/6-0043/calibration/q_stored - chown system system /sys/bus/i2c/devices/5-0043/calibration/q_stored - chown system system /sys/bus/i2c/devices/4-0043/calibration/q_stored - chown system system /sys/bus/i2c/devices/6-0042/calibration/q_stored - chown system system /sys/bus/i2c/devices/5-0042/calibration/q_stored - chown system system /sys/bus/i2c/devices/4-0042/calibration/q_stored - chown system system /sys/bus/i2c/devices/6-0043/calibration/redc_stored - chown system system /sys/bus/i2c/devices/5-0043/calibration/redc_stored - chown system system /sys/bus/i2c/devices/4-0043/calibration/redc_stored - chown system system /sys/bus/i2c/devices/6-0042/calibration/redc_stored - chown system system /sys/bus/i2c/devices/5-0042/calibration/redc_stored - chown system system /sys/bus/i2c/devices/4-0042/calibration/redc_stored - chown system system /sys/bus/i2c/devices/6-0043/default/vibe_state - chown system system /sys/bus/i2c/devices/5-0043/default/vibe_state - chown system system /sys/bus/i2c/devices/4-0043/default/vibe_state - chown system system /sys/bus/i2c/devices/6-0042/default/vibe_state - chown system system /sys/bus/i2c/devices/5-0042/default/vibe_state - chown system system /sys/bus/i2c/devices/4-0042/default/vibe_state - chown system system /sys/bus/i2c/devices/6-0043/default/num_waves - chown system system /sys/bus/i2c/devices/5-0043/default/num_waves - chown system system /sys/bus/i2c/devices/4-0043/default/num_waves - chown system system /sys/bus/i2c/devices/6-0042/default/num_waves - chown system system /sys/bus/i2c/devices/5-0042/default/num_waves - chown system system /sys/bus/i2c/devices/4-0042/default/num_waves - chown system system /sys/bus/i2c/devices/6-0043/default/f0_offset - chown system system /sys/bus/i2c/devices/5-0043/default/f0_offset - chown system system /sys/bus/i2c/devices/4-0043/default/f0_offset - chown system system /sys/bus/i2c/devices/6-0042/default/f0_offset - chown system system /sys/bus/i2c/devices/5-0042/default/f0_offset - chown system system /sys/bus/i2c/devices/4-0042/default/f0_offset - chown system system /sys/bus/i2c/devices/6-0043/default/owt_free_space - chown system system /sys/bus/i2c/devices/5-0043/default/owt_free_space - chown system system /sys/bus/i2c/devices/4-0043/default/owt_free_space - chown system system /sys/bus/i2c/devices/6-0042/default/owt_free_space - chown system system /sys/bus/i2c/devices/5-0042/default/owt_free_space - chown system system /sys/bus/i2c/devices/4-0042/default/owt_free_space - chown system system /sys/bus/i2c/devices/6-0043/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/5-0043/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/4-0043/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/6-0042/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/5-0042/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/4-0042/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/6-0043/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/5-0043/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/4-0043/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/6-0042/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/5-0042/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/4-0042/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/6-0042/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/5-0042/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/4-0042/default/delay_before_stop_playback_us + chown system system /sys/bus/i2c/devices/0-0043/calibration/f0_stored + chown system system /sys/bus/i2c/devices/0-0042/calibration/f0_stored + chown system system /sys/bus/i2c/devices/0-0043/calibration/q_stored + chown system system /sys/bus/i2c/devices/0-0042/calibration/q_stored + chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored + chown system system /sys/bus/i2c/devices/0-0042/calibration/redc_stored + chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state + chown system system /sys/bus/i2c/devices/0-0042/default/vibe_state + chown system system /sys/bus/i2c/devices/0-0043/default/num_waves + chown system system /sys/bus/i2c/devices/0-0042/default/num_waves + chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset + chown system system /sys/bus/i2c/devices/0-0042/default/f0_offset + chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space + chown system system /sys/bus/i2c/devices/0-0042/default/owt_free_space + chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/0-0042/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/0-0042/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us + chown system system /sys/bus/i2c/devices/0-0042/default/delay_before_stop_playback_us enable vendor.vibrator.cs40l26 enable vendor.vibrator.cs40l26-dual diff --git a/conf/init.shiba.rc b/conf/init.shiba.rc index e4c97a2..8c88141 100644 --- a/conf/init.shiba.rc +++ b/conf/init.shiba.rc @@ -1,9 +1,6 @@ # Shiba specific init.rc import /vendor/etc/init/hw/init.zuma.rc -on early-init && property:ro.product.name=shiba_fullmte - export SCUDO_OPTIONS allocation_ring_buffer_size=131072 - on init && property:ro.vendor.factory=1 import /vendor/etc/init/hw/init.factory.rc @@ -60,57 +57,23 @@ on property:vendor.all.modules.ready=1 chown system system /mnt/vendor/persist/haptics chown system system /mnt/vendor/persist/haptics/cs40l26.cal - chown system system /sys/bus/i2c/devices/6-0043/calibration/f0_stored - chown system system /sys/bus/i2c/devices/5-0043/calibration/f0_stored - chown system system /sys/bus/i2c/devices/4-0043/calibration/f0_stored - chown system system /sys/bus/i2c/devices/6-0043/calibration/q_stored - chown system system /sys/bus/i2c/devices/5-0043/calibration/q_stored - chown system system /sys/bus/i2c/devices/4-0043/calibration/q_stored - chown system system /sys/bus/i2c/devices/6-0043/calibration/redc_stored - chown system system /sys/bus/i2c/devices/5-0043/calibration/redc_stored - chown system system /sys/bus/i2c/devices/4-0043/calibration/redc_stored - chown system system /sys/bus/i2c/devices/6-0043/default/vibe_state - chown system system /sys/bus/i2c/devices/5-0043/default/vibe_state - chown system system /sys/bus/i2c/devices/4-0043/default/vibe_state - chown system system /sys/bus/i2c/devices/6-0043/default/num_waves - chown system system /sys/bus/i2c/devices/5-0043/default/num_waves - chown system system /sys/bus/i2c/devices/4-0043/default/num_waves - chown system system /sys/bus/i2c/devices/6-0043/default/f0_offset - chown system system /sys/bus/i2c/devices/5-0043/default/f0_offset - chown system system /sys/bus/i2c/devices/4-0043/default/f0_offset - chown system system /sys/bus/i2c/devices/6-0043/default/owt_free_space - chown system system /sys/bus/i2c/devices/5-0043/default/owt_free_space - chown system system /sys/bus/i2c/devices/4-0043/default/owt_free_space - chown system system /sys/bus/i2c/devices/6-0043/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/5-0043/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/4-0043/default/f0_comp_enable - chown system system /sys/bus/i2c/devices/6-0043/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/5-0043/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/4-0043/default/redc_comp_enable - chown system system /sys/bus/i2c/devices/6-0043/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/5-0043/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/4-0043/default/delay_before_stop_playback_us - chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_env_rel_coef - chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_env_rel_coef - chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_env_rel_coef - chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_rise_headroom - chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_rise_headroom - chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_rise_headroom - chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_fall_headroom - chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_fall_headroom - chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_fall_headroom - chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_enable - chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_enable - chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_enable - chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_thresh_fs - chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_thresh_fs - chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_thresh_fs - chown system system /sys/bus/i2c/devices/6-0043/dbc/dbc_tx_lvl_hold_off_ms - chown system system /sys/bus/i2c/devices/5-0043/dbc/dbc_tx_lvl_hold_off_ms - chown system system /sys/bus/i2c/devices/4-0043/dbc/dbc_tx_lvl_hold_off_ms - chown system system /sys/bus/i2c/devices/6-0043/default/pm_active_timeout_ms - chown system system /sys/bus/i2c/devices/5-0043/default/pm_active_timeout_ms - chown system system /sys/bus/i2c/devices/4-0043/default/pm_active_timeout_ms + chown system system /sys/bus/i2c/devices/0-0043/calibration/f0_stored + chown system system /sys/bus/i2c/devices/0-0043/calibration/q_stored + chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored + chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state + chown system system /sys/bus/i2c/devices/0-0043/default/num_waves + chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset + chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space + chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable + chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable + chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us + chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_env_rel_coef + chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_rise_headroom + chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_fall_headroom + chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_enable + chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_thresh_fs + chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_hold_off_ms + chown system system /sys/bus/i2c/devices/0-0043/default/pm_active_timeout_ms enable vendor.vibrator.cs40l26 diff --git a/device-husky.mk b/device-husky.mk index 7ef9b87..003e33d 100644 --- a/device-husky.mk +++ b/device-husky.mk @@ -14,21 +14,28 @@ # limitations under the License. # +# 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 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers LOCAL_PATH := device/google/shusky ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) USE_UWBFIELDTESTQM := true endif +ifeq ($(filter factory_husky, $(TARGET_PRODUCT)),) + include device/google/shusky/uwb/uwb_calibration.mk +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/Device.mk) +$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal-r63/Device.mk) $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersHusky.mk) # display @@ -39,7 +46,10 @@ PRODUCT_COPY_FILES += \ device/google/shusky/husky/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb \ device/google/shusky/husky/display_golden_google-hk3_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_google-hk3_cal0.pb +CAMERA_PRODUCT ?= husky + include device/google/shusky/audio/husky/audio-tables.mk +include device/google/shusky/camera/camera.mk include device/google/zuma/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk @@ -47,11 +57,6 @@ include device/google/gs-common/touch/stm/stm20.mk include device/google/gs-common/touch/gti/gti.mk include device/google/gs-common/touch/touchinspector/touchinspector.mk -# go/lyric-soong-variables -$(call soong_config_set,lyric,camera_hardware,husky) -$(call soong_config_set,lyric,tuning_product,husky) -$(call soong_config_set,google3a_config,target_device,husky) - # Init files PRODUCT_COPY_FILES += \ device/google/shusky/conf/init.husky.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.husky.rc @@ -67,10 +72,6 @@ PRODUCT_COPY_FILES += \ device/google/shusky/husky/radio/husky_camera_rear_tele_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/camera_rear_tele_mipi_coex_table.csv \ device/google/shusky/husky/radio/husky_display_primary_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv -# Camera -PRODUCT_COPY_FILES += \ - device/google/shusky/media_profiles_husky.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml - # NFC PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ @@ -82,7 +83,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st @@ -196,14 +197,18 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/shusky/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# LE Audio Unicast Allowlist +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.allow_list=SM-R510 + # Bluetooth LE Audio CIS handover to SCO # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.notify.idle.during.call=true -# Not support LE Audio dual mic SWB call based on the current launch strategy +# Support LE Audio dual mic SWB call PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.leaudio.dual_bidirection_swb.supported=false + bluetooth.leaudio.dual_bidirection_swb.supported=true # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ @@ -252,6 +257,17 @@ 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%,$(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 += \ + device/google/shusky/uwb # Location # SDK build system @@ -278,12 +294,19 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL -GOODIX_CONFIG_BUILD_VERSION := g7_trusty -include device/google/gs101/fingerprint/udfps_common.mk -ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2 else -include device/google/gs101/fingerprint/udfps_factory.mk +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk +endif +GOODIX_CONFIG_BUILD_VERSION := g7_trusty +$(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) +else +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif PRODUCT_VENDOR_PROPERTIES += \ @@ -299,7 +322,10 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.front_720P_always_binning=true # Media Performance Class 14 -PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=33 +PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34 + +# Modem +PRODUCT_PROPERTY_OVERRIDES += persist.vendor.radio.volte_mif_off=true # config of display brightness dimming PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.dimming.usage?=1 @@ -334,7 +360,7 @@ PRODUCT_COPY_FILES += \ ACTUATOR_MODEL := luxshare_ict_081545 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=0 \ + persist.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.222 \ ro.vendor.vibrator.hal.loc.coeff=2.8 \ persist.vendor.vibrator.hal.context.enable=false \ @@ -352,7 +378,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=6 + ro.vendor.build.svn=13 # WLC userdebug specific ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) @@ -395,17 +421,21 @@ PRODUCT_SYSTEM_PROPERTIES += \ # Keyboard height ratio and bottom padding in dp for portrait mode PRODUCT_PRODUCT_PROPERTIES += \ - ro.com.google.ime.kb_pad_port_b=10.4 \ - ro.com.google.ime.height_ratio=1.0 + ro.com.google.ime.kb_pad_port_b=10.4 + +PRODUCT_PRODUCT_PROPERTIES ?= \ + ro.com.google.ime.height_ratio=1.0 # Enable camera exif model/make reporting PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true +# AVF assignable devices xml +PRODUCT_PACKAGES += shusky_assignable_devices.xml + # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true -# DisplayPort should be disabled by default (b/300167292) -PRODUCT_VENDOR_PROPERTIES += \ - persist.vendor.usb.displayport.enabled=0 +PRODUCT_PACKAGES += \ + NfcOverlayHusky \ diff --git a/device-ripcurrent.mk b/device-ripcurrent.mk index 79406da..0717be5 100644 --- a/device-ripcurrent.mk +++ b/device-ripcurrent.mk @@ -14,12 +14,19 @@ # limitations under the License. # +# 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 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) USE_UWBFIELDTESTQM := true endif +ifeq ($(filter factory_ripcurrent, $(TARGET_PRODUCT)),) + include device/google/shusky/uwb/uwb_calibration.mk +endif + $(call inherit-product-if-exists, vendor/google_devices/shusky/prebuilts/device-vendor-ripcurrent.mk) $(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.mk) @@ -27,18 +34,16 @@ $(call inherit-product-if-exists, vendor/google_devices/zuma/proprietary/device- $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/ripcurrent/device-vendor-ripcurrent.mk) $(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.mk) +CAMERA_PRODUCT ?= ripcurrent + include device/google/shusky/audio/ripcurrent/audio-tables.mk +include device/google/shusky/camera/camera.mk include device/google/zuma/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/gps/brcm/cbd_gps.mk include device/google/gs-common/touch/stm/stm20.mk -# go/lyric-soong-variables -$(call soong_config_set,lyric,camera_hardware,ripcurrent) -$(call soong_config_set,lyric,tuning_product,ripcurrent) -$(call soong_config_set,google3a_config,target_device,ripcurrent) - # display DEVICE_PACKAGE_OVERLAYS += device/google/shusky/ripcurrent/overlay @@ -50,10 +55,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/shusky/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.ripcurrent.rc -# Camera -PRODUCT_COPY_FILES += \ - device/google/shusky/media_profiles_ripcurrent.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml - # NFC PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ @@ -66,7 +67,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st @@ -96,6 +97,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PROPERTY_OVERRIDES += \ ro.audio.spatializer_enabled=true +# DCK properties based on target +PRODUCT_PROPERTY_OVERRIDES += \ + ro.gms.dck.eligible_wcc=3 + # Bluetooth hci_inject test tool PRODUCT_PACKAGES_DEBUG += \ hci_inject @@ -166,9 +171,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.notify.idle.during.call=true -# Not support LE Audio dual mic SWB call based on the current launch strategy +# Support LE Audio dual mic SWB call PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.leaudio.dual_bidirection_swb.supported=false + bluetooth.leaudio.dual_bidirection_swb.supported=true # Keymaster HAL #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service @@ -210,6 +215,17 @@ 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%,$(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 += \ + device/google/shusky/uwb # Location # SDK build system @@ -246,7 +262,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=0 \ + persist.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.222 \ ro.vendor.vibrator.hal.loc.coeff=2.8 diff --git a/device-shiba.mk b/device-shiba.mk index e523ae0..f7879f6 100644 --- a/device-shiba.mk +++ b/device-shiba.mk @@ -14,8 +14,11 @@ # limitations under the License. # +# 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 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/shusky-kernel/kernel-headers LOCAL_PATH := device/google/shusky @@ -27,18 +30,15 @@ $(call inherit-product-if-exists, vendor/google_devices/shiba/proprietary/device $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersShiba.mk) DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay +CAMERA_PRODUCT ?= shiba include device/google/shusky/audio/shiba/audio-tables.mk +include device/google/shusky/camera/camera.mk include device/google/zuma/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/touch/gti/gti.mk -# go/lyric-soong-variables -$(call soong_config_set,lyric,camera_hardware,shiba) -$(call soong_config_set,lyric,tuning_product,shiba) -$(call soong_config_set,google3a_config,target_device,shiba) - # Init files PRODUCT_COPY_FILES += \ device/google/shusky/conf/init.shiba.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.shiba.rc @@ -54,8 +54,6 @@ PRODUCT_COPY_FILES += \ device/google/shusky/shiba/radio/shiba_display_primary_mipi_coex_table.csv:$(TARGET_COPY_OUT_VENDOR)/etc/modem/display_primary_mipi_coex_table.csv # Camera -PRODUCT_COPY_FILES += \ - device/google/shusky/media_profiles_shiba.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.camera.rls_range_supported=false @@ -70,7 +68,7 @@ PRODUCT_COPY_FILES += \ device/google/shusky/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st @@ -187,14 +185,18 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_COPY_FILES += \ device/google/shusky/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml +# LE Audio Unicast Allowlist +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.leaudio.allow_list=SM-R510 + # Bluetooth LE Audio CIS handover to SCO # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683. PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.notify.idle.during.call=true -# Not support LE Audio dual mic SWB call based on the current launch strategy +# Support LE Audio dual mic SWB call PRODUCT_PRODUCT_PROPERTIES += \ - bluetooth.leaudio.dual_bidirection_swb.supported=false + bluetooth.leaudio.dual_bidirection_swb.supported=true # Support One-Handed mode PRODUCT_PRODUCT_PROPERTIES += \ @@ -242,6 +244,13 @@ 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%,$(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 @@ -268,12 +277,19 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.device_config.configuration.disable_rescue_party=true # Fingerprint HAL -GOODIX_CONFIG_BUILD_VERSION := g7_trusty -include device/google/gs101/fingerprint/udfps_common.mk -ifeq ($(filter factory%, $(TARGET_PRODUCT)),) -include device/google/gs101/fingerprint/udfps_shipping.mk +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2 else -include device/google/gs101/fingerprint/udfps_factory.mk +APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/trunk +endif +GOODIX_CONFIG_BUILD_VERSION := g7_trusty +$(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) +else +$(call inherit-product-if-exists, vendor/goodix/udfps/configuration/udfps_factory.mk) endif # Fingerprint exposure compensation @@ -281,7 +297,7 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.udfps.auto_exposure_compensation_supported=true # Display -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1500 +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.set_idle_timer_ms=1000 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true # lhbm peak brightness delay: decided by kernel PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.primarydisplay.lhbm.frames_to_reach_peak_brightness=0 @@ -306,7 +322,10 @@ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.front_720P_always_binning=true # Media Performance Class 14 -PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=33 +PRODUCT_PRODUCT_PROPERTIES += ro.odm.build.media_performance_class=34 + +# Modem +PRODUCT_PROPERTY_OVERRIDES += persist.vendor.radio.volte_mif_off=true # Display LBE PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 @@ -315,7 +334,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 ACTUATOR_MODEL := luxshare_ict_081545 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.vibrator.hal.chirp.enabled=0 \ + persist.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.187 \ ro.vendor.vibrator.hal.loc.coeff=2.75 \ persist.vendor.vibrator.hal.context.enable=false \ @@ -333,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=6 + ro.vendor.build.svn=13 # P23 Devices no longer need rlsservice PRODUCT_VENDOR_PROPERTIES += \ @@ -377,10 +396,12 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \ persist.vendor.camera.exif_reveal_make_model=true +# AVF assignable devices xml +PRODUCT_PACKAGES += shusky_assignable_devices.xml + # Enable DeviceAsWebcam support PRODUCT_VENDOR_PROPERTIES += \ ro.usb.uvc.enabled=true -# DisplayPort should be disabled by default (b/300167292) -PRODUCT_VENDOR_PROPERTIES += \ - persist.vendor.usb.displayport.enabled=0 +PRODUCT_PACKAGES += \ + NfcOverlayShiba diff --git a/husky/BoardConfig.mk b/husky/BoardConfig.mk index 9e35d93..0f5e382 100644 --- a/husky/BoardConfig.mk +++ b/husky/BoardConfig.mk @@ -24,7 +24,24 @@ BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := husky -TARGET_SCREEN_DENSITY := 480 + +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%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif + + +ifdef PHONE_CAR_BOARD_PRODUCT + include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk +else + TARGET_SCREEN_DENSITY := 480 +endif + BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_SHUSKY := true BOARD_KERNEL_CMDLINE += swiotlb=noforce @@ -41,3 +58,12 @@ include device/google/zuma/BoardConfig-common.mk -include vendor/google_devices/husky/proprietary/BoardConfigVendor.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 +endif diff --git a/husky/overlay/frameworks/base/core/res/res/values/config.xml b/husky/overlay/frameworks/base/core/res/res/values/config.xml index 327a3af..f03519a 100644 --- a/husky/overlay/frameworks/base/core/res/res/values/config.xml +++ b/husky/overlay/frameworks/base/core/res/res/values/config.xml @@ -48,9 +48,6 @@ 0.087114228 - - true - + + + + + diff --git a/husky/rro_overlays/NfcOverlay/OWNERS b/husky/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/husky/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/husky/rro_overlays/NfcOverlay/res/values/config.xml b/husky/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..20edf75 --- /dev/null +++ b/husky/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + false + true + + GC3VE + G1MNW + GE9DP + + true + + 73 + 158 + false + + 37 + + + 103 + + diff --git a/husky/rro_overlays/UwbOverlay/res/values/config.xml b/husky/rro_overlays/UwbOverlay/res/values/config.xml index 7a77d32..bf8d264 100644 --- a/husky/rro_overlays/UwbOverlay/res/values/config.xml +++ b/husky/rro_overlays/UwbOverlay/res/values/config.xml @@ -17,4 +17,17 @@ */ --> + + true + + + true + + + true diff --git a/location/gps.xml b/location/gps.xml index 774e206..87ced9c 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" diff --git a/location/gps.xml.hk3 b/location/gps.xml.hk3 index 2857dcf..5eb541f 100644 --- a/location/gps.xml.hk3 +++ b/location/gps.xml.hk3 @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps.xml.sb3 b/location/gps.xml.sb3 index bceb407..17ad50d 100644 --- a/location/gps.xml.sb3 +++ b/location/gps.xml.sb3 @@ -35,7 +35,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml b/location/gps_user.xml index 9f3bd02..b9331e6 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.hk3 b/location/gps_user.xml.hk3 index 8a1d2b3..c72bfae 100644 --- a/location/gps_user.xml.hk3 +++ b/location/gps_user.xml.hk3 @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/location/gps_user.xml.sb3 b/location/gps_user.xml.sb3 index f74bce6..0375981 100644 --- a/location/gps_user.xml.sb3 +++ b/location/gps_user.xml.sb3 @@ -34,7 +34,7 @@ SuplVersion="2" SuplMinorVersion="0" SuplOtdoaCapable="true" - SuplOtdoaCapable2="false" + SuplOtdoaCapable2="true" SuplGlonassCapable = "true" SuplGalileoCapable = "true" SuplBdsCapable = "true" diff --git a/media_profiles_husky.xml b/media_profiles_husky.xml deleted file mode 100644 index 8abc330..0000000 --- a/media_profiles_husky.xml +++ /dev/null @@ -1,1808 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media_profiles_ripcurrent.xml b/media_profiles_ripcurrent.xml deleted file mode 100644 index 6e2977d..0000000 --- a/media_profiles_ripcurrent.xml +++ /dev/null @@ -1,1808 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/media_profiles_shiba.xml b/media_profiles_shiba.xml deleted file mode 100644 index 1da2154..0000000 --- a/media_profiles_shiba.xml +++ /dev/null @@ -1,1440 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/perf/powerhint-husky.json b/perf/powerhint-husky.json index 63af423..f316245 100644 --- a/perf/powerhint-husky.json +++ b/perf/powerhint-husky.json @@ -235,6 +235,7 @@ "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", "Values": [ + "2048 1280 1280", "1280", "1100" ], @@ -273,7 +274,7 @@ }, { "Name": "BGUClampMaxBoost", - "Path": "/proc/vendor_sched/bg_uclamp_max", + "Path": "/proc/vendor_sched/groups/bg/uclamp_max", "Values": [ "130", "512" @@ -283,7 +284,7 @@ }, { "Name": "Dex2oatUClampMaxBoost", - "Path": "/proc/vendor_sched/dex2oat_uclamp_max", + "Path": "/proc/vendor_sched/groups/dex2oat/uclamp_max", "Values": [ "-2", "615" @@ -293,7 +294,7 @@ }, { "Name": "CAMUClampBoost", - "Path": "/proc/vendor_sched/cam_uclamp_min", + "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", "0" @@ -302,7 +303,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", "1" @@ -311,7 +312,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -320,7 +321,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "812" @@ -339,7 +340,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "1", "0" @@ -401,7 +402,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -410,7 +411,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "1", "0" @@ -420,7 +421,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -430,7 +431,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -736,7 +737,7 @@ }, { "Name": "Dex2oatGroup", - "Path": "/proc/vendor_sched/dex2oat_ug", + "Path": "/proc/vendor_sched/groups/dex2oat/ug", "Values": [ "1", "0" @@ -1043,6 +1044,113 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE_GPU", + "Node": "GPUDvfsPeriod", + "Duration": 1000, + "Value": "10" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Type": "DoHint", + "Value": "DISPLAY_CHANGE_GPU" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "159" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "DsuMinFreq", + "Duration": 5000, + "Value": "1800000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "BCIMinFreq", + "Duration": 5000, + "Value": "1401000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "GPUPowerOn", @@ -1888,6 +1996,12 @@ "Duration": 0, "Value": "cam1" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -1954,6 +2068,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDPreferHighCap", @@ -2423,6 +2543,12 @@ "Duration": 0, "Value": "419000" }, + { + "PowerHint": "GAME", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "GAME", "Node": "VIRTUAL-SKIN-CPU-MID", diff --git a/perf/powerhint-ripcurrent.json b/perf/powerhint-ripcurrent.json index 2747e57..0e95f18 100644 --- a/perf/powerhint-ripcurrent.json +++ b/perf/powerhint-ripcurrent.json @@ -221,6 +221,7 @@ "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", "Values": [ + "2048 1280 1280", "1280", "1100" ], @@ -259,7 +260,7 @@ }, { "Name": "BGUClampMaxBoost", - "Path": "/proc/vendor_sched/bg_uclamp_max", + "Path": "/proc/vendor_sched/groups/bg/uclamp_max", "Values": [ "130", "512" @@ -269,7 +270,7 @@ }, { "Name": "Dex2oatUClampMaxBoost", - "Path": "/proc/vendor_sched/dex2oat_uclamp_max", + "Path": "/proc/vendor_sched/groups/dex2oat/uclamp_max", "Values": [ "-2", "615" @@ -279,7 +280,7 @@ }, { "Name": "CAMUClampBoost", - "Path": "/proc/vendor_sched/cam_uclamp_min", + "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", "0" @@ -288,7 +289,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", "1" @@ -297,7 +298,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -306,7 +307,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "812" @@ -325,7 +326,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "1", "0" @@ -387,7 +388,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -396,7 +397,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "1", "0" @@ -406,7 +407,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -416,7 +417,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -782,7 +783,7 @@ }, { "Name": "Dex2oatGroup", - "Path": "/proc/vendor_sched/dex2oat_ug", + "Path": "/proc/vendor_sched/groups/dex2oat/ug", "Values": [ "1", "0" @@ -1065,6 +1066,113 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE_GPU", + "Node": "GPUDvfsPeriod", + "Duration": 1000, + "Value": "10" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Type": "DoHint", + "Value": "DISPLAY_CHANGE_GPU" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "159" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "DsuMinFreq", + "Duration": 5000, + "Value": "1548000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "BCIMinFreq", + "Duration": 5000, + "Value": "1401000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "GPUPowerOn", @@ -1725,6 +1833,12 @@ "Duration": 0, "Value": "cam1" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -1779,6 +1893,12 @@ "Duration": 0, "Value": "1" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "CDPreferHighCap", @@ -2236,6 +2356,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "GAME", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "GAME", "Node": "NPITaskPacking", diff --git a/perf/powerhint-shiba.json b/perf/powerhint-shiba.json index 87b42ce..fa68d84 100644 --- a/perf/powerhint-shiba.json +++ b/perf/powerhint-shiba.json @@ -235,6 +235,7 @@ "Name": "CPUUtilThreshold", "Path": "/proc/vendor_sched/util_threshold", "Values": [ + "2048 1280 1280", "1280", "1100" ], @@ -273,7 +274,7 @@ }, { "Name": "BGUClampMaxBoost", - "Path": "/proc/vendor_sched/bg_uclamp_max", + "Path": "/proc/vendor_sched/groups/bg/uclamp_max", "Values": [ "130", "512" @@ -283,7 +284,7 @@ }, { "Name": "Dex2oatUClampMaxBoost", - "Path": "/proc/vendor_sched/dex2oat_uclamp_max", + "Path": "/proc/vendor_sched/groups/dex2oat/uclamp_max", "Values": [ "-2", "615" @@ -293,7 +294,7 @@ }, { "Name": "CAMUClampBoost", - "Path": "/proc/vendor_sched/cam_uclamp_min", + "Path": "/proc/vendor_sched/groups/cam/uclamp_min", "Values": [ "765", "0" @@ -302,7 +303,7 @@ }, { "Name": "TAUClampBoost", - "Path": "/proc/vendor_sched/ta_uclamp_min", + "Path": "/proc/vendor_sched/groups/ta/uclamp_min", "Values": [ "765", "1" @@ -311,7 +312,7 @@ }, { "Name": "FGUClampBoost", - "Path": "/proc/vendor_sched/fg_uclamp_min", + "Path": "/proc/vendor_sched/groups/fg/uclamp_min", "Values": [ "159", "0" @@ -320,7 +321,7 @@ }, { "Name": "MLUclampBoost", - "Path": "/proc/vendor_sched/nnapi_uclamp_min", + "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min", "Values": [ "225", "812" @@ -339,7 +340,7 @@ }, { "Name": "CDPreferIdle", - "Path": "/proc/vendor_sched/cam_prefer_idle", + "Path": "/proc/vendor_sched/groups/cam/prefer_idle", "Values": [ "1", "0" @@ -401,7 +402,7 @@ }, { "Name": "TAPreferHighCap", - "Path": "/proc/vendor_sched/ta_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap", "Values": [ "1", "0" @@ -410,7 +411,7 @@ }, { "Name": "TAPreferIdle", - "Path": "/proc/vendor_sched/ta_prefer_idle", + "Path": "/proc/vendor_sched/groups/ta/prefer_idle", "Values": [ "1", "0" @@ -420,7 +421,7 @@ }, { "Name": "FGPreferIdle", - "Path": "/proc/vendor_sched/fg_prefer_idle", + "Path": "/proc/vendor_sched/groups/fg/prefer_idle", "Values": [ "1", "0" @@ -430,7 +431,7 @@ }, { "Name": "CDPreferHighCap", - "Path": "/proc/vendor_sched/cam_prefer_high_cap", + "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap", "Values": [ "1", "0" @@ -736,7 +737,7 @@ }, { "Name": "Dex2oatGroup", - "Path": "/proc/vendor_sched/dex2oat_ug", + "Path": "/proc/vendor_sched/groups/dex2oat/ug", "Values": [ "1", "0" @@ -1043,6 +1044,113 @@ "Duration": 3000, "Value": "0" }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "ReducePreferIdle", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE_GPU", + "Node": "GPUDvfsPeriod", + "Duration": 1000, + "Value": "10" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Type": "DoHint", + "Value": "DISPLAY_CHANGE_GPU" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterMaxFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAUClampBoost", + "Duration": 5000, + "Value": "765" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGUClampBoost", + "Duration": 5000, + "Value": "159" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "MemFreq", + "Duration": 5000, + "Value": "9999999" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "DsuMinFreq", + "Duration": 5000, + "Value": "1800000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "BCIMinFreq", + "Duration": 5000, + "Value": "1401000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUDVFSHeadroom", + "Duration": 5000, + "Value": "1280" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUTaperedDVFSHeadroomEnable", + "Duration": 5000, + "Value": "0" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPULittleClusterDownRateLimitUs", + "Duration": 5000, + "Value": "5000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUMidClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "CPUBigClusterDownRateLimitUs", + "Duration": 5000, + "Value": "20000" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "TAPreferIdle", + "Duration": 5000, + "Value": "1" + }, + { + "PowerHint": "DISPLAY_CHANGE", + "Node": "FGPreferIdle", + "Duration": 5000, + "Value": "1" + }, { "PowerHint": "CPU_LOAD_RESET", "Node": "GPUPowerOn", @@ -1792,6 +1900,12 @@ "Duration": 0, "Value": "cam1" }, + { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "CDPreferHighCap", @@ -1936,6 +2050,12 @@ "Duration": 0, "Value": "cam1" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "CDPreferHighCap", @@ -2369,6 +2489,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "GAME", + "Node": "CPUUtilThreshold", + "Duration": 0, + "Value": "1280" + }, { "PowerHint": "GAME", "Node": "VIRTUAL-SKIN-CPU-MID", diff --git a/ripcurrent/BoardConfig.mk b/ripcurrent/BoardConfig.mk index a84d4b0..d25edd1 100644 --- a/ripcurrent/BoardConfig.mk +++ b/ripcurrent/BoardConfig.mk @@ -27,6 +27,14 @@ TARGET_SCREEN_DENSITY := 440 BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_SHUSKY := true +ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q1 +else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif + include device/google/shusky/device-shusky-common.mk include device/google/zuma/BoardConfig-common.mk diff --git a/rro_overlays/WifiOverlay/res/values/config.xml b/rro_overlays/WifiOverlay/res/values/config.xml index 3fdade0..6b5ccd8 100644 --- a/rro_overlays/WifiOverlay/res/values/config.xml +++ b/rro_overlays/WifiOverlay/res/values/config.xml @@ -136,7 +136,7 @@ true - false + true true @@ -171,4 +171,7 @@ true + + + true diff --git a/self-extractors_husky/google_devices/staging/Android.mk b/self-extractors_husky/google_devices/staging/Android.mk index 640e451..a3a6f13 100644 --- a/self-extractors_husky/google_devices/staging/Android.mk +++ b/self-extractors_husky/google_devices/staging/Android.mk @@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE diff --git a/self-extractors_shiba/google_devices/staging/Android.mk b/self-extractors_shiba/google_devices/staging/Android.mk index 27496ec..124f68a 100644 --- a/self-extractors_shiba/google_devices/staging/Android.mk +++ b/self-extractors_shiba/google_devices/staging/Android.mk @@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_CLASS := APPS LOCAL_SRC_FILES := $(LOCAL_MODULE).apk -LOCAL_CERTIFICATE := platform +LOCAL_CERTIFICATE := PRESIGNED LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_CONDITIONS := notice LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE diff --git a/shiba/BoardConfig.mk b/shiba/BoardConfig.mk index 1fe7b27..4ae6c8b 100644 --- a/shiba/BoardConfig.mk +++ b/shiba/BoardConfig.mk @@ -24,7 +24,23 @@ BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1 TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOOTLOADER_BOARD_NAME := shiba -TARGET_SCREEN_DENSITY := 420 + +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%,$(RELEASE_PLATFORM_VERSION))) +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/24Q2 +else +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/trunk +endif + +ifdef PHONE_CAR_BOARD_PRODUCT + include vendor/auto/embedded/products/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk +else + TARGET_SCREEN_DENSITY := 420 +endif + BOARD_USES_GENERIC_AUDIO := true USES_DEVICE_GOOGLE_SHUSKY := true BOARD_KERNEL_CMDLINE += swiotlb=noforce diff --git a/shiba/overlay/frameworks/base/core/res/res/values/config.xml b/shiba/overlay/frameworks/base/core/res/res/values/config.xml index 33399cb..a83fa35 100644 --- a/shiba/overlay/frameworks/base/core/res/res/values/config.xml +++ b/shiba/overlay/frameworks/base/core/res/res/values/config.xml @@ -45,9 +45,6 @@ 0.098176353 - - true - - - true - - + + 10dp + \ No newline at end of file diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_cn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_cn.png index 2ca5fa6..dc9d8b5 100644 Binary files a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_cn.png and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_cn.png differ diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_vn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_vn.png index 1fd1d71..8790e49 100644 Binary files a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_vn.png and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_g9bqd_vn.png differ diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_cn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_cn.png index da0634d..8c5e0c2 100644 Binary files a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_cn.png and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_cn.png differ diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_vn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_vn.png index c0d167d..2e4b5ee 100644 Binary files a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_vn.png and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gkws6_vn.png differ diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_cn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_cn.png index 03a4819..b849bcd 100644 Binary files a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_cn.png and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_cn.png differ diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_vn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_vn.png index 86da4b8..ace3619 100644 Binary files a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_vn.png and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gpj41_vn.png differ diff --git a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gzpf0_cn.png b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gzpf0_cn.png index 59fc3b3..dbd34d0 100644 Binary files a/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gzpf0_cn.png and b/shiba/overlay_packages/SettingsShibaOverlay/res/drawable/regulatory_info_gzpf0_cn.png differ diff --git a/shiba/rro_overlays/NfcOverlay/Android.bp b/shiba/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..065e971 --- /dev/null +++ b/shiba/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_shusky_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayShiba", + sdk_version: "current", + product_specific: true +} diff --git a/shiba/rro_overlays/NfcOverlay/AndroidManifest.xml b/shiba/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/shiba/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/shiba/rro_overlays/NfcOverlay/OWNERS b/shiba/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/shiba/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/shiba/rro_overlays/NfcOverlay/res/values/config.xml b/shiba/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..5bdeca6 --- /dev/null +++ b/shiba/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ + + + + false + true + + GKWS6 + GZPF0 + GPJ41 + + true + + 68 + 146 + false + + 34 + + + 97 + + diff --git a/thermal/Android.bp b/thermal/Android.bp new file mode 100644 index 0000000..fed2086 --- /dev/null +++ b/thermal/Android.bp @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2023 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. + */ + +package { + default_applicable_licenses: ["Android-Apache-2.0"], +} + +cc_library { + name: "thermal-config-cpp", + proto: { + type: "lite", + export_proto_headers: true, + include_dirs: [ + "external/protobuf/src", + "device/google/gs-common/thermal/thermal_hal/thermal_config_schemas" + ], + } +} + +cc_test_host { + name: "shusky-thermal-config-test", + srcs: [ + "thermal_config_test.cpp", + ], + static_libs: [ + "libbase", + "libgmock", + "liblog", + "libjsoncpp", + "libjsonpbverify", + "libjsonpbparse", + "thermal_HAL_info_config_proto", + ], + shared_libs: [ + "libprotobuf-cpp-full", + ], + cflags: [ + "-Wall", + "-Werror", + "-Wno-unused-parameter", + ], + data: [ + "*.json" + ], + test_suites: [ + "general-tests", + ], +} \ No newline at end of file diff --git a/thermal/thermal_config_test.cpp b/thermal/thermal_config_test.cpp new file mode 100644 index 0000000..7b01306 --- /dev/null +++ b/thermal/thermal_config_test.cpp @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2023 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. + */ + +#include +#include +#include + +#include "thermal_info_config_test.h" + +using namespace ::android::jsonpb; +using ::android::base::GetExecutableDirectory; + +namespace devices { +namespace shusky { + +template +JsonSchemaTestConfigFactory MakeTestParam(const std::string &path) { + return android::jsonpb::MakeTestParam(GetExecutableDirectory() + path); +} + +// Make test suite for thermal info config schema. +INSTANTIATE_TEST_SUITE_P( + ThermalSuite, ThermalInfoConfigTest, + ::testing::Values( + MakeTestParam("/thermal_info_config_husky.json"), + MakeTestParam("/thermal_info_config_shiba.json"), + MakeTestParam("/thermal_info_config_charge_husky.json"), + MakeTestParam("/thermal_info_config_charge_shiba.json"), + MakeTestParam("/thermal_info_config_ripcurrent.json"), + MakeTestParam( + "/thermal_info_config_charge_ripcurrent.json"))); + +// Ignores a formatting check (b/c 0.0 != 0 textually) +GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(JsonSchemaTest); + +int main(int argc, char **argv) { + ::testing::InitGoogleTest(&argc, argv); + return RUN_ALL_TESTS(); +} + +} // namespace shusky +} // namespace devices diff --git a/thermal/thermal_info_config_charge_husky.json b/thermal/thermal_info_config_charge_husky.json index 626c2b4..3751093 100644 --- a/thermal/thermal_info_config_charge_husky.json +++ b/thermal/thermal_info_config_charge_husky.json @@ -3,7 +3,7 @@ { "Name":"north_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 32.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, @@ -13,7 +13,7 @@ { "Name":"cam_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 33.7, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", "Multiplier":0.001, @@ -23,7 +23,7 @@ { "Name":"soc_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 47.2, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, @@ -33,7 +33,7 @@ { "Name":"charge_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 48.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", "Multiplier":0.001, @@ -43,7 +43,7 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 31.7, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, @@ -53,13 +53,13 @@ { "Name":"battery", "Type":"BATTERY", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", 60.0], "Multiplier":0.001 }, { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 44.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001, @@ -69,7 +69,7 @@ { "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 34.6, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, @@ -79,7 +79,7 @@ { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, @@ -163,21 +163,21 @@ "Formula":"WEIGHTED_AVG", "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], "Coefficient":[1.0, -1000000], - "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], + "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NaN", "NaN", 119, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 119, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 25, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1302, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2527, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 6219, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 6, "NaN", "NaN", "NaN", "NaN"], "I_Default":1302 }, "ExcludedPowerInfo": [ @@ -206,21 +206,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE"], "Coefficient":[1.0], - "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotThreshold":["NaN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 27, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1383, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2383, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 8022, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"], "I_Default":1383 }, "ExcludedPowerInfo": [ @@ -285,7 +285,7 @@ "TriggerSensor": "usb_pwr_therm", "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"], "Coefficient":[46000, 0, 0, 1], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "4.0", "NaN", "NaN"], "BindedCdevInfo": [ { "CdevRequest": "usbc-port", diff --git a/thermal/thermal_info_config_charge_ripcurrent.json b/thermal/thermal_info_config_charge_ripcurrent.json index 4e7eecb..2e80991 100644 --- a/thermal/thermal_info_config_charge_ripcurrent.json +++ b/thermal/thermal_info_config_charge_ripcurrent.json @@ -4,15 +4,15 @@ "Name":"battery", "Type":"BATTERY", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", "60.0" ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":0.001 } ] diff --git a/thermal/thermal_info_config_charge_shiba.json b/thermal/thermal_info_config_charge_shiba.json index a7d5436..8e3ffbd 100644 --- a/thermal/thermal_info_config_charge_shiba.json +++ b/thermal/thermal_info_config_charge_shiba.json @@ -3,7 +3,7 @@ { "Name":"north_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 38.8, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 38.8, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, @@ -13,7 +13,7 @@ { "Name":"cam_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 31.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 31.0, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", "Multiplier":0.001, @@ -23,7 +23,7 @@ { "Name":"soc_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 41.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 41.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, @@ -33,7 +33,7 @@ { "Name":"charge_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 42.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 42.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", "Multiplier":0.001, @@ -43,7 +43,7 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 31.2, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 31.2, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, @@ -53,13 +53,13 @@ { "Name":"battery", "Type":"BATTERY", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", 60.0], "Multiplier":0.001 }, { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 41.5, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 41.5, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001, @@ -69,7 +69,7 @@ { "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 35.1, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 35.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, @@ -79,7 +79,7 @@ { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, @@ -196,21 +196,21 @@ "Formula":"WEIGHTED_AVG", "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], "Coefficient":[1.0, -1000000], - "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], + "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NaN", "NaN", 101, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 101, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 21, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1099, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2404, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 5519, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 6, "NaN", "NaN", "NaN", "NaN"], "I_Default":1099 }, "ExcludedPowerInfo": [ @@ -239,21 +239,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE"], "Coefficient":[1.0], - "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotThreshold":["NaN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1066, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2066, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6412, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NaN", "NaN", 164, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 164, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 21, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1066, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2066, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 6412, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"], "I_Default":1066 }, "ExcludedPowerInfo": [ @@ -318,7 +318,7 @@ "TriggerSensor": "usb_pwr_therm", "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"], "Coefficient":[46000, 0, 0, 1], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "4.0", "NaN", "NaN"], "BindedCdevInfo": [ { "CdevRequest": "usbc-port", diff --git a/thermal/thermal_info_config_husky.json b/thermal/thermal_info_config_husky.json index 970b6d0..9e659ee 100644 --- a/thermal/thermal_info_config_husky.json +++ b/thermal/thermal_info_config_husky.json @@ -3,7 +3,7 @@ { "Name":"north_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 32.1, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 32.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, @@ -13,7 +13,7 @@ { "Name":"cam_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 33.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 33.7, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", "Multiplier":0.001, @@ -23,7 +23,7 @@ { "Name":"soc_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 47.2, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 47.2, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, @@ -33,7 +33,7 @@ { "Name":"charge_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 48.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 48.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", "Multiplier":0.001, @@ -43,7 +43,7 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 31.7, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 31.7, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, @@ -53,13 +53,13 @@ { "Name":"battery", "Type":"BATTERY", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", 60.0], "Multiplier":0.001 }, { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 44.1, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 44.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001, @@ -69,7 +69,7 @@ { "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 34.6, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 34.6, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, @@ -79,7 +79,7 @@ { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, @@ -97,7 +97,7 @@ "TriggerSensor": "vdroop1", "Combination":["battery", "battery_cycle", "vdroop1"], "Coefficient":[-10000, 400, 1000], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", 3.00, "NaN"], "Multiplier":1, "PollingDelay":0, "PassiveDelay":1000, @@ -111,7 +111,7 @@ "TriggerSensor": "vdroop1", "Combination":["battery", "battery_cycle", "vdroop1"], "Coefficient":[-10000, 400, 1000], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", 3.00, "NaN", "NaN"], "Multiplier":1, "PollingDelay":0, "PassiveDelay":1000, @@ -121,13 +121,13 @@ { "Name":"soc", "Type":"BCL_PERCENTAGE", - "HotThreshold":["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", 80, "NaN", "NaN", "NaN", "NaN"], "Multiplier":1 }, { "Name":"batoilo", "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", 5000, "NaN", "NaN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "SendCallback":true, @@ -142,16 +142,16 @@ "TriggerSensor": "soc", "Combination":["battery", "soc"], "Coefficient":[-25000, 80], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", 2.0, "NaN", "NaN"], "PollingDelay":0, - "PassiveDelay":1000, + "PassiveDelay":600000, "Multiplier":1, "SendCallback":true }, { "Name":"vdroop1", "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", 1000, "NaN", "NaN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "SendCallback":true, @@ -161,7 +161,7 @@ { "Name":"vdroop2", "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", 1200, "NaN", "NaN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "SendCallback":true, @@ -171,7 +171,7 @@ { "Name":"smpl_gm", "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", 1100, "NaN", "NaN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "SendCallback":true, @@ -320,7 +320,7 @@ "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5", "VIRTUAL-SKIN-SUB-6", "VIRTUAL-SKIN-SUB-7", "VIRTUAL-SKIN-SUB-8", "VIRTUAL-SKIN-SUB-9", "VIRTUAL-SKIN-SUB-10"], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], - "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotThreshold":["NaN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "SendCallback":true, @@ -346,7 +346,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotThreshold":["NaN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "SendPowerHint":true, @@ -362,21 +362,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 37.0, 39.0, "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 37.0, 39.0, "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 2200, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 4600, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] + "K_Po":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 2200, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 800, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 800, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 4600, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"] }, "BindedCdevInfo": [ { @@ -414,21 +414,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 39.0, 41.0, "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 39.0, 41.0, "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 2800, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] + "K_Po":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1500, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 700, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 2800, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"] }, "BindedCdevInfo": [ { @@ -460,16 +460,19 @@ { "CdevRequest": "thermal-cpufreq-0", "MaxReleaseStep": 1, + "CdevCeiling": [0, 6, 6, 6, 6, 6, 6], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-1", "MaxReleaseStep": 1, + "CdevCeiling": [0, 9, 9, 9, 9, 9, 9], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-2", "MaxReleaseStep": 1, + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12], "Disabled":true } ] @@ -480,16 +483,19 @@ { "CdevRequest": "thermal-cpufreq-0", "MaxReleaseStep": 1, + "CdevCeiling": [0, 6, 6, 6, 6, 6, 6], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-1", "MaxReleaseStep": 1, + "CdevCeiling": [0, 9, 9, 9, 9, 9, 9], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-2", "MaxReleaseStep": 1, + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12], "Disabled":true } ] @@ -505,21 +511,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 41.0, 43.0, 52.0, "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 1600, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] + "K_Po":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1000, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 600, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 1600, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"] }, "BindedCdevInfo": [ { @@ -551,16 +557,19 @@ { "CdevRequest": "thermal-cpufreq-0", "MaxReleaseStep": 1, + "CdevCeiling": [0, 8, 8, 8, 8, 8, 8], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-1", "MaxReleaseStep": 1, + "CdevCeiling": [0, 11, 11, 11, 11, 11, 11], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-2", "MaxReleaseStep": 1, + "CdevCeiling": [0, 13, 13, 13, 13, 13, 13], "Disabled":true } ] @@ -602,21 +611,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotThreshold":["NaN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], - "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"], - "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"] + "K_Po":["NaN", "NaN", "NaN", 300, "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", "NaN", 300, "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", "NaN", 5, "NaN", "NaN", "NaN"], + "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"], + "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"] }, "BindedCdevInfo": [ { @@ -666,21 +675,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 43.0, 45.0, 46.5, 52.0, "NAN", "NAN"], + "HotThreshold":["NaN", 43.0, 45.0, 46.5, 52.0, "NaN", "NaN"], "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1723, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 473, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 2500, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] + "K_Po":["NaN", "NaN", 700, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 700, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1723, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 473, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 2500, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"] }, "BindedCdevInfo": [ { @@ -698,7 +707,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", 54.0, "NaN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, "SendCallback":true, @@ -747,10 +756,12 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1", "VIRTUAL-SKIN-SPEAKER-SUB-2"], "Coefficient":[1, 1, 1], - "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 37.0, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, - "SendCallback":true + "SendCallback":true, + "PollingDelay":60000, + "PassiveDelay":7000 }, { "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", @@ -830,21 +841,21 @@ "Formula":"WEIGHTED_AVG", "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], "Coefficient":[1.0, -1000000], - "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], + "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 25, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NaN", "NaN", 119, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 119, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 25, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1302, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2527, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 6219, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 6, "NaN", "NaN", "NaN", "NaN"], "I_Default":1302 }, "ExcludedPowerInfo": [ @@ -873,21 +884,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE"], "Coefficient":[1.0], - "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotThreshold":["NaN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 27, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 27, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1383, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2383, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 8022, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"], "I_Default":1383 }, "ExcludedPowerInfo": [ @@ -996,7 +1007,7 @@ "TriggerSensor": "usb_pwr_therm", "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"], "Coefficient":[46000, 0, 0, 1], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "4.0", "NaN", "NaN"], "BindedCdevInfo": [ { "CdevRequest": "usbc-port", @@ -1024,7 +1035,7 @@ "TriggerSensor": "usb_pwr_therm", "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-UI-SUB0"], "Coefficient":[48000, 0, 0, 1], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "4.0", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "4.0", "NaN"], "Multiplier":1, "PollingDelay":300000, "PassiveDelay":7000, @@ -1033,31 +1044,31 @@ { "Name":"LITTLE", "Type":"CPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"], "Multiplier":0.001 }, { "Name":"MID", "Type":"CPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"], "Multiplier":0.001 }, { "Name":"BIG", "Type":"CPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"], "Multiplier":0.001 }, { "Name":"G3D", "Type":"GPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"], "Multiplier":0.001 }, { "Name":"TPU", "Type":"NPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"], "Multiplier":0.001 } ], @@ -1185,6 +1196,18 @@ "Name": "VIRTUAL-SKIN-SUB-7", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] }, + { + "Name": "VIRTUAL-SKIN-SUB-8", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-9", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, + { + "Name": "VIRTUAL-SKIN-SUB-10", + "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] + }, { "Name": "VIRTUAL-SKIN-CHARGE", "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] @@ -1193,7 +1216,62 @@ "Name": "VIRTUAL-USB-THROTTLING", "Thresholds": [3.0] } - ] + ], + "Abnormality": { + "Outlier": { + "Configs": [ + { + "Monitor": [ + "VIRTUAL-SKIN", + "VIRTUAL-SKIN-SUB-0", + "VIRTUAL-SKIN-SUB-1", + "VIRTUAL-SKIN-SUB-2", + "VIRTUAL-SKIN-SUB-3", + "VIRTUAL-SKIN-SUB-4", + "VIRTUAL-SKIN-SUB-5", + "VIRTUAL-SKIN-SUB-6", + "VIRTUAL-SKIN-SUB-7", + "VIRTUAL-SKIN-SUB-8", + "VIRTUAL-SKIN-SUB-9", + "VIRTUAL-SKIN-SUB-10" + ], + "TempRange": [0.0, 55.0] + } + ] + }, + "Stuck": { + "Configs": [ + { + "Monitor": [ + "VIRTUAL-SKIN", + "VIRTUAL-SKIN-SUB-0", + "VIRTUAL-SKIN-SUB-1", + "VIRTUAL-SKIN-SUB-2", + "VIRTUAL-SKIN-SUB-3", + "VIRTUAL-SKIN-SUB-4", + "VIRTUAL-SKIN-SUB-5", + "VIRTUAL-SKIN-SUB-6", + "VIRTUAL-SKIN-SUB-7", + "VIRTUAL-SKIN-SUB-8", + "VIRTUAL-SKIN-SUB-9", + "VIRTUAL-SKIN-SUB-10", + "VIRTUAL-SKIN-SPEAKER", + "VIRTUAL-SKIN-SPEAKER-SUB-0", + "VIRTUAL-SKIN-SPEAKER-SUB-1", + "VIRTUAL-SKIN-SPEAKER-SUB-2", + "VIRTUAL-SKIN-FRONT", + "VIRTUAL-SKIN-FRONT-SUB-0", + "VIRTUAL-SKIN-FRONT-SUB-1", + "VIRTUAL-SKIN-FRONT-SUB-2" + ], + "TempStuck": { + "MinPollingCount": 8, + "MinStuckDuration": 120000 + } + } + ] + } + } }, "CoolingDevices": { "RecordVotePerSensor": { diff --git a/thermal/thermal_info_config_ripcurrent.json b/thermal/thermal_info_config_ripcurrent.json index 009b1b5..266965d 100644 --- a/thermal/thermal_info_config_ripcurrent.json +++ b/thermal/thermal_info_config_ripcurrent.json @@ -4,75 +4,75 @@ "Name":"battery", "Type":"BATTERY", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", "60.0" ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":0.001 }, { "Name":"LITTLE", "Type":"CPU", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", 115.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":0.001 }, { "Name":"MID", "Type":"CPU", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", 115.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":0.001 }, { "Name":"G3D", "Type":"GPU", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", 115.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":0.001 }, { "Name":"battery_cycle", "Type":"BCL_VOLTAGE", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN" ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1, "Monitor":false }, @@ -93,15 +93,15 @@ "1000" ], "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", 3.00, - "NAN" + "NaN" ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1, "Monitor":true }, @@ -122,15 +122,15 @@ "1000" ], "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", 3.00, - "NAN", - "NAN" + "NaN", + "NaN" ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1, "Monitor":true, "SendPowerHint":true @@ -139,28 +139,28 @@ "Name":"soc", "Type":"BCL_PERCENTAGE", "HotThreshold":[ - "NAN", + "NaN", 80, - "NAN", - "NAN", - "NAN", - "NAN", - "NAN" + "NaN", + "NaN", + "NaN", + "NaN", + "NaN" ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1 }, { "Name":"batoilo", "Type":"BCL_CURRENT", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", 5000, - "NAN", - "NAN" + "NaN", + "NaN" ], "HotHysteresis":[ 0.0, @@ -171,7 +171,7 @@ 0.0, 0.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1, "Monitor":true, "PollingDelay":0, @@ -202,15 +202,15 @@ "80" ], "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", 2.0, - "NAN", - "NAN" + "NaN", + "NaN" ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1, "Monitor":true }, @@ -218,13 +218,13 @@ "Name":"vdroop1", "Type":"BCL_VOLTAGE", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", 1000, - "NAN", - "NAN" + "NaN", + "NaN" ], "HotHysteresis":[ 0.0, @@ -235,7 +235,7 @@ 0.0, 0.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1, "Monitor":true, "PollingDelay":0, @@ -255,13 +255,13 @@ "Name":"vdroop2", "Type":"BCL_VOLTAGE", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", 1200, - "NAN", - "NAN" + "NaN", + "NaN" ], "HotHysteresis":[ 0.0, @@ -272,7 +272,7 @@ 0.0, 0.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1, "Monitor":true, "PollingDelay":0, @@ -292,13 +292,13 @@ "Name":"smpl_gm", "Type":"BCL_VOLTAGE", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", 1100, - "NAN", - "NAN" + "NaN", + "NaN" ], "HotHysteresis":[ 0.0, @@ -309,7 +309,7 @@ 0.0, 0.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1, "Monitor":true, "PollingDelay":0, @@ -329,13 +329,13 @@ "Name":"ocp_cpu2", "Type":"BCL_CURRENT", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", 12000, - "NAN", - "NAN" + "NaN", + "NaN" ], "HotHysteresis":[ 0.0, @@ -346,20 +346,20 @@ 0.0, 0.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1 }, { "Name":"ocp_tpu", "Type":"BCL_CURRENT", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", 10500, - "NAN", - "NAN" + "NaN", + "NaN" ], "HotHysteresis":[ 0.0, @@ -370,20 +370,20 @@ 0.0, 0.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1 }, { "Name":"ocp_gpu", "Type":"BCL_CURRENT", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", 12000, - "NAN", - "NAN" + "NaN", + "NaN" ], "HotHysteresis":[ 0.0, @@ -394,20 +394,20 @@ 0.0, 0.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1 }, { "Name":"soft_ocp_cpu2", "Type":"BCL_CURRENT", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", 9000, - "NAN", - "NAN" + "NaN", + "NaN" ], "HotHysteresis":[ 0.0, @@ -418,20 +418,20 @@ 0.0, 0.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1 }, { "Name":"soft_ocp_tpu", "Type":"BCL_CURRENT", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", 8500, - "NAN", - "NAN" + "NaN", + "NaN" ], "HotHysteresis":[ 0.0, @@ -442,20 +442,20 @@ 0.0, 0.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1 }, { "Name":"soft_ocp_gpu", "Type":"BCL_CURRENT", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", 9000, - "NAN", - "NAN" + "NaN", + "NaN" ], "HotHysteresis":[ 0.0, @@ -466,22 +466,22 @@ 0.0, 0.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":1 }, { "Name":"TPU", "Type":"NPU", "HotThreshold":[ - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", - "NAN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", + "NaN", 115.0 ], - "VrThreshold":"NAN", + "VrThreshold":"NaN", "Multiplier":0.001 } ], diff --git a/thermal/thermal_info_config_shiba.json b/thermal/thermal_info_config_shiba.json index 87adbb9..988dac3 100644 --- a/thermal/thermal_info_config_shiba.json +++ b/thermal/thermal_info_config_shiba.json @@ -3,7 +3,7 @@ { "Name":"north_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 38.8, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 38.8, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp", "Multiplier":0.001, @@ -13,7 +13,7 @@ { "Name":"cam_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 31.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 31.0, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp", "Multiplier":0.001, @@ -23,7 +23,7 @@ { "Name":"soc_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 41.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 41.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp", "Multiplier":0.001, @@ -33,7 +33,7 @@ { "Name":"charge_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 42.4, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 42.4, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp", "Multiplier":0.001, @@ -43,7 +43,7 @@ { "Name":"disp_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 31.2, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 31.2, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp", "Multiplier":0.001, @@ -53,13 +53,13 @@ { "Name":"battery", "Type":"BATTERY", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", 60.0], "Multiplier":0.001 }, { "Name":"neutral_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 41.5, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 41.5, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp", "Multiplier":0.001, @@ -69,7 +69,7 @@ { "Name":"quiet_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 35.1, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 35.1, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0], "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp", "Multiplier":0.001, @@ -79,7 +79,7 @@ { "Name":"usb_pwr_therm", "Type":"UNKNOWN", - "HotThreshold":["NAN", 35.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 35.0, "NaN", "NaN", "NaN", "NaN", "NaN"], "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp", "Multiplier":0.001, "PollingDelay":60000, @@ -97,7 +97,7 @@ "TriggerSensor": "vdroop1", "Combination":["battery", "battery_cycle", "vdroop1"], "Coefficient":[-10000, 400, 1000], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", 3.00, "NaN"], "Multiplier":1, "PollingDelay":0, "PassiveDelay":1000, @@ -111,7 +111,7 @@ "TriggerSensor": "vdroop1", "Combination":["battery", "battery_cycle", "vdroop1"], "Coefficient":[-10000, 400, 1000], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", 3.00, "NaN", "NaN"], "Multiplier":1, "PollingDelay":0, "PassiveDelay":1000, @@ -121,13 +121,13 @@ { "Name":"soc", "Type":"BCL_PERCENTAGE", - "HotThreshold":["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", 80, "NaN", "NaN", "NaN", "NaN"], "Multiplier":1 }, { "Name":"batoilo", "Type":"BCL_CURRENT", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", 5000, "NaN", "NaN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "SendCallback":true, @@ -142,16 +142,16 @@ "TriggerSensor": "soc", "Combination":["battery", "soc"], "Coefficient":[-25000, 80], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", 2.0, "NaN", "NaN"], "PollingDelay":0, - "PassiveDelay":1000, + "PassiveDelay":600000, "Multiplier":1, "SendCallback":true }, { "Name":"vdroop1", "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", 1000, "NaN", "NaN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "SendCallback":true, @@ -161,7 +161,7 @@ { "Name":"vdroop2", "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", 1200, "NaN", "NaN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "SendCallback":true, @@ -171,7 +171,7 @@ { "Name":"smpl_gm", "Type":"BCL_VOLTAGE", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", 1100, "NaN", "NaN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0], "Multiplier":1, "SendCallback":true, @@ -288,7 +288,7 @@ "VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5", "VIRTUAL-SKIN-SUB-6", "VIRTUAL-SKIN-SUB-7", "VIRTUAL-SKIN-SUB-8"], "Coefficient":[1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0], - "HotThreshold":["NAN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotThreshold":["NaN", 39.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "SendCallback":true, @@ -314,7 +314,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotThreshold":["NaN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "SendPowerHint":true, @@ -330,21 +330,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 37.0, 39.0, "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 37.0, 39.0, "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 2200, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 4600, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] + "K_Po":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 2200, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 800, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 800, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 4600, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"] }, "BindedCdevInfo": [ { @@ -382,21 +382,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 39.0, 41.0, "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 39.0, 41.0, "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 2800, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] + "K_Po":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1500, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 700, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 2800, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"] }, "BindedCdevInfo": [ { @@ -428,16 +428,19 @@ { "CdevRequest": "thermal-cpufreq-0", "MaxReleaseStep": 1, + "CdevCeiling": [0, 6, 6, 6, 6, 6, 6], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-1", "MaxReleaseStep": 1, + "CdevCeiling": [0, 9, 9, 9, 9, 9, 9], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-2", "MaxReleaseStep": 1, + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12], "Disabled":true } ] @@ -448,16 +451,19 @@ { "CdevRequest": "thermal-cpufreq-0", "MaxReleaseStep": 1, + "CdevCeiling": [0, 6, 6, 6, 6, 6, 6], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-1", "MaxReleaseStep": 1, + "CdevCeiling": [0, 9, 9, 9, 9, 9, 9], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-2", "MaxReleaseStep": 1, + "CdevCeiling": [0, 12, 12, 12, 12, 12, 12], "Disabled":true } ] @@ -473,21 +479,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 41.0, 43.0, 52.0, "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 41.0, 43.0, 52.0, "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 1600, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] + "K_Po":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1000, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 600, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 1600, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"] }, "BindedCdevInfo": [ { @@ -519,16 +525,19 @@ { "CdevRequest": "thermal-cpufreq-0", "MaxReleaseStep": 1, + "CdevCeiling": [0, 8, 8, 8, 8, 8, 8], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-1", "MaxReleaseStep": 1, + "CdevCeiling": [0, 11, 11, 11, 11, 11, 11], "Disabled":true }, { "CdevRequest": "thermal-cpufreq-2", "MaxReleaseStep": 1, + "CdevCeiling": [0, 13, 13, 13, 13, 13, 13], "Disabled":true } ] @@ -570,21 +579,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], + "HotThreshold":["NaN", 37.0, 43.0, 45.0, 46.5, 52.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", "NAN", 5, "NAN", "NAN", "NAN"], - "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"], - "MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"] + "K_Po":["NaN", "NaN", "NaN", 300, "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", "NaN", 300, "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", "NaN", 5, "NaN", "NaN", "NaN"], + "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"], + "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"] }, "BindedCdevInfo": [ { @@ -634,21 +643,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", 43.0, 45.0, 46.5, 52.0, "NAN", "NAN"], + "HotThreshold":["NaN", 43.0, 45.0, 46.5, 52.0, "NaN", "NaN"], "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0], "Multiplier":0.001, "PollingDelay":300000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 5, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1723, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 473, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 2500, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] + "K_Po":["NaN", "NaN", 700, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 700, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1723, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 473, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 2500, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"] }, "BindedCdevInfo": [ { @@ -666,7 +675,7 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN"], "Coefficient":[1.0], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 54.0, "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", 54.0, "NaN"], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0], "Multiplier":0.001, "SendCallback":true, @@ -726,10 +735,12 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1", "VIRTUAL-SKIN-SPEAKER-SUB-2", "VIRTUAL-SKIN-SPEAKER-SUB-3"], "Coefficient":[1, 1, 1, 1], - "HotThreshold":["NAN", 37.0, "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", 37.0, "NaN", "NaN", "NaN", "NaN", "NaN"], "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0], "Multiplier":0.001, - "SendCallback":true + "SendCallback":true, + "PollingDelay":60000, + "PassiveDelay":7000 }, { "Name":"VIRTUAL-SKIN-CHARGE-SUB-0", @@ -842,21 +853,21 @@ "Formula":"WEIGHTED_AVG", "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], "Coefficient":[1.0, -1000000], - "HotThreshold":["NAN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], + "HotThreshold":["NaN", 34.0, 38.0, 41.0, 45.0, 47.0, 55.0], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NaN", "NaN", 101, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 101, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 21, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1099, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2404, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 5519, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 6, "NaN", "NaN", "NaN", "NaN"], "I_Default":1099 }, "ExcludedPowerInfo": [ @@ -885,21 +896,21 @@ "Formula":"MAXIMUM", "Combination":["VIRTUAL-SKIN-CHARGE"], "Coefficient":[1.0], - "HotThreshold":["NAN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], + "HotThreshold":["NaN", 35.0, 41.0, 45.0, 47.0, 51.0, 55.0], "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9], "Multiplier":0.001, "PollingDelay":60000, "PassiveDelay":7000, "PIDInfo": { - "K_Po":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], - "K_Pu":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], - "K_I":["NAN", "NAN", 21, "NAN", "NAN", "NAN", "NAN"], - "K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "I_Max":["NAN", "NAN", 1066, "NAN", "NAN", "NAN", "NAN"], - "S_Power":["NAN", "NAN", 2066, "NAN", "NAN", "NAN", "NAN"], - "MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], - "MaxAllocPower":["NAN", "NAN", 6412, "NAN", "NAN", "NAN", "NAN"], - "I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], + "K_Po":["NaN", "NaN", 164, "NaN", "NaN", "NaN", "NaN"], + "K_Pu":["NaN", "NaN", 164, "NaN", "NaN", "NaN", "NaN"], + "K_I":["NaN", "NaN", 21, "NaN", "NaN", "NaN", "NaN"], + "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "I_Max":["NaN", "NaN", 1066, "NaN", "NaN", "NaN", "NaN"], + "S_Power":["NaN", "NaN", 2066, "NaN", "NaN", "NaN", "NaN"], + "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"], + "MaxAllocPower":["NaN", "NaN", 6412, "NaN", "NaN", "NaN", "NaN"], + "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"], "I_Default":1066 }, "ExcludedPowerInfo": [ @@ -1029,7 +1040,7 @@ "TriggerSensor": "usb_pwr_therm", "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"], "Coefficient":[46000, 0, 0, 1], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "4.0", "NaN", "NaN"], "BindedCdevInfo": [ { "CdevRequest": "usbc-port", @@ -1057,7 +1068,7 @@ "TriggerSensor": "usb_pwr_therm", "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-UI-SUB0"], "Coefficient":[48000, 0, 0, 1], - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "4.0", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "4.0", "NaN"], "Multiplier":1, "PollingDelay":300000, "PassiveDelay":7000, @@ -1066,31 +1077,31 @@ { "Name":"LITTLE", "Type":"CPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"], "Multiplier":0.001 }, { "Name":"MID", "Type":"CPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"], "Multiplier":0.001 }, { "Name":"BIG", "Type":"CPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"], "Multiplier":0.001 }, { "Name":"G3D", "Type":"GPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"], "Multiplier":0.001 }, { "Name":"TPU", "Type":"NPU", - "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], + "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"], "Multiplier":0.001 } ], @@ -1226,7 +1237,61 @@ "Name": "VIRTUAL-USB-THROTTLING", "Thresholds": [3.0] } - ] + ], + "Abnormality": { + "Outlier": { + "Configs": [ + { + "Monitor": [ + "VIRTUAL-SKIN", + "VIRTUAL-SKIN-SUB-0", + "VIRTUAL-SKIN-SUB-1", + "VIRTUAL-SKIN-SUB-2", + "VIRTUAL-SKIN-SUB-3", + "VIRTUAL-SKIN-SUB-4", + "VIRTUAL-SKIN-SUB-5", + "VIRTUAL-SKIN-SUB-6", + "VIRTUAL-SKIN-SUB-7", + "VIRTUAL-SKIN-SUB-8" + ], + "TempRange": [0.0, 55.0] + } + ] + }, + "Stuck": { + "Configs": [ + { + "Monitor": [ + "VIRTUAL-SKIN", + "VIRTUAL-SKIN-SUB-0", + "VIRTUAL-SKIN-SUB-1", + "VIRTUAL-SKIN-SUB-2", + "VIRTUAL-SKIN-SUB-3", + "VIRTUAL-SKIN-SUB-4", + "VIRTUAL-SKIN-SUB-5", + "VIRTUAL-SKIN-SUB-6", + "VIRTUAL-SKIN-SUB-7", + "VIRTUAL-SKIN-SUB-8", + "VIRTUAL-SKIN-SPEAKER", + "VIRTUAL-SKIN-SPEAKER-SUB-0", + "VIRTUAL-SKIN-SPEAKER-SUB-1", + "VIRTUAL-SKIN-SPEAKER-SUB-2", + "VIRTUAL-SKIN-SPEAKER-SUB-3", + "VIRTUAL-SKIN-FRONT", + "VIRTUAL-SKIN-FRONT-SUB-0", + "VIRTUAL-SKIN-FRONT-SUB-1", + "VIRTUAL-SKIN-FRONT-SUB-2", + "VIRTUAL-SKIN-FRONT-SUB-3", + "VIRTUAL-SKIN-FRONT-SUB-4" + ], + "TempStuck": { + "MinPollingCount": 8, + "MinStuckDuration": 120000 + } + } + ] + } + } }, "CoolingDevices": { "RecordVotePerSensor": { diff --git a/thermal/thermal_info_config_test.h b/thermal/thermal_info_config_test.h new file mode 100644 index 0000000..1864420 --- /dev/null +++ b/thermal/thermal_info_config_test.h @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2023 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. + */ + +#pragma once + +#include + +#include +#include + +#include "thermal_info_config.pb.h" + +namespace devices { +namespace shusky { + +// JSON schema test wrapper. +class ThermalInfoConfigTest : public android::jsonpb::JsonSchemaTest { +public: + void SetUp() override { + JsonSchemaTest::SetUp(); + thermalInfoConfig_ = static_cast(message()); + } + ThermalConfig *thermalInfoConfig_ = nullptr; +}; + +// Individual test checking for sensor name and type as required fields. +TEST_P(ThermalInfoConfigTest, ThermalConfigRequiredFields) { + std::string error; + + // Checks that no unknown fields are introduced. + EXPECT_TRUE(android::jsonpb::AllFieldsAreKnown(*object_, json_, &error)) + << "File: " << file_path_ << ": " << error; + + // Check all Sensors have a Name and Type. + for (int i = 0; i < thermalInfoConfig_->sensors_size(); ++i) { + auto &&sensor = thermalInfoConfig_->sensors(i); + EXPECT_FALSE(sensor.name().empty()) + << "No name for sensor #" << i << " in " << file_path_; + EXPECT_FALSE(sensor.type().empty()) + << "No type for sensor " << sensor.name() << " in " << file_path_; + } +}; + +} // namespace shusky +} // namespace devices \ No newline at end of file diff --git a/uwb/Android.bp b/uwb/Android.bp new file mode 100644 index 0000000..617b368 --- /dev/null +++ b/uwb/Android.bp @@ -0,0 +1,70 @@ +// +// Copyright (C) 2021 The Android Open-Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +soong_namespace {} + +prebuilt_defaults { + name: "conf_defaults", + vendor: true, + sub_dir: "uwb", +} + +prebuilt_etc { + name: "configuration.conf", + src: "configuration.conf", + defaults: ["conf_defaults"], +} + +prebuilt_etc { + name: "calibration.conf", + src: "calibration.conf", + defaults: ["conf_defaults"], +} + +prebuilt_etc { + name: "calibration-default.conf", + src: "calibration-default.conf", + defaults: ["conf_defaults"], +} + +prebuilt_etc { + name: "calibration-CE.conf", + src: "calibration-CE.conf", + defaults: ["conf_defaults"], +} + +prebuilt_etc { + name: "calibration-FCC.conf", + src: "calibration-FCC.conf", + defaults: ["conf_defaults"], +} + +prebuilt_etc { + name: "calibration-JP.conf", + src: "calibration-JP.conf", + defaults: ["conf_defaults"], +} + +prebuilt_etc { + name: "calibration-TW.conf", + src: "calibration-TW.conf", + defaults: ["conf_defaults"], +} + +prebuilt_etc { + name: "calibration-RESTRICTED.conf", + src: "calibration-RESTRICTED.conf", + defaults: ["conf_defaults"], +} diff --git a/uwb/UWB-calibration.conf b/uwb/UWB-calibration.conf deleted file mode 100644 index 52a528d..0000000 --- a/uwb/UWB-calibration.conf +++ /dev/null @@ -1,142 +0,0 @@ -[CCC]version=2 -[CCC]ant0.ch5.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch5.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf2_rf1=0 -[CCC]ant0.ch9.prf64.pdoa_iso_rf1_rf2=0 -[CCC]ant0.ch5.prf64.pdoa_offset=0 -[CCC]ant0.ch9.prf64.pdoa_offset=0 -[CCC]ant0.ch5.prf64.pll_locking_code=0 -[CCC]ant0.ch9.prf64.pll_locking_code=0 -[CCC]id=0 -[CCC]wifi_coex_time_gap=10 -[CCC]ap_coop_mode=1 -[CCC]antenna_selection=4 -ant0.ch5.prf16.ant_delay=16450 -ant0.ch5.prf16.tx_power=0 -ant0.ch5.prf16.pg_count=0 -ant0.ch5.prf16.pg_delay=0 -ant0.ch5.prf64.ant_delay=16450 -ant0.ch5.prf64.tx_power=0 -ant0.ch5.prf64.pg_count=0 -ant0.ch5.prf64.pg_delay=0 -ant0.ch9.prf16.ant_delay=16450 -ant0.ch9.prf16.tx_power=0 -ant0.ch9.prf16.pg_count=0 -ant0.ch9.prf16.pg_delay=0 -ant0.ch9.prf64.ant_delay=16450 -ant0.ch9.prf64.tx_power=0 -ant0.ch9.prf64.pg_count=0 -ant0.ch9.prf64.pg_delay=0 -ant0.port=0 -ant0.selector_gpio=7 -ant0.selector_gpio_value=0 -ant1.ch5.prf16.ant_delay=16450 -ant1.ch5.prf16.tx_power=0 -ant1.ch5.prf16.pg_count=0 -ant1.ch5.prf16.pg_delay=0 -ant1.ch5.prf64.ant_delay=16450 -ant1.ch5.prf64.tx_power=0 -ant1.ch5.prf64.pg_count=0 -ant1.ch5.prf64.pg_delay=0 -ant1.ch9.prf16.ant_delay=16450 -ant1.ch9.prf16.tx_power=0 -ant1.ch9.prf16.pg_count=0 -ant1.ch9.prf16.pg_delay=0 -ant1.ch9.prf64.ant_delay=16450 -ant1.ch9.prf64.tx_power=0 -ant1.ch9.prf64.pg_count=0 -ant1.ch9.prf64.pg_delay=0 -ant1.port=0 -ant1.selector_gpio=7 -ant1.selector_gpio_value=1 -ant2.ch5.prf16.ant_delay=16450 -ant2.ch5.prf16.tx_power=0 -ant2.ch5.prf16.pg_count=0 -ant2.ch5.prf16.pg_delay=0 -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=16450 -ant2.ch9.prf16.tx_power=0 -ant2.ch9.prf16.pg_count=0 -ant2.ch9.prf16.pg_delay=0 -ant2.ch9.prf64.ant_delay=16450 -ant2.ch9.prf64.tx_power=0 -ant2.ch9.prf64.pg_count=0 -ant2.ch9.prf64.pg_delay=0 -ant2.port=1 -ant2.selector_gpio=6 -ant2.selector_gpio_value=0 -ant3.ch5.prf16.ant_delay=16450 -ant3.ch5.prf16.tx_power=0 -ant3.ch5.prf16.pg_count=0 -ant3.ch5.prf16.pg_delay=0 -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.tx_power=0 -ant3.ch9.prf16.pg_count=0 -ant3.ch9.prf16.pg_delay=0 -ant3.ch9.prf64.ant_delay=16450 -ant3.ch9.prf64.tx_power=0 -ant3.ch9.prf64.pg_count=0 -ant3.ch9.prf64.pg_delay=0 -ant3.port=1 -ant3.selector_gpio=6 -ant3.selector_gpio_value=1 -ant0.ant1.ch5.pdoa_offset=0 -ant0.ant1.ch9.pdoa_offset=0 -ant0.ant2.ch5.pdoa_offset=0 -ant0.ant2.ch9.pdoa_offset=0 -ant1.ant2.ch5.pdoa_offset=2173 -ant1.ant2.ch9.pdoa_offset=3555 -ant0.ant3.ch5.pdoa_offset=0 -ant0.ant3.ch9.pdoa_offset=0 -ant1.ant3.ch5.pdoa_offset=3845 -ant1.ant3.ch9.pdoa_offset=647 -ant2.ant3.ch5.pdoa_offset=0 -ant2.ant3.ch9.pdoa_offset=0 -ch5.pll_locking_code=0 -ch9.pll_locking_code=0 -ant1.ant2.ch5.pdoa_lut=3d:ea:7b:0a:66:ea:c3:09:a4:ea:0a:09:cd:ea:66:08:0a:eb:ae:07:33:eb:f6:06:48:eb:52:06:71:eb:9a:05:c3:eb:e1:04:e1:ec:29:04:c3:ef:85:03:a4:f4:cd:02:14:f8:14:02:b8:fa:5c:01:8f:fc:b8:00:e1:fe:00:00:48:01:48:ff:85:03:a4:fe:ae:05:ec:fd:00:08:33:fd:d7:09:7b:fc:85:0b:d7:fb:0a:0d:1f:fb:66:0e:66:fa:33:0f:ae:f9:00:10:0a:f9:a4:10:52:f8:1f:11:9a:f7:5c:11:f6:f6:9a:11:3d:f6:ae:11:85:f5 -ant1.ant2.ch9.pdoa_lut=c3:ed:7b:0a:29:ee:c3:09:3d:ee:0a:09:cd:ee:66:08:c3:ef:ae:07:f6:f0:f6:06:3d:f2:52:06:52:f2:9a:05:cd:f2:e1:04:5c:f3:29:04:c3:f3:85:03:b8:f4:cd:02:71:f7:14:02:52:fa:5c:01:85:fd:b8:00:00:00:00:00:0a:01:48:ff:5c:01:a4:fe:14:02:ec:fd:5c:03:33:fd:48:05:7b:fc:b8:06:d7:fb:14:08:1f:fb:33:09:66:fa:ec:09:ae:f9:3d:0a:0a:f9:0a:0b:52:f8:1f:0b:9a:f7:48:0b:f6:f6:85:0b:3d:f6:9a:0b:85:f5 -ant1.ant3.ch5.pdoa_lut=66:ec:7b:0a:e1:ec:c3:09:14:ee:0a:09:d7:ef:66:08:8f:f2:ae:07:00:f6:f6:06:cd:f6:52:06:33:f7:9a:05:d7:f7:e1:04:48:f9:29:04:33:fd:85:03:d7:fd:cd:02:3d:fe:14:02:ec:ff:5c:01:14:00:b8:00:3d:00:00:00:cd:02:48:ff:29:04:a4:fe:a4:04:ec:fd:85:05:33:fd:e1:06:7b:fc:b8:08:d7:fb:14:0a:1f:fb:e1:0a:66:fa:1f:0b:0a:f9:1f:0b:ae:f9:5c:0b:52:f8:c3:0b:9a:f7:52:0c:f6:f6:0a:0d:3d:f6:00:0e:85:f5 -ant1.ant3.ch9.pdoa_lut=0a:ef:7b:0a:c3:ef:c3:09:00:f0:0a:09:14:f0:66:08:7b:f0:ae:07:48:f1:f6:06:00:f2:52:06:c3:f3:9a:05:00:f6:e1:04:d7:f7:29:04:1f:f9:85:03:ae:f9:cd:02:e1:fa:14:02:e1:fc:5c:01:b8:fe:b8:00:c3:ff:00:00:00:02:48:ff:5c:05:a4:fe:52:08:ec:fd:14:0a:33:fd:e1:0a:7b:fc:14:0c:d7:fb:14:0e:1f:fb:1f:0f:66:fa:00:10:ae:f9:b8:10:0a:f9:29:12:52:f8:00:14:9a:f7:7b:16:f6:f6:d7:17:3d:f6:29:18:85:f5 -xtal_trim=23 -temperature_reference=85 -smart_tx_power=1 -auto_sleep_margin=20000 -restricted_channels=0 -[HAL]aoa_capability=1 -[HAL]ant_sets.ch5.range.rx_ant_set_nonranging = 6 -[HAL]ant_sets.ch5.range.rx_ant_set_ranging = 3 -[HAL]ant_sets.ch5.range.tx_ant_set_nonranging = 0 -[HAL]ant_sets.ch5.range.tx_ant_set_ranging = 0 -[HAL]ant_sets.ch5.azimuth.rx_ant_set_nonranging = 6 -[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 = 6 -[HAL]ant_sets.ch9.range.rx_ant_set_ranging = 3 -[HAL]ant_sets.ch9.range.tx_ant_set_nonranging = 0 -[HAL]ant_sets.ch9.range.tx_ant_set_ranging = 0 -[HAL]ant_sets.ch5.elevation.rx_ant_set_nonranging = 6 -[HAL]ant_sets.ch5.elevation.rx_ant_set_ranging = 1 -[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 = 6 -[HAL]ant_sets.ch9.elevation.rx_ant_set_ranging = 1 -[HAL]ant_sets.ch9.elevation.tx_ant_set_nonranging = 0 -[HAL]ant_sets.ch9.elevation.tx_ant_set_ranging = 0 -[HAL]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 6 -[HAL]ant_sets.ch9.azimuth.rx_ant_set_ranging = 3 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 0 -[HAL]ant_sets.ch9.azimuth.tx_ant_set_ranging = 0 -[HAL]minimum_system_offset_uwbtime0=500 -coex_gpio=4 -coex_delay_us=1000 -coex_margin_us=500 -coex_interval_us=2000 diff --git a/uwb/calibration-CE.conf b/uwb/calibration-CE.conf new file mode 100644 index 0000000..e1a45aa --- /dev/null +++ b/uwb/calibration-CE.conf @@ -0,0 +1,151 @@ +# CE calibration file + +# ANT0 CH5 configuration +#3C3C3C3C FF 0x34 0xFFFFFFFF +#3E3E3E3E FF 0x34 0xFFFFFFFF +#38403838 FF 0x34 0xFFFFFFFF +#33333333 FF 0x34 0xFFFFFFFF +#37373737 FF 0x34 0xFFFFFFFF +#37373737 FF 0x34 0xFFFFFFFF +#32323232 FF 0x34 0xFFFFFFFF + +# tx power +ant0.ch5.ref_frame0.tx_power_index=3C:3C:3C:3C +ant0.ch5.ref_frame1.tx_power_index=3E:3E:3E:3E +ant0.ch5.ref_frame2.tx_power_index=38:38:40:38 +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 + +# pp cw tx pwr +ant0.ch5.ref_frame0.post_tx_power_index=0xff +ant0.ch5.ref_frame1.post_tx_power_index=0xff +ant0.ch5.ref_frame2.post_tx_power_index=0xff +ant0.ch5.ref_frame3.post_tx_power_index=0xff +ant0.ch5.ref_frame4.post_tx_power_index=0xff +ant0.ch5.ref_frame5.post_tx_power_index=0xff +ant0.ch5.ref_frame6.post_tx_power_index=0xff +ant0.ch5.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant0.ch5.ref_frame0.pg_delay=0x34 +ant0.ch5.ref_frame1.pg_delay=0x34 +ant0.ch5.ref_frame2.pg_delay=0x34 +ant0.ch5.ref_frame3.pg_delay=0x34 +ant0.ch5.ref_frame4.pg_delay=0x34 +ant0.ch5.ref_frame5.pg_delay=0x34 +ant0.ch5.ref_frame6.pg_delay=0x34 +ant0.ch5.ref_frame7.pg_delay=0x34 + +# max gating gain +ant0.ch5.ref_frame0.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame1.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame2.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame3.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame4.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame5.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame6.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame7.max_gating_gain=0xFFFFFFFF + +# ANT0 CH9 CONFIGURATION +#3B3B3B3B FF 0x34 0xFFFFFFFF +#3C3C3C3C FF 0x34 0xFFFFFFFF +#3A423A3A FF 0x34 0xFFFFFFFF +#36363636 FF 0x34 0xFFFFFFFF +#32323232 FF 0x34 0xFFFFFFFF +#31313131 FF 0x34 0xFFFFFFFF +#37373737 FF 0x34 0xFFFFFFFF + +# tx power +ant0.ch9.ref_frame0.tx_power_index=3B:3B:3B:3B +ant0.ch9.ref_frame1.tx_power_index=3C:3C:3C:3C +ant0.ch9.ref_frame2.tx_power_index=3A:3A:42:3A +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 + +# pp cw tx pwr +ant0.ch9.ref_frame0.post_tx_power_index=0xff +ant0.ch9.ref_frame1.post_tx_power_index=0xff +ant0.ch9.ref_frame2.post_tx_power_index=0xff +ant0.ch9.ref_frame3.post_tx_power_index=0xff +ant0.ch9.ref_frame4.post_tx_power_index=0xff +ant0.ch9.ref_frame5.post_tx_power_index=0xff +ant0.ch9.ref_frame6.post_tx_power_index=0xff +ant0.ch9.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant0.ch9.ref_frame0.pg_delay=0x34 +ant0.ch9.ref_frame1.pg_delay=0x34 +ant0.ch9.ref_frame2.pg_delay=0x34 +ant0.ch9.ref_frame3.pg_delay=0x34 +ant0.ch9.ref_frame4.pg_delay=0x34 +ant0.ch9.ref_frame5.pg_delay=0x34 +ant0.ch9.ref_frame6.pg_delay=0x34 +ant0.ch9.ref_frame7.pg_delay=0x34 + +# max gating gain +ant0.ch9.ref_frame0.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame1.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame2.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame3.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame4.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame5.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame6.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame7.max_gating_gain=0xFFFFFFFF + +# ANT1 CH9 CONFIGURATION +#41414141 FF 0x34 0xFFFFFFFF +#45454545 FF 0x34 0xFFFFFFFF +#3E463E3E FF 0x34 0xFFFFFFFF +#37373737 FF 0x34 0xFFFFFFFF +#40404040 FF 0x34 0xFFFFFFFF +#3B3B3B3B FF 0x34 0xFFFFFFFF +#39393939 FF 0x34 0xFFFFFFFF + +# tx power +ant1.ch9.ref_frame0.tx_power_index=41:41:41:41 +ant1.ch9.ref_frame1.tx_power_index=45:45:45:45 +ant1.ch9.ref_frame2.tx_power_index=3E:3E:46:3E +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 + +# pp cw tx pwr +ant1.ch9.ref_frame0.post_tx_power_index=0xff +ant1.ch9.ref_frame1.post_tx_power_index=0xff +ant1.ch9.ref_frame2.post_tx_power_index=0xff +ant1.ch9.ref_frame3.post_tx_power_index=0xff +ant1.ch9.ref_frame4.post_tx_power_index=0xff +ant1.ch9.ref_frame5.post_tx_power_index=0xff +ant1.ch9.ref_frame6.post_tx_power_index=0xff +ant1.ch9.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant1.ch9.ref_frame0.pg_delay=0x34 +ant1.ch9.ref_frame1.pg_delay=0x34 +ant1.ch9.ref_frame2.pg_delay=0x34 +ant1.ch9.ref_frame3.pg_delay=0x34 +ant1.ch9.ref_frame4.pg_delay=0x34 +ant1.ch9.ref_frame5.pg_delay=0x34 +ant1.ch9.ref_frame6.pg_delay=0x34 +ant1.ch9.ref_frame7.pg_delay=0x34 + +# max gating gain +ant1.ch9.ref_frame0.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame1.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame2.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame3.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame4.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame5.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame6.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame7.max_gating_gain=0xFFFFFFFF + +restricted_channels=0x0000 +alternate_pulse_shape=0x00 diff --git a/uwb/calibration-FCC.conf b/uwb/calibration-FCC.conf new file mode 100644 index 0000000..f579c20 --- /dev/null +++ b/uwb/calibration-FCC.conf @@ -0,0 +1,151 @@ +# FCC calibration file + +# ANT0 CH5 configuration +#41414141 34 0x34 0xFFFFFFFF +#48484848 33 0x34 0xFFFFFFFF +#3C443C3C 36 0x34 0xFFFFFFFF +#33333333 33 0x34 0xFFFFFFFF +#3E3E3E3E 32 0x34 0xFFFFFFFF +#3B3B3B3B 32 0x34 0xFFFFFFFF +#32323232 32 0x34 0xFFFFFFFF + +# tx power +ant0.ch5.ref_frame0.tx_power_index=41:41:41:41 +ant0.ch5.ref_frame1.tx_power_index=48:48:48:48 +ant0.ch5.ref_frame2.tx_power_index=3C:3C:44:3C +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 + +# pp cw tx pwr +ant0.ch5.ref_frame0.post_tx_power_index=0x34 +ant0.ch5.ref_frame1.post_tx_power_index=0x33 +ant0.ch5.ref_frame2.post_tx_power_index=0x36 +ant0.ch5.ref_frame3.post_tx_power_index=0x33 +ant0.ch5.ref_frame4.post_tx_power_index=0x32 +ant0.ch5.ref_frame5.post_tx_power_index=0x32 +ant0.ch5.ref_frame6.post_tx_power_index=0x32 +ant0.ch5.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant0.ch5.ref_frame0.pg_delay=0x34 +ant0.ch5.ref_frame1.pg_delay=0x34 +ant0.ch5.ref_frame2.pg_delay=0x34 +ant0.ch5.ref_frame3.pg_delay=0x34 +ant0.ch5.ref_frame4.pg_delay=0x34 +ant0.ch5.ref_frame5.pg_delay=0x34 +ant0.ch5.ref_frame6.pg_delay=0x34 +ant0.ch5.ref_frame7.pg_delay=0x34 + +# max gating gain +ant0.ch5.ref_frame0.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame1.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame2.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame3.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame4.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame5.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame6.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame7.max_gating_gain=0xFFFFFFFF + +# ANT0 CH9 CONFIGURATION +#45454545 32 0x34 0xFFFFFFFF +#45454545 32 0x34 0xFFFFFFFF +#3F473F3F 32 0x34 0xFFFFFFFF +#3B3B3B3B 32 0x34 0xFFFFFFFF +#3E3E3E3E 32 0x34 0xFFFFFFFF +#37373737 32 0x34 0xFFFFFFFF +#39393939 32 0x34 0xFFFFFFFF + +# tx power +ant0.ch9.ref_frame0.tx_power_index=45:45:45:45 +ant0.ch9.ref_frame1.tx_power_index=45:45:45:45 +ant0.ch9.ref_frame2.tx_power_index=3F:3F:47:3F +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 + +# pp cw tx pwr +ant0.ch9.ref_frame0.post_tx_power_index=0x32 +ant0.ch9.ref_frame1.post_tx_power_index=0x32 +ant0.ch9.ref_frame2.post_tx_power_index=0x32 +ant0.ch9.ref_frame3.post_tx_power_index=0x32 +ant0.ch9.ref_frame4.post_tx_power_index=0x32 +ant0.ch9.ref_frame5.post_tx_power_index=0x32 +ant0.ch9.ref_frame6.post_tx_power_index=0x32 +ant0.ch9.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant0.ch9.ref_frame0.pg_delay=0x34 +ant0.ch9.ref_frame1.pg_delay=0x34 +ant0.ch9.ref_frame2.pg_delay=0x34 +ant0.ch9.ref_frame3.pg_delay=0x34 +ant0.ch9.ref_frame4.pg_delay=0x34 +ant0.ch9.ref_frame5.pg_delay=0x34 +ant0.ch9.ref_frame6.pg_delay=0x34 +ant0.ch9.ref_frame7.pg_delay=0x34 + +# max gating gain +ant0.ch9.ref_frame0.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame1.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame2.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame3.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame4.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame5.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame6.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame7.max_gating_gain=0xFFFFFFFF + +# ANT1 CH9 CONFIGURATION +#44444444 32 0x34 0xFFFFFFFF +#4B4B4B4B 32 0x34 0xFFFFFFFF +#41494141 32 0x34 0xFFFFFFFF +#3A3A3A3A 32 0x34 0xFFFFFFFF +#40404040 32 0x34 0xFFFFFFFF +#3E3E3E3E 32 0x34 0xFFFFFFFF +#34343434 32 0x34 0xFFFFFFFF + +# tx power +ant1.ch9.ref_frame0.tx_power_index=44:44:44:44 +ant1.ch9.ref_frame1.tx_power_index=4B:4B:4B:4B +ant1.ch9.ref_frame2.tx_power_index=41:41:49:41 +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 + +# pp cw tx pwr +ant1.ch9.ref_frame0.post_tx_power_index=0x32 +ant1.ch9.ref_frame1.post_tx_power_index=0x32 +ant1.ch9.ref_frame2.post_tx_power_index=0x32 +ant1.ch9.ref_frame3.post_tx_power_index=0x32 +ant1.ch9.ref_frame4.post_tx_power_index=0x32 +ant1.ch9.ref_frame5.post_tx_power_index=0x32 +ant1.ch9.ref_frame6.post_tx_power_index=0x32 +ant1.ch9.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant1.ch9.ref_frame0.pg_delay=0x34 +ant1.ch9.ref_frame1.pg_delay=0x34 +ant1.ch9.ref_frame2.pg_delay=0x34 +ant1.ch9.ref_frame3.pg_delay=0x34 +ant1.ch9.ref_frame4.pg_delay=0x34 +ant1.ch9.ref_frame5.pg_delay=0x34 +ant1.ch9.ref_frame6.pg_delay=0x34 +ant1.ch9.ref_frame7.pg_delay=0x34 + +# max gating gain +ant1.ch9.ref_frame0.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame1.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame2.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame3.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame4.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame5.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame6.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame7.max_gating_gain=0xFFFFFFFF + +restricted_channels=0x0000 +alternate_pulse_shape=0x00 diff --git a/uwb/calibration-JP.conf b/uwb/calibration-JP.conf new file mode 100644 index 0000000..463dada --- /dev/null +++ b/uwb/calibration-JP.conf @@ -0,0 +1,101 @@ +# JP calibration file +# ANT0 CH9 CONFIGURATION +#41414141 FF 29 0xFFFFFFFF +#4C4C4C4C FF 29 0xFFFFFFFF +#3C463C3C FF 29 0xFFFFFFFF +#32323232 FF 29 0xFFFFFFFF +#41414141 FF 29 0xFFFFFFFF +#40404040 FF 29 0xFFFFFFFF +#35353535 FF 29 0xFFFFFFFF + +# tx power +ant0.ch9.ref_frame0.tx_power_index=41:41:41:41 +ant0.ch9.ref_frame1.tx_power_index=4C:4C:4C:4C +ant0.ch9.ref_frame2.tx_power_index=3C:3C:46:3C +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 + +# pp cw tx pwr +ant0.ch9.ref_frame0.post_tx_power_index=0xff +ant0.ch9.ref_frame1.post_tx_power_index=0xff +ant0.ch9.ref_frame2.post_tx_power_index=0xff +ant0.ch9.ref_frame3.post_tx_power_index=0xff +ant0.ch9.ref_frame4.post_tx_power_index=0xff +ant0.ch9.ref_frame5.post_tx_power_index=0xff +ant0.ch9.ref_frame6.post_tx_power_index=0xff +ant0.ch9.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant0.ch9.ref_frame0.pg_delay=0x29 +ant0.ch9.ref_frame1.pg_delay=0x29 +ant0.ch9.ref_frame2.pg_delay=0x29 +ant0.ch9.ref_frame3.pg_delay=0x29 +ant0.ch9.ref_frame4.pg_delay=0x29 +ant0.ch9.ref_frame5.pg_delay=0x29 +ant0.ch9.ref_frame6.pg_delay=0x29 +ant0.ch9.ref_frame7.pg_delay=0x29 + +# max gating gain +ant0.ch9.ref_frame0.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame1.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame2.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame3.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame4.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame5.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame6.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame7.max_gating_gain=0xFFFFFFFF + +# ANT1 CH9 CONFIGURATION +#43434343 FF 28 0xFFFFFFFF +#47474747 FF 27 0xFFFFFFFF +#3E483E3E FF 28 0xFFFFFFFF +#34343434 FF 28 0xFFFFFFFF +#3C3C3C3C FF 27 0xFFFFFFFF +#3B3B3B3B FF 27 0xFFFFFFFF +#30303030 FF 27 0xFFFFFFFF + +# tx power +ant1.ch9.ref_frame0.tx_power_index=43:43:43:43 +ant1.ch9.ref_frame1.tx_power_index=47:47:47:47 +ant1.ch9.ref_frame2.tx_power_index=3E:3E:48:3E +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 + +# pp cw tx pwr +ant1.ch9.ref_frame0.post_tx_power_index=0xff +ant1.ch9.ref_frame1.post_tx_power_index=0xff +ant1.ch9.ref_frame2.post_tx_power_index=0xff +ant1.ch9.ref_frame3.post_tx_power_index=0xff +ant1.ch9.ref_frame4.post_tx_power_index=0xff +ant1.ch9.ref_frame5.post_tx_power_index=0xff +ant1.ch9.ref_frame6.post_tx_power_index=0xff +ant1.ch9.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant1.ch9.ref_frame0.pg_delay=0x28 +ant1.ch9.ref_frame1.pg_delay=0x27 +ant1.ch9.ref_frame2.pg_delay=0x28 +ant1.ch9.ref_frame3.pg_delay=0x28 +ant1.ch9.ref_frame4.pg_delay=0x27 +ant1.ch9.ref_frame5.pg_delay=0x27 +ant1.ch9.ref_frame6.pg_delay=0x27 +ant1.ch9.ref_frame7.pg_delay=0x27 + +# max gating gain +ant1.ch9.ref_frame0.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame1.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame2.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame3.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame4.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame5.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame6.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame7.max_gating_gain=0xFFFFFFFF + +restricted_channels=0x0020 +alternate_pulse_shape=0x01 diff --git a/uwb/calibration-RESTRICTED.conf b/uwb/calibration-RESTRICTED.conf new file mode 100644 index 0000000..64363e5 --- /dev/null +++ b/uwb/calibration-RESTRICTED.conf @@ -0,0 +1,3 @@ +# RESTRICTED calibration file, UWB disabled + +restricted_channels=0xFFFF diff --git a/uwb/calibration-TW.conf b/uwb/calibration-TW.conf new file mode 100644 index 0000000..fcac264 --- /dev/null +++ b/uwb/calibration-TW.conf @@ -0,0 +1,151 @@ +# TW calibration file (FCC w Ch5 disabled) + +# ANT0 CH5 configuration +#41414141 34 0x34 0xFFFFFFFF +#48484848 33 0x34 0xFFFFFFFF +#3C443C3C 36 0x34 0xFFFFFFFF +#33333333 33 0x34 0xFFFFFFFF +#3E3E3E3E 32 0x34 0xFFFFFFFF +#3B3B3B3B 32 0x34 0xFFFFFFFF +#32323232 32 0x34 0xFFFFFFFF + +# tx power +ant0.ch5.ref_frame0.tx_power_index=41:41:41:41 +ant0.ch5.ref_frame1.tx_power_index=48:48:48:48 +ant0.ch5.ref_frame2.tx_power_index=3C:3C:44:3C +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 + +# pp cw tx pwr +ant0.ch5.ref_frame0.post_tx_power_index=0x34 +ant0.ch5.ref_frame1.post_tx_power_index=0x33 +ant0.ch5.ref_frame2.post_tx_power_index=0x36 +ant0.ch5.ref_frame3.post_tx_power_index=0x33 +ant0.ch5.ref_frame4.post_tx_power_index=0x32 +ant0.ch5.ref_frame5.post_tx_power_index=0x32 +ant0.ch5.ref_frame6.post_tx_power_index=0x32 +ant0.ch5.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant0.ch5.ref_frame0.pg_delay=0x34 +ant0.ch5.ref_frame1.pg_delay=0x34 +ant0.ch5.ref_frame2.pg_delay=0x34 +ant0.ch5.ref_frame3.pg_delay=0x34 +ant0.ch5.ref_frame4.pg_delay=0x34 +ant0.ch5.ref_frame5.pg_delay=0x34 +ant0.ch5.ref_frame6.pg_delay=0x34 +ant0.ch5.ref_frame7.pg_delay=0x34 + +# max gating gain +ant0.ch5.ref_frame0.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame1.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame2.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame3.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame4.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame5.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame6.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame7.max_gating_gain=0xFFFFFFFF + +# ANT0 CH9 CONFIGURATION +#45454545 32 0x34 0xFFFFFFFF +#45454545 32 0x34 0xFFFFFFFF +#3F473F3F 32 0x34 0xFFFFFFFF +#3B3B3B3B 32 0x34 0xFFFFFFFF +#3E3E3E3E 32 0x34 0xFFFFFFFF +#37373737 32 0x34 0xFFFFFFFF +#39393939 32 0x34 0xFFFFFFFF + +# tx power +ant0.ch9.ref_frame0.tx_power_index=45:45:45:45 +ant0.ch9.ref_frame1.tx_power_index=45:45:45:45 +ant0.ch9.ref_frame2.tx_power_index=3F:3F:47:3F +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 + +# pp cw tx pwr +ant0.ch9.ref_frame0.post_tx_power_index=0x32 +ant0.ch9.ref_frame1.post_tx_power_index=0x32 +ant0.ch9.ref_frame2.post_tx_power_index=0x32 +ant0.ch9.ref_frame3.post_tx_power_index=0x32 +ant0.ch9.ref_frame4.post_tx_power_index=0x32 +ant0.ch9.ref_frame5.post_tx_power_index=0x32 +ant0.ch9.ref_frame6.post_tx_power_index=0x32 +ant0.ch9.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant0.ch9.ref_frame0.pg_delay=0x34 +ant0.ch9.ref_frame1.pg_delay=0x34 +ant0.ch9.ref_frame2.pg_delay=0x34 +ant0.ch9.ref_frame3.pg_delay=0x34 +ant0.ch9.ref_frame4.pg_delay=0x34 +ant0.ch9.ref_frame5.pg_delay=0x34 +ant0.ch9.ref_frame6.pg_delay=0x34 +ant0.ch9.ref_frame7.pg_delay=0x34 + +# max gating gain +ant0.ch9.ref_frame0.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame1.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame2.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame3.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame4.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame5.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame6.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame7.max_gating_gain=0xFFFFFFFF + +# ANT1 CH9 CONFIGURATION +#44444444 32 0x34 0xFFFFFFFF +#4B4B4B4B 32 0x34 0xFFFFFFFF +#41494141 32 0x34 0xFFFFFFFF +#3A3A3A3A 32 0x34 0xFFFFFFFF +#40404040 32 0x34 0xFFFFFFFF +#3E3E3E3E 32 0x34 0xFFFFFFFF +#34343434 32 0x34 0xFFFFFFFF + +# tx power +ant1.ch9.ref_frame0.tx_power_index=44:44:44:44 +ant1.ch9.ref_frame1.tx_power_index=4B:4B:4B:4B +ant1.ch9.ref_frame2.tx_power_index=41:41:49:41 +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 + +# pp cw tx pwr +ant1.ch9.ref_frame0.post_tx_power_index=0x32 +ant1.ch9.ref_frame1.post_tx_power_index=0x32 +ant1.ch9.ref_frame2.post_tx_power_index=0x32 +ant1.ch9.ref_frame3.post_tx_power_index=0x32 +ant1.ch9.ref_frame4.post_tx_power_index=0x32 +ant1.ch9.ref_frame5.post_tx_power_index=0x32 +ant1.ch9.ref_frame6.post_tx_power_index=0x32 +ant1.ch9.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant1.ch9.ref_frame0.pg_delay=0x34 +ant1.ch9.ref_frame1.pg_delay=0x34 +ant1.ch9.ref_frame2.pg_delay=0x34 +ant1.ch9.ref_frame3.pg_delay=0x34 +ant1.ch9.ref_frame4.pg_delay=0x34 +ant1.ch9.ref_frame5.pg_delay=0x34 +ant1.ch9.ref_frame6.pg_delay=0x34 +ant1.ch9.ref_frame7.pg_delay=0x34 + +# max gating gain +ant1.ch9.ref_frame0.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame1.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame2.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame3.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame4.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame5.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame6.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame7.max_gating_gain=0xFFFFFFFF + +restricted_channels=0x0020 +alternate_pulse_shape=0x00 diff --git a/uwb/calibration-default.conf b/uwb/calibration-default.conf new file mode 100644 index 0000000..f579c20 --- /dev/null +++ b/uwb/calibration-default.conf @@ -0,0 +1,151 @@ +# FCC calibration file + +# ANT0 CH5 configuration +#41414141 34 0x34 0xFFFFFFFF +#48484848 33 0x34 0xFFFFFFFF +#3C443C3C 36 0x34 0xFFFFFFFF +#33333333 33 0x34 0xFFFFFFFF +#3E3E3E3E 32 0x34 0xFFFFFFFF +#3B3B3B3B 32 0x34 0xFFFFFFFF +#32323232 32 0x34 0xFFFFFFFF + +# tx power +ant0.ch5.ref_frame0.tx_power_index=41:41:41:41 +ant0.ch5.ref_frame1.tx_power_index=48:48:48:48 +ant0.ch5.ref_frame2.tx_power_index=3C:3C:44:3C +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 + +# pp cw tx pwr +ant0.ch5.ref_frame0.post_tx_power_index=0x34 +ant0.ch5.ref_frame1.post_tx_power_index=0x33 +ant0.ch5.ref_frame2.post_tx_power_index=0x36 +ant0.ch5.ref_frame3.post_tx_power_index=0x33 +ant0.ch5.ref_frame4.post_tx_power_index=0x32 +ant0.ch5.ref_frame5.post_tx_power_index=0x32 +ant0.ch5.ref_frame6.post_tx_power_index=0x32 +ant0.ch5.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant0.ch5.ref_frame0.pg_delay=0x34 +ant0.ch5.ref_frame1.pg_delay=0x34 +ant0.ch5.ref_frame2.pg_delay=0x34 +ant0.ch5.ref_frame3.pg_delay=0x34 +ant0.ch5.ref_frame4.pg_delay=0x34 +ant0.ch5.ref_frame5.pg_delay=0x34 +ant0.ch5.ref_frame6.pg_delay=0x34 +ant0.ch5.ref_frame7.pg_delay=0x34 + +# max gating gain +ant0.ch5.ref_frame0.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame1.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame2.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame3.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame4.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame5.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame6.max_gating_gain=0xFFFFFFFF +ant0.ch5.ref_frame7.max_gating_gain=0xFFFFFFFF + +# ANT0 CH9 CONFIGURATION +#45454545 32 0x34 0xFFFFFFFF +#45454545 32 0x34 0xFFFFFFFF +#3F473F3F 32 0x34 0xFFFFFFFF +#3B3B3B3B 32 0x34 0xFFFFFFFF +#3E3E3E3E 32 0x34 0xFFFFFFFF +#37373737 32 0x34 0xFFFFFFFF +#39393939 32 0x34 0xFFFFFFFF + +# tx power +ant0.ch9.ref_frame0.tx_power_index=45:45:45:45 +ant0.ch9.ref_frame1.tx_power_index=45:45:45:45 +ant0.ch9.ref_frame2.tx_power_index=3F:3F:47:3F +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 + +# pp cw tx pwr +ant0.ch9.ref_frame0.post_tx_power_index=0x32 +ant0.ch9.ref_frame1.post_tx_power_index=0x32 +ant0.ch9.ref_frame2.post_tx_power_index=0x32 +ant0.ch9.ref_frame3.post_tx_power_index=0x32 +ant0.ch9.ref_frame4.post_tx_power_index=0x32 +ant0.ch9.ref_frame5.post_tx_power_index=0x32 +ant0.ch9.ref_frame6.post_tx_power_index=0x32 +ant0.ch9.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant0.ch9.ref_frame0.pg_delay=0x34 +ant0.ch9.ref_frame1.pg_delay=0x34 +ant0.ch9.ref_frame2.pg_delay=0x34 +ant0.ch9.ref_frame3.pg_delay=0x34 +ant0.ch9.ref_frame4.pg_delay=0x34 +ant0.ch9.ref_frame5.pg_delay=0x34 +ant0.ch9.ref_frame6.pg_delay=0x34 +ant0.ch9.ref_frame7.pg_delay=0x34 + +# max gating gain +ant0.ch9.ref_frame0.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame1.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame2.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame3.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame4.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame5.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame6.max_gating_gain=0xFFFFFFFF +ant0.ch9.ref_frame7.max_gating_gain=0xFFFFFFFF + +# ANT1 CH9 CONFIGURATION +#44444444 32 0x34 0xFFFFFFFF +#4B4B4B4B 32 0x34 0xFFFFFFFF +#41494141 32 0x34 0xFFFFFFFF +#3A3A3A3A 32 0x34 0xFFFFFFFF +#40404040 32 0x34 0xFFFFFFFF +#3E3E3E3E 32 0x34 0xFFFFFFFF +#34343434 32 0x34 0xFFFFFFFF + +# tx power +ant1.ch9.ref_frame0.tx_power_index=44:44:44:44 +ant1.ch9.ref_frame1.tx_power_index=4B:4B:4B:4B +ant1.ch9.ref_frame2.tx_power_index=41:41:49:41 +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 + +# pp cw tx pwr +ant1.ch9.ref_frame0.post_tx_power_index=0x32 +ant1.ch9.ref_frame1.post_tx_power_index=0x32 +ant1.ch9.ref_frame2.post_tx_power_index=0x32 +ant1.ch9.ref_frame3.post_tx_power_index=0x32 +ant1.ch9.ref_frame4.post_tx_power_index=0x32 +ant1.ch9.ref_frame5.post_tx_power_index=0x32 +ant1.ch9.ref_frame6.post_tx_power_index=0x32 +ant1.ch9.ref_frame7.post_tx_power_index=0xff + +# pg delay +ant1.ch9.ref_frame0.pg_delay=0x34 +ant1.ch9.ref_frame1.pg_delay=0x34 +ant1.ch9.ref_frame2.pg_delay=0x34 +ant1.ch9.ref_frame3.pg_delay=0x34 +ant1.ch9.ref_frame4.pg_delay=0x34 +ant1.ch9.ref_frame5.pg_delay=0x34 +ant1.ch9.ref_frame6.pg_delay=0x34 +ant1.ch9.ref_frame7.pg_delay=0x34 + +# max gating gain +ant1.ch9.ref_frame0.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame1.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame2.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame3.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame4.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame5.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame6.max_gating_gain=0xFFFFFFFF +ant1.ch9.ref_frame7.max_gating_gain=0xFFFFFFFF + +restricted_channels=0x0000 +alternate_pulse_shape=0x00 diff --git a/uwb/calibration.conf b/uwb/calibration.conf new file mode 100644 index 0000000..a985e8a --- /dev/null +++ b/uwb/calibration.conf @@ -0,0 +1,39 @@ +# common calibration file +ant0.ch5.ant_delay=37:40:00:00 +ant0.ch9.ant_delay=37:40:00:00 + +ant1.ch5.ant_delay=3a:40:00:00 +ant1.ch9.ant_delay=3a:40:00:00 + +ant2.ch5.ant_delay=38:40:00:00 +ant2.ch9.ant_delay=38:40:00:00 + +ant3.ch5.ant_delay=38:40:00:00 +ant3.ch9.ant_delay=38:40:00:00 + +ant_grp1.ch9.pdoa.axisx.offset=e2:0c +ant_grp1.ch9.pdoa.axisy.offset=00:00 + +ant_grp2.ch9.pdoa.axisx.offset=00:00 +ant_grp2.ch9.pdoa.axisy.offset=7f:10 + +xtal_trim=0x30 + +# signed in 2s complement FF -> -0.25 dB +ant0.ch5.pa_gain_offset=0x00 +ant0.ch9.pa_gain_offset=0x00 + +ant1.ch5.pa_gain_offset=0x00 +ant1.ch9.pa_gain_offset=0x00 + +ant2.ch5.pa_gain_offset=0x00 +ant2.ch9.pa_gain_offset=0x00 + +ant3.ch5.pa_gain_offset=0x00 +ant3.ch9.pa_gain_offset=0x00 + +#Coex +wifi_coex_mode=01 +wifi_coex_time_gap_t1=01 +ch5.wifi_coex_enabled=01 +ch9.wifi_coex_enabled=01 diff --git a/uwb/configuration.conf b/uwb/configuration.conf new file mode 100644 index 0000000..16b9f36 --- /dev/null +++ b/uwb/configuration.conf @@ -0,0 +1,122 @@ +[FIRA]ant_sets.ch5.range.rx_ant_set_nonranging = 0 +[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.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 +[FIRA]ant_sets.ch9.range.tx_ant_set_ranging = 0 +[FIRA]ant_sets.ch9.azimuth.rx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch9.azimuth.rx_ant_set_ranging = 1 +[FIRA]ant_sets.ch9.azimuth.tx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch9.azimuth.tx_ant_set_ranging = 1 +[FIRA]ant_sets.ch9.elevation.rx_ant_set_nonranging = 2 +[FIRA]ant_sets.ch9.elevation.rx_ant_set_ranging = 2 +[FIRA]ant_sets.ch9.elevation.tx_ant_set_nonranging = 2 +[FIRA]ant_sets.ch9.elevation.tx_ant_set_ranging = 2 +[FIRA]ant_sets.ch9.azimuth_elevation.rx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_azimuth = 1 +[FIRA]ant_sets.ch9.azimuth_elevation.rx_ant_set_ranging_elevation = 2 +[FIRA]ant_sets.ch9.azimuth_elevation.tx_ant_set_nonranging = 1 +[FIRA]ant_sets.ch9.azimuth_elevation.tx_ant_set_ranging = 1 + +[CCC]ant_sets.ch5.range.rx_ant_set_nonranging = 0 +[CCC]ant_sets.ch5.range.rx_ant_set_ranging = 0 +[CCC]ant_sets.ch5.range.tx_ant_set_nonranging = 0 +[CCC]ant_sets.ch5.range.tx_ant_set_ranging = 0 +[CCC]ant_sets.ch9.range.rx_ant_set_nonranging = 0 +[CCC]ant_sets.ch9.range.rx_ant_set_ranging = 0 +[CCC]ant_sets.ch9.range.tx_ant_set_nonranging = 0 +[CCC]ant_sets.ch9.range.tx_ant_set_ranging = 0 + +# Antenna Configuration +ant0.config=01 +ant1.config=02 +ant2.config=03 +ant3.config=04 + +# Ranging +ant_grp0.rf_config.rfoff=00 +ant_grp0.rf_config.tx=02 +ant_grp0.rf_config.tx_aoa=02 +ant_grp0.rf_config.rx_ip=04 +ant_grp0.rf_config.rx_sts0=04 +ant_grp0.rf_config.rx_sts1=04 +ant_grp0.rf_config.rx_sts2=04 +ant_grp0.rf_config.rx_sts3=04 +ant_grp0.lna_rxa=00 +ant_grp0.lna_rxb=01 +ant_grp0.rx_config=01 +ant_grp0.pdoa_segments=00:00:00:00:00:00 +ant_grp0.tx_power_control=01 + +# PDoA Azimuth +ant_grp1.rf_config.rfoff=00 +ant_grp1.rf_config.tx=03 +ant_grp1.rf_config.tx_aoa=03 +ant_grp1.rf_config.rx_ip=0e +ant_grp1.rf_config.rx_sts0=0e +ant_grp1.rf_config.rx_sts1=0e +ant_grp1.rf_config.rx_sts2=0e +ant_grp1.rf_config.rx_sts3=0e +ant_grp1.lna_rxa=01 +ant_grp1.lna_rxb=01 +ant_grp1.rx_config=04 +ant_grp1.pdoa_segments=07:02:00:00:00:00 +ant_grp1.pdoa_type=00:00:00 +ant_grp1.tx_power_control=01 +ant_grp1.ch9.pdoa.axisx.lut_id=00 +ant_grp1.ch9.pdoa.axisy.lut_id=ff + +# PDoA Elevation +ant_grp2.rf_config.rfoff=00 +ant_grp2.rf_config.tx=03 +ant_grp2.rf_config.tx_aoa=03 +ant_grp2.rf_config.rx_ip=0f +ant_grp2.rf_config.rx_sts0=0f +ant_grp2.rf_config.rx_sts1=0f +ant_grp2.rf_config.rx_sts2=0f +ant_grp2.rf_config.rx_sts3=0f +ant_grp2.lna_rxa=01 +ant_grp2.lna_rxb=01 +ant_grp2.rx_config=04 +ant_grp2.pdoa_segments=07:02:00:00:00:00 +ant_grp2.pdoa_type=01:00:00 +ant_grp2.tx_power_control=01 +ant_grp2.ch9.pdoa.axisx.lut_id=ff +ant_grp2.ch9.pdoa.axisy.lut_id=01 + +pdoa_lut0.data=29:ee:8f:0c:71:ee:dd:0b:a8:ee:2b:0b:00:ef:77:0a:35:ef:c5:09:c5:ef:12:09:4a:f0:60:08:db:f1:fa:06:cf:f2:48:06:b6:f3:96:05:37:f7:2f:04:91:f8:7d:03:00:fa:cb:02:f8:fc:64:01:62:fe:b2:00:04:00:00:00:d9:01:4e:ff:d5:03:9c:fe:ac:05:e7:fd:87:08:83:fc:a2:09:d1:fb:c5:0a:1d:fb:6d:0d:b8:f9:a8:0e:06:f9:d5:0f:54:f8:7f:11:ee:f6:7d:12:3b:f6:25:13:89:f5:98:13:d5:f4:71:14:23:f4:14:15:71:f3 +pdoa_lut1.data=7b:f0:89:f5:06:f1:3b:f6:87:f2:ee:f6:fe:f3:a0:f7:2d:f5:54:f8:17:f6:06:f9:e1:f6:b8:f9:b2:f7:6a:fa:aa:f8:1d:fb:96:f9:d1:fb:b0:fa:83:fc:f2:fb:35:fd:68:fd:e7:fd:f4:fe:9c:fe:62:00:4e:ff:be:01:00:00:14:03:b2:00:5e:04:64:01:66:05:19:02:8d:06:cb:02:d5:07:7d:03:12:09:2f:04:35:0a:e3:04:44:0b:96:05:6f:0c:48:06:ba:0d:fa:06:9e:0e:ac:07:b2:0f:60:08:a6:10:12:09:6d:11:c5:09:ee:11:77:0a + +# Reference frames definition +ref_frame0.phy_cfg=44:21:07 # BPRF SP1 with 125 bytes +ref_frame0.payload_size=0x007d + +ref_frame1.phy_cfg=45:04:00 # HPRF Set #1 (SP0 with 6.8 Mbps) with 150 bytes +ref_frame1.payload_size=0x0096 + +ref_frame2.phy_cfg=44:01:00 # BPRF SP0 with 125 bytes +ref_frame2.payload_size=0x007d + +ref_frame3.phy_cfg=44:22:07 # BPRF SP3 +ref_frame3.payload_size=0x0000 + +ref_frame4.phy_cfg=25:05:00 # HPRF Set #3 (SP0 with 27.2 Mbps) with 150 bytes +ref_frame4.payload_size=0x0096 + +ref_frame5.phy_cfg=45:22:07 # HPRF Set #24 (SP3) +ref_frame5.payload_size=0x0000 + +ref_frame6.phy_cfg=25:22:03 # HPRF Set #28 (SP3) +ref_frame6.payload_size=0x0000 + +ref_frame7.phy_cfg=25:2d:03 # HPRF DRHM_HR CL7 +ref_frame7.payload_size=0x0C68 + +# Post tones +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 diff --git a/uwb/uwb_calibration.mk b/uwb/uwb_calibration.mk index 38e4128..64e2b06 100644 --- a/uwb/uwb_calibration.mk +++ b/uwb/uwb_calibration.mk @@ -13,9 +13,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -LOCAL_UWB_CAL_DIR=device/google/shusky/uwb +PRODUCT_PACKAGES += \ + configuration.conf \ + calibration.conf \ + calibration-default.conf \ + calibration-CE.conf \ + calibration-FCC.conf \ + calibration-JP.conf \ + calibration-TW.conf \ + calibration-RESTRICTED.conf -PRODUCT_COPY_FILES += \ - $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration.conf \ - $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-unknown.conf \ - $(LOCAL_UWB_CAL_DIR)/UWB-calibration.conf:$(TARGET_COPY_OUT_VENDOR)/etc/UWB-calibration-default.conf \