@mentra/bluetooth-sdk 0.1.2 → 0.1.3

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

@@ -34,6 +34,7 @@ class MentraBluetoothSdk private constructor(
 
     companion object {
         private val DEFAULT_DEVICE_KEYS = setOf("default_wearable", "device_name", "device_address")
+        private const val DEFAULT_SCAN_TIMEOUT_MS = 15_000L
 
         @JvmStatic
         fun create(
@@ -103,9 +104,90 @@ class MentraBluetoothSdk private constructor(
     }
 
     fun stopScan() {
+        stopScan(ScanStopReason.CANCELLED)
+    }
+
+    private fun stopScan(reason: ScanStopReason) {
         deviceManager.stopScan()
         DeviceStore.apply(ObservableStore.BLUETOOTH_CATEGORY, "searching", false)
-        dispatchToListeners { it.onScanStopped(ScanStopReason.CANCELLED) }
+        dispatchToListeners { it.onScanStopped(reason) }
+    }
+
+    fun scan(
+        model: DeviceModel,
+        onResults: (List<Device>) -> Unit,
+    ): ScanSession = scan(model, DEFAULT_SCAN_TIMEOUT_MS, onResults)
+
+    fun scan(
+        model: DeviceModel,
+        timeoutMs: Long,
+        onResults: (List<Device>) -> Unit,
+    ): ScanSession =
+        scan(
+            model = model,
+            callback =
+                object : MentraBluetoothScanCallback() {
+                    override fun onResults(devices: List<Device>) {
+                        onResults(devices)
+                    }
+                },
+            timeoutMs = timeoutMs,
+        )
+
+    @JvmOverloads
+    fun scan(
+        model: DeviceModel,
+        callback: ScanCallback,
+        timeoutMs: Long = DEFAULT_SCAN_TIMEOUT_MS,
+    ): ScanSession {
+        val normalizedTimeoutMs = if (timeoutMs > 0) timeoutMs else DEFAULT_SCAN_TIMEOUT_MS
+        val latestResults = mutableListOf<Device>()
+        lateinit var timeoutRunnable: Runnable
+        lateinit var session: ScanSession
+        var finished = false
+
+        fun emitResults(devices: List<Device>) {
+            latestResults.clear()
+            latestResults.addAll(devices)
+            callback.onResults(latestResults.toList())
+        }
+
+        val scanListener =
+            object : MentraBluetoothSdkCallback() {
+                override fun onBluetoothStatusChanged(status: BluetoothStatusUpdate) {
+                    status.searchResults?.let { results ->
+                        emitResults(results.filter { it.model == model })
+                    }
+                }
+        }
+
+        fun finish(reason: ScanStopReason) {
+            if (finished) return
+            finished = true
+            removeListener(scanListener)
+            mainHandler.removeCallbacks(timeoutRunnable)
+            session.markStopped()
+            stopScan(reason)
+            callback.onComplete(latestResults.toList())
+        }
+
+        timeoutRunnable = Runnable { finish(ScanStopReason.COMPLETED) }
+        session = ScanSession { finish(ScanStopReason.CANCELLED) }
+        addListener(scanListener)
+
+        try {
+            emitResults(emptyList())
+            startScan(model)
+            emitResults(getBluetoothStatus().searchResults.filter { it.model == model })
+            mainHandler.postDelayed(timeoutRunnable, normalizedTimeoutMs)
+            return session
+        } catch (error: Throwable) {
+            removeListener(scanListener)
+            mainHandler.removeCallbacks(timeoutRunnable)
+            session.markStopped()
+            callback.onError(error.toBluetoothError("scan_failed"))
+            throw error
+        }
     }
 
     @JvmOverloads
@@ -149,7 +231,7 @@ class MentraBluetoothSdk private constructor(
         deviceManager.disconnect()
     }
 
-    fun connectSimulated() {
+    internal fun connectSimulated() {
         deviceManager.connectSimulated()
     }
 
@@ -170,7 +252,7 @@ class MentraBluetoothSdk private constructor(
         deviceManager.displayText(request.toMap())
     }
 
-    fun displayEvent(request: DisplayEventRequest) {
+    internal fun displayEvent(request: DisplayEventRequest) {
         deviceManager.displayEvent(request.toMap())
     }
 
@@ -182,13 +264,12 @@ class MentraBluetoothSdk private constructor(
         deviceManager.showDashboard()
     }
 
-    @JvmOverloads
-    fun setBrightness(level: Int, autoMode: Boolean? = null) {
+    internal fun setBrightness(level: Int, autoMode: Boolean? = null) {
         autoMode?.let { DeviceStore.apply(ObservableStore.BLUETOOTH_CATEGORY, "auto_brightness", it) }
         DeviceStore.apply(ObservableStore.BLUETOOTH_CATEGORY, "brightness", level)
     }
 
-    fun setAutoBrightness(enabled: Boolean) {
+    internal fun setAutoBrightness(enabled: Boolean) {
         DeviceStore.apply(ObservableStore.BLUETOOTH_CATEGORY, "auto_brightness", enabled)
     }
 
@@ -201,7 +282,7 @@ class MentraBluetoothSdk private constructor(
         setDashboardPosition(height = request.height, depth = request.depth)
     }
 
-    fun setDashboardMenu(items: List<DashboardMenuItem>) {
+    internal fun setDashboardMenu(items: List<DashboardMenuItem>) {
         DeviceStore.apply(
             ObservableStore.BLUETOOTH_CATEGORY,
             "menu_apps",
@@ -218,7 +299,7 @@ class MentraBluetoothSdk private constructor(
     }
 
     fun setGalleryMode(mode: GalleryMode) {
-        DeviceStore.apply(ObservableStore.BLUETOOTH_CATEGORY, "gallery_mode", mode == GalleryMode.AUTO)
+        DeviceStore.apply(ObservableStore.BLUETOOTH_CATEGORY, "galleryModeAuto", mode == GalleryMode.AUTO)
     }
 
     fun setButtonPhotoSettings(size: ButtonPhotoSize) {
@@ -229,14 +310,14 @@ class MentraBluetoothSdk private constructor(
         setButtonPhotoSettings(size = settings.size)
     }
 
-    fun setButtonVideoRecordingSettings(width: Int, height: Int, fps: Int) {
+    fun setButtonVideoRecordingSettings(width: Int, height: Int, frameRate: Int) {
         DeviceStore.apply(ObservableStore.BLUETOOTH_CATEGORY, "button_video_width", width)
         DeviceStore.apply(ObservableStore.BLUETOOTH_CATEGORY, "button_video_height", height)
-        DeviceStore.apply(ObservableStore.BLUETOOTH_CATEGORY, "button_video_fps", fps)
+        DeviceStore.apply(ObservableStore.BLUETOOTH_CATEGORY, "button_video_fps", frameRate)
     }
 
     fun setButtonVideoRecordingSettings(settings: ButtonVideoRecordingSettings) {
-        setButtonVideoRecordingSettings(width = settings.width, height = settings.height, fps = settings.fps)
+        setButtonVideoRecordingSettings(width = settings.width, height = settings.height, frameRate = settings.frameRate)
     }
 
     fun setButtonCameraLed(enabled: Boolean) {
@@ -251,7 +332,7 @@ class MentraBluetoothSdk private constructor(
         DeviceStore.apply(
             ObservableStore.BLUETOOTH_CATEGORY,
             "camera_fov",
-            mapOf("fov" to fov.fov, "roi_position" to fov.roiPosition),
+            mapOf("fov" to fov.fov, "roiPosition" to fov.roiPosition),
         )
     }
 
@@ -277,21 +358,6 @@ class MentraBluetoothSdk private constructor(
         )
     }
 
-    @Deprecated(
-        "Use setMicState(enabled = ..., useGlassesMic = ..., bypassVad = ...) instead.",
-        ReplaceWith(
-            "setMicState(enabled = config.sendPcmData, bypassVad = config.bypassVad, sendTranscript = config.sendTranscript, sendLc3Data = config.sendLc3Data)"
-        ),
-    )
-    fun setMicState(config: MicConfig) {
-        applyMicState(
-            sendPcmData = config.sendPcmData,
-            sendTranscript = config.sendTranscript,
-            bypassVad = config.bypassVad,
-            sendLc3Data = config.sendLc3Data,
-        )
-    }
-
     private fun applyMicState(
         sendPcmData: Boolean,
         sendTranscript: Boolean,
@@ -338,14 +404,13 @@ class MentraBluetoothSdk private constructor(
     }
 
     fun requestPhoto(request: PhotoRequest) {
-        deviceManager.photoRequest(
+        deviceManager.requestPhoto(
             request.requestId,
             request.appId,
             request.size.value,
             request.webhookUrl,
             request.authToken,
             request.compress.value,
-            request.flash,
             request.sound,
         )
     }
@@ -368,8 +433,8 @@ class MentraBluetoothSdk private constructor(
             request.packageName,
             request.action.value,
             request.color?.value,
-            request.ontime,
-            request.offtime,
+            request.onDurationMs,
+            request.offDurationMs,
             request.count,
         )
     }
@@ -379,7 +444,7 @@ class MentraBluetoothSdk private constructor(
     }
 
     fun startVideoRecording(request: VideoRecordingRequest) {
-        deviceManager.startVideoRecording(request.requestId, request.save, request.flash, request.sound)
+        deviceManager.startVideoRecording(request.requestId, request.save, request.sound)
     }
 
     fun stopVideoRecording(requestId: String) {
@@ -390,23 +455,23 @@ class MentraBluetoothSdk private constructor(
         deviceManager.requestVersionInfo()
     }
 
-    fun sendOtaStart() {
+    internal fun sendOtaStart() {
         deviceManager.sendOtaStart()
     }
 
-    fun sendOtaQueryStatus() {
+    internal fun sendOtaQueryStatus() {
         deviceManager.sendOtaQueryStatus()
     }
 
-    fun sendShutdown() {
+    internal fun sendShutdown() {
         deviceManager.sendShutdown()
     }
 
-    fun sendReboot() {
+    internal fun sendReboot() {
         deviceManager.sendReboot()
     }
 
-    fun sendIncidentId(incidentId: String, apiBaseUrl: String? = null) {
+    internal fun sendIncidentId(incidentId: String, apiBaseUrl: String? = null) {
         deviceManager.sendIncidentId(incidentId, apiBaseUrl)
     }
 
@@ -509,11 +574,18 @@ class MentraBluetoothSdk private constructor(
         }
     }
 
+    private fun Throwable.toBluetoothError(defaultCode: String): BluetoothError =
+        if (this is BluetoothException) {
+            BluetoothError(code, message ?: code, this)
+        } else {
+            BluetoothError(defaultCode, message ?: toString(), this)
+        }
+
     private fun dispatchDiscoveredDevices(rawSearchResults: Any?) {
         val results = rawSearchResults as? List<*> ?: return
         results.forEach { rawResult ->
             val result = rawResult as? Map<*, *> ?: return@forEach
-            val name = result["deviceName"] as? String ?: result["name"] as? String ?: return@forEach
+            val name = result["name"] as? String ?: return@forEach
             if (!discoveredDeviceNames.add(name)) return@forEach
             val values =
                 result.entries.mapNotNull { (key, value) ->

package/android/src/main/java/com/mentra/bluetoothsdk/controllers/ControllerManager.kt

@@ -57,8 +57,8 @@ abstract class ControllerManager {
         packageName: String?,
         action: String,
         color: String?,
-        ontime: Int,
-        offtime: Int,
+        onDurationMs: Int,
+        offDurationMs: Int,
         count: Int
     )
 
@@ -117,8 +117,8 @@ abstract class ControllerManager {
     val firmwareVersion: String
         get() = DeviceStore.get("glasses", "firmwareVersion") as? String ?: ""
 
-    val btMacAddress: String
-        get() = DeviceStore.get("glasses", "btMacAddress") as? String ?: ""
+    val bluetoothMacAddress: String
+        get() = DeviceStore.get("glasses", "bluetoothMacAddress") as? String ?: ""
 
     val serialNumber: String
         get() = DeviceStore.get("glasses", "serialNumber") as? String ?: ""

package/android/src/main/java/com/mentra/bluetoothsdk/controllers/R1.kt

@@ -454,7 +454,7 @@ class R1 : ControllerManager() {
      */
     private fun connectToGlasses() {
         // Try DeviceStore first; fall back to cached value in SharedPreferences.
-        val glassesMac = (DeviceStore.get("glasses", "btMacAddress") as? String)
+        val glassesMac = (DeviceStore.get("glasses", "bluetoothMacAddress") as? String)
             ?: prefs.getString("glasses_btMacAddress", null)
         if (glassesMac == null) {
             Bridge.log("R1: connectToGlasses: no glasses MAC")
@@ -888,7 +888,7 @@ class R1 : ControllerManager() {
     override fun sendReboot() {}
     override fun sendRgbLedControl(
         requestId: String, packageName: String?, action: String, color: String?,
-        ontime: Int, offtime: Int, count: Int
+        onDurationMs: Int, offDurationMs: Int, count: Int
     ) {}
     override fun requestWifiScan() {}
     override fun sendWifiCredentials(ssid: String, password: String) {}

package/android/src/main/java/com/mentra/bluetoothsdk/services/PhoneMic.kt

@@ -190,7 +190,7 @@ class PhoneMic private constructor(private val context: Context) {
 
     /**
      * Start recording from a specific microphone type
-     * @param mode One of MicTypes constants (PHONE_INTERNAL, BT_CLASSIC, BT)
+     * @param mode One of MicTypes constants (PHONE_INTERNAL, BLUETOOTH_CLASSIC, BLUETOOTH)
      * @return true if successfully started recording, false otherwise
      */
     fun startMode(mode: String): Boolean {
@@ -253,7 +253,7 @@ class PhoneMic private constructor(private val context: Context) {
                 Bridge.log("MIC: Starting phone internal mic")
                 return startRecordingPhoneInternal()
             }
-            MicTypes.BT_CLASSIC -> {
+            MicTypes.BLUETOOTH_CLASSIC -> {
                 Bridge.log("MIC: Starting Bluetooth Classic (SCO)")
                 if (!audioManager.isBluetoothScoAvailableOffCall) {
                     Bridge.log("MIC: Bluetooth SCO not available")
@@ -262,7 +262,7 @@ class PhoneMic private constructor(private val context: Context) {
                 }
                 return startRecordingBtClassic()
             }
-            MicTypes.BT -> {
+            MicTypes.BLUETOOTH -> {
                 Bridge.log("MIC: Starting high-quality Bluetooth mic")
                 if (!isHighQualityBluetoothAvailable()) {
                     Bridge.log("MIC: High-quality Bluetooth not available")
@@ -346,7 +346,7 @@ class PhoneMic private constructor(private val context: Context) {
 
             val success = createAndStartAudioRecord(MediaRecorder.AudioSource.VOICE_COMMUNICATION)
             if (success) {
-                currentMicMode = MicTypes.BT_CLASSIC
+                currentMicMode = MicTypes.BLUETOOTH_CLASSIC
             }
             return success
         } catch (e: Exception) {
@@ -383,7 +383,7 @@ class PhoneMic private constructor(private val context: Context) {
 
             val success = createAndStartAudioRecord(audioSource)
             if (success) {
-                currentMicMode = MicTypes.BT
+                currentMicMode = MicTypes.BLUETOOTH
             }
             return success
         } catch (e: Exception) {
@@ -1106,4 +1106,4 @@ class PhoneMic private constructor(private val context: Context) {
 
         Bridge.log("MIC: Cleaned up")
     }
-}
+}

package/android/src/main/java/com/mentra/bluetoothsdk/sgcs/G1.java

@@ -1682,7 +1682,7 @@ public class G1 extends SGCManager {
     }
 
     @Override
-    public void sendRgbLedControl(String requestId, String packageName, String action, String color, int ontime, int offtime, int count) {
+    public void sendRgbLedControl(String requestId, String packageName, String action, String color, int onDurationMs, int offDurationMs, int count) {
         Bridge.log("sendRgbLedControl - not supported on G1");
         Bridge.sendRgbLedControlResponse(requestId, false, "device_not_supported");
     }

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

@@ -2609,8 +2609,8 @@ class G2 : SGCManager() {
             packageName: String?,
             action: String,
             color: String?,
-            ontime: Int,
-            offtime: Int,
+            onDurationMs: Int,
+            offDurationMs: Int,
             count: Int
     ) {
         // G2 doesn't have RGB LEDs
@@ -2711,7 +2711,7 @@ class G2 : SGCManager() {
                             if (mac != null) {
                                 if (name.contains("_L_")) {
                                     DeviceStore.apply("glasses", "leftMacAddress", mac)
-                                    DeviceStore.apply("glasses", "btMacAddress", mac)
+                                    DeviceStore.apply("glasses", "bluetoothMacAddress", mac)
                                 } else if (name.contains("_R_")) {
                                     DeviceStore.apply("glasses", "rightMacAddress", mac)
                                 }

package/android/src/main/java/com/mentra/bluetoothsdk/sgcs/Mach1.java

@@ -290,7 +290,7 @@ public class Mach1 extends SGCManager {
     }
 
     @Override
-    public void sendRgbLedControl(String requestId, String packageName, String action, String color, int ontime, int offtime, int count) {
+    public void sendRgbLedControl(String requestId, String packageName, String action, String color, int onDurationMs, int offDurationMs, int count) {
         Bridge.log("sendRgbLedControl - not supported on Mach1");
         Bridge.sendRgbLedControlResponse(requestId, false, "device_not_supported");
     }

package/android/src/main/java/com/mentra/bluetoothsdk/sgcs/MentraLive.java

@@ -696,8 +696,8 @@ public class MentraLive extends SGCManager {
             // and the phone-side OTA check will disagree with glasses' PackageManager + ota_update_available.
             DeviceStore.INSTANCE.apply("glasses", "buildNumber", "");
             DeviceStore.INSTANCE.apply("glasses", "appVersion", "");
-            DeviceStore.INSTANCE.apply("glasses", "besFwVersion", "");
-            DeviceStore.INSTANCE.apply("glasses", "mtkFwVersion", "");
+            DeviceStore.INSTANCE.apply("glasses", "besFirmwareVersion", "");
+            DeviceStore.INSTANCE.apply("glasses", "mtkFirmwareVersion", "");
             Bridge.log("LIVE: Cleared cached version_info fields for fresh session");
         }
         
@@ -841,7 +841,7 @@ public class MentraLive extends SGCManager {
 
     private void emitStopScanEvent() {
         Map<String, Object> body = new HashMap<>();
-        body.put("device_model", DeviceTypes.LIVE);
+        body.put("deviceModel", DeviceTypes.LIVE);
         Bridge.sendTypedMessage("compatible_glasses_search_stop", body);
     }
 
@@ -2776,7 +2776,7 @@ public class MentraLive extends SGCManager {
                 DeviceStore.INSTANCE.apply("glasses", "androidVersion", androidVersionLegacy);
                 DeviceStore.INSTANCE.apply("glasses", "otaVersionUrl", otaVersionUrlLegacy != null ? otaVersionUrlLegacy : "");
                 DeviceStore.INSTANCE.apply("glasses", "firmwareVersion", firmwareVersionLegacy);
-                DeviceStore.INSTANCE.apply("glasses", "btMacAddress", btMacAddressLegacy);
+                DeviceStore.INSTANCE.apply("glasses", "bluetoothMacAddress", btMacAddressLegacy);
 
                 // Parse build number as integer for version checks (local field)
                 try {
@@ -2958,16 +2958,16 @@ public class MentraLive extends SGCManager {
                         DeviceStore.INSTANCE.apply("glasses", "otaVersionUrl", (String) fields.get("ota_version_url"));
                     }
                     if (fields.containsKey("firmware_version")) {
-                        DeviceStore.INSTANCE.apply("glasses", "fwVersion", (String) fields.get("firmware_version"));
+                        DeviceStore.INSTANCE.apply("glasses", "firmwareVersion", (String) fields.get("firmware_version"));
                     }
                     if (fields.containsKey("bes_fw_version")) {
-                        DeviceStore.INSTANCE.apply("glasses", "besFwVersion", (String) fields.get("bes_fw_version"));
+                        DeviceStore.INSTANCE.apply("glasses", "besFirmwareVersion", (String) fields.get("bes_fw_version"));
                     }
                     if (fields.containsKey("mtk_fw_version")) {
-                        DeviceStore.INSTANCE.apply("glasses", "mtkFwVersion", (String) fields.get("mtk_fw_version"));
+                        DeviceStore.INSTANCE.apply("glasses", "mtkFirmwareVersion", (String) fields.get("mtk_fw_version"));
                     }
                     if (fields.containsKey("bt_mac_address")) {
-                        DeviceStore.INSTANCE.apply("glasses", "btMacAddress", (String) fields.get("bt_mac_address"));
+                        DeviceStore.INSTANCE.apply("glasses", "bluetoothMacAddress", (String) fields.get("bt_mac_address"));
                     }
 
 
@@ -3625,7 +3625,7 @@ public class MentraLive extends SGCManager {
 
     @Override
     public void sendGalleryMode() {
-        boolean active = (Boolean) DeviceStore.INSTANCE.get("bluetooth", "gallery_mode");
+        boolean active = (Boolean) DeviceStore.INSTANCE.get("bluetooth", "galleryModeAuto");
         Bridge.log("LIVE: 📸 Sending gallery mode active to glasses: " + active);
         try {
             JSONObject json = new JSONObject();
@@ -4759,7 +4759,7 @@ public class MentraLive extends SGCManager {
                 Map<String, Object> videoSettings = (Map<String, Object>) videoSettingsObj;
                 videoWidth = ((Number) videoSettings.getOrDefault("width", videoWidth)).intValue();
                 videoHeight = ((Number) videoSettings.getOrDefault("height", videoHeight)).intValue();
-                videoFps = ((Number) videoSettings.getOrDefault("fps", videoFps)).intValue();
+                videoFps = ((Number) videoSettings.getOrDefault("frameRate", videoFps)).intValue();
             } else {
                 Object width = DeviceStore.INSTANCE.get("bluetooth", "button_video_width");
                 Object height = DeviceStore.INSTANCE.get("bluetooth", "button_video_height");
@@ -5249,7 +5249,7 @@ public class MentraLive extends SGCManager {
         }
 
         HashMap<String, Object> map = new HashMap<>();
-        map.put("vol", vol);
+        map.put("level", vol);
         map.put("statusCode", status);
         Bridge.log("LIVE: sr_getvol received vol=" + vol + " (0-15), statusCode=" + status);
         if (ok != null) {
@@ -5823,8 +5823,8 @@ public class MentraLive extends SGCManager {
                                    String packageName,
                                    String action,
                                    String color,
-                                   int ontime,
-                                   int offtime,
+                                   int onDurationMs,
+                                   int offDurationMs,
                                    int count) {
         if (!isConnected || !glassesReady) {
             Bridge.log("LIVE: Cannot handle RGB LED control - glasses not connected");
@@ -5849,8 +5849,8 @@ public class MentraLive extends SGCManager {
                     int ledIndex = ledIndexForColor(color);
                     command.put("type", "rgb_led_control_on");
                     command.put("led", ledIndex);
-                    command.put("ontime", ontime);
-                    command.put("offtime", offtime);
+                    command.put("ontime", onDurationMs);
+                    command.put("offtime", offDurationMs);
                     command.put("count", count);
                     break;
                 case "off":
@@ -6487,7 +6487,7 @@ public class MentraLive extends SGCManager {
     }
 
     /**
-     * Send camera FOV setting to glasses (K900 / Mentra Live). Reads fov and roi_position from store.
+     * Send camera FOV setting to glasses (K900 / Mentra Live). Reads fov and roiPosition from store.
      */
     @Override
     public void sendCameraFovSetting() {
@@ -6499,7 +6499,7 @@ public class MentraLive extends SGCManager {
                 @SuppressWarnings("unchecked")
                 java.util.Map<String, Object> map = (java.util.Map<String, Object>) raw;
                 Object f = map.get("fov");
-                Object r = map.get("roi_position");
+                Object r = map.get("roiPosition");
                 if (f instanceof Number) fov = ((Number) f).intValue();
                 if (r instanceof Number) roiPosition = ((Number) r).intValue();
             }
@@ -6507,7 +6507,7 @@ public class MentraLive extends SGCManager {
             Log.w(TAG, "Could not read camera_fov from store, using defaults", e);
         }
 
-        Bridge.log("LIVE: Sending camera FOV setting: fov=" + fov + ", roi_position=" + roiPosition);
+        Bridge.log("LIVE: Sending camera FOV setting: fov=" + fov + ", roiPosition=" + roiPosition);
 
         if (!isConnected) {
             Log.w(TAG, "Cannot send camera FOV setting - not connected");

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

@@ -431,7 +431,7 @@ class MentraNex : SGCManager() {
         Bridge.log("sendReboot - not supported on Nex")
     }
 
-    override fun sendRgbLedControl(requestId: String, packageName: String?, action: String, color: String?, ontime: Int, offtime: Int, count: Int) {
+    override fun sendRgbLedControl(requestId: String, packageName: String?, action: String, color: String?, onDurationMs: Int, offDurationMs: Int, count: Int) {
         Bridge.log("sendRgbLedControl - not supported on Nex");
         Bridge.sendRgbLedControlResponse(requestId, false, "device_not_supported");
     }

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

@@ -76,8 +76,8 @@ abstract class SGCManager {
             packageName: String?,
             action: String,
             color: String?,
-            ontime: Int,
-            offtime: Int,
+            onDurationMs: Int,
+            offDurationMs: Int,
             count: Int
     )
 
@@ -140,8 +140,8 @@ abstract class SGCManager {
     val firmwareVersion: String
         get() = DeviceStore.get("glasses", "firmwareVersion") as? String ?: ""
 
-    val btMacAddress: String
-        get() = DeviceStore.get("glasses", "btMacAddress") as? String ?: ""
+    val bluetoothMacAddress: String
+        get() = DeviceStore.get("glasses", "bluetoothMacAddress") as? String ?: ""
 
     val serialNumber: String
         get() = DeviceStore.get("glasses", "serialNumber") as? String ?: ""

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

@@ -140,8 +140,8 @@ class Simulated : SGCManager() {
             packageName: String?,
             action: String,
             color: String?,
-            ontime: Int,
-            offtime: Int,
+            onDurationMs: Int,
+            offDurationMs: Int,
             count: Int
     ) {
         Bridge.log("sendRgbLedControl - not supported on Simulated")

package/android/src/main/java/com/mentra/bluetoothsdk/utils/Constants.kt

@@ -28,17 +28,17 @@ object ConnTypes {
 object MicTypes {
     const val PHONE_INTERNAL = "phone"
     const val GLASSES_CUSTOM = "glasses"
-    const val BT_CLASSIC = "btclassic"
-    const val BT = "bt"
-    val ALL = arrayOf(PHONE_INTERNAL, GLASSES_CUSTOM, BT_CLASSIC, BT)
+    const val BLUETOOTH_CLASSIC = "bluetoothClassic"
+    const val BLUETOOTH = "bluetooth"
+    val ALL = arrayOf(PHONE_INTERNAL, GLASSES_CUSTOM, BLUETOOTH_CLASSIC, BLUETOOTH)
 }
 
 // convert to kotlin:
 object MicMap {
     val map: Map<String, List<String>> = mapOf(
-        "auto" to listOf(MicTypes.GLASSES_CUSTOM, MicTypes.PHONE_INTERNAL, MicTypes.BT, MicTypes.BT_CLASSIC),
+        "auto" to listOf(MicTypes.GLASSES_CUSTOM, MicTypes.PHONE_INTERNAL, MicTypes.BLUETOOTH, MicTypes.BLUETOOTH_CLASSIC),
         "glasses" to listOf(MicTypes.GLASSES_CUSTOM),
         "phone" to listOf(MicTypes.PHONE_INTERNAL, MicTypes.GLASSES_CUSTOM),
-        "bluetooth" to listOf(MicTypes.BT, MicTypes.BT_CLASSIC, MicTypes.PHONE_INTERNAL, MicTypes.GLASSES_CUSTOM),
+        "bluetooth" to listOf(MicTypes.BLUETOOTH, MicTypes.BLUETOOTH_CLASSIC, MicTypes.PHONE_INTERNAL, MicTypes.GLASSES_CUSTOM),
     )
-}
+}