@mentra/bluetooth-sdk 0.1.14 → 0.1.17

package/ios/BluetoothSdkModule.swift

@@ -31,6 +31,7 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
             "hotspot_error",
             "photo_response",
             "photo_status",
+            "camera_status",
             "video_recording_status",
             "media_success",
             "media_error",
@@ -58,7 +59,6 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
             "stream_status",
             "keep_alive_ack",
             "mtk_update_complete",
-            "ota_update_available",
             "ota_progress",
             "ota_start_ack",
             "ota_status",
@@ -154,7 +154,7 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
         AsyncFunction("connectWithOptions") { (device: [String: Any], options: [String: Any]) in
             try await MainActor.run {
                 guard let target = Device(dictionary: device) else {
-                    throw BluetoothError(
+                    throw BluetoothSdkError(
                         code: "invalid_device",
                         message: "connect requires a Device with model and name."
                     )
@@ -303,7 +303,7 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
                   timestampMs >= Double(Int64.min),
                   timestampMs <= maxTimestamp
             else {
-                throw BluetoothError(
+                throw BluetoothSdkError(
                     code: "invalid_timestamp",
                     message: "setSystemTime timestampMs must be a finite Int64 millisecond timestamp."
                 )
@@ -350,6 +350,11 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
             return try await sdk.setCameraFov(CameraFov(fov: value, roiPosition: roiPosition)).values
         }
 
+        AsyncFunction("setCameraTuningConfig") { (anrOn: Bool, gainOn: Bool) in
+            let sdk = await MainActor.run { self.bluetoothSdk() }
+            return try await sdk.setCameraTuningConfig(anrOn: anrOn, gainOn: gainOn).values
+        }
+
         AsyncFunction("queryGalleryStatus") {
             let sdk = await MainActor.run { self.bluetoothSdk() }
             return try await sdk.queryGalleryStatus().values
@@ -358,13 +363,41 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
         AsyncFunction("requestPhoto") { (params: [String: Any]) in
             let req = PhotoRequest.from(params: params)
             Bridge.log(
-                "NATIVE: PHOTO PIPELINE [3/6] BluetoothSdk.requestPhoto requestId=\(req.requestId) appId=\(req.appId) size=\(req.size.rawValue) compress=\(req.compress?.rawValue ?? "none") aeDivisor=\(req.aeExposureDivisor.map { String($0) } ?? "nil")"
+                "NATIVE: PHOTO PIPELINE [3/6] BluetoothSdk.requestPhoto requestId=\(req.requestId) size=\(req.size.rawValue) compress=\(req.compress?.rawValue ?? "none") aeDivisor=\(req.aeExposureDivisor.map { String($0) } ?? "nil")"
             )
 
             let sdk = await MainActor.run { self.bluetoothSdk() }
             return try await sdk.requestPhoto(req).values
         }
 
+        AsyncFunction("warmUpCamera") { (params: [String: Any]) in
+            let requestId = params["requestId"] as? String
+            let sizeRaw = params["size"] as? String ?? "medium"
+            let size = PhotoSize(normalizedRawValue: sizeRaw)
+            let exposureTimeNs: Double?
+            switch params["exposureTimeNs"] {
+            case let value as Double:
+                exposureTimeNs = value.isFinite && value > 0 ? value : nil
+            case let value as Int:
+                exposureTimeNs = value > 0 ? Double(value) : nil
+            case let value as NSNumber:
+                let d = value.doubleValue
+                exposureTimeNs = d.isFinite && d > 0 ? d : nil
+            default:
+                exposureTimeNs = nil
+            }
+            let durationRaw = intValue(params["durationMs"]) ?? 0
+            let durationMs = durationRaw > 0 ? durationRaw : 15000
+
+            let sdk = await MainActor.run { self.bluetoothSdk() }
+            return try await sdk.warmUpCamera(
+                requestId: requestId,
+                size: size,
+                exposureTimeNs: exposureTimeNs,
+                durationMs: durationMs
+            ).values
+        }
+
         // MARK: - OTA Commands
 
         Function("setOtaVersionUrl") { (otaVersionUrl: String) in
@@ -399,11 +432,6 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
             return try await sdk.sendOtaQueryStatus().values
         }
 
-        AsyncFunction("retryOtaVersionCheck") {
-            let sdk = await MainActor.run { self.bluetoothSdk() }
-            return try await sdk.retryOtaVersionCheck().values
-        }
-
         // MARK: - Version Info Commands
 
         AsyncFunction("requestVersionInfo") {
@@ -689,6 +717,8 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
             sendEvent("photo_response", response.values)
         case let .photoStatus(status):
             sendEvent("photo_status", status.values)
+        case let .cameraStatus(status):
+            sendEvent("camera_status", status.values)
         case let .videoRecordingStatus(status):
             sendEvent("video_recording_status", status.values)
         case let .mediaUpload(event):
@@ -699,8 +729,6 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
             sendEvent("stream_status", status.values)
         case let .keepAliveAck(ack):
             sendEvent("keep_alive_ack", ack.values)
-        case let .otaUpdateAvailable(event):
-            sendEvent("ota_update_available", event.values)
         case let .otaStartAck(event):
             sendEvent("ota_start_ack", event.values)
         case let .otaStatus(event):
@@ -743,7 +771,7 @@ public class BluetoothSdkModule: Module, MentraBluetoothSDKDelegate {
     }
 
     @MainActor
-    public func mentraBluetoothSDK(_: MentraBluetoothSDK, didFail error: BluetoothError) {
+    public func mentraBluetoothSDK(_: MentraBluetoothSDK, didFail error: BluetoothSdkError) {
         sendEvent("pair_failure", ["error": error.message])
     }
 }

package/ios/Source/BluetoothSdkDefaults.swift

@@ -3,45 +3,19 @@ import Foundation
 /// Defaults for the public Bluetooth SDK surface.
 enum BluetoothSdkDefaults {
     static var sdkVersion: String? {
-        #if SWIFT_PACKAGE
-            normalizedSdkVersion(swiftPackageSdkVersion)
-        #else
-            packageVersion(from: sdkBundle)
-        #endif
+        normalizedSdkVersion(swiftPackageSdkVersion)
     }
 
     static let voiceActivityDetectionEnabled = false
-    private static let swiftPackageSdkVersion = "__MENTRA_BLUETOOTH_SDK_VERSION__"
+    private static let swiftPackageSdkVersion = "0.1.17"
     private static let swiftPackageSdkVersionPlaceholder = "__MENTRA" + "_BLUETOOTH_SDK_VERSION__"
 
-    private static var sdkBundle: Bundle {
-        #if SWIFT_PACKAGE
-            Bundle.module
-        #else
-            Bundle(for: BluetoothSdkBundleToken.self)
-        #endif
-    }
-
-    private static func packageVersion(from bundle: Bundle) -> String? {
-        let version = bundle.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String
-        let build = bundle.object(forInfoDictionaryKey: "CFBundleVersion") as? String
-
-        for candidate in [version, build] {
-            if let sdkVersion = normalizedSdkVersion(candidate) {
-                return sdkVersion
-            }
-        }
-
-        return nil
-    }
-
     private static func normalizedSdkVersion(_ value: String?) -> String? {
         guard let value else {
             return nil
         }
         let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
         guard !trimmed.isEmpty,
-              trimmed != "1.0",
               trimmed != swiftPackageSdkVersionPlaceholder
         else {
             return nil
@@ -49,5 +23,3 @@ enum BluetoothSdkDefaults {
         return trimmed
     }
 }
-
-private final class BluetoothSdkBundleToken {}

package/ios/Source/Bridge.swift

@@ -347,6 +347,10 @@ class Bridge {
         Bridge.sendTypedMessage("photo_status", body: status)
     }
 
+    static func sendCameraStatus(_ status: [String: Any]) {
+        Bridge.sendTypedMessage("camera_status", body: status)
+    }
+
     static func sendPhotoResponse(_ response: [String: Any]) {
         Bridge.sendTypedMessage("photo_response", body: response)
     }
@@ -434,22 +438,6 @@ class Bridge {
         Bridge.sendTypedMessage("ota_start_ack", body: eventBody)
     }
 
-    /// Send OTA update available notification - glasses have detected an available update (background mode)
-    static func sendOtaUpdateAvailable(
-        versionCode: Int64,
-        versionName: String,
-        updates: [String],
-        totalSize: Int64
-    ) {
-        let eventBody: [String: Any] = [
-            "version_code": versionCode,
-            "version_name": versionName,
-            "updates": updates,
-            "total_size": totalSize,
-        ]
-        Bridge.sendTypedMessage("ota_update_available", body: eventBody)
-    }
-
     static func sendOtaStatus(
         sessionId: String,
         totalSteps: Int,

package/ios/Source/DeviceManager.swift

@@ -22,11 +22,14 @@ struct ViewState {
     var text: String
     var data: String?
     var animationData: [String: Any]?
-    // Optional bitmap_view container position/size (used by G2; ignored by others)
-    var bmpX: Int32?
-    var bmpY: Int32?
-    var bmpWidth: Int32?
-    var bmpHeight: Int32?
+    // Optional container position/size — used by bitmap_view and positioned_text (G2; ignored by others)
+    var bmpX: Int32? = nil
+    var bmpY: Int32? = nil
+    var bmpWidth: Int32? = nil
+    var bmpHeight: Int32? = nil
+    // Optional positioned_text border (used by G2; ignored by others)
+    var borderWidth: Int32? = nil
+    var borderRadius: Int32? = nil
 }
 
 @MainActor
@@ -620,6 +623,8 @@ struct ViewState {
             sgc = G2()
         } else if wearable.contains(DeviceTypes.LIVE) {
             sgc = MentraLive()
+        } else if wearable.contains(DeviceTypes.NIMO) {
+            sgc = Nimo()
         } else if wearable.contains(DeviceTypes.FRAME) {
             // sgc = FrameManager()
         }
@@ -714,6 +719,19 @@ struct ViewState {
                     width: currentViewState.bmpWidth,
                     height: currentViewState.bmpHeight
                 )
+            case "positioned_text":
+                Bridge.log(
+                    "MAN: positioned_text → text='\(currentViewState.text)' rect=\(currentViewState.bmpX ?? 0),\(currentViewState.bmpY ?? 0) \(currentViewState.bmpWidth ?? 576)x\(currentViewState.bmpHeight ?? 288)"
+                )
+                await sgc?.sendPositionedText(
+                    currentViewState.text,
+                    x: currentViewState.bmpX ?? 0,
+                    y: currentViewState.bmpY ?? 0,
+                    width: currentViewState.bmpWidth ?? 576,
+                    height: currentViewState.bmpHeight ?? 288,
+                    borderWidth: currentViewState.borderWidth ?? 0,
+                    borderRadius: currentViewState.borderRadius ?? 0
+                )
             case "clear_view":
                 sgc?.clearDisplay()
             default:
@@ -1039,6 +1057,8 @@ struct ViewState {
         let bmpY = (layout["y"] as? NSNumber).map { $0.int32Value }
         let bmpWidth = (layout["width"] as? NSNumber).map { $0.int32Value }
         let bmpHeight = (layout["height"] as? NSNumber).map { $0.int32Value }
+        let borderWidth = (layout["borderWidth"] as? NSNumber).map { $0.int32Value }
+        let borderRadius = (layout["borderRadius"] as? NSNumber).map { $0.int32Value }
 
         text = parsePlaceholders(text)
         topText = parsePlaceholders(topText)
@@ -1048,7 +1068,8 @@ struct ViewState {
         var newViewState = ViewState(
             topText: topText, bottomText: bottomText, title: title, layoutType: layoutType,
             text: text, data: data, animationData: nil,
-            bmpX: bmpX, bmpY: bmpY, bmpWidth: bmpWidth, bmpHeight: bmpHeight
+            bmpX: bmpX, bmpY: bmpY, bmpWidth: bmpWidth, bmpHeight: bmpHeight,
+            borderWidth: borderWidth, borderRadius: borderRadius
         )
 
         if layoutType == "bitmap_animation" {
@@ -1069,6 +1090,27 @@ struct ViewState {
             }
         }
 
+        // positioned_text is a sticky overlay container (e.g. the nav trip-stats
+        // label) that lives ALONGSIDE the main view. It must NOT flow through the
+        // single replaceable viewState[stateIndex] — otherwise the constantly-
+        // refreshing main text_wall (maneuver text) and the minimap bitmap_view
+        // overwrite it every frame and it never renders. Route it straight to the
+        // SGC, which keeps its own persistent text container for that rect.
+        if layoutType == "positioned_text" {
+            Bridge.log(
+                "MAN: positioned_text (sticky) → text='\(text)' rect=\(bmpX ?? 0),\(bmpY ?? 0) \(bmpWidth ?? 576)x\(bmpHeight ?? 288)"
+            )
+            Task { [weak self] in
+                await self?.sgc?.sendPositionedText(
+                    text,
+                    x: bmpX ?? 0, y: bmpY ?? 0,
+                    width: bmpWidth ?? 576, height: bmpHeight ?? 288,
+                    borderWidth: borderWidth ?? 0, borderRadius: borderRadius ?? 0
+                )
+            }
+            return
+        }
+
         let cS = viewStates[stateIndex]
         let nS = newViewState
         let currentState =
@@ -1180,7 +1222,7 @@ struct ViewState {
 
     private func liveSgc() throws -> MentraLive {
         guard let live = sgc as? MentraLive else {
-            throw BluetoothError(code: "unsupported_device", message: "This command requires Mentra Live glasses.")
+            throw BluetoothSdkError(code: "unsupported_device", message: "This command requires Mentra Live glasses.")
         }
         return live
     }
@@ -1212,9 +1254,28 @@ struct ViewState {
         try liveSgc().sendCameraFovSetting(requestId: requestId, fov: fov, roiPosition: roiPosition)
     }
 
-    func retryOtaVersionCheck() {
-        Bridge.log("MAN: ⏰ Retrying glasses OTA version check after clock sync")
-        (sgc as? MentraLive)?.sendOtaRetryVersionCheck()
+    func sendCameraTuningConfig(requestId: String, anrOn: Bool, gainOn: Bool) throws {
+        try liveSgc().sendCameraTuningConfig(requestId: requestId, anrOn: anrOn, gainOn: gainOn)
+    }
+
+    func warmUpCamera(
+        requestId: String,
+        size: PhotoSize,
+        exposureTimeNs: Double?,
+        durationMs: Int
+    ) throws {
+        guard let live = sgc as? MentraLive else {
+            // Fail fast like other camera commands so the SDK promise rejects immediately instead
+            // of hanging until the request timeout with no camera_status.
+            throw BluetoothSdkError(
+                code: "unsupported_device", message: "This command requires Mentra Live glasses.")
+        }
+        live.warmUpCamera(
+            requestId: requestId,
+            size: size,
+            exposureTimeNs: exposureTimeNs,
+            durationMs: durationMs
+        )
     }
 
     /// Request version info from glasses.
@@ -1324,7 +1385,6 @@ struct ViewState {
         let manualIso = manualExposureNs != nil ? request.iso.flatMap { $0 > 0 ? $0 : nil } : nil
         let routed = PhotoRequest(
             requestId: request.requestId,
-            appId: request.appId,
             size: request.size,
             webhookUrl: request.webhookUrl,
             authToken: request.authToken,
@@ -1343,7 +1403,7 @@ struct ViewState {
             ispAnalogGain: request.ispAnalogGain
         )
         Bridge.log(
-            "MAN: PHOTO PIPELINE [4/6] DeviceManager.requestPhoto requestId=\(routed.requestId) appId=\(routed.appId) webhookUrl=\(routed.webhookUrl ?? "nil") size=\(routed.size.rawValue) compress=\(routed.compress?.rawValue ?? "none") save=\(routed.save) sound=\(routed.sound) exposureTimeNs=\(manualExposureNs.map { String($0) } ?? "nil") iso=\(manualIso.map { String($0) } ?? "auto") aeDivisor=\(routed.aeExposureDivisor.map { String($0) } ?? "nil") isoCap=\(routed.isoCap.map { String($0) } ?? "nil") sgc=\(sgc != nil ? String(describing: type(of: sgc!)) : "null")"
+            "MAN: PHOTO PIPELINE [4/6] DeviceManager.requestPhoto requestId=\(routed.requestId) webhookUrl=\(routed.webhookUrl ?? "nil") size=\(routed.size.rawValue) compress=\(routed.compress?.rawValue ?? "none") save=\(routed.save) sound=\(routed.sound) exposureTimeNs=\(manualExposureNs.map { String($0) } ?? "nil") iso=\(manualIso.map { String($0) } ?? "auto") aeDivisor=\(routed.aeExposureDivisor.map { String($0) } ?? "nil") isoCap=\(routed.isoCap.map { String($0) } ?? "nil") sgc=\(sgc != nil ? String(describing: type(of: sgc!)) : "null")"
         )
         guard let sgc else {
             Bridge.log(