@mentra/bluetooth-sdk 0.1.21-beta.0 → 0.1.21-beta.2

package/android/src/main/java/com/mentra/bluetoothsdk/sgcs/MentraLive.kt

@@ -95,6 +95,7 @@ class MentraLive : SGCManager() {
         // LC3 frame size for Mentra Live
         private const val LC3_FRAME_SIZE = 40
         private const val VOICE_ACTIVITY_DETECTION_SWITCH_TYPE = 8
+        private const val LOUDNESS_GATE_SWITCH_TYPE = 10
         private const val BES2700_MTU_LIMIT = 509
 
         // L2CAP CoC fast path: new BES2700 firmware registers an LE L2CAP CoC server on this
@@ -233,6 +234,15 @@ class MentraLive : SGCManager() {
     private var peerK900Le = false
     private var peerWireCapsBinary = false
     private var peerFilePayloadV2 = false
+    // Last observed glasses process session id (`sid` in glasses_ready / version_info_1).
+    // The BES keeps the BLE link alive across asg_client restarts, so transport state
+    // cannot signal a restart - a CHANGED (or newly appearing) sid is the restart signal.
+    // Null = no sid observed this BLE session (legacy glasses, or none seen yet).
+    private var glassesSessionId: String? = null
+    // True once a glasses_ready completed on THIS physical BLE session; resets only with
+    // the physical connection (never on heartbeat readiness flaps), so a first-seen sid
+    // after an upgrade OTA is always detected as a restart.
+    private var readinessCompletedThisBleSession = false
     // Note: appVersion, buildNumber, deviceModel, androidVersion
     // are inherited from SGCManager parent class
 
@@ -806,6 +816,15 @@ class MentraLive : SGCManager() {
             return
         }
 
+        if (state == ConnTypes.DISCONNECTED) {
+            // A manufacturing serial is session-bound. Clear it on disconnect so a previous
+            // pair's serial can never be associated with the next connection. Connect must NOT
+            // clear it: DeviceManager.disconnect already wipes it before any new connection, and
+            // clearing on CONNECTED would wipe a still-valid serial mid-session when a same-link
+            // glasses_ready (e.g. ASG restart) re-publishes CONNECTED.
+            DeviceStore.apply("glasses", "serialNumber", "")
+        }
+
         // Actually update the connection state!
         DeviceStore.apply("glasses", "connectionState", state)
 
@@ -821,6 +840,10 @@ class MentraLive : SGCManager() {
             DeviceStore.apply("glasses", "appVersion", "")
             DeviceStore.apply("glasses", "besFirmwareVersion", "")
             DeviceStore.apply("glasses", "mtkFirmwareVersion", "")
+            // Modern ASG builds omit ota_version_url entirely (the phone owns manifest
+            // selection), and the chunked parser only writes present fields — clear it here so
+            // a URL reported by a previous build cannot leak into this session.
+            DeviceStore.apply("glasses", "otaVersionUrl", "")
             Bridge.log("LIVE: Cleared cached version_info fields for fresh session")
         }
 
@@ -1561,6 +1584,8 @@ class MentraLive : SGCManager() {
 
                             connectedDevice = null
                             glassesReady = false // Reset ready state on disconnect
+                            glassesSessionId = null // Fresh BLE session starts with no sid known
+                            readinessCompletedThisBleSession = false
 
                             // Reset audio pairing flags
                             glassesReadyReceived = false
@@ -1625,6 +1650,8 @@ class MentraLive : SGCManager() {
                         isConnected = false
                         isConnecting = false
                         glassesReady = false
+                        glassesSessionId = null
+                        readinessCompletedThisBleSession = false
                         glassesReadyReceived = false
                         audioConnected = false
 
@@ -3515,6 +3542,11 @@ class MentraLive : SGCManager() {
                 resetWireNegotiationState()
                 parsePeerWireCaps(json)
                 maybeSendWireHandshake()
+                // Record the session id BEFORE marking ready: an unsolicited glasses_ready
+                // already runs this full remote-reset flow, so recording (not re-triggering)
+                // is correct here; version_info detection covers the restart case.
+                json.optString("sid", "").takeIf { it.isNotEmpty() }?.let { glassesSessionId = it }
+                readinessCompletedThisBleSession = true
 
                 // Set the ready flag to stop any future readiness checks
                 glassesReady = true
@@ -3674,7 +3706,7 @@ class MentraLive : SGCManager() {
 
             "version_info" -> {
                 // Process version information from ASG client (legacy single-message format)
-                Bridge.log("LIVE: Received version info from ASG client: " + json.toString())
+                Bridge.log("LIVE: Received version info from ASG client")
 
                 // Extract version information
                 val appVersionLegacy = json.optString("app_version", "")
@@ -3684,6 +3716,7 @@ class MentraLive : SGCManager() {
                 val otaVersionUrlLegacy: String? = json.optString("ota_version_url", null)
                 val firmwareVersionLegacy = json.optString("firmware_version", "")
                 val btMacAddressLegacy = json.optString("bt_mac_address", "")
+                val serialNumberLegacy = json.optString("serial_number", "")
 
                 // Update parent SGCManager fields
                 DeviceStore.apply("glasses", "appVersion", appVersionLegacy)
@@ -3697,6 +3730,9 @@ class MentraLive : SGCManager() {
                 )
                 DeviceStore.apply("glasses", "firmwareVersion", firmwareVersionLegacy)
                 DeviceStore.apply("glasses", "bluetoothMacAddress", btMacAddressLegacy)
+                if (serialNumberLegacy.isNotBlank()) {
+                    DeviceStore.apply("glasses", "serialNumber", serialNumberLegacy)
+                }
 
                 val versionInfoLegacy = HashMap<String, Any>()
                 versionInfoLegacy["appVersion"] = appVersionLegacy
@@ -3878,7 +3914,7 @@ class MentraLive : SGCManager() {
             else -> {
                 // Flexible version_info parsing - handle any version_info* message
                 if (type.startsWith("version_info")) {
-                    Bridge.log("LIVE: Received " + type + ": " + json.toString())
+                    Bridge.log("LIVE: Received " + type)
 
                     // Extract all fields from JSON (except "type")
                     val fields = HashMap<String, Any>()
@@ -3965,6 +4001,10 @@ class MentraLive : SGCManager() {
                                 fields["bt_mac_address"] as String
                         )
                     }
+                    val serialNumber = fields["serial_number"] as? String
+                    if (!serialNumber.isNullOrBlank()) {
+                        DeviceStore.apply("glasses", "serialNumber", serialNumber)
+                    }
                     if (fields.containsKey("system_time_ms")) {
                         val v = fields["system_time_ms"]
                         if (v is Number) {
@@ -3981,6 +4021,7 @@ class MentraLive : SGCManager() {
                     // running them per chunk is safe.
                     parsePeerWireCaps(json)
                     maybeSendWireHandshake()
+                    handleGlassesSessionId(json)
 
                     Bridge.log("LIVE: Processed version_info fields and sent to RN")
                     Bridge.sendVersionInfo(fields)
@@ -4332,15 +4373,7 @@ class MentraLive : SGCManager() {
                             // The glassesReady flag is reset on disconnect/reconnect, so this won't
                             // prevent proper reconnection
                             if (!glassesReady) {
-                                Bridge.log(
-                                        "LIVE: 📱 Sending phone_ready to glasses - waiting for glasses_ready response"
-                                )
-                                val readyMsg = JSONObject()
-                                readyMsg.put("type", "phone_ready")
-                                readyMsg.put("timestamp", System.currentTimeMillis())
-
-                                // Send it through our data channel
-                                sendJson(readyMsg, true)
+                                sendPhoneReady("SOC ready")
                             } else {
                                 Bridge.log(
                                         "LIVE: ✅ Glasses already marked as ready, skipping phone_ready"
@@ -4421,6 +4454,8 @@ class MentraLive : SGCManager() {
                 updateConnectionState(ConnTypes.DISCONNECTED)
                 glassesReady = false
                 glassesReadyReceived = false
+                glassesSessionId = null
+                readinessCompletedThisBleSession = false
             }
             "sr_adota" -> {
                 // BES chip OTA progress — K900 path (serial busy during BES flash). Emit ota_status
@@ -5542,6 +5577,8 @@ class MentraLive : SGCManager() {
         mode: PhotoMode = PhotoMode.PHOTO,
         exposureTimeNs: Long?,
         durationMs: Int,
+        zsl: Boolean? = null,
+        mfnr: Boolean? = null,
     ) {
         Bridge.log(
                 "LIVE: warmUpCamera() entry — requestId=" +
@@ -5564,6 +5601,12 @@ class MentraLive : SGCManager() {
             if (exposureTimeNs != null && exposureTimeNs > 0L) {
                 json.put("exposureTimeNs", exposureTimeNs)
             }
+            if (mfnr != null) {
+                json.put("mfnr", mfnr)
+            }
+            if (zsl != null) {
+                json.put("zsl", zsl)
+            }
             json.put("durationMs", if (durationMs > 0) durationMs else 15000)
             sendJson(json, true)
         } catch (e: JSONException) {
@@ -7249,6 +7292,62 @@ class MentraLive : SGCManager() {
         wireHandshakeSentGeneration = -1
     }
 
+    /** Sends phone_ready to (re)start the glasses-driven readiness flow. */
+    private fun sendPhoneReady(reason: String) {
+        Bridge.log("LIVE: 📱 Sending phone_ready to glasses ($reason) - waiting for glasses_ready response")
+        val readyMsg = JSONObject()
+        readyMsg.put("type", "phone_ready")
+        readyMsg.put("timestamp", System.currentTimeMillis())
+        sendJson(readyMsg, true)
+    }
+
+    /**
+     * Tracks the glasses process session id (`sid`) and re-runs the phone-driven readiness
+     * flow when it changes under a live BLE link. The BES holds the link across asg_client
+     * restarts (APK OTA, crash recovery), so a restarted glasses process is invisible to
+     * transport state; the sid is the explicit protocol signal.
+     *
+     * Tri-state by design (retro-compat with pre-sid glasses builds):
+     * - no `sid` key: legacy glasses - do nothing, today's behavior;
+     * - sid appears where none was known on an ESTABLISHED session: the glasses just
+     *   updated from a pre-sid build and restarted - treat as a restart (this is the
+     *   upgrade OTA itself);
+     * - sid differs from the recorded one: the glasses restarted - treat as a restart;
+     * - same sid: same process, no action.
+     *
+     * A restart is handled as a LOGICAL session reset: send phone_ready immediately
+     * (instead of waiting for the next sr_hrt heartbeat, and bypassing its stale
+     * glassesReady suppression); the returning glasses_ready runs the full existing
+     * remote-wire-reset flow. glassesReady/fullyBooted are deliberately left untouched -
+     * the physical link never dropped, so the connection UI must not flap. The RN layer
+     * is notified so the OTA coordinator can treat it as its reconnect edge.
+     */
+    private fun handleGlassesSessionId(json: JSONObject) {
+        val sid = json.optString("sid", "")
+        if (sid.isEmpty()) return
+        val previous = glassesSessionId
+        if (sid == previous) return
+        glassesSessionId = sid
+        if (previous == null && !readinessCompletedThisBleSession) {
+            // First sid of a fresh BLE session before readiness completes: the normal
+            // pairing/readiness flow is already running - just record it.
+            return
+        }
+        Bridge.log(
+                "LIVE: 🔁 Glasses session changed (${previous ?: "<pre-sid build>"} -> $sid) - " +
+                        "asg restarted under a live link, re-running readiness"
+        )
+        sendPhoneReady("glasses session changed")
+        try {
+            val payload = HashMap<String, Any>()
+            payload["previous_sid"] = previous ?: ""
+            payload["sid"] = sid
+            Bridge.sendTypedMessage("glasses_session_changed", payload)
+        } catch (e: Exception) {
+            Log.e(TAG, "Error emitting glasses_session_changed", e)
+        }
+    }
+
     private fun parsePeerWireCaps(json: JSONObject) {
         val caps = json.optJSONObject("wire_caps") ?: return
         if (caps.optBoolean("k900_le", false)) {
@@ -8887,6 +8986,9 @@ class MentraLive : SGCManager() {
 
         // Send glasses-side Voice Activity Detection setting.
         sendVoiceActivityDetectionSetting()
+
+        // Send glasses-side loudness / Barrier gate setting.
+        sendLoudnessGateSetting()
     }
 
     override fun sendVoiceActivityDetectionSetting() {
@@ -8929,11 +9031,56 @@ class MentraLive : SGCManager() {
         }
     }
 
+    override fun sendLoudnessGateSetting() {
+        val value = DeviceStore.get("bluetooth", "loudness_gate_enabled")
+        val enabled =
+                if (value is Boolean) value
+                else BluetoothSdkDefaults.LOUDNESS_GATE_ENABLED
+
+        Bridge.log("LIVE: 🎚️ Sending loudness/Barrier gate setting to glasses: " + enabled)
+
+        if (!isConnected) {
+            Bridge.log("LIVE: Cannot send loudness gate setting - not connected")
+            return
+        }
+
+        try {
+            val body = JSONObject()
+            body.put("type", LOUDNESS_GATE_SWITCH_TYPE)
+            body.put("switch", if (enabled) 1 else 0)
+
+            val cmdObject = JSONObject()
+            cmdObject.put("C", "cs_swit")
+            cmdObject.put("V", 1)
+            cmdObject.put("B", body.toString())
+
+            val packedData =
+                    K900ProtocolUtils.packDataToK900(
+                            cmdObject.toString().toByteArray(StandardCharsets.UTF_8),
+                            K900ProtocolUtils.CMD_TYPE_STRING,
+                            k900LengthEndian()
+                    )
+            if (packedData == null) {
+                Bridge.log("LIVE: Failed to pack loudness gate setting command")
+                return
+            }
+            queueData(packedData)
+        } catch (e: JSONException) {
+            Log.e(TAG, "Error creating loudness gate setting command", e)
+        }
+    }
+
     /** Send button photo settings to glasses, replaying all stored scan-tuning fields. */
     override fun sendButtonPhotoSettings() {
+        val legacyZslMfnr =
+            DeviceStore.get(ObservableStore.BLUETOOTH_CATEGORY, "button_photo_zsl_mfnr") as Boolean?
         val size = DeviceStore.get(ObservableStore.BLUETOOTH_CATEGORY, "button_photo_size") as String?
-        val mfnr = DeviceStore.get(ObservableStore.BLUETOOTH_CATEGORY, "button_photo_mfnr") as Boolean?
-        val zsl = DeviceStore.get(ObservableStore.BLUETOOTH_CATEGORY, "button_photo_zsl") as Boolean?
+        val mfnr =
+            (DeviceStore.get(ObservableStore.BLUETOOTH_CATEGORY, "button_photo_mfnr") as Boolean?)
+                ?: legacyZslMfnr
+        val zsl =
+            (DeviceStore.get(ObservableStore.BLUETOOTH_CATEGORY, "button_photo_zsl") as Boolean?)
+                ?: legacyZslMfnr
         val noiseReduction = DeviceStore.get(ObservableStore.BLUETOOTH_CATEGORY, "button_photo_noise_reduction") as Boolean?
         val edgeEnhancement = DeviceStore.get(ObservableStore.BLUETOOTH_CATEGORY, "button_photo_edge_enhancement") as Boolean?
         val ispDigitalGain = DeviceStore.get(ObservableStore.BLUETOOTH_CATEGORY, "button_photo_isp_digital_gain") as Int?
@@ -8950,7 +9097,7 @@ class MentraLive : SGCManager() {
 
     /** Send camera FOV setting to glasses (K900 / Mentra Live). */
     override fun sendCameraFovSetting() {
-        var fov = 102
+        var fov = 118
         var roiPosition = 0
         try {
             val raw = DeviceStore.get("bluetooth", "camera_fov")

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

@@ -321,6 +321,9 @@ abstract class SGCManager {
     // Voice Activity Detection
     open fun sendVoiceActivityDetectionSetting() {}
 
+    // Mentra Live center-mic loudness / Barrier gate
+    open fun sendLoudnessGateSetting() {}
+
     // Start/stop LC3 audio playback from glasses based on the nex_lc3_audio_playback flag.
     open fun applyNexAudioPlaybackSetting() {}