@mentra/bluetooth-sdk 0.1.21-beta.3 → 0.1.21-beta.5

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

@@ -948,15 +948,20 @@ class DeviceManager {
 
         when (currentViewState.layoutType) {
             "text_wall" -> {
-                sgc?.sendTextWall(currentViewState.text)
+                sgc?.sendTextWall(parsePlaceholders(currentViewState.text))
             }
 
             "double_text_wall" -> {
-                sgc?.sendDoubleTextWall(currentViewState.topText, currentViewState.bottomText)
+                sgc?.sendDoubleTextWall(
+                    parsePlaceholders(currentViewState.topText),
+                    parsePlaceholders(currentViewState.bottomText)
+                )
             }
 
             "reference_card" -> {
-                sgc?.sendTextWall("${currentViewState.title}\n\n${currentViewState.text}")
+                val title = parsePlaceholders(currentViewState.title)
+                val text = parsePlaceholders(currentViewState.text)
+                sgc?.sendTextWall("$title\n\n$text")
             }
 
             "bitmap_view" -> {
@@ -973,7 +978,7 @@ class DeviceManager {
 
             "positioned_text" -> {
                 sgc?.sendPositionedText(
-                    currentViewState.text,
+                    parsePlaceholders(currentViewState.text),
                     currentViewState.bmpX ?: 0,
                     currentViewState.bmpY ?: 0,
                     currentViewState.bmpWidth ?: 576,
@@ -994,6 +999,8 @@ class DeviceManager {
     }
 
     private fun parsePlaceholders(text: String): String {
+        if (!text.contains('$')) return text
+
         val dateFormatter = SimpleDateFormat("M/dd, h:mm", Locale.getDefault())
         val formattedDate = dateFormatter.format(Date())
 

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

@@ -0,0 +1,49 @@
+package com.mentra.bluetoothsdk.sgcs
+
+import java.util.Locale
+
+/**
+ * Temporarily suppresses phone heartbeats while BES OTA owns the ASG-to-BES UART.
+ *
+ * The lease is renewable so a lost terminal status cannot disable heartbeats permanently. It is
+ * deliberately longer than ASG's 30-second BES response watchdog: after the lease expires, the
+ * raw transfer has already completed or failed and ordinary UART liveness traffic is safe again.
+ */
+internal class BesOtaHeartbeatGuard(
+    private val leaseDurationMs: Long = DEFAULT_LEASE_DURATION_MS,
+) {
+    @Volatile private var suppressionDeadlineMs = 0L
+
+    init {
+        require(leaseDurationMs > 0) { "leaseDurationMs must be positive" }
+    }
+
+    fun refresh(nowMs: Long) {
+        suppressionDeadlineMs =
+            if (nowMs > Long.MAX_VALUE - leaseDurationMs) Long.MAX_VALUE
+            else nowMs + leaseDurationMs
+    }
+
+    fun clear() {
+        suppressionDeadlineMs = 0L
+    }
+
+    fun observeOtaStatus(stepType: String, phase: String, status: String, nowMs: Long) {
+        if (!stepType.equals("bes", ignoreCase = true) ||
+            !phase.equals("install", ignoreCase = true)
+        ) {
+            return
+        }
+
+        when (status.lowercase(Locale.US)) {
+            "failed", "complete", "step_complete", "finished", "success" -> clear()
+            else -> refresh(nowMs)
+        }
+    }
+
+    fun shouldSuppress(nowMs: Long): Boolean = nowMs < suppressionDeadlineMs
+
+    companion object {
+        internal const val DEFAULT_LEASE_DURATION_MS = 120_000L
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.mentra.bluetoothsdk.sgcs
+
+internal data class BesOtaProgressMapping(
+    val status: String,
+    val progress: Int,
+    val errorMessage: String? = null,
+)
+
+/** Map the BES sr_adota protocol without inferring terminal state from transfer progress. */
+internal fun mapBesOtaProgress(
+    type: String,
+    rawProgress: Int,
+    message: String?,
+): BesOtaProgressMapping {
+    val roundedProgress = (((rawProgress.coerceIn(0, 100) + 2) / 5) * 5).coerceAtMost(100)
+    return when {
+        type == "success" -> BesOtaProgressMapping("FINISHED", 100)
+        type == "error" || type == "fail" ->
+            BesOtaProgressMapping(
+                "FAILED",
+                roundedProgress,
+                message?.takeIf { it.isNotBlank() } ?: "BES update failed",
+            )
+        // A raw update:100 is emitted before whole-image CRC/apply and is not terminal.
+        else -> BesOtaProgressMapping("PROGRESS", minOf(roundedProgress, 95))
+    }
+}