@mentra/bluetooth-sdk 0.1.14 → 0.1.17

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

@@ -1614,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)