diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:45:23 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-02-02 23:45:23 +0000 |
| commit | ec29c2c53e8c276b43ab20442abdb9a0e940071c (patch) | |
| tree | 369112c76cbd85e24986bb24cacdd11473e2535d | |
| parent | c8a5c514f15dd1e17043858d752af8680db9d7a6 (diff) | |
| parent | 9e58dbf4b23747ebf7987790db176cc5dd06574a (diff) | |
| download | pantah-simpleperf-release.tar.gz | |
Snap for 11400057 from 9e58dbf4b23747ebf7987790db176cc5dd06574a to simpleperf-releasesimpleperf-release
Change-Id: Iaec3836c20f09fa318875650c0b9ba42af86875d
59 files changed, 2162 insertions, 2337 deletions
diff --git a/audio/cheetah/aidl_config/audio_platform_configuration.xml b/audio/cheetah/aidl_config/audio_platform_configuration.xml new file mode 100644 index 0000000..a3144da --- /dev/null +++ b/audio/cheetah/aidl_config/audio_platform_configuration.xml @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- 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. +--> +<audioPlatformConfiguration xmlns:xi="http://www.w3.org/2001/XInclude"> + <features> + <feature name="ThermalThrottle"> + <argument name="Type" value="SKIN" /> + <argument name="Name" value="VIRTUAL-SKIN" /> + </feature> + <feature name="BatteryThrottle"> + <argument name="Type" value="BCL_VOLTAGE" /> + <argument name="Name" value="BCL_AUDIO_BAACL" /> + <argument name="Strategy" value="MediaSpeakerAndScreenOn" /> + </feature> + <feature name="PlaybackThermalThrottle"> + <argument name="PollWaitMs" value="20000" /> + <argument name="ThermistorName" value="VIRTUAL-SKIN" /> + <argument name="ThermistorType" value="SKIN" /> + <argument name="ThrottlingSeverity" value="MODERATE" /> + </feature> + </features> + + <voipVolume> + <path voipDevice="VoipDevice::kUsb"> + <gain>0.01</gain> + <gain>0.02</gain> + <gain>0.04</gain> + <gain>0.10</gain> + <gain>0.21</gain> + <gain>0.47</gain> + <gain>1.00</gain> + </path> + </voipVolume> + + <devices> + <device name="bluetooth" /> + <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"> + <argument name="SpeakerNum" value="2" /> + <argument name="Rotation" /> + <argument name="AcousticShockProtection" /> + </device> + </devices> + + <tuners> + <tuner type="playback" name="waves"> + <argument name="Sink" value="SPK" /> + <argument name="ThermistorsName" value="VIRTUAL-SKIN" /> + </tuner> + <tuner type="telephony" name="fortemedia"> + <argument name="VoIP_DLCHs" value="SPK:2,USB:2" /> + <argument name="VoIP_Rate" value="32000" /> + <argument name="BOOST_USB_SWB_CLK" value="y" /> + <argument name="CCA" value="y" /> + </tuner> + <tuner type="capture" name="gs_capture" /> + </tuners> + + <latencies> + <latency source="primary-playback" sink="speaker" milliseconds="20" /> + <latency source="primary-playback" sink="usb-device" milliseconds="60" /> + <latency source="primary-playback" sink="usb-headset" milliseconds="60" /> + <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="60" /> + <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="60" /> + + <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" /> + <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" /> + <latency source="deep-buffer-playback" sink="usb-headset" milliseconds="70" /> + <latency source="deep-buffer-playback" sink="bluetooth-a2dp-device" milliseconds="180" /> + <latency source="deep-buffer-playback" sink="bluetooth-low-energy-speaker" milliseconds="80" /> + + <latency source="compress-offload-playback" sink="speaker" milliseconds="40" /> + <latency source="compress-offload-playback" sink="usb-device" milliseconds="40" /> + <latency source="compress-offload-playback" sink="usb-headset" milliseconds="40" /> + <latency source="compress-offload-playback" sink="bluetooth-a2dp-device" milliseconds="70" /> + <latency source="compress-offload-playback" sink="bluetooth-low-energy-speaker" + milliseconds="20" /> + + <latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" /> + + <latency source="microphones" sink="primary-capture" milliseconds="160" /> + <latency source="back-microphones" sink="primary-capture" milliseconds="160" /> + <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" /> + </latencies> + + <spatialCapture> + <enablement useCase="primary-capture" deviceInterface="microphones"> + <source>MIC</source> + <source>CAMCORDER</source> + <source>VOICE_RECOGNITION</source> + </enablement> + <enablement useCase="primary-capture" deviceInterface="back-microphones"> + <source>MIC</source> + <source>CAMCORDER</source> + <source>VOICE_RECOGNITION</source> + </enablement> + </spatialCapture> + + <xi:include href="audio_policy_volumes.xml" /> + <xi:include href="default_volume_tables.xml" /> +</audioPlatformConfiguration> diff --git a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml deleted file mode 100644 index 912b4aa..0000000 --- a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- Copyright (c) 2023, The Linux Foundation. All rights reserved. --> -<!-- --> -<!-- Redistribution and use in source and binary forms, with or without --> -<!-- modification, are permitted provided that the following conditions are --> -<!-- met: --> -<!-- * Redistributions of source code must retain the above copyright --> -<!-- notice, this list of conditions and the following disclaimer. --> -<!-- * Redistributions in binary form must reproduce the above --> -<!-- copyright notice, this list of conditions and the following --> -<!-- disclaimer in the documentation and/or other materials provided --> -<!-- with the distribution. --> -<!-- * Neither the name of The Linux Foundation nor the names of its --> -<!-- contributors may be used to endorse or promote products derived --> -<!-- from this software without specific prior written permission. --> -<!-- --> -<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED --> -<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF --> -<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT --> -<!-- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS --> -<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR --> -<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF --> -<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR --> -<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, --> -<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN --> -<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> -<audio_platform_configuration> - <product_lists> - <product name="Blackbird"> - <id value="18d1:5033" /> - </product> - <product name="Condor"> - <id value="18d1:5034" /> - </product> - <product name="Condor_Sprint"> - <id value="18d1:5038" /> - </product> - <product name="Condor_Sprint2"> - <id value="18d1:5036" /> - </product> - </product_lists> - - <features> - <feature name="ThermalThrottle=Type:SKIN,Name:VIRTUAL-SKIN" /> - <feature - name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn" /> - <feature - name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN,ThermistorType:SKIN,ThrottlingSeverity:MODERATE" /> - </features> - - <!-- The voip_db_mapping: format is "device="x" value="f1,f2..." --> - <!-- device should be "handset","speaker","usb","bt","bt_hearing_aid" or "digital_dock" --> - <voip_db_mapping> - <voip_path device="usb" value="0.01,0.02,0.04,0.1,0.21,0.47,1.0" /> - </voip_db_mapping> - - <!-- The device_builder: format is "type="x" codec_name="y" argu="z". name and argu are optional. --> - <device_builder> - <device type="bt" /> - <device type="usb" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE" /> - <device type="speaker" codec_name="cs35l41" argu="SpeakerNum=4,Rotation,AcousticShockProtection" /> - </device_builder> - - <!-- The spatial_capture_conditions: format is "use_case="x" audio_source="y" --> - <!-- use_case defines in aidl/audio/usecase/use_case.h, audio_source is definied in aidl interfaces. --> - <spatial_capture_conditions> - <conditions use_case="primary-capture" audio_source="MIC,CAMCORDER,VOICE_RECOGNITION" /> - </spatial_capture_conditions> - - <!-- The tuner_builder: format is "type="x" codec_name="y" argu="z". argu is optional. --> - <tuner_builder> - <tuner type="playback" name="waves" argu="Sink=SPK ThermistorsName=VIRTUAL-SKIN" /> - <tuner type="telephony" name="fortemedia" argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y CCA=y" /> - <tuner type="capture" name="gs_capture" /> - </tuner_builder> -</audio_platform_configuration> diff --git a/audio/cheetah/aidl_config/audio_policy_configuration.xml b/audio/cheetah/aidl_config/audio_policy_configuration.xml deleted file mode 100644 index 28c8663..0000000 --- a/audio/cheetah/aidl_config/audio_policy_configuration.xml +++ /dev/null @@ -1,201 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- Copyright (C) 2020 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. ---> -<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude"> - <globalConfiguration speaker_drc_enabled="false" call_screen_mode_supported="true" /> - <modules> - <!-- Primary Audio HAL --> - <module name="primary" halVersion="2.0"> - <attachedDevices> - <item>Speaker</item> - <item>Speaker Safe</item> - <item>Earpiece</item> - <item>Built-In Mic</item> - <item>Built-In Back Mic</item> - <item>Telephony Tx</item> - <item>Voice Call And Telephony Rx</item> - <item>Echo Ref In</item> - </attachedDevices> - <defaultOutputDevice>Speaker</defaultOutputDevice> - <mixPorts> - <mixPort name="primary output" role="source" - flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST" - recommendedMuteDurationMs="40"> - <profile name="" format="AUDIO_FORMAT_PCM_FLOAT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> - <mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER"> - <profile name="" format="AUDIO_FORMAT_PCM_FLOAT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> - <mixPort name="compressed offload" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD"> - <profile name="" format="AUDIO_FORMAT_MP3" - samplingRates="8000 16000 24000 32000 44100 48000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO" /> - <profile name="" format="AUDIO_FORMAT_AAC_LC" - samplingRates="8000 16000 24000 32000 44100 48000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO" /> - <profile name="" format="AUDIO_FORMAT_AAC_HE_V1" - samplingRates="8000 16000 24000 32000 44100 48000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO" /> - <profile name="" format="AUDIO_FORMAT_AAC_HE_V2" - samplingRates="8000 16000 24000 32000 44100 48000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO" /> - </mixPort> - <mixPort name="haptic" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" /> - </mixPort> - <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER"> - <profile name="" format="AUDIO_FORMAT_PCM_32_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> - <mixPort name="incall playback" role="source" - flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> - <mixPort name="voip_rx" role="source" - flags="AUDIO_OUTPUT_FLAG_VOIP_RX"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> - <!-- <mixPort name="mmap playback" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_MMAP_NOIRQ"> - <profile name="" format="AUDIO_FORMAT_PCM_FLOAT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> - <mixPort name="raw" role="source" flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST"> - <profile name="" format="AUDIO_FORMAT_PCM_32_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> --> - - <mixPort name="primary input" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" - channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3" /> - </mixPort> - <mixPort name="voip_tx" role="sink" - flags="AUDIO_INPUT_FLAG_VOIP_TX"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO" /> - </mixPort> - <mixPort name="fast input" role="sink" - flags="AUDIO_INPUT_FLAG_RAW AUDIO_INPUT_FLAG_FAST"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" - channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" /> - </mixPort> - <mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="16000" - channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" /> - </mixPort> - <!-- <mixPort name="mmap capture" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ"> - <profile name="" format="AUDIO_FORMAT_PCM_32_BIT" - samplingRates="48000" - channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" /> - </mixPort> --> - </mixPorts> - <devicePorts> - <!-- Output devices declaration, i.e. Sink DEVICE PORT --> - <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink" /> - <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink" /> - <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink" /> - <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" - role="sink" /> - <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" - role="sink" /> - <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink" /> - <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" - role="sink" /> - <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" - role="sink" /> - <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink" /> - <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" - role="sink" /> - <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink" /> - <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink" /> - <!-- Input devices declaration, i.e. Source DEVICE PORT --> - <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source" /> - <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" - role="source" /> - <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" - role="source" /> - <devicePort tagName="BT SCO Headset Mic" - type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source" /> - <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink" - encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </devicePort> - <devicePort tagName="BT A2DP Headphones" - type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink" - encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </devicePort> - <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" - role="sink" - encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </devicePort> - <devicePort tagName="BT BLE Headset" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink" - encodedFormats="AUDIO_FORMAT_LC3"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </devicePort> - <devicePort tagName="BT BLE Speaker" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink" - encodedFormats="AUDIO_FORMAT_LC3"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </devicePort> - <devicePort tagName="BLE Headset Mic" type="AUDIO_DEVICE_IN_BLE_HEADSET" - role="source"> - </devicePort> - <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source" /> - <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" - role="source" /> - <!-- AUDIO_DEVICE_IN_VOICE_CALL and AUDIO_DEVICE_IN_TELEPHONY_RX are in the same - value --> - <devicePort tagName="Voice Call And Telephony Rx" type="AUDIO_DEVICE_IN_VOICE_CALL" - role="source" /> - <devicePort tagName="Echo Ref In" type="AUDIO_DEVICE_IN_ECHO_REFERENCE" - role="source" /> - </devicePorts> - <!-- route declaration, i.e. list all available sources for a given sink --> - <routes> - <route type="mix" sink="Earpiece" - sources="primary output,deep buffer,haptic,voip_rx,compressed offload" /> - <route type="mix" sink="Speaker" - sources="primary output,deep buffer,haptic,voip_rx,compressed offload" /> - <route type="mix" sink="Telephony Tx" sources="incall playback" /> - <route type="mix" sink="primary input" - sources="Built-In Mic,Built-In Back Mic" /> - <route type="mix" sink="voip_tx" - sources="Built-In Mic,Built-In Back Mic" /> - <route type="mix" sink="fast input" - sources="Built-In Mic,Built-In Back Mic" /> - <route type="mix" sink="hotword input" sources="Built-In Mic" /> - </routes> - </module> - </modules> - <!-- End of Modules section --> - <!-- Volume section --> - <xi:include href="audio_policy_volumes.xml" /> - <xi:include href="default_volume_tables.xml" /> - <!-- End of Volume section --> -</audioPolicyConfiguration> diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml index 894ef4e..bb9574b 100644 --- a/audio/cheetah/aidl_config/mixer_paths_aidl.xml +++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml @@ -79,8 +79,8 @@ <!-- Cirrus Booster Amp Output Gain --> <ctl name="AMP PCM Gain" value="17" /> <ctl name="R AMP PCM Gain" value="17" /> - <ctl name="Digital PCM Volume" value="817" /> - <ctl name="R Digital PCM Volume" value="817" /> + <ctl name="Digital PCM Volume" value="0" /> + <ctl name="R Digital PCM Volume" value="0" /> <!-- Cirrus Booster Amp Power --> <ctl name="Main AMP Enable Switch" value="0" /> @@ -97,6 +97,8 @@ <ctl name="R DSP RX2 Source" value="ASPRX1" /> <ctl name="Boost Peak Current Limit" value="3.50A" /> <ctl name="R Boost Peak Current Limit" value="3.50A" /> + <ctl name="PCM Soft Ramp" value=".5ms" /> + <ctl name="R PCM Soft Ramp" value=".5ms" /> <!-- Cirrus ASP TX source --> <ctl name="ASP TX1 Source" value="VMON" /> @@ -254,7 +256,9 @@ <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON" /> <ctl name="Voice Call Mic Source" value="Builtin_MIC" /> + <ctl name="Mic Spatial Module Enable" value="0" /> <ctl name="Audio Capture Eraser Enable" value="0" /> + <ctl name="Hotword Tap Enable" value="0" /> <!-- audio PDM mic default state --> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" /> @@ -372,10 +376,46 @@ <ctl name="BT_RX Mixer EP2" value="1" /> </path> - <path name="primary-playback -> usb-headset"> + <path name="primary-playback-0 -> bt"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-a2dp-device"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-a2dp-headphone"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-a2dp-speaker"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-sco-default"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-sco-headset"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-sco-car-kit"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> usb"> <ctl name="USB_RX Mixer EP2" value="1" /> </path> + <path name="primary-playback-0 -> usb-headset"> + <path name="primary-playback-0 -> usb" /> + </path> + + <path name="primary-playback-0 -> usb-device"> + <path name="primary-playback-0 -> usb" /> + </path> + <path name="raw-playback -> speaker"> <ctl name="TDM_0_RX Mixer RAW" value="1" /> </path> @@ -396,10 +436,46 @@ <ctl name="BT_RX Mixer RAW" value="1" /> </path> - <path name="raw-playback -> usb-headset"> + <path name="raw-playback-0 -> bt"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-a2dp-device"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-a2dp-headphone"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-a2dp-speaker"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-sco-default"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-sco-headset"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-sco-car-kit"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> usb"> <ctl name="USB_RX Mixer RAW" value="1" /> </path> + <path name="raw-playback-0 -> usb-headset"> + <path name="raw-playback-0 -> usb" /> + </path> + + <path name="raw-playback-0 -> usb-device"> + <path name="raw-playback-0 -> usb" /> + </path> + <path name="deep-buffer-playback -> speaker"> <ctl name="TDM_0_RX Mixer EP6" value="1" /> </path> @@ -420,10 +496,46 @@ <ctl name="BT_RX Mixer EP6" value="1" /> </path> - <path name="deep-buffer-playback -> usb-headset"> + <path name="deep-buffer-playback-0 -> bt"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-a2dp-device"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-a2dp-headphone"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-a2dp-speaker"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-sco-default"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-sco-headset"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-sco-car-kit"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> usb"> <ctl name="USB_RX Mixer EP6" value="1" /> </path> + <path name="deep-buffer-playback-0 -> usb-headset"> + <path name="deep-buffer-playback-0 -> usb" /> + </path> + + <path name="deep-buffer-playback-0 -> usb-device"> + <path name="deep-buffer-playback-0 -> usb" /> + </path> + <path name="compress-offload-playback"> <ctl name="LVM Enable" value="1" /> </path> @@ -449,10 +561,46 @@ <ctl name="BT_RX Mixer EP7" value="1" /> </path> - <path name="compress-offload-playback -> usb-headset"> + <path name="compress-offload-playback-0 -> bt"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-a2dp-device"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-a2dp-headphone"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-a2dp-speaker"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-sco-default"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-sco-headset"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-sco-car-kit"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> usb"> <ctl name="USB_RX Mixer EP7" value="1" /> </path> + <path name="compress-offload-playback-0 -> usb-headset"> + <path name="compress-offload-playback-0 -> usb" /> + </path> + + <path name="compress-offload-playback-0 -> usb-device"> + <path name="compress-offload-playback-0 -> usb" /> + </path> + <path name="mmap-playback -> speaker"> <ctl name="TDM_0_RX Mixer EP1" value="1" /> </path> @@ -473,14 +621,58 @@ <ctl name="BT_RX Mixer EP1" value="1" /> </path> - <path name="mmap-playback -> usb-headset"> + <path name="mmap-playback-0 -> bt"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-a2dp-device"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-a2dp-headphone"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-a2dp-speaker"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-sco-default"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-sco-headset"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-sco-car-kit"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> usb"> <ctl name="USB_RX Mixer EP1" value="1" /> </path> - <path name="hifi-playback -> usb-headset"> + <path name="mmap-playback-0 -> usb-headset"> + <path name="mmap-playback-0 -> usb" /> + </path> + + <path name="mmap-playback-0 -> usb-device"> + <path name="mmap-playback-0 -> usb" /> + </path> + + <path name="hifi-playback-0 -> usb"> <ctl name="USB_RX Mixer HIFI" value="1" /> </path> + <path name="hifi-playback-0 -> usb-headset"> + <path name="hifi-playback-0 -> usb" /> + </path> + + <path name="hifi-playback-0 -> usb-device"> + <path name="hifi-playback-0 -> usb" /> + </path> + <path name="voip-playback -> speaker"> <ctl name="TDM_0_RX Mixer VOIP" value="1" /> </path> @@ -501,10 +693,46 @@ <ctl name="BT_RX Mixer VOIP" value="1" /> </path> - <path name="voip-playback -> usb-headset"> + <path name="voip-playback-0 -> bt"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-a2dp-device"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-a2dp-headphone"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-a2dp-speaker"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-sco-default"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-sco-headset"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-sco-car-kit"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> usb"> <ctl name="USB_RX Mixer VOIP" value="1" /> </path> + <path name="voip-playback-0 -> usb-headset"> + <path name="voip-playback-0 -> usb" /> + </path> + + <path name="voip-playback-0 -> usb-device"> + <path name="voip-playback-0 -> usb" /> + </path> + <path name="immersive-playback -> speaker"> <ctl name="TDM_0_RX Mixer IMSV" value="1" /> </path> @@ -525,10 +753,34 @@ <ctl name="BT_RX Mixer IMSV" value="1" /> </path> - <path name="immersive-playback -> usb-headset"> + <path name="immersive-playback-0 -> bt"> + <path name="immersive-playback -> bt" /> + </path> + + <path name="immersive-playback-0 -> bluetooth-a2dp-device"> + <path name="immersive-playback -> bt" /> + </path> + + <path name="immersive-playback-0 -> bluetooth-a2dp-headphone"> + <path name="immersive-playback -> bt" /> + </path> + + <path name="immersive-playback-0 -> bluetooth-a2dp-speaker"> + <path name="immersive-playback -> bt" /> + </path> + + <path name="immersive-playback-0 -> usb"> <ctl name="USB_RX Mixer IMSV" value="1" /> </path> + <path name="immersive-playback-0 -> usb-headset"> + <path name="immersive-playback-0 -> usb" /> + </path> + + <path name="immersive-playback-0 -> usb-device"> + <path name="immersive-playback-0 -> usb" /> + </path> + <path name="haptic-playback -> speaker"> <ctl name="TDM_0_RX Mixer EP3" value="1" /> <ctl name="TDM_0_RX Mixer EP8" value="1" /> @@ -551,11 +803,47 @@ <ctl name="TDM_0_RX Mixer EP8" value="1" /> </path> - <path name="haptic-playback -> usb-headset"> + <path name="haptic-playback-0 -> bt"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-a2dp-device"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-a2dp-headphone"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-a2dp-speaker"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-sco-default"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-sco-headset"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-sco-car-kit"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> usb"> <ctl name="USB_RX Mixer EP3" value="1" /> <ctl name="TDM_0_RX Mixer EP8" value="1" /> </path> + <path name="haptic-playback-0 -> usb-headset"> + <path name="haptic-playback-0 -> usb" /> + </path> + + <path name="haptic-playback-0 -> usb-device"> + <path name="haptic-playback-0 -> usb" /> + </path> + <!-- audio capture dynamic route --> <path name="microphones -> primary-capture-0"> <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" /> @@ -565,10 +853,18 @@ <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" /> </path> - <path name="usb-headset-mic -> primary-capture-0"> + <path name="usb-microphones -> primary-capture-0"> <ctl name="EP1 TX Mixer USB_TX" value="1" /> </path> + <path name="usb-headset-microphones -> primary-capture-0"> + <path name="usb-microphones -> primary-capture-0" /> + </path> + + <path name="usb-device-microphones -> primary-capture-0"> + <path name="usb-microphones -> primary-capture-0" /> + </path> + <path name="microphones -> voip-capture-0"> <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" /> </path> @@ -577,11 +873,19 @@ <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" /> </path> - <path name="usb-headset-mic -> voip-capture-0"> + <path name="usb-microphones -> voip-capture-0"> <ctl name="VOIP TX Mixer USB_TX" value="1" /> </path> - <path name="bt-mic -> voip-capture-0"> + <path name="usb-headset-microphones -> voip-capture-0"> + <path name="usb-microphones -> voip-capture-0" /> + </path> + + <path name="usb-device-microphones -> voip-capture-0"> + <path name="usb-microphones -> voip-capture-0" /> + </path> + + <path name="bluetooth-sco-headset-microphones -> voip-capture-0"> <ctl name="VOIP TX Mixer BT_TX" value="1" /> </path> @@ -593,17 +897,31 @@ <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" /> </path> - <path name="usb-headset-mic -> fast-capture-0"> + <path name="usb-microphones -> fast-capture-0"> <ctl name="EP3 TX Mixer USB_TX" value="1" /> </path> - <path name="bt-mic -> fast-capture-0"> + <path name="usb-headset-microphones -> fast-capture-0"> + <path name="usb-microphones -> fast-capture-0" /> + </path> + + <path name="usb-device-microphones -> fast-capture-0"> + <path name="usb-microphones -> fast-capture-0" /> + </path> + + <path name="bluetooth-sco-headset-microphones -> fast-capture-0"> <ctl name="EP3 TX Mixer BT_TX" value="1" /> </path> <path name="microphones -> sound-trigger-capture-0"> </path> + <path name="microphones -> sound-trigger-tap-capture-0"> + </path> + + <path name="microphones -> hotword-lookback-capture-0"> + </path> + <!-- voice-call dynamic route --> <path name="voice-call-downlink-0 -> speaker"> <ctl name="TDM_0_RX Mixer EP5" value="1" /> @@ -617,10 +935,30 @@ <ctl name="BT_RX Mixer EP5" value="1" /> </path> - <path name="voice-call-downlink-0 -> usb-headphone"> + <path name="voice-call-downlink-0 -> bluetooth-sco-default"> + <path name="voice-call-downlink-0 -> bt" /> + </path> + + <path name="voice-call-downlink-0 -> bluetooth-sco-headset"> + <path name="voice-call-downlink-0 -> bt" /> + </path> + + <path name="voice-call-downlink-0 -> bluetooth-sco-car-kit"> + <path name="voice-call-downlink-0 -> bt" /> + </path> + + <path name="voice-call-downlink-0 -> usb"> <ctl name="USB_RX Mixer EP5" value="1" /> </path> + <path name="voice-call-downlink-0 -> usb-headset"> + <path name="voice-call-downlink-0 -> usb" /> + </path> + + <path name="voice-call-downlink-0 -> usb-device"> + <path name="voice-call-downlink-0 -> usb" /> + </path> + <path name="voice-call-downlink-0 -> null-sink"> <ctl name="INCALL_RX Mixer EP5" value="1" /> </path> @@ -633,11 +971,19 @@ <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" /> </path> - <path name="usb-headset-mic -> voice-call-uplink-0"> + <path name="usb-microphones -> voice-call-uplink-0"> <ctl name="EP4 TX Mixer USB_TX" value="1" /> </path> - <path name="bt-mic -> voice-call-uplink-0"> + <path name="usb-headset-microphones -> voice-call-uplink-0"> + <path name="usb-microphones -> voice-call-uplink-0" /> + </path> + + <path name="usb-device-microphones -> voice-call-uplink-0"> + <path name="usb-microphones -> voice-call-uplink-0" /> + </path> + + <path name="bluetooth-sco-headset-microphones -> voice-call-uplink-0"> <ctl name="EP4 TX Mixer BT_TX" value="1" /> </path> @@ -649,19 +995,59 @@ <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" /> </path> - <path name="telephony-rx -> in-call-capture-0" /> - <path name="telephony-rx -> in-call-capture-1" /> - <path name="telephony-rx -> in-call-capture-2" /> + <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0"> + <ctl name="Incall Capture Stream0" value="DL" /> + </path> + + <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0"> + <ctl name="Incall Capture Stream0" value="UL" /> + </path> + + <path name="telephony-rx (VOICE_CALL) -> in-call-capture-0"> + <ctl name="Incall Capture Stream0" value="UL_DL" /> + </path> + + <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1"> + <ctl name="Incall Capture Stream1" value="DL" /> + </path> + + <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1"> + <ctl name="Incall Capture Stream1" value="UL" /> + </path> + + <path name="telephony-rx (VOICE_CALL) -> in-call-capture-1"> + <ctl name="Incall Capture Stream1" value="UL_DL" /> + </path> + + <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2"> + <ctl name="Incall Capture Stream2" value="DL" /> + </path> + + <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2"> + <ctl name="Incall Capture Stream2" value="UL" /> + </path> + + <path name="telephony-rx (VOICE_CALL) -> in-call-capture-2"> + <ctl name="Incall Capture Stream2" value="UL_DL" /> + </path> <path name="microphones -> mmap-capture-0"> <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" /> </path> - <path name="usb-headset-mic -> mmap-capture-0"> + <path name="usb-microphones -> mmap-capture-0"> <ctl name="EP2 TX Mixer USB_TX" value="1" /> </path> - <path name="bt-mic -> mmap-capture-0"> + <path name="usb-headset-microphones -> mmap-capture-0"> + <path name="usb-microphones -> mmap-capture-0" /> + </path> + + <path name="usb-device-microphones -> mmap-capture-0"> + <path name="usb-microphones -> mmap-capture-0" /> + </path> + + <path name="bluetooth-sco-headset-microphones -> mmap-capture-0"> <ctl name="EP2 TX Mixer BT_TX" value="1" /> </path> @@ -674,15 +1060,12 @@ </path> <path name="speaker-earpiece (VOICE)"> - <ctl name="Boost Peak Current Limit" value="3.50A" /> <ctl name="PCM Source" value="ASP" /> <ctl name="AMP PCM Gain" value="7" /> <ctl name="Main AMP Enable Switch" value="1" /> </path> <path name="speaker"> - <ctl name="Boost Peak Current Limit" value="2.50A" /> - <ctl name="R Boost Peak Current Limit" value="2.50A" /> <ctl name="Main AMP Enable Switch" value="1" /> <ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="Fast Use Case Delta File" value="fast_switch3.txt" /> @@ -692,12 +1075,9 @@ </path> <path name="speaker (VOICE)"> - <ctl name="R Boost Peak Current Limit" value="3.50A" /> - <ctl name="Boost Peak Current Limit" value="3.50A" /> <ctl name="ASPTX1 Slot Position" value="1" /> <ctl name="R ASPTX1 Slot Position" value="0" /> - <!--<ctl - name="R DSP RX2 Source" value="ASPRX2"/>--> + <!--<ctl name="R DSP RX2 Source" value="ASPRX2" />--> <ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" /> <!-- load Enable FIR --> @@ -705,11 +1085,9 @@ <ctl name="Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" /> <ctl name="R Fast Use Case Switch Enable" value="1" /> - <ctl name="Digital PCM Volume" value="800" /> </path> <path name="speaker-safe"> - <ctl name="R Boost Peak Current Limit" value="3.50A" /> <ctl name="R Main AMP Enable Switch" value="1" /> <!-- load Bypass FIR --> <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> @@ -736,7 +1114,7 @@ <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> - <path name="back-microphones"> + <path name="microphones (VOICE_RECOGNITION)"> <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="2" value="2" /> @@ -745,55 +1123,63 @@ <ctl name="MIC Record Soft Gain (dB)" value="22" /> </path> - <path name="back-microphones (VOICE)"> + <path name="microphones (VOICE_RECOGNITION,SOUND_TRIGGER_TAP)"> + <ctl name="Audio Capture Eraser Enable" value="1" /> + <ctl name="Hotword Tap Enable" value="1" /> + <ctl name="MIC Record Soft Gain (dB)" value="0" /> + </path> + + <path name="microphones (SOUND_TRIGGER_AEC)"> + <ctl name="Audio Capture Eraser Enable" value="1" /> <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="2" value="2" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" /> <ctl name="MIC DC Blocker" value="1" /> - <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" /> + <ctl name="Audio Capture Mic Source" value="ERASER" /> <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> - <path name="microphones (CAMCORDER)"> - <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="2" value="2"/> - <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> - <ctl name="MIC DC Blocker" value="1"/> - <ctl name="MIC Record Soft Gain (dB)" value="0"/> - </path> - - <path name="back-microphones (CAMCORDER)"> - <path name="microphones (CAMCORDER)" /> + <path name="back-microphones"> + <ctl name="Mic Spatial Module Enable" value="1" /> + <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="2" value="2" /> + <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" /> + <ctl name="MIC DC Blocker" value="1" /> + <ctl name="MIC Record Soft Gain (dB)" value="22" /> </path> - <path name="camcorder-mic"> + <path name="back-microphones (VOICE)"> <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="2" value="2" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" /> <ctl name="MIC DC Blocker" value="1" /> + <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" /> <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> - <path name="voice-recog-mic"> + <path name="microphones (CAMCORDER)"> <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="2" value="2" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" /> <ctl name="MIC DC Blocker" value="1" /> - <ctl name="MIC Record Soft Gain (dB)" value="22" /> + <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> - <path name="voice-recog-aec-mic"> - <ctl name="Audio Capture Eraser Enable" value="1" /> + <path name="back-microphones (CAMCORDER)"> + <path name="microphones (CAMCORDER)" /> + </path> + + <path name="camcorder-mic"> + <ctl name="Mic Spatial Module Enable" value="1" /> <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="2" value="2" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" /> <ctl name="MIC DC Blocker" value="1" /> - <ctl name="Audio Capture Mic Source" value="ERASER" /> <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> @@ -824,7 +1210,7 @@ <ctl name="MIC Record Soft Gain (dB)" value="5" /> </path> - <path name="bt-mic"> + <path name="bluetooth-sco-headset-microphones"> <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="2" value="2" /> @@ -834,7 +1220,7 @@ <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> - <path name="usb-headset-mic"> + <path name="usb-headset-microphones"> <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="2" value="2" /> @@ -859,4 +1245,69 @@ <ctl name="R DSP1 Preload Switch" value="1" /> </path> <!-- cs35l41 specific path to load firmware in cs35l41.c end--> + + <!-- cs35l41 specific path for adated feature in cs35l41_route_control.cc --> + <!-- Which is controlled by speaker module and path name format is fixed. --> + <!-- Path name format: adapted-{type}{-battery-throttled}{-acoustic-shock} --> + <!-- Battery throttle and acoustic shock are disabled: "adapted-speaker" --> + <!-- Battery throttle enabled: "adapted-speaker-battery-throttled" --> + <!-- Acoustic shock enabled: "adapted-speaker-acoustic-shock" --> + <!-- Both are enabled: "adapted-speaker-battery-throttled-acoustic-shock" --> + <path name="adapted-speaker"> + <ctl name="Boost Peak Current Limit" value="2.50A" /> + <ctl name="R Boost Peak Current Limit" value="2.50A" /> + <ctl name="Digital PCM Volume" value="817" /> + <ctl name="R Digital PCM Volume" value="817" /> + </path> + <path name="adapted-speaker-battery-throttled"> + <ctl name="Boost Peak Current Limit" value="1.80A" /> + <ctl name="R Boost Peak Current Limit" value="1.80A" /> + <ctl name="Digital PCM Volume" value="817" /> + <ctl name="R Digital PCM Volume" value="817" /> + </path> + + <path name="adapted-speaker-safe"> + <ctl name="R Boost Peak Current Limit" value="3.50A" /> + <ctl name="R Digital PCM Volume" value="817" /> + </path> + <path name="adapted-speaker-safe-battery-throttled"> + <path name="adapted-speaker-safe" /> + </path> + + <path name="adapted-earpiece"> + <ctl name="Digital PCM Volume" value="817" /> + </path> + <path name="adapted-earpiece-battery-throttled"> + <path name="adapted-earpiece" /> + </path> + + <path name="adapted-voice-speaker"> + <ctl name="R Boost Peak Current Limit" value="3.50A" /> + <ctl name="Boost Peak Current Limit" value="3.50A" /> + <ctl name="Digital PCM Volume" value="800" /> + <ctl name="R Digital PCM Volume" value="817" /> + </path> + <path name="adapted-voice-speaker-battery-throttled"> + <path name="adapted-voice-speaker" /> + </path> + <path name="adapted-voice-speaker-acoustic-shock"> + <ctl name="R Boost Peak Current Limit" value="3.50A" /> + <ctl name="Boost Peak Current Limit" value="3.50A" /> + <ctl name="PCM Soft Ramp" value="2ms" /> + <ctl name="Digital PCM Volume" value="0" /> + <ctl name="R Digital PCM Volume" value="817" /> + </path> + + <path name="adapted-voice-speaker-battery-throttled-acoustic-shock"> + <path name="adapted-voice-speaker-acoustic-shock" /> + </path> + + <path name="adapted-voice-earpiece"> + <ctl name="Boost Peak Current Limit" value="3.50A" /> + <ctl name="Digital PCM Volume" value="817" /> + </path> + <path name="adapted-voice-earpiece-battery-throttled"> + <path name="adapted-voice-earpiece" /> + </path> + <!-- cs35l41 specific path for adated feature in cs35l41_route_control.cc end --> </mixer> diff --git a/audio/cheetah/audio-tables.mk b/audio/cheetah/audio-tables.mk index d4ce667..1f74dcf 100644 --- a/audio/cheetah/audio-tables.mk +++ b/audio/cheetah/audio-tables.mk @@ -22,8 +22,7 @@ AUDIO_TABLE_FOLDER := cheetah ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) # AIDL HAL configs are in the *config_aidl* folder PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml else diff --git a/audio/cheetah/config/audio_platform_configuration.xml b/audio/cheetah/config/audio_platform_configuration.xml index 5522ce1..87a2a43 100644 --- a/audio/cheetah/config/audio_platform_configuration.xml +++ b/audio/cheetah/config/audio_platform_configuration.xml @@ -311,7 +311,7 @@ <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/> <module libname="audio_cca_aoc.so"/> - <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y SHARED_MODULE=1130578253"/> + <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y SHARED_MODULE=1130578253"/> <module libname="liboffloadeffect.so"/> <module libname="audio_amcs_ext.so"/> <module libname="audio_bluenote_aoc.so"/> diff --git a/audio/cheetah/tuning/bluenote/recording.gatf b/audio/cheetah/tuning/bluenote/recording.gatf Binary files differindex 58be0d8..63a67ba 100644 --- a/audio/cheetah/tuning/bluenote/recording.gatf +++ b/audio/cheetah/tuning/bluenote/recording.gatf diff --git a/audio/cheetah/tuning/fortemedia_stereo/BLUETOOTH.dat b/audio/cheetah/tuning/fortemedia_stereo/BLUETOOTH.dat Binary files differindex 5d9c2a7..e97b201 100644 --- a/audio/cheetah/tuning/fortemedia_stereo/BLUETOOTH.dat +++ b/audio/cheetah/tuning/fortemedia_stereo/BLUETOOTH.dat diff --git a/audio/cheetah/tuning/fortemedia_stereo/BLUETOOTH.mods b/audio/cheetah/tuning/fortemedia_stereo/BLUETOOTH.mods index b6a5811..87f1928 100644 --- a/audio/cheetah/tuning/fortemedia_stereo/BLUETOOTH.mods +++ b/audio/cheetah/tuning/fortemedia_stereo/BLUETOOTH.mods @@ -1,12 +1,13 @@ #PLATFORM_NAME gChip
-#EXPORT_FLAG BLUETOOTH
#SINGLE_API_VER 1.2.1
-#SAVE_TIME 2023-03-20 18:05:41
+#EXPORT_FLAG BLUETOOTH
+#PARAM_MODE FULL
+#SAVE_MODE 3
+#SAVE_TIME 2023-10-04 11:25:07
#CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-NB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -534,8 +535,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -2674,9 +2675,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-WB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -3204,8 +3204,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -5344,9 +5344,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -5874,8 +5873,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -8014,9 +8013,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-FB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -8544,8 +8542,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -10684,9 +10682,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BT_HAC-RESERVE2-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -11214,8 +11211,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0064 //TX_DR_RESRV_5
525 0x1000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -13354,9 +13351,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB-VOICE_GENERIC-NB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -13884,8 +13880,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -16024,9 +16020,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB-VOICE_GENERIC-WB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -16554,8 +16549,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -18694,9 +18689,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -19224,8 +19218,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -19683,7 +19677,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -20534,7 +20528,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -21364,9 +21358,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB-VOICE_GENERIC-FB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0009 //TX_OPERATION_MODE_0
1 0x0009 //TX_OPERATION_MODE_1
@@ -21894,8 +21887,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -24034,9 +24027,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB-RESERVE2-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -24564,8 +24556,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -25001,7 +24993,7 @@ 960 0x0000 //TX_AMS_RESRV_18
961 0x0000 //TX_AMS_RESRV_19
#RX
-0 0xA064 //RX_RECVFUNC_MODE_0
+0 0x8064 //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0003 //RX_SAMPLINGFREQ_SIG
3 0x0003 //RX_SAMPLINGFREQ_PROC
@@ -25023,7 +25015,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -26704,9 +26696,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB_NREC-VOICE_GENERIC-NB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -27234,8 +27225,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -29374,9 +29365,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB_NREC-VOICE_GENERIC-WB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -29904,8 +29894,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -32044,9 +32034,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB_NREC-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -32574,8 +32563,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -33033,7 +33022,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -33884,7 +33873,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -34714,9 +34703,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB_NREC-VOICE_GENERIC-FB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0009 //TX_OPERATION_MODE_0
1 0x0009 //TX_OPERATION_MODE_1
@@ -35244,8 +35232,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -37384,9 +37372,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB_NREC-RESERVE2-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -37914,8 +37901,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -38351,7 +38338,7 @@ 960 0x0000 //TX_AMS_RESRV_18
961 0x0000 //TX_AMS_RESRV_19
#RX
-0 0xA064 //RX_RECVFUNC_MODE_0
+0 0x8064 //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0003 //RX_SAMPLINGFREQ_SIG
3 0x0003 //RX_SAMPLINGFREQ_PROC
@@ -38373,7 +38360,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -39224,7 +39211,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -40054,9 +40041,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB-VOICE_GENERIC-NB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -40584,8 +40570,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -42724,9 +42710,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB-VOICE_GENERIC-WB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -43254,8 +43239,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -45394,9 +45379,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -45924,8 +45908,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -46383,7 +46367,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -47234,7 +47218,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -48064,9 +48048,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB-VOICE_GENERIC-FB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0009 //TX_OPERATION_MODE_0
1 0x0009 //TX_OPERATION_MODE_1
@@ -48594,8 +48577,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -50734,9 +50717,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB-RESERVE2-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -51264,8 +51246,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -51701,7 +51683,7 @@ 960 0x0000 //TX_AMS_RESRV_18
961 0x0000 //TX_AMS_RESRV_19
#RX
-0 0xA064 //RX_RECVFUNC_MODE_0
+0 0x8064 //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0003 //RX_SAMPLINGFREQ_SIG
3 0x0003 //RX_SAMPLINGFREQ_PROC
@@ -51723,7 +51705,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -52574,7 +52556,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -53404,9 +53386,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB_NREC-VOICE_GENERIC-NB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -53934,8 +53915,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -56074,9 +56055,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB_NREC-VOICE_GENERIC-WB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -56604,8 +56584,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -58744,9 +58724,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB_NREC-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -59274,8 +59253,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -59733,7 +59712,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -60584,7 +60563,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -61414,9 +61393,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB_NREC-VOICE_GENERIC-FB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0009 //TX_OPERATION_MODE_0
1 0x0009 //TX_OPERATION_MODE_1
@@ -61944,8 +61922,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -64084,9 +64062,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB_NREC-RESERVE2-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -64614,8 +64591,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -65051,7 +65028,7 @@ 960 0x0000 //TX_AMS_RESRV_18
961 0x0000 //TX_AMS_RESRV_19
#RX
-0 0xA064 //RX_RECVFUNC_MODE_0
+0 0x8064 //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0003 //RX_SAMPLINGFREQ_SIG
3 0x0003 //RX_SAMPLINGFREQ_PROC
@@ -65073,7 +65050,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -65924,7 +65901,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -66754,9 +66731,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-RESERVE1-VOICE_GENERIC-FB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0000 //TX_OPERATION_MODE_1
@@ -67284,8 +67260,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
diff --git a/audio/cheetah/tuning/fortemedia_stereo/HANDSET.dat b/audio/cheetah/tuning/fortemedia_stereo/HANDSET.dat Binary files differindex 2c8e749..232c2d1 100644 --- a/audio/cheetah/tuning/fortemedia_stereo/HANDSET.dat +++ b/audio/cheetah/tuning/fortemedia_stereo/HANDSET.dat diff --git a/audio/cheetah/tuning/fortemedia_stereo/HANDSET.mods b/audio/cheetah/tuning/fortemedia_stereo/HANDSET.mods index c9557a4..1a5884d 100644 --- a/audio/cheetah/tuning/fortemedia_stereo/HANDSET.mods +++ b/audio/cheetah/tuning/fortemedia_stereo/HANDSET.mods @@ -1,10 +1,11 @@ #PLATFORM_NAME gChip
-#EXPORT_FLAG HANDSET
#SINGLE_API_VER 1.2.1
-#SAVE_TIME 2023-03-10 12:41:16
+#EXPORT_FLAG HANDSET
+#PARAM_MODE FULL
+#SAVE_MODE 3
+#SAVE_TIME 2023-08-15 15:59:55
#CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-NB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -534,8 +535,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -2674,7 +2675,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-WB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -3204,8 +3204,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -5344,7 +5344,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -5874,8 +5873,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -8014,7 +8013,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -8544,8 +8542,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -10684,7 +10682,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-TMOBILE_US-NB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -11214,8 +11211,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -13354,7 +13351,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-TMOBILE_US-WB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -13884,8 +13880,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -16024,7 +16020,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-TMOBILE_US-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -16554,8 +16549,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -18694,7 +18689,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-TMOBILE_US-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -19224,8 +19218,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -21364,7 +21358,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-CUSTOM1-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -21894,8 +21887,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -24034,7 +24027,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-CUSTOM1-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -24564,8 +24556,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -26704,7 +26696,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-CUSTOM2-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -27234,8 +27225,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -29374,7 +29365,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-CUSTOM2-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -29904,8 +29894,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -32044,7 +32034,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-RESERVE1-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -32574,8 +32563,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -34714,7 +34703,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-RESERVE1-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -35244,8 +35232,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -37384,7 +37372,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-RESERVE2-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -37914,8 +37901,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -40054,7 +40041,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-VOICE_GENERIC-NB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -40584,8 +40570,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -42724,7 +42710,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-VOICE_GENERIC-WB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -43254,8 +43239,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -45394,7 +45379,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -45924,8 +45908,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -48064,7 +48048,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-VOICE_GENERIC-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -48594,8 +48577,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -50734,7 +50717,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-TMOBILE_US-NB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -51264,8 +51246,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -53404,7 +53386,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-TMOBILE_US-WB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -53934,8 +53915,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -56074,7 +56055,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-TMOBILE_US-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -56604,8 +56584,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -58744,7 +58724,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-TMOBILE_US-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -59274,8 +59253,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -61414,7 +61393,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-RESERVE2-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -61944,8 +61922,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
diff --git a/audio/cheetah/tuning/fortemedia_stereo/HANDSFREE.dat b/audio/cheetah/tuning/fortemedia_stereo/HANDSFREE.dat Binary files differindex e6270f1..0440245 100644 --- a/audio/cheetah/tuning/fortemedia_stereo/HANDSFREE.dat +++ b/audio/cheetah/tuning/fortemedia_stereo/HANDSFREE.dat diff --git a/audio/cheetah/tuning/fortemedia_stereo/HANDSFREE.mods b/audio/cheetah/tuning/fortemedia_stereo/HANDSFREE.mods index cfcbef3..ceb562a 100644 --- a/audio/cheetah/tuning/fortemedia_stereo/HANDSFREE.mods +++ b/audio/cheetah/tuning/fortemedia_stereo/HANDSFREE.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG HANDSFREE
#PARAM_MODE FULL
#SAVE_MODE 3
-#SAVE_TIME 2023-03-20 17:19:03
+#SAVE_TIME 2023-08-15 16:00:16
#CASE_NAME HANDSFREE-HANDFREE-VOICE_GENERIC-NB
#PARAM_TYPE TX+2RX
@@ -535,8 +535,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -3204,8 +3204,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -5873,8 +5873,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -8542,8 +8542,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -11211,8 +11211,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -13880,8 +13880,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -16549,8 +16549,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -19218,8 +19218,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -21887,8 +21887,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -24556,8 +24556,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -27225,8 +27225,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0064 //TX_DR_RESRV_5
525 0x1000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
diff --git a/audio/cheetah/tuning/fortemedia_stereo/HEADSET.dat b/audio/cheetah/tuning/fortemedia_stereo/HEADSET.dat Binary files differindex 2686bac..2ff80e4 100644 --- a/audio/cheetah/tuning/fortemedia_stereo/HEADSET.dat +++ b/audio/cheetah/tuning/fortemedia_stereo/HEADSET.dat diff --git a/audio/cheetah/tuning/fortemedia_stereo/HEADSET.mods b/audio/cheetah/tuning/fortemedia_stereo/HEADSET.mods index 0414027..9345e3d 100644 --- a/audio/cheetah/tuning/fortemedia_stereo/HEADSET.mods +++ b/audio/cheetah/tuning/fortemedia_stereo/HEADSET.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG HEADSET
#PARAM_MODE FULL
#SAVE_MODE 3
-#SAVE_TIME 2023-03-20 17:50:42
+#SAVE_TIME 2023-08-15 16:00:35
#CASE_NAME HEADSET-USB_BLACKBIRD-VOICE_GENERIC-NB
#PARAM_TYPE TX+2RX
@@ -535,8 +535,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -3204,8 +3204,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -5873,8 +5873,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -8542,8 +8542,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -11211,8 +11211,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -13880,8 +13880,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -16549,8 +16549,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -19218,8 +19218,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -21887,8 +21887,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -24556,8 +24556,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -27225,8 +27225,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -29894,8 +29894,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -32563,8 +32563,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -35232,8 +35232,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -37901,8 +37901,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0064 //TX_DR_RESRV_5
525 0x1000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -40570,8 +40570,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -43239,8 +43239,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -45908,8 +45908,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -48577,8 +48577,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -51246,8 +51246,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -53915,8 +53915,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -56584,8 +56584,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -59253,8 +59253,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -61922,8 +61922,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -64591,8 +64591,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -67260,8 +67260,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -69929,8 +69929,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -72598,8 +72598,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -75267,8 +75267,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -77936,8 +77936,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0064 //TX_DR_RESRV_5
525 0x1000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -80605,8 +80605,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -83274,8 +83274,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -85943,8 +85943,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -88612,8 +88612,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -91281,8 +91281,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -93950,8 +93950,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -96619,8 +96619,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -99288,8 +99288,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -101957,8 +101957,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -104626,8 +104626,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
diff --git a/audio/panther/aidl_config/audio_platform_configuration.xml b/audio/panther/aidl_config/audio_platform_configuration.xml new file mode 100644 index 0000000..a3144da --- /dev/null +++ b/audio/panther/aidl_config/audio_platform_configuration.xml @@ -0,0 +1,121 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<!-- 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. +--> +<audioPlatformConfiguration xmlns:xi="http://www.w3.org/2001/XInclude"> + <features> + <feature name="ThermalThrottle"> + <argument name="Type" value="SKIN" /> + <argument name="Name" value="VIRTUAL-SKIN" /> + </feature> + <feature name="BatteryThrottle"> + <argument name="Type" value="BCL_VOLTAGE" /> + <argument name="Name" value="BCL_AUDIO_BAACL" /> + <argument name="Strategy" value="MediaSpeakerAndScreenOn" /> + </feature> + <feature name="PlaybackThermalThrottle"> + <argument name="PollWaitMs" value="20000" /> + <argument name="ThermistorName" value="VIRTUAL-SKIN" /> + <argument name="ThermistorType" value="SKIN" /> + <argument name="ThrottlingSeverity" value="MODERATE" /> + </feature> + </features> + + <voipVolume> + <path voipDevice="VoipDevice::kUsb"> + <gain>0.01</gain> + <gain>0.02</gain> + <gain>0.04</gain> + <gain>0.10</gain> + <gain>0.21</gain> + <gain>0.47</gain> + <gain>1.00</gain> + </path> + </voipVolume> + + <devices> + <device name="bluetooth" /> + <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"> + <argument name="SpeakerNum" value="2" /> + <argument name="Rotation" /> + <argument name="AcousticShockProtection" /> + </device> + </devices> + + <tuners> + <tuner type="playback" name="waves"> + <argument name="Sink" value="SPK" /> + <argument name="ThermistorsName" value="VIRTUAL-SKIN" /> + </tuner> + <tuner type="telephony" name="fortemedia"> + <argument name="VoIP_DLCHs" value="SPK:2,USB:2" /> + <argument name="VoIP_Rate" value="32000" /> + <argument name="BOOST_USB_SWB_CLK" value="y" /> + <argument name="CCA" value="y" /> + </tuner> + <tuner type="capture" name="gs_capture" /> + </tuners> + + <latencies> + <latency source="primary-playback" sink="speaker" milliseconds="20" /> + <latency source="primary-playback" sink="usb-device" milliseconds="60" /> + <latency source="primary-playback" sink="usb-headset" milliseconds="60" /> + <latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="60" /> + <latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="60" /> + + <latency source="deep-buffer-playback" sink="speaker" milliseconds="70" /> + <latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" /> + <latency source="deep-buffer-playback" sink="usb-headset" milliseconds="70" /> + <latency source="deep-buffer-playback" sink="bluetooth-a2dp-device" milliseconds="180" /> + <latency source="deep-buffer-playback" sink="bluetooth-low-energy-speaker" milliseconds="80" /> + + <latency source="compress-offload-playback" sink="speaker" milliseconds="40" /> + <latency source="compress-offload-playback" sink="usb-device" milliseconds="40" /> + <latency source="compress-offload-playback" sink="usb-headset" milliseconds="40" /> + <latency source="compress-offload-playback" sink="bluetooth-a2dp-device" milliseconds="70" /> + <latency source="compress-offload-playback" sink="bluetooth-low-energy-speaker" + milliseconds="20" /> + + <latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" /> + + <latency source="microphones" sink="primary-capture" milliseconds="160" /> + <latency source="back-microphones" sink="primary-capture" milliseconds="160" /> + <latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" /> + </latencies> + + <spatialCapture> + <enablement useCase="primary-capture" deviceInterface="microphones"> + <source>MIC</source> + <source>CAMCORDER</source> + <source>VOICE_RECOGNITION</source> + </enablement> + <enablement useCase="primary-capture" deviceInterface="back-microphones"> + <source>MIC</source> + <source>CAMCORDER</source> + <source>VOICE_RECOGNITION</source> + </enablement> + </spatialCapture> + + <xi:include href="audio_policy_volumes.xml" /> + <xi:include href="default_volume_tables.xml" /> +</audioPlatformConfiguration> diff --git a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml deleted file mode 100644 index 912b4aa..0000000 --- a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- Copyright (c) 2023, The Linux Foundation. All rights reserved. --> -<!-- --> -<!-- Redistribution and use in source and binary forms, with or without --> -<!-- modification, are permitted provided that the following conditions are --> -<!-- met: --> -<!-- * Redistributions of source code must retain the above copyright --> -<!-- notice, this list of conditions and the following disclaimer. --> -<!-- * Redistributions in binary form must reproduce the above --> -<!-- copyright notice, this list of conditions and the following --> -<!-- disclaimer in the documentation and/or other materials provided --> -<!-- with the distribution. --> -<!-- * Neither the name of The Linux Foundation nor the names of its --> -<!-- contributors may be used to endorse or promote products derived --> -<!-- from this software without specific prior written permission. --> -<!-- --> -<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED --> -<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF --> -<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT --> -<!-- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS --> -<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR --> -<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF --> -<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR --> -<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, --> -<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN --> -<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --> -<audio_platform_configuration> - <product_lists> - <product name="Blackbird"> - <id value="18d1:5033" /> - </product> - <product name="Condor"> - <id value="18d1:5034" /> - </product> - <product name="Condor_Sprint"> - <id value="18d1:5038" /> - </product> - <product name="Condor_Sprint2"> - <id value="18d1:5036" /> - </product> - </product_lists> - - <features> - <feature name="ThermalThrottle=Type:SKIN,Name:VIRTUAL-SKIN" /> - <feature - name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn" /> - <feature - name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN,ThermistorType:SKIN,ThrottlingSeverity:MODERATE" /> - </features> - - <!-- The voip_db_mapping: format is "device="x" value="f1,f2..." --> - <!-- device should be "handset","speaker","usb","bt","bt_hearing_aid" or "digital_dock" --> - <voip_db_mapping> - <voip_path device="usb" value="0.01,0.02,0.04,0.1,0.21,0.47,1.0" /> - </voip_db_mapping> - - <!-- The device_builder: format is "type="x" codec_name="y" argu="z". name and argu are optional. --> - <device_builder> - <device type="bt" /> - <device type="usb" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE" /> - <device type="speaker" codec_name="cs35l41" argu="SpeakerNum=4,Rotation,AcousticShockProtection" /> - </device_builder> - - <!-- The spatial_capture_conditions: format is "use_case="x" audio_source="y" --> - <!-- use_case defines in aidl/audio/usecase/use_case.h, audio_source is definied in aidl interfaces. --> - <spatial_capture_conditions> - <conditions use_case="primary-capture" audio_source="MIC,CAMCORDER,VOICE_RECOGNITION" /> - </spatial_capture_conditions> - - <!-- The tuner_builder: format is "type="x" codec_name="y" argu="z". argu is optional. --> - <tuner_builder> - <tuner type="playback" name="waves" argu="Sink=SPK ThermistorsName=VIRTUAL-SKIN" /> - <tuner type="telephony" name="fortemedia" argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y CCA=y" /> - <tuner type="capture" name="gs_capture" /> - </tuner_builder> -</audio_platform_configuration> diff --git a/audio/panther/aidl_config/audio_policy_configuration.xml b/audio/panther/aidl_config/audio_policy_configuration.xml deleted file mode 100644 index dfc8577..0000000 --- a/audio/panther/aidl_config/audio_policy_configuration.xml +++ /dev/null @@ -1,203 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- Copyright (C) 2020 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. ---> -<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude"> - <globalConfiguration speaker_drc_enabled="false" call_screen_mode_supported="true" /> - <modules> - <!-- Primary Audio HAL --> - <module name="primary" halVersion="2.0"> - <attachedDevices> - <item>Speaker</item> - <item>Speaker Safe</item> - <item>Earpiece</item> - <item>Built-In Mic</item> - <item>Built-In Back Mic</item> - <item>Telephony Tx</item> - <item>Voice Call And Telephony Rx</item> - <item>Echo Ref In</item> - </attachedDevices> - <defaultOutputDevice>Speaker</defaultOutputDevice> - <mixPorts> - <mixPort name="primary output" role="source" - flags="AUDIO_OUTPUT_FLAG_PRIMARY AUDIO_OUTPUT_FLAG_FAST" - recommendedMuteDurationMs="40"> - <profile name="" format="AUDIO_FORMAT_PCM_FLOAT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> - <mixPort name="deep buffer" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER"> - <profile name="" format="AUDIO_FORMAT_PCM_FLOAT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> - <mixPort name="compressed offload" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD"> - <profile name="" format="AUDIO_FORMAT_MP3" - samplingRates="8000 16000 24000 32000 44100 48000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO" /> - <profile name="" format="AUDIO_FORMAT_AAC_LC" - samplingRates="8000 16000 24000 32000 44100 48000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO" /> - <profile name="" format="AUDIO_FORMAT_AAC_HE_V1" - samplingRates="8000 16000 24000 32000 44100 48000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO" /> - <profile name="" format="AUDIO_FORMAT_AAC_HE_V2" - samplingRates="8000 16000 24000 32000 44100 48000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO" /> - </mixPort> - <mixPort name="haptic" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A" /> - </mixPort> - <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER"> - <profile name="" format="AUDIO_FORMAT_PCM_32_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> - <mixPort name="incall playback" role="source" - flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> - <mixPort name="voip_rx" role="source" - flags="AUDIO_OUTPUT_FLAG_VOIP_RX"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> - <!-- <mixPort name="mmap playback" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_MMAP_NOIRQ"> - <profile name="" format="AUDIO_FORMAT_PCM_FLOAT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> - <mixPort name="raw" role="source" - flags="AUDIO_OUTPUT_FLAG_RAW AUDIO_OUTPUT_FLAG_FAST"> - <profile name="" format="AUDIO_FORMAT_PCM_32_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </mixPort> --> - - <mixPort name="primary input" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" - channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO AUDIO_CHANNEL_INDEX_MASK_3" /> - </mixPort> - <mixPort name="voip_tx" role="sink" - flags="AUDIO_INPUT_FLAG_VOIP_TX"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO" /> - </mixPort> - <mixPort name="fast input" role="sink" - flags="AUDIO_INPUT_FLAG_RAW AUDIO_INPUT_FLAG_FAST"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" - channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" /> - </mixPort> - <mixPort name="hotword input" role="sink" flags="AUDIO_INPUT_FLAG_HW_HOTWORD"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="16000" - channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" /> - </mixPort> - <!-- <mixPort name="mmap capture" role="sink" flags="AUDIO_INPUT_FLAG_MMAP_NOIRQ"> - <profile name="" format="AUDIO_FORMAT_PCM_32_BIT" - samplingRates="48000" - channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO" /> - </mixPort> --> - - </mixPorts> - <devicePorts> - <!-- Output devices declaration, i.e. Sink DEVICE PORT --> - <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink" /> - <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink" /> - <devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink" /> - <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" - role="sink" /> - <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" - role="sink" /> - <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink" /> - <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" - role="sink" /> - <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" - role="sink" /> - <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink" /> - <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" - role="sink" /> - <devicePort tagName="Aux Digital" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink" /> - <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink" /> - <!-- Input devices declaration, i.e. Source DEVICE PORT --> - <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source" /> - <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" - role="source" /> - <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" - role="source" /> - <devicePort tagName="BT SCO Headset Mic" - type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source" /> - <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink" - encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </devicePort> - <devicePort tagName="BT A2DP Headphones" - type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink" - encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </devicePort> - <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" - role="sink" - encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </devicePort> - <devicePort tagName="BT BLE Headset" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink" - encodedFormats="AUDIO_FORMAT_LC3"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </devicePort> - <devicePort tagName="BT BLE Speaker" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink" - encodedFormats="AUDIO_FORMAT_LC3"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO" /> - </devicePort> - <devicePort tagName="BLE Headset Mic" type="AUDIO_DEVICE_IN_BLE_HEADSET" - role="source"> - </devicePort> - <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source" /> - <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" - role="source" /> - <!-- AUDIO_DEVICE_IN_VOICE_CALL and AUDIO_DEVICE_IN_TELEPHONY_RX are in the same - value --> - <devicePort tagName="Voice Call And Telephony Rx" type="AUDIO_DEVICE_IN_VOICE_CALL" - role="source" /> - <devicePort tagName="Echo Ref In" type="AUDIO_DEVICE_IN_ECHO_REFERENCE" - role="source" /> - </devicePorts> - <!-- route declaration, i.e. list all available sources for a given sink --> - <routes> - <route type="mix" sink="Earpiece" - sources="primary output,deep buffer,haptic,voip_rx,compressed offload" /> - <route type="mix" sink="Speaker" - sources="primary output,deep buffer,haptic,voip_rx,compressed offload" /> - <route type="mix" sink="Telephony Tx" sources="incall playback" /> - <route type="mix" sink="primary input" - sources="Built-In Mic,Built-In Back Mic" /> - <route type="mix" sink="voip_tx" - sources="Built-In Mic,Built-In Back Mic" /> - <route type="mix" sink="fast input" - sources="Built-In Mic,Built-In Back Mic" /> - <route type="mix" sink="hotword input" sources="Built-In Mic" /> - </routes> - </module> - </modules> - <!-- End of Modules section --> - <!-- Volume section --> - <xi:include href="audio_policy_volumes.xml" /> - <xi:include href="default_volume_tables.xml" /> - <!-- End of Volume section --> -</audioPolicyConfiguration> diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml index 894ef4e..bb9574b 100644 --- a/audio/panther/aidl_config/mixer_paths_aidl.xml +++ b/audio/panther/aidl_config/mixer_paths_aidl.xml @@ -79,8 +79,8 @@ <!-- Cirrus Booster Amp Output Gain --> <ctl name="AMP PCM Gain" value="17" /> <ctl name="R AMP PCM Gain" value="17" /> - <ctl name="Digital PCM Volume" value="817" /> - <ctl name="R Digital PCM Volume" value="817" /> + <ctl name="Digital PCM Volume" value="0" /> + <ctl name="R Digital PCM Volume" value="0" /> <!-- Cirrus Booster Amp Power --> <ctl name="Main AMP Enable Switch" value="0" /> @@ -97,6 +97,8 @@ <ctl name="R DSP RX2 Source" value="ASPRX1" /> <ctl name="Boost Peak Current Limit" value="3.50A" /> <ctl name="R Boost Peak Current Limit" value="3.50A" /> + <ctl name="PCM Soft Ramp" value=".5ms" /> + <ctl name="R PCM Soft Ramp" value=".5ms" /> <!-- Cirrus ASP TX source --> <ctl name="ASP TX1 Source" value="VMON" /> @@ -254,7 +256,9 @@ <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON" /> <ctl name="Voice Call Mic Source" value="Builtin_MIC" /> + <ctl name="Mic Spatial Module Enable" value="0" /> <ctl name="Audio Capture Eraser Enable" value="0" /> + <ctl name="Hotword Tap Enable" value="0" /> <!-- audio PDM mic default state --> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" /> @@ -372,10 +376,46 @@ <ctl name="BT_RX Mixer EP2" value="1" /> </path> - <path name="primary-playback -> usb-headset"> + <path name="primary-playback-0 -> bt"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-a2dp-device"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-a2dp-headphone"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-a2dp-speaker"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-sco-default"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-sco-headset"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> bluetooth-sco-car-kit"> + <path name="primary-playback -> bt" /> + </path> + + <path name="primary-playback-0 -> usb"> <ctl name="USB_RX Mixer EP2" value="1" /> </path> + <path name="primary-playback-0 -> usb-headset"> + <path name="primary-playback-0 -> usb" /> + </path> + + <path name="primary-playback-0 -> usb-device"> + <path name="primary-playback-0 -> usb" /> + </path> + <path name="raw-playback -> speaker"> <ctl name="TDM_0_RX Mixer RAW" value="1" /> </path> @@ -396,10 +436,46 @@ <ctl name="BT_RX Mixer RAW" value="1" /> </path> - <path name="raw-playback -> usb-headset"> + <path name="raw-playback-0 -> bt"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-a2dp-device"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-a2dp-headphone"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-a2dp-speaker"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-sco-default"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-sco-headset"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> bluetooth-sco-car-kit"> + <path name="raw-playback -> bt" /> + </path> + + <path name="raw-playback-0 -> usb"> <ctl name="USB_RX Mixer RAW" value="1" /> </path> + <path name="raw-playback-0 -> usb-headset"> + <path name="raw-playback-0 -> usb" /> + </path> + + <path name="raw-playback-0 -> usb-device"> + <path name="raw-playback-0 -> usb" /> + </path> + <path name="deep-buffer-playback -> speaker"> <ctl name="TDM_0_RX Mixer EP6" value="1" /> </path> @@ -420,10 +496,46 @@ <ctl name="BT_RX Mixer EP6" value="1" /> </path> - <path name="deep-buffer-playback -> usb-headset"> + <path name="deep-buffer-playback-0 -> bt"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-a2dp-device"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-a2dp-headphone"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-a2dp-speaker"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-sco-default"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-sco-headset"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> bluetooth-sco-car-kit"> + <path name="deep-buffer-playback -> bt" /> + </path> + + <path name="deep-buffer-playback-0 -> usb"> <ctl name="USB_RX Mixer EP6" value="1" /> </path> + <path name="deep-buffer-playback-0 -> usb-headset"> + <path name="deep-buffer-playback-0 -> usb" /> + </path> + + <path name="deep-buffer-playback-0 -> usb-device"> + <path name="deep-buffer-playback-0 -> usb" /> + </path> + <path name="compress-offload-playback"> <ctl name="LVM Enable" value="1" /> </path> @@ -449,10 +561,46 @@ <ctl name="BT_RX Mixer EP7" value="1" /> </path> - <path name="compress-offload-playback -> usb-headset"> + <path name="compress-offload-playback-0 -> bt"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-a2dp-device"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-a2dp-headphone"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-a2dp-speaker"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-sco-default"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-sco-headset"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> bluetooth-sco-car-kit"> + <path name="compress-offload-playback -> bt" /> + </path> + + <path name="compress-offload-playback-0 -> usb"> <ctl name="USB_RX Mixer EP7" value="1" /> </path> + <path name="compress-offload-playback-0 -> usb-headset"> + <path name="compress-offload-playback-0 -> usb" /> + </path> + + <path name="compress-offload-playback-0 -> usb-device"> + <path name="compress-offload-playback-0 -> usb" /> + </path> + <path name="mmap-playback -> speaker"> <ctl name="TDM_0_RX Mixer EP1" value="1" /> </path> @@ -473,14 +621,58 @@ <ctl name="BT_RX Mixer EP1" value="1" /> </path> - <path name="mmap-playback -> usb-headset"> + <path name="mmap-playback-0 -> bt"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-a2dp-device"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-a2dp-headphone"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-a2dp-speaker"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-sco-default"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-sco-headset"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> bluetooth-sco-car-kit"> + <path name="mmap-playback -> bt" /> + </path> + + <path name="mmap-playback-0 -> usb"> <ctl name="USB_RX Mixer EP1" value="1" /> </path> - <path name="hifi-playback -> usb-headset"> + <path name="mmap-playback-0 -> usb-headset"> + <path name="mmap-playback-0 -> usb" /> + </path> + + <path name="mmap-playback-0 -> usb-device"> + <path name="mmap-playback-0 -> usb" /> + </path> + + <path name="hifi-playback-0 -> usb"> <ctl name="USB_RX Mixer HIFI" value="1" /> </path> + <path name="hifi-playback-0 -> usb-headset"> + <path name="hifi-playback-0 -> usb" /> + </path> + + <path name="hifi-playback-0 -> usb-device"> + <path name="hifi-playback-0 -> usb" /> + </path> + <path name="voip-playback -> speaker"> <ctl name="TDM_0_RX Mixer VOIP" value="1" /> </path> @@ -501,10 +693,46 @@ <ctl name="BT_RX Mixer VOIP" value="1" /> </path> - <path name="voip-playback -> usb-headset"> + <path name="voip-playback-0 -> bt"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-a2dp-device"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-a2dp-headphone"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-a2dp-speaker"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-sco-default"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-sco-headset"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> bluetooth-sco-car-kit"> + <path name="voip-playback -> bt" /> + </path> + + <path name="voip-playback-0 -> usb"> <ctl name="USB_RX Mixer VOIP" value="1" /> </path> + <path name="voip-playback-0 -> usb-headset"> + <path name="voip-playback-0 -> usb" /> + </path> + + <path name="voip-playback-0 -> usb-device"> + <path name="voip-playback-0 -> usb" /> + </path> + <path name="immersive-playback -> speaker"> <ctl name="TDM_0_RX Mixer IMSV" value="1" /> </path> @@ -525,10 +753,34 @@ <ctl name="BT_RX Mixer IMSV" value="1" /> </path> - <path name="immersive-playback -> usb-headset"> + <path name="immersive-playback-0 -> bt"> + <path name="immersive-playback -> bt" /> + </path> + + <path name="immersive-playback-0 -> bluetooth-a2dp-device"> + <path name="immersive-playback -> bt" /> + </path> + + <path name="immersive-playback-0 -> bluetooth-a2dp-headphone"> + <path name="immersive-playback -> bt" /> + </path> + + <path name="immersive-playback-0 -> bluetooth-a2dp-speaker"> + <path name="immersive-playback -> bt" /> + </path> + + <path name="immersive-playback-0 -> usb"> <ctl name="USB_RX Mixer IMSV" value="1" /> </path> + <path name="immersive-playback-0 -> usb-headset"> + <path name="immersive-playback-0 -> usb" /> + </path> + + <path name="immersive-playback-0 -> usb-device"> + <path name="immersive-playback-0 -> usb" /> + </path> + <path name="haptic-playback -> speaker"> <ctl name="TDM_0_RX Mixer EP3" value="1" /> <ctl name="TDM_0_RX Mixer EP8" value="1" /> @@ -551,11 +803,47 @@ <ctl name="TDM_0_RX Mixer EP8" value="1" /> </path> - <path name="haptic-playback -> usb-headset"> + <path name="haptic-playback-0 -> bt"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-a2dp-device"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-a2dp-headphone"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-a2dp-speaker"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-sco-default"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-sco-headset"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> bluetooth-sco-car-kit"> + <path name="haptic-playback -> bt" /> + </path> + + <path name="haptic-playback-0 -> usb"> <ctl name="USB_RX Mixer EP3" value="1" /> <ctl name="TDM_0_RX Mixer EP8" value="1" /> </path> + <path name="haptic-playback-0 -> usb-headset"> + <path name="haptic-playback-0 -> usb" /> + </path> + + <path name="haptic-playback-0 -> usb-device"> + <path name="haptic-playback-0 -> usb" /> + </path> + <!-- audio capture dynamic route --> <path name="microphones -> primary-capture-0"> <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" /> @@ -565,10 +853,18 @@ <ctl name="EP1 TX Mixer INTERNAL_MIC_TX" value="1" /> </path> - <path name="usb-headset-mic -> primary-capture-0"> + <path name="usb-microphones -> primary-capture-0"> <ctl name="EP1 TX Mixer USB_TX" value="1" /> </path> + <path name="usb-headset-microphones -> primary-capture-0"> + <path name="usb-microphones -> primary-capture-0" /> + </path> + + <path name="usb-device-microphones -> primary-capture-0"> + <path name="usb-microphones -> primary-capture-0" /> + </path> + <path name="microphones -> voip-capture-0"> <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" /> </path> @@ -577,11 +873,19 @@ <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" /> </path> - <path name="usb-headset-mic -> voip-capture-0"> + <path name="usb-microphones -> voip-capture-0"> <ctl name="VOIP TX Mixer USB_TX" value="1" /> </path> - <path name="bt-mic -> voip-capture-0"> + <path name="usb-headset-microphones -> voip-capture-0"> + <path name="usb-microphones -> voip-capture-0" /> + </path> + + <path name="usb-device-microphones -> voip-capture-0"> + <path name="usb-microphones -> voip-capture-0" /> + </path> + + <path name="bluetooth-sco-headset-microphones -> voip-capture-0"> <ctl name="VOIP TX Mixer BT_TX" value="1" /> </path> @@ -593,17 +897,31 @@ <ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" /> </path> - <path name="usb-headset-mic -> fast-capture-0"> + <path name="usb-microphones -> fast-capture-0"> <ctl name="EP3 TX Mixer USB_TX" value="1" /> </path> - <path name="bt-mic -> fast-capture-0"> + <path name="usb-headset-microphones -> fast-capture-0"> + <path name="usb-microphones -> fast-capture-0" /> + </path> + + <path name="usb-device-microphones -> fast-capture-0"> + <path name="usb-microphones -> fast-capture-0" /> + </path> + + <path name="bluetooth-sco-headset-microphones -> fast-capture-0"> <ctl name="EP3 TX Mixer BT_TX" value="1" /> </path> <path name="microphones -> sound-trigger-capture-0"> </path> + <path name="microphones -> sound-trigger-tap-capture-0"> + </path> + + <path name="microphones -> hotword-lookback-capture-0"> + </path> + <!-- voice-call dynamic route --> <path name="voice-call-downlink-0 -> speaker"> <ctl name="TDM_0_RX Mixer EP5" value="1" /> @@ -617,10 +935,30 @@ <ctl name="BT_RX Mixer EP5" value="1" /> </path> - <path name="voice-call-downlink-0 -> usb-headphone"> + <path name="voice-call-downlink-0 -> bluetooth-sco-default"> + <path name="voice-call-downlink-0 -> bt" /> + </path> + + <path name="voice-call-downlink-0 -> bluetooth-sco-headset"> + <path name="voice-call-downlink-0 -> bt" /> + </path> + + <path name="voice-call-downlink-0 -> bluetooth-sco-car-kit"> + <path name="voice-call-downlink-0 -> bt" /> + </path> + + <path name="voice-call-downlink-0 -> usb"> <ctl name="USB_RX Mixer EP5" value="1" /> </path> + <path name="voice-call-downlink-0 -> usb-headset"> + <path name="voice-call-downlink-0 -> usb" /> + </path> + + <path name="voice-call-downlink-0 -> usb-device"> + <path name="voice-call-downlink-0 -> usb" /> + </path> + <path name="voice-call-downlink-0 -> null-sink"> <ctl name="INCALL_RX Mixer EP5" value="1" /> </path> @@ -633,11 +971,19 @@ <ctl name="EP4 TX Mixer INTERNAL_MIC_TX" value="1" /> </path> - <path name="usb-headset-mic -> voice-call-uplink-0"> + <path name="usb-microphones -> voice-call-uplink-0"> <ctl name="EP4 TX Mixer USB_TX" value="1" /> </path> - <path name="bt-mic -> voice-call-uplink-0"> + <path name="usb-headset-microphones -> voice-call-uplink-0"> + <path name="usb-microphones -> voice-call-uplink-0" /> + </path> + + <path name="usb-device-microphones -> voice-call-uplink-0"> + <path name="usb-microphones -> voice-call-uplink-0" /> + </path> + + <path name="bluetooth-sco-headset-microphones -> voice-call-uplink-0"> <ctl name="EP4 TX Mixer BT_TX" value="1" /> </path> @@ -649,19 +995,59 @@ <ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" /> </path> - <path name="telephony-rx -> in-call-capture-0" /> - <path name="telephony-rx -> in-call-capture-1" /> - <path name="telephony-rx -> in-call-capture-2" /> + <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0"> + <ctl name="Incall Capture Stream0" value="DL" /> + </path> + + <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0"> + <ctl name="Incall Capture Stream0" value="UL" /> + </path> + + <path name="telephony-rx (VOICE_CALL) -> in-call-capture-0"> + <ctl name="Incall Capture Stream0" value="UL_DL" /> + </path> + + <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1"> + <ctl name="Incall Capture Stream1" value="DL" /> + </path> + + <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1"> + <ctl name="Incall Capture Stream1" value="UL" /> + </path> + + <path name="telephony-rx (VOICE_CALL) -> in-call-capture-1"> + <ctl name="Incall Capture Stream1" value="UL_DL" /> + </path> + + <path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2"> + <ctl name="Incall Capture Stream2" value="DL" /> + </path> + + <path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2"> + <ctl name="Incall Capture Stream2" value="UL" /> + </path> + + <path name="telephony-rx (VOICE_CALL) -> in-call-capture-2"> + <ctl name="Incall Capture Stream2" value="UL_DL" /> + </path> <path name="microphones -> mmap-capture-0"> <ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" /> </path> - <path name="usb-headset-mic -> mmap-capture-0"> + <path name="usb-microphones -> mmap-capture-0"> <ctl name="EP2 TX Mixer USB_TX" value="1" /> </path> - <path name="bt-mic -> mmap-capture-0"> + <path name="usb-headset-microphones -> mmap-capture-0"> + <path name="usb-microphones -> mmap-capture-0" /> + </path> + + <path name="usb-device-microphones -> mmap-capture-0"> + <path name="usb-microphones -> mmap-capture-0" /> + </path> + + <path name="bluetooth-sco-headset-microphones -> mmap-capture-0"> <ctl name="EP2 TX Mixer BT_TX" value="1" /> </path> @@ -674,15 +1060,12 @@ </path> <path name="speaker-earpiece (VOICE)"> - <ctl name="Boost Peak Current Limit" value="3.50A" /> <ctl name="PCM Source" value="ASP" /> <ctl name="AMP PCM Gain" value="7" /> <ctl name="Main AMP Enable Switch" value="1" /> </path> <path name="speaker"> - <ctl name="Boost Peak Current Limit" value="2.50A" /> - <ctl name="R Boost Peak Current Limit" value="2.50A" /> <ctl name="Main AMP Enable Switch" value="1" /> <ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="Fast Use Case Delta File" value="fast_switch3.txt" /> @@ -692,12 +1075,9 @@ </path> <path name="speaker (VOICE)"> - <ctl name="R Boost Peak Current Limit" value="3.50A" /> - <ctl name="Boost Peak Current Limit" value="3.50A" /> <ctl name="ASPTX1 Slot Position" value="1" /> <ctl name="R ASPTX1 Slot Position" value="0" /> - <!--<ctl - name="R DSP RX2 Source" value="ASPRX2"/>--> + <!--<ctl name="R DSP RX2 Source" value="ASPRX2" />--> <ctl name="R Main AMP Enable Switch" value="1" /> <ctl name="Main AMP Enable Switch" value="1" /> <!-- load Enable FIR --> @@ -705,11 +1085,9 @@ <ctl name="Fast Use Case Switch Enable" value="1" /> <ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" /> <ctl name="R Fast Use Case Switch Enable" value="1" /> - <ctl name="Digital PCM Volume" value="800" /> </path> <path name="speaker-safe"> - <ctl name="R Boost Peak Current Limit" value="3.50A" /> <ctl name="R Main AMP Enable Switch" value="1" /> <!-- load Bypass FIR --> <ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" /> @@ -736,7 +1114,7 @@ <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> - <path name="back-microphones"> + <path name="microphones (VOICE_RECOGNITION)"> <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="2" value="2" /> @@ -745,55 +1123,63 @@ <ctl name="MIC Record Soft Gain (dB)" value="22" /> </path> - <path name="back-microphones (VOICE)"> + <path name="microphones (VOICE_RECOGNITION,SOUND_TRIGGER_TAP)"> + <ctl name="Audio Capture Eraser Enable" value="1" /> + <ctl name="Hotword Tap Enable" value="1" /> + <ctl name="MIC Record Soft Gain (dB)" value="0" /> + </path> + + <path name="microphones (SOUND_TRIGGER_AEC)"> + <ctl name="Audio Capture Eraser Enable" value="1" /> <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="2" value="2" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" /> <ctl name="MIC DC Blocker" value="1" /> - <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" /> + <ctl name="Audio Capture Mic Source" value="ERASER" /> <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> - <path name="microphones (CAMCORDER)"> - <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="2" value="2"/> - <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/> - <ctl name="MIC DC Blocker" value="1"/> - <ctl name="MIC Record Soft Gain (dB)" value="0"/> - </path> - - <path name="back-microphones (CAMCORDER)"> - <path name="microphones (CAMCORDER)" /> + <path name="back-microphones"> + <ctl name="Mic Spatial Module Enable" value="1" /> + <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="2" value="2" /> + <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" /> + <ctl name="MIC DC Blocker" value="1" /> + <ctl name="MIC Record Soft Gain (dB)" value="22" /> </path> - <path name="camcorder-mic"> + <path name="back-microphones (VOICE)"> <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="2" value="2" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" /> <ctl name="MIC DC Blocker" value="1" /> + <ctl name="MIC HW Gain At High Power Mode (cB)" value="130" /> <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> - <path name="voice-recog-mic"> + <path name="microphones (CAMCORDER)"> <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="2" value="2" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" /> <ctl name="MIC DC Blocker" value="1" /> - <ctl name="MIC Record Soft Gain (dB)" value="22" /> + <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> - <path name="voice-recog-aec-mic"> - <ctl name="Audio Capture Eraser Enable" value="1" /> + <path name="back-microphones (CAMCORDER)"> + <path name="microphones (CAMCORDER)" /> + </path> + + <path name="camcorder-mic"> + <ctl name="Mic Spatial Module Enable" value="1" /> <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="2" value="2" /> <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" /> <ctl name="MIC DC Blocker" value="1" /> - <ctl name="Audio Capture Mic Source" value="ERASER" /> <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> @@ -824,7 +1210,7 @@ <ctl name="MIC Record Soft Gain (dB)" value="5" /> </path> - <path name="bt-mic"> + <path name="bluetooth-sco-headset-microphones"> <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="2" value="2" /> @@ -834,7 +1220,7 @@ <ctl name="MIC Record Soft Gain (dB)" value="0" /> </path> - <path name="usb-headset-mic"> + <path name="usb-headset-microphones"> <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="2" value="2" /> @@ -859,4 +1245,69 @@ <ctl name="R DSP1 Preload Switch" value="1" /> </path> <!-- cs35l41 specific path to load firmware in cs35l41.c end--> + + <!-- cs35l41 specific path for adated feature in cs35l41_route_control.cc --> + <!-- Which is controlled by speaker module and path name format is fixed. --> + <!-- Path name format: adapted-{type}{-battery-throttled}{-acoustic-shock} --> + <!-- Battery throttle and acoustic shock are disabled: "adapted-speaker" --> + <!-- Battery throttle enabled: "adapted-speaker-battery-throttled" --> + <!-- Acoustic shock enabled: "adapted-speaker-acoustic-shock" --> + <!-- Both are enabled: "adapted-speaker-battery-throttled-acoustic-shock" --> + <path name="adapted-speaker"> + <ctl name="Boost Peak Current Limit" value="2.50A" /> + <ctl name="R Boost Peak Current Limit" value="2.50A" /> + <ctl name="Digital PCM Volume" value="817" /> + <ctl name="R Digital PCM Volume" value="817" /> + </path> + <path name="adapted-speaker-battery-throttled"> + <ctl name="Boost Peak Current Limit" value="1.80A" /> + <ctl name="R Boost Peak Current Limit" value="1.80A" /> + <ctl name="Digital PCM Volume" value="817" /> + <ctl name="R Digital PCM Volume" value="817" /> + </path> + + <path name="adapted-speaker-safe"> + <ctl name="R Boost Peak Current Limit" value="3.50A" /> + <ctl name="R Digital PCM Volume" value="817" /> + </path> + <path name="adapted-speaker-safe-battery-throttled"> + <path name="adapted-speaker-safe" /> + </path> + + <path name="adapted-earpiece"> + <ctl name="Digital PCM Volume" value="817" /> + </path> + <path name="adapted-earpiece-battery-throttled"> + <path name="adapted-earpiece" /> + </path> + + <path name="adapted-voice-speaker"> + <ctl name="R Boost Peak Current Limit" value="3.50A" /> + <ctl name="Boost Peak Current Limit" value="3.50A" /> + <ctl name="Digital PCM Volume" value="800" /> + <ctl name="R Digital PCM Volume" value="817" /> + </path> + <path name="adapted-voice-speaker-battery-throttled"> + <path name="adapted-voice-speaker" /> + </path> + <path name="adapted-voice-speaker-acoustic-shock"> + <ctl name="R Boost Peak Current Limit" value="3.50A" /> + <ctl name="Boost Peak Current Limit" value="3.50A" /> + <ctl name="PCM Soft Ramp" value="2ms" /> + <ctl name="Digital PCM Volume" value="0" /> + <ctl name="R Digital PCM Volume" value="817" /> + </path> + + <path name="adapted-voice-speaker-battery-throttled-acoustic-shock"> + <path name="adapted-voice-speaker-acoustic-shock" /> + </path> + + <path name="adapted-voice-earpiece"> + <ctl name="Boost Peak Current Limit" value="3.50A" /> + <ctl name="Digital PCM Volume" value="817" /> + </path> + <path name="adapted-voice-earpiece-battery-throttled"> + <path name="adapted-voice-earpiece" /> + </path> + <!-- cs35l41 specific path for adated feature in cs35l41_route_control.cc end --> </mixer> diff --git a/audio/panther/audio-tables.mk b/audio/panther/audio-tables.mk index 6a7619f..108b800 100644 --- a/audio/panther/audio-tables.mk +++ b/audio/panther/audio-tables.mk @@ -22,8 +22,7 @@ AUDIO_TABLE_FOLDER := panther ifeq ($(BUILD_AUDIO_AIDL_VERSION),true) # AIDL HAL configs are in the *aidl_config* folder PRODUCT_COPY_FILES += \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \ + device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ device/google/pantah/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml else diff --git a/audio/panther/config/audio_platform_configuration.xml b/audio/panther/config/audio_platform_configuration.xml index 5522ce1..87a2a43 100644 --- a/audio/panther/config/audio_platform_configuration.xml +++ b/audio/panther/config/audio_platform_configuration.xml @@ -311,7 +311,7 @@ <module libname="audio_spk_35l41.so" argu="AcousticShockProtection"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1"/> <module libname="audio_cca_aoc.so"/> - <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y SHARED_MODULE=1130578253"/> + <module libname="audio_fortemedia_aoc.so" argu="DL_CH=y VoIP_DLCHs=SPK:2,USB:2,BT:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y SHARED_MODULE=1130578253"/> <module libname="liboffloadeffect.so"/> <module libname="audio_amcs_ext.so"/> <module libname="audio_bluenote_aoc.so"/> diff --git a/audio/panther/tuning/bluenote/recording.gatf b/audio/panther/tuning/bluenote/recording.gatf Binary files differindex 8742543..e67742b 100644 --- a/audio/panther/tuning/bluenote/recording.gatf +++ b/audio/panther/tuning/bluenote/recording.gatf diff --git a/audio/panther/tuning/fortemedia_stereo/BLUETOOTH.dat b/audio/panther/tuning/fortemedia_stereo/BLUETOOTH.dat Binary files differindex 987f8a2..411563f 100644 --- a/audio/panther/tuning/fortemedia_stereo/BLUETOOTH.dat +++ b/audio/panther/tuning/fortemedia_stereo/BLUETOOTH.dat diff --git a/audio/panther/tuning/fortemedia_stereo/BLUETOOTH.mods b/audio/panther/tuning/fortemedia_stereo/BLUETOOTH.mods index dd9b922..4132c7d 100644 --- a/audio/panther/tuning/fortemedia_stereo/BLUETOOTH.mods +++ b/audio/panther/tuning/fortemedia_stereo/BLUETOOTH.mods @@ -1,12 +1,13 @@ #PLATFORM_NAME gChip
-#EXPORT_FLAG BLUETOOTH
#SINGLE_API_VER 1.2.1
-#SAVE_TIME 2023-03-20 18:08:13
+#EXPORT_FLAG BLUETOOTH
+#PARAM_MODE FULL
+#SAVE_MODE 3
+#SAVE_TIME 2023-10-04 11:35:28
#CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-NB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -534,8 +535,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -2674,9 +2675,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-WB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -3204,8 +3204,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -5344,9 +5344,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -5874,8 +5873,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -8014,9 +8013,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BT_HAC-VOICE_GENERIC-FB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -8544,8 +8542,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -10684,9 +10682,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BT_HAC-RESERVE2-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -11214,8 +11211,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0064 //TX_DR_RESRV_5
525 0x1000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -13354,9 +13351,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB-VOICE_GENERIC-NB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -13884,8 +13880,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -16024,9 +16020,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB-VOICE_GENERIC-WB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -16554,8 +16549,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -18694,9 +18689,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -19224,8 +19218,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -19683,7 +19677,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -20534,7 +20528,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -21364,9 +21358,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB-VOICE_GENERIC-FB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0009 //TX_OPERATION_MODE_0
1 0x0009 //TX_OPERATION_MODE_1
@@ -21894,8 +21887,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -24034,9 +24027,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB-RESERVE2-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -24564,8 +24556,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -25001,7 +24993,7 @@ 960 0x0000 //TX_AMS_RESRV_18
961 0x0000 //TX_AMS_RESRV_19
#RX
-0 0xA064 //RX_RECVFUNC_MODE_0
+0 0x8064 //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0003 //RX_SAMPLINGFREQ_SIG
3 0x0003 //RX_SAMPLINGFREQ_PROC
@@ -25023,7 +25015,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -26704,9 +26696,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB_NREC-VOICE_GENERIC-NB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -27234,8 +27225,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -29374,9 +29365,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB_NREC-VOICE_GENERIC-WB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -29904,8 +29894,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -32044,9 +32034,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB_NREC-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -32574,8 +32563,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -33033,7 +33022,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -33884,7 +33873,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -34714,9 +34703,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB_NREC-VOICE_GENERIC-FB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0009 //TX_OPERATION_MODE_0
1 0x0009 //TX_OPERATION_MODE_1
@@ -35244,8 +35232,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -37384,9 +37372,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTNB_NREC-RESERVE2-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -37914,8 +37901,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -38351,7 +38338,7 @@ 960 0x0000 //TX_AMS_RESRV_18
961 0x0000 //TX_AMS_RESRV_19
#RX
-0 0xA064 //RX_RECVFUNC_MODE_0
+0 0x8064 //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0003 //RX_SAMPLINGFREQ_SIG
3 0x0003 //RX_SAMPLINGFREQ_PROC
@@ -38373,7 +38360,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -39224,7 +39211,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -40054,9 +40041,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB-VOICE_GENERIC-NB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -40584,8 +40570,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -42724,9 +42710,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB-VOICE_GENERIC-WB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -43254,8 +43239,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -45394,9 +45379,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -45924,8 +45908,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -46383,7 +46367,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -47234,7 +47218,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -48064,9 +48048,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB-VOICE_GENERIC-FB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0009 //TX_OPERATION_MODE_0
1 0x0009 //TX_OPERATION_MODE_1
@@ -48594,8 +48577,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -50734,9 +50717,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB-RESERVE2-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -51264,8 +51246,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -51701,7 +51683,7 @@ 960 0x0000 //TX_AMS_RESRV_18
961 0x0000 //TX_AMS_RESRV_19
#RX
-0 0xA064 //RX_RECVFUNC_MODE_0
+0 0x8064 //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0003 //RX_SAMPLINGFREQ_SIG
3 0x0003 //RX_SAMPLINGFREQ_PROC
@@ -51723,7 +51705,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -52574,7 +52556,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -53404,9 +53386,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB_NREC-VOICE_GENERIC-NB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -53934,8 +53915,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -56074,9 +56055,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB_NREC-VOICE_GENERIC-WB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0008 //TX_OPERATION_MODE_0
1 0x0008 //TX_OPERATION_MODE_1
@@ -56604,8 +56584,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -58744,9 +58724,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB_NREC-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -59274,8 +59253,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -59733,7 +59712,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -60584,7 +60563,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -61414,9 +61393,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB_NREC-VOICE_GENERIC-FB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0009 //TX_OPERATION_MODE_0
1 0x0009 //TX_OPERATION_MODE_1
@@ -61944,8 +61922,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -64084,9 +64062,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-BTWB_NREC-RESERVE2-SWB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0001 //TX_OPERATION_MODE_1
@@ -64614,8 +64591,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -65051,7 +65028,7 @@ 960 0x0000 //TX_AMS_RESRV_18
961 0x0000 //TX_AMS_RESRV_19
#RX
-0 0xA064 //RX_RECVFUNC_MODE_0
+0 0x8064 //RX_RECVFUNC_MODE_0
1 0x0000 //RX_RECVFUNC_MODE_1
2 0x0003 //RX_SAMPLINGFREQ_SIG
3 0x0003 //RX_SAMPLINGFREQ_PROC
@@ -65073,7 +65050,7 @@ 19 0x0020 //RX_PP_RESRV_1
20 0x0400 //RX_N_SN_EST
21 0x000C //RX_N2_SN_EST
-22 0x0003 //RX_NS_LVL_CTRL
+22 0x0006 //RX_NS_LVL_CTRL
23 0x9000 //RX_THR_SN_EST
24 0x7CCD //RX_LAMBDA_PFILT
25 0x000A //RX_FENS_RESRV_0
@@ -65924,7 +65901,7 @@ 176 0x0020 //RX_PP_RESRV_1
177 0x0400 //RX_N_SN_EST
178 0x000C //RX_N2_SN_EST
-179 0x0003 //RX_NS_LVL_CTRL
+179 0x0006 //RX_NS_LVL_CTRL
180 0x9000 //RX_THR_SN_EST
181 0x7CCD //RX_LAMBDA_PFILT
182 0x000A //RX_FENS_RESRV_0
@@ -66754,9 +66731,8 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME BLUETOOTH-RESERVE1-VOICE_GENERIC-FB
-#PARAM_MODE FULL
-#PARAM_TYPE TX+2RX
-#TOTAL_CUSTOM_STEP 7+7
+#PARAM_TYPE TX+2RX
+#TOTAL_CUSTOM_STEP 7+7
#TX
0 0x0001 //TX_OPERATION_MODE_0
1 0x0000 //TX_OPERATION_MODE_1
@@ -67284,8 +67260,8 @@ 523 0x0000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
diff --git a/audio/panther/tuning/fortemedia_stereo/HANDSET.dat b/audio/panther/tuning/fortemedia_stereo/HANDSET.dat Binary files differindex c087f41..135b639 100644 --- a/audio/panther/tuning/fortemedia_stereo/HANDSET.dat +++ b/audio/panther/tuning/fortemedia_stereo/HANDSET.dat diff --git a/audio/panther/tuning/fortemedia_stereo/HANDSET.mods b/audio/panther/tuning/fortemedia_stereo/HANDSET.mods index 88b1315..4aa8869 100644 --- a/audio/panther/tuning/fortemedia_stereo/HANDSET.mods +++ b/audio/panther/tuning/fortemedia_stereo/HANDSET.mods @@ -1,10 +1,11 @@ #PLATFORM_NAME gChip
-#EXPORT_FLAG HANDSET
#SINGLE_API_VER 1.2.1
-#SAVE_TIME 2023-03-10 12:42:04
+#EXPORT_FLAG HANDSET
+#PARAM_MODE FULL
+#SAVE_MODE 3
+#SAVE_TIME 2023-08-15 16:19:55
#CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-NB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -534,8 +535,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -2674,7 +2675,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-WB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -3204,8 +3204,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -5344,7 +5344,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -5874,8 +5873,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -8014,7 +8013,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-VOICE_GENERIC-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -8544,8 +8542,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -10684,7 +10682,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-TMOBILE_US-NB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -11214,8 +11211,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -13354,7 +13351,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-TMOBILE_US-WB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -13884,8 +13880,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -16024,7 +16020,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-TMOBILE_US-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -16554,8 +16549,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -18694,7 +18689,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-TMOBILE_US-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -19224,8 +19218,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -21364,7 +21358,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-CUSTOM1-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -21894,8 +21887,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -24034,7 +24027,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-CUSTOM1-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -24564,8 +24556,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -26704,7 +26696,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-CUSTOM2-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -27234,8 +27225,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -29374,7 +29365,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-CUSTOM2-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -29904,8 +29894,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -32044,7 +32034,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-RESERVE1-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -32574,8 +32563,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -34714,7 +34703,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-RESERVE1-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -35244,8 +35232,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -37384,7 +37372,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET-RESERVE2-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -37914,8 +37901,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -40054,7 +40041,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-VOICE_GENERIC-NB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -40584,8 +40570,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -42724,7 +42710,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-VOICE_GENERIC-WB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -43254,8 +43239,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -45394,7 +45379,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-VOICE_GENERIC-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -45924,8 +45908,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -48064,7 +48048,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-VOICE_GENERIC-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -48594,8 +48577,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -50734,7 +50717,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-TMOBILE_US-NB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -51264,8 +51246,8 @@ 523 0x6000 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -53404,7 +53386,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-TMOBILE_US-WB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -53934,8 +53915,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -56074,7 +56055,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-TMOBILE_US-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -56604,8 +56584,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -58744,7 +58724,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-TMOBILE_US-FB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -59274,8 +59253,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -61414,7 +61393,6 @@ 287 0x0000 //RX_VOL_RESRV_0
#CASE_NAME HANDSET-HANDSET_HAC-RESERVE2-SWB
-#PARAM_MODE FULL
#PARAM_TYPE TX+2RX
#TOTAL_CUSTOM_STEP 7+7
#TX
@@ -61944,8 +61922,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
diff --git a/audio/panther/tuning/fortemedia_stereo/HANDSFREE.dat b/audio/panther/tuning/fortemedia_stereo/HANDSFREE.dat Binary files differindex 2b3d425..bd2e89f 100644 --- a/audio/panther/tuning/fortemedia_stereo/HANDSFREE.dat +++ b/audio/panther/tuning/fortemedia_stereo/HANDSFREE.dat diff --git a/audio/panther/tuning/fortemedia_stereo/HANDSFREE.mods b/audio/panther/tuning/fortemedia_stereo/HANDSFREE.mods index 6406865..c1cc5fc 100644 --- a/audio/panther/tuning/fortemedia_stereo/HANDSFREE.mods +++ b/audio/panther/tuning/fortemedia_stereo/HANDSFREE.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG HANDSFREE
#PARAM_MODE FULL
#SAVE_MODE 3
-#SAVE_TIME 2023-03-20 17:20:15
+#SAVE_TIME 2023-08-15 16:22:15
#CASE_NAME HANDSFREE-HANDFREE-VOICE_GENERIC-NB
#PARAM_TYPE TX+2RX
@@ -535,8 +535,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -3204,8 +3204,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -5873,8 +5873,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -8542,8 +8542,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -11211,8 +11211,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -13880,8 +13880,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -16549,8 +16549,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -19218,8 +19218,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -21887,8 +21887,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -24556,8 +24556,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -27225,8 +27225,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0064 //TX_DR_RESRV_5
525 0x1000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
diff --git a/audio/panther/tuning/fortemedia_stereo/HEADSET.dat b/audio/panther/tuning/fortemedia_stereo/HEADSET.dat Binary files differindex 60c86b4..ad70496 100644 --- a/audio/panther/tuning/fortemedia_stereo/HEADSET.dat +++ b/audio/panther/tuning/fortemedia_stereo/HEADSET.dat diff --git a/audio/panther/tuning/fortemedia_stereo/HEADSET.mods b/audio/panther/tuning/fortemedia_stereo/HEADSET.mods index a6c9e87..53e968b 100644 --- a/audio/panther/tuning/fortemedia_stereo/HEADSET.mods +++ b/audio/panther/tuning/fortemedia_stereo/HEADSET.mods @@ -3,7 +3,7 @@ #EXPORT_FLAG HEADSET
#PARAM_MODE FULL
#SAVE_MODE 3
-#SAVE_TIME 2023-03-20 17:34:46
+#SAVE_TIME 2023-08-15 16:24:54
#CASE_NAME HEADSET-USB_BLACKBIRD-VOICE_GENERIC-NB
#PARAM_TYPE TX+2RX
@@ -535,8 +535,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -3204,8 +3204,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -5873,8 +5873,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -8542,8 +8542,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -11211,8 +11211,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -13880,8 +13880,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -16549,8 +16549,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -19218,8 +19218,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -21887,8 +21887,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -24556,8 +24556,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -27225,8 +27225,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -29894,8 +29894,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -32563,8 +32563,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -35232,8 +35232,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -37901,8 +37901,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0064 //TX_DR_RESRV_5
525 0x1000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -40570,8 +40570,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -43239,8 +43239,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -45908,8 +45908,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -48577,8 +48577,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -51246,8 +51246,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -53915,8 +53915,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -56584,8 +56584,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -59253,8 +59253,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -61922,8 +61922,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -64591,8 +64591,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -67260,8 +67260,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -69929,8 +69929,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -72598,8 +72598,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -75267,8 +75267,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -77936,8 +77936,8 @@ 523 0x7E2C //TX_WIDE2_MEANHTH
524 0x0064 //TX_DR_RESRV_5
525 0x1000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -80605,8 +80605,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -83274,8 +83274,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -85943,8 +85943,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -88612,8 +88612,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -91281,8 +91281,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x0000 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0028 //TX_SNR_THR
@@ -93950,8 +93950,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -96619,8 +96619,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -99288,8 +99288,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -101957,8 +101957,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
@@ -104626,8 +104626,8 @@ 523 0x0064 //TX_WIDE2_MEANHTH
524 0x0000 //TX_DR_RESRV_5
525 0x0000 //TX_DR_RESRV_6
-526 0x0000 //TX_DR_RESRV_7
-527 0x0000 //TX_DR_RESRV_8
+526 0x122E //TX_DR_RESRV_7
+527 0x1100 //TX_DR_RESRV_8
528 0x1333 //TX_WIND_MARK_TH
529 0x399A //TX_CORR_THR
530 0x0004 //TX_SNR_THR
diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml index 98d5c30..392c5ec 100644 --- a/cheetah/overlay/frameworks/base/core/res/res/values/config.xml +++ b/cheetah/overlay/frameworks/base/core/res/res/values/config.xml @@ -308,4 +308,8 @@ Note: If the display supports multiple resolutions, please define the path config based on the highest resolution so that it can be scaled correctly in each resolution. --> <string name="config_mainDisplayShape">M 120.63086 0 C 111.97487 9.2518493e-17 103.41184 -0.00022182194 94.755859 0.091796875 C 86.099865 0.18380821 77.536566 0.46005475 68.972656 1.65625 C 51.568581 4.0486395 35.637425 10.122024 22.929688 22.912109 C 10.129864 35.610181 3.9606178 51.529084 1.5664062 68.919922 C 0.36930055 77.477315 0.092085137 86.034182 0 94.683594 L 0 3025.3164 C 0.092089816 3033.9658 0.3692987 3042.5227 1.5664062 3051.0801 C 3.9606216 3068.471 10.129872 3084.3898 22.929688 3097.0879 C 35.637432 3109.878 51.568582 3115.9514 68.972656 3118.3438 C 77.53656 3119.5398 86.099868 3119.8162 94.755859 3119.9082 C 103.41184 3120.0002 111.97487 3120 120.63086 3120 L 1319.3691 3120 C 1328.0252 3120 1336.5881 3120.0002 1345.2441 3119.9082 C 1353.9001 3119.8162 1362.4635 3119.5398 1371.0273 3118.3438 C 1388.4314 3115.9514 1404.3625 3109.878 1417.0703 3097.0879 C 1429.8701 3084.3898 1436.0412 3068.471 1438.4355 3051.0801 C 1439.6326 3042.5227 1439.9079 3033.9658 1440 3025.3164 L 1440 94.683594 C 1439.9079 86.03418 1439.6326 77.477314 1438.4355 68.919922 C 1436.0412 51.529083 1429.8701 35.610181 1417.0703 22.912109 C 1404.3625 10.122024 1388.4314 4.0486392 1371.0273 1.65625 C 1362.4635 0.4600554 1353.9001 0.18380669 1345.2441 0.091796875 C 1336.5881 -0.00022294096 1328.0251 0 1319.3691 0 L 120.63086 0 z</string> + + <!-- Boolean indicating whether allow sending null to modem to clear the previous initial attach + data profile --> + <bool name="allow_clear_initial_attach_data_profile">true</bool> </resources> diff --git a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index 735cd9c..eecb57f 100644 --- a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -36,11 +36,11 @@ <bool name="config_enableDisplayCutoutProtection">true</bool> <!-- Location on the screen of the center of the physical power button. --> - <dimen name="physical_power_button_center_screen_location_y">940px</dimen> + <dimen name="physical_power_button_center_screen_location_y">828px</dimen> <!-- Location on the screen of the center of the physical volume up/down buttons. --> - <dimen name="physical_volume_up_button_center_screen_location_y">1320px</dimen> - <dimen name="physical_volume_down_button_center_screen_location_y">1520px</dimen> + <dimen name="physical_volume_up_button_center_screen_location_y">1130px</dimen> + <dimen name="physical_volume_down_button_center_screen_location_y">1274px</dimen> <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. --> <dimen name="lock_icon_padding">60px</dimen> diff --git a/cheetah/rro_overlays/NfcOverlay/Android.bp b/cheetah/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..83a878d --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_pantah_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayCheetah", + sdk_version: "current", + product_specific: true +} diff --git a/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml b/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -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> diff --git a/cheetah/rro_overlays/NfcOverlay/OWNERS b/cheetah/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/cheetah/rro_overlays/NfcOverlay/res/values/config.xml b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..0055264 --- /dev/null +++ b/cheetah/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2021 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources> + <bool name="nfcc_always_on_allowed">true</bool> + <bool name="polling_disable_allowed">true</bool> + <string-array name="config_skuSupportsSecureNfc" translatable="false"> + <item>GP4BC</item> + <item>GE2AE</item> + <item>GFE4J</item> + </string-array> + <bool name="tag_intent_app_pref_supported">true</bool> + <!-- NFC Antenna Location API --> + <integer name="device_width">75</integer> + <integer name="device_height">160</integer> + <bool name="device_foldable">false</bool> + <integer-array name="antenna_x"> + <item>38</item> + </integer-array> + <integer-array name="antenna_y"> + <item>100</item> + </integer-array> +</resources> diff --git a/conf/init.pantah.rc b/conf/init.pantah.rc index 54dbb2e..7ce1aea 100644 --- a/conf/init.pantah.rc +++ b/conf/init.pantah.rc @@ -55,6 +55,7 @@ on property:ro.boot.hardware.revision=PROTO1.1 # Bluetooth on post-fs-data chown bluetooth system /proc/bluetooth/timesync + mkdir /data/vendor/bluetooth 0770 bluetooth system # SecureElement eSE2 cts mode on property:persist.vendor.se.ese2.mode=ctsmode diff --git a/device-cheetah.mk b/device-cheetah.mk index 01e0dd3..8f879ae 100644 --- a/device-cheetah.mk +++ b/device-cheetah.mk @@ -32,7 +32,7 @@ include device/google/pantah/audio/cheetah/audio-tables.mk include device/google/gs201/device-shipping-common.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk -include device/google/gs-common/touch/syna/syna.mk +include device/google/gs-common/touch/syna/syna0.mk ifeq ($(filter factory_cheetah, $(TARGET_PRODUCT)),) include device/google/pantah/uwb/uwb_calibration.mk @@ -103,21 +103,15 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.hcef.xml \ frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \ frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \ + device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ device/google/pantah/nfc/libnfc-hal-st-proto1.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st-proto1.conf \ device/google/pantah/nfc/libnfc-nci-cheetah.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_COPY_FILES += \ - device/google/pantah/nfc/libnfc-hal-st-debug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf -else -PRODUCT_COPY_FILES += \ - device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf -endif - PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayCheetah # SecureElement PRODUCT_PACKAGES += \ @@ -163,13 +157,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah_GFE4J_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GFE4J_JP.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah_GP4BC_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_CA.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah_GE2AE_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GE2AE_EU.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah_GP4BC_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_EU.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah_GE2AE_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GE2AE_US.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_cheetah_GP4BC_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_US.csv + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GFE4J_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GFE4J_JP.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GP4BC_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_CA.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GE2AE_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GE2AE_EU.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GP4BC_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_EU.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GE2AE_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GE2AE_US.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_cheetah_GP4BC_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GP4BC_US.csv # Bluetooth SAR test tool PRODUCT_PACKAGES_DEBUG += \ @@ -209,6 +203,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.notify.idle.during.call=true +# BT controller not able to support LE Audio dual mic SWB call +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.leaudio.dual_bidirection_swb.supported=false + # LE Auido Offload Capabilities setting PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml @@ -308,7 +306,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=37 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ @@ -342,10 +340,16 @@ PRODUCT_VENDOR_PROPERTIES += \ # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 +ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.214 \ - ro.vendor.vibrator.hal.loc.coeff=2.7 + ro.vendor.vibrator.hal.loc.coeff=2.7 \ + persist.vendor.vibrator.hal.context.enable=false \ + persist.vendor.vibrator.hal.context.scale=60 \ + persist.vendor.vibrator.hal.context.fade=true \ + persist.vendor.vibrator.hal.context.cooldowntime=1600 \ + persist.vendor.vibrator.hal.context.settlingtime=5000 # Keyboard bottom and side padding in dp for portrait mode and height ratio PRODUCT_PRODUCT_PROPERTIES += \ @@ -376,3 +380,16 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false + +# Enable DeviceAsWebcam support +PRODUCT_VENDOR_PROPERTIES += \ + ro.usb.uvc.enabled=true + +# Quick Start device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + ro.quick_start.oem_id=00e0 \ + ro.quick_start.device_id=cheetah diff --git a/device-cloudripper.mk b/device-cloudripper.mk index 0a4dfc1..145de08 100644 --- a/device-cloudripper.mk +++ b/device-cloudripper.mk @@ -27,7 +27,7 @@ include device/google/pantah/audio/cloudripper/audio-tables.mk include hardware/google/pixel/vibrator/cs40l26/device.mk include device/google/gs-common/bcmbt/bluetooth.mk include device/google/gs-common/gps/brcm/cbd_gps.mk -include device/google/gs-common/touch/syna/syna.mk +include device/google/gs-common/touch/syna/syna0.mk # go/lyric-soong-variables $(call soong_config_set,lyric,camera_hardware,cloudripper) @@ -58,18 +58,11 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \ frameworks/native/data/etc/android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.uicc.xml \ frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \ + device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_COPY_FILES += \ - device/google/pantah/nfc/libnfc-hal-st-debug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf -else -PRODUCT_COPY_FILES += \ - device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf -endif - PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/device-panther.mk b/device-panther.mk index dde9314..07aa48b 100644 --- a/device-panther.mk +++ b/device-panther.mk @@ -83,20 +83,14 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml \ frameworks/native/data/etc/android.hardware.nfc.ese.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.ese.xml \ device/google/pantah/nfc/libnfc-hal-st-proto1.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st-proto1.conf \ + device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf \ device/google/pantah/nfc/libnfc-nci-panther.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf -ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) -PRODUCT_COPY_FILES += \ - device/google/pantah/nfc/libnfc-hal-st-debug.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf -else -PRODUCT_COPY_FILES += \ - device/google/pantah/nfc/libnfc-hal-st.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-hal-st.conf -endif - PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ - android.hardware.nfc-service.st + android.hardware.nfc-service.st \ + NfcOverlayPanther # SecureElement PRODUCT_PACKAGES += \ @@ -146,13 +140,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Bluetooth Tx power caps PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther_G03Z5_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G03Z5_JP.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther_GVU6C_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_CA.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther_GQML3_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GQML3_EU.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther_GVU6C_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_EU.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther_GQML3_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GQML3_US.csv \ - $(LOCAL_PATH)/bluetooth/bluetooth_power_limits_panther_GVU6C_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_US.csv + device/google/pantah/bluetooth/bluetooth_power_limits_panther.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_panther_G03Z5_JP.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G03Z5_JP.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_panther_GVU6C_CA.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_CA.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_panther_GQML3_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GQML3_EU.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_panther_GVU6C_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_EU.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_panther_GQML3_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GQML3_US.csv \ + device/google/pantah/bluetooth/bluetooth_power_limits_panther_GVU6C_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GVU6C_US.csv # Bluetooth SAR test tool PRODUCT_PACKAGES_DEBUG += \ @@ -179,6 +173,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.leaudio.notify.idle.during.call=true +# BT controller not able to support LE Audio dual mic SWB call +PRODUCT_PRODUCT_PROPERTIES += \ + bluetooth.leaudio.dual_bidirection_swb.supported=false + # LE Auido Offload Capabilities setting PRODUCT_COPY_FILES += \ device/google/pantah/bluetooth/le_audio_codec_capabilities.xml:$(TARGET_COPY_OUT_VENDOR)/etc/le_audio_codec_capabilities.xml @@ -291,7 +289,7 @@ PRODUCT_VENDOR_PROPERTIES += \ # Increment the SVN for any official public releases PRODUCT_VENDOR_PROPERTIES += \ - ro.vendor.build.svn=31 + ro.vendor.build.svn=37 # DCK properties based on target PRODUCT_PROPERTY_OVERRIDES += \ @@ -327,10 +325,17 @@ PRODUCT_VENDOR_PROPERTIES += \ # Vibrator HAL ACTUATOR_MODEL := luxshare_ict_081545 +ADAPTIVE_HAPTICS_FEATURE := adaptive_haptics_v1 PRODUCT_VENDOR_PROPERTIES += \ ro.vendor.vibrator.hal.chirp.enabled=0 \ ro.vendor.vibrator.hal.device.mass=0.195 \ - ro.vendor.vibrator.hal.loc.coeff=2.65 + ro.vendor.vibrator.hal.loc.coeff=2.65 \ + persist.vendor.vibrator.hal.context.enable=false \ + persist.vendor.vibrator.hal.context.scale=60 \ + persist.vendor.vibrator.hal.context.fade=true \ + persist.vendor.vibrator.hal.context.cooldowntime=1600 \ + persist.vendor.vibrator.hal.context.settlingtime=5000 + # Keyboard bottom padding in dp for portrait mode and height ratio PRODUCT_PRODUCT_PROPERTIES += \ ro.com.google.ime.kb_pad_port_b=8 \ @@ -358,3 +363,16 @@ PRODUCT_PRODUCT_PROPERTIES += \ # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml + +# Disable Settings large-screen optimization enabled by Window Extensions +PRODUCT_SYSTEM_PROPERTIES += \ + persist.settings.large_screen_opt.enabled=false + +# Enable DeviceAsWebcam support +PRODUCT_VENDOR_PROPERTIES += \ + ro.usb.uvc.enabled=true + +# Quick Start device-specific settings +PRODUCT_PRODUCT_PROPERTIES += \ + ro.quick_start.oem_id=00e0 \ + ro.quick_start.device_id=panther diff --git a/device-ravenclaw.mk b/device-ravenclaw.mk index b3607e7..0f3af6d 100644 --- a/device-ravenclaw.mk +++ b/device-ravenclaw.mk @@ -66,7 +66,7 @@ PRODUCT_COPY_FILES += \ device/google/pantah/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_PRODUCT)/etc/libnfc-nci.conf PRODUCT_PACKAGES += \ - NfcNci \ + $(RELEASE_PACKAGE_NFC_STACK) \ Tag \ android.hardware.nfc-service.st diff --git a/location/gps.xml b/location/gps.xml index 77fec48..3e9b0df 100644 --- a/location/gps.xml +++ b/location/gps.xml @@ -58,16 +58,19 @@ AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" PpsDevice="/sys/class/pps/pps0/assert_elapsed" + SensorsMask="0x244" + MaxThreadNum="13" /> <gll PpsEnable="true" LogPriMask="LOG_INFO" - LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI" + LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI" FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB" MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5" MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON" @@ -89,6 +92,7 @@ PowerMode="3" MinGpsWeekNumber="2216" OnChipAccMask="50" + EnableB1C="false" /> <gll_features diff --git a/location/gps.xml.c10 b/location/gps.xml.c10 index 6ad7053..26a55f7 100644 --- a/location/gps.xml.c10 +++ b/location/gps.xml.c10 @@ -58,16 +58,19 @@ AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" PpsDevice="/sys/class/pps/pps0/assert_elapsed" + SensorsMask="0x244" + MaxThreadNum="13" /> <gll PpsEnable="true" LogPriMask="LOG_INFO" - LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI" + LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI" FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB" MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5" MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON" @@ -89,6 +92,7 @@ PowerMode="3" MinGpsWeekNumber="2216" OnChipAccMask="50" + EnableB1C="false" /> <gll_features diff --git a/location/gps.xml.p10 b/location/gps.xml.p10 index 2e13754..0215c9e 100644 --- a/location/gps.xml.p10 +++ b/location/gps.xml.p10 @@ -58,16 +58,19 @@ AssertEnabled="true" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" PpsDevice="/sys/class/pps/pps0/assert_elapsed" + SensorsMask="0x244" + MaxThreadNum="13" /> <gll PpsEnable="true" LogPriMask="LOG_INFO" - LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI" + LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI | LOG_MEASAPI" FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB" MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5" MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON" @@ -89,6 +92,7 @@ PowerMode="3" MinGpsWeekNumber="2216" OnChipAccMask="50" + EnableB1C="false" /> <gll_features diff --git a/location/gps_user.xml b/location/gps_user.xml index 3af6cca..d85da72 100644 --- a/location/gps_user.xml +++ b/location/gps_user.xml @@ -57,10 +57,13 @@ AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" PpsDevice="/sys/class/pps/pps0/assert_elapsed" + MaxThreadNum="13" + SensorsMask="0x244" /> <gll @@ -88,6 +91,7 @@ PowerMode="3" MinGpsWeekNumber="2216" OnChipAccMask="50" + EnableB1C="false" /> <gll_features diff --git a/location/gps_user.xml.c10 b/location/gps_user.xml.c10 index d4f596b..1a369a6 100644 --- a/location/gps_user.xml.c10 +++ b/location/gps_user.xml.c10 @@ -57,10 +57,13 @@ AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" PpsDevice="/sys/class/pps/pps0/assert_elapsed" + SensorsMask="0x244" + MaxThreadNum="13" /> <gll @@ -88,6 +91,7 @@ PowerMode="3" MinGpsWeekNumber="2216" OnChipAccMask="50" + EnableB1C="false" /> <gll_features diff --git a/location/gps_user.xml.p10 b/location/gps_user.xml.p10 index cf367e7..c1e5d59 100644 --- a/location/gps_user.xml.p10 +++ b/location/gps_user.xml.p10 @@ -57,10 +57,13 @@ AssertEnabled="false" CpLppeCancelDbhOnAgnssProvideLoc="true" CpLppeUseAgnssLocForEmptyDbh="true" + CpLppHighAccuracyShapeMode="1" ReAidingOnHotStart="false" ReAidingIntervalSec="1200" RuntimeSwLteFilterEnable="true" PpsDevice="/sys/class/pps/pps0/assert_elapsed" + SensorsMask="0x244" + MaxThreadNum="13" /> <gll @@ -88,6 +91,7 @@ PowerMode="3" MinGpsWeekNumber="2216" OnChipAccMask="50" + EnableB1C="false" /> <gll_features diff --git a/manifest.xml b/manifest.xml index 75aa800..e01d156 100644 --- a/manifest.xml +++ b/manifest.xml @@ -99,16 +99,6 @@ <fqname>@1.2::IBootControl/default</fqname> </hal> <hal format="hidl"> - <name>android.hardware.neuralnetworks</name> - <transport>hwbinder</transport> - <version>1.2</version> - <interface> - <name>IDevice</name> - <instance>armnn</instance> - </interface> - <fqname>@1.2::IDevice/armnn</fqname> - </hal> - <hal format="hidl"> <name>android.hardware.neuralnetworks</name> <transport>hwbinder</transport> <fqname>@1.3::IDevice/google-edgetpu</fqname> diff --git a/nfc/libnfc-hal-st-debug.conf b/nfc/libnfc-hal-st-debug.conf deleted file mode 100644 index 7ccc526..0000000 --- a/nfc/libnfc-hal-st-debug.conf +++ /dev/null @@ -1,164 +0,0 @@ -########################### Start of libnf-hal-st_aosp.conf ########################### - -############################################################################### -############################################################################### -# ST HAL trace log level -STNFC_HAL_LOGLEVEL=1 -NFC_DEBUG_ENABLED=0 - -############################################################################### -# Vendor specific mode to enable FW (RF & SWP) traces. -STNFC_FW_DEBUG_ENABLED=1 - -############################################################################### -# Vendor specific payload size for traces -STNFC_FW_RF_LOG_SIZE=15 -STNFC_FW_SWP_LOG_SIZE=30 - -############################################################################### -# File used for NFA storage -NFA_STORAGE="/data/nfc" - -############################################################################### -# Keep the nfa storage file. -PRESERVE_STORAGE=1 - -############################################################################### -# In Switch OFF mode (phone switched-off), specify the desired CE mode to -# the controller. -# 0: No card-emulation; DEFAULT -# 1: Switch-off card-emulation enabled -CE_ON_SWITCH_OFF_STATE=1 - -############################################################################### -# Vendor specific mode to support the USB charging mode if VPSIO=1 in switch off. -STNFC_USB_CHARGING_MODE=1 - -############################################################################### -# Vendor Specific Proprietary Protocol & Discovery Configuration -# Set to 0xFF if unsupported -# byte[0] NCI_PROTOCOL_18092_ACTIVE -# byte[1] NCI_PROTOCOL_B_PRIME -# byte[2] NCI_PROTOCOL_DUAL -# byte[3] NCI_PROTOCOL_15693 -# byte[4] NCI_PROTOCOL_KOVIO -# byte[5] NCI_PROTOCOL_MIFARE -# byte[6] NCI_DISCOVERY_TYPE_POLL_KOVIO -# byte[7] NCI_DISCOVERY_TYPE_POLL_B_PRIME -# byte[8] NCI_DISCOVERY_TYPE_LISTEN_B_PRIME -NFA_PROPRIETARY_CFG={05:FF:FF:06:8A:90:77:FF:FF} - -############################################################################### -# Choose the presence-check algorithm for type-4 tag. If not defined, -# the default value is 1. -# 0 NFA_RW_PRES_CHK_DEFAULT; Let stack selects an algorithm -# 1 NFA_RW_PRES_CHK_I_BLOCK; ISO-DEP protocol's empty I-block -# 2 NFA_RW_PRES_CHK_RESET; Deactivate to Sleep, then re-activate -# 3 NFA_RW_PRES_CHK_RB_CH0; Type-4 tag protocol's ReadBinary command on channel 0 -# 4 NFA_RW_PRES_CHK_RB_CH3; Type-4 tag protocol's ReadBinary command on channel 3 -# 5 NFA_RW_PRES_CHK_ISO_DEP_NAK; presence check command ISO-DEP NAK as per NCI2.0 -PRESENCE_CHECK_ALGORITHM=5 - -############################################################################### -# Name of the NCI HAL module to use -# If unset, falls back to nfc_nci.bcm2079x -NCI_HAL_MODULE="nfc_nci.st21nfc" - -############################################################################### -# White list to be set at startup. -DEVICE_HOST_ALLOW_LIST={02:C0} - -############################################################################### -# BAIL OUT value for P2P -# Implements algorithm for NFC-DEP protocol priority over ISO-DEP protocol. -POLL_BAIL_OUT_MODE=1 - -############################################################################### -# Extended APDU length for ISO_DEP -ISO_DEP_MAX_TRANSCEIVE=0xFEFF - -############################################################################### -# Configure the NFC Extras to open and use a static pipe. If the value is -# not set or set to 0, then the default is use a dynamic pipe based on a -# destination gate (see NFA_HCI_DEFAULT_DEST_GATE). Note there is a value -# for each EE (ESE/SIM) -OFF_HOST_ESE_PIPE_ID=0x5E -OFF_HOST_SIM_PIPE_ID=0x3E - -############################################################################### -#Set the default Felica T3T System Code OffHost route Location : -#This settings will be used when application does not set this parameter -# host 0x00 -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_SYS_CODE_ROUTE=0x86 - -############################################################################### -#Set the Felica T3T System Code supported power state: -DEFAULT_SYS_CODE_PWR_STATE=0x3B - -############################################################################### -# Path and Files used for FW update binaries storage -STNFC_FW_PATH_STORAGE="/vendor/firmware" -STNFC_FW_BIN_NAME="/st54j_fw.bin" -STNFC_FW_CONF_NAME="/st54j_conf.bin" - -############################################################################### -# Default off-host route for Felica. -# This settings will be used when application does not set this parameter -# host 0x00 -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_NFCF_ROUTE=0x86 - -############################################################################### -# Configure the default off-host route. -# used for technology A and B routing -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_OFFHOST_ROUTE=0x81 - -############################################################################### -# Configure the default AID route. -# host 0x00 -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_ROUTE=0x00 - -############################################################################### -# Configure the NFCEEIDs of offhost UICC. -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -OFFHOST_ROUTE_UICC={81} - -############################################################################### -# Configure the NFCEEIDs of offhost eSEs. -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -OFFHOST_ROUTE_ESE={86} - -############################################################################### -# Configure the list of NFCEE for the ISO-DEP routing. -# host 0x00 -# eSE 0x82 (eSE), 0x86 (eUICC/SPI-SE) -# UICC 0x81 (UICC_1), 0x85 (UICC_2) -DEFAULT_ISODEP_ROUTE=0x81 - -############################################################################### -# Configure the HAL Clock control -# enable 0x01 -# disable 0x00 default value -STNFC_CONTROL_CLK=0x01 - -############################################################################### -# Configure the ACTIVE_RW timer -# Default 0x00, set 0x01 to enable it -STNFC_ACTIVERW_TIMER=0x01 - -############################################################################### -# Core configuration settings -CORE_CONF_PROP={ 20, 02, 0a, 03, - a1, 01, 1e, - a2, 01, 19, - 80, 01, 01 -} - - diff --git a/panther/overlay/frameworks/base/core/res/res/values/config.xml b/panther/overlay/frameworks/base/core/res/res/values/config.xml index 63165c5..014f57a 100644 --- a/panther/overlay/frameworks/base/core/res/res/values/config.xml +++ b/panther/overlay/frameworks/base/core/res/res/values/config.xml @@ -325,4 +325,8 @@ Note: If the display supports multiple resolutions, please define the path config based on the highest resolution so that it can be scaled correctly in each resolution. --> <string name="config_mainDisplayShape">M 75.769531 0 C 70.332709 -9.2518493e-18 64.952449 0.00079919532 59.515625 0.05859375 C 54.078801 0.11638831 48.699297 0.28968642 43.320312 1.0410156 C 32.388827 2.5436742 22.384063 6.3571816 14.402344 14.390625 C 6.3627864 22.366274 2.486224 32.36589 0.98242188 43.289062 C 0.23052083 48.663956 0.057838542 54.038015 0 59.470703 L 0 2340.5293 C 0.057838884 2345.962 0.23052038 2351.336 0.98242188 2356.7109 C 2.4862239 2367.6341 6.3627861 2377.6338 14.402344 2385.6094 C 22.384063 2393.6429 32.388834 2397.4563 43.320312 2398.959 C 48.699302 2399.7103 54.078805 2399.8834 59.515625 2399.9414 C 64.952444 2399.9994 70.332714 2400 75.769531 2400 L 1004.2305 2400 C 1009.6673 2400 1015.0476 2399.9994 1020.4844 2399.9414 C 1025.9213 2399.8834 1031.3008 2399.7103 1036.6797 2398.959 C 1047.6113 2397.4563 1057.6159 2393.6429 1065.5977 2385.6094 C 1073.6371 2377.6338 1077.5138 2367.6341 1079.0176 2356.7109 C 1079.7695 2351.336 1079.9422 2345.962 1080 2340.5293 L 1080 59.470703 C 1079.9422 54.038015 1079.7695 48.663956 1079.0176 43.289062 C 1077.5138 32.36589 1073.637 22.366274 1065.5977 14.390625 C 1057.6159 6.3571811 1047.6112 2.5436742 1036.6797 1.0410156 C 1031.3007 0.28968666 1025.9213 0.11639363 1020.4844 0.05859375 C 1015.0476 0.00080386558 1009.6673 0 1004.2305 0 L 75.769531 0 z</string> + + <!-- Boolean indicating whether allow sending null to modem to clear the previous initial attach + data profile --> + <bool name="allow_clear_initial_attach_data_profile">true</bool> </resources> diff --git a/panther/overlay/frameworks/base/packages/SystemUI/res/values-h800dp/dimens.xml b/panther/overlay/frameworks/base/packages/SystemUI/customization/res/values-h800dp/dimens.xml index d062247..d062247 100644 --- a/panther/overlay/frameworks/base/packages/SystemUI/res/values-h800dp/dimens.xml +++ b/panther/overlay/frameworks/base/packages/SystemUI/customization/res/values-h800dp/dimens.xml diff --git a/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml index bbb6ac3..c0baa60 100644 --- a/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml +++ b/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml @@ -40,11 +40,11 @@ <dimen name="config_rounded_mask_size_bottom">46px</dimen> <!-- Location on the screen of the center of the physical power button. --> - <dimen name="physical_power_button_center_screen_location_y">650px</dimen> + <dimen name="physical_power_button_center_screen_location_y">776px</dimen> <!-- Location on the screen of the center of the physical volume up/down buttons. --> - <dimen name="physical_volume_up_button_center_screen_location_y">950px</dimen> - <dimen name="physical_volume_down_button_center_screen_location_y">1110px</dimen> + <dimen name="physical_volume_up_button_center_screen_location_y">1100px</dimen> + <dimen name="physical_volume_down_button_center_screen_location_y">1262px</dimen> <!-- Padding for the lock icon on the keyguard. In pixels - should not scale with display size. --> <dimen name="lock_icon_padding">48px</dimen> diff --git a/panther/rro_overlays/NfcOverlay/Android.bp b/panther/rro_overlays/NfcOverlay/Android.bp new file mode 100644 index 0000000..a1d3b96 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/Android.bp @@ -0,0 +1,9 @@ +package { + default_applicable_licenses: ["device_google_pantah_license"], +} + +runtime_resource_overlay { + name: "NfcOverlayPanther", + sdk_version: "current", + product_specific: true +} diff --git a/panther/rro_overlays/NfcOverlay/AndroidManifest.xml b/panther/rro_overlays/NfcOverlay/AndroidManifest.xml new file mode 100644 index 0000000..5241aa4 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/AndroidManifest.xml @@ -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> diff --git a/panther/rro_overlays/NfcOverlay/OWNERS b/panther/rro_overlays/NfcOverlay/OWNERS new file mode 100644 index 0000000..35e9713 --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/OWNERS @@ -0,0 +1,2 @@ +# Bug component: 48448 +include platform/packages/apps/Nfc:/OWNERS diff --git a/panther/rro_overlays/NfcOverlay/res/values/config.xml b/panther/rro_overlays/NfcOverlay/res/values/config.xml new file mode 100644 index 0000000..d5bfd3d --- /dev/null +++ b/panther/rro_overlays/NfcOverlay/res/values/config.xml @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2021 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<resources> + <bool name="nfcc_always_on_allowed">false</bool> + <bool name="polling_disable_allowed">true</bool> + <string-array name="config_skuSupportsSecureNfc" translatable="false"> + <item>GQML3</item> + <item>GVU6C</item> + <item>G03Z5</item> + </string-array> + <bool name="tag_intent_app_pref_supported">true</bool> + <!-- NFC Antenna Location API --> + <integer name="device_width">70</integer> + <integer name="device_height">150</integer> + <bool name="device_foldable">false</bool> + <integer-array name="antenna_x"> + <item>38</item> + </integer-array> + <integer-array name="antenna_y"> + <item>97</item> + </integer-array> +</resources> diff --git a/powerhint-cheetah.json b/powerhint-cheetah.json index 090e924..618d59a 100644 --- a/powerhint-cheetah.json +++ b/powerhint-cheetah.json @@ -317,6 +317,14 @@ "ResetOnInit": true }, { + "Name": "NewlyIdleBalancer", + "Path": "/proc/vendor_sched/idle_balancer", + "Values": [ + "0", + "1" + ], + }, + { "Name": "DisplayWakeup", "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup", "Values": [ @@ -746,30 +754,6 @@ { "PowerHint": "LAUNCH", "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", "Value": "LAUNCH_EXTEND" }, { @@ -1283,6 +1267,12 @@ "Value": "0" }, { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, + { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", "Duration": 0, @@ -1409,6 +1399,12 @@ "Value": "0" }, { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, + { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", "Duration": 0, @@ -1517,6 +1513,12 @@ "Value": "0" }, { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, + { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", "Duration": 0, @@ -1595,6 +1597,12 @@ "Value": "0" }, { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, + { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", "Value": "CDCPUSET_RESTRICTED" @@ -1993,84 +2001,6 @@ }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "TpuControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "AurControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" @@ -2082,210 +2012,12 @@ "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "TpuControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "AurControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "Dex2oatThreads", - "Duration": 0, - "Value": "4" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "Dex2oatCPUSet", - "Duration": 0, - "Value": "0,1,2,3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "TpuControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "AurControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatThreads", "Duration": 0, "Value": "2" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "Dex2oatCPUSet", - "Duration": 0, - "Value": "0,1,2,3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_LITTLE_TSKIN_BYPASS", "Duration": 0, @@ -2305,95 +2037,11 @@ }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "TpuControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "AurControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatThreads", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "Dex2oatCPUSet", - "Duration": 0, - "Value": "0,1,2,3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", "Duration": 1000, @@ -2495,7 +2143,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "REFRESH_90FPS", @@ -2519,7 +2167,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "REFRESH_60FPS", @@ -2543,7 +2191,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "UiHighBoostWithoutPid", diff --git a/powerhint-panther.json b/powerhint-panther.json index d32ef83..849ef07 100644 --- a/powerhint-panther.json +++ b/powerhint-panther.json @@ -297,6 +297,14 @@ "ResetOnInit": true }, { + "Name": "NewlyIdleBalancer", + "Path": "/proc/vendor_sched/idle_balancer", + "Values": [ + "0", + "1" + ], + }, + { "Name": "DisplayWakeup", "Path": "/sys/devices/platform/1c240000.drmdecon/early_wakeup", "Values": [ @@ -715,30 +723,6 @@ { "PowerHint": "LAUNCH", "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDCPUSET_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", - "EnableProperty": "vendor.powerhal.camerarunning", - "Value": "CDMIDHIGHCPUSETCPUS_RESTRICTED" - }, - { - "PowerHint": "LAUNCH", - "Type": "DoHint", "Value": "LAUNCH_EXTEND" }, { @@ -1150,6 +1134,12 @@ "Value": "0" }, { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, + { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", "Duration": 0, @@ -1276,6 +1266,12 @@ "Value": "0" }, { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, + { "PowerHint": "CAMERA_STREAMING_STANDARD", "Node": "PowerHALCameraRunning", "Duration": 0, @@ -1384,6 +1380,12 @@ "Value": "0" }, { + "PowerHint": "CAMERA_STREAMING_STANDARD", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, + { "PowerHint": "CAMERA_STREAMING_LOW", "Node": "PowerHALCameraRunning", "Duration": 0, @@ -1462,6 +1464,12 @@ "Value": "0" }, { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "NewlyIdleBalancer", + "Duration": 0, + "Value": "0" + }, + { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", "Value": "CDCPUSET_RESTRICTED" @@ -1860,84 +1868,6 @@ }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "TpuControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "AurControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", "Node": "Dex2oatThreads", "Duration": 0, "Value": "4" @@ -1949,210 +1879,12 @@ "Value": "0,1,2,3" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_MODERATE", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "TpuControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "AurControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "Dex2oatThreads", - "Duration": 0, - "Value": "4" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "Dex2oatCPUSet", - "Duration": 0, - "Value": "0,1,2,3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_SEVERE", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "TpuControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "AurControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", "Node": "Dex2oatThreads", "Duration": 0, "Value": "2" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "Dex2oatCPUSet", - "Duration": 0, - "Value": "0,1,2,3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_CRITICAL", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "PMU_POLL", - "Duration": 0, - "Value": "1" - }, - { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "CPU_LITTLE_TSKIN_BYPASS", "Duration": 0, @@ -2172,95 +1904,11 @@ }, { "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "BigControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "MidControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "LittleControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "G3dControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "TpuControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "AurControlTempSet", - "Duration": 0, - "Value": "80000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "BigSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "MidSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "LittleSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "G3dSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "TpuSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "AurSwitchOnTempSet", - "Duration": 0, - "Value": "60000" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", "Node": "Dex2oatThreads", "Duration": 0, "Value": "1" }, { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "Dex2oatCPUSet", - "Duration": 0, - "Value": "0,1,2,3" - }, - { - "PowerHint": "THERMAL_VIRTUAL-SKIN-HINT_EMERGENCY", - "Node": "Dex2oatGroup", - "Duration": 0, - "Value": "0" - }, - { "PowerHint": "FACE_UNLOCK_BOOST", "Node": "CPUBigClusterMaxFreq", "Duration": 1000, @@ -2362,7 +2010,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "REFRESH_90FPS", @@ -2386,7 +2034,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "REFRESH_60FPS", @@ -2410,7 +2058,7 @@ "EarlyBoost_On": false, "EarlyBoost_TimeFactor": 0.0, "TargetTimeFactor": 1.0, - "StaleTimeFactor": 20.0 + "StaleTimeFactor": 15.0 }, { "Name": "UiHighBoostWithoutPid", diff --git a/wifi/BoardConfig-wifi.mk b/wifi/BoardConfig-wifi.mk index bc0cb80..14f9821 100644 --- a/wifi/BoardConfig-wifi.mk +++ b/wifi/BoardConfig-wifi.mk @@ -36,3 +36,5 @@ PRODUCT_COPY_FILES += \ device/google/pantah/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ device/google/pantah/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf +# Add WIFI_FEATURE_IMU_DETECTION to soong_config +$(call soong_config_set,wifi,feature_imu_detection,$(WIFI_FEATURE_IMU_DETECTION)) |