@mentra/bluetooth-sdk 0.1.12 → 0.1.13

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

@@ -1,5 +1,6 @@
 package com.mentra.bluetoothsdk.sgcs
 
+import com.mentra.bluetoothsdk.PhotoRequest
 import android.bluetooth.BluetoothAdapter
 import android.bluetooth.BluetoothGatt
 import android.bluetooth.BluetoothGattCallback
@@ -1838,10 +1839,18 @@ class G2 : SGCManager() {
 
     // ---------- SGCManager: Display Control ----------
 
+    override fun sendText(text: String) {
+        displayScope.launch {
+            displayMutex.withLock {
+                sendText2(text)
+            }
+        }
+    }
+
     override fun sendTextWall(text: String) {
         displayScope.launch {
             displayMutex.withLock {
-                sendText(
+                sendText2(
                         text,
                         x = defaultTextX,
                         y = defaultTextY,
@@ -1856,7 +1865,7 @@ class G2 : SGCManager() {
         }
     }
 
-    private suspend fun sendText(
+    private suspend fun sendText2(
             text: String,
             x: Int? = null,
             y: Int? = null,
@@ -1917,7 +1926,7 @@ class G2 : SGCManager() {
                     contentLength = container.content.toByteArray(Charsets.UTF_8).size,
                     content = container.content
             )
-            sendEvenHubCommand(msg)
+            queueEvenHubCommand(msg)
             return
         }
         container =
@@ -1955,13 +1964,7 @@ class G2 : SGCManager() {
                     imageContainers[i].bmpData = ByteArray(0)
                 }
                 // shutdown the page and then recreate the containers without the content.
-                // Reset pageCreated so the recreate below issues a fresh createPageMessage rather
-                // than a rebuildPageMessage that no longer matches the torn-down page.
-                val msg = EvenHubProto.shutdownMessage()
-                sendEvenHubCommand(msg)
-                pageCreated = false
-                createPageWithContainers()
-                restartMicIfAlreadyEnabled()
+                rebuildPage()
             }
         }
     }
@@ -2145,6 +2148,9 @@ class G2 : SGCManager() {
         //     sendEvenHubCommand(textMsg)
         //     delay(100)
         // }
+
+        delay(300) // 300ms to settle
+        restartMicIfAlreadyEnabled()
     }
 
     /**
@@ -2635,19 +2641,7 @@ class G2 : SGCManager() {
     }
 
     // Camera & Media - G2 has no camera
-    override fun requestPhoto(
-            requestId: String,
-            appId: String,
-            size: String,
-            webhookUrl: String?,
-            authToken: String?,
-            compress: String?,
-            flash: Boolean,
-            save: Boolean,
-            sound: Boolean,
-            exposureTimeNs: Long?,
-            iso: Int?,
-    ) {
+    override fun requestPhoto(request: PhotoRequest) {
         Bridge.log("G2: requestPhoto - not supported (no camera)")
     }
 
@@ -3552,6 +3546,9 @@ class G2 : SGCManager() {
         val reader = ProtobufReader(payload)
         val fields = reader.parseFields()
 
+        // print raw payload:
+        Bridge.log("G2: EvenHub response payload: ${payload.joinToString("") { String.format("%02X", it) }}")
+
         val cmdValue =
                 fields[1] as? Int
                         ?: run {