@glassly/bluetooth-sdk 0.3.1-dev.535 → 0.3.1-dev.538

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

@@ -2340,11 +2340,22 @@ class DeviceManager {
             Bridge.log("MAN: connectDefaultController skipped — bluetooth runtime permissions not granted")
             return
         }
+        // The ring link outlives glasses connects/disconnects, so every
+        // reconnect path may find it already up.
+        if (DeviceStore.get("glasses", "controllerConnected") as? Boolean == true) {
+            Bridge.log("MAN: Controller already connected, returning")
+            return
+        }
         initController(defaultController)
         searchingController = true
         controller?.connectById(controllerDeviceName)
     }
 
+    /** Debug `ring_via_glasses` flipped: re-route a connected ring live. */
+    fun ringRouteToggled(viaGlasses: Boolean) {
+        controller?.setRouteViaGlasses(viaGlasses)
+    }
+
     fun connectByName(dName: String) {
         Bridge.log("MAN: Connecting to wearable: $dName")
 
@@ -2435,11 +2446,8 @@ class DeviceManager {
             "voiceActivityDetectionEnabled",
             BluetoothSdkDefaults.VOICE_ACTIVITY_DETECTION_ENABLED
         )
-        // disconnect the controller as well:
-        searchingController = false
-        DeviceStore.apply("glasses", "controllerConnected", false)
-        controller?.disconnect()
-        controller = null
+        // The ring is its own link and stays up across glasses disconnects;
+        // disconnectController()/forgetController() are the explicit ways down.
         if (clearPendingIdentity) {
             clearPendingConnection()
         }
@@ -2489,10 +2497,6 @@ class DeviceManager {
                     "voiceActivityDetectionEnabled",
                     BluetoothSdkDefaults.VOICE_ACTIVITY_DETECTION_ENABLED,
             )
-            searchingController = false
-            DeviceStore.apply("glasses", "controllerConnected", false)
-            controller?.disconnect()
-            controller = null
         } else {
             // Typical abandonAttempt path: disconnect() already destroyed SGC and nulled
             // this.sgc, so MentraLive.forget() never ran and Classic bonds stayed up —

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

@@ -148,6 +148,8 @@ object DeviceStore {
         store.set("bluetooth", "cfw_fast_ble", false)
         // Debug: G2PERF display performance lines in the log (off = counted, not logged).
         store.set("bluetooth", "g2_perf_logs", false)
+        // Debug: link the R1 ring to the glasses (off = ring on the phone link only).
+        store.set("bluetooth", "ring_via_glasses", false)
         store.set("bluetooth", "button_photo_size", "max")
         store.set("bluetooth", "button_max_recording_time", 10)
         store.set("bluetooth", "camera_fov", mapOf("fov" to 118, "roi_position" to 0))
@@ -264,6 +266,14 @@ object DeviceStore {
                     }
                 }
             }
