@mentra/bluetooth-sdk 0.1.12 → 0.1.13

package/ios/Source/camera/CameraModels.swift

@@ -1,17 +1,44 @@
 import Foundation
 
 public enum PhotoSize: String {
-    case small
+    case low
     case medium
-    case large
-    case full
+    case high
+    case max
+
+    public static func normalizeLegacy(_ value: String?) -> String {
+        switch value {
+        case "small":
+            return PhotoSize.low.rawValue
+        case "large":
+            return PhotoSize.high.rawValue
+        case "full":
+            return PhotoSize.max.rawValue
+        default:
+            return value ?? PhotoSize.medium.rawValue
+        }
+    }
+
+    public init(normalizedRawValue value: String?) {
+        let normalized = PhotoSize.normalizeLegacy(value)
+        self = PhotoSize(rawValue: normalized) ?? .medium
+    }
 }
 
 public enum ButtonPhotoSize: String {
-    case small
+    case low
     case medium
-    case large
+    case high
     case max
+
+    public static func normalizeLegacy(_ value: String?) -> String {
+        PhotoSize.normalizeLegacy(value)
+    }
+
+    public init(normalizedRawValue value: String?) {
+        let normalized = ButtonPhotoSize.normalizeLegacy(value)
+        self = ButtonPhotoSize(rawValue: normalized) ?? .medium
+    }
 }
 
 public enum PhotoCompression: String {
@@ -21,10 +48,66 @@ public enum PhotoCompression: String {
 }
 
 public struct ButtonPhotoSettings {
-    public let size: ButtonPhotoSize
+    public let size: ButtonPhotoSize?
+    public let mfnr: Bool?
+    public let zsl: Bool?
+    public let noiseReduction: Bool?
+    public let edgeEnhancement: Bool?
+    public let ispDigitalGain: Int?
+    public let ispAnalogGain: String?
+    public let aeExposureDivisor: Int?
+    public let isoCap: Int?
+    public let compress: String?
+    public let sound: Bool?
+    public let resetCaptureTuning: Bool?
 
-    public init(size: ButtonPhotoSize) {
+    public init(
+        size: ButtonPhotoSize?,
+        mfnr: Bool? = nil,
+        zsl: Bool? = nil,
+        noiseReduction: Bool? = nil,
+        edgeEnhancement: Bool? = nil,
+        ispDigitalGain: Int? = nil,
+        ispAnalogGain: String? = nil,
+        aeExposureDivisor: Int? = nil,
+        isoCap: Int? = nil,
+        compress: String? = nil,
+        sound: Bool? = nil,
+        resetCaptureTuning: Bool? = nil
+    ) {
         self.size = size
+        self.mfnr = mfnr
+        self.zsl = zsl
+        self.noiseReduction = noiseReduction
+        self.edgeEnhancement = edgeEnhancement
+        self.ispDigitalGain = ispDigitalGain
+        self.ispAnalogGain = ispAnalogGain
+        self.aeExposureDivisor = aeExposureDivisor
+        self.isoCap = isoCap
+        self.compress = compress
+        self.sound = sound
+        self.resetCaptureTuning = resetCaptureTuning
+    }
+
+    static func from(params: [String: Any]) -> ButtonPhotoSettings {
+        let size = (params["size"] as? String).map { ButtonPhotoSize(normalizedRawValue: $0) }
+        let aeExposureDivisor =
+            optionalIntValue(params, "aeExposureDivisor").flatMap { $0 > 1 ? $0 : nil }
+        let isoCap = optionalIntValue(params, "isoCap").flatMap { $0 > 0 ? $0 : nil }
+        return ButtonPhotoSettings(
+            size: size,
+            mfnr: optionalBoolValue(params, "mfnr"),
+            zsl: optionalBoolValue(params, "zsl"),
+            noiseReduction: optionalBoolValue(params, "noiseReduction"),
+            edgeEnhancement: optionalBoolValue(params, "edgeEnhancement"),
+            ispDigitalGain: optionalIntValue(params, "ispDigitalGain"),
+            ispAnalogGain: optionalStringValue(params, "ispAnalogGain"),
+            aeExposureDivisor: aeExposureDivisor,
+            isoCap: isoCap,
+            compress: optionalStringValue(params, "compress"),
+            sound: optionalBoolValue(params, "sound"),
+            resetCaptureTuning: optionalBoolValue(params, "resetCaptureTuning")
+        )
     }
 }
 
@@ -152,6 +235,14 @@ public struct PhotoRequest {
     public let exposureTimeNs: Double?
     /// Sensor ISO for this capture only. Only used when exposureTimeNs enables manual exposure.
     public let iso: Int?
+    public let aeExposureDivisor: Int?
+    public let isoCap: Int?
+    public let noiseReduction: Bool?
+    public let edgeEnhancement: Bool?
+    public let mfnr: Bool?
+    public let zsl: Bool?
+    public let ispDigitalGain: Int?
+    public let ispAnalogGain: String?
 
     public init(
         requestId: String,
@@ -164,7 +255,15 @@ public struct PhotoRequest {
         save: Bool = false,
         sound: Bool,
         exposureTimeNs: Double? = nil,
-        iso: Int? = nil
+        iso: Int? = nil,
+        aeExposureDivisor: Int? = nil,
+        isoCap: Int? = nil,
+        noiseReduction: Bool? = nil,
+        edgeEnhancement: Bool? = nil,
+        mfnr: Bool? = nil,
+        zsl: Bool? = nil,
+        ispDigitalGain: Int? = nil,
+        ispAnalogGain: String? = nil
     ) {
         self.requestId = requestId
         self.appId = appId
@@ -177,6 +276,117 @@ public struct PhotoRequest {
         self.sound = sound
         self.exposureTimeNs = exposureTimeNs
         self.iso = iso
+        self.aeExposureDivisor = aeExposureDivisor
+        self.isoCap = isoCap
+        self.noiseReduction = noiseReduction
+        self.edgeEnhancement = edgeEnhancement
+        self.mfnr = mfnr
+        self.zsl = zsl
+        self.ispDigitalGain = ispDigitalGain
+        self.ispAnalogGain = ispAnalogGain
+    }
+
+    public static func from(params: [String: Any]) -> PhotoRequest {
+        let sizeRaw = params["size"] as? String ?? "medium"
+        let compressRaw = params["compress"] as? String ?? "none"
+        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 iso: Int?
+        switch params["iso"] {
+        case let value as Int:
+            iso = value > 0 ? value : nil
+        case let value as Double:
+            iso = value.isFinite && value > 0 && value < Double(Int.max) ? Int(value) : nil
+        case let value as NSNumber:
+            let intValue = value.intValue
+            iso = intValue > 0 ? intValue : nil
+        default:
+            iso = nil
+        }
+        func optionalInt(_ key: String, min: Int = Int.min, filter: (Int) -> Bool = { _ in true }) -> Int? {
+            guard params.keys.contains(key) else { return nil }
+            switch params[key] {
+            case let value as Int:
+                return filter(value) ? value : nil
+            case let value as Double:
+                guard value.isFinite, value >= Double(min) else { return nil }
+                return filter(Int(value)) ? Int(value) : nil
+            case let value as NSNumber:
+                let intValue = value.intValue
+                return filter(intValue) ? intValue : nil
+            default:
+                return nil
+            }
+        }
+        func optionalBool(_ key: String) -> Bool? {
+            guard params.keys.contains(key) else { return nil }
+            return params[key] as? Bool
+        }
+
+        return PhotoRequest(
+            requestId: params["requestId"] as? String ?? "",
+            appId: params["appId"] as? String ?? "",
+            size: PhotoSize(normalizedRawValue: sizeRaw),
+            webhookUrl: params["webhookUrl"] as? String,
+            authToken: (params["authToken"] as? String)?.nilIfBlank,
+            compress: PhotoCompression(rawValue: compressRaw),
+            flash: params["flash"] as? Bool ?? true,
+            save: (params["save"] as? Bool) ?? (params["saveToGallery"] as? Bool) ?? false,
+            sound: params["sound"] as? Bool ?? true,
+            exposureTimeNs: exposureTimeNs,
+            iso: iso,
+            aeExposureDivisor: optionalInt("aeExposureDivisor", min: 2) { $0 > 1 },
+            isoCap: optionalInt("isoCap", min: 1) { $0 > 0 },
+            noiseReduction: optionalBool("noiseReduction"),
+            edgeEnhancement: optionalBool("edgeEnhancement"),
+            mfnr: optionalBool("mfnr"),
+            zsl: optionalBool("zsl"),
+            ispDigitalGain: optionalInt("ispDigitalGain"),
+            ispAnalogGain: params["ispAnalogGain"] as? String
+        )
+    }
+
+    func appendScanFields(to json: inout [String: Any]) {
+        if let aeExposureDivisor {
+            json["aeExposureDivisor"] = aeExposureDivisor
+        }
+        if let isoCap {
+            json["isoCap"] = isoCap
+        }
+        if let noiseReduction {
+            json["noiseReduction"] = noiseReduction
+        }
+        if let edgeEnhancement {
+            json["edgeEnhancement"] = edgeEnhancement
+        }
+        if let mfnr {
+            json["mfnr"] = mfnr
+        }
+        if let zsl {
+            json["zsl"] = zsl
+        }
+        if let ispDigitalGain {
+            json["ispDigitalGain"] = ispDigitalGain
+        }
+        if let ispAnalogGain {
+            json["ispAnalogGain"] = ispAnalogGain
+        }
+    }
+}
+
+private extension String {
+    var nilIfBlank: String? {
+        isEmpty ? nil : self
     }
 }
 

package/ios/Source/controllers/ControllerManager.swift

@@ -18,10 +18,7 @@ protocol ControllerManager {
 
     // MARK: - Camera & Media
 
-    func requestPhoto(
-        _ requestId: String, appId: String, size: String?, webhookUrl: String?, authToken: String?,
-        compress: String?, flash: Bool, save: Bool, sound: Bool, exposureTimeNs: Double?, iso: Int?
-    )
+    func requestPhoto(_ request: PhotoRequest)
     func startStream(_ message: [String: Any])
     func stopStream()
     func sendStreamKeepAlive(_ message: [String: Any])
@@ -75,7 +72,7 @@ protocol ControllerManager {
     func sendWifiCredentials(_ ssid: String, _ password: String)
     func forgetWifiNetwork(_ ssid: String)
     func sendHotspotState(_ enabled: Bool)
-    func sendOtaStart()
+    func sendOtaStart(otaVersionUrl: String?)
     func sendOtaQueryStatus()
 
     // MARK: - User Context (for crash reporting)

package/ios/Source/controllers/R1.swift

@@ -504,10 +504,7 @@ class R1: NSObject, ControllerManager {
     }
 
     func sendJson(_: [String: Any], wakeUp _: Bool, requireAck _: Bool) {}
-    func requestPhoto(
-        _: String, appId _: String, size _: String?, webhookUrl _: String?, authToken _: String?,
-        compress _: String?, flash _: Bool, save _: Bool, sound _: Bool, exposureTimeNs _: Double?, iso _: Int?
-    ) {}
+    func requestPhoto(_: PhotoRequest) {}
     func startVideoRecording(requestId _: String, save _: Bool, flash _: Bool, sound _: Bool) {}
     func stopVideoRecording(requestId _: String) {}
     func startStream(_: [String: Any]) {}
@@ -543,7 +540,7 @@ class R1: NSObject, ControllerManager {
     func sendWifiCredentials(_: String, _: String) {}
     func forgetWifiNetwork(_: String) {}
     func sendHotspotState(_: Bool) {}
-    func sendOtaStart() {}
+    func sendOtaStart(otaVersionUrl: String?) {}
     func sendOtaQueryStatus() {}
     func sendUserEmailToGlasses(_: String) {}
     func queryGalleryStatus() {}

package/ios/Source/sgcs/G1.swift

@@ -276,10 +276,7 @@ class G1: NSObject, SGCManager {
 
     func sendButtonMaxRecordingTime(_: Int) {}
 
-    func requestPhoto(
-        _: String, appId _: String, size _: String?, webhookUrl _: String?, authToken _: String?,
-        compress _: String?, flash _: Bool, save _: Bool, sound _: Bool, exposureTimeNs _: Double?, iso _: Int?
-    ) {}
+    func requestPhoto(_: PhotoRequest) {}
 
     func startStream(_: [String: Any]) {}
 
@@ -317,7 +314,7 @@ class G1: NSObject, SGCManager {
 
     func queryGalleryStatus() {}
 
-    func sendOtaStart() {}
+    func sendOtaStart(otaVersionUrl: String?) {}
     func sendOtaQueryStatus() {}
 
     func ping() {}
@@ -786,6 +783,10 @@ class G1: NSObject, SGCManager {
         //    }
     }
 
+    func sendText(_ text: String) async {
+        await sendTextWall(text)
+    }
+
     func sendTextWall(_ text: String) async {
         let chunks = textHelper.createTextWallChunks(text)
         queueChunks(chunks, sleepAfterMs: 10)

package/ios/Source/sgcs/G2.swift

@@ -1534,7 +1534,6 @@ class G2: NSObject, SGCManager {
     /// Fixed pool of container IDs the page protocol expects.
     private let imageContainerIDPool: [Int32] = [10, 11, 12, 13]
     private let textContainerIDPool: [Int32] = [1, 2, 3, 4, 5, 6]
-    /// Default container seeded into every fresh page: 100x100 in the top-left.
     private static let defaultImgContainer = (
         x: Int32(188), y: Int32(44), width: Int32(200), height: Int32(100)
     )
@@ -1927,7 +1926,7 @@ class G2: NSObject, SGCManager {
     // MARK: - SGCManager: Display Control
 
     func sendTextWall(_ text: String) async {
-        await sendText(
+        await sendTextAt(
             text,
             x: G2.defaultTextContainer.x,
             y: G2.defaultTextContainer.y,
@@ -1940,7 +1939,13 @@ class G2: NSObject, SGCManager {
         )
     }
 
-    func sendText(
+    // Protocol witness for SGCManager.sendText — G2 renders a simple string as a
+    // default-positioned text wall. The positioned variant is `sendTextAt`.
+    func sendText(_ text: String) async {
+        await sendTextWall(text)
+    }
+
+    func sendTextAt(
         _ text: String, x: Int32? = nil, y: Int32? = nil, width: Int32? = nil, height: Int32? = nil,
         borderWidth: Int32? = nil, borderColor: Int32? = nil, borderRadius: Int32? = nil,
         paddingLength: Int32? = nil
@@ -1983,7 +1988,7 @@ class G2: NSObject, SGCManager {
             let msg = EvenHubProto.updateTextMessage(
                 containerID: container.id,
                 contentOffset: 0,
-                contentLength: Int32(text.utf8.count),
+                contentLength: Int32(container.content.utf8.count),
                 content: container.content
             )
             queueEvenHubCommand(msg)
@@ -2011,10 +2016,10 @@ class G2: NSObject, SGCManager {
         // Don't shutdown the EvenHub page — that kills audio streaming too.
         // Instead, just clear the text content by sending a space.
 
-        if !pageCreated {
-            Bridge.log("G2: clearDisplay() - page not created")
-            createPageWithContainers()
-        }
+        // if !pageCreated {
+        //     Bridge.log("G2: clearDisplay() - page not created")
+        //     createPageWithContainers()
+        // }
 
         // reset the content of all text containers to empty:
         for i in textContainers.indices {
@@ -2024,10 +2029,7 @@ class G2: NSObject, SGCManager {
             imageContainers[i].bmpData = Data()
         }
         // shutdown the page and then recreate the containers without the content:
-        let msg = EvenHubProto.shutdownMessage()
-        sendEvenHubCommand(msg)
-        createPageWithContainers()
-        restartMicIfAlreadyEnabled()
+        Task { await rebuildPage() }
     }
 
     /// Send BMP data to an image container via fragmented updateImageRawData
@@ -2207,6 +2209,9 @@ class G2: NSObject, SGCManager {
         //     )
         //     sendEvenHubCommand(msg)
         // }
+        
+        try? await Task.sleep(nanoseconds: 300_000_000)  // 300ms to settle
+        restartMicIfAlreadyEnabled()
     }
 
     /// Upscale BMP pixel data by 2x (200x100 → 400x200) using nearest-neighbor
@@ -2766,6 +2771,7 @@ class G2: NSObject, SGCManager {
     func disconnect() {
         Bridge.log("G2: disconnect()")
         isDisconnecting = true
+        clearDisplay()
         cancelPairingTimeout()
         stopHeartbeats()
         Task { await reconnectionManager.stop() }
@@ -3140,11 +3146,7 @@ class G2: NSObject, SGCManager {
 
     // MARK: - SGCManager: Camera & Media (not supported on G2)
 
-    func requestPhoto(
-        _: String, appId _: String, size _: String?, webhookUrl _: String?, authToken _: String?,
-        compress _: String?, flash _: Bool, save _: Bool, sound _: Bool, exposureTimeNs _: Double?,
-        iso _: Int?
-    ) {}
+    func requestPhoto(_: PhotoRequest) {}
     func startVideoRecording(requestId _: String, save _: Bool, flash _: Bool, sound _: Bool) {}
     func startStream(_: [String: Any]) {}
     func stopStream() {}
@@ -3163,7 +3165,7 @@ class G2: NSObject, SGCManager {
     func sendWifiCredentials(_: String, _: String) {}
     func forgetWifiNetwork(_: String) {}
     func sendHotspotState(_: Bool) {}
-    func sendOtaStart() {}
+    func sendOtaStart(otaVersionUrl: String?) {}
     func sendOtaQueryStatus() {}
 
     // MARK: - SGCManager: User Context

package/ios/Source/sgcs/Mach1.swift

@@ -15,10 +15,7 @@ import UltraliteSDK
 class Mach1: UltraliteBaseViewController, SGCManager {
     func sendIncidentId(_: String, apiBaseUrl _: String?) {}
 
-    func requestPhoto(
-        _: String, appId _: String, size _: String?, webhookUrl _: String?, authToken _: String?,
-        compress _: String?, flash _: Bool, save _: Bool, sound _: Bool, exposureTimeNs _: Double?, iso _: Int?
-    ) {}
+    func requestPhoto(_: PhotoRequest) {}
 
     func sendGalleryMode() {}
 
@@ -26,7 +23,7 @@ class Mach1: UltraliteBaseViewController, SGCManager {
 
     var connectionState: String = ConnTypes.DISCONNECTED
 
-    func sendOtaStart() {}
+    func sendOtaStart(otaVersionUrl: String?) {}
     func sendOtaQueryStatus() {}
 
     func sendJson(_: [String: Any], wakeUp _: Bool, requireAck _: Bool) {}
@@ -325,6 +322,10 @@ class Mach1: UltraliteBaseViewController, SGCManager {
         UltraliteManager.shared.stopScan()
     }
 
+    func sendText(_ text: String) async {
+        await sendTextWall(text)
+    }
+
     func sendTextWall(_ text: String) async {
         //    displayTextWall(text)
         guard let device = UltraliteManager.shared.currentDevice else {