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 AirPods Max wear detection. (#108)

Browse Source 
Closes #106
This commit is contained in:
Matthias Urhahn
2023-03-10 11:30:40 +01:00
committed by GitHub
parent db80fa1b46
commit 94e2d40554
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app-common/src/main/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMax.kt
+4 -6
View File
@@ -3,6 +3,7 @@ package eu.darken.capod.pods.core.apple.airpods
import eu.darken.capod.common.bluetooth.BleScanResult import eu.darken.capod.common.bluetooth.BleScanResult
import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.common.debug.logging.logTag
import eu.darken.capod.common.isBitSet import eu.darken.capod.common.isBitSet
import eu.darken.capod.pods.core.HasChargeDetection
import eu.darken.capod.pods.core.HasEarDetection import eu.darken.capod.pods.core.HasEarDetection
import eu.darken.capod.pods.core.PodDevice import eu.darken.capod.pods.core.PodDevice
import eu.darken.capod.pods.core.apple.ApplePods import eu.darken.capod.pods.core.apple.ApplePods
@@ -22,21 +23,18 @@ data class AirPodsMax(
override val proximityMessage: ProximityPairing.Message, override val proximityMessage: ProximityPairing.Message,
override val reliability: Float = PodDevice.BASE_CONFIDENCE, override val reliability: Float = PodDevice.BASE_CONFIDENCE,
private val rssiAverage: Int? = null, private val rssiAverage: Int? = null,
) : SingleApplePods, HasEarDetection, HasAppleColor { ) : SingleApplePods, HasEarDetection, HasChargeDetection, HasAppleColor {
override val model: PodDevice.Model = PodDevice.Model.AIRPODS_MAX override val model: PodDevice.Model = PodDevice.Model.AIRPODS_MAX
override val rssi: Int override val rssi: Int
get() = rssiAverage ?: super<SingleApplePods>.rssi get() = rssiAverage ?: super<SingleApplePods>.rssi
val isHeadphonesBeingWorn: Boolean override val isHeadsetBeingCharged: Boolean
get() = rawStatus.isBitSet(1)
val isHeadsetBeingCharged: Boolean
get() = rawFlags.isBitSet(0) get() = rawFlags.isBitSet(0)
override val isBeingWorn: Boolean override val isBeingWorn: Boolean
get() = isHeadphonesBeingWorn get() = !rawStatus.isBitSet(5)
class Factory @Inject constructor() : SingleApplePodsFactory(TAG) { class Factory @Inject constructor() : SingleApplePodsFactory(TAG) {
app-common/src/test/java/eu/darken/capod/pods/core/apple/SingleApplePodsTest.kt
+1 -1
View File
@@ -29,7 +29,7 @@ class SingleApplePodsTest : BaseAirPodsTest() {
isHeadsetBeingCharged shouldBe false isHeadsetBeingCharged shouldBe false
isHeadphonesBeingWorn shouldBe true isBeingWorn shouldBe true
} }
} }
} }
app-common/src/test/java/eu/darken/capod/pods/core/apple/airpods/AirPodsMaxTest.kt
+18 -5
View File
@@ -1,5 +1,6 @@
package eu.darken.capod.pods.core.apple.airpods package eu.darken.capod.pods.core.apple.airpods
import eu.darken.capod.common.isBitSet
import eu.darken.capod.pods.core.PodDevice import eu.darken.capod.pods.core.PodDevice
import eu.darken.capod.pods.core.apple.BaseAirPodsTest import eu.darken.capod.pods.core.apple.BaseAirPodsTest
import eu.darken.capod.pods.core.apple.HasAppleColor import eu.darken.capod.pods.core.apple.HasAppleColor
@@ -27,8 +28,6 @@ class AirPodsMaxTest : BaseAirPodsTest() {
isHeadsetBeingCharged shouldBe false isHeadsetBeingCharged shouldBe false
isHeadphonesBeingWorn shouldBe true
model shouldBe PodDevice.Model.AIRPODS_MAX model shouldBe PodDevice.Model.AIRPODS_MAX
} }
} }
@@ -50,8 +49,6 @@ class AirPodsMaxTest : BaseAirPodsTest() {
batteryHeadsetPercent shouldBe 0.5f batteryHeadsetPercent shouldBe 0.5f
isHeadsetBeingCharged shouldBe false isHeadsetBeingCharged shouldBe false
isHeadphonesBeingWorn shouldBe true
} }
} }
@@ -72,9 +69,25 @@ class AirPodsMaxTest : BaseAirPodsTest() {
isHeadsetBeingCharged shouldBe false isHeadsetBeingCharged shouldBe false
isHeadphonesBeingWorn shouldBe true rawStatus.isBitSet(5) shouldBe true
podStyle shouldBe HasAppleColor.DeviceColor.BLUE podStyle shouldBe HasAppleColor.DeviceColor.BLUE
} }
} }
@Test
fun `wear status`() = runTest {
create<AirPodsMax>("07 19 01 0A 20 03 07 80 03 03 65 1F 28 32 D0 D9 71 43 00 9A 40 E7 6B EA 6C 2C FB") {
rawStatus shouldBe 0x03.toUByte()
rawStatus.isBitSet(5) shouldBe false
isBeingWorn shouldBe true
}
create<AirPodsMax>("07 19 01 0A 20 23 07 80 03 03 65 1F 28 32 D0 D9 71 43 00 9A 40 E7 6B EA 6C 2C FB") {
rawStatus shouldBe 0x23.toUByte()
rawStatus.isBitSet(5) shouldBe true
isBeingWorn shouldBe false
}
}
} }