+            "bluetooth" to "ring_via_glasses" -> {
+                val viaGlasses = value as? Boolean
+                if (viaGlasses != null && (oldValue as? Boolean) != viaGlasses) {
+                    CoroutineScope(Dispatchers.Main).launch {
+                        DeviceManager.getInstance().ringRouteToggled(viaGlasses)
+                    }
+                }
+            }
             "bluetooth" to "display_max_fps" -> {
                 (value as? Number)?.let { fps ->
                     DeviceManager.getInstance().setDisplayMaxFps(fps.toInt())

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.3.1"
-    const val RELEASE_IDENTITY: String = "0.3.1-dev.535"
-    const val RELEASE_SET_ID: String = "glassly-0.3.1-dev.535"
-    const val SOURCE_COMMIT: String = "5efaf90cbc7e0103909d4f15c530076eb042deb5"
+    const val RELEASE_IDENTITY: String = "0.3.1-dev.538"
+    const val RELEASE_SET_ID: String = "glassly-0.3.1-dev.538"
+    const val SOURCE_COMMIT: String = "3c004fd397951d67d68c6a6dcfda389afb5a2bc0"
     const val OTA_MANIFEST_URL: String = ""
     const val OTA_MANIFEST_SHA256: String = ""
 }

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

@@ -63,6 +63,8 @@ abstract class ControllerManager {
     // Connection Management
     abstract fun disconnect()
     abstract fun forget()
+    /** Route input through the glasses (debug) or the phone link (default). */
+    open fun setRouteViaGlasses(viaGlasses: Boolean) {}
     abstract fun findCompatibleDevices()
     abstract fun stopScan()
     abstract fun connectById(id: String)

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

@@ -45,6 +45,70 @@ private object R1BLE {
     val NAME_FILTERS = arrayOf("EVEN R1", "BCL60")
 
     const val GESTURE_MARKER: Byte = 0xFF.toByte()
+
+    /** `source` on emitted touch events; the same value the G2 CFW tags
+     *  ring input it relays with, so JS treats both paths alike. */
+    const val RING_SOURCE = 2
+
+    /**
+     * Scan-response manufacturer data (openCFW: `0x5245` company id, the six
+     * address bytes in SoftDevice order, then an optional 15-byte serial).
+     * Android hands us the payload with the company id already stripped. The
+     * GAP name is `EVEN R1_` + address bytes 3,2,1, which pins the byte order;
+     * the returned string keeps SoftDevice order, the form the glasses have
+     * accepted in RING_CONNECT_INFO. Taking the LAST six bytes was wrong for
+     * rings with a serial (it returned ASCII digits).
+     */
+    fun macAddress(mfgBytes: ByteArray, ringId: String?): String? {
+        if (mfgBytes.size < 6) return null
+        val addr = mfgBytes.copyOfRange(0, 6)
+        val hex = { b: ByteArray -> b.joinToString("") { String.format("%02X", it) } }
+        val id = ringId?.uppercase()
+        val chosen = when {
+            id.isNullOrEmpty() -> addr
+            hex(byteArrayOf(addr[3], addr[2], addr[1])) == id -> addr
+            else -> {
+                val flipped = addr.reversedArray()
+                if (hex(byteArrayOf(flipped[3], flipped[2], flipped[1])) == id) flipped else return null
+            }
+        }
+        return chosen.joinToString(":") { String.format("%02X", it) }
+    }
+}
+
+// MARK: - Ring → phone touch report (channel 1)
+
+/**
+ * The ring reports touch on the legacy channel-1 transport as 11 bytes
+ * `[00][09][61][00][wireType][aux][speed][00][tick LE32]` — the same report
+ * the Glassly CFW relays from the glasses as the `RI` SysEvent extension
+ * (g2flash gesture_fwd.c `faceclaw_ring_report`). Wire types map onto the
+ * gesture names the G2 path emits so miniapps see one vocabulary.
+ */
+private object R1TouchReport {
+    const val LENGTH = 11
+    const val OPCODE: Byte = 0x61
+
+    fun gestureName(wireType: Int): String? = when (wireType) {
+        0 -> "tap_start"
+        1 -> "single_tap"
+        2 -> "double_tap"
+        4 -> "swipe_up"
+        5 -> "swipe_down"
+        8 -> "tap_end"
+        9 -> "tap_then_hold"
+        10 -> "touch_down"
+        else -> null
+    }
+
+    /** null when `data` is not a touch report; `.first` null for an unknown wire type. */
+    fun parse(data: ByteArray): Pair<String?, Int>? {
+        if (data.size != LENGTH || data[0] != 0.toByte() || data[1] != 9.toByte() ||
+            data[2] != OPCODE || data[3] != 0.toByte()
+        ) return null
+        val wireType = data[4].toInt() and 0xFF
+        return gestureName(wireType) to wireType
+    }
 }
 
 // MARK: - EUS transport encoder (phone → ring, channel 2)
@@ -75,6 +139,12 @@ private object R1Eus {
     /** 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
+    /** system subcommand 0x82 (removeRingNotify): one-byte SET erases both
+     *  stored glasses targets and the "glasses paired" flag. While the ring
+     *  holds glasses targets its touch reports go to the glasses and the
+     *  phone link carries telemetry only, so this is what puts input on the
+     *  phone link. */
+    const val SUBCMD_REMOVE_RING = 0x82
 
     private fun crc16Step(crc: Int, byte: Int): Int {
         var c = ((crc shr 8) or (crc shl 8)) and 0xFFFF
@@ -144,7 +214,7 @@ private object R1Eus {
 // MARK: - R1 Gesture Types
 
 private enum class R1Gesture(val rawValue: String) {
-    HOLD("hold"),
+    HOLD("tap_then_hold"),
     SINGLE_TAP("single_tap"),
     DOUBLE_TAP("double_tap"),
     SWIPE_UP("swipe_up"),
@@ -438,14 +508,14 @@ class R1 : ControllerManager() {
             val mfgHex = mfgBytes?.joinToString(" ") { String.format("%02X", it) } ?: "none"
             Bridge.log("R1: Discovered: ${deviceName ?: "?"} (RSSI: ${result.rssi}) mfgData: $mfgHex")
 
-            // Extract ring MAC from manufacturer data (last 6 bytes) and store name->MAC map.
-            // Android's manufacturerSpecificData strips the 2-byte company ID; iOS keeps it. The
-            // resulting "last 6 bytes" land in reversed byte order between platforms (verified in
-            // the field), so reverse here to match iOS's stored string ("1B:08:26:8E:0E:E6").
-            if (deviceName != null && mfgBytes != null && mfgBytes.size >= 6) {
-                val tail = mfgBytes.copyOfRange(mfgBytes.size - 6, mfgBytes.size)
-                val macStr = tail.joinToString(":") { String.format("%02X", it) }
-                putRingMacInMap(deviceName, macStr)
+            // Extract the ring MAC from manufacturer data and store name->MAC map.
+            if (deviceName != null && mfgBytes != null) {
+                val macStr = R1BLE.macAddress(mfgBytes, extractRingId(deviceName))
+                if (macStr != null) {
+                    putRingMacInMap(deviceName, macStr)
+                } else {
+                    Bridge.log("R1: mfgData carries no address matching $deviceName")
+                }
             }
 
             // Emit discovered device
@@ -554,20 +624,54 @@ class R1 : ControllerManager() {
         DeviceStore.apply("glasses", "controllerMacAddress", mac)
         DeviceStore.apply("glasses", "controllerConnected", 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.
+        // success (fires handleControllerReady). A glasses link is only
+        // layered on afterwards (advStart + RING_CONNECT_INFO) when debug-routed.
         DeviceStore.apply("glasses", "controllerFullyBooted", true)
 
-        // tell the ring to connect to the glasses if we have its mac address:
-        connectToGlasses()
+        applyRoute(routeViaGlasses)
+
+        startHeartbeat()
+    }
+
+    /** Debug `ring_via_glasses` (default off): link the ring to the glasses and
+     *  take its input through the CFW relay instead of this link. */
+    private val routeViaGlasses: Boolean
+        get() = DeviceStore.get("bluetooth", "ring_via_glasses") as? Boolean ?: false
 
-        // after a second, connect the glasses to the controller if needed:
-        CoroutineScope(Dispatchers.Main).launch {
-            delay(1000)
-            DeviceManager.getInstance().sgc?.connectController()
+    /**
+     * Phone route (default): erase the ring's stored glasses targets so its
+     * touch reports come to this link, and have the glasses drop any ring
+     * link they still hold. Glasses route (debug): hand the ring the glasses
+     * MACs, then ask the glasses to connect.
+     */
+    private fun applyRoute(viaGlasses: Boolean) {
+        if (viaGlasses) {
+            connectToGlasses()
+            // after a second, connect the glasses to the controller if needed:
+            CoroutineScope(Dispatchers.Main).launch {
+                delay(1000)
+                DeviceManager.getInstance().sgc?.connectController()
+            }
+        } else {
+            sendEusCommand(R1Eus.SUBCMD_REMOVE_RING, byteArrayOf(0x01), "removeRingNotify")
+            DeviceManager.getInstance().sgc?.releaseController()
         }
+    }
 
-        startHeartbeat()
+    override fun setRouteViaGlasses(viaGlasses: Boolean) {
+        Bridge.log("R1: route via ${if (viaGlasses) "glasses" else "phone"}")
+        if (DeviceStore.get("glasses", "controllerConnected") as? Boolean != true) return
+        applyRoute(viaGlasses)
+    }
+
+    /**
+     * One emit path for both direct parsers. The ring reports touch to a
+     * single peer, so whatever arrives here is the only copy — forward it
+     * whichever route is configured.
+     */
+    private fun emitGesture(gestureName: String, timestamp: Long, via: String) {
+        Bridge.log("R1: $via: $gestureName")
+        Bridge.sendTouchEvent(ControllerTypes.R1, gestureName, timestamp, R1BLE.RING_SOURCE)
     }
 
     /**
@@ -657,12 +761,21 @@ class R1 : ControllerManager() {
 
         val timestamp = System.currentTimeMillis()
 
+        // Touch report: [00 09 61 00 wireType aux speed 00 tick4]
+        R1TouchReport.parse(data)?.let { (gesture, wireType) ->
+            if (gesture != null) {
+                emitGesture(gesture, timestamp, "Touch report")
+            } else {
+                Bridge.log("R1: Unknown touch report wireType=$wireType")
+            }
+            return
+        }
+
         // Gesture: [0xFF, type, param]
         if (data.size >= 3 && data[0] == R1BLE.GESTURE_MARKER) {
             val gesture = R1Gesture.parse(data)
             if (gesture != null) {
-                Bridge.log("R1: Gesture: ${gesture.rawValue}")
-                Bridge.sendTouchEvent(ControllerTypes.R1, gesture.rawValue, timestamp)
+                emitGesture(gesture.rawValue, timestamp, "Gesture")
             } else {
                 Bridge.log(
                     "R1: Unknown gesture type=0x%02X param=0x%02X".format(data[1], data[2])
@@ -696,8 +809,7 @@ class R1 : ControllerManager() {
                 val slice = byteArrayOf(data[ffIndex], data[ffIndex + 1], data[ffIndex + 2])
                 val gesture = R1Gesture.parse(slice)
                 if (gesture != null) {
-                    Bridge.log("R1: Embedded gesture: ${gesture.rawValue}")
-                    Bridge.sendTouchEvent(ControllerTypes.R1, gesture.rawValue, timestamp)
+                    emitGesture(gesture.rawValue, timestamp, "Embedded gesture")
                     return
                 }
             }

package/android/src/main/java/com/glassly/bluetoothsdk/sgcs/G2.kt

@@ -2298,7 +2298,7 @@ class G2 : SGCManager() {
 
         setFullyConnected()
 
-        // Connect a controller if we have one
+        // Link a paired ring if it is routed via the glasses, else release it
         connectController()
 
         // Query version + battery info from glasses
@@ -5596,52 +5596,60 @@ class G2 : SGCManager() {
         connectController()
     }
 
-    override fun connectController() {
+    /**
+     * Debug `ring_via_glasses`: the ring is linked to the glasses and its
+     * input arrives through the CFW. Off (default), the ring stays on the
+     * phone link and the glasses must not hold it — the ring sends touch
+     * reports to whichever glasses link it has and only telemetry to the phone.
+     */
+    private val ringViaGlasses: Boolean
+        get() = DeviceStore.get("bluetooth", "ring_via_glasses") as? Boolean ?: false
+
+    private var lastRingReleaseAt = 0L
+    private val RING_RELEASE_INTERVAL_MS = 5_000L
+
+    /** RING_CONNECT_INFO for the paired ring. False when the glasses aren't
+     *  booted or no ring MAC is known. */
+    private fun sendRingConnectInfo(connect: Boolean, tag: String): Boolean {
         val isFullyBooted = DeviceStore.get("glasses", "fullyBooted") as? Boolean ?: false
         if (!isFullyBooted) {
-            Bridge.log("G2: connectController - g2 not fully booted, ignoring")
-            return
+            Bridge.log("G2: $tag - g2 not fully booted, ignoring")
+            return false
         }
         val mac = DeviceStore.get("glasses", "controllerMacAddress") as? String
         if (mac.isNullOrEmpty()) {
-            Bridge.log("G2: connectController - no MAC address found")
-            return
+            Bridge.log("G2: $tag - no MAC address found")
+            return false
         }
         val hexParts = mac.split(":").mapNotNull { it.toIntOrNull(16)?.toByte() }
         if (hexParts.size != 6) {
-            Bridge.log("G2: connectController - invalid MAC format: $mac")
-            return
+            Bridge.log("G2: $tag - invalid MAC format: $mac")
+            return false
         }
-        Bridge.log("G2: connectController() - MAC: $mac")
-        val macData = hexParts.toByteArray()
-        val msg = DevSettingsProto.ringConnectInfo(sendManager.nextMagicRandom(), true, macData)
+        val msg = DevSettingsProto.ringConnectInfo(sendManager.nextMagicRandom(), connect, hexParts.toByteArray())
         sendDevSettingsCommand(msg)
-        Bridge.log("G2: Sent RING_CONNECT_INFO for MAC $mac")
+        Bridge.log("G2: Sent RING_${if (connect) "CONNECT" else "DISCONNECT"}_INFO for MAC $mac")
+        return true
     }
 
-    override fun disconnectController() {
-        val isFullyBooted = DeviceStore.get("glasses", "fullyBooted") as? Boolean ?: false
-        if (!isFullyBooted) {
-            Bridge.log("G2: disconnectController - g2 not fully booted, ignoring")
-            return
-        }
-        val mac = DeviceStore.get("glasses", "controllerMacAddress") as? String
-        if (mac.isNullOrEmpty()) {
-            Bridge.log("G2: disconnectController - no MAC address found")
-            return
-        }
-        val hexParts = mac.split(":").mapNotNull { it.toIntOrNull(16)?.toByte() }
-        if (hexParts.size != 6) {
-            Bridge.log("G2: disconnectController - invalid MAC format: $mac")
+    override fun connectController() {
+        if (!ringViaGlasses) {
+            // Phone-routed ring: make sure the glasses let go of it instead.
+            releaseController()
             return
         }
-        val macData = hexParts.toByteArray()
-        val msg = DevSettingsProto.ringConnectInfo(sendManager.nextMagicRandom(), false, macData)
-        sendDevSettingsCommand(msg)
+        sendRingConnectInfo(true, "connectController")
+    }
+
+    override fun disconnectController() {
+        if (!sendRingConnectInfo(false, "disconnectController")) return
         // DeviceStore.apply("glasses", "controllerMacAddress", "")
         DeviceStore.apply("glasses", "controllerConnected", false)
         DeviceStore.apply("glasses", "controllerFullyBooted", false)
-        Bridge.log("G2: Sent RING_DISCONNECT_INFO for MAC $mac")
+    }
+
+    override fun releaseController() {
+        sendRingConnectInfo(false, "releaseController")
     }
 
     // ---------- SGCManager: Device Control ----------
@@ -6779,9 +6787,24 @@ class G2 : SGCManager() {
                 return@let
             }
 
+            // Ring input relayed by the glasses. Older CFWs left event 14's
+            // source unspecified, so the id alone also marks the ring.
+            val fromRing = eventSource == 2 || eventType == OsEventType.RING_TOUCH_DOWN
+            if (fromRing && !ringViaGlasses) {
+                // The ring only reports touch to one peer, so this input is
+                // real and must flow — but the glasses shouldn't hold the ring
+                // while it is phone-routed. Ask them to let go (not per event).
+                val now = System.currentTimeMillis()
+                if (now - lastRingReleaseAt > RING_RELEASE_INTERVAL_MS) {
+                    lastRingReleaseAt = now
+                    Bridge.log("G2: ring $gestureName via glasses while phone-routed — releasing ring")
+                    releaseController()
+                }
+            }
+
             Bridge.sendTouchEvent(DeviceTypes.G2, gestureName, timestamp, eventSource)
 
-            if (eventSource == 2) {
+            if (fromRing) {
                 // controller must be connected and fully booted:
                 setControllerFullyConnected()
             }
@@ -6905,7 +6928,8 @@ class G2 : SGCManager() {
                 if (connStatus == 22) {
                     // The ring↔glasses link dropped. The phone↔ring link owns
                     // controllerConnected/FullyBooted, so don't clear them here
-                    // (that would flap pairing state) — just re-request the link.
+                    // (that would flap pairing state) — just re-request the link
+                    // (a no-op while the ring is routed via the phone).
                     Bridge.log("G2: Ring-glasses link dropped, re-requesting")
                     reconnectController()
                 }

package/android/src/main/java/com/glassly/bluetoothsdk/sgcs/SGCManager.kt

@@ -355,6 +355,8 @@ abstract class SGCManager {
     // Controller bridging (default no-op — only G2 supports pairing with a ring controller)
     open fun connectController() {}
     open fun disconnectController() {}
+    /** Drop the glasses↔ring link without touching the phone↔ring state. */
+    open fun releaseController() {}
 
     // Native navigation mode (glasses-rendered nav UI — G2 service 0x08 today).
     // Default no-ops so devices without a firmware nav UI accept the calls; the JS layer

package/build/generated/releaseMetadata.js

@@ -1,9 +1,9 @@
 export const BLUETOOTH_SDK_RELEASE_METADATA = Object.freeze({
     "schemaVersion": 1,
     "familyBaseVersion": "0.3.1",
-    "releaseIdentity": "0.3.1-dev.535",
-    "releaseSetId": "glassly-0.3.1-dev.535",
-    "sourceCommit": "5efaf90cbc7e0103909d4f15c530076eb042deb5",
+    "releaseIdentity": "0.3.1-dev.538",
+    "releaseSetId": "glassly-0.3.1-dev.538",
+    "sourceCommit": "3c004fd397951d67d68c6a6dcfda389afb5a2bc0",
     "otaManifestUrl": null,
     "otaManifestSha256": null
 });

package/build/generated/releaseMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"0.3.1\",\n  \"releaseIdentity\": \"0.3.1-dev.535\",\n  \"releaseSetId\": \"glassly-0.3.1-dev.535\",\n  \"sourceCommit\": \"5efaf90cbc7e0103909d4f15c530076eb042deb5\",\n  \"otaManifestUrl\": null,\n  \"otaManifestSha256\": null\n})\n"]}
+{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"0.3.1\",\n  \"releaseIdentity\": \"0.3.1-dev.538\",\n  \"releaseSetId\": \"glassly-0.3.1-dev.538\",\n  \"sourceCommit\": \"3c004fd397951d67d68c6a6dcfda389afb5a2bc0\",\n  \"otaManifestUrl\": null,\n  \"otaManifestSha256\": null\n})\n"]}

package/ios/Source/BluetoothSdkDefaults.swift

@@ -11,7 +11,7 @@ enum BluetoothSdkDefaults {
     static let voiceActivityDetectionEnabled = false
     static let loudnessGateEnabled = true
     private static let infoSdkVersionKey = "BluetoothSdkVersion"
-    private static let swiftPackageSdkVersion = "0.3.1-dev.535"
+    private static let swiftPackageSdkVersion = "0.3.1-dev.538"
     private static let swiftPackageSdkVersionPlaceholder = "__GLASSLY" + "_BLUETOOTH_SDK_VERSION__"
 
     private static func normalizedSdkVersion(_ value: String?) -> String? {

package/ios/Source/DeviceManager.swift

@@ -1976,6 +1976,12 @@ struct ViewState {
             Bridge.log("MAN: No controller device name, returning")
             return
         }
+        // The ring link outlives glasses connects/disconnects, so every
+        // reconnect path may find it already up.
+        if DeviceStore.shared.get("glasses", "controllerConnected") as? Bool == true {
+            Bridge.log("MAN: Controller already connected, returning")
+            return
+        }
         initController(defaultController)
         searchingController = true
         controller?.connectById(controllerDeviceName)
@@ -2074,11 +2080,8 @@ struct ViewState {
         DeviceStore.shared.apply("glasses", "connected", false)
         DeviceStore.shared.apply("glasses", "connectionState", ConnTypes.DISCONNECTED)
         DeviceStore.shared.apply("glasses", "voiceActivityDetectionEnabled", BluetoothSdkDefaults.voiceActivityDetectionEnabled)
-        // disconnect the controller as well:
-        searchingController = false
-        DeviceStore.shared.apply("glasses", "controllerConnected", false)
-        controller?.disconnect()
-        controller = nil // Clear the controller reference after disconnect
+        // The ring is its own link and stays up across glasses disconnects;
+        // disconnectController()/forgetController() are the explicit ways down.
         if clearPendingConnection {
             self.clearPendingConnection()
         }
@@ -2098,6 +2101,11 @@ struct ViewState {
         controller = nil // Clear the controller reference after disconnect
     }
 
+    /// Debug `ring_via_glasses` flipped: re-route a connected ring live.
+    func ringRouteToggled(_ viaGlasses: Bool) {
+        controller?.setRouteViaGlasses(viaGlasses)
+    }
+
     func forget() {
         Bridge.log("MAN: Forgetting smart glasses")
         // Call forget first to stop timers/handlers/reconnect logic

package/ios/Source/DeviceStore.swift

@@ -129,6 +129,8 @@ class DeviceStore {
         store.set("bluetooth", "cfw_fast_ble", false)
         // Debug: G2PERF display performance lines in the log (off = counted, not logged).
         store.set("bluetooth", "g2_perf_logs", false)
+        // Debug: link the R1 ring to the glasses (off = ring on the phone link only).
+        store.set("bluetooth", "ring_via_glasses", false)
         store.set("bluetooth", "display_max_fps", DisplayPacer.defaultFps)
     }
 
@@ -247,6 +249,11 @@ class DeviceStore {
                 Task { await DeviceManager.shared.sgc?.cfwFastBleToggled(enabled) }
             }
 
+        case ("bluetooth", "ring_via_glasses"):
+            if let viaGlasses = value as? Bool, (oldValue as? Bool) != viaGlasses {
+                Task { await DeviceManager.shared.ringRouteToggled(viaGlasses) }
+            }
+
         case ("bluetooth", "display_max_fps"):
             if let fps = value as? NSNumber {
                 DeviceManager.shared.setDisplayMaxFps(fps.intValue)

package/ios/Source/GeneratedReleaseMetadata.swift

@@ -3,9 +3,9 @@ import Foundation
 /// Generated by release CI. Do not edit in a release checkout.
 enum GeneratedReleaseMetadata {
     static let familyBaseVersion = "0.3.1"
-    static let releaseIdentity = "0.3.1-dev.535"
-    static let releaseSetId = "glassly-0.3.1-dev.535"
-    static let sourceCommit = "5efaf90cbc7e0103909d4f15c530076eb042deb5"
+    static let releaseIdentity = "0.3.1-dev.538"
+    static let releaseSetId = "glassly-0.3.1-dev.538"
+    static let sourceCommit = "3c004fd397951d67d68c6a6dcfda389afb5a2bc0"
     static let otaManifestUrl = ""
     static let otaManifestSha256 = ""
 }

package/ios/Source/controllers/ControllerManager.swift

@@ -58,6 +58,8 @@ protocol ControllerManager {
 
     func disconnect()
     func forget()
+    /// Route input through the glasses (debug) or the phone link (default).
+    func setRouteViaGlasses(_ viaGlasses: Bool)
     func findCompatibleDevices()
     func stopScan()
     func connectById(_ id: String)

package/ios/Source/controllers/R1.swift

@@ -12,6 +12,24 @@ import Foundation
 // MARK: - R1 BLE Constants
 
 private enum R1BLE {
+    /// Scan-response manufacturer data (openCFW: `0x5245` company id, the six
+    /// address bytes in SoftDevice order, then an optional 15-byte serial).
+    /// The GAP name is `EVEN R1_` + address bytes 3,2,1, which pins the byte
+    /// order; the stored string keeps SoftDevice order, the form the glasses
+    /// have accepted in RING_CONNECT_INFO. Taking the LAST six bytes was wrong
+    /// for rings with a serial (it returned ASCII digits).
+    static func macAddress(mfgData: Data, ringId: String?) -> Data? {
+        let bytes = [UInt8](mfgData)
+        guard bytes.count >= 8, bytes[0] == 0x45, bytes[1] == 0x52 else { return nil }
+        let addr = Array(bytes[2 ..< 8])
+        guard let ringId, !ringId.isEmpty else { return Data(addr) }
+        let hex = { (b: [UInt8]) in b.map { String(format: "%02X", $0) }.joined() }
+        if hex([addr[3], addr[2], addr[1]]) == ringId.uppercased() { return Data(addr) }
+        let flipped = Array(addr.reversed())
+        if hex([flipped[3], flipped[2], flipped[1]]) == ringId.uppercased() { return Data(flipped) }
+        return nil
+    }
+
     /// Ring custom service
     static let SERVICE_UUID = CBUUID(string: "BAE80001-4F05-4503-8E65-3AF1F7329D1F")
 
@@ -33,9 +51,46 @@ private enum R1BLE {
     /// Gesture protocol marker
     static let GESTURE_MARKER: UInt8 = 0xFF
 
+    /// `source` on emitted touch events; the same value the G2 CFW tags
+    /// ring input it relays with, so JS treats both paths alike.
+    static let RING_SOURCE: Int32 = 2
+
     static let SCAN_TIMEOUT: TimeInterval = 15.0
 }
 
+// MARK: - Ring → phone touch report (channel 1)
+
+/// The ring reports touch on the legacy channel-1 transport as 11 bytes
+/// `[00][09][61][00][wireType][aux][speed][00][tick LE32]` — the same report
+/// the Glassly CFW relays from the glasses as the `RI` SysEvent extension
+/// (g2flash gesture_fwd.c `faceclaw_ring_report`). Wire types map onto the
+/// gesture names the G2 path emits so miniapps see one vocabulary.
+private enum R1TouchReport {
+    static let LENGTH = 11
+    static let OPCODE: UInt8 = 0x61
+
+    static func gestureName(wireType: UInt8) -> String? {
+        switch wireType {
+        case 0: return "tap_start"
+        case 1: return "single_tap"
+        case 2: return "double_tap"
+        case 4: return "swipe_up"
+        case 5: return "swipe_down"
+        case 8: return "tap_end"
+        case 9: return "tap_then_hold"
+        case 10: return "touch_down"
+        default: return nil
+        }
+    }
+
+    /// nil when `data` is not a touch report; `.gesture` nil for an unknown wire type.
+    static func parse(_ data: Data) -> (gesture: String?, wireType: UInt8)? {
+        let b = [UInt8](data)
+        guard b.count == LENGTH, b[0] == 0, b[1] == 9, b[2] == OPCODE, b[3] == 0 else { return nil }
+        return (gestureName(wireType: b[4]), b[4])
+    }
+}
+
 // MARK: - EUS transport encoder (phone → ring, channel 2)
 
 /// Recovered firmware contract (openCFW r1/ research): every phone→ring packet
@@ -61,6 +116,12 @@ private enum R1Eus {
     /// system subcommand 0x0A: 12-byte payload = two 6-byte glasses arm MACs;
     /// the ring stores both targets and fast-advertises for them
     static let SUBCMD_ADV_START: UInt8 = 0x0A
+    /// system subcommand 0x82 (removeRingNotify): one-byte SET erases both
+    /// stored glasses targets and the "glasses paired" flag. While the ring
+    /// holds glasses targets its touch reports go to the glasses and the
+    /// phone link carries telemetry only, so this is what puts input on the
+    /// phone link.
+    static let SUBCMD_REMOVE_RING: UInt8 = 0x82
 
     private static func crc16Step(_ crc: UInt16, _ byte: UInt8) -> UInt16 {
         var c = (crc >> 8) | (crc << 8)
@@ -124,7 +185,7 @@ private enum R1Eus {
 // MARK: - R1 Gesture Types
 
 private enum R1Gesture: String {
-    case hold
+    case hold = "tap_then_hold"
     case singleTap = "single_tap"
     case doubleTap = "double_tap"
     case swipeUp = "swipe_up"
@@ -168,6 +229,12 @@ class R1: NSObject, ControllerManager {
     private var initSequenceRun = false
     private var eusSerial: UInt16 = 0
 
+    /// Debug `ring_via_glasses` (default off): link the ring to the glasses and
+    /// take its input through the CFW relay instead of this link.
+    private var routeViaGlasses: Bool {
+        DeviceStore.shared.get("bluetooth", "ring_via_glasses") as? Bool ?? false
+    }
+
     /// Device search
     var DEVICE_SEARCH_ID = "NOT_SET"
 
@@ -409,20 +476,50 @@ class R1: NSObject, ControllerManager {
 
         DeviceStore.shared.apply("glasses", "controllerConnected", 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.
+        // success (fires handleControllerReady). A glasses link is only
+        // layered on afterwards (advStart + RING_CONNECT_INFO) when debug-routed.
         DeviceStore.shared.apply("glasses", "controllerFullyBooted", true)
 
-        // tell the ring to connect to the glasses if we have it's mac address:
-        connectToGlasses()
+        applyRoute(viaGlasses: routeViaGlasses)
 
-        // after a second, connect the glasses to the controller if needed:
-        Task {
-            try? await Task.sleep(nanoseconds: 1_000_000_000)
-            await DeviceManager.shared.sgc?.connectController()
+        startHeartbeat()
+    }
+
+    /// Phone route (default): erase the ring's stored glasses targets so its
+    /// touch reports come to this link, and have the glasses drop any ring
+    /// link they still hold. Glasses route (debug): hand the ring the glasses
+    /// MACs, then ask the glasses to connect.
+    private func applyRoute(viaGlasses: Bool) {
+        if viaGlasses {
+            connectToGlasses()
+            // after a second, connect the glasses to the controller if needed:
+            Task {
+                try? await Task.sleep(nanoseconds: 1_000_000_000)
+                await DeviceManager.shared.sgc?.connectController()
+            }
+        } else {
+            sendEusCommand(R1Eus.SUBCMD_REMOVE_RING, payload: Data([0x01]), log: "removeRingNotify")
+            Task { await DeviceManager.shared.sgc?.releaseController() }
         }
+    }
 
-        startHeartbeat()
+    func setRouteViaGlasses(_ viaGlasses: Bool) {
+        Bridge.log("R1: route via \(viaGlasses ? "glasses" : "phone")")
+        guard DeviceStore.shared.get("glasses", "controllerConnected") as? Bool ?? false else { return }
+        applyRoute(viaGlasses: viaGlasses)
+    }
+
+    /// One emit path for both direct parsers. The ring reports touch to a
+    /// single peer, so whatever arrives here is the only copy — forward it
+    /// whichever route is configured.
+    private func emitGesture(_ gestureName: String, timestamp: Int64, via: String) {
+        Bridge.log("R1: \(via): \(gestureName)")
+        Bridge.sendTouchEvent(
+            deviceModel: ControllerTypes.R1,
+            gestureName: gestureName,
+            timestamp: timestamp,
+            source: R1BLE.RING_SOURCE
+        )
     }
 
     // MARK: - Heartbeat
@@ -455,15 +552,20 @@ class R1: NSObject, ControllerManager {
 
         let timestamp = Int64(Date().timeIntervalSince1970 * 1000)
 
+        // Touch report: [00 09 61 00 wireType aux speed 00 tick4]
+        if let report = R1TouchReport.parse(data) {
+            if let gesture = report.gesture {
+                emitGesture(gesture, timestamp: timestamp, via: "Touch report")
+            } else {
+                Bridge.log("R1: Unknown touch report wireType=\(report.wireType)")
+            }
+            return
+        }
+
         // Gesture: [0xFF, type, param]
         if data.count >= 3, data[0] == R1BLE.GESTURE_MARKER {
             if let gesture = R1Gesture.parse(from: data) {
-                Bridge.log("R1: Gesture: \(gesture.rawValue)")
-                Bridge.sendTouchEvent(
-                    deviceModel: ControllerTypes.R1,
-                    gestureName: gesture.rawValue,
-                    timestamp: timestamp
-                )
+                emitGesture(gesture.rawValue, timestamp: timestamp, via: "Gesture")
             } else {
                 Bridge.log(
                     "R1: Unknown gesture type=0x\(String(format: "%02X", data[1])) param=0x\(String(format: "%02X", data[2]))"
@@ -492,12 +594,7 @@ class R1: NSObject, ControllerManager {
         {
             let gestureData = Data(data[ffIndex ... ffIndex + 2])
             if let gesture = R1Gesture.parse(from: gestureData) {
-                Bridge.log("R1: Embedded gesture: \(gesture.rawValue)")
-                Bridge.sendTouchEvent(
-                    deviceModel: ControllerTypes.R1,
-                    gestureName: gesture.rawValue,
-                    timestamp: timestamp
-                )
+                emitGesture(gesture.rawValue, timestamp: timestamp, via: "Embedded gesture")
                 return
             }
         }
@@ -678,8 +775,10 @@ extension R1: CBCentralManagerDelegate {
                 Bridge.log(
                     "R1: mfgData: \(mfgData.map { String(format: "%02X", $0) }.joined(separator: " "))"
                 )
-                if mfgData.count >= 6 {
-                    self.ringMacAddressMap[name ?? ""] = Data(mfgData.suffix(6))
+                if let mac = R1BLE.macAddress(mfgData: mfgData, ringId: name.flatMap(self.extractRingId)) {
+                    self.ringMacAddressMap[name ?? ""] = mac
+                } else {
+                    Bridge.log("R1: mfgData carries no address matching \(name ?? "?")")
                 }
             }
 

package/ios/Source/sgcs/G2.swift

@@ -2674,7 +2674,7 @@ final class G2: NSObject, SGCManager {
 
         setFullyConnected()
 
-        // connnect a controller if we have one:
+        // Link a paired ring if it is routed via the glasses, else release it:
         connectController()
 
         // Query version + battery info from glasses
@@ -5812,66 +5812,68 @@ final class G2: NSObject, SGCManager {
         sendEvenHubHeartbeat()
     }
 
-    func connectController() {
+    /// Debug `ring_via_glasses`: the ring is linked to the glasses and its
+    /// input arrives through the CFW. Off (default), the ring stays on the
+    /// phone link and the glasses must not hold it — the ring sends touch
+    /// reports to whichever glasses link it has and only telemetry to the phone.
+    private var ringViaGlasses: Bool {
+        DeviceStore.shared.get("bluetooth", "ring_via_glasses") as? Bool ?? false
+    }
+
+    private var lastRingReleaseAt: TimeInterval = 0
+    private let RING_RELEASE_INTERVAL_S: TimeInterval = 5
+
+    /// RING_CONNECT_INFO for the paired ring. False when the glasses aren't
+    /// booted or no ring MAC is known.
+    @discardableResult
+    private func sendRingConnectInfo(connect: Bool, tag: String) -> Bool {
         let isFullyBooted = DeviceStore.shared.get("glasses", "fullyBooted") as? Bool ?? false
         guard isFullyBooted else {
-            Bridge.log("G2: connectController - g2 not fully booted, ignoring")
-            return
+            Bridge.log("G2: \(tag) - g2 not fully booted, ignoring")
+            return false
         }
 
-        guard let mac = DeviceStore.shared.get("glasses", "controllerMacAddress") as? String else {
-            Bridge.log("G2: connectController - no MAC address found")
-            return
+        guard let mac = DeviceStore.shared.get("glasses", "controllerMacAddress") as? String, !mac.isEmpty else {
+            Bridge.log("G2: \(tag) - no MAC address found")
+            return false
         }
 
         // Parse "AA:BB:CC:DD:EE:FF" into 6-byte Data
         let hexParts = mac.split(separator: ":").compactMap { UInt8($0, radix: 16) }
         guard hexParts.count == 6 else {
-            Bridge.log("G2: connectController - invalid MAC format: \(mac)")
-            return
+            Bridge.log("G2: \(tag) - invalid MAC format: \(mac)")
+            return false
         }
-        let macData = Data(hexParts)
 
         let msg = DevSettingsProto.ringConnectInfo(
             magicRandom: sendManager.nextMagicRandom(),
-            connect: true,
-            ringMac: macData
+            connect: connect,
+            ringMac: Data(hexParts)
         )
         sendDevSettingsCommand(msg)
-        Bridge.log("G2: Sent RING_CONNECT_INFO for MAC \(mac)")
+        Bridge.log("G2: Sent RING_\(connect ? "CONNECT" : "DISCONNECT")_INFO for MAC \(mac)")
+        return true
     }
 
-    func disconnectController() {
-        let isFullyBooted = DeviceStore.shared.get("glasses", "fullyBooted") as? Bool ?? false
-        guard isFullyBooted else {
-            Bridge.log("G2: disconnectController - g2 not fully booted, ignoring")
-            return
-        }
-
-        guard let mac = DeviceStore.shared.get("glasses", "controllerMacAddress") as? String else {
-            Bridge.log("G2: disconnectController - no MAC address found")
-            return
-        }
-
-        // Parse "AA:BB:CC:DD:EE:FF" into 6-byte Data
-        let hexParts = mac.split(separator: ":").compactMap { UInt8($0, radix: 16) }
-        guard hexParts.count == 6 else {
-            Bridge.log("G2: disconnectController - invalid MAC format: \(mac)")
+    func connectController() {
+        guard ringViaGlasses else {
+            // Phone-routed ring: make sure the glasses let go of it instead.
+            releaseController()
             return
         }
-        let macData = Data(hexParts)
+        sendRingConnectInfo(connect: true, tag: "connectController")
+    }
 
-        let msg = DevSettingsProto.ringConnectInfo(
-            magicRandom: sendManager.nextMagicRandom(),
-            connect: false,
-            ringMac: macData
-        )
-        sendDevSettingsCommand(msg)
+    func disconnectController() {
+        guard sendRingConnectInfo(connect: false, tag: "disconnectController") else { return }
 
         // DeviceStore.shared.apply("glasses", "controllerMacAddress", "")
         DeviceStore.shared.apply("glasses", "controllerConnected", false)
         DeviceStore.shared.apply("glasses", "controllerFullyBooted", false)
-        Bridge.log("G2: Sent RING_DISCONNECT_INFO for MAC \(mac)")
+    }
+
+    func releaseController() {
+        sendRingConnectInfo(connect: false, tag: "releaseController")
     }
 
     /// Fire an EvenAI skill — the same path "Hey Even, show X" uses. Triggers a
@@ -7092,13 +7094,28 @@ final class G2: NSObject, SGCManager {
                 return
             }
 
+            // Ring input relayed by the glasses. Older CFWs left event 14's
+            // source unspecified, so the id alone also marks the ring.
+            let fromRing = eventSource == 2 || eventType == .ringTouchDown
+            if fromRing, !ringViaGlasses {
+                // The ring only reports touch to one peer, so this input is
+                // real and must flow — but the glasses shouldn't hold the ring
+                // while it is phone-routed. Ask them to let go (not per event).
+                let now = Date().timeIntervalSince1970
+                if now - lastRingReleaseAt > RING_RELEASE_INTERVAL_S {
+                    lastRingReleaseAt = now
+                    Bridge.log("G2: ring \(gestureName) via glasses while phone-routed — releasing ring")
+                    releaseController()
+                }
+            }
+
             Bridge.sendTouchEvent(
                 deviceModel: type, gestureName: gestureName,
                 timestamp: timestamp,
                 source: eventSource
             )
 
-            if eventSource == 2 {
+            if fromRing {
                 // controller must be connected and fully booted:
                 setControllerFullyConnected()
             }
@@ -7259,7 +7276,8 @@ final class G2: NSObject, SGCManager {
                 if connStatus == 22 {
                     // The ring↔glasses link dropped. The phone↔ring link owns
                     // controllerConnected/FullyBooted, so don't clear them here
-                    // (that would flap pairing state) — just re-request the link.
+                    // (that would flap pairing state) — just re-request the link
+                    // (a no-op while the ring is routed via the phone).
                     Bridge.log("G2: Ring-glasses link dropped, re-requesting")
                     reconnectController()
                 }

package/ios/Source/sgcs/SGCManager.swift

@@ -343,6 +343,8 @@ protocol SGCManager {
     func getConnectedBluetoothName() -> String?
     func connectController()
     func disconnectController()
+    /// Drop the glasses↔ring link without touching the phone↔ring state.
+    func releaseController()
     func cleanup()
     func ping()
     func dbg1()
@@ -397,6 +399,9 @@ extension SGCManager {
     /// Default: no-op. Only G2 distinguishes stock from Glassly CFW firmware.
     func awaitFirmwareClassification() async {}
 
+    /// Default: no-op. Only G2 can hold a ring link.
+    func releaseController() {}
+
     /// Default: no-op debug hooks; only G2 wires them.
     func dbg3() {}
     func dbg4() {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glassly/bluetooth-sdk",
-  "version": "0.3.1-dev.535",
+  "version": "0.3.1-dev.538",
   "description": "SDK for communicating with smart glasses",
   "main": "build/index.js",
   "react-native": "src/index.ts",

package/src/generated/releaseMetadata.ts

@@ -12,9 +12,9 @@ export interface BluetoothSdkReleaseMetadata {
 export const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({
   "schemaVersion": 1,
   "familyBaseVersion": "0.3.1",
-  "releaseIdentity": "0.3.1-dev.535",
-  "releaseSetId": "glassly-0.3.1-dev.535",
-  "sourceCommit": "5efaf90cbc7e0103909d4f15c530076eb042deb5",
+  "releaseIdentity": "0.3.1-dev.538",
+  "releaseSetId": "glassly-0.3.1-dev.538",
+  "sourceCommit": "3c004fd397951d67d68c6a6dcfda389afb5a2bc0",
   "otaManifestUrl": null,
   "otaManifestSha256": null
 })