Merge Android 14 QPR2 to AOSP main

Bug: 319669529
Merged-In: I6bf80dc609b0ab9e06e1db8a9711896957a0c137
Change-Id: I0156f661a90d3718676c46ef5da0b1370b4c6a87
This commit is contained in:
Xin Li 2024-03-06 09:29:50 -08:00
commit a7013b4818
112 changed files with 21942 additions and 24923 deletions

View file

@ -19,10 +19,12 @@ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_ripcurrent_fullmte.mk \ $(LOCAL_DIR)/aosp_ripcurrent_fullmte.mk \
$(LOCAL_DIR)/factory_ripcurrent.mk \ $(LOCAL_DIR)/factory_ripcurrent.mk \
$(LOCAL_DIR)/aosp_husky.mk \ $(LOCAL_DIR)/aosp_husky.mk \
$(LOCAL_DIR)/aosp_husky_61_pgagnostic.mk \
$(LOCAL_DIR)/aosp_husky_fullmte.mk \ $(LOCAL_DIR)/aosp_husky_fullmte.mk \
$(LOCAL_DIR)/aosp_husky_pgagnostic.mk \ $(LOCAL_DIR)/aosp_husky_pgagnostic.mk \
$(LOCAL_DIR)/factory_husky.mk \ $(LOCAL_DIR)/factory_husky.mk \
$(LOCAL_DIR)/aosp_shiba.mk \ $(LOCAL_DIR)/aosp_shiba.mk \
$(LOCAL_DIR)/aosp_shiba_61_pgagnostic.mk \
$(LOCAL_DIR)/aosp_shiba_fullmte.mk \ $(LOCAL_DIR)/aosp_shiba_fullmte.mk \
$(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \ $(LOCAL_DIR)/aosp_shiba_pgagnostic.mk \
$(LOCAL_DIR)/factory_shiba.mk $(LOCAL_DIR)/factory_shiba.mk

2
OWNERS
View file

@ -1,4 +1,4 @@
per-file perf/*,thermal/*= jenhaochen@google.com,wvw@google.com,joaodias@google.com 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 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

2
PREUPLOAD.cfg Normal file
View file

@ -0,0 +1,2 @@
[Builtin Hooks]
jsonlint = true

View file

@ -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

View file

@ -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

View file

@ -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"
],
}

View file

@ -15,10 +15,6 @@
--> -->
<audioPlatformConfiguration xmlns:xi="http://www.w3.org/2001/XInclude"> <audioPlatformConfiguration xmlns:xi="http://www.w3.org/2001/XInclude">
<features> <features>
<feature name="ThermalThrottle">
<argument name="Type" value="SKIN" />
<argument name="Name" value="VIRTUAL-SKIN" />
</feature>
<feature name="BatteryThrottle"> <feature name="BatteryThrottle">
<argument name="Type" value="BCL_VOLTAGE" /> <argument name="Type" value="BCL_VOLTAGE" />
<argument name="Name" value="BCL_AUDIO_BAACL" /> <argument name="Name" value="BCL_AUDIO_BAACL" />
@ -26,7 +22,7 @@
</feature> </feature>
<feature name="PlaybackThermalThrottle"> <feature name="PlaybackThermalThrottle">
<argument name="PollWaitMs" value="20000" /> <argument name="PollWaitMs" value="20000" />
<argument name="ThermistorName" value="VIRTUAL-SKIN" /> <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
<argument name="ThermistorType" value="SKIN" /> <argument name="ThermistorType" value="SKIN" />
<argument name="ThrottlingSeverity" value="MODERATE" /> <argument name="ThrottlingSeverity" value="MODERATE" />
</feature> </feature>
@ -47,15 +43,7 @@
<devices> <devices>
<device name="bluetooth" /> <device name="bluetooth" />
<device name="usb"> <device name="usb" />
<argument name="MaxSamplingRate" value="192000" />
<argument name="UnsupportedFormat" value="S24_LE" />
<argument name="MaxCapPacketInterval" value="125" />
<argument name="MaxCapSampleRate" value="192000" />
<argument name="MaxCapBitWidth" value="32" />
<argument name="MaxCapChannel" value="2" />
<argument name="EnableHifi192kMultichannel" value="0" />
</device>
<device name="speaker" codec="cs35l41"> <device name="speaker" codec="cs35l41">
<argument name="SpeakerNum" value="2" /> <argument name="SpeakerNum" value="2" />
<argument name="Rotation" /> <argument name="Rotation" />
@ -66,7 +54,7 @@
<tuners> <tuners>
<tuner type="playback" name="waves"> <tuner type="playback" name="waves">
<argument name="Sink" value="SPK" /> <argument name="Sink" value="SPK" />
<argument name="ThermistorsName" value="VIRTUAL-SKIN" /> <argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
</tuner> </tuner>
<tuner type="telephony" name="fortemedia"> <tuner type="telephony" name="fortemedia">
<argument name="VoIP_DLCHs" value="SPK:2,USB:2" /> <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />

View file

@ -405,6 +405,14 @@
<path name="primary-playback -> bt" /> <path name="primary-playback -> bt" />
</path> </path>
<path name="primary-playback-0 -> bluetooth-low-energy-headset">
<path name="primary-playback -> bt" />
</path>
<path name="primary-playback-0 -> bluetooth-low-energy-speaker">
<path name="primary-playback -> bt" />
</path>
<path name="primary-playback-0 -> usb"> <path name="primary-playback-0 -> usb">
<ctl name="USB_RX Mixer EP2" value="1" /> <ctl name="USB_RX Mixer EP2" value="1" />
</path> </path>
@ -465,6 +473,14 @@
<path name="raw-playback -> bt" /> <path name="raw-playback -> bt" />
</path> </path>
<path name="raw-playback-0 -> bluetooth-low-energy-headset">
<path name="raw-playback -> bt" />
</path>
<path name="raw-playback-0 -> bluetooth-low-energy-speaker">
<path name="raw-playback -> bt" />
</path>
<path name="raw-playback-0 -> usb"> <path name="raw-playback-0 -> usb">
<ctl name="USB_RX Mixer RAW" value="1" /> <ctl name="USB_RX Mixer RAW" value="1" />
</path> </path>
@ -525,6 +541,14 @@
<path name="deep-buffer-playback -> bt" /> <path name="deep-buffer-playback -> bt" />
</path> </path>
<path name="deep-buffer-playback-0 -> bluetooth-low-energy-headset">
<path name="deep-buffer-playback -> bt" />
</path>
<path name="deep-buffer-playback-0 -> bluetooth-low-energy-speaker">
<path name="deep-buffer-playback -> bt" />
</path>
<path name="deep-buffer-playback-0 -> usb"> <path name="deep-buffer-playback-0 -> usb">
<ctl name="USB_RX Mixer EP6" value="1" /> <ctl name="USB_RX Mixer EP6" value="1" />
</path> </path>
@ -590,6 +614,14 @@
<path name="compress-offload-playback -> bt" /> <path name="compress-offload-playback -> bt" />
</path> </path>
<path name="compress-offload-playback-0 -> bluetooth-low-energy-headset">
<path name="compress-offload-playback -> bt" />
</path>
<path name="compress-offload-playback-0 -> bluetooth-low-energy-speaker">
<path name="compress-offload-playback -> bt" />
</path>
<path name="compress-offload-playback-0 -> usb"> <path name="compress-offload-playback-0 -> usb">
<ctl name="USB_RX Mixer EP7" value="1" /> <ctl name="USB_RX Mixer EP7" value="1" />
</path> </path>
@ -650,6 +682,14 @@
<path name="mmap-playback -> bt" /> <path name="mmap-playback -> bt" />
</path> </path>
<path name="mmap-playback-0 -> bluetooth-low-energy-headset">
<path name="mmap-playback -> bt" />
</path>
<path name="mmap-playback-0 -> bluetooth-low-energy-speaker">
<path name="mmap-playback -> bt" />
</path>
<path name="mmap-playback-0 -> usb"> <path name="mmap-playback-0 -> usb">
<ctl name="USB_RX Mixer EP1" value="1" /> <ctl name="USB_RX Mixer EP1" value="1" />
</path> </path>
@ -722,6 +762,14 @@
<path name="voip-playback -> bt" /> <path name="voip-playback -> bt" />
</path> </path>
<path name="voip-playback-0 -> bluetooth-low-energy-headset">
<path name="voip-playback -> bt" />
</path>
<path name="voip-playback-0 -> bluetooth-low-energy-speaker">
<path name="voip-playback -> bt" />
</path>
<path name="voip-playback-0 -> usb"> <path name="voip-playback-0 -> usb">
<ctl name="USB_RX Mixer VOIP" value="1" /> <ctl name="USB_RX Mixer VOIP" value="1" />
</path> </path>
@ -832,6 +880,14 @@
<path name="haptic-playback -> bt" /> <path name="haptic-playback -> bt" />
</path> </path>
<path name="haptic-playback-0 -> bluetooth-low-energy-headset">
<path name="haptic-playback -> bt" />
</path>
<path name="haptic-playback-0 -> bluetooth-low-energy-speaker">
<path name="haptic-playback -> bt" />
</path>
<path name="haptic-playback-0 -> usb"> <path name="haptic-playback-0 -> usb">
<ctl name="USB_RX Mixer EP3" value="1" /> <ctl name="USB_RX Mixer EP3" value="1" />
<ctl name="TDM_0_RX Mixer EP8" value="1" /> <ctl name="TDM_0_RX Mixer EP8" value="1" />
@ -866,6 +922,14 @@
<path name="usb-microphones -> primary-capture-0" /> <path name="usb-microphones -> primary-capture-0" />
</path> </path>
<path name="bluetooth-sco-headset-microphones -> primary-capture-0">
<ctl name="EP1 TX Mixer BT_TX" value="1" />
</path>
<path name="bluetooth-low-energy-headset-microphones -> primary-capture-0">
<ctl name="EP1 TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> voip-capture-0"> <path name="microphones -> voip-capture-0">
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" /> <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
</path> </path>
@ -890,6 +954,10 @@
<ctl name="VOIP TX Mixer BT_TX" value="1" /> <ctl name="VOIP TX Mixer BT_TX" value="1" />
</path> </path>
<path name="bluetooth-low-energy-headset-microphones -> voip-capture-0">
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> fast-capture-0"> <path name="microphones -> fast-capture-0">
<ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" /> <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
</path> </path>
@ -914,6 +982,10 @@
<ctl name="EP3 TX Mixer BT_TX" value="1" /> <ctl name="EP3 TX Mixer BT_TX" value="1" />
</path> </path>
<path name="bluetooth-low-energy-headset-microphones -> fast-capture-0">
<ctl name="EP3 TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> sound-trigger-capture-0"> <path name="microphones -> sound-trigger-capture-0">
</path> </path>
@ -948,6 +1020,14 @@
<path name="voice-call-downlink-0 -> bt" /> <path name="voice-call-downlink-0 -> bt" />
</path> </path>
<path name="voice-call-downlink-0 -> bluetooth-low-energy-headset">
<path name="voice-call-downlink-0 -> bt" />
</path>
<path name="voice-call-downlink-0 -> bluetooth-low-energy-speaker">
<path name="voice-call-downlink-0 -> bt" />
</path>
<path name="voice-call-downlink-0 -> usb"> <path name="voice-call-downlink-0 -> usb">
<ctl name="USB_RX Mixer EP5" value="1" /> <ctl name="USB_RX Mixer EP5" value="1" />
</path> </path>
@ -988,6 +1068,10 @@
<ctl name="EP4 TX Mixer BT_TX" value="1" /> <ctl name="EP4 TX Mixer BT_TX" value="1" />
</path> </path>
<path name="bluetooth-low-energy-headset-microphones -> voice-call-uplink-0">
<ctl name="EP4 TX Mixer BT_TX" value="1" />
</path>
<path name="null-source -> voice-call-uplink-0"> <path name="null-source -> voice-call-uplink-0">
<ctl name="EP4 TX Mixer INCALL_TX" value="1" /> <ctl name="EP4 TX Mixer INCALL_TX" value="1" />
</path> </path>
@ -1052,6 +1136,10 @@
<ctl name="EP2 TX Mixer BT_TX" value="1" /> <ctl name="EP2 TX Mixer BT_TX" value="1" />
</path> </path>
<path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer BT_TX" value="1" />
</path>
<!-- codec setting --> <!-- codec setting -->
<!-- Rx device --> <!-- Rx device -->
<path name="speaker-earpiece"> <path name="speaker-earpiece">
@ -1222,6 +1310,10 @@
<ctl name="MIC Record Soft Gain (dB)" value="0" /> <ctl name="MIC Record Soft Gain (dB)" value="0" />
</path> </path>
<path name="bluetooth-low-energy-headset-microphones">
<path name="bluetooth-sco-headset-microphones" />
</path>
<path name="usb-headset-microphones"> <path name="usb-headset-microphones">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />

View file

@ -16,14 +16,11 @@
AUDIO_TABLE_FOLDER := husky AUDIO_TABLE_FOLDER := husky
# Enable this to build AIDL # Choose AIDL config by build flag.
# BUILD_AUDIO_AIDL_VERSION := true 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 else
# Platform Configuration for AudioHAL / SoundTriggerHAL # Platform Configuration for AudioHAL / SoundTriggerHAL
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \

View file

@ -50,6 +50,9 @@
<profile name="" format="AUDIO_FORMAT_AAC_HE_V2" <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
samplingRates="8000 16000 24000 32000 44100 48000" samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_OPUS"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort> </mixPort>
<mixPort name="haptic" role="source"> <mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -50,6 +50,9 @@
<profile name="" format="AUDIO_FORMAT_AAC_HE_V2" <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
samplingRates="8000 16000 24000 32000 44100 48000" samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_OPUS"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort> </mixPort>
<mixPort name="haptic" role="source"> <mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -50,6 +50,9 @@
<profile name="" format="AUDIO_FORMAT_AAC_HE_V2" <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
samplingRates="8000 16000 24000 32000 44100 48000" samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_OPUS"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort> </mixPort>
<mixPort name="haptic" role="source"> <mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -3,7 +3,7 @@
#EXPORT_FLAG BLUETOOTH #EXPORT_FLAG BLUETOOTH
#PARAM_MODE FULL #PARAM_MODE FULL
#SAVE_MODE 3 #SAVE_MODE 3
#SAVE_TIME 2023-09-14 20:13:28 #SAVE_TIME 2023-12-11 17:35:22
#CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-NB #CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-NB
#PARAM_TYPE TX+2RX #PARAM_TYPE TX+2RX
@ -3228,8 +3228,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH

View file

@ -3,7 +3,7 @@
#EXPORT_FLAG HANDSET #EXPORT_FLAG HANDSET
#PARAM_MODE FULL #PARAM_MODE FULL
#SAVE_MODE 3 #SAVE_MODE 3
#SAVE_TIME 2023-09-14 20:10:18 #SAVE_TIME 2023-12-11 17:49:37
#CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-NB #CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-NB
#PARAM_TYPE TX+2RX #PARAM_TYPE TX+2RX
@ -533,8 +533,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x6000 //TX_WIDE2_MEANHTH 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -3228,8 +3228,8 @@
521 0x0000 //TX_GSC_RTOL_TH 521 0x0000 //TX_GSC_RTOL_TH
522 0x0000 //TX_GSC_RTOH_TH 522 0x0000 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -5923,8 +5923,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -11313,8 +11313,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x6000 //TX_WIDE2_MEANHTH 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -14008,8 +14008,8 @@
521 0x0000 //TX_GSC_RTOL_TH 521 0x0000 //TX_GSC_RTOL_TH
522 0x0000 //TX_GSC_RTOH_TH 522 0x0000 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -16703,8 +16703,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -22093,8 +22093,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -27483,8 +27483,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -32873,8 +32873,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -38263,8 +38263,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -40958,8 +40958,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x6000 //TX_WIDE2_MEANHTH 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -43653,8 +43653,8 @@
521 0x0000 //TX_GSC_RTOL_TH 521 0x0000 //TX_GSC_RTOL_TH
522 0x0000 //TX_GSC_RTOH_TH 522 0x0000 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -46348,8 +46348,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -51738,8 +51738,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x6000 //TX_WIDE2_MEANHTH 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -54433,8 +54433,8 @@
521 0x0000 //TX_GSC_RTOL_TH 521 0x0000 //TX_GSC_RTOL_TH
522 0x0000 //TX_GSC_RTOH_TH 522 0x0000 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -57128,8 +57128,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -62518,8 +62518,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH

View file

@ -3,7 +3,7 @@
#EXPORT_FLAG HANDSFREE #EXPORT_FLAG HANDSFREE
#PARAM_MODE FULL #PARAM_MODE FULL
#SAVE_MODE 3 #SAVE_MODE 3
#SAVE_TIME 2023-09-14 20:13:51 #SAVE_TIME 2023-12-11 17:35:21
#CASE_NAME HANDSFREE-HANDSFREE-VOICE_GENERIC-NB #CASE_NAME HANDSFREE-HANDSFREE-VOICE_GENERIC-NB
#PARAM_TYPE TX+2RX #PARAM_TYPE TX+2RX
@ -3228,8 +3228,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH

View file

@ -3,7 +3,7 @@
#EXPORT_FLAG HEADSET #EXPORT_FLAG HEADSET
#PARAM_MODE FULL #PARAM_MODE FULL
#SAVE_MODE 3 #SAVE_MODE 3
#SAVE_TIME 2023-09-14 20:13:07 #SAVE_TIME 2023-12-11 17:35:18
#CASE_NAME HEADSET-USB_BLACKBIRD-VOICE_GENERIC-NB #CASE_NAME HEADSET-USB_BLACKBIRD-VOICE_GENERIC-NB
#PARAM_TYPE TX+2RX #PARAM_TYPE TX+2RX
@ -30178,8 +30178,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -70603,8 +70603,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH

View file

@ -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"
],
}

View file

@ -15,10 +15,6 @@
--> -->
<audioPlatformConfiguration xmlns:xi="http://www.w3.org/2001/XInclude"> <audioPlatformConfiguration xmlns:xi="http://www.w3.org/2001/XInclude">
<features> <features>
<feature name="ThermalThrottle">
<argument name="Type" value="SKIN" />
<argument name="Name" value="VIRTUAL-SKIN" />
</feature>
<feature name="BatteryThrottle"> <feature name="BatteryThrottle">
<argument name="Type" value="BCL_VOLTAGE" /> <argument name="Type" value="BCL_VOLTAGE" />
<argument name="Name" value="BCL_AUDIO_BAACL" /> <argument name="Name" value="BCL_AUDIO_BAACL" />
@ -26,7 +22,7 @@
</feature> </feature>
<feature name="PlaybackThermalThrottle"> <feature name="PlaybackThermalThrottle">
<argument name="PollWaitMs" value="20000" /> <argument name="PollWaitMs" value="20000" />
<argument name="ThermistorName" value="VIRTUAL-SKIN" /> <argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
<argument name="ThermistorType" value="SKIN" /> <argument name="ThermistorType" value="SKIN" />
<argument name="ThrottlingSeverity" value="MODERATE" /> <argument name="ThrottlingSeverity" value="MODERATE" />
</feature> </feature>
@ -47,15 +43,7 @@
<devices> <devices>
<device name="bluetooth" /> <device name="bluetooth" />
<device name="usb"> <device name="usb" />
<argument name="MaxSamplingRate" value="192000" />
<argument name="UnsupportedFormat" value="S24_LE" />
<argument name="MaxCapPacketInterval" value="125" />
<argument name="MaxCapSampleRate" value="192000" />
<argument name="MaxCapBitWidth" value="32" />
<argument name="MaxCapChannel" value="2" />
<argument name="EnableHifi192kMultichannel" value="0" />
</device>
<device name="speaker" codec="cs35l41"> <device name="speaker" codec="cs35l41">
<argument name="SpeakerNum" value="2" /> <argument name="SpeakerNum" value="2" />
<argument name="Rotation" /> <argument name="Rotation" />
@ -66,7 +54,7 @@
<tuners> <tuners>
<tuner type="playback" name="waves"> <tuner type="playback" name="waves">
<argument name="Sink" value="SPK" /> <argument name="Sink" value="SPK" />
<argument name="ThermistorsName" value="VIRTUAL-SKIN" /> <argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
</tuner> </tuner>
<tuner type="telephony" name="fortemedia"> <tuner type="telephony" name="fortemedia">
<argument name="VoIP_DLCHs" value="SPK:2,USB:2" /> <argument name="VoIP_DLCHs" value="SPK:2,USB:2" />

View file

@ -405,6 +405,14 @@
<path name="primary-playback -> bt" /> <path name="primary-playback -> bt" />
</path> </path>
<path name="primary-playback-0 -> bluetooth-low-energy-headset">
<path name="primary-playback -> bt" />
</path>
<path name="primary-playback-0 -> bluetooth-low-energy-speaker">
<path name="primary-playback -> bt" />
</path>
<path name="primary-playback-0 -> usb"> <path name="primary-playback-0 -> usb">
<ctl name="USB_RX Mixer EP2" value="1" /> <ctl name="USB_RX Mixer EP2" value="1" />
</path> </path>
@ -465,6 +473,14 @@
<path name="raw-playback -> bt" /> <path name="raw-playback -> bt" />
</path> </path>
<path name="raw-playback-0 -> bluetooth-low-energy-headset">
<path name="raw-playback -> bt" />
</path>
<path name="raw-playback-0 -> bluetooth-low-energy-speaker">
<path name="raw-playback -> bt" />
</path>
<path name="raw-playback-0 -> usb"> <path name="raw-playback-0 -> usb">
<ctl name="USB_RX Mixer RAW" value="1" /> <ctl name="USB_RX Mixer RAW" value="1" />
</path> </path>
@ -525,6 +541,14 @@
<path name="deep-buffer-playback -> bt" /> <path name="deep-buffer-playback -> bt" />
</path> </path>
<path name="deep-buffer-playback-0 -> bluetooth-low-energy-headset">
<path name="deep-buffer-playback -> bt" />
</path>
<path name="deep-buffer-playback-0 -> bluetooth-low-energy-speaker">
<path name="deep-buffer-playback -> bt" />
</path>
<path name="deep-buffer-playback-0 -> usb"> <path name="deep-buffer-playback-0 -> usb">
<ctl name="USB_RX Mixer EP6" value="1" /> <ctl name="USB_RX Mixer EP6" value="1" />
</path> </path>
@ -590,6 +614,14 @@
<path name="compress-offload-playback -> bt" /> <path name="compress-offload-playback -> bt" />
</path> </path>
<path name="compress-offload-playback-0 -> bluetooth-low-energy-headset">
<path name="compress-offload-playback -> bt" />
</path>
<path name="compress-offload-playback-0 -> bluetooth-low-energy-speaker">
<path name="compress-offload-playback -> bt" />
</path>
<path name="compress-offload-playback-0 -> usb"> <path name="compress-offload-playback-0 -> usb">
<ctl name="USB_RX Mixer EP7" value="1" /> <ctl name="USB_RX Mixer EP7" value="1" />
</path> </path>
@ -650,6 +682,14 @@
<path name="mmap-playback -> bt" /> <path name="mmap-playback -> bt" />
</path> </path>
<path name="mmap-playback-0 -> bluetooth-low-energy-headset">
<path name="mmap-playback -> bt" />
</path>
<path name="mmap-playback-0 -> bluetooth-low-energy-speaker">
<path name="mmap-playback -> bt" />
</path>
<path name="mmap-playback-0 -> usb"> <path name="mmap-playback-0 -> usb">
<ctl name="USB_RX Mixer EP1" value="1" /> <ctl name="USB_RX Mixer EP1" value="1" />
</path> </path>
@ -722,6 +762,14 @@
<path name="voip-playback -> bt" /> <path name="voip-playback -> bt" />
</path> </path>
<path name="voip-playback-0 -> bluetooth-low-energy-headset">
<path name="voip-playback -> bt" />
</path>
<path name="voip-playback-0 -> bluetooth-low-energy-speaker">
<path name="voip-playback -> bt" />
</path>
<path name="voip-playback-0 -> usb"> <path name="voip-playback-0 -> usb">
<ctl name="USB_RX Mixer VOIP" value="1" /> <ctl name="USB_RX Mixer VOIP" value="1" />
</path> </path>
@ -832,6 +880,14 @@
<path name="haptic-playback -> bt" /> <path name="haptic-playback -> bt" />
</path> </path>
<path name="haptic-playback-0 -> bluetooth-low-energy-headset">
<path name="haptic-playback -> bt" />
</path>
<path name="haptic-playback-0 -> bluetooth-low-energy-speaker">
<path name="haptic-playback -> bt" />
</path>
<path name="haptic-playback-0 -> usb"> <path name="haptic-playback-0 -> usb">
<ctl name="USB_RX Mixer EP3" value="1" /> <ctl name="USB_RX Mixer EP3" value="1" />
<ctl name="TDM_0_RX Mixer EP8" value="1" /> <ctl name="TDM_0_RX Mixer EP8" value="1" />
@ -866,6 +922,14 @@
<path name="usb-microphones -> primary-capture-0" /> <path name="usb-microphones -> primary-capture-0" />
</path> </path>
<path name="bluetooth-sco-headset-microphones -> primary-capture-0">
<ctl name="EP1 TX Mixer BT_TX" value="1" />
</path>
<path name="bluetooth-low-energy-headset-microphones -> primary-capture-0">
<ctl name="EP1 TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> voip-capture-0"> <path name="microphones -> voip-capture-0">
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" /> <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
</path> </path>
@ -890,6 +954,10 @@
<ctl name="VOIP TX Mixer BT_TX" value="1" /> <ctl name="VOIP TX Mixer BT_TX" value="1" />
</path> </path>
<path name="bluetooth-low-energy-headset-microphones -> voip-capture-0">
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> fast-capture-0"> <path name="microphones -> fast-capture-0">
<ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" /> <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
</path> </path>
@ -914,6 +982,10 @@
<ctl name="EP3 TX Mixer BT_TX" value="1" /> <ctl name="EP3 TX Mixer BT_TX" value="1" />
</path> </path>
<path name="bluetooth-low-energy-headset-microphones -> fast-capture-0">
<ctl name="EP3 TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> sound-trigger-capture-0"> <path name="microphones -> sound-trigger-capture-0">
</path> </path>
@ -948,6 +1020,14 @@
<path name="voice-call-downlink-0 -> bt" /> <path name="voice-call-downlink-0 -> bt" />
</path> </path>
<path name="voice-call-downlink-0 -> bluetooth-low-energy-headset">
<path name="voice-call-downlink-0 -> bt" />
</path>
<path name="voice-call-downlink-0 -> bluetooth-low-energy-speaker">
<path name="voice-call-downlink-0 -> bt" />
</path>
<path name="voice-call-downlink-0 -> usb"> <path name="voice-call-downlink-0 -> usb">
<ctl name="USB_RX Mixer EP5" value="1" /> <ctl name="USB_RX Mixer EP5" value="1" />
</path> </path>
@ -988,6 +1068,10 @@
<ctl name="EP4 TX Mixer BT_TX" value="1" /> <ctl name="EP4 TX Mixer BT_TX" value="1" />
</path> </path>
<path name="bluetooth-low-energy-headset-microphones -> voice-call-uplink-0">
<ctl name="EP4 TX Mixer BT_TX" value="1" />
</path>
<path name="null-source -> voice-call-uplink-0"> <path name="null-source -> voice-call-uplink-0">
<ctl name="EP4 TX Mixer INCALL_TX" value="1" /> <ctl name="EP4 TX Mixer INCALL_TX" value="1" />
</path> </path>
@ -1052,6 +1136,10 @@
<ctl name="EP2 TX Mixer BT_TX" value="1" /> <ctl name="EP2 TX Mixer BT_TX" value="1" />
</path> </path>
<path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer BT_TX" value="1" />
</path>
<!-- codec setting --> <!-- codec setting -->
<!-- Rx device --> <!-- Rx device -->
<path name="speaker-earpiece"> <path name="speaker-earpiece">
@ -1222,6 +1310,10 @@
<ctl name="MIC Record Soft Gain (dB)" value="0" /> <ctl name="MIC Record Soft Gain (dB)" value="0" />
</path> </path>
<path name="bluetooth-low-energy-headset-microphones">
<path name="bluetooth-sco-headset-microphones" />
</path>
<path name="usb-headset-microphones"> <path name="usb-headset-microphones">
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />

View file

@ -16,14 +16,11 @@
AUDIO_TABLE_FOLDER := shiba AUDIO_TABLE_FOLDER := shiba
# Enable this to build AIDL # Choose AIDL config by build flag.
# BUILD_AUDIO_AIDL_VERSION := true 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 else
# Platform Configuration for AudioHAL / SoundTriggerHAL # Platform Configuration for AudioHAL / SoundTriggerHAL
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \

View file

@ -50,6 +50,9 @@
<profile name="" format="AUDIO_FORMAT_AAC_HE_V2" <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
samplingRates="8000 16000 24000 32000 44100 48000" samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_OPUS"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort> </mixPort>
<mixPort name="haptic" role="source"> <mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -50,6 +50,9 @@
<profile name="" format="AUDIO_FORMAT_AAC_HE_V2" <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
samplingRates="8000 16000 24000 32000 44100 48000" samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_OPUS"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort> </mixPort>
<mixPort name="haptic" role="source"> <mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

View file

@ -50,6 +50,9 @@
<profile name="" format="AUDIO_FORMAT_AAC_HE_V2" <profile name="" format="AUDIO_FORMAT_AAC_HE_V2"
samplingRates="8000 16000 24000 32000 44100 48000" samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/> channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
<profile name="" format="AUDIO_FORMAT_OPUS"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>
</mixPort> </mixPort>
<mixPort name="haptic" role="source"> <mixPort name="haptic" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

File diff suppressed because it is too large Load diff

View file

@ -3,7 +3,7 @@
#EXPORT_FLAG HANDSET #EXPORT_FLAG HANDSET
#PARAM_MODE FULL #PARAM_MODE FULL
#SAVE_MODE 3 #SAVE_MODE 3
#SAVE_TIME 2023-09-13 17:44:33 #SAVE_TIME 2023-12-11 17:50:38
#CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-NB #CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-NB
#PARAM_TYPE TX+2RX #PARAM_TYPE TX+2RX
@ -533,8 +533,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x6000 //TX_WIDE2_MEANHTH 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -3228,8 +3228,8 @@
521 0x0000 //TX_GSC_RTOL_TH 521 0x0000 //TX_GSC_RTOL_TH
522 0x0000 //TX_GSC_RTOH_TH 522 0x0000 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -5923,8 +5923,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -11313,8 +11313,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x6000 //TX_WIDE2_MEANHTH 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -14008,8 +14008,8 @@
521 0x0000 //TX_GSC_RTOL_TH 521 0x0000 //TX_GSC_RTOL_TH
522 0x0000 //TX_GSC_RTOH_TH 522 0x0000 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -16703,8 +16703,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -22093,8 +22093,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -27483,8 +27483,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -32873,8 +32873,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -38263,8 +38263,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -40958,8 +40958,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x6000 //TX_WIDE2_MEANHTH 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -43653,8 +43653,8 @@
521 0x0000 //TX_GSC_RTOL_TH 521 0x0000 //TX_GSC_RTOL_TH
522 0x0000 //TX_GSC_RTOH_TH 522 0x0000 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -46348,8 +46348,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -51738,8 +51738,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x6000 //TX_WIDE2_MEANHTH 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -54433,8 +54433,8 @@
521 0x0000 //TX_GSC_RTOL_TH 521 0x0000 //TX_GSC_RTOL_TH
522 0x0000 //TX_GSC_RTOH_TH 522 0x0000 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -57128,8 +57128,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -62518,8 +62518,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH

View file

@ -3,7 +3,7 @@
#EXPORT_FLAG HANDSFREE #EXPORT_FLAG HANDSFREE
#PARAM_MODE FULL #PARAM_MODE FULL
#SAVE_MODE 3 #SAVE_MODE 3
#SAVE_TIME 2023-09-13 17:44:57 #SAVE_TIME 2023-12-11 17:37:01
#CASE_NAME HANDSFREE-HANDSFREE-VOICE_GENERIC-NB #CASE_NAME HANDSFREE-HANDSFREE-VOICE_GENERIC-NB
#PARAM_TYPE TX+2RX #PARAM_TYPE TX+2RX
@ -3228,8 +3228,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH

View file

@ -3,7 +3,7 @@
#EXPORT_FLAG HEADSET #EXPORT_FLAG HEADSET
#PARAM_MODE FULL #PARAM_MODE FULL
#SAVE_MODE 3 #SAVE_MODE 3
#SAVE_TIME 2023-09-13 17:45:47 #SAVE_TIME 2023-12-11 17:36:58
#CASE_NAME HEADSET-USB_BLACKBIRD-VOICE_GENERIC-NB #CASE_NAME HEADSET-USB_BLACKBIRD-VOICE_GENERIC-NB
#PARAM_TYPE TX+2RX #PARAM_TYPE TX+2RX
@ -30178,8 +30178,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH
@ -70603,8 +70603,8 @@
521 0x3A98 //TX_GSC_RTOL_TH 521 0x3A98 //TX_GSC_RTOL_TH
522 0x3A98 //TX_GSC_RTOH_TH 522 0x3A98 //TX_GSC_RTOH_TH
523 0x7E2C //TX_WIDE2_MEANHTH 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5 524 0x0064 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6 525 0x1000 //TX_DR_RESRV_6
526 0x122E //TX_DR_RESRV_7 526 0x122E //TX_DR_RESRV_7
527 0x1100 //TX_DR_RESRV_8 527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH 528 0x1333 //TX_WIND_MARK_TH

22
avf/Android.bp Normal file
View file

@ -0,0 +1,22 @@
//
// 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.
prebuilt_etc {
name: "shusky_assignable_devices.xml",
src: "assignable_devices.xml",
filename: "assignable_devices.xml",
vendor: true,
relative_install_path: "avf",
}

View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.
-->
<devices>
<device>
<kind>eh</kind>
<dtbo_label>eh</dtbo_label>
<sysfs_path>/sys/bus/platform/devices/16d00000.eh</sysfs_path>
</device>
</devices>

View file

@ -3,9 +3,6 @@
# Uart port name # Uart port name
UartPort = /dev/ttySAC18 UartPort = /dev/ttySAC18
# Userial type
UserialType = 2
# <boolean> Enable check whether let aoc controls power pin # <boolean> Enable check whether let aoc controls power pin
AocPowerPinCtrlCheckEnable = true AocPowerPinCtrlCheckEnable = true
@ -17,6 +14,9 @@ HwStageDoesNotCtrlPowerPinFromAoc = PROTO1.0-EVT1.0-EVT1.2
# supported by BT firmware. # supported by BT firmware.
HwStageWithOldChipFwNoLongerSupport = PROTO1.0-PROTO1.1 HwStageWithOldChipFwNoLongerSupport = PROTO1.0-PROTO1.1
# <boolean> APM Uart skip suspend to aovid hold system too long when BT using AOC UART
ApmUartSkipSuspend = true
# Sar backOff high resolution support # Sar backOff high resolution support
SarBackOffHighResolution = true SarBackOffHighResolution = true

View file

@ -3,9 +3,6 @@
# Uart port name # Uart port name
UartPort = /dev/ttySAC18 UartPort = /dev/ttySAC18
# Userial type
UserialType = 2
# Sar backOff high resolution support # Sar backOff high resolution support
SarBackOffHighResolution = true SarBackOffHighResolution = true

View file

@ -32,6 +32,9 @@
<scenario encode="OneChanMono_24_2" decode="invalid"/> <scenario encode="OneChanMono_24_2" decode="invalid"/>
<scenario encode="TwoChanStereo_24_2" decode="invalid"/> <scenario encode="TwoChanStereo_24_2" decode="invalid"/>
<scenario encode="OneChanStereo_24_2" decode="invalid"/> <scenario encode="OneChanStereo_24_2" decode="invalid"/>
<scenario encode="OneChanMono_48_2" decode="invalid"/>
<scenario encode="TwoChanStereo_48_2" decode="invalid"/>
<scenario encode="OneChanStereo_48_2" decode="invalid"/>
<scenario encode="OneChanMono_48_4" decode="invalid"/> <scenario encode="OneChanMono_48_4" decode="invalid"/>
<scenario encode="TwoChanStereo_48_4" decode="invalid"/> <scenario encode="TwoChanStereo_48_4" decode="invalid"/>
<scenario encode="OneChanStereo_48_4" decode="invalid"/> <scenario encode="OneChanStereo_48_4" decode="invalid"/>
@ -44,6 +47,8 @@
<scenario encode="OneChanStereo_16_2" decode="OneChanMono_16_2"/> <scenario encode="OneChanStereo_16_2" decode="OneChanMono_16_2"/>
<scenario encode="TwoChanStereo_16_2" decode="OneChanMono_16_2"/> <scenario encode="TwoChanStereo_16_2" decode="OneChanMono_16_2"/>
<scenario encode="OneChanMono_16_2" decode="OneChanMono_16_2"/> <scenario encode="OneChanMono_16_2" decode="OneChanMono_16_2"/>
<scenario encode="OneChanStereo_32_2" decode="OneChanStereo_32_2"/>
<scenario encode="OneChanStereo_32_2" decode="OneChanMono_32_2"/>
<scenario encode="TwoChanStereo_32_2" decode="OneChanMono_32_2"/> <scenario encode="TwoChanStereo_32_2" decode="OneChanMono_32_2"/>
<scenario encode="OneChanMono_32_2" decode="OneChanMono_32_2"/> <scenario encode="OneChanMono_32_2" decode="OneChanMono_32_2"/>
<!-- broadcast --> <!-- broadcast -->
@ -62,8 +67,12 @@
<configuration name="OneChanMono_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/> <configuration name="OneChanMono_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
<configuration name="TwoChanStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/> <configuration name="TwoChanStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
<configuration name="OneChanStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/> <configuration name="OneChanStereo_24_2" codecConfiguration="LC3_24k_2" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
<configuration name="OneChanStereo_32_2" codecConfiguration="LC3_32k_2" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
<configuration name="OneChanMono_32_2" codecConfiguration="LC3_32k_2" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/> <configuration name="OneChanMono_32_2" codecConfiguration="LC3_32k_2" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
<configuration name="TwoChanStereo_32_2" codecConfiguration="LC3_32k_2" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/> <configuration name="TwoChanStereo_32_2" codecConfiguration="LC3_32k_2" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
<configuration name="OneChanMono_48_2" codecConfiguration="LC3_48k_2" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
<configuration name="TwoChanStereo_48_2" codecConfiguration="LC3_48k_2" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
<configuration name="OneChanStereo_48_2" codecConfiguration="LC3_48k_2" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>
<configuration name="OneChanMono_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/> <configuration name="OneChanMono_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="MONO_ONE_CIS_PER_DEVICE"/>
<configuration name="TwoChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/> <configuration name="TwoChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_TWO_CISES_PER_DEVICE"/>
<configuration name="OneChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/> <configuration name="OneChanStereo_48_4" codecConfiguration="LC3_48k_4" strategyConfiguration="STEREO_ONE_CIS_PER_DEVICE"/>

24
camera/camera.mk Normal file
View file

@ -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))

View file

@ -1,9 +1,6 @@
# Husky specific init.rc # Husky specific init.rc
import /vendor/etc/init/hw/init.zuma.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 on init && property:ro.vendor.factory=1
import /vendor/etc/init/hw/init.factory.rc 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
chown system system /mnt/vendor/persist/haptics/cs40l26.cal 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/0-0043/calibration/f0_stored
chown system system /sys/bus/i2c/devices/5-0043/calibration/f0_stored chown system system /sys/bus/i2c/devices/0-0043/calibration/q_stored
chown system system /sys/bus/i2c/devices/4-0043/calibration/f0_stored chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored
chown system system /sys/bus/i2c/devices/6-0043/calibration/q_stored chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state
chown system system /sys/bus/i2c/devices/5-0043/calibration/q_stored chown system system /sys/bus/i2c/devices/0-0043/default/num_waves
chown system system /sys/bus/i2c/devices/4-0043/calibration/q_stored chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset
chown system system /sys/bus/i2c/devices/6-0043/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space
chown system system /sys/bus/i2c/devices/5-0043/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable
chown system system /sys/bus/i2c/devices/4-0043/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable
chown system system /sys/bus/i2c/devices/6-0043/default/vibe_state chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us
chown system system /sys/bus/i2c/devices/5-0043/default/vibe_state chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_env_rel_coef
chown system system /sys/bus/i2c/devices/4-0043/default/vibe_state chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_rise_headroom
chown system system /sys/bus/i2c/devices/6-0043/default/num_waves chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_fall_headroom
chown system system /sys/bus/i2c/devices/5-0043/default/num_waves chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_enable
chown system system /sys/bus/i2c/devices/4-0043/default/num_waves chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_thresh_fs
chown system system /sys/bus/i2c/devices/6-0043/default/f0_offset chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_hold_off_ms
chown system system /sys/bus/i2c/devices/5-0043/default/f0_offset chown system system /sys/bus/i2c/devices/0-0043/default/pm_active_timeout_ms
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
enable vendor.vibrator.cs40l26 enable vendor.vibrator.cs40l26

View file

@ -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.cal
chown system system /mnt/vendor/persist/haptics/cs40l26_dual.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/0-0043/calibration/f0_stored
chown system system /sys/bus/i2c/devices/5-0043/calibration/f0_stored chown system system /sys/bus/i2c/devices/0-0042/calibration/f0_stored
chown system system /sys/bus/i2c/devices/4-0043/calibration/f0_stored chown system system /sys/bus/i2c/devices/0-0043/calibration/q_stored
chown system system /sys/bus/i2c/devices/6-0042/calibration/f0_stored chown system system /sys/bus/i2c/devices/0-0042/calibration/q_stored
chown system system /sys/bus/i2c/devices/5-0042/calibration/f0_stored chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored
chown system system /sys/bus/i2c/devices/4-0042/calibration/f0_stored chown system system /sys/bus/i2c/devices/0-0042/calibration/redc_stored
chown system system /sys/bus/i2c/devices/6-0043/calibration/q_stored chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state
chown system system /sys/bus/i2c/devices/5-0043/calibration/q_stored chown system system /sys/bus/i2c/devices/0-0042/default/vibe_state
chown system system /sys/bus/i2c/devices/4-0043/calibration/q_stored chown system system /sys/bus/i2c/devices/0-0043/default/num_waves
chown system system /sys/bus/i2c/devices/6-0042/calibration/q_stored chown system system /sys/bus/i2c/devices/0-0042/default/num_waves
chown system system /sys/bus/i2c/devices/5-0042/calibration/q_stored chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset
chown system system /sys/bus/i2c/devices/4-0042/calibration/q_stored chown system system /sys/bus/i2c/devices/0-0042/default/f0_offset
chown system system /sys/bus/i2c/devices/6-0043/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space
chown system system /sys/bus/i2c/devices/5-0043/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0042/default/owt_free_space
chown system system /sys/bus/i2c/devices/4-0043/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable
chown system system /sys/bus/i2c/devices/6-0042/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0042/default/f0_comp_enable
chown system system /sys/bus/i2c/devices/5-0042/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable
chown system system /sys/bus/i2c/devices/4-0042/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0042/default/redc_comp_enable
chown system system /sys/bus/i2c/devices/6-0043/default/vibe_state chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us
chown system system /sys/bus/i2c/devices/5-0043/default/vibe_state chown system system /sys/bus/i2c/devices/0-0042/default/delay_before_stop_playback_us
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
enable vendor.vibrator.cs40l26 enable vendor.vibrator.cs40l26
enable vendor.vibrator.cs40l26-dual enable vendor.vibrator.cs40l26-dual

View file

@ -1,9 +1,6 @@
# Shiba specific init.rc # Shiba specific init.rc
import /vendor/etc/init/hw/init.zuma.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 on init && property:ro.vendor.factory=1
import /vendor/etc/init/hw/init.factory.rc 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
chown system system /mnt/vendor/persist/haptics/cs40l26.cal 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/0-0043/calibration/f0_stored
chown system system /sys/bus/i2c/devices/5-0043/calibration/f0_stored chown system system /sys/bus/i2c/devices/0-0043/calibration/q_stored
chown system system /sys/bus/i2c/devices/4-0043/calibration/f0_stored chown system system /sys/bus/i2c/devices/0-0043/calibration/redc_stored
chown system system /sys/bus/i2c/devices/6-0043/calibration/q_stored chown system system /sys/bus/i2c/devices/0-0043/default/vibe_state
chown system system /sys/bus/i2c/devices/5-0043/calibration/q_stored chown system system /sys/bus/i2c/devices/0-0043/default/num_waves
chown system system /sys/bus/i2c/devices/4-0043/calibration/q_stored chown system system /sys/bus/i2c/devices/0-0043/default/f0_offset
chown system system /sys/bus/i2c/devices/6-0043/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0043/default/owt_free_space
chown system system /sys/bus/i2c/devices/5-0043/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0043/default/f0_comp_enable
chown system system /sys/bus/i2c/devices/4-0043/calibration/redc_stored chown system system /sys/bus/i2c/devices/0-0043/default/redc_comp_enable
chown system system /sys/bus/i2c/devices/6-0043/default/vibe_state chown system system /sys/bus/i2c/devices/0-0043/default/delay_before_stop_playback_us
chown system system /sys/bus/i2c/devices/5-0043/default/vibe_state chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_env_rel_coef
chown system system /sys/bus/i2c/devices/4-0043/default/vibe_state chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_rise_headroom
chown system system /sys/bus/i2c/devices/6-0043/default/num_waves chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_fall_headroom
chown system system /sys/bus/i2c/devices/5-0043/default/num_waves chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_enable
chown system system /sys/bus/i2c/devices/4-0043/default/num_waves chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_thresh_fs
chown system system /sys/bus/i2c/devices/6-0043/default/f0_offset chown system system /sys/bus/i2c/devices/0-0043/dbc/dbc_tx_lvl_hold_off_ms
chown system system /sys/bus/i2c/devices/5-0043/default/f0_offset chown system system /sys/bus/i2c/devices/0-0043/default/pm_active_timeout_ms
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
enable vendor.vibrator.cs40l26 enable vendor.vibrator.cs40l26

View file

@ -14,21 +14,28 @@
# limitations under the License. # 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_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 LOCAL_PATH := device/google/shusky
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
USE_UWBFIELDTESTQM := true USE_UWBFIELDTESTQM := true
endif 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/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/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/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/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/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) $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersHusky.mk)
# display # 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_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 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/audio/husky/audio-tables.mk
include device/google/shusky/camera/camera.mk
include device/google/zuma/device-shipping-common.mk include device/google/zuma/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk include hardware/google/pixel/vibrator/cs40l26/device.mk
include device/google/gs-common/bcmbt/bluetooth.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/gti/gti.mk
include device/google/gs-common/touch/touchinspector/touchinspector.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 # Init files
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/shusky/conf/init.husky.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.husky.rc 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_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 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 # NFC
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ 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 device/google/shusky/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ $(RELEASE_PACKAGE_NFC_STACK) \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc-service.st
@ -196,14 +197,18 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/shusky/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml 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 # 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. # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683.
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.leaudio.notify.idle.during.call=true 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 += \ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.leaudio.dual_bidirection_swb.supported=false bluetooth.leaudio.dual_bidirection_swb.supported=true
# Support One-Handed mode # Support One-Handed mode
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
@ -252,6 +257,17 @@ PRODUCT_PACKAGES += \
# Trusty liboemcrypto.so # Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts 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 # Location
# SDK build system # SDK build system
@ -278,12 +294,19 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.device_config.configuration.disable_rescue_party=true persist.device_config.configuration.disable_rescue_party=true
# Fingerprint HAL # Fingerprint HAL
GOODIX_CONFIG_BUILD_VERSION := g7_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
include device/google/gs101/fingerprint/udfps_common.mk APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
ifeq ($(filter factory%, $(TARGET_PRODUCT)),) else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
include device/google/gs101/fingerprint/udfps_shipping.mk APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2
else 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 endif
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
@ -299,7 +322,10 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.front_720P_always_binning=true persist.vendor.camera.front_720P_always_binning=true
# Media Performance Class 14 # 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 # config of display brightness dimming
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.dimming.usage?=1 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.0.brightness.dimming.usage?=1
@ -334,7 +360,7 @@ PRODUCT_COPY_FILES += \
ACTUATOR_MODEL := luxshare_ict_081545 ACTUATOR_MODEL := luxshare_ict_081545
ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
PRODUCT_VENDOR_PROPERTIES += \ 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.device.mass=0.222 \
ro.vendor.vibrator.hal.loc.coeff=2.8 \ ro.vendor.vibrator.hal.loc.coeff=2.8 \
persist.vendor.vibrator.hal.context.enable=false \ persist.vendor.vibrator.hal.context.enable=false \
@ -352,7 +378,7 @@ PRODUCT_VENDOR_PROPERTIES += \
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=6 ro.vendor.build.svn=13
# WLC userdebug specific # WLC userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) 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 # Keyboard height ratio and bottom padding in dp for portrait mode
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
ro.com.google.ime.kb_pad_port_b=10.4 \ ro.com.google.ime.kb_pad_port_b=10.4
ro.com.google.ime.height_ratio=1.0
PRODUCT_PRODUCT_PROPERTIES ?= \
ro.com.google.ime.height_ratio=1.0
# Enable camera exif model/make reporting # Enable camera exif model/make reporting
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.exif_reveal_make_model=true persist.vendor.camera.exif_reveal_make_model=true
# AVF assignable devices xml
PRODUCT_PACKAGES += shusky_assignable_devices.xml
# Enable DeviceAsWebcam support # Enable DeviceAsWebcam support
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.usb.uvc.enabled=true ro.usb.uvc.enabled=true
# DisplayPort should be disabled by default (b/300167292) PRODUCT_PACKAGES += \
PRODUCT_VENDOR_PROPERTIES += \ NfcOverlayHusky \
persist.vendor.usb.displayport.enabled=0

View file

@ -14,12 +14,19 @@
# limitations under the License. # 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_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))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
USE_UWBFIELDTESTQM := true USE_UWBFIELDTESTQM := true
endif 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/shusky/prebuilts/device-vendor-ripcurrent.mk)
$(call inherit-product-if-exists, vendor/google_devices/zuma/prebuilts/device-vendor.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/google_devices/shusky/proprietary/ripcurrent/device-vendor-ripcurrent.mk)
$(call inherit-product-if-exists, vendor/qorvo/uwb/qm35-hal/Device.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/audio/ripcurrent/audio-tables.mk
include device/google/shusky/camera/camera.mk
include device/google/zuma/device-shipping-common.mk include device/google/zuma/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk include hardware/google/pixel/vibrator/cs40l26/device-stereo.mk
include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/gps/brcm/cbd_gps.mk include device/google/gs-common/gps/brcm/cbd_gps.mk
include device/google/gs-common/touch/stm/stm20.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 # display
DEVICE_PACKAGE_OVERLAYS += device/google/shusky/ripcurrent/overlay DEVICE_PACKAGE_OVERLAYS += device/google/shusky/ripcurrent/overlay
@ -50,10 +55,6 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/shusky/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.ripcurrent.rc 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 # NFC
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ 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 device/google/shusky/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ $(RELEASE_PACKAGE_NFC_STACK) \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc-service.st
@ -96,6 +97,10 @@ PRODUCT_PACKAGES += \
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true ro.audio.spatializer_enabled=true
# DCK properties based on target
PRODUCT_PROPERTY_OVERRIDES += \
ro.gms.dck.eligible_wcc=3
# Bluetooth hci_inject test tool # Bluetooth hci_inject test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \
hci_inject hci_inject
@ -166,9 +171,9 @@ PRODUCT_COPY_FILES += \
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.leaudio.notify.idle.during.call=true 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 += \ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.leaudio.dual_bidirection_swb.supported=false bluetooth.leaudio.dual_bidirection_swb.supported=true
# Keymaster HAL # Keymaster HAL
#LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service #LOCAL_KEYMASTER_PRODUCT_PACKAGE ?= android.hardware.keymaster@4.1-service
@ -210,6 +215,17 @@ PRODUCT_PACKAGES += \
# Trusty liboemcrypto.so # Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts 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 # Location
# SDK build system # SDK build system
@ -246,7 +262,7 @@ PRODUCT_VENDOR_PROPERTIES += \
# Vibrator HAL # Vibrator HAL
ACTUATOR_MODEL := luxshare_ict_081545 ACTUATOR_MODEL := luxshare_ict_081545
PRODUCT_VENDOR_PROPERTIES += \ 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.device.mass=0.222 \
ro.vendor.vibrator.hal.loc.coeff=2.8 ro.vendor.vibrator.hal.loc.coeff=2.8

View file

@ -14,8 +14,11 @@
# limitations under the License. # 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_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 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) $(call inherit-product-if-exists, vendor/google_devices/shusky/proprietary/WallpapersShiba.mk)
DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay DEVICE_PACKAGE_OVERLAYS += device/google/shusky/shiba/overlay
CAMERA_PRODUCT ?= shiba
include device/google/shusky/audio/shiba/audio-tables.mk 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 device/google/zuma/device-shipping-common.mk
include hardware/google/pixel/vibrator/cs40l26/device.mk include hardware/google/pixel/vibrator/cs40l26/device.mk
include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/bcmbt/bluetooth.mk
include device/google/gs-common/touch/gti/gti.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 # Init files
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/shusky/conf/init.shiba.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.shiba.rc 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 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 # Camera
PRODUCT_COPY_FILES += \
device/google/shusky/media_profiles_shiba.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.camera.rls_range_supported=false 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 device/google/shusky/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
NfcNci \ $(RELEASE_PACKAGE_NFC_STACK) \
Tag \ Tag \
android.hardware.nfc-service.st android.hardware.nfc-service.st
@ -187,14 +185,18 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/shusky/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml 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 # 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. # Set the property only for the controller couldn't support CIS/SCO simultaneously. More detailed in b/242908683.
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
persist.bluetooth.leaudio.notify.idle.during.call=true 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 += \ PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.leaudio.dual_bidirection_swb.supported=false bluetooth.leaudio.dual_bidirection_swb.supported=true
# Support One-Handed mode # Support One-Handed mode
PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \
@ -242,6 +244,13 @@ PRODUCT_PACKAGES += \
# Trusty liboemcrypto.so # Trusty liboemcrypto.so
PRODUCT_SOONG_NAMESPACES += vendor/google_devices/shusky/prebuilts 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 # Location
# SDK build system # SDK build system
@ -268,12 +277,19 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.device_config.configuration.disable_rescue_party=true persist.device_config.configuration.disable_rescue_party=true
# Fingerprint HAL # Fingerprint HAL
GOODIX_CONFIG_BUILD_VERSION := g7_trusty ifneq (,$(filter AP1%,$(RELEASE_PLATFORM_VERSION)))
include device/google/gs101/fingerprint/udfps_common.mk APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q1
ifeq ($(filter factory%, $(TARGET_PRODUCT)),) else ifneq (,$(filter AP2%,$(RELEASE_PLATFORM_VERSION)))
include device/google/gs101/fingerprint/udfps_shipping.mk APEX_FPS_TA_DIR := //vendor/google_devices/shusky/prebuilts/firmware/fingerprint/24Q2
else 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 endif
# Fingerprint exposure compensation # Fingerprint exposure compensation
@ -281,7 +297,7 @@ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.udfps.auto_exposure_compensation_supported=true persist.vendor.udfps.auto_exposure_compensation_supported=true
# Display # 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 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += ro.surface_flinger.ignore_hdr_camera_layers=true
# lhbm peak brightness delay: decided by kernel # lhbm peak brightness delay: decided by kernel
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.primarydisplay.lhbm.frames_to_reach_peak_brightness=0 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 persist.vendor.camera.front_720P_always_binning=true
# Media Performance Class 14 # 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 # Display LBE
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.display.lbe.supported=1 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 ACTUATOR_MODEL := luxshare_ict_081545
ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1
PRODUCT_VENDOR_PROPERTIES += \ 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.device.mass=0.187 \
ro.vendor.vibrator.hal.loc.coeff=2.75 \ ro.vendor.vibrator.hal.loc.coeff=2.75 \
persist.vendor.vibrator.hal.context.enable=false \ persist.vendor.vibrator.hal.context.enable=false \
@ -333,7 +352,7 @@ PRODUCT_VENDOR_PROPERTIES += \
# Increment the SVN for any official public releases # Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=6 ro.vendor.build.svn=13
# P23 Devices no longer need rlsservice # P23 Devices no longer need rlsservice
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
@ -377,10 +396,12 @@ PRODUCT_PRODUCT_PROPERTIES += \
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
persist.vendor.camera.exif_reveal_make_model=true persist.vendor.camera.exif_reveal_make_model=true
# AVF assignable devices xml
PRODUCT_PACKAGES += shusky_assignable_devices.xml
# Enable DeviceAsWebcam support # Enable DeviceAsWebcam support
PRODUCT_VENDOR_PROPERTIES += \ PRODUCT_VENDOR_PROPERTIES += \
ro.usb.uvc.enabled=true ro.usb.uvc.enabled=true
# DisplayPort should be disabled by default (b/300167292) PRODUCT_PACKAGES += \
PRODUCT_VENDOR_PROPERTIES += \ NfcOverlayShiba
persist.vendor.usb.displayport.enabled=0

View file

@ -24,7 +24,24 @@ BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1
TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := husky 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 BOARD_USES_GENERIC_AUDIO := true
USES_DEVICE_GOOGLE_SHUSKY := true USES_DEVICE_GOOGLE_SHUSKY := true
BOARD_KERNEL_CMDLINE += swiotlb=noforce 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 vendor/google_devices/husky/proprietary/BoardConfigVendor.mk
include device/google/shusky-sepolicy/husky-sepolicy.mk include device/google/shusky-sepolicy/husky-sepolicy.mk
include device/google/shusky/wifi/BoardConfig-wifi.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

View file

@ -48,9 +48,6 @@
<!-- 140 nits: (140-2)/(1000-2)*(0.63-0.0)+0.0 = 0.087114228 --> <!-- 140 nits: (140-2)/(1000-2)*(0.63-0.0)+0.0 = 0.087114228 -->
<item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.087114228</item> <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.087114228</item>
<!-- Allow normal brightness controller feature. -->
<bool name="config_allowNormalBrightnessControllerFeature">true</bool>
<!-- Array of light sensor LUX values to define our levels for auto backlight brightness support. <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
The N entries of this array define N 1 zones as follows: The N entries of this array define N 1 zones as follows:
Zone 0: 0 <= LUX < array[0] Zone 0: 0 <= LUX < array[0]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 408 KiB

After

Width:  |  Height:  |  Size: 151 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 404 KiB

After

Width:  |  Height:  |  Size: 149 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 586 KiB

After

Width:  |  Height:  |  Size: 222 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 509 KiB

After

Width:  |  Height:  |  Size: 191 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 685 KiB

After

Width:  |  Height:  |  Size: 271 KiB

Before After
Before After

View file

@ -0,0 +1,9 @@
package {
default_applicable_licenses: ["device_google_shusky_license"],
}
runtime_resource_overlay {
name: "NfcOverlayHusky",
sdk_version: "current",
product_specific: true
}

View file

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.
-->
<!-- Pixel specific nfc overlays -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.nfc.overlay"
android:versionCode="1"
android:versionName="1.0">
<application android:hasCode="false" />
<overlay
android:targetPackage="com.android.nfc"
android:targetName="NfcCustomization"
android:isStatic="true"
android:priority="0"/>
</manifest>

View file

@ -0,0 +1,2 @@
# Bug component: 48448
include platform/packages/apps/Nfc:/OWNERS

View file

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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.
-->
<resources>
<bool name="nfcc_always_on_allowed">false</bool>
<bool name="polling_disable_allowed">true</bool>
<string-array name="config_skuSupportsSecureNfc" translatable="false">
<item>GC3VE</item>
<item>G1MNW</item>
<item>GE9DP</item>
</string-array>
<bool name="tag_intent_app_pref_supported">true</bool>
<!-- NFC Antenna Location API -->
<integer name="device_width">73</integer>
<integer name="device_height">158</integer>
<bool name="device_foldable">false</bool>
<integer-array name="antenna_x">
<item>37</item>
</integer-array>
<integer-array name="antenna_y">
<item>103</item>
</integer-array>
</resources>

View file

@ -17,4 +17,17 @@
*/ */
--> -->
<resources> <resources>
<!-- When true, the filter engine will alter UWB values to improve accuracy. -->
<bool name="enable_filters">true</bool>
<!-- Enables the AoA conversion primer. This is needed on hardware that does not convert AoA
to spherical coordinates, including hardware that does not support elevation.-->
<bool name="enable_primer_aoa">true</bool>
<!-- Whether background ranging is enabled or not
If enabled:
* Background 3p apps are allowed to open new ranging sessions
* When previously foreground 3p apps moves to background, sessions are not terminated
-->
<bool name = "background_ranging_enabled">true</bool>
</resources> </resources>

View file

@ -35,7 +35,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="false" SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"

View file

@ -35,7 +35,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="false" SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"

View file

@ -35,7 +35,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="false" SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"

View file

@ -34,7 +34,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="false" SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"

View file

@ -34,7 +34,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="false" SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"

View file

@ -34,7 +34,7 @@
SuplVersion="2" SuplVersion="2"
SuplMinorVersion="0" SuplMinorVersion="0"
SuplOtdoaCapable="true" SuplOtdoaCapable="true"
SuplOtdoaCapable2="false" SuplOtdoaCapable2="true"
SuplGlonassCapable = "true" SuplGlonassCapable = "true"
SuplGalileoCapable = "true" SuplGalileoCapable = "true"
SuplBdsCapable = "true" SuplBdsCapable = "true"

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -235,6 +235,7 @@
"Name": "CPUUtilThreshold", "Name": "CPUUtilThreshold",
"Path": "/proc/vendor_sched/util_threshold", "Path": "/proc/vendor_sched/util_threshold",
"Values": [ "Values": [
"2048 1280 1280",
"1280", "1280",
"1100" "1100"
], ],
@ -273,7 +274,7 @@
}, },
{ {
"Name": "BGUClampMaxBoost", "Name": "BGUClampMaxBoost",
"Path": "/proc/vendor_sched/bg_uclamp_max", "Path": "/proc/vendor_sched/groups/bg/uclamp_max",
"Values": [ "Values": [
"130", "130",
"512" "512"
@ -283,7 +284,7 @@
}, },
{ {
"Name": "Dex2oatUClampMaxBoost", "Name": "Dex2oatUClampMaxBoost",
"Path": "/proc/vendor_sched/dex2oat_uclamp_max", "Path": "/proc/vendor_sched/groups/dex2oat/uclamp_max",
"Values": [ "Values": [
"-2", "-2",
"615" "615"
@ -293,7 +294,7 @@
}, },
{ {
"Name": "CAMUClampBoost", "Name": "CAMUClampBoost",
"Path": "/proc/vendor_sched/cam_uclamp_min", "Path": "/proc/vendor_sched/groups/cam/uclamp_min",
"Values": [ "Values": [
"765", "765",
"0" "0"
@ -302,7 +303,7 @@
}, },
{ {
"Name": "TAUClampBoost", "Name": "TAUClampBoost",
"Path": "/proc/vendor_sched/ta_uclamp_min", "Path": "/proc/vendor_sched/groups/ta/uclamp_min",
"Values": [ "Values": [
"765", "765",
"1" "1"
@ -311,7 +312,7 @@
}, },
{ {
"Name": "FGUClampBoost", "Name": "FGUClampBoost",
"Path": "/proc/vendor_sched/fg_uclamp_min", "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
"Values": [ "Values": [
"159", "159",
"0" "0"
@ -320,7 +321,7 @@
}, },
{ {
"Name": "MLUclampBoost", "Name": "MLUclampBoost",
"Path": "/proc/vendor_sched/nnapi_uclamp_min", "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min",
"Values": [ "Values": [
"225", "225",
"812" "812"
@ -339,7 +340,7 @@
}, },
{ {
"Name": "CDPreferIdle", "Name": "CDPreferIdle",
"Path": "/proc/vendor_sched/cam_prefer_idle", "Path": "/proc/vendor_sched/groups/cam/prefer_idle",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -401,7 +402,7 @@
}, },
{ {
"Name": "TAPreferHighCap", "Name": "TAPreferHighCap",
"Path": "/proc/vendor_sched/ta_prefer_high_cap", "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -410,7 +411,7 @@
}, },
{ {
"Name": "TAPreferIdle", "Name": "TAPreferIdle",
"Path": "/proc/vendor_sched/ta_prefer_idle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -420,7 +421,7 @@
}, },
{ {
"Name": "FGPreferIdle", "Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/fg_prefer_idle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -430,7 +431,7 @@
}, },
{ {
"Name": "CDPreferHighCap", "Name": "CDPreferHighCap",
"Path": "/proc/vendor_sched/cam_prefer_high_cap", "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -736,7 +737,7 @@
}, },
{ {
"Name": "Dex2oatGroup", "Name": "Dex2oatGroup",
"Path": "/proc/vendor_sched/dex2oat_ug", "Path": "/proc/vendor_sched/groups/dex2oat/ug",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -1043,6 +1044,113 @@
"Duration": 3000, "Duration": 3000,
"Value": "0" "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", "PowerHint": "CPU_LOAD_RESET",
"Node": "GPUPowerOn", "Node": "GPUPowerOn",
@ -1888,6 +1996,12 @@
"Duration": 0, "Duration": 0,
"Value": "cam1" "Value": "cam1"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1280"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -1954,6 +2068,12 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1280"
},
{ {
"PowerHint": "CAMERA_STREAMING_LOW", "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -2423,6 +2543,12 @@
"Duration": 0, "Duration": 0,
"Value": "419000" "Value": "419000"
}, },
{
"PowerHint": "GAME",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1280"
},
{ {
"PowerHint": "GAME", "PowerHint": "GAME",
"Node": "VIRTUAL-SKIN-CPU-MID", "Node": "VIRTUAL-SKIN-CPU-MID",

View file

@ -221,6 +221,7 @@
"Name": "CPUUtilThreshold", "Name": "CPUUtilThreshold",
"Path": "/proc/vendor_sched/util_threshold", "Path": "/proc/vendor_sched/util_threshold",
"Values": [ "Values": [
"2048 1280 1280",
"1280", "1280",
"1100" "1100"
], ],
@ -259,7 +260,7 @@
}, },
{ {
"Name": "BGUClampMaxBoost", "Name": "BGUClampMaxBoost",
"Path": "/proc/vendor_sched/bg_uclamp_max", "Path": "/proc/vendor_sched/groups/bg/uclamp_max",
"Values": [ "Values": [
"130", "130",
"512" "512"
@ -269,7 +270,7 @@
}, },
{ {
"Name": "Dex2oatUClampMaxBoost", "Name": "Dex2oatUClampMaxBoost",
"Path": "/proc/vendor_sched/dex2oat_uclamp_max", "Path": "/proc/vendor_sched/groups/dex2oat/uclamp_max",
"Values": [ "Values": [
"-2", "-2",
"615" "615"
@ -279,7 +280,7 @@
}, },
{ {
"Name": "CAMUClampBoost", "Name": "CAMUClampBoost",
"Path": "/proc/vendor_sched/cam_uclamp_min", "Path": "/proc/vendor_sched/groups/cam/uclamp_min",
"Values": [ "Values": [
"765", "765",
"0" "0"
@ -288,7 +289,7 @@
}, },
{ {
"Name": "TAUClampBoost", "Name": "TAUClampBoost",
"Path": "/proc/vendor_sched/ta_uclamp_min", "Path": "/proc/vendor_sched/groups/ta/uclamp_min",
"Values": [ "Values": [
"765", "765",
"1" "1"
@ -297,7 +298,7 @@
}, },
{ {
"Name": "FGUClampBoost", "Name": "FGUClampBoost",
"Path": "/proc/vendor_sched/fg_uclamp_min", "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
"Values": [ "Values": [
"159", "159",
"0" "0"
@ -306,7 +307,7 @@
}, },
{ {
"Name": "MLUclampBoost", "Name": "MLUclampBoost",
"Path": "/proc/vendor_sched/nnapi_uclamp_min", "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min",
"Values": [ "Values": [
"225", "225",
"812" "812"
@ -325,7 +326,7 @@
}, },
{ {
"Name": "CDPreferIdle", "Name": "CDPreferIdle",
"Path": "/proc/vendor_sched/cam_prefer_idle", "Path": "/proc/vendor_sched/groups/cam/prefer_idle",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -387,7 +388,7 @@
}, },
{ {
"Name": "TAPreferHighCap", "Name": "TAPreferHighCap",
"Path": "/proc/vendor_sched/ta_prefer_high_cap", "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -396,7 +397,7 @@
}, },
{ {
"Name": "TAPreferIdle", "Name": "TAPreferIdle",
"Path": "/proc/vendor_sched/ta_prefer_idle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -406,7 +407,7 @@
}, },
{ {
"Name": "FGPreferIdle", "Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/fg_prefer_idle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -416,7 +417,7 @@
}, },
{ {
"Name": "CDPreferHighCap", "Name": "CDPreferHighCap",
"Path": "/proc/vendor_sched/cam_prefer_high_cap", "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -782,7 +783,7 @@
}, },
{ {
"Name": "Dex2oatGroup", "Name": "Dex2oatGroup",
"Path": "/proc/vendor_sched/dex2oat_ug", "Path": "/proc/vendor_sched/groups/dex2oat/ug",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -1065,6 +1066,113 @@
"Duration": 3000, "Duration": 3000,
"Value": "0" "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", "PowerHint": "CPU_LOAD_RESET",
"Node": "GPUPowerOn", "Node": "GPUPowerOn",
@ -1725,6 +1833,12 @@
"Duration": 0, "Duration": 0,
"Value": "cam1" "Value": "cam1"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1280"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -1779,6 +1893,12 @@
"Duration": 0, "Duration": 0,
"Value": "1" "Value": "1"
}, },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1280"
},
{ {
"PowerHint": "CAMERA_STREAMING_LOW", "PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -2236,6 +2356,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "GAME",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1280"
},
{ {
"PowerHint": "GAME", "PowerHint": "GAME",
"Node": "NPITaskPacking", "Node": "NPITaskPacking",

View file

@ -235,6 +235,7 @@
"Name": "CPUUtilThreshold", "Name": "CPUUtilThreshold",
"Path": "/proc/vendor_sched/util_threshold", "Path": "/proc/vendor_sched/util_threshold",
"Values": [ "Values": [
"2048 1280 1280",
"1280", "1280",
"1100" "1100"
], ],
@ -273,7 +274,7 @@
}, },
{ {
"Name": "BGUClampMaxBoost", "Name": "BGUClampMaxBoost",
"Path": "/proc/vendor_sched/bg_uclamp_max", "Path": "/proc/vendor_sched/groups/bg/uclamp_max",
"Values": [ "Values": [
"130", "130",
"512" "512"
@ -283,7 +284,7 @@
}, },
{ {
"Name": "Dex2oatUClampMaxBoost", "Name": "Dex2oatUClampMaxBoost",
"Path": "/proc/vendor_sched/dex2oat_uclamp_max", "Path": "/proc/vendor_sched/groups/dex2oat/uclamp_max",
"Values": [ "Values": [
"-2", "-2",
"615" "615"
@ -293,7 +294,7 @@
}, },
{ {
"Name": "CAMUClampBoost", "Name": "CAMUClampBoost",
"Path": "/proc/vendor_sched/cam_uclamp_min", "Path": "/proc/vendor_sched/groups/cam/uclamp_min",
"Values": [ "Values": [
"765", "765",
"0" "0"
@ -302,7 +303,7 @@
}, },
{ {
"Name": "TAUClampBoost", "Name": "TAUClampBoost",
"Path": "/proc/vendor_sched/ta_uclamp_min", "Path": "/proc/vendor_sched/groups/ta/uclamp_min",
"Values": [ "Values": [
"765", "765",
"1" "1"
@ -311,7 +312,7 @@
}, },
{ {
"Name": "FGUClampBoost", "Name": "FGUClampBoost",
"Path": "/proc/vendor_sched/fg_uclamp_min", "Path": "/proc/vendor_sched/groups/fg/uclamp_min",
"Values": [ "Values": [
"159", "159",
"0" "0"
@ -320,7 +321,7 @@
}, },
{ {
"Name": "MLUclampBoost", "Name": "MLUclampBoost",
"Path": "/proc/vendor_sched/nnapi_uclamp_min", "Path": "/proc/vendor_sched/groups/nnapi/uclamp_min",
"Values": [ "Values": [
"225", "225",
"812" "812"
@ -339,7 +340,7 @@
}, },
{ {
"Name": "CDPreferIdle", "Name": "CDPreferIdle",
"Path": "/proc/vendor_sched/cam_prefer_idle", "Path": "/proc/vendor_sched/groups/cam/prefer_idle",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -401,7 +402,7 @@
}, },
{ {
"Name": "TAPreferHighCap", "Name": "TAPreferHighCap",
"Path": "/proc/vendor_sched/ta_prefer_high_cap", "Path": "/proc/vendor_sched/groups/ta/prefer_high_cap",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -410,7 +411,7 @@
}, },
{ {
"Name": "TAPreferIdle", "Name": "TAPreferIdle",
"Path": "/proc/vendor_sched/ta_prefer_idle", "Path": "/proc/vendor_sched/groups/ta/prefer_idle",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -420,7 +421,7 @@
}, },
{ {
"Name": "FGPreferIdle", "Name": "FGPreferIdle",
"Path": "/proc/vendor_sched/fg_prefer_idle", "Path": "/proc/vendor_sched/groups/fg/prefer_idle",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -430,7 +431,7 @@
}, },
{ {
"Name": "CDPreferHighCap", "Name": "CDPreferHighCap",
"Path": "/proc/vendor_sched/cam_prefer_high_cap", "Path": "/proc/vendor_sched/groups/cam/prefer_high_cap",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -736,7 +737,7 @@
}, },
{ {
"Name": "Dex2oatGroup", "Name": "Dex2oatGroup",
"Path": "/proc/vendor_sched/dex2oat_ug", "Path": "/proc/vendor_sched/groups/dex2oat/ug",
"Values": [ "Values": [
"1", "1",
"0" "0"
@ -1043,6 +1044,113 @@
"Duration": 3000, "Duration": 3000,
"Value": "0" "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", "PowerHint": "CPU_LOAD_RESET",
"Node": "GPUPowerOn", "Node": "GPUPowerOn",
@ -1792,6 +1900,12 @@
"Duration": 0, "Duration": 0,
"Value": "cam1" "Value": "cam1"
}, },
{
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1280"
},
{ {
"PowerHint": "CAMERA_STREAMING_STANDARD", "PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -1936,6 +2050,12 @@
"Duration": 0, "Duration": 0,
"Value": "cam1" "Value": "cam1"
}, },
{
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1280"
},
{ {
"PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "PowerHint": "CAMERA_STREAMING_VIDEO_CALL",
"Node": "CDPreferHighCap", "Node": "CDPreferHighCap",
@ -2369,6 +2489,12 @@
"Duration": 0, "Duration": 0,
"Value": "0" "Value": "0"
}, },
{
"PowerHint": "GAME",
"Node": "CPUUtilThreshold",
"Duration": 0,
"Value": "1280"
},
{ {
"PowerHint": "GAME", "PowerHint": "GAME",
"Node": "VIRTUAL-SKIN-CPU-MID", "Node": "VIRTUAL-SKIN-CPU-MID",

View file

@ -27,6 +27,14 @@ TARGET_SCREEN_DENSITY := 440
BOARD_USES_GENERIC_AUDIO := true BOARD_USES_GENERIC_AUDIO := true
USES_DEVICE_GOOGLE_SHUSKY := 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/shusky/device-shusky-common.mk
include device/google/zuma/BoardConfig-common.mk include device/google/zuma/BoardConfig-common.mk

View file

@ -136,7 +136,7 @@
<bool translatable="false" name="config_wifiUseHalApiToDisableFwRoaming">true</bool> <bool translatable="false" name="config_wifiUseHalApiToDisableFwRoaming">true</bool>
<!-- Indicate the driver doesn't support NL80211 Reg changed event --> <!-- Indicate the driver doesn't support NL80211 Reg changed event -->
<bool translatable="false" name="config_wifiDriverSupportedNl80211RegChangedEvent">false</bool> <bool translatable="false" name="config_wifiDriverSupportedNl80211RegChangedEvent">true</bool>
<!-- boolean indicating whether or not to disable shutdown idle instance timer in the bridged mode when connected to a power source --> <!-- boolean indicating whether or not to disable shutdown idle instance timer in the bridged mode when connected to a power source -->
<bool translatable="false" name ="config_wifiFrameworkSoftApDisableBridgedModeShutdownIdleInstanceWhenCharging">true</bool> <bool translatable="false" name ="config_wifiFrameworkSoftApDisableBridgedModeShutdownIdleInstanceWhenCharging">true</bool>
@ -171,4 +171,7 @@
<!-- boolean indicating whether the caller thread needs to wait for destroyed listeners --> <!-- boolean indicating whether the caller thread needs to wait for destroyed listeners -->
<bool translatable="false" name ="config_wifiWaitForDestroyedListeners">true</bool> <bool translatable="false" name ="config_wifiWaitForDestroyedListeners">true</bool>
<!-- Enable aggregation of Wifi link layer radio stats from all radios -->
<bool translatable="false" name="config_wifiLinkLayerAllRadiosStatsAggregationEnabled">true</bool>
</resources> </resources>

View file

@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_OWNER := samsung
LOCAL_MODULE_CLASS := APPS LOCAL_MODULE_CLASS := APPS
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := PRESIGNED
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE

View file

@ -48,7 +48,7 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_MODULE_OWNER := samsung LOCAL_MODULE_OWNER := samsung
LOCAL_MODULE_CLASS := APPS LOCAL_MODULE_CLASS := APPS
LOCAL_SRC_FILES := $(LOCAL_MODULE).apk LOCAL_SRC_FILES := $(LOCAL_MODULE).apk
LOCAL_CERTIFICATE := platform LOCAL_CERTIFICATE := PRESIGNED
LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
LOCAL_LICENSE_CONDITIONS := notice LOCAL_LICENSE_CONDITIONS := notice
LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE LOCAL_NOTICE_FILE := $(LOCAL_PATH)/../COPYRIGHT $(LOCAL_PATH)/../LICENSE

View file

@ -24,7 +24,23 @@ BOARD_KERNEL_CMDLINE += samsung_iommu_v9.load_sequential=1
TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt TARGET_BOARD_INFO_FILE := device/google/shusky/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := shiba 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 BOARD_USES_GENERIC_AUDIO := true
USES_DEVICE_GOOGLE_SHUSKY := true USES_DEVICE_GOOGLE_SHUSKY := true
BOARD_KERNEL_CMDLINE += swiotlb=noforce BOARD_KERNEL_CMDLINE += swiotlb=noforce

View file

@ -45,9 +45,6 @@
<!-- 140 nits: (140-2)/(1000-2)*(0.71-0.0)+0.0 = 0.098176353 --> <!-- 140 nits: (140-2)/(1000-2)*(0.71-0.0)+0.0 = 0.098176353 -->
<item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.098176353</item> <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.098176353</item>
<!-- Allow normal brightness controller feature. -->
<bool name="config_allowNormalBrightnessControllerFeature">true</bool>
<!-- Array of light sensor LUX values to define our levels for auto backlight brightness support. <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.
The N entries of this array define N 1 zones as follows: The N entries of this array define N 1 zones as follows:
Zone 0: 0 <= LUX < array[0] Zone 0: 0 <= LUX < array[0]

View file

@ -16,7 +16,6 @@
*/ */
--> -->
<resources> <resources>
<!-- Whether face auth will immediately stop when the display state is OFF --> <!-- Weather clock smartspace positioning to apply for the weather clock on shiba -->
<bool name="flag_stop_face_auth_on_display_off">true</bool> <dimen name="weather_clock_smartspace_translateY">10dp</dimen>
</resources> </resources>

View file

@ -20,6 +20,7 @@
<item>GKWS6</item> <item>GKWS6</item>
<item>GZPF0</item> <item>GZPF0</item>
<item>GPJ41</item> <item>GPJ41</item>
<item>G9BQD</item>
</string-array> </string-array>
<bool name="tag_intent_app_pref_supported">true</bool> <bool name="tag_intent_app_pref_supported">true</bool>
<!-- NFC Antenna Location API --> <!-- NFC Antenna Location API -->

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 KiB

After

Width:  |  Height:  |  Size: 57 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 146 KiB

After

Width:  |  Height:  |  Size: 57 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 302 KiB

After

Width:  |  Height:  |  Size: 106 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 KiB

After

Width:  |  Height:  |  Size: 106 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 632 KiB

After

Width:  |  Height:  |  Size: 240 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 555 KiB

After

Width:  |  Height:  |  Size: 208 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 683 KiB

After

Width:  |  Height:  |  Size: 272 KiB

Before After
Before After

View file

@ -0,0 +1,9 @@
package {
default_applicable_licenses: ["device_google_shusky_license"],
}
runtime_resource_overlay {
name: "NfcOverlayShiba",
sdk_version: "current",
product_specific: true
}

View file

@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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.
-->
<!-- Pixel specific nfc overlays -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.nfc.overlay"
android:versionCode="1"
android:versionName="1.0">
<application android:hasCode="false" />
<overlay
android:targetPackage="com.android.nfc"
android:targetName="NfcCustomization"
android:isStatic="true"
android:priority="0"/>
</manifest>

View file

@ -0,0 +1,2 @@
# Bug component: 48448
include platform/packages/apps/Nfc:/OWNERS

View file

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2022 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.
-->
<resources>
<bool name="nfcc_always_on_allowed">false</bool>
<bool name="polling_disable_allowed">true</bool>
<string-array name="config_skuSupportsSecureNfc" translatable="false">
<item>GKWS6</item>
<item>GZPF0</item>
<item>GPJ41</item>
</string-array>
<bool name="tag_intent_app_pref_supported">true</bool>
<!-- NFC Antenna Location API -->
<integer name="device_width">68</integer>
<integer name="device_height">146</integer>
<bool name="device_foldable">false</bool>
<integer-array name="antenna_x">
<item>34</item>
</integer-array>
<integer-array name="antenna_y">
<item>97</item>
</integer-array>
</resources>

61
thermal/Android.bp Normal file
View file

@ -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",
],
}

View file

@ -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 <android-base/file.h>
#include <gtest/gtest.h>
#include <jsonpb/json_schema_test.h>
#include "thermal_info_config_test.h"
using namespace ::android::jsonpb;
using ::android::base::GetExecutableDirectory;
namespace devices {
namespace shusky {
template <typename T>
JsonSchemaTestConfigFactory MakeTestParam(const std::string &path) {
return android::jsonpb::MakeTestParam<T>(GetExecutableDirectory() + path);
}
// Make test suite for thermal info config schema.
INSTANTIATE_TEST_SUITE_P(
ThermalSuite, ThermalInfoConfigTest,
::testing::Values(
MakeTestParam<ThermalConfig>("/thermal_info_config_husky.json"),
MakeTestParam<ThermalConfig>("/thermal_info_config_shiba.json"),
MakeTestParam<ThermalConfig>("/thermal_info_config_charge_husky.json"),
MakeTestParam<ThermalConfig>("/thermal_info_config_charge_shiba.json"),
MakeTestParam<ThermalConfig>("/thermal_info_config_ripcurrent.json"),
MakeTestParam<ThermalConfig>(
"/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

View file

@ -3,7 +3,7 @@
{ {
"Name":"north_therm", "Name":"north_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -13,7 +13,7 @@
{ {
"Name":"cam_therm", "Name":"cam_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -23,7 +23,7 @@
{ {
"Name":"soc_therm", "Name":"soc_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -33,7 +33,7 @@
{ {
"Name":"charge_therm", "Name":"charge_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -43,7 +43,7 @@
{ {
"Name":"disp_therm", "Name":"disp_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -53,13 +53,13 @@
{ {
"Name":"battery", "Name":"battery",
"Type":"BATTERY", "Type":"BATTERY",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", 60.0],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"neutral_therm", "Name":"neutral_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -69,7 +69,7 @@
{ {
"Name":"quiet_therm", "Name":"quiet_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -79,7 +79,7 @@
{ {
"Name":"usb_pwr_therm", "Name":"usb_pwr_therm",
"Type":"UNKNOWN", "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", "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
@ -163,21 +163,21 @@
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"],
"Coefficient":[1.0, -1000000], "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], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 119, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 25, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1302, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 2527, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 6219, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NaN", "NaN", 6, "NaN", "NaN", "NaN", "NaN"],
"I_Default":1302 "I_Default":1302
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
@ -206,21 +206,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 27, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1383, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 2383, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 8022, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"],
"I_Default":1383 "I_Default":1383
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
@ -285,7 +285,7 @@
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"], "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"],
"Coefficient":[46000, 0, 0, 1], "Coefficient":[46000, 0, 0, 1],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "4.0", "NaN", "NaN"],
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "usbc-port", "CdevRequest": "usbc-port",

View file

@ -4,15 +4,15 @@
"Name":"battery", "Name":"battery",
"Type":"BATTERY", "Type":"BATTERY",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"60.0" "60.0"
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":0.001 "Multiplier":0.001
} }
] ]

View file

@ -3,7 +3,7 @@
{ {
"Name":"north_therm", "Name":"north_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -13,7 +13,7 @@
{ {
"Name":"cam_therm", "Name":"cam_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -23,7 +23,7 @@
{ {
"Name":"soc_therm", "Name":"soc_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -33,7 +33,7 @@
{ {
"Name":"charge_therm", "Name":"charge_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -43,7 +43,7 @@
{ {
"Name":"disp_therm", "Name":"disp_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -53,13 +53,13 @@
{ {
"Name":"battery", "Name":"battery",
"Type":"BATTERY", "Type":"BATTERY",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", 60.0],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"neutral_therm", "Name":"neutral_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -69,7 +69,7 @@
{ {
"Name":"quiet_therm", "Name":"quiet_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -79,7 +79,7 @@
{ {
"Name":"usb_pwr_therm", "Name":"usb_pwr_therm",
"Type":"UNKNOWN", "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", "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
@ -196,21 +196,21 @@
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"],
"Coefficient":[1.0, -1000000], "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], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 101, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 21, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1099, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 2404, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 5519, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NaN", "NaN", 6, "NaN", "NaN", "NaN", "NaN"],
"I_Default":1099 "I_Default":1099
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
@ -239,21 +239,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 164, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 21, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1066, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1066, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 2066, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 2066, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 6412, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 6412, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"],
"I_Default":1066 "I_Default":1066
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
@ -318,7 +318,7 @@
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"], "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"],
"Coefficient":[46000, 0, 0, 1], "Coefficient":[46000, 0, 0, 1],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "4.0", "NaN", "NaN"],
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "usbc-port", "CdevRequest": "usbc-port",

View file

@ -3,7 +3,7 @@
{ {
"Name":"north_therm", "Name":"north_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -13,7 +13,7 @@
{ {
"Name":"cam_therm", "Name":"cam_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -23,7 +23,7 @@
{ {
"Name":"soc_therm", "Name":"soc_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -33,7 +33,7 @@
{ {
"Name":"charge_therm", "Name":"charge_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -43,7 +43,7 @@
{ {
"Name":"disp_therm", "Name":"disp_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -53,13 +53,13 @@
{ {
"Name":"battery", "Name":"battery",
"Type":"BATTERY", "Type":"BATTERY",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", 60.0],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"neutral_therm", "Name":"neutral_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -69,7 +69,7 @@
{ {
"Name":"quiet_therm", "Name":"quiet_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -79,7 +79,7 @@
{ {
"Name":"usb_pwr_therm", "Name":"usb_pwr_therm",
"Type":"UNKNOWN", "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", "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
@ -97,7 +97,7 @@
"TriggerSensor": "vdroop1", "TriggerSensor": "vdroop1",
"Combination":["battery", "battery_cycle", "vdroop1"], "Combination":["battery", "battery_cycle", "vdroop1"],
"Coefficient":[-10000, 400, 1000], "Coefficient":[-10000, 400, 1000],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", 3.00, "NaN"],
"Multiplier":1, "Multiplier":1,
"PollingDelay":0, "PollingDelay":0,
"PassiveDelay":1000, "PassiveDelay":1000,
@ -111,7 +111,7 @@
"TriggerSensor": "vdroop1", "TriggerSensor": "vdroop1",
"Combination":["battery", "battery_cycle", "vdroop1"], "Combination":["battery", "battery_cycle", "vdroop1"],
"Coefficient":[-10000, 400, 1000], "Coefficient":[-10000, 400, 1000],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", 3.00, "NaN", "NaN"],
"Multiplier":1, "Multiplier":1,
"PollingDelay":0, "PollingDelay":0,
"PassiveDelay":1000, "PassiveDelay":1000,
@ -121,13 +121,13 @@
{ {
"Name":"soc", "Name":"soc",
"Type":"BCL_PERCENTAGE", "Type":"BCL_PERCENTAGE",
"HotThreshold":["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", 80, "NaN", "NaN", "NaN", "NaN"],
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"batoilo", "Name":"batoilo",
"Type":"BCL_CURRENT", "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], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"SendCallback":true, "SendCallback":true,
@ -142,16 +142,16 @@
"TriggerSensor": "soc", "TriggerSensor": "soc",
"Combination":["battery", "soc"], "Combination":["battery", "soc"],
"Coefficient":[-25000, 80], "Coefficient":[-25000, 80],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", 2.0, "NaN", "NaN"],
"PollingDelay":0, "PollingDelay":0,
"PassiveDelay":1000, "PassiveDelay":600000,
"Multiplier":1, "Multiplier":1,
"SendCallback":true "SendCallback":true
}, },
{ {
"Name":"vdroop1", "Name":"vdroop1",
"Type":"BCL_VOLTAGE", "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], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"SendCallback":true, "SendCallback":true,
@ -161,7 +161,7 @@
{ {
"Name":"vdroop2", "Name":"vdroop2",
"Type":"BCL_VOLTAGE", "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], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"SendCallback":true, "SendCallback":true,
@ -171,7 +171,7 @@
{ {
"Name":"smpl_gm", "Name":"smpl_gm",
"Type":"BCL_VOLTAGE", "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], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"SendCallback":true, "SendCallback":true,
@ -320,7 +320,7 @@
"VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5", "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-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], "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], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"SendCallback":true, "SendCallback":true,
@ -346,7 +346,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"SendPowerHint":true, "SendPowerHint":true,
@ -362,21 +362,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 2200, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 2200, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 800, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 800, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 4600, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 4600, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"]
}, },
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -414,21 +414,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1500, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 700, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 2800, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 2800, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"]
}, },
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -460,16 +460,19 @@
{ {
"CdevRequest": "thermal-cpufreq-0", "CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6],
"Disabled":true "Disabled":true
}, },
{ {
"CdevRequest": "thermal-cpufreq-1", "CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9],
"Disabled":true "Disabled":true
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12],
"Disabled":true "Disabled":true
} }
] ]
@ -480,16 +483,19 @@
{ {
"CdevRequest": "thermal-cpufreq-0", "CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6],
"Disabled":true "Disabled":true
}, },
{ {
"CdevRequest": "thermal-cpufreq-1", "CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9],
"Disabled":true "Disabled":true
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12],
"Disabled":true "Disabled":true
} }
] ]
@ -505,21 +511,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1000, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 600, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 1600, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 1600, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"]
}, },
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -551,16 +557,19 @@
{ {
"CdevRequest": "thermal-cpufreq-0", "CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8],
"Disabled":true "Disabled":true
}, },
{ {
"CdevRequest": "thermal-cpufreq-1", "CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 11, 11, 11, 11, 11, 11],
"Disabled":true "Disabled":true
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13],
"Disabled":true "Disabled":true
} }
] ]
@ -602,21 +611,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", "NaN", 300, "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", "NaN", 5, "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"] "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"]
}, },
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -666,21 +675,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 700, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1723, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1723, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 473, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 473, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 2500, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 2500, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"]
}, },
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -698,7 +707,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"SendCallback":true, "SendCallback":true,
@ -747,10 +756,12 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1", "VIRTUAL-SKIN-SPEAKER-SUB-2"], "Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1", "VIRTUAL-SKIN-SPEAKER-SUB-2"],
"Coefficient":[1, 1, 1], "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], "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"SendCallback":true "SendCallback":true,
"PollingDelay":60000,
"PassiveDelay":7000
}, },
{ {
"Name":"VIRTUAL-SKIN-CHARGE-SUB-0", "Name":"VIRTUAL-SKIN-CHARGE-SUB-0",
@ -830,21 +841,21 @@
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"],
"Coefficient":[1.0, -1000000], "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], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 119, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 119, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 25, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1302, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1302, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 2527, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 2527, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 6219, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 6219, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NaN", "NaN", 6, "NaN", "NaN", "NaN", "NaN"],
"I_Default":1302 "I_Default":1302
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
@ -873,21 +884,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 213, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 213, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 27, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1383, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1383, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 2383, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 2383, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 8022, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 8022, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"],
"I_Default":1383 "I_Default":1383
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
@ -996,7 +1007,7 @@
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"], "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"],
"Coefficient":[46000, 0, 0, 1], "Coefficient":[46000, 0, 0, 1],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "4.0", "NaN", "NaN"],
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "usbc-port", "CdevRequest": "usbc-port",
@ -1024,7 +1035,7 @@
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-UI-SUB0"], "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-UI-SUB0"],
"Coefficient":[48000, 0, 0, 1], "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, "Multiplier":1,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
@ -1033,31 +1044,31 @@
{ {
"Name":"LITTLE", "Name":"LITTLE",
"Type":"CPU", "Type":"CPU",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"MID", "Name":"MID",
"Type":"CPU", "Type":"CPU",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"BIG", "Name":"BIG",
"Type":"CPU", "Type":"CPU",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"G3D", "Name":"G3D",
"Type":"GPU", "Type":"GPU",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"TPU", "Name":"TPU",
"Type":"NPU", "Type":"NPU",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"],
"Multiplier":0.001 "Multiplier":0.001
} }
], ],
@ -1185,6 +1196,18 @@
"Name": "VIRTUAL-SKIN-SUB-7", "Name": "VIRTUAL-SKIN-SUB-7",
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] "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", "Name": "VIRTUAL-SKIN-CHARGE",
"Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51] "Thresholds": [31, 33, 35, 37, 39, 41, 43, 45, 47, 49, 51]
@ -1193,7 +1216,62 @@
"Name": "VIRTUAL-USB-THROTTLING", "Name": "VIRTUAL-USB-THROTTLING",
"Thresholds": [3.0] "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": { "CoolingDevices": {
"RecordVotePerSensor": { "RecordVotePerSensor": {

View file

@ -4,75 +4,75 @@
"Name":"battery", "Name":"battery",
"Type":"BATTERY", "Type":"BATTERY",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"60.0" "60.0"
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"LITTLE", "Name":"LITTLE",
"Type":"CPU", "Type":"CPU",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
115.0 115.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"MID", "Name":"MID",
"Type":"CPU", "Type":"CPU",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
115.0 115.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"G3D", "Name":"G3D",
"Type":"GPU", "Type":"GPU",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
115.0 115.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"battery_cycle", "Name":"battery_cycle",
"Type":"BCL_VOLTAGE", "Type":"BCL_VOLTAGE",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN" "NaN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1, "Multiplier":1,
"Monitor":false "Monitor":false
}, },
@ -93,15 +93,15 @@
"1000" "1000"
], ],
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
3.00, 3.00,
"NAN" "NaN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1, "Multiplier":1,
"Monitor":true "Monitor":true
}, },
@ -122,15 +122,15 @@
"1000" "1000"
], ],
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
3.00, 3.00,
"NAN", "NaN",
"NAN" "NaN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1, "Multiplier":1,
"Monitor":true, "Monitor":true,
"SendPowerHint":true "SendPowerHint":true
@ -139,28 +139,28 @@
"Name":"soc", "Name":"soc",
"Type":"BCL_PERCENTAGE", "Type":"BCL_PERCENTAGE",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
80, 80,
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN" "NaN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"batoilo", "Name":"batoilo",
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
5000, 5000,
"NAN", "NaN",
"NAN" "NaN"
], ],
"HotHysteresis":[ "HotHysteresis":[
0.0, 0.0,
@ -171,7 +171,7 @@
0.0, 0.0,
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1, "Multiplier":1,
"Monitor":true, "Monitor":true,
"PollingDelay":0, "PollingDelay":0,
@ -202,15 +202,15 @@
"80" "80"
], ],
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
2.0, 2.0,
"NAN", "NaN",
"NAN" "NaN"
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1, "Multiplier":1,
"Monitor":true "Monitor":true
}, },
@ -218,13 +218,13 @@
"Name":"vdroop1", "Name":"vdroop1",
"Type":"BCL_VOLTAGE", "Type":"BCL_VOLTAGE",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
1000, 1000,
"NAN", "NaN",
"NAN" "NaN"
], ],
"HotHysteresis":[ "HotHysteresis":[
0.0, 0.0,
@ -235,7 +235,7 @@
0.0, 0.0,
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1, "Multiplier":1,
"Monitor":true, "Monitor":true,
"PollingDelay":0, "PollingDelay":0,
@ -255,13 +255,13 @@
"Name":"vdroop2", "Name":"vdroop2",
"Type":"BCL_VOLTAGE", "Type":"BCL_VOLTAGE",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
1200, 1200,
"NAN", "NaN",
"NAN" "NaN"
], ],
"HotHysteresis":[ "HotHysteresis":[
0.0, 0.0,
@ -272,7 +272,7 @@
0.0, 0.0,
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1, "Multiplier":1,
"Monitor":true, "Monitor":true,
"PollingDelay":0, "PollingDelay":0,
@ -292,13 +292,13 @@
"Name":"smpl_gm", "Name":"smpl_gm",
"Type":"BCL_VOLTAGE", "Type":"BCL_VOLTAGE",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
1100, 1100,
"NAN", "NaN",
"NAN" "NaN"
], ],
"HotHysteresis":[ "HotHysteresis":[
0.0, 0.0,
@ -309,7 +309,7 @@
0.0, 0.0,
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1, "Multiplier":1,
"Monitor":true, "Monitor":true,
"PollingDelay":0, "PollingDelay":0,
@ -329,13 +329,13 @@
"Name":"ocp_cpu2", "Name":"ocp_cpu2",
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
12000, 12000,
"NAN", "NaN",
"NAN" "NaN"
], ],
"HotHysteresis":[ "HotHysteresis":[
0.0, 0.0,
@ -346,20 +346,20 @@
0.0, 0.0,
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"ocp_tpu", "Name":"ocp_tpu",
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
10500, 10500,
"NAN", "NaN",
"NAN" "NaN"
], ],
"HotHysteresis":[ "HotHysteresis":[
0.0, 0.0,
@ -370,20 +370,20 @@
0.0, 0.0,
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"ocp_gpu", "Name":"ocp_gpu",
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
12000, 12000,
"NAN", "NaN",
"NAN" "NaN"
], ],
"HotHysteresis":[ "HotHysteresis":[
0.0, 0.0,
@ -394,20 +394,20 @@
0.0, 0.0,
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"soft_ocp_cpu2", "Name":"soft_ocp_cpu2",
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
9000, 9000,
"NAN", "NaN",
"NAN" "NaN"
], ],
"HotHysteresis":[ "HotHysteresis":[
0.0, 0.0,
@ -418,20 +418,20 @@
0.0, 0.0,
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"soft_ocp_tpu", "Name":"soft_ocp_tpu",
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
8500, 8500,
"NAN", "NaN",
"NAN" "NaN"
], ],
"HotHysteresis":[ "HotHysteresis":[
0.0, 0.0,
@ -442,20 +442,20 @@
0.0, 0.0,
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"soft_ocp_gpu", "Name":"soft_ocp_gpu",
"Type":"BCL_CURRENT", "Type":"BCL_CURRENT",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
9000, 9000,
"NAN", "NaN",
"NAN" "NaN"
], ],
"HotHysteresis":[ "HotHysteresis":[
0.0, 0.0,
@ -466,22 +466,22 @@
0.0, 0.0,
0.0 0.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"TPU", "Name":"TPU",
"Type":"NPU", "Type":"NPU",
"HotThreshold":[ "HotThreshold":[
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
"NAN", "NaN",
115.0 115.0
], ],
"VrThreshold":"NAN", "VrThreshold":"NaN",
"Multiplier":0.001 "Multiplier":0.001
} }
], ],

View file

@ -3,7 +3,7 @@
{ {
"Name":"north_therm", "Name":"north_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/north_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -13,7 +13,7 @@
{ {
"Name":"cam_therm", "Name":"cam_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/cam_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -23,7 +23,7 @@
{ {
"Name":"soc_therm", "Name":"soc_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/soc_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -33,7 +33,7 @@
{ {
"Name":"charge_therm", "Name":"charge_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/charge_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -43,7 +43,7 @@
{ {
"Name":"disp_therm", "Name":"disp_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/disp_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -53,13 +53,13 @@
{ {
"Name":"battery", "Name":"battery",
"Type":"BATTERY", "Type":"BATTERY",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", 60.0], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", 60.0],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"neutral_therm", "Name":"neutral_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/neutral_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -69,7 +69,7 @@
{ {
"Name":"quiet_therm", "Name":"quiet_therm",
"Type":"UNKNOWN", "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], "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", "TempPath":"/dev/thermal/tz-by-name/quiet_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
@ -79,7 +79,7 @@
{ {
"Name":"usb_pwr_therm", "Name":"usb_pwr_therm",
"Type":"UNKNOWN", "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", "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/tz_temp",
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
@ -97,7 +97,7 @@
"TriggerSensor": "vdroop1", "TriggerSensor": "vdroop1",
"Combination":["battery", "battery_cycle", "vdroop1"], "Combination":["battery", "battery_cycle", "vdroop1"],
"Coefficient":[-10000, 400, 1000], "Coefficient":[-10000, 400, 1000],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", 3.00, "NaN"],
"Multiplier":1, "Multiplier":1,
"PollingDelay":0, "PollingDelay":0,
"PassiveDelay":1000, "PassiveDelay":1000,
@ -111,7 +111,7 @@
"TriggerSensor": "vdroop1", "TriggerSensor": "vdroop1",
"Combination":["battery", "battery_cycle", "vdroop1"], "Combination":["battery", "battery_cycle", "vdroop1"],
"Coefficient":[-10000, 400, 1000], "Coefficient":[-10000, 400, 1000],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", 3.00, "NaN", "NaN"],
"Multiplier":1, "Multiplier":1,
"PollingDelay":0, "PollingDelay":0,
"PassiveDelay":1000, "PassiveDelay":1000,
@ -121,13 +121,13 @@
{ {
"Name":"soc", "Name":"soc",
"Type":"BCL_PERCENTAGE", "Type":"BCL_PERCENTAGE",
"HotThreshold":["NAN", "NAN", 80, "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", 80, "NaN", "NaN", "NaN", "NaN"],
"Multiplier":1 "Multiplier":1
}, },
{ {
"Name":"batoilo", "Name":"batoilo",
"Type":"BCL_CURRENT", "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], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"SendCallback":true, "SendCallback":true,
@ -142,16 +142,16 @@
"TriggerSensor": "soc", "TriggerSensor": "soc",
"Combination":["battery", "soc"], "Combination":["battery", "soc"],
"Coefficient":[-25000, 80], "Coefficient":[-25000, 80],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", 2.0, "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", 2.0, "NaN", "NaN"],
"PollingDelay":0, "PollingDelay":0,
"PassiveDelay":1000, "PassiveDelay":600000,
"Multiplier":1, "Multiplier":1,
"SendCallback":true "SendCallback":true
}, },
{ {
"Name":"vdroop1", "Name":"vdroop1",
"Type":"BCL_VOLTAGE", "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], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"SendCallback":true, "SendCallback":true,
@ -161,7 +161,7 @@
{ {
"Name":"vdroop2", "Name":"vdroop2",
"Type":"BCL_VOLTAGE", "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], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"SendCallback":true, "SendCallback":true,
@ -171,7 +171,7 @@
{ {
"Name":"smpl_gm", "Name":"smpl_gm",
"Type":"BCL_VOLTAGE", "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], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
"Multiplier":1, "Multiplier":1,
"SendCallback":true, "SendCallback":true,
@ -288,7 +288,7 @@
"VIRTUAL-SKIN-SUB-3", "VIRTUAL-SKIN-SUB-4", "VIRTUAL-SKIN-SUB-5", "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-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], "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], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"SendCallback":true, "SendCallback":true,
@ -314,7 +314,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"SendPowerHint":true, "SendPowerHint":true,
@ -330,21 +330,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 1.9, 1.9, 0.0, 0.0, 0.0, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 2200, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 2200, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 800, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 800, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 800, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 4600, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 4600, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"]
}, },
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -382,21 +382,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 0.0, 1.9, 0.0, 0.0, 0.0, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1500, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1500, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 700, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 2800, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 2800, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"]
}, },
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -428,16 +428,19 @@
{ {
"CdevRequest": "thermal-cpufreq-0", "CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6],
"Disabled":true "Disabled":true
}, },
{ {
"CdevRequest": "thermal-cpufreq-1", "CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9],
"Disabled":true "Disabled":true
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12],
"Disabled":true "Disabled":true
} }
] ]
@ -448,16 +451,19 @@
{ {
"CdevRequest": "thermal-cpufreq-0", "CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 6, 6, 6, 6, 6, 6],
"Disabled":true "Disabled":true
}, },
{ {
"CdevRequest": "thermal-cpufreq-1", "CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 9, 9, 9, 9, 9, 9],
"Disabled":true "Disabled":true
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 12, 12, 12, 12, 12, 12],
"Disabled":true "Disabled":true
} }
] ]
@ -473,21 +479,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 0.0, 1.9, 1.9, 0.0, 0.0, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 400, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 400, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1000, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1000, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 600, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 600, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 1600, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 1600, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"]
}, },
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -519,16 +525,19 @@
{ {
"CdevRequest": "thermal-cpufreq-0", "CdevRequest": "thermal-cpufreq-0",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 8, 8, 8, 8, 8, 8],
"Disabled":true "Disabled":true
}, },
{ {
"CdevRequest": "thermal-cpufreq-1", "CdevRequest": "thermal-cpufreq-1",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 11, 11, 11, 11, 11, 11],
"Disabled":true "Disabled":true
}, },
{ {
"CdevRequest": "thermal-cpufreq-2", "CdevRequest": "thermal-cpufreq-2",
"MaxReleaseStep": 1, "MaxReleaseStep": 1,
"CdevCeiling": [0, 13, 13, 13, 13, 13, 13],
"Disabled":true "Disabled":true
} }
] ]
@ -570,21 +579,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 1.9, 1.9, 1.9, 1.4, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", "NAN", 300, "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", "NaN", 300, "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", "NaN", 5, "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", "NAN", 2600, "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", "NaN", 2600, "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", "NAN", 800, "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", "NaN", 800, "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", "NAN", 0, "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", "NaN", 0, "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", "NAN", 3900, "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", "NaN", 3900, "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", "NAN", 8, "NAN", "NAN", "NAN"] "I_Cutoff":["NaN", "NaN", "NaN", 8, "NaN", "NaN", "NaN"]
}, },
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -634,21 +643,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 1.9, 1.9, 1.4, 1.9, 0.0, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 700, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 700, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 5, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1723, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1723, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 473, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 473, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 2500, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 2500, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 4, "NAN", "NAN", "NAN", "NAN"] "I_Cutoff":["NaN", "NaN", 4, "NaN", "NaN", "NaN", "NaN"]
}, },
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
@ -666,7 +675,7 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN"], "Combination":["VIRTUAL-SKIN"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 0.0, 1.9, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"SendCallback":true, "SendCallback":true,
@ -726,10 +735,12 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-SPEAKER-SUB-0", "VIRTUAL-SKIN-SPEAKER-SUB-1", "VIRTUAL-SKIN-SPEAKER-SUB-2", "VIRTUAL-SKIN-SPEAKER-SUB-3"], "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], "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], "HotHysteresis":[0.0, 1.9, 0.0, 0.0, 0.0, 0.0, 0.0],
"Multiplier":0.001, "Multiplier":0.001,
"SendCallback":true "SendCallback":true,
"PollingDelay":60000,
"PassiveDelay":7000
}, },
{ {
"Name":"VIRTUAL-SKIN-CHARGE-SUB-0", "Name":"VIRTUAL-SKIN-CHARGE-SUB-0",
@ -842,21 +853,21 @@
"Formula":"WEIGHTED_AVG", "Formula":"WEIGHTED_AVG",
"Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"], "Combination":["VIRTUAL-SKIN-CHARGE", "IS_WLC"],
"Coefficient":[1.0, -1000000], "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], "HotHysteresis":[0.0, 1.9, 3.9, 2.9, 3.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 101, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 101, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 21, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1099, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1099, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 2404, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 2404, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 5519, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 5519, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 6, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NaN", "NaN", 6, "NaN", "NaN", "NaN", "NaN"],
"I_Default":1099 "I_Default":1099
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
@ -885,21 +896,21 @@
"Formula":"MAXIMUM", "Formula":"MAXIMUM",
"Combination":["VIRTUAL-SKIN-CHARGE"], "Combination":["VIRTUAL-SKIN-CHARGE"],
"Coefficient":[1.0], "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], "HotHysteresis":[0.0, 1.9, 1.9, 3.9, 1.9, 1.9, 1.9],
"Multiplier":0.001, "Multiplier":0.001,
"PollingDelay":60000, "PollingDelay":60000,
"PassiveDelay":7000, "PassiveDelay":7000,
"PIDInfo": { "PIDInfo": {
"K_Po":["NAN", "NAN", 164, "NAN", "NAN", "NAN", "NAN"], "K_Po":["NaN", "NaN", 164, "NaN", "NaN", "NaN", "NaN"],
"K_Pu":["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_I":["NaN", "NaN", 21, "NaN", "NaN", "NaN", "NaN"],
"K_D":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "K_D":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"I_Max":["NAN", "NAN", 1066, "NAN", "NAN", "NAN", "NAN"], "I_Max":["NaN", "NaN", 1066, "NaN", "NaN", "NaN", "NaN"],
"S_Power":["NAN", "NAN", 2066, "NAN", "NAN", "NAN", "NAN"], "S_Power":["NaN", "NaN", 2066, "NaN", "NaN", "NaN", "NaN"],
"MinAllocPower":["NAN", "NAN", 0, "NAN", "NAN", "NAN", "NAN"], "MinAllocPower":["NaN", "NaN", 0, "NaN", "NaN", "NaN", "NaN"],
"MaxAllocPower":["NAN", "NAN", 6412, "NAN", "NAN", "NAN", "NAN"], "MaxAllocPower":["NaN", "NaN", 6412, "NaN", "NaN", "NaN", "NaN"],
"I_Cutoff":["NAN", "NAN", 8, "NAN", "NAN", "NAN", "NAN"], "I_Cutoff":["NaN", "NaN", 8, "NaN", "NaN", "NaN", "NaN"],
"I_Default":1066 "I_Default":1066
}, },
"ExcludedPowerInfo": [ "ExcludedPowerInfo": [
@ -1029,7 +1040,7 @@
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"], "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-THROTTLING-SUB0"],
"Coefficient":[46000, 0, 0, 1], "Coefficient":[46000, 0, 0, 1],
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "4.0", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "4.0", "NaN", "NaN"],
"BindedCdevInfo": [ "BindedCdevInfo": [
{ {
"CdevRequest": "usbc-port", "CdevRequest": "usbc-port",
@ -1057,7 +1068,7 @@
"TriggerSensor": "usb_pwr_therm", "TriggerSensor": "usb_pwr_therm",
"Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-UI-SUB0"], "Combination":["usb_pwr_therm", "USB-MINUS-NEUTRAL", "USB-MINUS-QUIET", "VIRTUAL-USB-UI-SUB0"],
"Coefficient":[48000, 0, 0, 1], "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, "Multiplier":1,
"PollingDelay":300000, "PollingDelay":300000,
"PassiveDelay":7000, "PassiveDelay":7000,
@ -1066,31 +1077,31 @@
{ {
"Name":"LITTLE", "Name":"LITTLE",
"Type":"CPU", "Type":"CPU",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"MID", "Name":"MID",
"Type":"CPU", "Type":"CPU",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"BIG", "Name":"BIG",
"Type":"CPU", "Type":"CPU",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"G3D", "Name":"G3D",
"Type":"GPU", "Type":"GPU",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"],
"Multiplier":0.001 "Multiplier":0.001
}, },
{ {
"Name":"TPU", "Name":"TPU",
"Type":"NPU", "Type":"NPU",
"HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", "NAN", "NAN"], "HotThreshold":["NaN", "NaN", "NaN", "NaN", "NaN", "NaN", "NaN"],
"Multiplier":0.001 "Multiplier":0.001
} }
], ],
@ -1226,7 +1237,61 @@
"Name": "VIRTUAL-USB-THROTTLING", "Name": "VIRTUAL-USB-THROTTLING",
"Thresholds": [3.0] "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": { "CoolingDevices": {
"RecordVotePerSensor": { "RecordVotePerSensor": {

Some files were not shown because too many files have changed in this diff Show more