@glassly/bluetooth-sdk 0.1.0-dev.62 → 0.1.0-dev.90

package/README.md

@@ -352,7 +352,7 @@ Android and iOS async APIs use `BluetoothSdkException` / `BluetoothSdkError` for
 React Native apps should use `MentraLiveOtaFlow` or `useMentraLiveOta` from
 `@glassly/engine/ota`. They provide the same tested Wi-Fi/hotspot,
 APK/MTK/BES, restart, retry, and verification flow as the Glassly App. See
-[Update Mentra Live](https://docs.glassly.com/mentra-live/software-update).
+[Update Mentra Live](https://docs.glassly.com/bluetooth-sdk/software-update).
 
 The Bluetooth SDK exposes the lower-level commands and transport capabilities
 that Glassly Engine and native apps build on. They are not a replacement for the
@@ -371,7 +371,7 @@ Engine coordinator:
 Release CI embeds an immutable manifest URL and checksum into every published
 SDK distribution. The completed coordinated release record correlates the SDK
 package with its exact manifest and OTA bundle. A completed release is available at
-`https://github.com/Glassly-Community/GlasslyOS/releases/tag/glassly-v<releaseIdentity>`
+`https://github.com/tetramo-labs/glassly/releases/tag/glassly-v<releaseIdentity>`
 and contains `glassly-release-<releaseIdentity>.json`, which records the exact
 package coordinates, asset URLs, sizes, checksums, and build provenance.
 
@@ -409,7 +409,7 @@ OTA requires Mentra Live glasses firmware that supports the ASG OTA protocol and
 
 For release selection, bundle verification, analytics opt-out, internal server
 requirements, and disconnected validation, see the
-[air-gapped deployment guide](https://docs.glassly.com/mentra-live/air-gapped-deployment).
+[air-gapped deployment guide](https://docs.glassly.com/bluetooth-sdk/air-gapped-deployment).
 
 Mentra Live also rejects `ota_start` before acknowledgement when its known battery level is below 5%, emitting a failed `ota_status` with `error_message: "battery_low"`. Unknown battery state remains fail-open, so apps should keep their own (typically stricter) user-facing battery policy.
 
@@ -560,4 +560,4 @@ secrets, not in the repository.
 
 ## Starter Example App
 
-The [Glassly Bluetooth SDK Starter Kit](https://github.com/Glassly-Community/Glassly-Bluetooth-SDK-Starter-Kit) includes starter example apps for Android, iOS, and React Native / Expo. The React Native starter demonstrates scan/connect, display, camera photo upload, RTMP/SRT/WebRTC streaming, Wi-Fi/hotspot, microphone PCM, RGB LED, gallery mode, and console event inspection.
+The [Glassly Bluetooth SDK Starter Kit](https://github.com/tetramo-labs/glassly-starter-kit) includes starter example apps for Android, iOS, and React Native / Expo. The React Native starter demonstrates scan/connect, display, camera photo upload, RTMP/SRT/WebRTC streaming, Wi-Fi/hotspot, microphone PCM, RGB LED, gallery mode, and console event inspection.

package/android/src/main/assets/G2Firmware/README.md

@@ -3,9 +3,9 @@
 The Android library bundles the stock and Glassly CFW EVENOTA images stored in
 this directory. They are copied from the sibling `g2flash` checkout:
 
-- `g2_2.2.6.10.bin` -> `g2-stock-2.2.6.10.evenota.bin`
-- `g2_2.2.6.10_cfw.bin` -> `g2-glassly-cfw-2.2.6.10.evenota.bin`
+- `g2_2.2.9.22.bin` -> `g2-stock-2.2.9.22.evenota.bin`
+- `g2_2.2.9.22_cfw.bin` -> `g2-glassly-cfw-2.2.9.22.evenota.bin`
 
 Run `./build_cfw.sh` in `g2flash` before manually replacing the CFW image. The
-firmware binaries are intentionally ignored by Git and verified by size,
+firmware binaries are committed so CI builds bundle them, and verified by size,
 SHA-256, per-component CRC32C, and the MRAM guard before flashing.

package/android/src/main/java/com/glassly/bluetoothsdk/BluetoothSdk.kt

@@ -501,10 +501,6 @@ class BluetoothSdk private constructor(
         deviceManager.showDashboard()
     }
 
-    fun toggleHeadUp() {
-        deviceManager.headUp = !deviceManager.headUp
-    }
-
     fun showNotificationsPanel() {
         deviceManager.showNotificationsPanel()
     }

package/android/src/main/java/com/glassly/bluetoothsdk/BluetoothSdkModule.kt

@@ -550,7 +550,6 @@ class BluetoothSdkModule : Module() {
 
         SdkAsyncFunction("showDashboard") { -> sdk?.showDashboard() }
 
-        SdkAsyncFunction("toggleHeadUp") { -> sdk?.toggleHeadUp() }
 
         SdkAsyncFunction("showNativeNotificationPanel") { -> sdk?.showNotificationsPanel() }
 

package/android/src/main/java/com/glassly/bluetoothsdk/DeviceManager.kt

@@ -176,10 +176,6 @@ class DeviceManager {
         get() = DeviceStore.store.get("bluetooth", "should_send_transcript") as? Boolean ?: false
         set(value) = DeviceStore.apply("bluetooth", "should_send_transcript", value)
 
-    private var contextualDashboard: Boolean
-        get() = DeviceStore.store.get("bluetooth", "contextual_dashboard") as? Boolean ?: true
-        set(value) = DeviceStore.apply("bluetooth", "contextual_dashboard", value)
-
     private var dashboardHeight: Int
         get() = (DeviceStore.store.get("bluetooth", "dashboard_height") as? Number)?.toInt() ?: 4
         set(value) = DeviceStore.apply("bluetooth", "dashboard_height", value)
@@ -223,10 +219,6 @@ class DeviceManager {
         get() = DeviceStore.store.get("bluetooth", "systemMicUnavailable") as? Boolean ?: false
         set(value) = DeviceStore.apply("bluetooth", "systemMicUnavailable", value)
 
-    public var headUp: Boolean
-        get() = DeviceStore.store.get("glasses", "headUp") as? Boolean ?: false
-        set(value) = DeviceStore.apply("glasses", "headUp", value)
-
     private var micEnabled: Boolean
         get() = DeviceStore.store.get("bluetooth", "micEnabled") as? Boolean ?: false
         set(value) = DeviceStore.apply("bluetooth", "micEnabled", value)
@@ -280,12 +272,12 @@ class DeviceManager {
     // STT
     private var transcriber: SherpaOnnxTranscriber? = null
 
-    // View states
-    private val viewStates = mutableListOf<ViewState>()
+    // Single retained display state. The JS engine owns view switching
+    // (dashboard vs main); native just paints and repaints the last frame.
+    private var viewState = ViewState(" ", " ", " ", "text_wall", "", null, null)
 
     init {
         Bridge.log("DeviceManager: init()")
-        initializeViewStates()
         startForegroundService()
         // setupPermissionMonitoring()
         setupBluetoothStateMonitoring()
@@ -673,36 +665,6 @@ class DeviceManager {
         }
     }
 
-    private fun initializeViewStates() {
-        viewStates.clear()
-
-        // Matching Swift's 4 view states exactly
-        viewStates.add(ViewState(" ", " ", " ", "text_wall", "", null, null))
-        viewStates.add(
-            ViewState(
-                " ",
-                " ",
-                " ",
-                "text_wall",
-                "\$TIME12$ \$DATE$ \$GBATT$ \$CONNECTION_STATUS$",
-                null,
-                null
-            )
-        )
-        viewStates.add(ViewState(" ", " ", " ", "text_wall", "", null, null))
-        viewStates.add(
-            ViewState(
-                " ",
-                " ",
-                " ",
-                "text_wall",
-                "\$TIME12$ \$DATE$ \$GBATT$ \$CONNECTION_STATUS$",
-                null,
-                null
-            )
-        )
-    }
-
     private fun statesEqual(s1: ViewState, s2: ViewState): Boolean {
         val state1 =
             "${s1.layoutType}${s1.text}${s1.topText}${s1.bottomText}${s1.title}${s1.data ?: ""}"
@@ -736,12 +698,11 @@ class DeviceManager {
         var borderRadius: Int? = null
     )
 
-    // Scene slots — one whole SceneFrame per view (main/dashboard), parallel to
-    // viewStates. When a slot holds a scene, viewStates carries a "scene"
+    // Retained SceneFrame. When it holds a scene, viewState carries a "scene"
     // sentinel so sendCurrentState routes here. Holding the WHOLE frame keeps
-    // native re-dispatch coherent (dashboard exit re-applies a complete scene,
-    // not whatever element happened to arrive last).
-    private val sceneStates = arrayOfNulls<SceneFrame>(2)
+    // native re-dispatch coherent (nav exit re-applies a complete scene, not
+    // whatever element happened to arrive last).
+    private var sceneState: SceneFrame? = null
     // MARK: - End Unique
 
     // MARK: - Voice Data Handling
@@ -1021,15 +982,12 @@ class DeviceManager {
     }
 
     fun sendCurrentState() {
-        val hUp = DeviceStore.get("glasses", "headUp") as? Boolean ?: false
-        // Bridge.log("MAN: sendCurrentState(): $isHeadUp")
         if (screenDisabled) {
             return
         }
 
         // executor.execute {
-        val currentStateIndex = if (hUp && contextualDashboard) 1 else 0
-        val currentViewState: ViewState = viewStates[currentStateIndex]
+        val currentViewState: ViewState = viewState
 
         if (sgc?.type?.contains(DeviceTypes.SIMULATED) == true) {
             // dont send the event to glasses that aren't there:
@@ -1093,7 +1051,7 @@ class DeviceManager {
             }
 
             "scene" -> {
-                sceneStates[currentStateIndex]?.let { sgc?.applySceneFrame(it) }
+                sceneState?.let { sgc?.applySceneFrame(it) }
             }
 
             "clear_view" -> sgc?.clearDisplay()
@@ -1529,6 +1487,12 @@ class DeviceManager {
             val projectName = (DeviceStore.store.get("bluetooth", "project_name") as? String)?.trim().orEmpty()
             Bridge.saveSetting("project_name", projectName)
         }
+
+        // Restore the ring: connecting glasses tears the controller down
+        // (disconnect() nulls it), so bring a paired default controller back.
+        if (DeviceStore.get("glasses", "controllerConnected") as? Boolean != true) {
+            connectDefaultController()
+        }
     }
 
     private fun syncSystemTimeOnceForConnection(connectionKey: String) {
@@ -1620,22 +1584,13 @@ class DeviceManager {
     }
 
     fun displayEvent(event: Map<String, Any>) {
-        val view = event["view"] as? String
-        if (view == null) {
-            Bridge.log("MAN: Invalid view")
-            return
-        }
-
-        val isDashboard = view == "dashboard"
-        val stateIndex = if (isDashboard) 1 else 0
-
         // Scene frames (display.render() pipeline) take their own path: the
         // whole frame is the unit, not a layout, and the host's per-element
         // annotations make redundant frames self-deduping (all-"unchanged"
         // frames no-op in the SGC base handler).
         @Suppress("UNCHECKED_CAST") val sceneMap = event["scene"] as? Map<String, Any>
         if (sceneMap != null) {
-            handleSceneEvent(stateIndex, sceneMap)
+            handleSceneEvent(sceneMap)
             return
         }
 
@@ -1647,8 +1602,8 @@ class DeviceManager {
         // (e.g. a cloud app taking the view from a miniapp). Sweep the scene's
         // elements first so they don't linger under the new content; clear_view
         // wipes everything anyway.
-        sceneStates[stateIndex]?.let { prevFrame ->
-            sceneStates[stateIndex] = null
+        sceneState?.let { prevFrame ->
+            sceneState = null
             if (layoutType != "clear_view") {
                 sgc?.clearSceneElements(prevFrame.elements.map { it.id })
             }
@@ -1687,33 +1642,25 @@ class DeviceManager {
                 borderRadius
             )
 
-        val currentState = viewStates[stateIndex]
-
-        if (statesEqual(currentState, newViewState)) {
+        if (statesEqual(viewState, newViewState)) {
             return
         }
 
-        viewStates[stateIndex] = newViewState
-        val hUp = headUp && contextualDashboard
-        // send the state we just received if the user is currently in that state:
-        if (stateIndex == 0 && !hUp) {
-            sendCurrentState()
-        } else if (stateIndex == 1 && hUp) {
-            sendCurrentState()
-        }
+        viewState = newViewState
+        sendCurrentState()
     }
 
-    /** Parse + store a scene frame, then dispatch it if its view is visible. */
-    private fun handleSceneEvent(stateIndex: Int, sceneMap: Map<String, Any>) {
+    /** Parse + store a scene frame, then dispatch it. */
+    private fun handleSceneEvent(sceneMap: Map<String, Any>) {
         var frame = parseSceneFrame(sceneMap) ?: return
-        val prevFrame = sceneStates[stateIndex]
+        val prevFrame = sceneState
 
         if (prevFrame == null) {
             // Legacy→scene handoff: stale legacy content (e.g. a cloud app's
             // text wall) must not linger under the scene's elements.
             // clearDisplay is the per-device "wipe what's there" (blank-in-place
             // on G2 — no page rebuild).
-            val prevLegacyType = viewStates[stateIndex].layoutType
+            val prevLegacyType = viewState.layoutType
             if (prevLegacyType.isNotEmpty() && prevLegacyType != "clear_view" && prevLegacyType != "scene") {
                 sgc?.clearDisplay()
             }
@@ -1728,17 +1675,14 @@ class DeviceManager {
             frame = frame.copy(replay = true, elements = frame.elements.map { it.copy(change = "created") })
         }
 
-        // Store the REDISPATCH form: any later sendCurrentState (dashboard
-        // exit, head-up return) must repaint the whole frame — the original
+        // Store the REDISPATCH form: any later sendCurrentState (nav exit,
+        // screen re-enable) must repaint the whole frame — the original
         // annotations are only valid for the first dispatch right now.
-        sceneStates[stateIndex] =
+        sceneState =
             frame.copy(replay = true, elements = frame.elements.map { it.copy(change = "created") })
-        viewStates[stateIndex] = ViewState(" ", " ", " ", "scene", " ", null, null)
+        viewState = ViewState(" ", " ", " ", "scene", " ", null, null)
 
-        val hUp = headUp && contextualDashboard
-        if ((stateIndex == 0 && !hUp) || (stateIndex == 1 && hUp)) {
-            dispatchSceneFrame(frame)
-        }
+        dispatchSceneFrame(frame)
     }
 
     /** Guarded scene dispatch — mirrors sendCurrentState's send conditions. */

package/android/src/main/java/com/glassly/bluetoothsdk/DeviceStore.kt

@@ -128,7 +128,6 @@ object DeviceStore {
         store.set("bluetooth", "dashboard_depth", 2)
         store.set("bluetooth", "head_up_angle", 30)
         store.set("bluetooth", "imu_enabled", false)
-        store.set("bluetooth", "contextual_dashboard", true)
         store.set("bluetooth", "gallery_mode", true)
         store.set("bluetooth", "voice_activity_detection_enabled", BluetoothSdkDefaults.VOICE_ACTIVITY_DETECTION_ENABLED)
         store.set("bluetooth", "loudness_gate_enabled", BluetoothSdkDefaults.LOUDNESS_GATE_ENABLED)
@@ -198,9 +197,9 @@ object DeviceStore {
                     }
                 }
             }
+            // Head position only reaches JS now; the engine owns dashboard switching.
             "glasses" to "headUp" -> {
                 if (value is Boolean) {
-                    DeviceManager.getInstance().sendCurrentState()
                     Bridge.sendHeadUp(value)
                 }
             }

package/android/src/main/java/com/glassly/bluetoothsdk/GeneratedReleaseMetadata.kt

@@ -3,9 +3,9 @@ package com.glassly.bluetoothsdk
 /** Generated by release CI. Do not edit in a release checkout. */
 internal object GeneratedReleaseMetadata {
     const val FAMILY_BASE_VERSION: String = "0.1.0"
-    const val RELEASE_IDENTITY: String = "0.1.0-dev.62"
-    const val RELEASE_SET_ID: String = "glassly-0.1.0-dev.62"
-    const val SOURCE_COMMIT: String = "69eee438b882fca1c9b0ad466d71fc2c24053662"
+    const val RELEASE_IDENTITY: String = "0.1.0-dev.90"
+    const val RELEASE_SET_ID: String = "glassly-0.1.0-dev.90"
+    const val SOURCE_COMMIT: String = "1140c7490313353cb1d8da0782bf74c87d9119eb"
     const val OTA_MANIFEST_URL: String = ""
     const val OTA_MANIFEST_SHA256: String = ""
 }

package/android/src/main/java/com/glassly/bluetoothsdk/controllers/R1.kt

@@ -44,16 +44,101 @@ private object R1BLE {
 
     val NAME_FILTERS = arrayOf("EVEN R1", "BCL60")
 
-    val CONFIG_FC = byteArrayOf(0xFC.toByte())
-    val CONFIG_11 = byteArrayOf(0x11.toByte())
+    const val GESTURE_MARKER: Byte = 0xFF.toByte()
+}
 
-    // BleRing1 command header (cmd, module, subCmd) for advStart.
-    // From RE: BleRing1Cmd_system=0, BleRing1Module_system=0, BleRing1SubCmd_advStart=9
-    const val CMD_SYSTEM: Byte = 0x00
-    const val MODULE_SYSTEM: Byte = 0x00
-    const val SUBCMD_ADV_START: Byte = 0x09
+// MARK: - EUS transport encoder (phone → ring, channel 2)
+
+/**
+ * Recovered firmware contract (openCFW r1/ research): every phone→ring packet
+ * is a 12-byte "model" header
+ *   [version, module, moduleVersion, serial LE16, status, command, subcommand,
+ *    totalLength LE16, crc16 LE16]
+ * followed by the payload, where the phone-direction CRC-16 (CCITT rounds,
+ * init 0xFFFF) runs over the compact bytes [0,1,2,3,5,6,7,8,0x00] and then
+ * continues over the payload bytes. The model is carried on channel 2 inside a
+ * fragment train [sequence, crc32 LE32, ≤239 bytes]; the CRC-32 (poly
+ * 0x1EDC6F41, MSB-first, zero seed, no final xor) covers the whole model and
+ * sequence 0 terminates the train — all our packets fit a single fragment.
+ * Mirrors iOS R1.swift's R1Eus.
+ */
+private object R1Eus {
+    const val VERSION = 100
+    const val MODULE_SYSTEM = 0x01
+    const val MODULE_VERSION = 100
+    /** status bit 0x02 marks a SET; advStart requires it */
+    const val STATUS_SET = 0x02
+
+    /** system subcommand 0x08: payload [0x01] claims the phone role; the ring
+     *  requests link encryption/bonding in response */
+    const val SUBCMD_PAIR_AUTH = 0x08
+    /** system subcommand 0x0A: 12-byte payload = two 6-byte glasses arm MACs;
+     *  the ring stores both targets and fast-advertises for them */
+    const val SUBCMD_ADV_START = 0x0A
+
+    private fun crc16Step(crc: Int, byte: Int): Int {
+        var c = ((crc shr 8) or (crc shl 8)) and 0xFFFF
+        c = c xor (byte and 0xFF)
+        c = c xor ((c and 0x00FF) shr 4)
+        c = (c xor (c shl 12)) and 0xFFFF
+        c = (c xor ((c and 0x00FF) shl 5)) and 0xFFFF
+        return c
+    }
 
-    const val GESTURE_MARKER: Byte = 0xFF.toByte()
+    private fun phoneCrc16(header: ByteArray, payload: ByteArray): Int {
+        var crc = 0xFFFF
+        // compact header: bytes 0-3 and 5-8, then a zero placeholder
+        for (b in intArrayOf(
+            header[0].toInt(), header[1].toInt(), header[2].toInt(), header[3].toInt(),
+            header[5].toInt(), header[6].toInt(), header[7].toInt(), header[8].toInt(), 0
+        )) {
+            crc = crc16Step(crc, b)
+        }
+        for (b in payload) {
+            crc = crc16Step(crc, b.toInt())
+        }
+        return crc
+    }
+
+    private fun crc32(data: ByteArray): Long {
+        var crc = 0L
+        for (byte in data) {
+            crc = crc xor ((byte.toLong() and 0xFF) shl 24)
+            repeat(8) {
+                crc = if ((crc and 0x8000_0000L) != 0L) {
+                    ((crc shl 1) xor 0x1EDC6F41L) and 0xFFFF_FFFFL
+                } else {
+                    (crc shl 1) and 0xFFFF_FFFFL
+                }
+            }
+        }
+        return crc
+    }
+
+    /** Build one single-fragment system-module command packet. */
+    fun frame(subcommand: Int, status: Int, serial: Int, payload: ByteArray): ByteArray {
+        val length = 12 + payload.size
+        val header = byteArrayOf(
+            VERSION.toByte(), MODULE_SYSTEM.toByte(), MODULE_VERSION.toByte(),
+            (serial and 0xFF).toByte(), ((serial shr 8) and 0xFF).toByte(),
+            status.toByte(), 0x00, subcommand.toByte(),
+            (length and 0xFF).toByte(), ((length shr 8) and 0xFF).toByte(),
+            0, 0,
+        )
+        val crc16 = phoneCrc16(header, payload)
+        header[10] = (crc16 and 0xFF).toByte()
+        header[11] = ((crc16 shr 8) and 0xFF).toByte()
+        val model = header + payload
+
+        val outer = crc32(model)
+        return byteArrayOf(
+            0x00, // sequence 0: single-fragment train
+            (outer and 0xFF).toByte(),
+            ((outer shr 8) and 0xFF).toByte(),
+            ((outer shr 16) and 0xFF).toByte(),
+            ((outer shr 24) and 0xFF).toByte(),
+        ) + model
+    }
 }
 
 // MARK: - R1 Gesture Types
@@ -166,9 +251,22 @@ class R1 : ControllerManager() {
 
     private fun getRingMacFromMap(name: String): String? = loadRingMacAddressMap()[name]
 
-    // Reconnection (defined but currently unwired — matches iOS which leaves it commented)
+    // Reconnection
     private val reconnectionManager = R1ReconnectionManager()
 
+    private fun startReconnectionTimer() {
+        reconnectionManager.start {
+            val connected = DeviceStore.get("glasses", "controllerConnected") as? Boolean ?: false
+            if (connected) {
+                true // already connected — stop retrying
+            } else {
+                Bridge.log("R1: Attempting reconnection...")
+                mainHandler.post { startScan() }
+                false // keep trying
+            }
+        }
+    }
+
     // Battery
     private var _batteryLevel: Int = -1
         set(value) {
@@ -378,27 +476,52 @@ class R1 : ControllerManager() {
         }
     }
 
+    // MARK: - EUS commands
+
+    private var eusSerial = 0
+
+    private fun nextEusSerial(): Int {
+        eusSerial = (eusSerial + 1) and 0xFFFF
+        if (eusSerial == 0) eusSerial = 1
+        return eusSerial
+    }
+
+    /**
+     * EUS system commands go to WRITE_CHAR_2 only — channel 2 is the framed
+     * transport; channel 1 speaks the separate legacy protocol.
+     */
+    private fun sendEusCommand(subcommand: Int, payload: ByteArray, log: String) {
+        val wc = writeChar2
+        if (wc == null) {
+            Bridge.log("R1: $log: no channel-2 write characteristic")
+            return
+        }
+        val packet = R1Eus.frame(subcommand, R1Eus.STATUS_SET, nextEusSerial(), payload)
+        writeNoResponse(wc, packet)
+        Bridge.log("R1: $log sent (${packet.size} bytes)")
+    }
+
     // MARK: - Init Sequence
 
+    /**
+     * Runs after notify subscriptions are confirmed: claim the phone role,
+     * then mark the phone link ready.
+     */
     private fun runInitSequence() {
         if (initSequenceRun) return
         initSequenceRun = true
 
         Bridge.log("R1: Running init sequence")
 
-        val writeChars = listOfNotNull(writeChar1, writeChar2)
-        if (writeChars.isEmpty()) {
-            Bridge.log("R1: No write characteristics found, skipping init")
+        if (writeChar2 == null) {
+            Bridge.log("R1: No channel-2 write characteristic, skipping init")
             markConnected()
             return
         }
 
-        writeChars.forEach { writeNoResponse(it, R1BLE.CONFIG_FC) }
+        sendEusCommand(R1Eus.SUBCMD_PAIR_AUTH, byteArrayOf(0x01), "pairAuth")
 
-        mainHandler.postDelayed({
-            writeChars.forEach { writeNoResponse(it, R1BLE.CONFIG_11) }
-            markConnected()
-        }, 200)
+        mainHandler.postDelayed({ markConnected() }, 300)
     }
 
     private fun writeNoResponse(char: BluetoothGattCharacteristic, data: ByteArray) {
@@ -430,7 +553,10 @@ class R1 : ControllerManager() {
         }
         DeviceStore.apply("glasses", "controllerMacAddress", mac)
         DeviceStore.apply("glasses", "controllerConnected", true)
-        // DeviceStore.apply("glasses", "controllerFullyBooted", true)
+        // The phone link owns these flags: a ready phone link IS pairing
+        // success (fires handleControllerReady). The glasses link is layered
+        // on afterwards via advStart + RING_CONNECT_INFO.
+        DeviceStore.apply("glasses", "controllerFullyBooted", true)
 
         // tell the ring to connect to the glasses if we have its mac address:
         connectToGlasses()
@@ -445,46 +571,41 @@ class R1 : ControllerManager() {
     }
 
     /**
-     * Tells the ring to start advertising / connect to the glasses.
-     * Sends BleRing1 advStart (cmd=0, module=0, subCmd=9) with the 6-byte glasses MAC as payload
-     * to WRITE_CHAR_2 (BAE80012-…). Reverse-engineered from the Even Realities mobile app
-     * (BleRing1CmdProto::advStart -> BleRing1CmdPublicExt.sendCmd).
-     *
-     * TODO: BleRing1CmdPublicExt.sendCmd may add additional outer framing (length/seq/CRC) around
-     * the 3-byte header + MAC. If the ring rejects this raw payload, decode the wrapper.
+     * Tells the ring which glasses may connect to it: EUS advStart whose
+     * 12-byte payload is the two glasses arm MACs. The ring stores both
+     * targets, fast-advertises while a glasses role is open, and accepts a
+     * connection from either arm. With only one arm MAC known it is sent for
+     * both targets — the ring matches against either slot.
      */
     private fun connectToGlasses() {
-        // Try DeviceStore first; fall back to cached value in SharedPreferences.
-        val glassesMac = (DeviceStore.get("glasses", "bluetoothMacAddress") as? String)
+        fun stored(key: String): String? =
+            (DeviceStore.get("glasses", key) as? String)?.takeIf { it.isNotEmpty() }
+
+        val left = stored("leftMacAddress")
+            ?: stored("bluetoothMacAddress")
             ?: prefs.getString("glasses_btMacAddress", null)
-        if (glassesMac == null) {
+        val right = stored("rightMacAddress")
+            ?: prefs.getString("glasses_btMacAddressRight", null)
+
+        if (left == null) {
             Bridge.log("R1: connectToGlasses: no glasses MAC")
             return
         }
-        // Cache so we can reconnect even before the glasses are scanned.
-        prefs.edit().putString("glasses_btMacAddress", glassesMac).apply()
-
-        val macBytes = parseMac(glassesMac)
-        if (macBytes == null) {
+        val leftBytes = parseMac(left)
+        if (leftBytes == null) {
             Bridge.log("R1: connectToGlasses: could not parse glasses MAC")
             return
         }
-        val wc = writeChar2 ?: writeChar1
-        if (wc == null) {
-            Bridge.log("R1: connectToGlasses: no write characteristic")
-            return
-        }
-
-        val payload = byteArrayOf(R1BLE.CMD_SYSTEM, R1BLE.MODULE_SYSTEM, R1BLE.SUBCMD_ADV_START) + macBytes
-        Bridge.log("R1: advStart sent")
+        val rightBytes = right?.let { parseMac(it) } ?: leftBytes
 
-        wc.writeType = BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE
-        wc.value = payload
-        try {
-            ringGatt?.writeCharacteristic(wc)
-        } catch (e: SecurityException) {
-            Bridge.log("R1: connectToGlasses writeCharacteristic SecurityException: ${e.message}")
+        // Cache so we can re-send even before the glasses are next scanned.
+        prefs.edit().apply {
+            putString("glasses_btMacAddress", left)
+            if (right != null) putString("glasses_btMacAddressRight", right)
+            apply()
         }
+
+        sendEusCommand(R1Eus.SUBCMD_ADV_START, leftBytes + rightBytes, "advStart")
     }
 
     /** Parse "AA:BB:CC:DD:EE:FF" or "AABBCCDDEEFF" into 6 raw bytes. */
@@ -598,8 +719,8 @@ class R1 : ControllerManager() {
         pendingReads.clear()
         descriptorWriteInFlight = false
         readInFlight = false
-        ringMacAddress = null
-        ringBleAddress = null
+        // ringMacAddress/ringBleAddress persist across disconnects so
+        // reconnection can find the ring again; only forget() clears them.
         DeviceStore.apply("glasses", "controllerConnected", false)
         DeviceStore.apply("glasses", "controllerFullyBooted", false)
     }
@@ -645,7 +766,7 @@ class R1 : ControllerManager() {
                         try { gatt.close() } catch (e: SecurityException) {}
                         if (isDisconnecting) return@post
                         resetConnectionState()
-                        // iOS leaves reconnection timer commented; match that behavior
+                        startReconnectionTimer()
                     }
                 }
             }
@@ -906,7 +1027,6 @@ class R1 : ControllerManager() {
 
 // MARK: - R1 Reconnection Manager
 // Coroutine-based port of Swift's R1ReconnectionManager actor.
-// Currently unwired — matches iOS which leaves the reconnection timer commented out.
 
 private class R1ReconnectionManager(
     private val intervalSeconds: Long = 30L,