Add Rokid Max 2 support using its verified USB identity (#1535)

Add Rokid Max 2 USB recognition and validated Max support
This commit is contained in:
informalTechCode authored and GitHub committed 2026-10-25 12:07:47 -04:00
1 parent c6bc8aef04
commit b1c70f5f81
4 files changed
+38 -7

No files matched your search

@@ -3,7 +3,7 @@ package com.droiddeck.launcher.glasses
import java.nio.ByteBuffer
import java.nio.ByteOrder
/** Rokid Air/Max share one USB identity; the product string distinguishes them. */
/** Rokid Air/Max share one USB identity; Max 2 has a separate product ID. */
internal class RokidModel private constructor(override val name: String, private val max: Boolean) : GlassesModel {
override val controllable = true
override val brightnessMax = BRIGHTNESS_STEPS
@@ -33,6 +33,7 @@ internal class RokidModel private constructor(override val name: String, private
companion object {
const val VENDOR_ID = 0x04d2
const val PRODUCT_ID = 0x162f
const val MAX2_PRODUCT_ID = 0x2002
const val BRIGHTNESS_STEPS = 10
// Vendor control requests, device recipient.
@@ -52,9 +53,9 @@ internal class RokidModel private constructor(override val name: String, private
// 0x04d2 is a shared vendor ID, so the Rokid product string is required too.
fun model(vid: Int, pid: Int, name: String?): GlassesModel? {
if (vid != VENDOR_ID || pid != PRODUCT_ID) return null
if (vid != VENDOR_ID || (pid != PRODUCT_ID && pid != MAX2_PRODUCT_ID)) return null
val product = name?.trim()?.takeIf { it.startsWith("Rokid", ignoreCase = true) } ?: return null
return RokidModel(product, product.contains("Max", ignoreCase = true))
return RokidModel(product, pid == MAX2_PRODUCT_ID || product.contains("Max", ignoreCase = true))
}
fun isDisplay(name: String) = name.contains("Rokid", ignoreCase = true)
@@ -269,6 +269,17 @@ class GlassesUsbTest {
assertTrue(Glasses.isGlassesDisplayName("Rokid Max"))
}
@Test fun rokidMax2RequestsPermissionForItsOwnProductId() {
val max2 = device(0x2002, 0x04d2, "Rokid Max2")
manager.devices[max2.deviceName] = max2
refresh(ask = true)
assertEquals("Rokid Max2", state.value.model)
assertTrue(state.value.controllable)
assertEquals(listOf(max2), manager.requests)
assertTrue(Glasses.isGlassesDisplayName("Rokid Max 2"))
assertEquals(null, Glasses.deviceModel(device(0x2002, 0x04d2, "Generic HID")))
}
private fun device(pid: Int, vid: Int = VitureProtocol.VENDOR_ID, name: String = "VITURE device"): UsbDevice = ReflectionHelpers.callConstructor(
UsbDevice::class.java,
from(String::class.java, "/dev/bus/usb/$pid"),
@@ -13,6 +13,10 @@ class RokidProtocolTest {
@Test fun identityRequiresRokidProductString() {
assertEquals("Rokid Max", RokidModel.model(0x04d2, 0x162f, "Rokid Max")?.name)
assertEquals("Rokid Air", RokidModel.model(0x04d2, 0x162f, "Rokid Air")?.name)
assertEquals("Rokid Max2", RokidModel.model(0x04d2, 0x2002, "Rokid Max2")?.name)
assertNull(RokidModel.model(0x04d2, 0x2002, "USB Keyboard"))
assertNull(RokidModel.model(0x04d2, 0x2002, null))
assertNull(RokidModel.model(0x1234, 0x2002, "Rokid Max2"))
assertNull(RokidModel.model(0x04d2, 0x162f, "USB Keyboard"))
assertNull(RokidModel.model(0x04d2, 0x162f, null))
assertNull(RokidModel.model(0x04d2, 0x1234, "Rokid Max"))
@@ -40,6 +44,21 @@ class RokidProtocolTest {
assertEquals(listOf(60), air.rates2d)
}
@Test fun max2UsesMaxModesAndParsesItsCapturedCombinedReport() {
val max2 = RokidModel.model(0x04d2, 0x2002, "Rokid Max2")!!
assertEquals(RokidModel.MODE_2D_120, max2.mode(120, false, null))
assertEquals(RokidModel.MODE_SBS_1080_60, max2.mode(60, true, GlassesResolution(1920, 1080)))
assertEquals(RokidModel.MODE_SBS_1200_90, max2.mode(90, true, null))
val packet = hex("119ceac6a47b000000542389bf2f430f41de9f6fc000967a38666144bbd0d4413b66661bc2cdcc2c4066e6e142000000ea70a2a47b0000000000006464000000")
val sample = RokidProtocol.Parser().parse(packet)!!
assertEquals(0x7ba4c6ea9cL, sample.timeNs)
assertEquals(8.954f, sample.accel.y, 0.001f)
assertEquals(100, sample.brightness)
val pose = ImuFusion().update(sample.timeNs, sample.accel, sample.gyro)
assertNotNull(pose)
assertTrue(pose!!.all { it.isFinite() })
}
@Test fun brightnessStepsRoundTripTheDevicePercent() {
assertEquals(8, RokidModel.brightnessStep(80))
assertEquals(10, RokidModel.brightnessStep(100))