@mentra/bluetooth-sdk 0.1.13 → 0.1.16

package/android/src/main/java/com/mentra/bluetoothsdk/camera/CameraModels.kt

@@ -1,6 +1,13 @@
 package com.mentra.bluetoothsdk
 
 import org.json.JSONObject
+import java.util.UUID
+
+internal fun generatedCameraRequestId(prefix: String): String =
+    "$prefix-${System.currentTimeMillis()}-${UUID.randomUUID().toString().take(8)}"
+
+internal fun nonBlankRequestId(requestId: String?): String? =
+    requestId?.trim()?.takeIf { it.isNotEmpty() }
 
 enum class PhotoSize(val value: String) {
     LOW("low"),
@@ -56,8 +63,8 @@ enum class PhotoCompression(val value: String) {
     }
 }
 
-data class ButtonPhotoSettings(
-    val size: ButtonPhotoSize? = null,
+data class PhotoCaptureDefaults(
+    val size: PhotoSize? = null,
     val mfnr: Boolean? = null,
     val zsl: Boolean? = null,
     val noiseReduction: Boolean? = null,
@@ -71,7 +78,7 @@ data class ButtonPhotoSettings(
     val resetCaptureTuning: Boolean = false,
 )
 
-data class ButtonVideoRecordingSettings(
+data class VideoRecordingDefaults(
     val width: Int,
     val height: Int,
     val fps: Int,
@@ -138,13 +145,13 @@ data class CameraFovResult(
             fallback: CameraFov,
         ): CameraFovResult {
             if (ack.status == "error") {
-                throw BluetoothException(
+                throw BluetoothSdkException(
                     ack.errorCode ?: "camera_fov_failed",
                     ack.errorMessage ?: "Camera FOV request failed.",
                 )
             }
             if (!ack.hardwareApplied) {
-                throw BluetoothException(
+                throw BluetoothSdkException(
                     "camera_fov_not_applied",
                     "Camera FOV was saved but not applied to hardware.",
                 )
@@ -161,13 +168,11 @@ data class CameraFovResult(
 }
 
 data class PhotoRequest @JvmOverloads constructor(
-    val requestId: String,
-    val appId: String,
+    val requestId: String = generatedCameraRequestId("photo"),
     val size: PhotoSize,
     val webhookUrl: String,
     val authToken: String? = null,
     val compress: PhotoCompression = PhotoCompression.MEDIUM,
-    val flash: Boolean = true,
     val save: Boolean = false,
     val sound: Boolean = true,
     /** Sensor exposure time for this capture only (ns), or null for auto exposure */
@@ -212,13 +217,12 @@ data class PhotoRequest @JvmOverloads constructor(
             val ispAnalogGain = stringValue(values, "ispAnalogGain")
 
             return PhotoRequest(
-                requestId = stringValue(values, "requestId", "request_id").orEmpty(),
-                appId = stringValue(values, "appId", "app_id").orEmpty(),
+                requestId = nonBlankRequestId(stringValue(values, "requestId", "request_id"))
+                    ?: generatedCameraRequestId("photo"),
                 size = PhotoSize.fromValue(stringValue(values, "size") ?: "medium"),
                 webhookUrl = stringValue(values, "webhookUrl", "webhook_url").orEmpty(),
                 authToken = stringValue(values, "authToken", "auth_token")?.takeIf { it.isNotBlank() },
                 compress = PhotoCompression.fromValue(stringValue(values, "compress") ?: "none"),
-                flash = boolValue(values, "flash") ?: true,
                 save = boolValue(values, "save", "saveToGallery") ?: false,
                 sound = boolValue(values, "sound") ?: true,
                 exposureTimeNs = exposureTimeNs,
@@ -441,3 +445,13 @@ data class PhotoStatusEvent(
     val errorCode: String? get() = stringValue(values, "errorCode")
     val errorMessage: String? get() = stringValue(values, "errorMessage")
 }
+
+data class CameraStatusEvent(
+    val values: Map<String, Any>,
+) {
+    val requestId: String get() = stringValue(values, "requestId").orEmpty()
+    val state: String get() = stringValue(values, "state").orEmpty()
+    val timestamp: Long get() = longValue(values, "timestamp") ?: System.currentTimeMillis()
+    val errorCode: String? get() = stringValue(values, "errorCode")
+    val errorMessage: String? get() = stringValue(values, "errorMessage")
+}

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

@@ -20,14 +20,13 @@ abstract class ControllerManager {
     abstract fun startStream(message: Map<String, Any>)
     abstract fun stopStream()
     abstract fun sendStreamKeepAlive(message: Map<String, Any>)
-    abstract fun startVideoRecording(requestId: String, save: Boolean, flash: Boolean, sound: Boolean)
+    abstract fun startVideoRecording(requestId: String, save: Boolean, sound: Boolean)
     abstract fun stopVideoRecording(requestId: String)
 
     // Button Settings
     abstract fun sendButtonPhotoSettings()
     abstract fun sendButtonVideoRecordingSettings()
     abstract fun sendButtonMaxRecordingTime()
-    abstract fun sendButtonCameraLedSetting()
 
     // Display Control
     abstract fun setBrightness(level: Int, autoMode: Boolean)

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

@@ -863,7 +863,7 @@ class R1 : ControllerManager() {
     override fun sortMicRanking(list: MutableList<String>): MutableList<String> = list
     override fun sendJson(jsonOriginal: Map<String, Any>, wakeUp: Boolean, requireAck: Boolean) {}
     override fun requestPhoto(request: PhotoRequest) {}
-    override fun startVideoRecording(requestId: String, save: Boolean, flash: Boolean, sound: Boolean) {}
+    override fun startVideoRecording(requestId: String, save: Boolean, sound: Boolean) {}
     override fun stopVideoRecording(requestId: String) {}
     override fun startStream(message: Map<String, Any>) {}
     override fun stopStream() {}
@@ -871,7 +871,6 @@ class R1 : ControllerManager() {
     override fun sendButtonPhotoSettings() {}
     override fun sendButtonVideoRecordingSettings() {}
     override fun sendButtonMaxRecordingTime() {}
-    override fun sendButtonCameraLedSetting() {}
     override fun setBrightness(level: Int, autoMode: Boolean) {}
     override fun clearDisplay() {}
     override fun sendTextWall(text: String) {}

package/android/src/main/java/com/mentra/bluetoothsdk/events/BluetoothEvents.kt

@@ -39,27 +39,6 @@ data class SpeakingStatusEvent(
     val values: Map<String, Any>,
 )
 
-data class OtaUpdateAvailableEvent(
-    val versionCode: Long?,
-    val versionName: String?,
-    val updates: List<String>,
-    val totalSize: Long?,
-    val cacheReady: Boolean?,
-    val values: Map<String, Any>,
-) {
-    companion object {
-        internal fun fromMap(values: Map<String, Any>): OtaUpdateAvailableEvent =
-            OtaUpdateAvailableEvent(
-                versionCode = longValue(values, "version_code"),
-                versionName = stringValue(values, "version_name"),
-                updates = (values["updates"] as? List<*>)?.filterIsInstance<String>() ?: emptyList(),
-                totalSize = longValue(values, "total_size"),
-                cacheReady = boolValue(values, "cache_ready"),
-                values = values,
-            )
-    }
-}
-
 data class OtaStartAckEvent(
     val timestamp: Long?,
     val values: Map<String, Any>,
@@ -153,12 +132,12 @@ interface MentraBluetoothSdkListener {
     fun onGalleryStatus(event: GalleryStatusEvent) {}
     fun onPhotoResponse(event: PhotoResponseEvent) {}
     fun onPhotoStatus(event: PhotoStatusEvent) {}
+    fun onCameraStatus(event: CameraStatusEvent) {}
     fun onVideoRecordingStatus(event: VideoRecordingStatusEvent) {}
     fun onMediaUpload(event: MediaUploadEvent) {}
     fun onRgbLedControlResponse(event: RgbLedControlResponseEvent) {}
     fun onStreamStatus(event: StreamStatusEvent) {}
     fun onKeepAliveAck(event: KeepAliveAckEvent) {}
-    fun onOtaUpdateAvailable(event: OtaUpdateAvailableEvent) {}
     fun onOtaStartAck(event: OtaStartAckEvent) {}
     fun onOtaStatus(event: OtaStatusEvent) {}
     fun onSettingsAck(event: SettingsAckEvent) {}

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

@@ -1584,7 +1584,7 @@ class G1 : SGCManager() {
 
     }
 
-    override fun startVideoRecording(requestId: String, save: Boolean, flash: Boolean, sound: Boolean) {
+    override fun startVideoRecording(requestId: String, save: Boolean, sound: Boolean) {
 
     }
 
@@ -1600,10 +1600,6 @@ class G1 : SGCManager() {
 
     }
 
-    override fun sendButtonCameraLedSetting() {
-
-    }
-
     override fun sendCameraFovSetting() {
     }
 
@@ -1618,25 +1614,72 @@ class G1 : SGCManager() {
 
     override fun clearDisplay() {
         Bridge.log("G1: clearDisplay() - sending space")
-        sendTextWall(" ")
+        // Bypass the throttle (a clear must always land) and drop any pending caption so it can't
+        // overwrite the clear after the fact.
+        cancelPendingThrottledText()
+        displayTextWall(" ")
+    }
+
+    // G1-specific display throttle (300ms, last-wins) — see G1.swift. G1 firmware can't absorb
+    // rapid text-wall updates; coalesce to the latest within a 300ms window. Belongs in the G1 SGC
+    // (G1 hardware quirk); G2 deliberately does NOT throttle (it must show every caption). The
+    // trailing flush always sends the most recent text, so the final caption is never dropped —
+    // only intermediate frames within a window are coalesced.
+    private val textThrottleHandler = Handler(Looper.getMainLooper())
+    private var textThrottlePending: String? = null
+    private var textThrottleLastSent: Long = 0L
+    private var textThrottleScheduled = false
+    private val TEXT_THROTTLE_WINDOW_MS = 300L
+
+    /** Drop any pending throttled text-wall flush so it can't later overwrite a newer, non-text
+     *  display write (a clear, double-text-wall, or bitmap). The posted flush no-ops when
+     *  `textThrottlePending` is null. Called from every G1 display path that bypasses the throttle. */
+    private fun cancelPendingThrottledText() {
+        textThrottlePending = null
+    }
+
+    private fun throttledTextWall(text: String) {
+        val now = android.os.SystemClock.uptimeMillis()
+        val sinceLast = now - textThrottleLastSent
+        if (sinceLast >= TEXT_THROTTLE_WINDOW_MS) {
+            // Past the window — send now.
+            textThrottleLastSent = now
+            textThrottlePending = null
+            displayTextWall(text)
+        } else {
+            // Inside the window — keep only the latest and schedule one trailing flush.
+            textThrottlePending = text
+            if (!textThrottleScheduled) {
+                textThrottleScheduled = true
+                textThrottleHandler.postDelayed({
+                    textThrottleScheduled = false
+                    val pending = textThrottlePending ?: return@postDelayed
+                    textThrottlePending = null
+                    textThrottleLastSent = android.os.SystemClock.uptimeMillis()
+                    displayTextWall(pending)
+                }, TEXT_THROTTLE_WINDOW_MS - sinceLast)
+            }
+        }
     }
 
     override fun sendText(text: String) {
         Bridge.log("G1: sendText() - text: " + text)
-        displayTextWall(text)
+        throttledTextWall(text)
     }
 
     override fun sendTextWall(text: String) {
         // Bridge.log("G1: sendTextWall() - text: " + text);
-        displayTextWall(text)
+        throttledTextWall(text)
     }
 
     override fun sendDoubleTextWall(top: String, bottom: String) {
+        cancelPendingThrottledText() // a newer layout supersedes any pending caption text
         Bridge.log("G1: sendDoubleTextWall() - top: " + top + ", bottom: " + bottom)
         displayDoubleTextWall(top, bottom)
     }
 
     override fun displayBitmap(base64ImageData: String, x: Int?, y: Int?, width: Int?, height: Int?): Boolean {
+        cancelPendingThrottledText() // a bitmap supersedes any pending caption text
         try {
             // Decode base64 to byte array
             val bmpData = android.util.Base64.decode(base64ImageData, android.util.Base64.DEFAULT)