Merge pull request 'fix(ble): connect G2 arms with autoConnect=true' (#18) from MasterControl/faceclaw:fix/ble-autoconnect-arms into build/all-features

Reviewed-on: Blendman974/faceclaw#18
This commit is contained in:
Blendman974 committed 2026-11-14 20:06:31 +00:00
commit e4d3286b3d
3 files changed
+21 -18

No files matched your search

@@ -231,17 +231,16 @@ class FaceclawBleManager(context: Context) {
fun connect(address: String?, timeoutMs: Int): Boolean = connect(address, timeoutMs, false) fun connect(address: String?, timeoutMs: Int): Boolean = connect(address, timeoutMs, false)
/** /**
* EXPERIMENTAL (2026-09-11): the ring specifically needs autoConnect=true. * autoConnect=true is used for the ring and both glasses arms. The ring specifically
* Even's own vendor app connects the ring with Android's autoConnect flag * needs it (Even's own vendor app connects the ring with Android's autoConnect flag
* set (confirmed via its own BLE debug log, "connect() - device: ..., * set, confirmed via its own BLE debug log, "connect() - device: ...,
* auto: true"), while every other faceclaw connection (both glasses arms) * auto: true"). A live test showed a ring-only direct connection dying almost
* uses autoConnect=false. Direct connect (false) is faster to establish * exactly 5 seconds in, repeatedly, with nothing else competing for it, and the
* but Android supervises it less patiently; a live test showed the * glasses arms showed the same "less patiently supervised" direct-connect drop.
* ring-only direct connection dying almost exactly 5 seconds in, * Direct connect (false) is faster to establish but Android supervises it less
* repeatedly, with nothing else competing for it. autoConnect=true can * patiently. autoConnect=true can take much longer to actually complete (Android
* take much longer to actually complete (Android manages it as a * manages it as a background reconnect, not an immediate attempt), so it needs its
* background reconnect, not an immediate attempt), so this needs its own * own longer timeout. Like [connect], waits on an attempt already pending.
* longer timeout. Like [connect], waits on an attempt already pending.
*/ */
fun connect(address: String?, timeoutMs: Int, autoConnect: Boolean): Boolean { fun connect(address: String?, timeoutMs: Int, autoConnect: Boolean): Boolean {
val key = requireAddress(address) val key = requireAddress(address)
@@ -2339,9 +2339,12 @@ class GlassesSessionCore(
try { try {
// Dial both arms at once, so the left arm's attempt is already pending (and // Dial both arms at once, so the left arm's attempt is already pending (and
// can land) while the right arm is being set up; they share one window. // can land) while the right arm is being set up; they share one window.
// autoConnect=true for both arms: a direct connection is supervised less
// patiently by Android's stack and was observed dropping the link shortly
// after it came up (the same failure that made the ring require autoConnect).
val deadlineMs = now() + ConnectionOptions.ARM_CONNECT_WINDOW_MS val deadlineMs = now() + ConnectionOptions.ARM_CONNECT_WINDOW_MS
link.beginConnect(rightAddress, false) link.beginConnect(rightAddress, true)
link.beginConnect(leftAddress, false) link.beginConnect(leftAddress, true)
connectArm(rightAddress, true, deadlineMs) connectArm(rightAddress, true, deadlineMs)
connectArm(leftAddress, true, deadlineMs) connectArm(leftAddress, true, deadlineMs)
if (!sleepDuringConnectSettling(800)) { if (!sleepDuringConnectSettling(800)) {
@@ -2450,7 +2453,7 @@ class GlassesSessionCore(
internal fun connectArm(address: String, enableRenderNotify: Boolean, deadlineMs: Long) { internal fun connectArm(address: String, enableRenderNotify: Boolean, deadlineMs: Long) {
val timeoutMs = maxOf(deadlineMs - now(), ConnectionOptions.CONNECT_TIMEOUT_MS.toLong()) val timeoutMs = maxOf(deadlineMs - now(), ConnectionOptions.CONNECT_TIMEOUT_MS.toLong())
if (!link.connect(address, timeoutMs.toInt())) { if (!link.connect(address, timeoutMs.toInt(), true)) {
throw ArmUnreachableException(if (address.equals(leftAddress, ignoreCase = true)) "left" else "right", address) throw ArmUnreachableException(if (address.equals(leftAddress, ignoreCase = true)) "left" else "right", address)
} }
// requestConnectionPriority has no callback in this Android compile target, so there is // requestConnectionPriority has no callback in this Android compile target, so there is
@@ -2538,9 +2541,9 @@ class GlassesSessionCore(
logLine("connecting direct ring $ringAddress") logLine("connecting direct ring $ringAddress")
// autoConnect=true (see SessionLink.connect's 3-arg overload) - // autoConnect=true (see SessionLink.connect's 3-arg overload) -
// matches what Even's own app does for this device specifically. // matches what Even's own app does for this device specifically.
// Direct connect (false, the default used for the glasses) was // Direct connect (false) was measured dying ~5s into an
// measured dying ~5s into an otherwise-idle ring connection, // otherwise-idle ring connection, repeatedly, with nothing else
// repeatedly, with nothing else competing for it. // competing for it.
if (!link.connect(ringAddress, ConnectionOptions.RING_CONNECT_TIMEOUT_MS, true)) { if (!link.connect(ringAddress, ConnectionOptions.RING_CONNECT_TIMEOUT_MS, true)) {
throw IllegalStateException("connect failed: $ringAddress") throw IllegalStateException("connect failed: $ringAddress")
} }
@@ -18,7 +18,8 @@ interface SessionLink {
/** /**
* [connect] with the platform's background-reconnect mode (Android's autoConnect) when * [connect] with the platform's background-reconnect mode (Android's autoConnect) when
* [autoConnect] is set. The R1 ring needs it; platforms without the distinction ignore it. * [autoConnect] is set. The R1 ring and the G2 glasses arms both need it; platforms
* without the distinction ignore it.
*/ */
fun connect(address: String, timeoutMs: Int, autoConnect: Boolean): Boolean = connect(address, timeoutMs) fun connect(address: String, timeoutMs: Int, autoConnect: Boolean): Boolean = connect(address, timeoutMs)