TySS-Dev/capod
1
0
Fork 0
mirror of https://github.com/d4rken-org/capod.git synced 2026-09-16 11:16:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(aap): Correct Adaptive noise capability flags and level semantics

Browse Source 
Switch the 0x4D init packet flags from 0x0E to 0xD7 to match the value captured from Apple's own stack (librepods AACPManager). The previous value traced to MagicPodsCore and matches no known Apple capture.

Invert the Adaptive Audio Noise level on write and read: wire 0 means max noise reduction, wire 100 means transparency-like. UI stays in intuitive 100 = max NC semantics, matching librepods' slider behavior.
This commit is contained in:
darken
2026-04-14 15:57:07 +02:00
committed by Matthias Urhahn
parent 8229163f70
commit 7f82119001
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/eu/darken/capod/pods/core/apple/aap/protocol/AapSetting.kt
+2 -3
View File
@@ -93,9 +93,8 @@ sealed class AapSetting {
val enabled: Boolean, val enabled: Boolean,
) : AapSetting() ) : AapSetting()
// Wire format matches librepods spec (tested on AirPods Pro 2). On AirPods Pro 3 the device // UI-space 0..100 (100 = max noise reduction). Wire value is inverted — conversion lives in
// accepts and echoes the value but no audible effect has been observed — may need additional // the device profile. Pro 3 silently accepts writes (no echo) but the value persists.
// enable packet or different handling. Requires more investigation.
data class AdaptiveAudioNoise( data class AdaptiveAudioNoise(
val level: Int, val level: Int,
) : AapSetting() ) : AapSetting()
app/src/main/java/eu/darken/capod/pods/core/apple/aap/protocol/DefaultAapDeviceProfile.kt
+5 -3
View File
@@ -86,7 +86,7 @@ class DefaultAapDeviceProfile(
override fun encodeInitExt(): ByteArray? { override fun encodeInitExt(): ByteArray? {
if (!model.features.needsInitExt) return null if (!model.features.needsInitExt) return null
return byteArrayOf( return byteArrayOf(
0x04, 0x00, 0x04, 0x00, 0x4d, 0x00, 0x0e, 0x00, 0x04, 0x00, 0x04, 0x00, 0x4d, 0x00, 0xd7.toByte(), 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
) )
} }
@@ -101,7 +101,9 @@ class DefaultAapDeviceProfile(
is AapCommand.SetVolumeSwipeLength -> buildSettingsMessage(SETTING_VOLUME_SWIPE_LENGTH, command.value.wireValue) is AapCommand.SetVolumeSwipeLength -> buildSettingsMessage(SETTING_VOLUME_SWIPE_LENGTH, command.value.wireValue)
is AapCommand.SetVolumeSwipe -> buildSettingsMessage(SETTING_VOLUME_SWIPE, encodeAppleBool(command.enabled)) is AapCommand.SetVolumeSwipe -> buildSettingsMessage(SETTING_VOLUME_SWIPE, encodeAppleBool(command.enabled))
is AapCommand.SetPersonalizedVolume -> buildSettingsMessage(SETTING_PERSONALIZED_VOLUME, encodeAppleBool(command.enabled)) is AapCommand.SetPersonalizedVolume -> buildSettingsMessage(SETTING_PERSONALIZED_VOLUME, encodeAppleBool(command.enabled))
is AapCommand.SetAdaptiveAudioNoise -> buildSettingsMessage(SETTING_ADAPTIVE_AUDIO_NOISE, command.level.coerceIn(0, 100)) // Wire semantics are inverted: wire 0 = max noise reduction, wire 100 = min (transparency-like).
// UI value 0..100 follows user intuition (100 = max NC), so flip on write/read.
is AapCommand.SetAdaptiveAudioNoise -> buildSettingsMessage(SETTING_ADAPTIVE_AUDIO_NOISE, 100 - command.level.coerceIn(0, 100))
is AapCommand.SetEndCallMuteMic -> buildEndCallMuteMicMessage(command.muteMic, command.endCall) is AapCommand.SetEndCallMuteMic -> buildEndCallMuteMicMessage(command.muteMic, command.endCall)
is AapCommand.SetMicrophoneMode -> buildSettingsMessage(SETTING_MICROPHONE_MODE, command.mode.wireValue) is AapCommand.SetMicrophoneMode -> buildSettingsMessage(SETTING_MICROPHONE_MODE, command.mode.wireValue)
is AapCommand.SetEarDetectionEnabled -> buildSettingsMessage(SETTING_EAR_DETECTION_ENABLED, encodeAppleBool(command.enabled)) is AapCommand.SetEarDetectionEnabled -> buildSettingsMessage(SETTING_EAR_DETECTION_ENABLED, encodeAppleBool(command.enabled))
@@ -242,7 +244,7 @@ class DefaultAapDeviceProfile(
AapSetting.PersonalizedVolume::class to AapSetting.PersonalizedVolume(enabled) AapSetting.PersonalizedVolume::class to AapSetting.PersonalizedVolume(enabled)
} }
SETTING_ADAPTIVE_AUDIO_NOISE -> { SETTING_ADAPTIVE_AUDIO_NOISE -> {
AapSetting.AdaptiveAudioNoise::class to AapSetting.AdaptiveAudioNoise(level = value) AapSetting.AdaptiveAudioNoise::class to AapSetting.AdaptiveAudioNoise(level = 100 - value.coerceIn(0, 100))
} }
SETTING_MICROPHONE_MODE -> { SETTING_MICROPHONE_MODE -> {
val mode = AapSetting.MicrophoneMode.Mode.fromWire(value) ?: return null val mode = AapSetting.MicrophoneMode.Mode.fromWire(value) ?: return null