diff --git a/ACKNOWLEDGEMENTS.md b/ACKNOWLEDGEMENTS.md
index a054eae1..7e9ee19f 100644
--- a/ACKNOWLEDGEMENTS.md
+++ b/ACKNOWLEDGEMENTS.md
@@ -13,6 +13,16 @@ and others who contributed to documenting the G2's bluetooth protocol and firmwa
G2 microphone LC3 decoding uses Google's liblc3: https://github.com/google/liblc3
+Even G1 support builds on ScouterKit (MIT License), by the ScouterKit authors:
+https://github.com/mafik/scouter_kit. The firmware Faceclaw installs on a G1 is a
+modified build of its g1v0, using the Zephyr RTOS and Nordic's nRF Connect SDK; the
+parts of it that are Even Realities' own are downloaded from Even, not shipped here.
+
+RayNeo iO support builds on the Glassly SDK and custom firmware by Tetramo, Inc.
+and Mentra Labs, Inc. (MIT License): https://github.com/tetramo-labs/glassly and
+https://github.com/tetramo-labs/glassly-rayneo-cfw. The iO wire codecs in
+native/kotlin/shared/.../rayneo/RayNeoIoProtocol.kt follow their protocol work.
+
iPhone notification icons are Pebble's notification and timeline icons, from
https://github.com/pebble-dev/iconography: the original Pebble Technology icons
and Rebble community additions. They are licensed under the Apache License 2.0;
diff --git a/App_Resources/Android/app.gradle b/App_Resources/Android/app.gradle
index 997e1f4d..99e36fe3 100644
--- a/App_Resources/Android/app.gradle
+++ b/App_Resources/Android/app.gradle
@@ -19,6 +19,9 @@ dependencies {
// app's captions (translation models download on demand, per language).
implementation 'com.google.mlkit:language-id:17.0.6'
implementation 'com.google.mlkit:translate:17.0.3'
+ // Pure-Java Opus decoder for the RayNeo iO's microphone (16 kHz mono Opus over
+ // BLE); the same one Glassly uses. See AndroidSpeechEngines.OpusDecoderAdapter.
+ implementation 'io.github.jaredmdobson:concentus:1.0.1'
}
def faceclawSherpaOnnxVersion = "1.13.0"
diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/AndroidSessionLink.kt b/App_Resources/Android/src/main/java/com/faceclaw/app/AndroidSessionLink.kt
index 2921e222..f5ffece3 100644
--- a/App_Resources/Android/src/main/java/com/faceclaw/app/AndroidSessionLink.kt
+++ b/App_Resources/Android/src/main/java/com/faceclaw/app/AndroidSessionLink.kt
@@ -46,6 +46,15 @@ class AndroidSessionLink(private val bleManager: FaceclawBleManager) : SessionLi
override fun isBonded(address: String): Boolean = bleManager.isBonded(address)
+ override fun requestBond(address: String) = bleManager.requestBond(address)
+
+ override fun removeBond(address: String): Boolean = bleManager.removeBond(address)
+
+ override fun hasCharacteristic(address: String, characteristicUuid: String): Boolean =
+ bleManager.hasCharacteristic(address, characteristicUuid)
+
+ override fun refreshServices(address: String, timeoutMs: Int): Boolean = bleManager.refreshServices(address, timeoutMs)
+
override fun prepareBenchmarkLink(address: String, mode: Int) = bleManager.prepareBenchmarkLink(address, mode)
override fun recordDisplayFrameSent() = FaceclawBleManager.recordDisplayFrameSent()
diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/AndroidSpeechEngines.kt b/App_Resources/Android/src/main/java/com/faceclaw/app/AndroidSpeechEngines.kt
index 2b149f09..83357d08 100644
--- a/App_Resources/Android/src/main/java/com/faceclaw/app/AndroidSpeechEngines.kt
+++ b/App_Resources/Android/src/main/java/com/faceclaw/app/AndroidSpeechEngines.kt
@@ -94,6 +94,44 @@ internal object AndroidSpeechEngines {
override fun close() = decoder.close()
}
+ /**
+ * The RayNeo iO's microphone: one 16 kHz mono Opus packet per BLE message (its remote
+ * audio stream, GlassesSessionIo), decoded with Concentus. No G2 DSP metadata; packets
+ * carry no counter, so "missing" stays 0 and a lost one is just a gap.
+ */
+ class OpusDecoderAdapter : AudioPacketDecoder {
+ private val decoder = io.github.jaredmdobson.OpusDecoder(RayNeoIoProtocol.VOICE_SAMPLE_RATE, 1)
+ private var packets = 0L
+ private var errors = 0L
+
+ override fun decodePacket(packet: ByteArray?, pcmOut: ShortArray?): Int {
+ if (packet == null || packet.isEmpty() || pcmOut == null) return 0
+ return try {
+ val count = decoder.decode(packet, 0, packet.size, pcmOut, 0, pcmOut.size, false)
+ packets++
+ count
+ } catch (e: io.github.jaredmdobson.OpusException) {
+ errors++
+ if (errors == 1L || errors % 100 == 0L) {
+ android.util.Log.w("FaceclawVoice", "Opus decode error ($errors so far): ${e.message}")
+ }
+ 0
+ }
+ }
+
+ /** 120 ms, Opus's longest frame. */
+ override val maxSamplesPerPacket: Int get() = RayNeoIoProtocol.VOICE_SAMPLE_RATE * 120 / 1000
+ override val hasFrameMeta: Boolean get() = false
+ override val lastAngleDegrees: Int get() = 0
+ override val lastSsr: Int get() = 0
+ override val realPackets: Long get() = packets
+ override val duplicatePackets: Long get() = 0
+ override val missingPackets: Long get() = 0
+ override val decodeErrors: Long get() = errors
+
+ override fun close() = decoder.resetState()
+ }
+
/**
* Open the phone's own microphone at the pipeline's native format (16 kHz
* mono PCM16), or null when it cannot start — the permission is missing
diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/AndroidStockLink.kt b/App_Resources/Android/src/main/java/com/faceclaw/app/AndroidStockLink.kt
index 3e7d264e..c4ef4a5b 100644
--- a/App_Resources/Android/src/main/java/com/faceclaw/app/AndroidStockLink.kt
+++ b/App_Resources/Android/src/main/java/com/faceclaw/app/AndroidStockLink.kt
@@ -48,6 +48,17 @@ class AndroidStockLink(context: Context) : StockLink, FaceclawBleListener {
else -> BondState.UNKNOWN
}
+ override fun negotiatedMtu(address: String): Int = bleManager.getNegotiatedMtu(address)
+
+ override fun requestBond(address: String) = bleManager.requestBond(address)
+
+ override fun removeBond(address: String): Boolean = bleManager.removeBond(address)
+
+ override fun hasCharacteristic(address: String, characteristicUuid: String): Boolean =
+ bleManager.hasCharacteristic(address, characteristicUuid)
+
+ override fun refreshServices(address: String, timeoutMs: Int): Boolean = bleManager.refreshServices(address, timeoutMs)
+
override fun disconnect(address: String) = bleManager.disconnect(address)
override fun close() = bleManager.close()
diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleCommunicator.kt b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleCommunicator.kt
index e384d0da..9f0e47e5 100644
--- a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleCommunicator.kt
+++ b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleCommunicator.kt
@@ -189,6 +189,28 @@ class FaceclawBleCommunicator(context: Context, rightAddress: String?, leftAddre
fun setRequiredFirmwareRevision(revision: Int) = core.setRequiredFirmwareRevision(revision)
+ /**
+ * Drive a RayNeo iO (constructed with its address as both arms and no ring). The phone's
+ * protocol identity is derived from ANDROID_ID so it survives reinstalls: the glasses bind
+ * to the first identity that authenticates and refuse others until put in pairing mode.
+ */
+ fun useRayNeoIo() {
+ val androidId = try {
+ android.provider.Settings.Secure.getString(appContext.contentResolver, android.provider.Settings.Secure.ANDROID_ID)
+ } catch (_: Exception) {
+ null
+ }
+ val seed = "faceclaw-rayneo-phone-id:" + (androidId ?: android.os.Build.FINGERPRINT)
+ val phoneId = java.security.MessageDigest.getInstance("SHA-256").digest(seed.toByteArray(Charsets.UTF_8)).copyOf(6)
+ val model = android.os.Build.MODEL ?: "Android"
+ core.useRayNeoIo(phoneId, model, android.os.Build.MANUFACTURER ?: "Android", model)
+ }
+
+ fun isRayNeoIo(): Boolean = core.isRayNeoIo()
+
+ /** Drive an Even G1 on g1v0 (two arms, as a G2 pair's addresses). */
+ fun useG1() = core.useG1()
+
fun start() {
if (core.start()) {
activeInstance = this
@@ -235,6 +257,9 @@ class FaceclawBleCommunicator(context: Context, rightAddress: String?, leftAddre
fun setFaceclawWakeLeaseEnabled(enabled: Boolean): Boolean = core.setFaceclawWakeLeaseEnabled(enabled)
+ /** See [GlassesSessionCore.setVoiceWakeEnabled]. */
+ fun setVoiceWakeEnabled(enabled: Boolean) = core.setVoiceWakeEnabled(enabled)
+
fun awaitEvenHubSessionReady(timeoutMs: Int): Boolean = core.awaitEvenHubSessionReady(timeoutMs)
fun setImuReportEnabled(enable: Boolean, reportFrq: Int) = core.setImuReportEnabled(enable, reportFrq)
diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleManager.kt b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleManager.kt
index fd303744..3782e821 100644
--- a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleManager.kt
+++ b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawBleManager.kt
@@ -27,6 +27,11 @@ import java.util.concurrent.atomic.AtomicLong
class FaceclawBleManager(context: Context) {
companion object {
private const val TAG = "FaceclawBle"
+
+ /** Not public API, but long stable, and the only way short of sending the user to Settings. */
+ fun removeBond(device: BluetoothDevice): Boolean =
+ device.bondState == BluetoothDevice.BOND_NONE || device.javaClass.getMethod("removeBond").invoke(device) == true
+
private val WRITE_RETRY_DELAYS_MS = intArrayOf(1, 1, 1, 2, 4, 8, 12, 20, 35, 100, 200)
// Gap after each LE 2M PHY request before checking whether it landed and asking
@@ -160,6 +165,36 @@ class FaceclawBleManager(context: Context) {
}
}
+ /**
+ * Remove this phone's half of a pairing the other side no longer has. False when the platform refused.
+ */
+ fun removeBond(address: String?): Boolean {
+ if (address == null || address.trim().isEmpty()) {
+ return false
+ }
+ return try {
+ removeBond(bluetoothAdapter.getRemoteDevice(address))
+ } catch (t: Throwable) {
+ Log.w(TAG, "removeBond failed: $address", t)
+ false
+ }
+ }
+
+ /** Start bonding, without waiting: the OS may ask the user, and [isBonded] tells when it is done. */
+ fun requestBond(address: String?) {
+ if (address == null || address.trim().isEmpty()) {
+ return
+ }
+ try {
+ val device = bluetoothAdapter.getRemoteDevice(address)
+ if (device.bondState == BluetoothDevice.BOND_NONE) {
+ Log.i(TAG, "requestBond " + address + ": " + device.createBond())
+ }
+ } catch (t: Throwable) {
+ Log.w(TAG, "requestBond failed: " + address, t)
+ }
+ }
+
/**
* Android's bond state for this address (BluetoothDevice.BOND_NONE /
* BOND_BONDING / BOND_BONDED), or -1 when it cannot be determined.
@@ -364,6 +399,31 @@ class FaceclawBleManager(context: Context) {
return status == BluetoothGatt.GATT_SUCCESS
}
+ /** After discovery: whether the service table has this characteristic. */
+ fun hasCharacteristic(address: String, characteristicUuid: String): Boolean {
+ synchronized(bluetoothApiLock) {
+ val gatt = links[address]?.gatt ?: return false
+ val target = UUID.fromString(characteristicUuid)
+ return gatt.services.any { it.getCharacteristic(target) != null }
+ }
+ }
+
+ /**
+ * Forget the service table Android remembers for a bonded device and read it again. A G1 arm keeps its address across an
+ * install that changes its services, and a cached table would make new firmware look like the old one.
+ */
+ fun refreshServices(address: String, timeoutMs: Int): Boolean {
+ synchronized(bluetoothApiLock) {
+ val gatt = links[address]?.gatt ?: return false
+ try {
+ gatt.javaClass.getMethod("refresh").invoke(gatt)
+ } catch (t: Throwable) {
+ Log.w(TAG, "refresh failed: $address", t)
+ }
+ }
+ return discoverServices(address, timeoutMs)
+ }
+
fun enableNotifications(address: String, characteristicUuid: String, enable: Boolean, timeoutMs: Int): Boolean {
synchronized(bluetoothApiLock) {
val gatt = requireGatt(address)
diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawDeviceDiscovery.kt b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawDeviceDiscovery.kt
index b43bcaae..13074560 100644
--- a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawDeviceDiscovery.kt
+++ b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawDeviceDiscovery.kt
@@ -129,13 +129,21 @@ class FaceclawDeviceDiscovery(context: Context) {
&& manufacturerData[0] == 0x45.toByte() && manufacturerData[1] == 0x52.toByte()) {
return true
}
+ // RayNeo iO: manufacturer company 0x5716 ([07][MAC]...) outside pairing mode;
+ // in pairing mode only the "RayNeo iO-xxxx" name identifies it.
+ if (manufacturerData != null && manufacturerData.size >= 2
+ && manufacturerData[0] == 0x16.toByte() && manufacturerData[1] == 0x57.toByte()) {
+ return true
+ }
if (name == null) {
return false
}
val upper = name.uppercase()
// A bare "R1" substring also matches unrelated hardware ("Oppo Enco
// R1"), and TS only classifies rings from the stock name prefix.
- return upper.contains("G2") || upper.startsWith("EVEN R1")
+ // Even G1: its stock name, or g1v0's G1CFW_L_XXXXXX (before 0.5.66: G1v0_L, G1v0S_R).
+ return upper.contains("G2") || upper.startsWith("EVEN R1") || upper.startsWith("RAYNEO") ||
+ upper.startsWith("EVEN G1") || upper.startsWith("G1CFW_") || upper.startsWith("G1V0")
}
private fun buildJson(
diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawG1Flasher.kt b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawG1Flasher.kt
new file mode 100644
index 00000000..bcb22f7d
--- /dev/null
+++ b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawG1Flasher.kt
@@ -0,0 +1,106 @@
+package com.faceclaw.app
+
+import android.content.Context
+import android.os.Handler
+import android.os.Looper
+
+/**
+ * Android host for the shared [G1ArmFlashFlow]: owns the GATT link and the worker thread for one G1 arm's install, its
+ * restore to Even's firmware, or a question about what it runs, and delivers listener callbacks on the main thread. For app/native/g1-flasher.ts.
+ */
+class FaceclawG1Flasher(
+ context: Context,
+ address: String?,
+ side: String?,
+ firmwarePath: String?,
+ netCorePath: String?,
+ mode: String?,
+ connectWindowMs: Int,
+) {
+ private val link = AndroidStockLink(context.applicationContext)
+ private val mainHandler = Handler(Looper.getMainLooper())
+ private val lock = Any()
+
+ @Volatile
+ private var listener: FaceclawFirmwareFlasherListener? = null
+
+ @Volatile
+ private var worker: Thread? = null
+
+ private val flow =
+ G1ArmFlashFlow(
+ link,
+ address ?: "",
+ side ?: "",
+ firmwarePath ?: "",
+ netCorePath ?: "",
+ G1ArmFlashFlow.mode(mode ?: ""),
+ connectWindowMs,
+ object : FaceclawFirmwareFlasherListener {
+ override fun onLog(line: String?) {
+ android.util.Log.i(G1ArmFlashFlow.TAG, line ?: "")
+ post { it.onLog(line) }
+ }
+
+ override fun onProgress(
+ lens: String?,
+ componentIndex: Int,
+ componentCount: Int,
+ blockIndex: Int,
+ blockCount: Int,
+ bytesSent: Long,
+ bytesTotal: Long,
+ ) = post { it.onProgress(lens, componentIndex, componentCount, blockIndex, blockCount, bytesSent, bytesTotal) }
+
+ override fun onState(state: String?, detail: String?) = post { it.onState(state, detail ?: "") }
+
+ override fun onComplete(success: Boolean, detail: String?) = post { it.onComplete(success, detail ?: "") }
+ },
+ )
+
+ fun setListener(listener: FaceclawFirmwareFlasherListener?) {
+ this.listener = listener
+ }
+
+ fun start() {
+ synchronized(lock) {
+ if (worker != null) {
+ return
+ }
+ val w = Thread({ flow.run() }, "faceclaw-g1-flash")
+ worker = w
+ w.start()
+ }
+ }
+
+ fun cancel() {
+ flow.cancel()
+ }
+
+ fun close() {
+ cancel()
+ try {
+ link.close()
+ } catch (ignored: Exception) {
+ }
+ }
+
+ companion object {
+ /** The phone's pairing with an address these glasses no longer use. */
+ @JvmStatic
+ fun forgetPairing(context: Context, address: String?) {
+ if (address == null) return
+ val manager = context.applicationContext.getSystemService(Context.BLUETOOTH_SERVICE) as android.bluetooth.BluetoothManager
+ FaceclawBleManager.removeBond(manager.adapter.getRemoteDevice(address))
+ }
+ }
+
+ private fun post(action: (FaceclawFirmwareFlasherListener) -> Unit) {
+ mainHandler.post {
+ val current = listener
+ if (current != null) {
+ action(current)
+ }
+ }
+ }
+}
diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawVoiceController.kt b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawVoiceController.kt
index ad0531bb..ec143d1a 100644
--- a/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawVoiceController.kt
+++ b/App_Resources/Android/src/main/java/com/faceclaw/app/FaceclawVoiceController.kt
@@ -114,7 +114,9 @@ class FaceclawVoiceController(context: Context) {
}
}
- override fun createPacketDecoder(): AudioPacketDecoder = AndroidSpeechEngines.Lc3DecoderAdapter()
+ override fun createPacketDecoder(): AudioPacketDecoder =
+ if (communicator?.isRayNeoIo() == true) AndroidSpeechEngines.OpusDecoderAdapter()
+ else AndroidSpeechEngines.Lc3DecoderAdapter()
override fun openPhoneMic(): PcmAudioSource? = AndroidSpeechEngines.openPhoneMic(PHONE_MIC_CHUNK_SAMPLES)
diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/FontFileRenderer.kt b/App_Resources/Android/src/main/java/com/faceclaw/app/FontFileRenderer.kt
index fa33d1c3..b4597b71 100644
--- a/App_Resources/Android/src/main/java/com/faceclaw/app/FontFileRenderer.kt
+++ b/App_Resources/Android/src/main/java/com/faceclaw/app/FontFileRenderer.kt
@@ -167,6 +167,7 @@ class FontFileRenderer private constructor() {
* [width u16][height u16]
* [width*height coverage bytes, gamma-mapped]
* An ink-free glyph (space) has width = height = 0 but a valid advance.
+ * A color glyph (emoji) carries its ColorGlyphArt shade as its coverage.
* Empty array when the font cannot be loaded or the render fails.
*/
@JvmStatic
@@ -196,11 +197,16 @@ class FontFileRenderer private constructor() {
}
val penX = pad - bounds.left
val baselineY = pad - bounds.top
- val bitmap = Bitmap.createBitmap(bw, bh, Bitmap.Config.ALPHA_8)
+ // Drawn in color: an emoji the system fallback supplies from a color font
+ // would keep only its silhouette in an alpha-only bitmap. ColorGlyphArt shades
+ // color glyphs and passes white ones through as their alpha.
+ val bitmap = Bitmap.createBitmap(bw, bh, Bitmap.Config.ARGB_8888)
val canvas = Canvas(bitmap)
canvas.drawText(text, penX.toFloat(), baselineY.toFloat(), paint)
- val pixels = alpha8Pixels(bitmap, bw, bh)
+ val argb = IntArray(bw * bh)
+ bitmap.getPixels(argb, 0, bw, 0, 0, bw, bh)
bitmap.recycle()
+ val pixels = ColorGlyphArt.coverage(argb)
// Trim to the tight ink box; bearing/inkTop become pen- and
// line-relative inside the shared packer.
diff --git a/App_Resources/Android/src/main/java/com/faceclaw/app/ImageFileLoader.kt b/App_Resources/Android/src/main/java/com/faceclaw/app/ImageFileLoader.kt
index 1df754f9..5b0167b2 100644
--- a/App_Resources/Android/src/main/java/com/faceclaw/app/ImageFileLoader.kt
+++ b/App_Resources/Android/src/main/java/com/faceclaw/app/ImageFileLoader.kt
@@ -108,6 +108,64 @@ class ImageFileLoader private constructor() {
}
}
+ /** Longest side decodeRgbaFromBytes decodes at; larger images are subsampled. */
+ private const val MAX_RGBA_SIDE = 4096
+
+ /**
+ * Decode encoded image bytes (JPEG, PNG, WebP, GIF's first frame, BMP)
+ * to [widthLo, widthHi, heightLo, heightHi, R, G, B, A, ...] at native
+ * size, not premultiplied, so a transparent pixel keeps its colour;
+ * empty when undecodable. The EvenHub host converts these to grey the
+ * way the Even app does (app/apps/evenhub/image-pipeline.ts).
+ */
+ @JvmStatic
+ fun decodeRgbaFromBytes(buffer: java.nio.ByteBuffer?): ByteArray {
+ if (buffer == null) return ByteArray(0)
+ try {
+ val source = buffer.duplicate()
+ source.rewind()
+ val data = ByteArray(source.remaining())
+ source.get(data)
+ if (data.isEmpty()) return ByteArray(0)
+ val bounds = BitmapFactory.Options().apply { inJustDecodeBounds = true }
+ BitmapFactory.decodeByteArray(data, 0, data.size, bounds)
+ if (bounds.outWidth <= 0 || bounds.outHeight <= 0) return ByteArray(0)
+ var sample = 1
+ while (maxOf(bounds.outWidth, bounds.outHeight) / sample > MAX_RGBA_SIDE) sample *= 2
+ val options = BitmapFactory.Options().apply {
+ inPreferredConfig = Bitmap.Config.ARGB_8888
+ inPremultiplied = false
+ inSampleSize = sample
+ }
+ val bitmap = BitmapFactory.decodeByteArray(data, 0, data.size, options) ?: return ByteArray(0)
+ val width = bitmap.width
+ val height = bitmap.height
+ val argb = IntArray(width * height)
+ bitmap.getPixels(argb, 0, width, 0, 0, width, height)
+ bitmap.recycle()
+ val packet = ByteArray(4 + argb.size * 4)
+ packet[0] = (width and 0xff).toByte()
+ packet[1] = ((width shr 8) and 0xff).toByte()
+ packet[2] = (height and 0xff).toByte()
+ packet[3] = ((height shr 8) and 0xff).toByte()
+ for (i in argb.indices) {
+ val pixel = argb[i]
+ val o = 4 + i * 4
+ packet[o] = (pixel shr 16).toByte()
+ packet[o + 1] = (pixel shr 8).toByte()
+ packet[o + 2] = pixel.toByte()
+ packet[o + 3] = (pixel ushr 24).toByte()
+ }
+ return packet
+ } catch (e: Exception) {
+ Log.w(TAG, "RGBA image decode failed", e)
+ return ByteArray(0)
+ } catch (e: OutOfMemoryError) {
+ Log.w(TAG, "RGBA image decode failed", e)
+ return ByteArray(0)
+ }
+ }
+
/**
* Scale a bitmap to fit within maxWidth x maxHeight (preserving aspect,
* never upscaling) and convert it to the grayscale packet format.
diff --git a/App_Resources/iOS/Info.plist b/App_Resources/iOS/Info.plist
index a22eb26f..d2f2fe6a 100644
--- a/App_Resources/iOS/Info.plist
+++ b/App_Resources/iOS/Info.plist
@@ -13,7 +13,7 @@
CFBundleDisplayName
Faceclaw
CFBundleShortVersionString
- 0.8.6
+ 0.9.0
CFBundleVersion
1
LSRequiresIPhoneOS
diff --git a/App_Resources/iOS/src/FaceclawFontRenderer.m b/App_Resources/iOS/src/FaceclawFontRenderer.m
index d7598ca6..823f93b3 100644
--- a/App_Resources/iOS/src/FaceclawFontRenderer.m
+++ b/App_Resources/iOS/src/FaceclawFontRenderer.m
@@ -1,6 +1,7 @@
#import "FaceclawFontRenderer.h"
#import
#import
+#import
#import
// Immutable font descriptors may be shared; layout objects never cross threads.
@@ -42,8 +43,9 @@ static BOOL HasColorRun(CTLineRef line) {
}
// iOS falls back to Apple Color Emoji for default-text symbols the face lacks
// (▶ U+25B6 in Roboto), where Android's minikin picks a text font; the
-// alpha-only raster keeps just the emoji's silhouette (▶ becomes a solid
-// rounded square). Request text presentation (U+FE0E) for each lone codepoint
+// emoji is a tile (▶ becomes a rounded square: a silhouette in the alpha-only
+// line rasters, a shaded tile in glyph cells), which reads worse than the
+// text symbol. Request text presentation (U+FE0E) for each lone codepoint
// that fell back to a color font, wherever a text font can supply it. Returns
// `text` itself when nothing changes.
static NSString *PreferTextPresentation(CTFontRef font, NSString *text, CTLineRef line, BOOL glyphLayout) {
@@ -78,18 +80,34 @@ static BOOL ValidText(NSString *text) { return text != nil && text.length <= 100
static BOOL ValidRaster(NSInteger width, NSInteger height) {
return width > 0 && height > 0 && width <= 65535 && height <= 65535 && width * height <= 4000000;
}
+static void ConfigureTextContext(CGContextRef ctx) {
+ CGContextSetShouldAntialias(ctx, true);
+ CGContextSetShouldSmoothFonts(ctx, false); // Grayscale coverage, never LCD subpixel color.
+ CGContextSetShouldSubpixelPositionFonts(ctx, true);
+ CGContextSetShouldSubpixelQuantizeFonts(ctx, false);
+ CGContextSetTextMatrix(ctx, CGAffineTransformIdentity);
+}
static CGContextRef CreateContext(NSMutableData *pixels, NSInteger width, NSInteger height) CF_RETURNS_RETAINED {
CGContextRef ctx = CGBitmapContextCreate(pixels.mutableBytes, width, height, 8, width, NULL, (CGBitmapInfo)kCGImageAlphaOnly);
if (ctx) {
- CGContextSetShouldAntialias(ctx, true);
- CGContextSetShouldSmoothFonts(ctx, false); // Grayscale coverage, never LCD subpixel color.
- CGContextSetShouldSubpixelPositionFonts(ctx, true);
- CGContextSetShouldSubpixelQuantizeFonts(ctx, false);
- CGContextSetTextMatrix(ctx, CGAffineTransformIdentity);
+ ConfigureTextContext(ctx);
CGContextSetGrayFillColor(ctx, 1, 1);
}
return ctx;
}
+// Premultiplied RGBA bytes, for a line with a color (emoji) run: an alpha-only raster keeps
+// just the emoji's silhouette, so its colors go to ColorGlyphArt to be shaded instead.
+static CGContextRef CreateColorContext(NSMutableData *pixels, NSInteger width, NSInteger height) CF_RETURNS_RETAINED {
+ CGColorSpaceRef space = CGColorSpaceCreateWithName(kCGColorSpaceSRGB);
+ CGContextRef ctx = CGBitmapContextCreate(pixels.mutableBytes, width, height, 8, width * 4, space,
+ (CGBitmapInfo)kCGImageAlphaPremultipliedLast | kCGBitmapByteOrder32Big);
+ CGColorSpaceRelease(space);
+ if (ctx) {
+ ConfigureTextContext(ctx);
+ CGContextSetRGBFillColor(ctx, 1, 1, 1, 1);
+ }
+ return ctx;
+}
static void U16(uint8_t *out, NSInteger value) { out[0] = value & 255; out[1] = (value >> 8) & 255; }
static void GammaCopy(uint8_t *dst, const uint8_t *src, NSInteger count, double gamma) {
if (!isfinite(gamma) || gamma <= 0) gamma = 1;
@@ -150,10 +168,13 @@ static NSData *ImagePacket(NSData *pixels, NSInteger width, NSInteger height, do
NSInteger bottom = floor(CGRectGetMinY(bounds)) - 2;
NSInteger width = ceil(CGRectGetMaxX(bounds)) + 2 - left, height = top - bottom;
if (!ValidRaster(width, height)) { CFRelease(line); CFRelease(font); return [NSData data]; }
- NSMutableData *pixels = [NSMutableData dataWithLength:width * height];
- CGContextRef ctx = CreateContext(pixels, width, height);
+ BOOL color = HasColorRun(line);
+ NSMutableData *raster = [NSMutableData dataWithLength:width * height * (color ? 4 : 1)];
+ CGContextRef ctx = color ? CreateColorContext(raster, width, height) : CreateContext(raster, width, height);
if (!ctx) { CFRelease(line); CFRelease(font); return [NSData data]; }
CGContextSetTextPosition(ctx, -left, -bottom); CTLineDraw(line, ctx); CGContextRelease(ctx);
+ NSData *pixels = color ? [[FaceclawKitIosColorGlyph shared] shadeRgba:raster] : raster;
+ if ((NSInteger)pixels.length != width * height) { CFRelease(line); CFRelease(font); return [NSData data]; }
const uint8_t *src = pixels.bytes;
NSInteger x0 = width, y0 = height, x1 = -1, y1 = -1;
for (NSInteger y = 0; y < height; y++) for (NSInteger x = 0; x < width; x++) if (src[y * width + x]) {
diff --git a/App_Resources/iOS/src/FaceclawGraphics.h b/App_Resources/iOS/src/FaceclawGraphics.h
index 2f71ddcd..f948c1e3 100644
--- a/App_Resources/iOS/src/FaceclawGraphics.h
+++ b/App_Resources/iOS/src/FaceclawGraphics.h
@@ -14,4 +14,10 @@
+ (NSData *)bgraPacket:(CGImageRef)image maxSize:(NSInteger)maxSize;
/** bgraPacket of encoded image bytes (JPEG, PNG, ...); nil when undecodable. */
+ (NSData *)bgraPacketFromImageData:(NSData *)data maxSize:(NSInteger)maxSize;
+/**
+ * [widthLo, widthHi, heightLo, heightHi, RGBA...] of encoded image bytes at native size
+ * (at most 4096 px a side), first frame only; nil when undecodable. CoreGraphics
+ * premultiplies, so transparent pixels come out black. For the EvenHub image pipeline.
+ */
++ (NSData *)rgbaPacketFromImageData:(NSData *)data;
@end
diff --git a/App_Resources/iOS/src/FaceclawGraphics.m b/App_Resources/iOS/src/FaceclawGraphics.m
index cd8f3f16..fbc7fb9e 100644
--- a/App_Resources/iOS/src/FaceclawGraphics.m
+++ b/App_Resources/iOS/src/FaceclawGraphics.m
@@ -158,4 +158,26 @@
CGImageRelease(image);
return packet;
}
++ (NSData *)rgbaPacketFromImageData:(NSData *)data {
+ if (!data.length) return nil;
+ CGImageSourceRef source = CGImageSourceCreateWithData((__bridge CFDataRef)data, NULL);
+ if (!source) return nil;
+ CGImageRef image = CGImageSourceCreateImageAtIndex(source, 0, NULL);
+ CFRelease(source);
+ if (!image) return nil;
+ size_t width = CGImageGetWidth(image), height = CGImageGetHeight(image);
+ if (width == 0 || height == 0 || width > 4096 || height > 4096) { CGImageRelease(image); return nil; }
+ uint8_t dimensions[] = { width & 255, (width >> 8) & 255, height & 255, (height >> 8) & 255 };
+ NSMutableData *packet = [NSMutableData dataWithBytes:dimensions length:4];
+ [packet increaseLengthBy:width * height * 4];
+ CGColorSpaceRef space = CGColorSpaceCreateDeviceRGB();
+ CGContextRef context = CGBitmapContextCreate((uint8_t *)packet.mutableBytes + 4, width, height, 8, width * 4, space,
+ kCGBitmapByteOrder32Big | (CGBitmapInfo)kCGImageAlphaPremultipliedLast);
+ CGColorSpaceRelease(space);
+ if (!context) { CGImageRelease(image); return nil; }
+ CGContextDrawImage(context, CGRectMake(0, 0, width, height), image);
+ CGContextRelease(context);
+ CGImageRelease(image);
+ return packet;
+}
@end
diff --git a/CHANGELOG b/CHANGELOG
index 125d7a77..78c74f45 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,26 @@
# Changelog
+## 0.9.0 - 2026-11-08
+
+### Major Features
+
+* Add support for the Even Realities G1
+* Add support for the Apple Watch
+
+### Minor Features
+* Show charging case battery for the G2
+* Terminals now default to opening in the same window rather than opening a new window
+* Better rendering of color emojis
+* Inrease the max timeout for glanceboard show-on-tap display
+* Fix some minor issues in the oboarding flow
+* Add option to auto-close notification popups after a delay
+
+### Bug Fixes
+
+* Fix an issue that would cause microphone permission check to fail if you swiped away the Android Activity
+* Fix an issue that broke the Nightscout widget on the status bar on iOS
+* Fix an issue were EvenHub app texet containers weren't indented correctly
+
## 0.8.6 - 2026-11-01
* Connect directly to the R1 ring rather than indirectly via the glasses
diff --git a/CLAUDE.md b/CLAUDE.md
index 041eb486..839e965e 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -43,7 +43,10 @@ local checkout above this workspace at ../g2-kit-unofficial.
This Android app uses a modded firmware for the G2 smart glasses. Source code
to the corresponding firmware modifications lives in
https://github.com/jimrandomh/g2flash; there is a compiled version of the
-firmware patch-set in app/g2/firmware/cfw-patches.ts. Strongly prefer making
-changes to the Android app over making changes to changes to the firmware, as
-firmware development is considerably more fraught.
+firmware patch-set in app/g2/firmware/cfw-patches.ts, regenerated by
+scripts/update_deltas.sh. Even G1 glasses run g1v0, a firmware from ScouterKit
+(currently checked out at ~/src/scouter_kit, in g1_firmware/); Faceclaw embeds
+it in app/g1/firmware/, regenerated by scripts/update_g1_firmware.sh VERSION.
+Strongly prefer making changes to the Android app over making changes to the
+firmware, as firmware development is considerably more fraught.
diff --git a/app/analytics/privacy-disclosure.ts b/app/analytics/privacy-disclosure.ts
index 9cc2ed43..ede51f26 100644
--- a/app/analytics/privacy-disclosure.ts
+++ b/app/analytics/privacy-disclosure.ts
@@ -1,10 +1,6 @@
-/** Conditional wording: also shown on self-built iOS apps, where TestFlight does not apply. */
-export const IOS_PRIVACY_NOTICE = [
- "If installed with TestFlight, Apple automatically collects crash logs, installs, sessions, and device/app details and shares them with Faceclaw's developers. This continues even when Faceclaw statistics are None; the app cannot turn it off.",
- "Joining only through a public link hides your name and email from us, not from Apple. Email invitations can identify you. Optional feedback can disclose your email, comments, screenshots and diagnostics. Review what you send.",
- "iPhone Settings > Privacy & Security > Analytics & Improvements controls ordinary iOS analytics. It does not stop TestFlight crash reports. Faceclaw cannot change Apple's analytics settings.",
- "To leave the beta, open Faceclaw in TestFlight and choose Stop Testing, then stop using and uninstall the beta. This does not erase earlier reports. Details: Settings > Privacy > Privacy policy.",
-].join("\n\n");
-
+/**
+ * One-line pointer for iOS. The full TestFlight disclosure lives only in the
+ * PRIVACY file (shown in-app as Settings > Privacy > Privacy policy).
+ */
export const IOS_PRIVACY_SUMMARY =
- "With TestFlight, crash/usage reports continue even with None. Open iOS / TestFlight privacy for details.";
+ "With TestFlight, crash/usage reports continue even with None. See Privacy policy for details.";
diff --git a/app/app.css b/app/app.css
index b59200cd..28d6483c 100644
--- a/app/app.css
+++ b/app/app.css
@@ -81,12 +81,6 @@ Button.-primary {
font-size: 18;
}
-/* The logo art is black-on-transparent; tint it light in dark mode so it
- * doesn't vanish into the dark page background. */
-.ns-dark .onboarding-logo {
- tint-color: #e6e6e6;
-}
-
/* License / privacy-policy links in the onboarding disclaimer footer. The
* padding widens the tap target beyond the small text. */
.footer-link {
diff --git a/app/app.ios.css b/app/app.ios.css
index 4245407f..b3b6f08c 100644
--- a/app/app.ios.css
+++ b/app/app.ios.css
@@ -5,6 +5,7 @@
.body-text { font-size: 18; }
.h1 { font-size: 28; font-weight: bold; }
.footer-link { color: #285c45; padding: 4 8; text-decoration: underline; }
+.ns-dark .footer-link { color: #7bc47f; }
Page {
background-color: #f5f5f2;
diff --git a/app/apps/app-definition.ts b/app/apps/app-definition.ts
index b46c809d..a51adf4f 100644
--- a/app/apps/app-definition.ts
+++ b/app/apps/app-definition.ts
@@ -30,6 +30,13 @@ export type AppDefinition = {
boot?: (ctx: AppContext) => void;
/** False for apps that must not appear in the launcher grid (the launcher itself). */
showInLauncher?: boolean;
+ /**
+ * False while the paired glasses can't run the app (absent means they can).
+ * It then leaves the launcher grid and what mirrors it: the watch remote and
+ * the apps.launch tool. A window restored from before a re-pair still opens,
+ * so the app needs to say what's wrong rather than assume it never runs.
+ */
+ isSupported?: () => boolean;
/** Present on the app that handles text shared via the Android share intent. */
openSharedText?: (ctx: AppContext, title: string, text: string) => void;
/**
diff --git a/app/apps/compass/compass-app.ts b/app/apps/compass/compass-app.ts
index 27cb1303..8c01ff0f 100644
--- a/app/apps/compass/compass-app.ts
+++ b/app/apps/compass/compass-app.ts
@@ -10,6 +10,7 @@ import {
type CompassDiagnostics,
} from "../../native/compass";
import { wrapText } from "../../graphics/textwrap";
+import { glassesHaveCompass } from "../../ui/dashboard-settings";
import { type InputEvent } from "../../ui/gestures";
import { type Layer, type LayerContext } from "../../ui/layers";
import { lineStep } from "../../ui/metrics";
@@ -151,6 +152,7 @@ class CompassLayer implements Layer {
}
private statusText(): string {
+ if (!glassesHaveCompass()) return "These glasses have no compass sensor";
if (this.firmwareStatus !== null) return this.firmwareStatus;
if (!this.enabled) return "Compass paused";
if (this.rawHeading === null) return "Waiting for compass data…";
@@ -206,8 +208,10 @@ class CompassLayer implements Layer {
image.drawText(small, Math.round(cx - small.measureText(line) / 2), y, line, 125);
y += smallStep;
}
- const accuracyText = magneticAccuracyText(this.diagnostics);
- image.drawText(small, width - ACCURACY_RIGHT_PAD - small.measureText(accuracyText), ACCURACY_TOP_PAD, accuracyText, 175);
+ if (glassesHaveCompass()) {
+ const accuracyText = magneticAccuracyText(this.diagnostics);
+ image.drawText(small, width - ACCURACY_RIGHT_PAD - small.measureText(accuracyText), ACCURACY_TOP_PAD, accuracyText, 175);
+ }
return image;
}
@@ -216,7 +220,7 @@ class CompassLayer implements Layer {
// "Uncalibrated" prompt advertises, and re-calibrating is a normal thing to
// want once the glasses have been taken off and put back on.
handleInput(event: InputEvent, ctx: LayerContext): void {
- if (event.type === "click") this.openCalibration(ctx);
+ if (event.type === "click" && glassesHaveCompass()) this.openCalibration(ctx);
}
}
@@ -231,7 +235,7 @@ export function createCompassAppWindow(options: InProcessAppOptions): InProcessW
icon: "compass",
closeable: true,
actions: options.actions,
- menuItems: () => [
+ menuItems: () => !glassesHaveCompass() ? [] : [
{
label: "Calibrate",
onSelect: (ctx) => {
diff --git a/app/apps/compass/index.ts b/app/apps/compass/index.ts
index 4b8442a8..6741a735 100644
--- a/app/apps/compass/index.ts
+++ b/app/apps/compass/index.ts
@@ -1,3 +1,4 @@
+import { glassesHaveCompass } from "../../ui/dashboard-settings";
import { type AppDefinition } from "../app-definition";
import { COMPASS_SURFACE_ID, COMPASS_WINDOW_ID, createCompassAppWindow } from "./compass-app";
@@ -5,6 +6,7 @@ const compassApp: AppDefinition = {
appId: "compass",
title: "Compass",
icon: "compass",
+ isSupported: glassesHaveCompass,
launch: (ctx) => ctx.launchInProcessApp(COMPASS_WINDOW_ID, COMPASS_SURFACE_ID, createCompassAppWindow),
};
diff --git a/app/apps/developer/ring-status.ts b/app/apps/developer/ring-status.ts
index 876aa506..a680a3dc 100644
--- a/app/apps/developer/ring-status.ts
+++ b/app/apps/developer/ring-status.ts
@@ -4,7 +4,7 @@ import { type InputEvent } from "../../ui/gestures";
import { Layer, type LayerContext } from "../../ui/layers";
import { shell } from "../../ui/shell/shell";
import { MenuLayer, type MenuItem } from "../../ui/menu";
-import { ringConnectionModeSetting } from "../../ui/dashboard-settings";
+import { effectiveRingConnectionMode, ringConnectionModeSetting } from "../../ui/dashboard-settings";
import { loadDeviceAddresses } from "../../g2/device-addresses";
import {
getRingSessionStatus,
@@ -146,7 +146,7 @@ export class RingStatusLayer implements Layer {
}
if (!s.directEnabled) {
- const pending = ringConnectionModeSetting.get() !== "glasses";
+ const pending = effectiveRingConnectionMode() !== "glasses";
rows.push({ label: "Direct link", value: pending ? "on after glasses reconnect" : "off (only via glasses)", dim: true });
} else {
const state = s.directNotificationsReady ? "subscribed"
diff --git a/app/apps/evenhub/compositor.ts b/app/apps/evenhub/compositor.ts
index 8518facf..7886b5b2 100644
--- a/app/apps/evenhub/compositor.ts
+++ b/app/apps/evenhub/compositor.ts
@@ -7,16 +7,23 @@
* match what apps expect. Extended layouts may pick other fonts per container
* (fonts.ts), which wrap with Faceclaw's own text wrapping.
*
+ * Containers stack in stock's order (paintOrder): without zOrderIndex, lists,
+ * then texts, then images, so an image container covers text beneath it. Text
+ * containers are transparent windows that clip their text and scroll it.
+ *
* Known deviations from stock, acceptable for now:
* - List rendering is a plain vertical list. A non-zero itemWidth sets the
* selection outline's width and truncates long items to fit, as on stock;
* whether stock also lays narrow items out side by side is unknown.
* - Lists scroll with our menus' animation and bounce (see list-menu.ts).
+ * - Text scrolls in jumps; stock eases each 28px step over 200ms and
+ * rubber-bands at the ends.
*/
import { GrayImage } from "../../graphics/image";
import { containerFace } from "./fonts";
import {
- type EvenHubContainer,
+ borderGrey,
+ paintOrder,
type EvenHubImageContainer,
type EvenHubListContainer,
type EvenHubPage,
@@ -30,35 +37,122 @@ export const EVENHUB_SCREEN_HEIGHT = 288;
const TEXT_WHITE = 255;
/**
- * SDK 0.0.14 textColor levels 0..4 as grey values. Level 4 is the default and
- * the only one apps got before 0.0.14, so it must stay exactly TEXT_WHITE.
- * Level 0 is the firmware's "fully dim" step, which over the black page
- * background means the text is effectively not shown.
+ * SDK 0.0.14 textColor levels 0..4 as the greys stock draws them (measured
+ * in the firmware emulator): level 0 is dim, not off. A missing or
+ * out-of-range level draws white, the only colour before 0.0.14.
*/
-const TEXT_BRIGHTNESS_GREYS = [0, 64, 128, 191, 255];
+const TEXT_BRIGHTNESS_GREYS = [51, 102, 153, 204, 255];
function textGrey(level: number | undefined): number {
return level === undefined ? TEXT_WHITE : (TEXT_BRIGHTNESS_GREYS[level] ?? TEXT_WHITE);
}
-/** Chars the font lacks are skipped silently on stock (no tofu); EvenHubFont
- * skips unknown glyphs, matching that. */
-function paintTextContainer(image: GrayImage, container: EvenHubTextContainer): void {
- // Only the text dims: textColor is a text-brightness level, and stock draws
- // the container's border at full brightness regardless.
- paintBorder(image, container);
+/**
+ * The scrollbar stock draws on any text container whose text overflows
+ * (LV_SCROLLBAR_MODE_AUTO), whether or not it captures input: 4px wide, 10px
+ * in from the right edge, in a track 6px in from top and bottom, with its
+ * corner pixels cut. Measured in the firmware emulator.
+ */
+const SCROLLBAR_GREY = 187;
+const SCROLLBAR_WIDTH = 4;
+const SCROLLBAR_RIGHT_INSET = 10;
+const SCROLLBAR_TRACK_INSET = 6;
+
+type Rect = { x: number; y: number; width: number; height: number };
+
+/** A text container's wrapped lines and the geometry its scrolling works in. */
+export type TextLayout = {
+ lines: string[];
+ lineHeight: number;
+ /** Left edge and unscrolled top of the text. */
+ contentX: number;
+ contentY: number;
+ /** Height of the window the text scrolls in (inside border and padding). */
+ viewportHeight: number;
+ /** Largest scrollY: how far the text overflows that window. */
+ maxScroll: number;
+};
+
+/**
+ * Stock lays text out at x + border + padding and wraps it at width - 2 *
+ * padding: the label is sized ignoring the border, so a line can run into
+ * the right border, where it is clipped.
+ */
+export function layoutText(container: EvenHubTextContainer): TextLayout {
const inset = container.borderWidth + container.paddingLength;
const face = containerFace(container.font);
- const lines = face.wrap(container.content, Math.max(1, container.width - 2 * inset));
- for (let i = 0; i < lines.length; i++) {
- face.drawText(image, container.x + inset, container.y + inset + i * face.lineHeight, lines[i]!, textGrey(container.textColor));
+ const lines = face.wrap(container.content, Math.max(1, container.width - 2 * container.paddingLength));
+ const viewportHeight = Math.max(0, container.height - 2 * inset);
+ return {
+ lines,
+ lineHeight: face.lineHeight,
+ contentX: container.x + inset,
+ contentY: container.y + inset,
+ viewportHeight,
+ maxScroll: Math.max(0, lines.length * face.lineHeight - viewportHeight),
+ };
+}
+
+/**
+ * Text is clipped at the border's inner edge (at the container's edge when it
+ * has no border). Lines wholly inside stay deferred firmware-text draws; a
+ * line the edge cuts is rasterized and blitted clipped. Chars the font lacks
+ * are skipped silently, as on stock (no tofu).
+ */
+function paintTextContainer(image: GrayImage, container: EvenHubTextContainer): void {
+ // Only the text dims: textColor is a text-brightness level; the border has its own color.
+ paintBorder(image, container);
+ const layout = layoutText(container);
+ const face = containerFace(container.font);
+ const grey = textGrey(container.textColor);
+ const border = container.borderWidth;
+ const clip: Rect = {
+ x: container.x + border,
+ y: container.y + border,
+ width: Math.max(0, container.width - 2 * border),
+ height: Math.max(0, container.height - 2 * border),
+ };
+ for (let i = 0; i < layout.lines.length; i++) {
+ const y = layout.contentY + i * layout.lineHeight - container.scrollY;
+ const bottom = y + layout.lineHeight;
+ if (bottom <= clip.y || y >= clip.y + clip.height) continue;
+ const line = layout.lines[i]!;
+ if (y >= clip.y && bottom <= clip.y + clip.height && layout.contentX + face.measureLine(line) <= clip.x + clip.width) {
+ face.drawText(image, layout.contentX, y, line, grey);
+ continue;
+ }
+ const strip = new GrayImage(container.width, layout.lineHeight, 0);
+ face.drawText(strip, layout.contentX - container.x, 0, line, grey);
+ const visibleTop = Math.max(y, clip.y);
+ image.bitBlt(strip.withDrawsBaked(), clip.x, visibleTop, {
+ sx: clip.x - container.x,
+ sy: visibleTop - y,
+ width: clip.width,
+ height: Math.min(bottom, clip.y + clip.height) - visibleTop,
+ transparentZero: true,
+ });
+ }
+ if (layout.maxScroll > 0) paintScrollbar(image, container, layout);
+}
+
+function paintScrollbar(image: GrayImage, container: EvenHubTextContainer, layout: TextLayout): void {
+ const height = container.height;
+ const track = height - 2 * SCROLLBAR_TRACK_INSET;
+ const length = Math.floor((track * height) / (height + layout.maxScroll));
+ if (track <= 0 || length <= 0) return;
+ const top = container.y + SCROLLBAR_TRACK_INSET + Math.floor(((track - length) * container.scrollY) / layout.maxScroll);
+ const left = container.x + container.width - SCROLLBAR_RIGHT_INSET;
+ for (let row = 0; row < length; row++) {
+ const end = row === 0 || row === length - 1;
+ image.fillRect(end ? left + 1 : left, top + row, end ? SCROLLBAR_WIDTH - 2 : SCROLLBAR_WIDTH, 1, SCROLLBAR_GREY);
}
}
function paintBorder(
image: GrayImage,
- container: { x: number; y: number; width: number; height: number; borderWidth: number; borderRadius: number },
+ container: { x: number; y: number; width: number; height: number; borderWidth: number; borderColor: number; borderRadius: number },
): void {
+ const grey = borderGrey(container.borderColor);
for (let i = 0; i < container.borderWidth; i++) {
if (container.borderRadius > 0) {
image.drawRoundedRect(
@@ -66,28 +160,28 @@ function paintBorder(
container.y + i,
container.width - 2 * i,
container.height - 2 * i,
- TEXT_WHITE,
+ grey,
Math.max(0, container.borderRadius - i),
);
} else {
- image.drawRect(container.x + i, container.y + i, container.width - 2 * i, container.height - 2 * i, TEXT_WHITE);
+ image.drawRect(container.x + i, container.y + i, container.width - 2 * i, container.height - 2 * i, grey);
}
}
}
+/**
+ * An opaque bitmap (black pixels cover what's beneath). Updates are converted
+ * to exactly the container's size (image-pipeline.ts); pixels an extended
+ * layout carried over from a differently sized container are clipped.
+ */
function paintImageContainer(image: GrayImage, container: EvenHubImageContainer): void {
if (!container.pixels || container.pixelsWidth <= 0 || container.pixelsHeight <= 0) return;
const source = new GrayImage(container.pixelsWidth, container.pixelsHeight, 0);
source.pixels.set(container.pixels);
- // Stock quirk: raw data smaller than the container tiles/repeats to fill it.
- for (let ty = 0; ty < container.height; ty += container.pixelsHeight) {
- for (let tx = 0; tx < container.width; tx += container.pixelsWidth) {
- image.bitBlt(source, container.x + tx, container.y + ty, {
- width: Math.min(container.pixelsWidth, container.width - tx),
- height: Math.min(container.pixelsHeight, container.height - ty),
- });
- }
- }
+ image.bitBlt(source, container.x, container.y, {
+ width: Math.min(container.pixelsWidth, container.width),
+ height: Math.min(container.pixelsHeight, container.height),
+ });
}
function paintListContainer(image: GrayImage, container: EvenHubListContainer, focused: boolean): void {
@@ -95,36 +189,23 @@ function paintListContainer(image: GrayImage, container: EvenHubListContainer, f
paintListItems(image, container, containerFace(container.font), focused);
}
-/** Bottom-to-top paint order for a page's containers. */
-function paintOrder(containers: EvenHubContainer[]): EvenHubContainer[] {
- const anyZ = containers.some((c) => c.zOrderIndex !== undefined);
- if (anyZ) {
- // Explicit z-order: larger zOrderIndex renders closer to the front, i.e.
- // painted later. (Stock requires all-or-nothing + unique values.)
- return [...containers].sort((a, b) => (a.zOrderIndex ?? 0) - (b.zOrderIndex ?? 0));
- }
- // Default (no z-order): image containers sit below lists and text. Cross-type
- // order isn't defined by the wire format (separate object arrays), so this is
- // our choice, matching stock. Order within each group is preserved.
- const images = containers.filter((c) => c.kind === "image");
- const rest = containers.filter((c) => c.kind !== "image");
- return [...images, ...rest];
-}
-
/** Render a page into a fresh app-viewport image (positioned by the shell). */
export function compositePage(page: EvenHubPage | null, size: { width: number; height: number }, focused: boolean): GrayImage {
const image = new GrayImage(size.width, size.height, 0);
if (!page) return image;
for (const container of paintOrder(page.containers)) {
switch (container.kind) {
- case "image":
+ case "image": {
+ if (!container.pixels) break; // Nothing is drawn before the first update.
// Text painted so far is deferred draws (firmware-text runs), which
- // would otherwise render above this container's raster. Stock puts a
- // later image container OVER earlier text, so bake the pending draws
- // first; text painted after this container stays deferred (and above).
- image.bakeDeferredDrawsInPlace();
+ // would otherwise render above this container's raster. The image is
+ // opaque and covers what's under it, so bake the draws it overlaps
+ // first; the others, and text painted later, stay deferred.
+ const box: Rect = { x: container.x, y: container.y, width: container.width, height: container.height };
+ image.bakeDeferredDrawsWithin(box);
paintImageContainer(image, container);
break;
+ }
case "text":
paintTextContainer(image, container);
break;
diff --git a/app/apps/evenhub/containers.ts b/app/apps/evenhub/containers.ts
index 6cb7f629..a2bb79d7 100644
--- a/app/apps/evenhub/containers.ts
+++ b/app/apps/evenhub/containers.ts
@@ -6,6 +6,7 @@
* reads go through loose key matching (the SDK's pickLoose behavior).
*/
import { mergeFontSpecs, parseFontSpec, type EvenHubFontSpec } from "./font-spec";
+import { inStockImageRange } from "./image-pipeline";
export type EvenHubTextContainer = {
kind: "text";
@@ -16,6 +17,8 @@ export type EvenHubTextContainer = {
width: number;
height: number;
borderWidth: number;
+ /** Firmware border color index 0..16; see borderGrey. */
+ borderColor: number;
borderRadius: number;
paddingLength: number;
isEventCapture: boolean;
@@ -27,6 +30,11 @@ export type EvenHubTextContainer = {
textColor: number | undefined;
/** Extended-layout font (merged with the layout's default); undefined is the stock font. */
font: EvenHubFontSpec | undefined;
+ /**
+ * How far the text is scrolled up, in pixels. Host-local like a list's
+ * selection: stock scrolls an overflowing capture container itself.
+ */
+ scrollY: number;
};
export type EvenHubImageContainer = {
@@ -54,6 +62,8 @@ export type EvenHubListContainer = {
width: number;
height: number;
borderWidth: number;
+ /** Firmware border color index 0..16; see borderGrey. */
+ borderColor: number;
borderRadius: number;
paddingLength: number;
isEventCapture: boolean;
@@ -80,7 +90,7 @@ export type EvenHubMenuItem = {
};
export type EvenHubPage = {
- /** In declaration order (lists, images, texts); z-sorted at paint time. */
+ /** Lists, then texts, then images, each in declaration order (stock's container list order); z-sorted at paint time. */
containers: EvenHubContainer[];
/**
* The page's contextual-menu entries (SDK 0.0.14 `menuObject`). Empty when
@@ -92,6 +102,26 @@ export type EvenHubPage = {
/** Stock draws at most a 5px border; wider requests are clamped. */
const MAX_BORDER_WIDTH = 5;
+/**
+ * Stock firmware limits for list and text containers (common_text_create /
+ * common_list_create clamp to these), from the evenRealities-openCFW
+ * reconstruction. Extended layouts are exempt: they have their own canvas.
+ */
+const STOCK_SCREEN_WIDTH = 576;
+const STOCK_SCREEN_HEIGHT = 288;
+const STOCK_MAX_BORDER_COLOR = 16;
+const STOCK_MAX_BORDER_RADIUS = 10;
+const STOCK_MAX_PADDING = 32;
+const STOCK_MAX_LIST_ITEMS = 20;
+
+/**
+ * The border color index's grey: indices 0..15 step by 0x11 (0 is black, so a
+ * border without a color is invisible) and 16 is white.
+ */
+export function borderGrey(index: number): number {
+ return index >= 0 && index < 16 ? index * 0x11 : 0xff;
+}
+
/** Firmware brightness levels for text; 4 is the device default. */
const MIN_TEXT_BRIGHTNESS = 0;
const MAX_TEXT_BRIGHTNESS = 4;
@@ -154,6 +184,11 @@ function readBorderWidth(json: Record): number {
return Math.max(0, Math.min(MAX_BORDER_WIDTH, readNumber(json, "borderWidth", 0)));
}
+/** A protobuf field, so an omitted borderColor is 0 (black). */
+function readBorderColor(json: Record): number {
+ return Math.max(0, readNumber(json, "borderColor", 0));
+}
+
/** A container's font: its own `font` over the layout-wide default. */
function readFont(json: Record, layoutFont: EvenHubFontSpec | undefined): EvenHubFontSpec | undefined {
return mergeFontSpecs(layoutFont, parseFontSpec(pickLoose(json, "font")));
@@ -169,6 +204,7 @@ function parseTextContainer(json: Record, layoutFont: EvenHubFo
width: readNumber(json, "width", 0),
height: readNumber(json, "height", 0),
borderWidth: readBorderWidth(json),
+ borderColor: readBorderColor(json),
borderRadius: readNumber(json, "borderRadius", 0),
paddingLength: readNumber(json, "paddingLength", 0),
isEventCapture: readFlag(json, "isEventCapture"),
@@ -177,6 +213,7 @@ function parseTextContainer(json: Record, layoutFont: EvenHubFo
content: readString(json, "content", ""),
textColor: readTextBrightness(json),
font: readFont(json, layoutFont),
+ scrollY: 0,
};
}
@@ -262,6 +299,7 @@ function parseListContainer(json: Record, layoutFont: EvenHubFo
width: readNumber(json, "width", 0),
height: readNumber(json, "height", 0),
borderWidth: readBorderWidth(json),
+ borderColor: readBorderColor(json),
borderRadius: readNumber(json, "borderRadius", 0),
paddingLength: readNumber(json, "paddingLength", 0),
isEventCapture: readFlag(json, "isEventCapture"),
@@ -277,9 +315,8 @@ function parseListContainer(json: Record, layoutFont: EvenHubFo
/**
* Parse a CreateStartUpPageContainer / RebuildPageContainer payload into a
- * page. Containers keep declaration order within and across the three arrays
- * (lists, then images, then texts — texts last so info panels and capture
- * containers sit above image tiles when no zOrderIndex is given).
+ * page. Containers are kept in stock's container-list order: lists, then
+ * texts, then images, each in declaration order (evenhub_build_container_list).
*
* The whole page is replaced on rebuild, which is also what gives an omitted
* menuObject its documented meaning: the previous contextual menu goes away.
@@ -292,20 +329,100 @@ export function parsePage(data: Record): EvenHubPage {
if (Array.isArray(lists)) {
for (const item of lists) containers.push(parseListContainer(asRecord(item), layoutFont));
}
- const images = pickLoose(data, "imageObject");
- if (Array.isArray(images)) {
- for (const item of images) containers.push(parseImageContainer(asRecord(item)));
- }
const texts = pickLoose(data, "textObject");
if (Array.isArray(texts)) {
for (const item of texts) containers.push(parseTextContainer(asRecord(item), layoutFont));
}
+ const images = pickLoose(data, "imageObject");
+ if (Array.isArray(images)) {
+ for (const item of images) containers.push(parseImageContainer(asRecord(item)));
+ }
return { containers, menuItems: parseMenuItems(data) };
}
-/** The container that owns gesture events (exactly one per valid page). */
-export function eventCaptureContainer(page: EvenHubPage): EvenHubContainer | undefined {
- return page.containers.find(
- (container) => container.kind !== "image" && container.isEventCapture,
- );
+/**
+ * Clamp a stock page's containers the way the firmware does when it creates
+ * them: positions and sizes to the 576x288 screen (images keep their size,
+ * which a separate check rejects instead), border color, radius and padding to
+ * their maxima, and lists to 20 items. Not for extended layouts.
+ */
+export function clampToStockLimits(page: EvenHubPage): void {
+ for (const c of page.containers) {
+ c.x = Math.min(c.x, STOCK_SCREEN_WIDTH);
+ c.y = Math.min(c.y, STOCK_SCREEN_HEIGHT);
+ if (c.kind === "image") continue;
+ c.width = Math.min(c.width, STOCK_SCREEN_WIDTH);
+ c.height = Math.min(c.height, STOCK_SCREEN_HEIGHT);
+ c.borderColor = Math.min(c.borderColor, STOCK_MAX_BORDER_COLOR);
+ c.borderRadius = Math.min(c.borderRadius, STOCK_MAX_BORDER_RADIUS);
+ c.paddingLength = Math.min(c.paddingLength, STOCK_MAX_PADDING);
+ if (c.kind === "list" && c.itemNames.length > STOCK_MAX_LIST_ITEMS) {
+ c.itemNames = c.itemNames.slice(0, STOCK_MAX_LIST_ITEMS);
+ }
+ }
+}
+
+/** The firmware's fixed protobuf arrays: more containers than this fail to decode. */
+const STOCK_MAX_LISTS = 4;
+const STOCK_MAX_TEXTS = 8;
+const STOCK_MAX_IMAGES = 4;
+
+/** EhStartUpPageCreateResult values for a page the firmware can't build. */
+export const PAGE_CREATE_INVALID = 1;
+export const PAGE_CREATE_OUT_OF_MEMORY = 3;
+
+/**
+ * Why the stock firmware would fail to build this page, with the create result
+ * the app gets, or null when it builds. Too many containers overflow the
+ * firmware's protobuf arrays, so decoding fails (it replies with the code the
+ * phone app maps to outOfMemory). An image container outside 20..288 x 20..144
+ * fails to create (invalid container).
+ */
+export function stockPageFailure(page: EvenHubPage): { code: number; reason: string } | null {
+ const count = (kind: EvenHubContainer["kind"]) => page.containers.filter((c) => c.kind === kind).length;
+ const [lists, texts, images] = [count("list"), count("text"), count("image")];
+ if (lists > STOCK_MAX_LISTS || texts > STOCK_MAX_TEXTS || images > STOCK_MAX_IMAGES) {
+ return {
+ code: PAGE_CREATE_OUT_OF_MEMORY,
+ reason: `${lists} list, ${texts} text and ${images} image containers (at most ${STOCK_MAX_LISTS}, ${STOCK_MAX_TEXTS} and ${STOCK_MAX_IMAGES})`,
+ };
+ }
+ for (const c of page.containers) {
+ if (c.kind === "image" && !inStockImageRange(c.width, c.height)) {
+ return { code: PAGE_CREATE_INVALID, reason: `image container ${JSON.stringify(c.name)} is ${c.width}x${c.height}, outside 20..288 x 20..144` };
+ }
+ }
+ return null;
+}
+
+/**
+ * Bottom-to-top paint order, as stock stacks its containers: the container
+ * list order (lists, texts, images), stably sorted by zOrderIndex (larger is
+ * closer to the front) only when every container has one and there are at
+ * least two. So without z-order, images are drawn over text.
+ */
+export function paintOrder(containers: readonly EvenHubContainer[]): EvenHubContainer[] {
+ const allHaveZ = containers.every((c) => c.zOrderIndex !== undefined);
+ if (!allHaveZ || containers.length < 2) return [...containers];
+ return [...containers].sort((a, b) => (a.zOrderIndex ?? 0) - (b.zOrderIndex ?? 0));
+}
+
+/**
+ * The container that owns gesture events. Stock binds the first list or text
+ * container with isEventCapture in paint order and ignores any later ones.
+ */
+export function eventCaptureContainer(page: EvenHubPage): EvenHubTextContainer | EvenHubListContainer | undefined {
+ for (const c of paintOrder(page.containers)) {
+ if (c.kind !== "image" && c.isEventCapture) return c;
+ }
+ return undefined;
+}
+
+/**
+ * The container stock resolves an id to: the first one with that id in paint
+ * order, whatever its kind, so an update aimed at a later container that
+ * shares the id never reaches it.
+ */
+export function containerById(page: EvenHubPage | null, id: number): EvenHubContainer | undefined {
+ return page ? paintOrder(page.containers).find((c) => c.id === id) : undefined;
}
diff --git a/app/apps/evenhub/display-warning-dialog.ts b/app/apps/evenhub/display-warning-dialog.ts
new file mode 100644
index 00000000..e99d52c0
--- /dev/null
+++ b/app/apps/evenhub/display-warning-dialog.ts
@@ -0,0 +1,65 @@
+import { wrapText } from "../../graphics/textwrap";
+import { type LayerContext } from "../../ui/layers";
+import { lineStep } from "../../ui/metrics";
+import { ScrollingDialogLayer, type DialogBody, type DialogRow } from "./scrolling-dialog";
+
+/** Wider than the permission dialog: the RayNeo iO's window is short, so fewer, longer lines fit better. */
+const DIALOG_WIDTH = 420;
+
+/**
+ * Shown over an EvenHub app the first time it runs with a RayNeo iO paired
+ * (see glasses-compat.ts): the app is made for Even Realities glasses and
+ * won't display correctly on the iO's screen. The app starts underneath.
+ * Continue (or double-click) dismisses the warning; Close app closes the
+ * app's window. Either answer counts as having seen it; a window closed with
+ * the warning still up shows it again next time.
+ */
+export class EvenHubDisplayWarningLayer extends ScrollingDialogLayer {
+ constructor(
+ private readonly appName: string,
+ private readonly onAnswered: () => void,
+ private readonly closeApp: () => void,
+ ) {
+ super(DIALOG_WIDTH);
+ }
+
+ protected bodyRows({ image, font, left, textWidth }: DialogBody): DialogRow[] {
+ const step = lineStep(font);
+ const rows: DialogRow[] = [];
+ for (const line of wrapText(font, "Compatibility warning", textWidth)) {
+ rows.push({ height: step + 2, draw: (top) => image.drawText(font, left, top, line, 235) });
+ }
+ rows[rows.length - 1]!.height += 6;
+ const message =
+ `${this.appName} is an EvenHub app, made for Even Realities glasses. It will not display correctly ` +
+ "on the RayNeo iO, because the iO's screen has a different resolution.";
+ // One row per wrapped line, so a large font scrolls line by line.
+ const lines = wrapText(font, message, textWidth);
+ for (let index = 0; index < lines.length; index++) {
+ rows.push({
+ height: step + (index === lines.length - 1 ? 8 : 0),
+ draw: (top) => image.drawText(font, left, top, lines[index]!, 190),
+ });
+ }
+ return rows;
+ }
+
+ protected actions(): string[] {
+ return ["Continue", "Close app"];
+ }
+
+ protected activate(action: string, ctx: LayerContext): void {
+ this.close(ctx, () => {
+ this.onAnswered();
+ if (action === "Close app") this.closeApp();
+ });
+ }
+
+ protected backedOut(): void {
+ this.onAnswered();
+ }
+
+ protected abandoned(): void {
+ // Not answered: the next launch shows it again.
+ }
+}
diff --git a/app/apps/evenhub/evenhub-window.ts b/app/apps/evenhub/evenhub-window.ts
index a0937cb5..34a38e8e 100644
--- a/app/apps/evenhub/evenhub-window.ts
+++ b/app/apps/evenhub/evenhub-window.ts
@@ -16,6 +16,8 @@ import { shell } from "../../ui/shell/shell";
import { makeImageWindowIcon, windowIcon } from "../../ui/shell/chrome-layer";
import { EvenHubSession } from "./session";
import { renderInstalledEvenHubIcon } from "./installed-apps";
+import { markDisplayWarningShown, needsDisplayWarning } from "./glasses-compat";
+import { EvenHubDisplayWarningLayer } from "./display-warning-dialog";
class EvenHubAppLayer implements Layer {
/**
@@ -149,5 +151,16 @@ export function createEvenHubWindow(
session.setScreenOn(on);
};
+ // The app's first run with a RayNeo iO paired: warn, over the app itself,
+ // that it won't display correctly there.
+ const packageId = session.manifest.packageId;
+ if (needsDisplayWarning(packageId)) {
+ created.stack.push(new EvenHubDisplayWarningLayer(
+ session.manifest.name,
+ () => markDisplayWarningShown(packageId),
+ () => shell.closeWindow(windowId),
+ ));
+ }
+
return created;
}
diff --git a/app/apps/evenhub/glasses-compat.ts b/app/apps/evenhub/glasses-compat.ts
new file mode 100644
index 00000000..0485f663
--- /dev/null
+++ b/app/apps/evenhub/glasses-compat.ts
@@ -0,0 +1,38 @@
+/**
+ * EvenHub with glasses that aren't Even Realities': with a RayNeo iO paired,
+ * the store is off (it is Even's, and its apps are made for their glasses),
+ * while apps sideloaded through Files or the Developer app still run, after a
+ * warning the first time each one launches that it won't display correctly
+ * (EvenHub apps lay out for the G2's 576x288 display; the iO's is 540x220).
+ */
+import { glassesTypeSetting } from "../../ui/dashboard-settings";
+import { getStringSetting, setStringSetting } from "../../native/settings-store";
+
+/** The package IDs whose RayNeo iO display warning has been answered, as a JSON array. */
+const DISPLAY_WARNED_KEY = "evenhub.rayneoDisplayWarned";
+
+/** Whether the EvenHub store can be used: with Even Realities glasses paired, not a RayNeo iO. */
+export function isEvenHubStoreAvailable(): boolean {
+ return glassesTypeSetting.get() !== "rayneo-io";
+}
+
+/** Whether launching this package should warn that it won't display correctly on these glasses. */
+export function needsDisplayWarning(packageId: string): boolean {
+ return glassesTypeSetting.get() === "rayneo-io" && !displayWarnedPackages().includes(packageId);
+}
+
+/** The user answered the package's display warning: don't show it again. */
+export function markDisplayWarningShown(packageId: string): void {
+ const warned = displayWarnedPackages();
+ if (warned.includes(packageId)) return;
+ setStringSetting(DISPLAY_WARNED_KEY, JSON.stringify([...warned, packageId]));
+}
+
+function displayWarnedPackages(): string[] {
+ try {
+ const parsed: unknown = JSON.parse(getStringSetting(DISPLAY_WARNED_KEY, "[]"));
+ return Array.isArray(parsed) ? parsed.filter((id): id is string => typeof id === "string") : [];
+ } catch {
+ return [];
+ }
+}
diff --git a/app/apps/evenhub/image-pipeline.ts b/app/apps/evenhub/image-pipeline.ts
new file mode 100644
index 00000000..3f5345f8
--- /dev/null
+++ b/app/apps/evenhub/image-pipeline.ts
@@ -0,0 +1,247 @@
+/**
+ * updateImageRawData the way stock turns an app's imageData into the 4-bit
+ * bitmap the glasses show. The Even phone app does the conversion
+ * (EvenHubAppService.updateImageRawData → _prepare / _prepareLegacyRaw, read
+ * from its blutter decompilation); the glasses firmware then shows the result
+ * only if it is exactly the container's size (common_image_container_set_data).
+ *
+ * - imageData must be a JSON array of integers; a base64 string or an object
+ * (a typed array that skipped the SDK's toJson) fails as sendFailed.
+ * - PNG, JPEG, WebP, GIF and BMP are decoded, scaled to cover the container
+ * (aspect-fill, centre crop, nearest neighbour) and converted to grey with
+ * alpha ignored.
+ * - Anything else is raw pixels, accepted only with compressMode 2 (which the
+ * SDK sends since 0.0.12) and exactly the container's size: one byte per
+ * pixel (values up to 15 are already 4-bit levels) or 4-bit packed rows.
+ *
+ * Native-free so it runs under Node; JPEG/WebP/GIF decoding is injected.
+ */
+const UPNG = require("upng-js");
+
+/** EhImageUpdateResult, as the SDK reads the host's integer. */
+export const IMAGE_SUCCESS = 0;
+export const IMAGE_EXCEPTION = 1;
+export const IMAGE_SIZE_INVALID = 2;
+export const IMAGE_TO_GRAY4_FAILED = 3;
+export const IMAGE_SEND_FAILED = 4;
+
+/** Stock image containers are 20..288 wide and 20..144 high. */
+export const STOCK_IMAGE_MIN_SIZE = 20;
+export const STOCK_IMAGE_MAX_WIDTH = 288;
+export const STOCK_IMAGE_MAX_HEIGHT = 144;
+
+/** The compressMode the SDK sends, and the phone app requires for raw pixels. */
+const RAW_COMPRESS_MODE = 2;
+
+export function inStockImageRange(width: number, height: number): boolean {
+ return width >= STOCK_IMAGE_MIN_SIZE && width <= STOCK_IMAGE_MAX_WIDTH &&
+ height >= STOCK_IMAGE_MIN_SIZE && height <= STOCK_IMAGE_MAX_HEIGHT;
+}
+
+export type ImageFormat = "png" | "jpeg" | "webp" | "gif" | "bmp" | "raw";
+
+/** Format by magic bytes, as the phone app's EvenHubImageFormatDetector. */
+export function detectImageFormat(b: Uint8Array): ImageFormat {
+ const at = (i: number, ...values: number[]) => values.every((v, j) => b[i + j] === v);
+ if (at(0, 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a)) return "png";
+ if (at(0, 0xff, 0xd8, 0xff)) return "jpeg";
+ if (at(0, 0x52, 0x49, 0x46, 0x46) && at(8, 0x57, 0x45, 0x42, 0x50)) return "webp";
+ if (at(0, 0x47, 0x49, 0x46, 0x38, 0x37, 0x61) || at(0, 0x47, 0x49, 0x46, 0x38, 0x39, 0x61)) return "gif";
+ if (at(0, 0x42, 0x4d)) return "bmp";
+ return "raw";
+}
+
+/** Decoded pixels, RGBA, not premultiplied. */
+export type RgbaImage = { width: number; height: number; rgba: Uint8Array };
+
+export type NativeImageDecoder = (bytes: Uint8Array) => RgbaImage | null;
+
+/** 8-bit grey from RGB (alpha ignored), then the nearest of 16 levels. */
+export function grayLevel(r: number, g: number, b: number): number {
+ const g8 = Math.floor((299 * r + 587 * g + 114 * b + 500) / 1000);
+ return Math.min(15, Math.max(0, Math.floor((g8 * 15 + 127) / 255)));
+}
+
+export function rgbaToLevels(image: RgbaImage): Uint8Array {
+ const levels = new Uint8Array(image.width * image.height);
+ for (let i = 0; i < levels.length; i++) {
+ const o = i * 4;
+ levels[i] = grayLevel(image.rgba[o]!, image.rgba[o + 1]!, image.rgba[o + 2]!);
+ }
+ return levels;
+}
+
+/**
+ * Scale to exactly width x height covering it (aspect-fill), cropping the
+ * overflow equally on both sides, sampling the nearest source pixel centre.
+ */
+export function resizeRgbaCover(image: RgbaImage, width: number, height: number): RgbaImage {
+ const scale = Math.max(width / image.width, height / image.height);
+ const offX = (image.width - width / scale) / 2;
+ const offY = (image.height - height / scale) / 2;
+ const rgba = new Uint8Array(width * height * 4);
+ for (let y = 0; y < height; y++) {
+ const sy = Math.min(image.height - 1, Math.max(0, Math.floor(offY + (y + 0.5) / scale)));
+ for (let x = 0; x < width; x++) {
+ const sx = Math.min(image.width - 1, Math.max(0, Math.floor(offX + (x + 0.5) / scale)));
+ const from = (sy * image.width + sx) * 4;
+ rgba.set(image.rgba.subarray(from, from + 4), (y * width + x) * 4);
+ }
+ }
+ return { width, height, rgba };
+}
+
+function decodePng(bytes: Uint8Array): RgbaImage | null {
+ try {
+ const decoded = UPNG.decode(bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength));
+ const frames = UPNG.toRGBA8(decoded) as ArrayBuffer[];
+ if (!frames.length) return null;
+ return { width: decoded.width, height: decoded.height, rgba: new Uint8Array(frames[0]!) };
+ } catch {
+ return null;
+ }
+}
+
+/**
+ * Uncompressed Windows BMP ('BM', BI_RGB): 1/4/8-bit paletted and 24/32-bit,
+ * top-down or bottom-up. Null for other variants (the native decoder may still
+ * read them). EvenChess sends 1-bit BMPs for full-board refreshes.
+ */
+export function decodeBmp(bytes: Uint8Array): RgbaImage | null {
+ if (bytes.length < 54 || bytes[0] !== 0x42 || bytes[1] !== 0x4d) return null;
+ const u16 = (o: number) => bytes[o]! | (bytes[o + 1]! << 8);
+ const u32 = (o: number) => (bytes[o]! | (bytes[o + 1]! << 8) | (bytes[o + 2]! << 16) | (bytes[o + 3]! << 24)) >>> 0;
+ const i32 = (o: number) => bytes[o]! | (bytes[o + 1]! << 8) | (bytes[o + 2]! << 16) | (bytes[o + 3]! << 24);
+ const pixelOffset = u32(10);
+ const dibSize = u32(14);
+ const width = i32(18);
+ const heightRaw = i32(22);
+ const bitCount = u16(28);
+ if (u32(30) !== 0) return null; // only BI_RGB
+ if (width <= 0 || width > 4096) return null;
+ const topDown = heightRaw < 0;
+ const height = Math.abs(heightRaw);
+ if (height === 0 || height > 4096) return null;
+ if (![1, 4, 8, 24, 32].includes(bitCount)) return null;
+
+ // Palette entries are 4 bytes, BGRx.
+ let palette: Uint8Array | null = null;
+ if (bitCount <= 8) {
+ let count = u32(46);
+ if (count === 0 || count > 1 << bitCount) count = 1 << bitCount;
+ palette = new Uint8Array(count * 3);
+ for (let i = 0; i < count; i++) {
+ const o = 14 + dibSize + i * 4;
+ if (o + 2 >= bytes.length) break;
+ palette.set([bytes[o + 2]!, bytes[o + 1]!, bytes[o]!], i * 3);
+ }
+ }
+ const stride = ((width * bitCount + 31) >> 5) << 2;
+ const rgba = new Uint8Array(width * height * 4);
+ for (let y = 0; y < height; y++) {
+ const row = pixelOffset + (topDown ? y : height - 1 - y) * stride;
+ if (row >= bytes.length) break;
+ for (let x = 0; x < width; x++) {
+ let r: number, g: number, b: number;
+ if (palette) {
+ let index: number;
+ if (bitCount === 1) index = ((bytes[row + (x >> 3)] ?? 0) >> (7 - (x & 7))) & 1;
+ else if (bitCount === 4) index = (x & 1) === 0 ? (bytes[row + (x >> 1)] ?? 0) >> 4 : (bytes[row + (x >> 1)] ?? 0) & 0x0f;
+ else index = bytes[row + x] ?? 0;
+ if (index * 3 >= palette.length) index = 0;
+ [r, g, b] = [palette[index * 3]!, palette[index * 3 + 1]!, palette[index * 3 + 2]!];
+ } else {
+ const o = row + x * (bitCount / 8);
+ [r, g, b] = [bytes[o + 2] ?? 0, bytes[o + 1] ?? 0, bytes[o] ?? 0];
+ }
+ rgba.set([r, g, b, 255], (y * width + x) * 4);
+ }
+ }
+ return { width, height, rgba };
+}
+
+/** imageData as bytes: a JSON array of integers only (Uint8List.fromList keeps the low 8 bits). */
+function imageDataBytes(raw: unknown): Uint8Array | null {
+ if (raw === undefined || raw === null) return new Uint8Array(0);
+ if (!Array.isArray(raw)) return null;
+ const out = new Uint8Array(raw.length);
+ for (let i = 0; i < raw.length; i++) {
+ const value: unknown = raw[i];
+ if (typeof value !== "number" || !Number.isInteger(value)) return null;
+ out[i] = value & 0xff;
+ }
+ return out;
+}
+
+export type PreparedImage = {
+ result: number;
+ /** 4-bit levels (0..15), row-major, when result is success. */
+ levels: Uint8Array | null;
+ width: number;
+ height: number;
+ format: ImageFormat | null;
+ /** Why it failed, for the debug log. */
+ reason: string;
+};
+
+export type ImageRequest = {
+ imageData: unknown;
+ compressMode: number;
+ /** width/height sent with the update; when both are positive they replace the container's. */
+ requestWidth: number;
+ requestHeight: number;
+ /** The image container's size, looked up by id or name; null when none matched. */
+ geometry: { width: number; height: number } | null;
+ decodeNative: NativeImageDecoder;
+ /** Stock pages limit image sizes; Faceclaw's extended layouts don't. */
+ stockLimits: boolean;
+};
+
+/** Convert an update's imageData to 4-bit levels the way the phone app does. */
+export function prepareImageUpdate(request: ImageRequest): PreparedImage {
+ const fail = (result: number, reason: string, format: ImageFormat | null = null): PreparedImage =>
+ ({ result, levels: null, width: 0, height: 0, format, reason });
+ const bytes = imageDataBytes(request.imageData);
+ if (!bytes) return fail(IMAGE_SEND_FAILED, "imageData is not an array of integers");
+ const inRange = (w: number, h: number) => (request.stockLimits ? inStockImageRange(w, h) : w > 0 && h > 0);
+ const [width, height] = request.requestWidth > 0 && request.requestHeight > 0
+ ? [request.requestWidth, request.requestHeight]
+ : [request.geometry?.width ?? 0, request.geometry?.height ?? 0];
+
+ const format = detectImageFormat(bytes);
+ if (format === "raw") {
+ if (request.stockLimits && request.compressMode !== RAW_COMPRESS_MODE) {
+ return fail(IMAGE_EXCEPTION, `raw pixels need compressMode ${RAW_COMPRESS_MODE}`, format);
+ }
+ if (!inRange(width, height)) return fail(IMAGE_SIZE_INVALID, `raw size ${width}x${height} out of range`, format);
+ const levels = new Uint8Array(width * height);
+ const packedStride = Math.ceil(width / 2);
+ if (bytes.length === width * height) {
+ for (let i = 0; i < levels.length; i++) {
+ const v = bytes[i]!;
+ levels[i] = v <= 15 ? v : Math.floor((v * 15 + 127) / 255);
+ }
+ } else if (bytes.length === packedStride * height) {
+ for (let y = 0; y < height; y++) {
+ for (let x = 0; x < width; x++) {
+ const byte = bytes[y * packedStride + (x >> 1)]!;
+ levels[y * width + x] = (x & 1) === 0 ? byte >> 4 : byte & 0x0f;
+ }
+ }
+ } else {
+ return fail(IMAGE_EXCEPTION, `raw length ${bytes.length} fits neither ${width}x${height} 8-bit nor 4-bit`, format);
+ }
+ return { result: IMAGE_SUCCESS, levels, width, height, format, reason: "" };
+ }
+
+ let decoded = format === "png" ? decodePng(bytes) : format === "bmp" ? decodeBmp(bytes) : null;
+ decoded ??= request.decodeNative(bytes);
+ if (!decoded || decoded.width <= 0 || decoded.height <= 0) return fail(IMAGE_EXCEPTION, `${format} decode failed`, format);
+ if (inRange(width, height) && (decoded.width !== width || decoded.height !== height)) {
+ decoded = resizeRgbaCover(decoded, width, height);
+ }
+ if (!inRange(decoded.width, decoded.height)) {
+ return fail(IMAGE_SIZE_INVALID, `${decoded.width}x${decoded.height} out of range`, format);
+ }
+ return { result: IMAGE_SUCCESS, levels: rgbaToLevels(decoded), width: decoded.width, height: decoded.height, format, reason: "" };
+}
diff --git a/app/apps/evenhub/index.ts b/app/apps/evenhub/index.ts
index f7968676..75a02c70 100644
--- a/app/apps/evenhub/index.ts
+++ b/app/apps/evenhub/index.ts
@@ -5,6 +5,9 @@
* a phone WebView (its runtime + phone UI) and a 576x288 glasses window
* composited by Faceclaw instead of the stock firmware.
*
+ * With a RayNeo iO paired the store is unavailable and sideloaded apps warn
+ * on first run that they won't display correctly; see glasses-compat.ts.
+ *
* Design notes: notes/evenhub_compatibility.txt.
*/
import { type AppContext, type AppDefinition } from "../app-definition";
@@ -15,6 +18,7 @@ import { createInProcessWindow, type InProcessWindow } from "../../ui/shell/in-p
import { renderEvenRealitiesLogo } from "../../graphics/even-realities-logo";
import { makeImageWindowIcon, windowIcon } from "../../ui/shell/chrome-layer";
import { type InstalledEvenHubApp } from "./installed-apps";
+import { isEvenHubStoreAvailable } from "./glasses-compat";
const EVENHUB_STORE_WINDOW_ID = "evenhub:store";
const EVENHUB_STORE_SURFACE_ID = "window:evenhub:store";
@@ -104,8 +108,17 @@ const evenhubApp: AppDefinition = {
title: "EvenHub",
icon: "package",
renderIcon: renderEvenRealitiesLogo,
+ // Off the launcher with a RayNeo iO paired. A store window that opens
+ // anyway (restored from before a re-pair, or the launcher's route for an
+ // installed app whose package is missing) says why instead of loading.
+ isSupported: isEvenHubStoreAvailable,
launch: async (ctx) => {
- await ensureStoreWindow(ctx);
+ const { window } = await ensureStoreWindow(ctx);
+ if (!isEvenHubStoreAvailable()) {
+ // Store pages opened while Even glasses were paired would cover the notice.
+ window.stack.clearToBase();
+ window.requestRender();
+ }
},
};
diff --git a/app/apps/evenhub/layout-debug.ts b/app/apps/evenhub/layout-debug.ts
new file mode 100644
index 00000000..2653b394
--- /dev/null
+++ b/app/apps/evenhub/layout-debug.ts
@@ -0,0 +1,181 @@
+/**
+ * Debug-log descriptions of EvenHub page layouts and container updates.
+ * session.ts sends them to logcat at debug level (tag FaceclawEvenHubLayout).
+ *
+ * "note:" lines point out page quirks that change what stock (and so we) do
+ * with it: shared ids, missing or extra capture containers, a wrong
+ * containerTotalNum.
+ */
+import {
+ paintOrder,
+ readOptionalNumber,
+ type EvenHubContainer,
+ type EvenHubListContainer,
+ type EvenHubPage,
+ type EvenHubTextContainer,
+} from "./containers";
+import type { PreparedImage } from "./image-pipeline";
+
+const CONTENT_PREVIEW_CHARS = 40;
+const RAW_STRING_CHARS = 120;
+const RAW_ARRAY_ITEMS = 32;
+
+function label(c: EvenHubContainer): string {
+ return `${c.kind}#${c.id} ${JSON.stringify(c.name)}`;
+}
+
+function preview(text: string): string {
+ return JSON.stringify(text.length > CONTENT_PREVIEW_CHARS ? `${text.slice(0, CONTENT_PREVIEW_CHARS)}…` : text);
+}
+
+function decoration(c: EvenHubTextContainer | EvenHubListContainer): string {
+ let out = "";
+ if (c.borderWidth > 0) out += ` border=${c.borderWidth}c${c.borderColor}${c.borderRadius > 0 ? `r${c.borderRadius}` : ""}`;
+ if (c.paddingLength > 0) out += ` pad=${c.paddingLength}`;
+ if (c.isEventCapture) out += " capture";
+ if (c.font) out += " font";
+ return out;
+}
+
+function describeContainer(c: EvenHubContainer): string {
+ const z = c.zOrderIndex === undefined ? "" : ` z=${c.zOrderIndex}`;
+ const head = `${label(c)} @${c.x},${c.y} ${c.width}x${c.height}${z}`;
+ switch (c.kind) {
+ case "image":
+ return `${head} ${c.pixels ? `pixels=${c.pixelsWidth}x${c.pixelsHeight}` : "no pixels yet"}`;
+ case "text": {
+ const color = c.textColor === undefined ? "" : ` color=${c.textColor}`;
+ return `${head}${decoration(c)}${color} len=${c.content.length} ${preview(c.content)}`;
+ }
+ case "list":
+ return `${head}${decoration(c)} items=${c.itemNames.length} itemWidth=${c.itemWidth}${c.selectBorder ? " selectBorder" : ""} selected=${c.selectedIndex}`;
+ }
+}
+
+/** Quirks of a page that change how stock treats it. */
+export function pageNotes(page: EvenHubPage, declaredTotal?: number): string[] {
+ const notes: string[] = [];
+ const ordered = paintOrder(page.containers);
+ const byId = new Map();
+ for (const c of ordered) byId.set(c.id, [...(byId.get(c.id) ?? []), c]);
+ byId.forEach((shared, id) => {
+ if (shared.length > 1) {
+ notes.push(`id ${id} is shared by ${shared.map(label).join(", ")}; updates and events resolve to ${label(shared[0]!)} only`);
+ }
+ });
+ const captures = ordered.filter((c) => c.kind !== "image" && c.isEventCapture);
+ if (captures.length === 0) notes.push("no event-capture container, so the app gets no input");
+ else if (captures.length > 1) notes.push(`${captures.length} event-capture containers; only the first, ${label(captures[0]!)}, gets input`);
+ if (declaredTotal !== undefined && declaredTotal !== page.containers.length) {
+ notes.push(`containerTotalNum is ${declaredTotal} but ${page.containers.length} containers were sent (nothing checks it)`);
+ }
+ return notes;
+}
+
+/** The payload, as compact JSON with long strings and arrays cut short. */
+function rawJson(data: Record): string {
+ try {
+ return JSON.stringify(data, (_key, value: unknown) => {
+ if (typeof value === "string" && value.length > RAW_STRING_CHARS) {
+ return `${value.slice(0, RAW_STRING_CHARS)}…(${value.length} chars)`;
+ }
+ if (Array.isArray(value) && value.length > RAW_ARRAY_ITEMS) {
+ return [...value.slice(0, RAW_ARRAY_ITEMS), `…(${value.length} items)`];
+ }
+ return value;
+ });
+ } catch (error) {
+ return `(unserializable: ${String(error)})`;
+ }
+}
+
+/** A create/rebuild/extension layout: one line per container in paint order, then notes, then the raw payload. */
+export function describePage(method: string, page: EvenHubPage, data: Record): string[] {
+ const containers = page.containers;
+ const count = (kind: EvenHubContainer["kind"]) => containers.filter((c) => c.kind === kind).length;
+ const declaredTotal = readOptionalNumber(data, "containerTotalNum");
+ const total = declaredTotal === undefined ? "" : `, containerTotalNum=${declaredTotal}`;
+ const menu = page.menuItems.length > 0 ? `, ${page.menuItems.length} menu items` : "";
+ const lines = [
+ `${method}: ${containers.length} containers (${count("list")} list, ${count("text")} text, ${count("image")} image)` +
+ `${total}${menu}; painted bottom to top:`,
+ ];
+ paintOrder(containers).forEach((c, i) => lines.push(` ${i}: ${describeContainer(c)}`));
+ for (const note of pageNotes(page, declaredTotal)) lines.push(` note: ${note}`);
+ lines.push(` raw: ${rawJson(data)}`);
+ return lines;
+}
+
+function payloadKind(raw: unknown): string {
+ if (raw === undefined || raw === null) return "missing";
+ if (Array.isArray(raw)) return `number[${raw.length}]`;
+ if (typeof raw === "string") return `string(${raw.length} chars)`;
+ if (typeof raw === "object") return `object(${Object.keys(raw).length} keys)`;
+ return typeof raw;
+}
+
+/** Lit-pixel count and bounding box of 4-bit levels, so a blank "hide this" image is recognizable. */
+function litSummary(levels: Uint8Array, width: number): string {
+ let lit = 0;
+ let max = 0;
+ let x0 = width;
+ let y0 = Infinity;
+ let x1 = -1;
+ let y1 = -1;
+ for (let i = 0; i < levels.length; i++) {
+ const level = levels[i]!;
+ if (level === 0) continue;
+ lit++;
+ if (level > max) max = level;
+ const x = i % width;
+ const y = Math.floor(i / width);
+ if (x < x0) x0 = x;
+ if (x > x1) x1 = x;
+ if (y < y0) y0 = y;
+ if (y > y1) y1 = y;
+ }
+ return lit === 0 ? "blank" : `lit=${lit}px max=${max}/15 bbox=${x0},${y0}-${x1},${y1}`;
+}
+
+export type ImageUpdateDebug = {
+ sentId: number;
+ sentName: string;
+ raw: unknown;
+ /** The container the id resolves to. */
+ target: EvenHubContainer | undefined;
+ prepared: PreparedImage;
+ /** Whether the container now shows the update. */
+ shown: boolean;
+ /** EhImageUpdateResult returned to the app. */
+ result: number;
+};
+
+export function describeImageUpdate(u: ImageUpdateDebug): string[] {
+ const parts = [`updateImageRawData id=${u.sentId} ${JSON.stringify(u.sentName)}`];
+ parts.push(`-> ${u.target ? label(u.target) : "no container"}`);
+ parts.push(`payload=${payloadKind(u.raw)}`);
+ if (u.prepared.format) parts.push(`format=${u.prepared.format}`);
+ if (u.prepared.levels) parts.push(`${u.prepared.width}x${u.prepared.height} ${litSummary(u.prepared.levels, u.prepared.width)}`);
+ parts.push(`result=${u.result}`, u.shown ? "shown" : "not shown");
+ const lines = [parts.join(" ")];
+ if (u.prepared.reason) lines.push(` ${u.prepared.reason}`);
+ if (u.prepared.result === 0 && u.target?.kind !== "image") {
+ lines.push(` the id ${u.target ? `resolves to ${label(u.target)}` : "matches no container"}, so the glasses refuse the transfer`);
+ } else if (u.prepared.result === 0 && !u.shown && u.target) {
+ lines.push(` ${u.prepared.width}x${u.prepared.height} isn't the container's ${u.target.width}x${u.target.height}, so the glasses drop it`);
+ }
+ return lines;
+}
+
+export function describeTextUpgrade(
+ sentId: number,
+ sentName: string,
+ container: EvenHubTextContainer | null,
+ offset: number | undefined,
+ sentLength: number,
+): string {
+ if (!container) return `textContainerUpgrade id=${sentId} ${JSON.stringify(sentName)}: no container with that id`;
+ const at = offset === undefined ? "" : ` offset=${offset}`;
+ const color = container.textColor === undefined ? "" : ` color=${container.textColor}`;
+ return `textContainerUpgrade ${label(container)}${at} sent=${sentLength} chars -> len=${container.content.length}${color} ${preview(container.content)}`;
+}
diff --git a/app/apps/evenhub/payload-validation.ts b/app/apps/evenhub/payload-validation.ts
new file mode 100644
index 00000000..4d001b91
--- /dev/null
+++ b/app/apps/evenhub/payload-validation.ts
@@ -0,0 +1,141 @@
+/**
+ * The checks the Even phone app applies to createStartUpPageContainer,
+ * rebuildPageContainer and textContainerUpgrade payloads before it sends
+ * anything to the glasses (read from its blutter decompilation:
+ * EvenHubProtoJsonMapper.validateTextBrightness, mapProtoJsonKeys and
+ * protobuf.dart's tag-keyed JSON parsing):
+ *
+ * - every key must be one the message defines (a numeric key passes as a raw
+ * protobuf tag, which we then ignore);
+ * - numeric fields take an integer or a numeric string — not a boolean, a
+ * fraction or null; string fields take a string; repeated fields an array;
+ * - any key named textColor, anywhere, must be an integer from 0 to 4.
+ *
+ * A failure means the call fails without reaching the glasses: create
+ * returns invalid (1), rebuild and textContainerUpgrade return false.
+ * Faceclaw's extended layouts are not checked; they carry their own keys.
+ */
+
+type FieldType = "uint" | "string" | "any" | { list: FieldType } | { message: Schema };
+type Schema = Readonly>;
+
+const BOX: Schema = {
+ xPosition: "uint",
+ yPosition: "uint",
+ width: "uint",
+ height: "uint",
+ containerID: "uint",
+ containerName: "string",
+ zOrderIndex: "uint",
+};
+
+const DECORATED: Schema = {
+ ...BOX,
+ borderWidth: "uint",
+ borderColor: "uint",
+ borderRadius: "uint",
+ paddingLength: "uint",
+ isEventCapture: "uint",
+};
+
+const TEXT: Schema = { ...DECORATED, content: "string", textColor: "uint" };
+
+const ITEM_CONTAINER: Schema = {
+ itemCount: "uint",
+ itemWidth: "uint",
+ isItemSelectBorderEn: "uint",
+ itemName: { list: "string" },
+};
+
+const LIST: Schema = { ...DECORATED, itemContainer: { message: ITEM_CONTAINER } };
+
+// The app knows position, subItems and checkedIndex (second-level menus, not
+// yet in the SDK); their value types are unconfirmed, so they aren't checked.
+const MENU_ITEM: Schema = { itemName: "string", itemID: "uint", position: "any", subItems: "any", checkedIndex: "any" };
+
+const MENU: Schema = { menuItems: { list: { message: MENU_ITEM } } };
+
+const REBUILD: Schema = {
+ containerTotalNum: "uint",
+ listObject: { list: { message: LIST } },
+ textObject: { list: { message: TEXT } },
+ imageObject: { list: { message: BOX } },
+ menuObject: { message: MENU },
+};
+
+const CREATE: Schema = { ...REBUILD, widgetId: "uint" };
+
+const TEXT_UPGRADE: Schema = {
+ containerID: "uint",
+ containerName: "string",
+ contentOffset: "uint",
+ contentLength: "uint",
+ content: "string",
+ textColor: "uint",
+};
+
+const SCHEMAS = { create: CREATE, rebuild: REBUILD, textUpgrade: TEXT_UPGRADE } as const;
+
+/** What Dart's int.parse accepts. */
+const INT_STRING = /^\s*[+-]?(?:\d+|0[xX][0-9a-fA-F]+)\s*$/;
+
+function isRecord(value: unknown): value is Record {
+ return !!value && typeof value === "object" && !Array.isArray(value);
+}
+
+function checkValue(type: FieldType, value: unknown, path: string): string | null {
+ if (type === "any") return null;
+ if (value === null || value === undefined) return `${path} is null`;
+ if (type === "uint") {
+ if (typeof value === "number" ? Number.isInteger(value) : typeof value === "string" && INT_STRING.test(value)) return null;
+ return `${path} must be an integer, not ${JSON.stringify(value)}`;
+ }
+ if (type === "string") return typeof value === "string" ? null : `${path} must be a string, not ${JSON.stringify(value)}`;
+ if ("list" in type) {
+ if (!Array.isArray(value)) return `${path} must be an array`;
+ for (let i = 0; i < value.length; i++) {
+ const error = checkValue(type.list, value[i], `${path}[${i}]`);
+ if (error) return error;
+ }
+ return null;
+ }
+ return isRecord(value) ? checkMessage(type.message, value, path) : `${path} must be an object`;
+}
+
+function checkMessage(schema: Schema, message: Record, path: string): string | null {
+ for (const [key, value] of Object.entries(message)) {
+ const field = schema[key];
+ if (!field) {
+ if (INT_STRING.test(key)) continue;
+ return `unknown key ${path ? `${path}.` : ""}${key}`;
+ }
+ const error = checkValue(field, value, path ? `${path}.${key}` : key);
+ if (error) return error;
+ }
+ return null;
+}
+
+/** validateTextBrightness: every textColor key, at any depth, holds an integer 0..4. */
+function checkTextColors(value: unknown, path: string): string | null {
+ if (Array.isArray(value)) {
+ for (let i = 0; i < value.length; i++) {
+ const error = checkTextColors(value[i], `${path}[${i}]`);
+ if (error) return error;
+ }
+ } else if (isRecord(value)) {
+ for (const [key, child] of Object.entries(value)) {
+ const at = path ? `${path}.${key}` : key;
+ if (key === "textColor" && !(typeof child === "number" && Number.isInteger(child) && child >= 0 && child <= 4)) {
+ return `${at} must be an integer from 0 to 4, not ${JSON.stringify(child)}`;
+ }
+ const error = checkTextColors(child, at);
+ if (error) return error;
+ }
+ }
+ return null;
+}
+
+/** Why the Even app would refuse this payload without sending it, or null if it would send it. */
+export function stockPayloadError(kind: keyof typeof SCHEMAS, data: Record): string | null {
+ return checkTextColors(data, "") ?? checkMessage(SCHEMAS[kind], data, "");
+}
diff --git a/app/apps/evenhub/permission-dialog.ts b/app/apps/evenhub/permission-dialog.ts
index 3f0560ff..8c0ae2a6 100644
--- a/app/apps/evenhub/permission-dialog.ts
+++ b/app/apps/evenhub/permission-dialog.ts
@@ -1,17 +1,11 @@
-import { getDefaultSmallFont } from "../../graphics/ui-fonts";
-import { GrayImage } from "../../graphics/image";
import { truncateText, wrapText } from "../../graphics/textwrap";
-import { type InputEvent } from "../../ui/gestures";
-import { Layer, type LayerContext, type PaintBelow } from "../../ui/layers";
-import { drawListScrollbar, drawSelectionHighlight } from "../../ui/menu";
+import { type LayerContext } from "../../ui/layers";
import { permissionDetail, permissionLabel, type EvenHubPermission } from "./permissions";
import { openPrivacyPolicyOnPhone } from "./privacy-policy";
-import { lineStep, listRowHeight } from "../../ui/metrics";
+import { lineStep } from "../../ui/metrics";
+import { ScrollingDialogLayer, type DialogBody, type DialogRow } from "./scrolling-dialog";
-/** Minimum gap between the dialog and the edges of the window it's centered in. */
-const DIALOG_MARGIN = 8;
const DIALOG_WIDTH = 320;
-const PADDING = 10;
const PERM_GAP = 4;
/**
@@ -20,56 +14,26 @@ const PERM_GAP = 4;
* Cancel (or double-click) backs out. A privacy-policy-only app still reaches
* this dialog so the user can review the policy before allowing first run.
*
- * When the list overflows the viewport the dialog scrolls: scroll events move
- * through the content row by row, and only once the bottom is fully visible do
- * further scrolls move the action selection. The actions are inert until then
- * (a click just scrolls), so the user can't Allow without having had the whole
- * list on screen.
+ * A long list scrolls a page at a time, and Allow stays inert until the
+ * bottom has been reached (see ScrollingDialogLayer), so the user can't
+ * Allow without having had the whole list on screen.
*/
-export class EvenHubPermissionDialogLayer implements Layer {
- /** Floats in front of the window content, like the context menus. */
- readonly depth = 2;
- /** Starts on Allow; the optional privacy-policy action is inserted after it. */
- private selectedIndex = 0;
- /** First content row drawn; rows above it are scrolled off. */
- private firstRow = 0;
- /** Scroll position at which the last row is fully visible; set by paint. */
- private maxFirstRow = 0;
- private resolved = false;
-
+export class EvenHubPermissionDialogLayer extends ScrollingDialogLayer {
constructor(
private readonly appName: string,
private readonly permissions: EvenHubPermission[],
private readonly privacyPolicyUrl: string,
private readonly onConfirm: () => void,
private readonly onCancel: () => void,
- ) {}
-
- /** Whether the dialog is scrolled to the bottom, making the actions live. */
- private atBottom(): boolean {
- return this.firstRow >= this.maxFirstRow;
+ ) {
+ super(DIALOG_WIDTH);
}
- paint(ctx: LayerContext, paintBelow: PaintBelow): GrayImage {
- const font = getDefaultSmallFont();
- const { width: viewportWidth, height: viewportHeight } = ctx.stack.getBaseSize();
- const image = paintBelow();
- const dialogWidth = Math.min(DIALOG_WIDTH, viewportWidth - 2 * DIALOG_MARGIN);
- const dialogX = ((viewportWidth - dialogWidth) / 2) | 0;
- const textWidth = dialogWidth - 2 * PADDING - 4;
- const left = dialogX + PADDING + 2;
-
+ protected bodyRows({ image, font, left, textWidth }: DialogBody): DialogRow[] {
const headerStep = lineStep(font) + 2;
const permLabelStep = lineStep(font) + 1;
const permDetailStep = lineStep(font) - 1;
- const actionRowH = listRowHeight(font);
- const actions = this.actions();
- const focused = ctx.stack.isFocused();
-
- // The dialog body as scrollable rows; each row's height includes the gap
- // below it, so scrolling and visibility checks work on whole rows.
- type Row = { height: number; draw: (top: number) => void };
- const rows: Row[] = [];
+ const rows: DialogRow[] = [];
const heading = this.permissions.length ? `${this.appName} needs:` : `${this.appName} is ready to run`;
rows.push({
height: headerStep + 6,
@@ -98,113 +62,28 @@ export class EvenHubPermissionDialogLayer implements Layer {
});
}
}
- for (let index = 0; index < actions.length; index++) {
- rows.push({
- height: actionRowH,
- draw: (top) => {
- const selected = this.atBottom() && index === this.selectedIndex;
- if (selected) {
- drawSelectionHighlight(image, dialogX + 12, top, dialogWidth - 24, actionRowH - 1, focused, 8);
- }
- image.drawText(font, dialogX + 22, top + 3, actions[index]!, selected ? 255 : 200);
- },
- });
- }
-
- const contentHeight = rows.reduce((sum, row) => sum + row.height, 0);
- const height = Math.min(contentHeight + 2 * PADDING, viewportHeight - 2 * DIALOG_MARGIN);
- const dialogY = ((viewportHeight - height) / 2) | 0;
- const visibleHeight = height - 2 * PADDING;
-
- // The bottommost scroll position: the largest suffix of rows that fits.
- let maxFirstRow = rows.length;
- for (let suffixHeight = 0; maxFirstRow > 0; maxFirstRow--) {
- const rowHeight = rows[maxFirstRow - 1]!.height;
- if (suffixHeight + rowHeight > visibleHeight) break;
- suffixHeight += rowHeight;
- }
- this.maxFirstRow = maxFirstRow;
- this.firstRow = Math.max(0, Math.min(this.firstRow, maxFirstRow));
-
- // Fill 1 (transparent color key is 0), outline for the dialog edge.
- image.fillRoundedRect(dialogX, dialogY, dialogWidth, height, 1);
- image.drawRoundedRect(dialogX, dialogY, dialogWidth, height, 72);
-
- let y = dialogY + PADDING;
- for (let index = this.firstRow; index < rows.length; index++) {
- const row = rows[index]!;
- if (y + row.height > dialogY + PADDING + visibleHeight) break;
- row.draw(y);
- y += row.height;
- }
-
- if (maxFirstRow > 0) {
- drawListScrollbar(
- image,
- dialogX + dialogWidth - 7,
- dialogY + PADDING,
- visibleHeight,
- this.firstRow,
- rows.length - maxFirstRow,
- rows.length,
- );
- }
- return image;
+ return rows;
}
- handleInput(event: InputEvent, ctx: LayerContext): void {
- const actions = this.actions();
- switch (event.type) {
- case "scroll-up":
- if (this.atBottom() && this.selectedIndex > 0) {
- this.selectedIndex -= 1;
- } else if (this.firstRow > 0) {
- this.firstRow -= 1;
- }
- return;
- case "scroll-down":
- if (!this.atBottom()) {
- this.firstRow += 1;
- } else {
- this.selectedIndex = Math.min(actions.length - 1, this.selectedIndex + 1);
- }
- return;
- case "click":
- if (!this.atBottom()) {
- this.firstRow += 1;
- return;
- }
- if (actions[this.selectedIndex] === "Privacy policy") {
- openPrivacyPolicyOnPhone(this.privacyPolicyUrl, this.appName);
- } else {
- this.resolve(ctx, actions[this.selectedIndex] === "Allow");
- }
- return;
- case "double-click":
- this.resolve(ctx, false);
- return;
- default:
- return;
- }
- }
-
- onRemoved(): void {
- // Dismissed some other way (window closed, back button): treat as cancel.
- if (!this.resolved) {
- this.resolved = true;
- this.onCancel();
- }
- }
-
- private resolve(ctx: LayerContext, confirmed: boolean): void {
- if (this.resolved) return;
- this.resolved = true;
- ctx.stack.pop();
- if (confirmed) this.onConfirm();
- else this.onCancel();
- }
-
- private actions(): string[] {
+ protected actions(): string[] {
return this.privacyPolicyUrl ? ["Allow", "Privacy policy", "Cancel"] : ["Allow", "Cancel"];
}
+
+ protected activate(action: string, ctx: LayerContext): void {
+ if (action === "Privacy policy") {
+ openPrivacyPolicyOnPhone(this.privacyPolicyUrl, this.appName);
+ } else if (action === "Allow") {
+ this.close(ctx, () => this.onConfirm());
+ } else {
+ this.close(ctx, () => this.onCancel());
+ }
+ }
+
+ protected backedOut(): void {
+ this.onCancel();
+ }
+
+ protected abandoned(): void {
+ this.onCancel();
+ }
}
diff --git a/app/apps/evenhub/scrolling-dialog.ts b/app/apps/evenhub/scrolling-dialog.ts
new file mode 100644
index 00000000..1c9862d6
--- /dev/null
+++ b/app/apps/evenhub/scrolling-dialog.ts
@@ -0,0 +1,201 @@
+import { getDefaultSmallFont } from "../../graphics/ui-fonts";
+import { type GrayImage, type UiFont } from "../../graphics/image";
+import { type InputEvent } from "../../ui/gestures";
+import { type Layer, type LayerContext, type PaintBelow } from "../../ui/layers";
+import { drawListScrollbar, drawSelectionHighlight } from "../../ui/menu";
+import { listRowHeight } from "../../ui/metrics";
+
+/** Minimum gap between the dialog and the edges of the window it's centered in. */
+const DIALOG_MARGIN = 8;
+const PADDING = 10;
+
+/** One row of a dialog's content. Its height includes the gap below it, so scrolling works on whole rows. */
+export type DialogRow = { height: number; draw: (top: number) => void };
+
+/** What a dialog's body rows draw with: the canvas, the font, and the text column. */
+export type DialogBody = { image: GrayImage; font: UiFont; left: number; textWidth: number };
+
+/**
+ * A dialog box centered over the window it opens in: body rows, then a
+ * column of actions, starting on the first. EvenHub's confirmations and
+ * warnings (permissions, the RayNeo iO display warning) are built on it.
+ *
+ * When the content overflows the viewport the dialog scrolls a page at a
+ * time, keeping one line of overlap (the last line of one page is the first
+ * of the next), and only once the bottom is fully visible do further scrolls
+ * move the action selection. The actions are inert until then (a click just
+ * pages down), so nothing can be chosen without the whole dialog having been
+ * on screen. Double-click backs out.
+ */
+export abstract class ScrollingDialogLayer implements Layer {
+ /** Floats in front of the window content, like the context menus. */
+ readonly depth = 2;
+ private selectedIndex = 0;
+ /** First content row drawn; rows above it are scrolled off. */
+ private firstRow = 0;
+ /** Scroll position at which the last row is fully visible; set by paint. */
+ private maxFirstRow = 0;
+ /** Heights of the content rows and of the viewport they scroll in, as last painted (for paging). */
+ private rowHeights: number[] = [];
+ private visibleHeight = 0;
+ private resolved = false;
+
+ constructor(private readonly maxWidth: number) {}
+
+ /** The rows above the actions. */
+ protected abstract bodyRows(body: DialogBody): DialogRow[];
+ /** The action labels, top to bottom. */
+ protected abstract actions(): string[];
+ /** A click on an action once the actions are live; close() dismisses the dialog with it. */
+ protected abstract activate(action: string, ctx: LayerContext): void;
+ /** Double-click: the user backed out of the dialog. */
+ protected abstract backedOut(): void;
+ /** The dialog left the stack unanswered (its window closed). */
+ protected abstract abandoned(): void;
+
+ /** Whether the dialog is scrolled to the bottom, making the actions live. */
+ private atBottom(): boolean {
+ return this.firstRow >= this.maxFirstRow;
+ }
+
+ paint(ctx: LayerContext, paintBelow: PaintBelow): GrayImage {
+ const font = getDefaultSmallFont();
+ const { width: viewportWidth, height: viewportHeight } = ctx.stack.getBaseSize();
+ const image = paintBelow();
+ const dialogWidth = Math.min(this.maxWidth, viewportWidth - 2 * DIALOG_MARGIN);
+ const dialogX = ((viewportWidth - dialogWidth) / 2) | 0;
+ const textWidth = dialogWidth - 2 * PADDING - 4;
+ const left = dialogX + PADDING + 2;
+
+ const actionRowH = listRowHeight(font);
+ const actions = this.actions();
+ const focused = ctx.stack.isFocused();
+
+ const rows = this.bodyRows({ image, font, left, textWidth });
+ for (let index = 0; index < actions.length; index++) {
+ rows.push({
+ height: actionRowH,
+ draw: (top) => {
+ const selected = this.atBottom() && index === this.selectedIndex;
+ if (selected) {
+ drawSelectionHighlight(image, dialogX + 12, top, dialogWidth - 24, actionRowH - 1, focused, 8);
+ }
+ image.drawText(font, dialogX + 22, top + 3, actions[index]!, selected ? 255 : 200);
+ },
+ });
+ }
+
+ const contentHeight = rows.reduce((sum, row) => sum + row.height, 0);
+ const height = Math.min(contentHeight + 2 * PADDING, viewportHeight - 2 * DIALOG_MARGIN);
+ const dialogY = ((viewportHeight - height) / 2) | 0;
+ const visibleHeight = height - 2 * PADDING;
+
+ // The bottommost scroll position: the largest suffix of rows that fits.
+ let maxFirstRow = rows.length;
+ for (let suffixHeight = 0; maxFirstRow > 0; maxFirstRow--) {
+ const rowHeight = rows[maxFirstRow - 1]!.height;
+ if (suffixHeight + rowHeight > visibleHeight) break;
+ suffixHeight += rowHeight;
+ }
+ this.maxFirstRow = maxFirstRow;
+ this.firstRow = Math.max(0, Math.min(this.firstRow, maxFirstRow));
+ this.rowHeights = rows.map((row) => row.height);
+ this.visibleHeight = visibleHeight;
+
+ // Fill 1 (transparent color key is 0), outline for the dialog edge.
+ image.fillRoundedRect(dialogX, dialogY, dialogWidth, height, 1);
+ image.drawRoundedRect(dialogX, dialogY, dialogWidth, height, 72);
+
+ let y = dialogY + PADDING;
+ for (let index = this.firstRow; index < rows.length; index++) {
+ const row = rows[index]!;
+ if (y + row.height > dialogY + PADDING + visibleHeight) break;
+ row.draw(y);
+ y += row.height;
+ }
+
+ if (maxFirstRow > 0) {
+ drawListScrollbar(
+ image,
+ dialogX + dialogWidth - 7,
+ dialogY + PADDING,
+ visibleHeight,
+ this.firstRow,
+ rows.length - maxFirstRow,
+ rows.length,
+ );
+ }
+ return image;
+ }
+
+ handleInput(event: InputEvent, ctx: LayerContext): void {
+ const actions = this.actions();
+ switch (event.type) {
+ case "scroll-up":
+ if (this.atBottom() && this.selectedIndex > 0) {
+ this.selectedIndex -= 1;
+ } else if (this.firstRow > 0) {
+ this.pageUp();
+ }
+ return;
+ case "scroll-down":
+ if (!this.atBottom()) {
+ this.pageDown();
+ } else {
+ this.selectedIndex = Math.min(actions.length - 1, this.selectedIndex + 1);
+ }
+ return;
+ case "click":
+ if (!this.atBottom()) {
+ this.pageDown();
+ return;
+ }
+ this.activate(actions[this.selectedIndex]!, ctx);
+ return;
+ case "double-click":
+ this.close(ctx, () => this.backedOut());
+ return;
+ default:
+ return;
+ }
+ }
+
+ /** Scroll so the last fully visible row becomes the first (one row of overlap). */
+ private pageDown(): void {
+ let y = 0;
+ let lastVisible = this.firstRow;
+ for (let index = this.firstRow; index < this.rowHeights.length; index++) {
+ y += this.rowHeights[index]!;
+ if (y > this.visibleHeight) break;
+ lastVisible = index;
+ }
+ this.firstRow = Math.min(this.maxFirstRow, Math.max(this.firstRow + 1, lastVisible));
+ }
+
+ /** Scroll so the current first row becomes the last fully visible one (one row of overlap). */
+ private pageUp(): void {
+ let first = this.firstRow;
+ let y = this.rowHeights[first] ?? 0;
+ while (first > 0 && y + this.rowHeights[first - 1]! <= this.visibleHeight) {
+ first -= 1;
+ y += this.rowHeights[first]!;
+ }
+ this.firstRow = Math.max(0, Math.min(this.firstRow - 1, first));
+ }
+
+ onRemoved(): void {
+ // Dismissed some other way (window closed, back button).
+ if (!this.resolved) {
+ this.resolved = true;
+ this.abandoned();
+ }
+ }
+
+ /** Take the dialog down, then run the answer's effect (once, however it was answered). */
+ protected close(ctx: LayerContext, then: () => void): void {
+ if (this.resolved) return;
+ this.resolved = true;
+ ctx.stack.pop();
+ then();
+ }
+}
diff --git a/app/apps/evenhub/session.ts b/app/apps/evenhub/session.ts
index bdbdd92d..18ba982e 100644
--- a/app/apps/evenhub/session.ts
+++ b/app/apps/evenhub/session.ts
@@ -38,7 +38,11 @@ import {
import { EvenHubApiKeyDialogLayer } from "./api-key-dialog";
import {
asRecord,
+ clampToStockLimits,
+ containerById,
declaredMenuItems,
+ PAGE_CREATE_INVALID,
+ stockPageFailure,
eventCaptureContainer,
parsePage,
readNumber,
@@ -50,8 +54,13 @@ import {
type EvenHubContainer,
type EvenHubMenuItem,
type EvenHubPage,
+ type EvenHubTextContainer,
} from "./containers";
-import { compositePage } from "./compositor";
+import { compositePage, layoutText } from "./compositor";
+import { describeImageUpdate, describePage, describeTextUpgrade } from "./layout-debug";
+import { IMAGE_SEND_FAILED, IMAGE_SUCCESS, prepareImageUpdate } from "./image-pipeline";
+import { stockPayloadError } from "./payload-validation";
+import { decodeImageRgba } from "../../native/image-rgba";
import { stepListSelection } from "./list-menu";
import { type EvenHubManifest } from "./ehpk";
import { permissionsIncludeMicrophone, permissionsInclude } from "./permissions";
@@ -74,7 +83,15 @@ import { parseWindowIcon, WindowIconRenderer } from "./window-icon";
import { availableFontFamilies, containerFace, measureContainerText } from "./fonts";
import { parseFontSpec } from "./font-spec";
-const UPNG = require("upng-js");
+
+/**
+ * Page layouts and container updates go to logcat at debug level (see
+ * layout-debug.ts): `adb logcat -s FaceclawEvenHubLayout:D`. Android only.
+ */
+const LAYOUT_LOG_TAG = "FaceclawEvenHubLayout";
+const LAYOUT_LOG_ENABLED = !!global.isAndroid;
+/** Logcat truncates entries around 4 KB; split longer lines below that. */
+const LOGCAT_CHUNK_CHARS = 3000;
/** OsEventTypeList values (PB ordinals). */
const CLICK_EVENT = 0;
@@ -83,12 +100,20 @@ const SCROLL_BOTTOM_EVENT = 2;
const DOUBLE_CLICK_EVENT = 3;
const FOREGROUND_ENTER_EVENT = 4;
const FOREGROUND_EXIT_EVENT = 5;
+const ABNORMAL_EXIT_EVENT = 6;
const SYSTEM_EXIT_EVENT = 7;
const IMU_DATA_REPORT_EVENT = 8;
/** SDK 0.0.14: the press gesture, delivered like any other list/text/sys event. */
const LONG_PRESS_EVENT = 9;
const LONG_PRESS_RELEASE_EVENT = 10;
+/** After a failed rebuild, how long the app gets to hear ABNORMAL_EXIT before it is closed. */
+const ABNORMAL_EXIT_CLOSE_DELAY_MS = 200;
+
+/** Stock text scrolling: one step per swipe, and "at an end" within this tolerance. */
+const TEXT_SCROLL_STEP_PX = 28;
+const TEXT_SCROLL_EDGE_PX = 3;
+
/**
* Injected into every served HTML document at document start (before any app
* JS): (1) the promise-returning flutter_inappwebview.callHandler the EvenHub
@@ -416,6 +441,8 @@ export class EvenHubSession implements EvenHubMicClient, EvenHubImuClient, EvenH
private page: EvenHubPage | null = null;
private pageCreated = false;
+ /** The page came from Faceclaw's extended layout API, which isn't held to stock limits. */
+ private extendedLayout = false;
private webViewHandle: EvenHubWebViewHandle | null = null;
private windowHooks: EvenHubWindowHooks | null = null;
private closed = false;
@@ -596,6 +623,8 @@ export class EvenHubSession implements EvenHubMicClient, EvenHubImuClient, EvenH
const eventType = event.type === "scroll-up" ? SCROLL_TOP_EVENT : SCROLL_BOTTOM_EVENT;
if (capture?.kind === "list") {
this.scrollList(capture, eventType, inputSource);
+ } else if (capture?.kind === "text") {
+ this.scrollText(capture, eventType, inputSource);
} else {
this.emitSysEvent(eventType, 0, inputSource);
}
@@ -620,6 +649,25 @@ export class EvenHubSession implements EvenHubMicClient, EvenHubImuClient, EvenH
this.pushMessage("evenHubEvent", { type: "menuItemClickEvent", jsonData: { itemID } });
}
+ /**
+ * Stock scrolls a capture text container that overflows by itself, a 28px
+ * step per swipe, and tells the app only at the ends (a textEvent naming the
+ * container). Text that fits reports every swipe as reaching an end.
+ */
+ private scrollText(text: EvenHubTextContainer, eventType: number, inputSource?: ExtensionInputSource): void {
+ const { maxScroll } = layoutText(text);
+ const forward = eventType === SCROLL_BOTTOM_EVENT;
+ const atEnd = forward ? maxScroll - text.scrollY < TEXT_SCROLL_EDGE_PX : text.scrollY < TEXT_SCROLL_EDGE_PX;
+ if (maxScroll === 0 || atEnd) {
+ this.emitTextEvent(text, eventType, inputSource);
+ return;
+ }
+ text.scrollY = forward
+ ? Math.min(maxScroll, text.scrollY + TEXT_SCROLL_STEP_PX)
+ : Math.max(0, text.scrollY - TEXT_SCROLL_STEP_PX);
+ this.windowHooks?.requestRender();
+ }
+
private scrollList(list: EvenHubListContainer, eventType: number, inputSource?: ExtensionInputSource): void {
// Swipe up selects the previous item, swipe down the next (stock direction).
const delta = eventType === SCROLL_TOP_EVENT ? -1 : 1;
@@ -808,7 +856,8 @@ export class EvenHubSession implements EvenHubMicClient, EvenHubImuClient, EvenH
deliverImu(reading: ImuReading): void {
this.pushEvenHubEvent("sysEvent", {
eventType: IMU_DATA_REPORT_EVENT,
- imuData: { x: reading.x, y: reading.y, z: reading.z },
+ // The Even app's field name (protobuf IMU_Data); the SDK reads it as imuData.
+ iMUData: { x: reading.x, y: reading.y, z: reading.z },
});
}
@@ -858,7 +907,8 @@ export class EvenHubSession implements EvenHubMicClient, EvenHubImuClient, EvenH
const first = args[0];
const message = asRecord(typeof first === "string" ? JSON.parse(first) : first);
const method = readString(message, "method", "");
- const data = asRecord(message.data);
+ // As the Even app: `data`, else `payload`.
+ const data = asRecord(message.data ?? message.payload);
result = await this.dispatch(method, data);
} catch (error) {
this.log(`evenhub bridge call failed: ${error}`);
@@ -916,13 +966,29 @@ export class EvenHubSession implements EvenHubMicClient, EvenHubImuClient, EvenH
private async createStartUpPage(data: Record): Promise {
if (this.pageCreated) {
// One-shot per session on stock: a second call blocks ~2s, then fails.
+ this.layoutLog(() => ["createStartUpPageContainer: repeated call, rejected as stock does"]);
await delay(DUPLICATE_CREATE_DELAY_MS);
return 1;
}
+ // The Even app refuses some payloads without sending them; then the
+ // firmware may fail to build the page.
+ const payloadError = stockPayloadError("create", data);
+ if (payloadError) {
+ this.layoutLog(() => [`createStartUpPageContainer refused, as the Even app would: ${payloadError}`]);
+ return PAGE_CREATE_INVALID;
+ }
const page = parsePage(data);
- this.warnOnInvalidPage(page, data);
+ const failure = stockPageFailure(page);
+ if (failure) {
+ this.layoutLog(() => [`createStartUpPageContainer failed, as the firmware would: ${failure.reason}`]);
+ return failure.code;
+ }
+ clampToStockLimits(page);
+ this.warnOnDroppedMenuItems(page, data);
+ this.layoutLog(() => describePage("createStartUpPageContainer", page, data));
this.page = page;
this.pageCreated = true;
+ this.extendedLayout = false;
// The launch focus arrived before the page existed; deliver the ENTER now.
if (this.foreground && !this.launchEnterSent) {
this.launchEnterSent = true;
@@ -933,16 +999,39 @@ export class EvenHubSession implements EvenHubMicClient, EvenHubImuClient, EvenH
}
private rebuildPage(data: Record): boolean {
- // Also serves as create for apps that fall back to rebuild-on-error.
+ // Only createStartUpPageContainer starts an EvenHub page on the glasses.
+ if (!this.pageCreated) {
+ this.layoutLog(() => ["rebuildPageContainer before createStartUpPageContainer: no page to rebuild"]);
+ return false;
+ }
+ const payloadError = stockPayloadError("rebuild", data);
+ if (payloadError) {
+ this.layoutLog(() => [`rebuildPageContainer refused, as the Even app would: ${payloadError}`]);
+ return false;
+ }
const page = parsePage(data);
- this.warnOnInvalidPage(page, data);
+ const failure = stockPageFailure(page);
+ if (failure) {
+ // The firmware has already torn the old page down; it reports an
+ // abnormal exit and the Even app closes the app.
+ this.layoutLog(() => [`rebuildPageContainer failed, as the firmware would: ${failure.reason}; closing the app`]);
+ this.page = { containers: [], menuItems: [] };
+ this.windowHooks?.requestRender();
+ this.emitSysEvent(ABNORMAL_EXIT_EVENT, 0);
+ this.systemExitSent = true;
+ setTimeout(() => this.close(), ABNORMAL_EXIT_CLOSE_DELAY_MS);
+ return false;
+ }
+ clampToStockLimits(page);
+ this.warnOnDroppedMenuItems(page, data);
+ this.layoutLog(() => describePage("rebuildPageContainer", page, data));
this.page = page;
- this.pageCreated = true;
+ this.extendedLayout = false;
this.windowHooks?.requestRender();
return true;
}
- private warnOnInvalidPage(page: EvenHubPage, data: Record): void {
+ private warnOnDroppedMenuItems(page: EvenHubPage, data: Record): void {
const declaredMenuCount = declaredMenuItems(data).length;
if (declaredMenuCount > page.menuItems.length) {
this.log(
@@ -950,64 +1039,106 @@ export class EvenHubSession implements EvenHubMicClient, EvenHubImuClient, EvenH
"items (max 10, itemID must be non-zero and unique, itemName at most 32 UTF-8 bytes)",
);
}
- // Stock rejects these outright; we accept-and-log until rejection is
- // proven necessary for compatibility.
- const captures = page.containers.filter((c) => c.kind !== "image" && c.isEventCapture).length;
- if (captures !== 1) this.log(`evenhub: page has ${captures} event-capture containers (stock requires exactly 1)`);
- const texts = page.containers.filter((c) => c.kind === "text").length;
- const images = page.containers.filter((c) => c.kind === "image").length;
- if (texts > 8 || images > 4) this.log(`evenhub: page exceeds stock limits (${texts} text, ${images} image)`);
}
private textUpgrade(data: Record): boolean {
- const id = readNumber(data, "containerID", -1);
- // containerID is the identity; containerName is optional in the wild (e.g.
- // level-even-g2 omits it). Match by id, enforcing the name only when the app
- // actually supplies a non-empty one. (updateImage already matches by id.)
+ const id = readNumber(data, "containerID", 0);
const name = readString(data, "containerName", "");
- const container = this.page?.containers.find(
- (c) => c.kind === "text" && c.id === id && (name === "" || c.name === name),
- );
- if (!container || container.kind !== "text") return false;
const content = readString(data, "content", "");
const offset = readOptionalNumber(data, "contentOffset");
- // (contentLength is intentionally ignored — see below.)
- // Stock semantics are "write `content` at contentOffset and truncate the
- // rest" (a null-terminating strcpy(buf+offset, content)), NOT a splice that
- // keeps the old tail after offset+contentLength. Keeping the tail left stray
- // trailing text when an app (e.g. g2oom) shrank a string with an
- // under-sized contentLength; dropping it matches stock and still supports
- // suffix rewrites (offset>0) and full replaces (offset 0 / omitted).
- if (offset !== undefined && offset > 0) {
- container.content = container.content.slice(0, offset) + content;
- } else {
- container.content = content;
+ const payloadError = stockPayloadError("textUpgrade", data);
+ if (payloadError) {
+ this.layoutLog(() => [`textContainerUpgrade refused, as the Even app would: ${payloadError}`]);
+ return false;
+ }
+ // The firmware finds the container by id alone (its first container with
+ // that id, of any kind); the name isn't checked anywhere.
+ const target = containerById(this.page, id);
+ if (!target) {
+ this.layoutLog(() => [describeTextUpgrade(id, name, null, offset, content.length)]);
+ return false;
+ }
+ // Aimed at a list or image, the firmware writes into it as if it were
+ // text and reports success; nothing we could show.
+ if (target.kind !== "text") return true;
+ // The content replaces the whole text: stock ignores contentOffset and
+ // contentLength (firmware 2.2.9.22 in the emulator showed "XY" alone for
+ // every offset/length tried). The firmware re-sets the label, scrolled
+ // back to the top, only for non-empty text, so emptying a container
+ // leaves its old text showing (apps send " " to clear one).
+ if (content !== "") {
+ target.content = content;
+ target.scrollY = 0;
}
// SDK 0.0.14: textColor on an incremental update sets the container's
// brightness; omitting it keeps whatever level the container has.
const brightness = readTextBrightness(data);
- if (brightness !== undefined) container.textColor = brightness;
+ if (brightness !== undefined) target.textColor = brightness;
+ this.layoutLog(() => [describeTextUpgrade(id, name, target, offset, content.length)]);
this.windowHooks?.requestRender();
return true;
}
- /** BleEhSendImageResult: 0 success, 1 imageException, 2 sizeInvalid, 3 sendFailed. */
+ /** EhImageUpdateResult: 0 success, 1 imageException, 2 sizeInvalid, 3 toGray4Failed, 4 sendFailed. */
private updateImage(data: Record): number {
- const id = readNumber(data, "containerID", -1);
- const container = this.page?.containers.find((c) => c.kind === "image" && c.id === id);
- if (!container || container.kind !== "image") return 3;
- const bytes = imagePayloadBytes(data.imageData ?? data.rawData ?? asRecord(data).mapRawData);
- if (!bytes || bytes.length === 0) return 1;
- const decoded = decodeImageBytes(bytes, container);
- if (!decoded) return 1;
- container.pixels = decoded.pixels;
- container.pixelsWidth = decoded.width;
- container.pixelsHeight = decoded.height;
- this.windowHooks?.requestRender();
- return 0;
+ const id = readNumber(data, "containerID", 0);
+ const name = readString(data, "containerName", "");
+ const raw = data.imageData;
+ // Before the page exists (and after shutdown) the Even app fails it outright.
+ if (!this.pageCreated || !this.page) {
+ this.layoutLog(() => [`updateImageRawData id=${id}: no page yet, sendFailed`]);
+ return IMAGE_SEND_FAILED;
+ }
+ // The Even app sizes the bitmap from the image container it finds by id,
+ // then by trimmed name.
+ const images = this.page.containers.filter((c): c is EvenHubImageContainer => c.kind === "image");
+ const geometry = (id > 0 ? images.find((c) => c.id === id) : undefined) ??
+ (name.trim() ? images.find((c) => c.name.trim() === name.trim()) : undefined);
+ const prepared = prepareImageUpdate({
+ imageData: raw,
+ compressMode: readNumber(data, "compressMode", 0),
+ requestWidth: readNumber(data, "width", 0),
+ requestHeight: readNumber(data, "height", 0),
+ geometry: geometry ?? null,
+ decodeNative: decodeImageRgba,
+ stockLimits: !this.extendedLayout,
+ });
+ // The firmware takes the transfer only for an id whose first container is
+ // an image, and then shows the bitmap only if it's exactly that size.
+ const target = containerById(this.page, id);
+ let result = prepared.result;
+ let shown = false;
+ if (result === IMAGE_SUCCESS && target?.kind !== "image") {
+ result = IMAGE_SEND_FAILED;
+ } else if (result === IMAGE_SUCCESS && target?.kind === "image" && prepared.levels &&
+ prepared.width === target.width && prepared.height === target.height) {
+ target.pixels = prepared.levels.map((level) => level * 17);
+ target.pixelsWidth = prepared.width;
+ target.pixelsHeight = prepared.height;
+ shown = true;
+ this.windowHooks?.requestRender();
+ }
+ this.layoutLog(() => describeImageUpdate({ sentId: id, sentName: name, raw, target, prepared, shown, result }));
+ return result;
+ }
+
+ /** Debug-level logcat for layouts and updates; `describe` runs only when logging is on. */
+ private layoutLog(describe: () => string[]): void {
+ if (!LAYOUT_LOG_ENABLED) return;
+ try {
+ const prefix = `[${this.manifest.packageId}] `;
+ for (const line of describe()) {
+ for (let i = 0; i < line.length; i += LOGCAT_CHUNK_CHARS) {
+ android.util.Log.d(LAYOUT_LOG_TAG, prefix + line.slice(i, i + LOGCAT_CHUNK_CHARS));
+ }
+ }
+ } catch (error) {
+ console.warn(`evenhub: layout log failed: ${error}`);
+ }
}
private shutDown(exitMode: number): boolean {
+ this.layoutLog(() => [`shutDownPageContainer exitMode=${exitMode}`]);
if (exitMode === 1) {
// The app asked to quit (stock would pop an on-glasses confirm). We
// decline and hand focus to the app switcher instead, leaving the app
@@ -1075,6 +1206,15 @@ export class EvenHubSession implements EvenHubMicClient, EvenHubImuClient, EvenH
this.pushEvenHubEvent("sysEvent", { eventType, eventSource, [INPUT_SOURCE_FIELD]: inputSource });
}
+ private emitTextEvent(text: EvenHubTextContainer, eventType: number, inputSource?: ExtensionInputSource): void {
+ this.pushEvenHubEvent("textEvent", {
+ containerID: text.id,
+ containerName: text.name,
+ eventType,
+ [INPUT_SOURCE_FIELD]: inputSource,
+ });
+ }
+
private emitListEvent(list: EvenHubListContainer, eventType: number, inputSource?: ExtensionInputSource): void {
this.pushEvenHubEvent("listEvent", {
containerID: list.id,
@@ -1252,8 +1392,10 @@ export class EvenHubSession implements EvenHubMicClient, EvenHubImuClient, EvenH
for (const container of page.containers) {
if (container.preserve) preserveContent(container, previous);
}
+ this.layoutLog(() => describePage("extension layout", page, data));
this.page = page;
this.pageCreated = true;
+ this.extendedLayout = true;
// The extended layout uses the taller app area.
this.windowHooks?.setTallCanvas(true);
if (this.foreground && !this.launchEnterSent) {
@@ -1559,82 +1701,6 @@ function normalizeBuzzerSteps(raw: unknown[]): Step[] {
return out;
}
-/**
- * Decode an uncompressed Windows BMP ('BM', BI_RGB) to 8bpp grayscale. Handles
- * 1/4/8-bit paletted and 24/32-bit BGR(A), top-down or bottom-up. Returns null
- * for compressed or unsupported variants. Apps like EvenChess send 1-bit BMPs
- * (black/white palette) for full-board refreshes.
- */
-function decodeBmp(bytes: Uint8Array): { pixels: Uint8Array; width: number; height: number } | null {
- if (bytes.length < 54 || bytes[0] !== 0x42 || bytes[1] !== 0x4d) return null;
- const u16 = (o: number) => bytes[o]! | (bytes[o + 1]! << 8);
- const u32 = (o: number) => (bytes[o]! | (bytes[o + 1]! << 8) | (bytes[o + 2]! << 16) | (bytes[o + 3]! << 24)) >>> 0;
- const i32 = (o: number) => bytes[o]! | (bytes[o + 1]! << 8) | (bytes[o + 2]! << 16) | (bytes[o + 3]! << 24);
-
- const pixelOffset = u32(10);
- const dibSize = u32(14);
- const width = i32(18);
- const heightRaw = i32(22);
- const bitCount = u16(28);
- const compression = u32(30);
- if (compression !== 0) return null; // only BI_RGB (uncompressed)
- if (width <= 0 || width > 4096) return null;
- const topDown = heightRaw < 0;
- const height = Math.abs(heightRaw);
- if (height === 0 || height > 4096) return null;
-
- // Palette (grayscale per index) for <=8bpp; each entry is 4 bytes BGRA.
- let palette: Uint8Array | null = null;
- if (bitCount <= 8) {
- let numColors = u32(46);
- if (numColors === 0 || numColors > (1 << bitCount)) numColors = 1 << bitCount;
- const palOffset = 14 + dibSize;
- palette = new Uint8Array(numColors);
- for (let i = 0; i < numColors; i++) {
- const o = palOffset + i * 4;
- if (o + 2 >= bytes.length) break;
- palette[i] = luminance(bytes[o + 2]!, bytes[o + 1]!, bytes[o]!);
- }
- }
-
- const stride = (((width * bitCount + 31) >> 5) << 2); // rows are 4-byte aligned
- const pixels = new Uint8Array(width * height);
- for (let y = 0; y < height; y++) {
- const srcY = topDown ? y : height - 1 - y;
- const rowStart = pixelOffset + srcY * stride;
- if (rowStart >= bytes.length) break;
- const dstRow = y * width;
- for (let x = 0; x < width; x++) {
- let gray: number;
- if (bitCount === 1) {
- const bit = ((bytes[rowStart + (x >> 3)] ?? 0) >> (7 - (x & 7))) & 1;
- gray = palette?.[bit] ?? (bit ? 255 : 0);
- } else if (bitCount === 4) {
- const byte = bytes[rowStart + (x >> 1)] ?? 0;
- const nib = (x & 1) === 0 ? byte >> 4 : byte & 0x0f;
- gray = palette?.[nib] ?? nib * 17;
- } else if (bitCount === 8) {
- const idx = bytes[rowStart + x] ?? 0;
- gray = palette?.[idx] ?? idx;
- } else if (bitCount === 24) {
- const o = rowStart + x * 3;
- gray = luminance(bytes[o + 2] ?? 0, bytes[o + 1] ?? 0, bytes[o] ?? 0);
- } else if (bitCount === 32) {
- const o = rowStart + x * 4;
- gray = luminance(bytes[o + 2] ?? 0, bytes[o + 1] ?? 0, bytes[o] ?? 0);
- } else {
- return null;
- }
- pixels[dstRow + x] = gray;
- }
- }
- return { pixels, width, height };
-}
-
-function luminance(r: number, g: number, b: number): number {
- return Math.round(0.2126 * r + 0.7152 * g + 0.0722 * b);
-}
-
/**
* Input-device names in the extension API: the touchDown event's source, and
* the `faceclawInputSource` field added to stock gesture events.
@@ -1686,97 +1752,3 @@ function elideZeroFields(obj: Record): Record
return out;
}
-/** Accept the payload forms seen on the wire: number[], JSON-ified typed
- * array ({"0": 1, ...}), or base64 string. */
-function imagePayloadBytes(raw: unknown): Uint8Array | null {
- if (Array.isArray(raw)) {
- const out = new Uint8Array(raw.length);
- for (let i = 0; i < raw.length; i++) out[i] = Number(raw[i]) & 0xff;
- return out;
- }
- if (typeof raw === "string") return base64Decode(raw);
- if (raw && typeof raw === "object") {
- const record = raw as Record;
- const keys = Object.keys(record);
- const out = new Uint8Array(keys.length);
- for (let i = 0; i < keys.length; i++) {
- const value = record[String(i)];
- if (typeof value !== "number") return null;
- out[i] = value & 0xff;
- }
- return out;
- }
- return null;
-}
-
-const BASE64_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-function base64Decode(text: string): Uint8Array | null {
- const clean = text.replace(/[\s=]+$/g, "").replace(/\s+/g, "");
- const out = new Uint8Array(Math.floor((clean.length * 3) / 4));
- let bits = 0;
- let bitCount = 0;
- let outIndex = 0;
- for (const char of clean) {
- const value = BASE64_ALPHABET.indexOf(char);
- if (value < 0) return null;
- bits = (bits << 6) | value;
- bitCount += 6;
- if (bitCount >= 8) {
- bitCount -= 8;
- out[outIndex++] = (bits >> bitCount) & 0xff;
- }
- }
- return out.subarray(0, outIndex);
-}
-
-/**
- * Decode an image payload: PNG or BMP (both are sent by real apps — EvenChess
- * force-refreshes as 1-bit BMP but streams live moves as PNG, so a host that
- * only did PNG dropped the initial board), or raw grayscale sized to the
- * container (8bpp, or 4bpp packed two pixels per byte, high nibble first).
- */
-function decodeImageBytes(
- bytes: Uint8Array,
- container: EvenHubImageContainer,
-): { pixels: Uint8Array; width: number; height: number } | null {
- if (bytes.length > 2 && bytes[0] === 0x42 && bytes[1] === 0x4d) {
- const bmp = decodeBmp(bytes);
- if (bmp) return bmp;
- }
- if (bytes.length > 4 && bytes[0] === 0x89 && bytes[1] === 0x50 && bytes[2] === 0x4e && bytes[3] === 0x47) {
- try {
- const buffer = bytes.buffer.slice(bytes.byteOffset, bytes.byteOffset + bytes.byteLength);
- const decoded = UPNG.decode(buffer);
- const frames = UPNG.toRGBA8(decoded) as ArrayBuffer[];
- if (!frames.length) return null;
- const rgba = new Uint8Array(frames[0]!);
- const pixels = new Uint8Array(decoded.width * decoded.height);
- for (let i = 0; i < pixels.length; i++) {
- const offset = i * 4;
- const alpha = (rgba[offset + 3] ?? 0) / 255;
- pixels[i] = Math.round(
- (0.2126 * (rgba[offset] ?? 0) + 0.7152 * (rgba[offset + 1] ?? 0) + 0.0722 * (rgba[offset + 2] ?? 0)) * alpha,
- );
- }
- return { pixels, width: decoded.width, height: decoded.height };
- } catch (error) {
- console.warn(`evenhub: PNG decode failed: ${error}`);
- return null;
- }
- }
- const area = container.width * container.height;
- if (bytes.length === area) {
- return { pixels: Uint8Array.from(bytes), width: container.width, height: container.height };
- }
- if (bytes.length === Math.ceil(area / 2)) {
- const pixels = new Uint8Array(area);
- for (let i = 0; i < area; i++) {
- const byte = bytes[i >> 1]!;
- const nibble = i % 2 === 0 ? byte >> 4 : byte & 0x0f;
- pixels[i] = nibble * 17;
- }
- return { pixels, width: container.width, height: container.height };
- }
- return null;
-}
diff --git a/app/apps/evenhub/store-layer.ts b/app/apps/evenhub/store-layer.ts
index bd974dc8..8df5be91 100644
--- a/app/apps/evenhub/store-layer.ts
+++ b/app/apps/evenhub/store-layer.ts
@@ -1,7 +1,7 @@
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
import { GrayImage, type UiFont } from "../../graphics/image";
import { truncateText, wrapText } from "../../graphics/textwrap";
-import { GESTURE_CLICK, type InputEvent } from "../../ui/gestures";
+import { directionalFallback, GESTURE_CLICK, isDirectionalInput, type InputEvent } from "../../ui/gestures";
import { type Layer, type LayerActions, type LayerContext, type LayerStack } from "../../ui/layers";
import { drawSelectionHighlight, type MenuItem } from "../../ui/menu";
import { Menu } from "../../ui/menu-core";
@@ -14,6 +14,7 @@ import { EvenHubStoreDetailLayer, type EvenHubStoreDetailOptions } from "./store
import { cleanError, installStoreApp } from "./store-install";
import { checkForEvenHubUpdates, describeUpdate, type EvenHubAppUpdate } from "./updates";
import { lineStep } from "../../ui/metrics";
+import { isEvenHubStoreAvailable } from "./glasses-compat";
const LIST_X = 18;
/** Horizontal gap between tab labels. */
@@ -55,7 +56,32 @@ type StoreRow =
/** The Search tab's first row: shows the query and opens the phone editor. */
| { kind: "search-query" }
/** A registry entry whose package is gone and which the store no longer lists. */
- | { kind: "orphan"; update: EvenHubAppUpdate };
+ | { kind: "orphan"; update: EvenHubAppUpdate }
+ /** The Updates tab's first row while any update is installable; `busy` while Update All runs. */
+ | { kind: "update-all"; count: number; busy: boolean };
+
+type AppRow = Extract;
+
+/** An Updates row that installing the store's version would satisfy. */
+function isUpdatableRow(row: StoreRow): row is AppRow {
+ return row.kind === "app" && row.update !== undefined;
+}
+
+/** An Updates row for one installed app (not the Update All row). */
+function isInstalledAppRow(row: StoreRow): boolean {
+ return row.kind === "app" || row.kind === "orphan";
+}
+
+function rowPackageId(row: StoreRow): string | undefined {
+ switch (row.kind) {
+ case "app":
+ return row.app.packageId;
+ case "orphan":
+ return row.update.installed.packageId;
+ default:
+ return undefined;
+ }
+}
type TabState = {
rows: StoreRow[];
@@ -118,10 +144,18 @@ export type EvenHubStoreLayerOptions = {
* The EvenHub storefront: Top (leaderboard), New (by first publication),
* Search, and Updates (installed apps that are stale or whose package is
* missing). The tab row is its own focus level above the list: double-click
- * in the list focuses the tabs, scrolling there switches tabs, and a click
- * returns to the list.
+ * in the list focuses the tabs, scrolling (or a watch swipe in any direction)
+ * there switches tabs, and a click returns to the list.
+ *
+ * With glasses that can't use the store (a RayNeo iO; see glasses-compat.ts)
+ * it shows only a notice saying so, and loads nothing. That is checked on
+ * every paint and input, so a window open across a re-pair follows the
+ * glasses either way.
*/
export class EvenHubStoreLayer implements Layer {
+ /** Swipes left/right switch tabs on the tab strip; elsewhere they get the usual fallback. */
+ readonly acceptsDirectional = true;
+
private readonly tabs: Record = {
top: emptyTab(),
new: emptyTab(),
@@ -140,12 +174,15 @@ export class EvenHubStoreLayer implements Layer {
private updatingAll = false;
/** An app page requested while the login form was up; opened once signed in. */
private pendingPackage: InstalledEvenHubApp | null = null;
+ /** An app page requested while the store was unavailable, named on its notice. */
+ private unavailablePackageName: string | null = null;
constructor(private readonly options: EvenHubStoreLayerOptions) {
if (this.showingLogin) resetEvenHubLoginForm();
}
paint(ctx: LayerContext): GrayImage {
+ if (!isEvenHubStoreAvailable()) return this.paintUnavailable(ctx);
if (!this.started) {
this.started = true;
// Do NOT open the phone credential editor here. This runs on the first
@@ -205,6 +242,23 @@ export class EvenHubStoreLayer implements Layer {
return image;
}
+ /** The notice that replaces the store when the paired glasses can't use it. */
+ private paintUnavailable(ctx: LayerContext): GrayImage {
+ const font = getDefaultSmallFont();
+ const { width, height } = ctx.stack.getBaseSize();
+ const image = new GrayImage(width, height, 0);
+ image.drawText(font, LIST_X, 8, "EvenHub", 220);
+ if (this.unavailablePackageName) {
+ const status = `${this.unavailablePackageName}'s package is missing.`;
+ image.drawText(font, LIST_X, 8 + lineStep(font), truncateText(font, status, width - LIST_X * 2), 125);
+ }
+ const message = "Using the Even Realities app store requires Even Realities glasses.";
+ for (const [index, line] of wrapText(font, message, width - LIST_X * 2).entries()) {
+ image.drawText(font, LIST_X, headerHeight(font) + 16 + index * lineStep(font), line, 190);
+ }
+ return image;
+ }
+
/** Tab labels to the right of the title; the active one is bright and underlined. */
private paintTabs(image: GrayImage, font: UiFont, ctx: LayerContext): void {
const tabsFocused = ctx.stack.isFocused() && this.focus === "tabs";
@@ -229,7 +283,7 @@ export class EvenHubStoreLayer implements Layer {
const label = TABS.find((entry) => entry.id === tab)!.label;
if (tab !== "updates") return label;
const updates = this.tabs.updates;
- const count = updates.rows.filter((row) => row.kind !== "search-query").length;
+ const count = updates.rows.filter(isInstalledAppRow).length;
return updates.loaded && count > 0 ? `${label} (${count})` : label;
}
@@ -245,9 +299,11 @@ export class EvenHubStoreLayer implements Layer {
if (!state.query) return "Search public apps";
return results === 1 ? `1 result for "${state.query}"` : `${results} results for "${state.query}"`;
}
- case "updates":
+ case "updates": {
if (!state.loaded) return "Installed apps with newer versions";
- return count === 0 ? "All installed apps are up to date" : count === 1 ? "1 app needs attention" : `${count} apps need attention`;
+ const apps = state.rows.filter(isInstalledAppRow).length;
+ return apps === 0 ? "All installed apps are up to date" : apps === 1 ? "1 app needs attention" : `${apps} apps need attention`;
+ }
}
}
@@ -263,7 +319,14 @@ export class EvenHubStoreLayer implements Layer {
}
}
- async handleInput(event: InputEvent, ctx: LayerContext): Promise {
+ async handleInput(rawEvent: InputEvent, ctx: LayerContext): Promise {
+ if (!isEvenHubStoreAvailable()) {
+ if (directionalFallback(rawEvent).type === "double-click") shell.yieldFocusToSidebar();
+ return;
+ }
+ const tabSwipe = !this.showingLogin && this.focus === "tabs"
+ && (rawEvent.type === "swipe-left" || rawEvent.type === "swipe-right");
+ const event = isDirectionalInput(rawEvent) && !tabSwipe ? directionalFallback(rawEvent) : rawEvent;
if (this.showingLogin) {
if (event.type === "click" && !this.loginBusy) {
this.openCredentialEditor(ctx);
@@ -301,9 +364,11 @@ export class EvenHubStoreLayer implements Layer {
const index = TABS.findIndex((tab) => tab.id === this.activeTab);
switch (event.type) {
case "scroll-up":
+ case "swipe-left":
this.switchTab(ctx, TABS[Math.max(0, index - 1)]!.id);
return;
case "scroll-down":
+ case "swipe-right":
this.switchTab(ctx, TABS[Math.min(TABS.length - 1, index + 1)]!.id);
return;
case "click":
@@ -333,6 +398,9 @@ export class EvenHubStoreLayer implements Layer {
case "search-query":
this.openSearchEditor(ctx);
return;
+ case "update-all":
+ void this.updateAll(ctx);
+ return;
case "orphan": {
// Nothing can be reinstalled; the only useful action is to drop the
// dead registry entry so the launcher stops offering it.
@@ -358,6 +426,12 @@ export class EvenHubStoreLayer implements Layer {
* placeholder built from the registry entry stands in.
*/
showInstalledPackage(stack: LayerStack, installed: InstalledEvenHubApp): void {
+ if (!isEvenHubStoreAvailable()) {
+ this.unavailablePackageName = installed.name;
+ stack.clearToBase();
+ return;
+ }
+ this.unavailablePackageName = null;
if (this.showingLogin) {
this.pendingPackage = installed;
return;
@@ -369,7 +443,7 @@ export class EvenHubStoreLayer implements Layer {
/** Dictated text becomes a search (the shell's "Type Into App" / voice input). */
receiveTextInput(text: string, ctx: LayerContext): void {
- if (this.showingLogin) return;
+ if (this.showingLogin || !isEvenHubStoreAvailable()) return;
const query = evenHubSearchQuerySetting.set(text);
if (!query) return;
this.closePhoneEditor(ctx.actions, "search");
@@ -379,7 +453,7 @@ export class EvenHubStoreLayer implements Layer {
}
buildMenuItems(): MenuItem[] {
- if (this.showingLogin) return [];
+ if (this.showingLogin || !isEvenHubStoreAvailable()) return [];
const items: MenuItem[] = [];
if (this.activeTab === "search") {
items.push({
@@ -532,8 +606,7 @@ export class EvenHubStoreLayer implements Layer {
const rows: StoreRow[] = updates.map((update) =>
update.latest ? { kind: "app", app: update.latest, update } : { kind: "orphan", update },
);
- state.rows = rows;
- state.menu.setItems(rows, 0);
+ this.setUpdateRows(state, rows, 0);
state.menu.scrollTop = 0;
state.status = "";
state.exhausted = true;
@@ -548,10 +621,20 @@ export class EvenHubStoreLayer implements Layer {
}
}
- private updatableRows(): Extract[] {
- return this.tabs.updates.rows.filter(
- (row): row is Extract => row.kind === "app" && row.update !== undefined,
- );
+ private updatableRows(): AppRow[] {
+ return this.tabs.updates.rows.filter(isUpdatableRow);
+ }
+
+ /**
+ * Replace the Updates rows, putting an Update All row on top while any of
+ * them can be installed (and dropping it once none can).
+ */
+ private setUpdateRows(state: TabState, entries: readonly StoreRow[], selectedIndex?: number): void {
+ const rows = entries.filter(isInstalledAppRow);
+ const count = rows.filter(isUpdatableRow).length;
+ if (count > 0) rows.unshift({ kind: "update-all", count, busy: this.updatingAll });
+ state.rows = rows;
+ state.menu.setItems(rows, selectedIndex);
}
/** Install every pending update in turn; a declined permission dialog skips that app. */
@@ -559,6 +642,7 @@ export class EvenHubStoreLayer implements Layer {
if (this.updatingAll) return;
this.updatingAll = true;
const state = this.tabs.updates;
+ this.setUpdateRows(state, state.rows);
const pending = this.updatableRows();
let installed = 0;
const failures: string[] = [];
@@ -593,6 +677,7 @@ export class EvenHubStoreLayer implements Layer {
: installed === 1 ? "Updated 1 app." : `Updated ${installed} apps.`;
} finally {
this.updatingAll = false;
+ this.setUpdateRows(this.tabs.updates, this.tabs.updates.rows);
if (!this.closed) ctx.actions.requestRender();
}
}
@@ -609,10 +694,7 @@ export class EvenHubStoreLayer implements Layer {
private removeUpdateRow(packageId: string): void {
const state = this.tabs.updates;
- state.rows = state.rows.filter((row) =>
- row.kind === "search-query" ? true : row.kind === "app" ? row.app.packageId !== packageId : row.update.installed.packageId !== packageId,
- );
- state.menu.setItems(state.rows);
+ this.setUpdateRows(state, state.rows.filter((row) => rowPackageId(row) !== packageId));
}
// ---- login and phone editors --------------------------------------------
@@ -751,6 +833,14 @@ function rowText(row: StoreRow): { title: string; detail: string; titleValue: nu
titleValue: 200,
};
}
+ case "update-all":
+ return {
+ title: row.busy ? "Updating..." : "Update All",
+ detail: row.busy
+ ? "Installing updates; progress is shown above."
+ : row.count === 1 ? "Install the 1 available update" : `Install all ${row.count} available updates`,
+ titleValue: row.busy ? 150 : 230,
+ };
case "orphan":
return {
title: row.update.installed.name,
diff --git a/app/apps/glanceboard/glanceboard-settings.ts b/app/apps/glanceboard/glanceboard-settings.ts
index 4d729490..4e6ba8e6 100644
--- a/app/apps/glanceboard/glanceboard-settings.ts
+++ b/app/apps/glanceboard/glanceboard-settings.ts
@@ -1,4 +1,4 @@
-import { ConfigSettingBoolean, ConfigSettingEnum } from "../../ui/dashboard-settings";
+import { ConfigSettingBoolean, ConfigSettingEnum, glassesHaveCompass } from "../../ui/dashboard-settings";
import { QUADRANT_LAYOUT, SIX_SLOT_LAYOUT, slotsVerticallyAdjacent, type GlanceLayout } from "./layout";
import { type GlanceWidgetId } from "./widget";
import { glanceWidgetSpans } from "./widgets";
@@ -23,6 +23,11 @@ export function glanceSlotChoiceLabel(choice: GlanceSlotChoice): string {
return SLOT_CHOICE_LABELS[choice] ?? choice;
}
+/** Whether the paired glasses can drive this widget; if not, it is left out of the slot picker. */
+function slotChoiceAvailable(choice: GlanceSlotChoice): boolean {
+ return choice !== "compass" || glassesHaveCompass();
+}
+
/**
* Slot order follows QUADRANT_LAYOUT: top left, top right, bottom left, bottom
* right. Calendar in both right slots merges into one double-height region.
@@ -56,9 +61,28 @@ export const glanceboardEnabledSetting = new ConfigSettingBoolean({
"While the display is asleep, a tap, a long-press or a head-tilt shows the Glanceboard instead of the regular UI. Double-tap still wakes the regular UI.",
});
-export type GlanceTapDuration = "off" | "3s" | "5s" | "7s" | "10s";
+const TAP_DURATION_SECONDS = {
+ "3s": 3,
+ "5s": 5,
+ "7s": 7,
+ "10s": 10,
+ "20s": 20,
+ "30s": 30,
+ "1min": 60,
+} as const;
-const DEFAULT_TAP_DURATION: GlanceTapDuration = "5s";
+type GlanceTapDurationTimed = keyof typeof TAP_DURATION_SECONDS;
+export type GlanceTapDuration = "off" | GlanceTapDurationTimed;
+
+const TAP_DURATION_VALUES: readonly GlanceTapDuration[] = ["off", ...(Object.keys(TAP_DURATION_SECONDS) as GlanceTapDurationTimed[])];
+
+const DEFAULT_TAP_DURATION: GlanceTapDurationTimed = "5s";
+
+function formatTapDuration(value: GlanceTapDuration): string {
+ if (value === "off") return "Disabled";
+ const seconds = TAP_DURATION_SECONDS[value];
+ return seconds % 60 === 0 ? `${seconds / 60} min` : `${seconds} s`;
+}
/**
* How long a tap (or head-tilt) keeps the board up; each further tap restarts
@@ -70,8 +94,8 @@ export const glanceTapDurationSetting = new ConfigSettingEnum
label: "Show on tap",
storageKey: "glanceboard.tapDuration",
defaultValue: DEFAULT_TAP_DURATION,
- values: ["off", "3s", "5s", "7s", "10s"],
- formatValue: (value) => (value === "off" ? "Disabled" : value.replace("s", " s")),
+ values: TAP_DURATION_VALUES,
+ formatValue: formatTapDuration,
description:
"How long a single tap (or a head-tilt) keeps the Glanceboard on screen. Disabled: a single tap does not show the Glanceboard.",
});
@@ -83,8 +107,7 @@ export function glanceShowOnTap(): boolean {
export function glanceTapTimeoutMs(): number {
const duration = glanceTapDurationSetting.get();
- const seconds = duration === "off" ? DEFAULT_TAP_DURATION : duration;
- return Number.parseInt(seconds, 10) * 1000;
+ return TAP_DURATION_SECONDS[duration === "off" ? DEFAULT_TAP_DURATION : duration] * 1000;
}
/** A long-press holds the board up until the press is released. */
@@ -146,18 +169,26 @@ export const glanceShowLinesSetting = new ConfigSettingBoolean({
export function glanceSlotSettings(layout: GlanceLayout = glanceLayout()): ConfigSettingEnum[] {
const grid = layout === QUADRANT_LAYOUT || layout === SIX_SLOT_LAYOUT;
const storageId = grid ? QUADRANT_LAYOUT.id : layout.id;
- return layout.slots.map(
- (slot, index) =>
- new ConfigSettingEnum({
- id: `glanceboard-${layout.id}-slot-${index}`,
- label: slot.label,
- storageKey: `glanceboard.${storageId}.slot.${index}`,
- defaultValue: (grid ? DEFAULT_QUADRANT_CHOICES[index] : undefined) ?? "none",
- values: SLOT_CHOICES,
- formatValue: glanceSlotChoiceLabel,
- description: `Which widget fills the ${slot.label.toLowerCase()} slot of the Glanceboard.`,
- }),
- );
+ return layout.slots.map((slot, index) => {
+ const defaultValue: GlanceSlotChoice = (grid ? DEFAULT_QUADRANT_CHOICES[index] : undefined) ?? "none";
+ return new ConfigSettingEnum({
+ id: `glanceboard-${layout.id}-slot-${index}`,
+ label: slot.label,
+ storageKey: `glanceboard.${storageId}.slot.${index}`,
+ defaultValue,
+ values: SLOT_CHOICES.filter(slotChoiceAvailable),
+ // A stored choice the glasses can't drive reads as Empty, not the slot's
+ // default (which could put a widget on the board twice). The stored value
+ // stays, so pairing glasses that can drive it brings it back.
+ normalize: (value) => {
+ const choice = value as GlanceSlotChoice;
+ if (!SLOT_CHOICES.includes(choice)) return defaultValue;
+ return slotChoiceAvailable(choice) ? choice : "none";
+ },
+ formatValue: glanceSlotChoiceLabel,
+ description: `Which widget fills the ${slot.label.toLowerCase()} slot of the Glanceboard.`,
+ });
+ });
}
/**
diff --git a/app/apps/glanceboard/widgets/system-card.ts b/app/apps/glanceboard/widgets/system-card.ts
index 2ef3515a..90fb5056 100644
--- a/app/apps/glanceboard/widgets/system-card.ts
+++ b/app/apps/glanceboard/widgets/system-card.ts
@@ -18,6 +18,7 @@ import {
batteryIndicatorVisible,
ConfigSettingBoolean,
glassesBatteryVisibilitySetting,
+ glassesModelName,
onAnySettingChanged,
phoneBatteryVisibilitySetting,
ringBatteryVisibilitySetting,
@@ -328,7 +329,7 @@ function collectBatteryItems(): BatteryItem[] {
push(phoneBatteryVisibilitySetting.get(), "Phone", "phone", phone.battery, phone.charging);
const levels = shell.getBatteryLevels();
push(watchBatteryVisibilitySetting.get(), "Watch", "watch", levels.watch, levels.watchCharging);
- push(glassesBatteryVisibilitySetting.get(), "G2", "glasses", levels.headset, levels.headsetCharging);
+ push(glassesBatteryVisibilitySetting.get(), glassesModelName(), "glasses", levels.headset, levels.headsetCharging);
if (levels.ring !== null && Number.isInteger(levels.ring) && levels.ring >= 0 && levels.ring <= 100) {
push(ringBatteryVisibilitySetting.get(), "R1", "ring", levels.ring, levels.ringCharging);
}
diff --git a/app/apps/launcher/index.ts b/app/apps/launcher/index.ts
index 1c16f4b9..40448347 100644
--- a/app/apps/launcher/index.ts
+++ b/app/apps/launcher/index.ts
@@ -11,7 +11,7 @@ import {
export function launcherEntries(apps: readonly AppDefinition[]) {
return [
...apps
- .filter((app) => app.showInLauncher !== false)
+ .filter((app) => app.showInLauncher !== false && app.isSupported?.() !== false)
.map((app) => ({
appId: app.appId,
label: app.title,
diff --git a/app/apps/nightscout/nightscout-app.ts b/app/apps/nightscout/nightscout-app.ts
index 6458541a..01032319 100644
--- a/app/apps/nightscout/nightscout-app.ts
+++ b/app/apps/nightscout/nightscout-app.ts
@@ -84,7 +84,8 @@ function buildNightscoutTrayIcon(state: NightscoutState): GrayImage {
const font = getDefaultSmallFont();
const nowMs = Date.now();
const label = state.latest ? `${state.latest.sgv}` : "--";
- const labelWidth = font.measureText(label);
+ // A TTF face measures fractionally; the icon's size and layout need whole pixels.
+ const labelWidth = Math.ceil(font.measureText(label));
const warning = evaluateNightscoutAlerts(state, loadNightscoutThresholds(), nowMs).any;
const graphEnd = labelWidth + 4 + TRAY_GRAPH_WIDTH;
const image = new GrayImage(graphEnd + (warning ? 24 : 0), TRAY_HEIGHT, 0);
diff --git a/app/apps/notifications/index.ts b/app/apps/notifications/index.ts
index 6f9cd5ed..426ddfd1 100644
--- a/app/apps/notifications/index.ts
+++ b/app/apps/notifications/index.ts
@@ -14,7 +14,12 @@ const notificationsApp: AppDefinition = {
if (listenerState === "no-access" || listenerState === "stuck") {
requestNotificationListenerAccess();
}
- return ctx.launchInProcessApp(NOTIFICATIONS_WINDOW_ID, NOTIFICATIONS_SURFACE_ID, createNotificationsAppWindow);
+ return ctx.launchInProcessApp(NOTIFICATIONS_WINDOW_ID, NOTIFICATIONS_SURFACE_ID, (options) =>
+ createNotificationsAppWindow(options, (section) => {
+ void ctx.launchApp("settings", { section }).catch((error) => {
+ ctx.appendLog(`settings launch failed: ${error}`);
+ });
+ }));
},
};
diff --git a/app/apps/notifications/notifications-app.ts b/app/apps/notifications/notifications-app.ts
index 65719b3f..561bb3dd 100644
--- a/app/apps/notifications/notifications-app.ts
+++ b/app/apps/notifications/notifications-app.ts
@@ -1,5 +1,5 @@
import { NotificationsListLayer } from "../../ui/notifications";
-import { NotificationFilterLayer } from "../../ui/notification-filter";
+import { NOTIFICATIONS_SETTINGS_SECTION } from "../../ui/dashboard/settings-menus";
import { onAndroidNotificationsChanged } from "../../native/notification-icons";
import {
createInProcessWindow,
@@ -14,9 +14,13 @@ export const NOTIFICATIONS_SURFACE_ID = "window:notifications";
/**
* The Notifications app: the Android-notification list (previously a
* dashboard page) in its own in-process window; selecting a notification
- * opens the detail view with its quick actions.
+ * opens the detail view with its quick actions. `openSettings` opens a
+ * Settings section (the menu's "Settings" goes to Notifications).
*/
-export function createNotificationsAppWindow(options: InProcessAppOptions): InProcessWindow {
+export function createNotificationsAppWindow(
+ options: InProcessAppOptions,
+ openSettings: (section: string) => void,
+): InProcessWindow {
// Newly posted notifications repaint the list while the window is open.
let offNotificationsChanged: (() => void) | null = null;
const created = createInProcessWindow({
@@ -27,10 +31,10 @@ export function createNotificationsAppWindow(options: InProcessAppOptions): InPr
icon: "bell",
closeable: true,
menuItems: () => [{
- label: "Notification filter",
+ label: "Settings",
onSelect: (ctx) => {
ctx.stack.pop();
- ctx.stack.push(new NotificationFilterLayer());
+ openSettings(NOTIFICATIONS_SETTINGS_SECTION);
},
}],
actions: options.actions,
diff --git a/app/apps/onboarding/ios-privacy-page.ts b/app/apps/onboarding/ios-privacy-page.ts
deleted file mode 100644
index dd3b94c6..00000000
--- a/app/apps/onboarding/ios-privacy-page.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { IOS_PRIVACY_NOTICE } from "../../analytics/privacy-disclosure";
-import type { GrayImage } from "../../graphics/image";
-import { wrapText } from "../../graphics/textwrap";
-import type { InputEvent } from "../../ui/gestures";
-import { onboardingFont } from "./onboarding-fonts";
-import { drawPageHeading, PAGE_X, type OnboardingNav, type OnboardingPage } from "./onboarding-page";
-
-/** Paginate the notice so no disclosure is silently clipped on a short glasses viewport. */
-export class IosPrivacyPage implements OnboardingPage {
- readonly immersive = true;
- private page = 0;
- private pageCount = 1;
-
- enter(): void { this.page = 0; }
-
- paint(image: GrayImage): void {
- const top = drawPageHeading(image, "iOS / TestFlight privacy", "") + 8;
- const font = onboardingFont("detail");
- const lines = IOS_PRIVACY_NOTICE.split("\n\n").flatMap((paragraph, index) => [
- ...(index ? [""] : []), ...wrapText(font, paragraph, image.width - 2 * PAGE_X),
- ]);
- const perPage = Math.max(1, Math.floor((image.height - top - font.lineHeight - 20) / font.lineHeight));
- this.pageCount = Math.ceil(lines.length / perPage);
- this.page = Math.min(this.page, this.pageCount - 1);
- lines.slice(this.page * perPage, (this.page + 1) * perPage).forEach((line, index) => {
- image.drawText(font, PAGE_X, top + index * font.lineHeight, line, 200);
- });
- const action = this.page + 1 < this.pageCount ? "Tap for more" : "Tap to choose statistics";
- image.drawText(font, PAGE_X, image.height - font.lineHeight - 8,
- `${this.page + 1}/${this.pageCount} - ${action}`, 230);
- }
-
- handleInput(event: InputEvent, nav: OnboardingNav): void {
- if (event.type === "click") {
- if (this.page + 1 < this.pageCount) this.page++;
- else nav.next();
- } else if (event.type === "scroll-down" || event.type === "swipe-up") {
- this.page = Math.min(this.page + 1, this.pageCount - 1);
- } else if (event.type === "scroll-up" || event.type === "swipe-down") {
- this.page = Math.max(0, this.page - 1);
- }
- }
-}
diff --git a/app/apps/onboarding/layout-diagram.ts b/app/apps/onboarding/layout-diagram.ts
index 3ade4108..c92bda21 100644
--- a/app/apps/onboarding/layout-diagram.ts
+++ b/app/apps/onboarding/layout-diagram.ts
@@ -3,9 +3,9 @@
* page: to scale in real-display pixels, simplified, and drawn brighter
* than the real chrome, which they shrink to a few pixels.
*/
-import { G2_LENS_WIDTH, type GrayImage } from "../../graphics/image";
+import type { GrayImage } from "../../graphics/image";
import { statusBarPositionSetting, type AppSwitcherPosition } from "../../ui/dashboard-settings";
-import { SIDEBAR_WIDTH, SWITCHER_ROW_HEIGHT, MIN_WINDOW_HEIGHT, TOP_BAR_HEIGHT } from "../../ui/shell/geometry";
+import { MIN_WINDOW_HEIGHT, screenHeight, screenWidth, SIDEBAR_WIDTH, SWITCHER_ROW_HEIGHT, TOP_BAR_HEIGHT } from "../../ui/shell/geometry";
export const AREA_OUTLINE = 30;
const CHROME_LINE = 100;
@@ -80,14 +80,14 @@ export function drawLayout(d: Diagram, position: AppSwitcherPosition, band: Diag
switch (position) {
case "left":
case "right": {
- const stripLeft = position === "left" ? 0 : G2_LENS_WIDTH - SIDEBAR_WIDTH;
+ const stripLeft = position === "left" ? 0 : screenWidth() - SIDEBAR_WIDTH;
const contentLeft = position === "left" ? SIDEBAR_WIDTH : 0;
- const windowWidth = G2_LENS_WIDTH - SIDEBAR_WIDTH;
+ const windowWidth = screenWidth() - SIDEBAR_WIDTH;
drawStatusBar(d, contentLeft, top, windowWidth, TOP_BAR_HEIGHT - 1);
drawContent(d, contentLeft, top + TOP_BAR_HEIGHT, windowWidth, height - TOP_BAR_HEIGHT, 1);
- // The strip keeps to the 288px band's height, even beside taller windows.
+ // The strip keeps to the min band's height (288px, or the whole short screen), even beside taller windows.
const separator = position === "left" ? SIDEBAR_WIDTH - 1 : stripLeft;
- d.vline(separator, top + TOP_BAR_HEIGHT, MIN_WINDOW_HEIGHT - TOP_BAR_HEIGHT, CHROME_LINE);
+ d.vline(separator, top + TOP_BAR_HEIGHT, diagramBandHeight("left") - TOP_BAR_HEIGHT, CHROME_LINE);
// One column of icons against the separator.
const column = position === "left" ? SIDEBAR_WIDTH - 36 : stripLeft;
for (let slot = 0; slot < 4; slot++) drawIcon(d, column + 2, top + TOP_BAR_HEIGHT + 10 + slot * 40, slot === 0);
@@ -131,11 +131,11 @@ export function drawLayout(d: Diagram, position: AppSwitcherPosition, band: Diag
}
}
-/** A bottom row or popup layout's window: centred at 576 wide and framed, or the panel's width without a frame. */
+/** A bottom row or popup layout's window: centred, SIDEBAR_WIDTH narrower, framed; or the screen's width without a frame. */
function windowSpan(band: DiagramBand): { left: number; width: number; framed: boolean } {
return band.fullWidth
- ? { left: 0, width: G2_LENS_WIDTH, framed: false }
- : { left: SIDEBAR_WIDTH / 2, width: G2_LENS_WIDTH - SIDEBAR_WIDTH, framed: true };
+ ? { left: 0, width: screenWidth(), framed: false }
+ : { left: SIDEBAR_WIDTH / 2, width: screenWidth() - SIDEBAR_WIDTH, framed: true };
}
/**
@@ -173,5 +173,16 @@ function drawContent(d: Diagram, x: number, y: number, width: number, height: nu
}
}
-/** Real-display rows the Layout page's diagrams cover: a 288px band and a bottom switcher row under it. */
-export const LAYOUT_AREA_HEIGHT = MIN_WINDOW_HEIGHT + SWITCHER_ROW_HEIGHT;
+/**
+ * Real-display rows the Layout page's diagrams cover: a 288px band and a
+ * bottom switcher row under it, or the whole screen where that is shorter
+ * (the RayNeo iO's 220 rows).
+ */
+export function layoutAreaHeight(): number {
+ return Math.min(MIN_WINDOW_HEIGHT + SWITCHER_ROW_HEIGHT, screenHeight());
+}
+
+/** A layout's min-height band within the diagram area: 288px, less a bottom row where the screen is short. */
+export function diagramBandHeight(position: AppSwitcherPosition): number {
+ return Math.min(MIN_WINDOW_HEIGHT, layoutAreaHeight() - (position === "bottom" ? SWITCHER_ROW_HEIGHT : 0));
+}
diff --git a/app/apps/onboarding/layout-page.ts b/app/apps/onboarding/layout-page.ts
index 0d2eae6c..50411469 100644
--- a/app/apps/onboarding/layout-page.ts
+++ b/app/apps/onboarding/layout-page.ts
@@ -1,9 +1,9 @@
-import { G2_LENS_WIDTH, type GrayImage, type UiFont } from "../../graphics/image";
-import { appSwitcherPositionSetting, type AppSwitcherPosition } from "../../ui/dashboard-settings";
+import type { GrayImage, UiFont } from "../../graphics/image";
+import { appSwitcherPositionSetting, glassesTypeSetting, type AppSwitcherPosition } from "../../ui/dashboard-settings";
import type { InputEvent } from "../../ui/gestures";
import { MENU_HIGHLIGHT_FILL, MENU_HIGHLIGHT_STROKE } from "../../ui/menu-core";
-import { MIN_WINDOW_HEIGHT } from "../../ui/shell/geometry";
-import { AREA_OUTLINE, Diagram, drawLayout, LAYOUT_AREA_HEIGHT } from "./layout-diagram";
+import { screenWidth } from "../../ui/shell/geometry";
+import { AREA_OUTLINE, Diagram, diagramBandHeight, drawLayout, layoutAreaHeight } from "./layout-diagram";
import { onboardingFont } from "./onboarding-fonts";
import { drawPageHeading, type OnboardingNav, type OnboardingPage } from "./onboarding-page";
@@ -19,8 +19,13 @@ const ROW_GAP = 6;
const DEPTH_SUBTITLE = "Customizable Depth";
/** Grid order, in rows of two: the layouts with depth on top. */
const LAYOUT_ORDER: readonly AppSwitcherPosition[] = ["bottom", "popup", "left", "right"];
-/** Selected on the first visit, and marked. */
-const RECOMMENDED_LAYOUT: AppSwitcherPosition = "bottom";
+/**
+ * Selected on the first visit, and marked: Bottom on the G2, whose 480 rows
+ * leave room for the row; a side strip on the RayNeo iO, whose 220 can't.
+ */
+export function recommendedLayout(): AppSwitcherPosition {
+ return glassesTypeSetting.get() === "rayneo-io" ? "left" : "bottom";
+}
/** Whether a layout leaves the side margins the display's stereo depth shifts into (geometry.ts uiDepth). */
export function layoutHasDepth(position: AppSwitcherPosition): boolean {
@@ -29,7 +34,7 @@ export function layoutHasDepth(position: AppSwitcherPosition): boolean {
/**
* The app switcher position, as a 2×2 grid of captioned diagrams of each
- * layout, Bottom (recommended, and selected at first) and Popup on top;
+ * layout, Bottom and Popup on top, the recommended one selected at first;
* swipes move through them in reading order, a tap saves the selected one.
* The page is immersive, so the diagrams get 40% of the display's width
* each. Choosing a layout reflows open windows (the dashboard controller
@@ -38,7 +43,7 @@ export function layoutHasDepth(position: AppSwitcherPosition): boolean {
export class LayoutPage implements OnboardingPage {
readonly immersive = true;
/** Kept across visits, so going back returns to the last choice. */
- private selected = LAYOUT_ORDER.indexOf(RECOMMENDED_LAYOUT);
+ private selected = LAYOUT_ORDER.indexOf(recommendedLayout());
paint(image: GrayImage, focused: boolean): void {
const top = drawPageHeading(
@@ -53,11 +58,11 @@ export class LayoutPage implements OnboardingPage {
// Short of DIAGRAM_SCALE only where two rows of cells wouldn't fit.
const scale = Math.min(
DIAGRAM_SCALE,
- ((available - ROW_GAP) / 2 - 2 * CELL_PADDING - captionHeight) / LAYOUT_AREA_HEIGHT,
- ((image.width - COLUMN_GAP) / 2 - 2 * CELL_PADDING) / G2_LENS_WIDTH,
+ ((available - ROW_GAP) / 2 - 2 * CELL_PADDING - captionHeight) / layoutAreaHeight(),
+ ((image.width - COLUMN_GAP) / 2 - 2 * CELL_PADDING) / screenWidth(),
);
- const diagramWidth = Math.round(G2_LENS_WIDTH * scale);
- const diagramHeight = Math.round(LAYOUT_AREA_HEIGHT * scale);
+ const diagramWidth = Math.round(screenWidth() * scale);
+ const diagramHeight = Math.round(layoutAreaHeight() * scale);
const cellWidth = diagramWidth + 2 * CELL_PADDING;
const cellHeight = diagramHeight + 2 * CELL_PADDING + captionHeight;
const left = Math.round((image.width - 2 * cellWidth - COLUMN_GAP) / 2);
@@ -75,7 +80,7 @@ export class LayoutPage implements OnboardingPage {
image.drawText(font, x + Math.round((cellWidth - font.measureText(text)) / 2), textY, text, value);
const captionTop = y + CELL_PADDING + diagramHeight + CAPTION_GAP;
const name = appSwitcherPositionSetting.displayValue(position);
- const caption = position === RECOMMENDED_LAYOUT ? `${name} (Recommended)` : name;
+ const caption = position === recommendedLayout() ? `${name} (Recommended)` : name;
centre(caption, title, captionTop, selected ? 255 : 190);
if (layoutHasDepth(position)) {
centre(DEPTH_SUBTITLE, subtitle, captionTop + title.lineHeight, selected ? 210 : 150);
@@ -103,12 +108,14 @@ export class LayoutPage implements OnboardingPage {
}
/**
- * A layout's diagram: the 288px band, with the popup switcher open. Only a
- * bottom switcher row takes rows under the band; without one, the band sits
- * centred in their place, as the band and row share the screen's slack.
+ * A layout's diagram: the min-height band, with the popup switcher open.
+ * Only a bottom switcher row takes rows under the band; without one, the
+ * band sits centred in their place, as the band and row share the screen's
+ * slack (none on a screen as short as the RayNeo iO's: the band fills it).
*/
function drawLayoutDiagram(d: Diagram, position: AppSwitcherPosition): void {
- d.outline(0, 0, G2_LENS_WIDTH, LAYOUT_AREA_HEIGHT, AREA_OUTLINE, 12);
- const top = position === "bottom" ? 0 : (LAYOUT_AREA_HEIGHT - MIN_WINDOW_HEIGHT) / 2;
- drawLayout(d, position, { top, height: MIN_WINDOW_HEIGHT, fullWidth: false }, true);
+ d.outline(0, 0, screenWidth(), layoutAreaHeight(), AREA_OUTLINE, 12);
+ const height = diagramBandHeight(position);
+ const top = position === "bottom" ? 0 : (layoutAreaHeight() - height) / 2;
+ drawLayout(d, position, { top, height, fullWidth: false }, true);
}
diff --git a/app/apps/onboarding/onboarding-app.ts b/app/apps/onboarding/onboarding-app.ts
index 66a7000d..fb799dc8 100644
--- a/app/apps/onboarding/onboarding-app.ts
+++ b/app/apps/onboarding/onboarding-app.ts
@@ -7,7 +7,6 @@ import { findSoundEffect, playSoundEffect } from "../../ui/sound-effects";
import { DataCollectionPage } from "./data-collection-page";
import { DepthPage } from "./depth-page";
import { DisplayModePage } from "./display-mode-page";
-import { IosPrivacyPage } from "./ios-privacy-page";
import { LayoutPage } from "./layout-page";
import { markGlassesOnboardingFinished, ONBOARDING_APP_ID } from "./onboarding-progress";
import type { OnboardingPage } from "./onboarding-page";
@@ -26,9 +25,7 @@ export const ONBOARDING_SURFACE_ID = "window:onboarding";
*/
export function createOnboardingAppWindow(options: InProcessAppOptions): InProcessWindow {
const pages: OnboardingPage[] = [
- new WelcomePage(), new TextSizePage(),
- ...(global.isIOS ? [new IosPrivacyPage()] : []),
- new DataCollectionPage(), new LayoutPage(), new DepthPage(), new DisplayModePage(),
+ new WelcomePage(), new TextSizePage(), new DataCollectionPage(), new LayoutPage(), new DepthPage(), new DisplayModePage(),
];
const app = createInProcessWindow({
appId: ONBOARDING_APP_ID,
diff --git a/app/apps/onboarding/text-size-page.ts b/app/apps/onboarding/text-size-page.ts
index 46498f45..485691b7 100644
--- a/app/apps/onboarding/text-size-page.ts
+++ b/app/apps/onboarding/text-size-page.ts
@@ -3,6 +3,7 @@ import { installedFontPath } from "../../graphics/installed-fonts";
import { wrapText } from "../../graphics/textwrap";
import { TtfFont } from "../../graphics/ttf-font";
import {
+ defaultUiFontSize,
fontSelectionLabel,
getDefaultSmallFont,
getUiFontSelection,
@@ -25,8 +26,6 @@ const ROW_GAP = 2;
const NOTE_GAP = 8;
/** The sizes offered here; Settings has the full range. */
const SIZE_CHOICES = FONT_SIZE_CHOICES.filter((size) => size >= 12 && size <= 18);
-/** Selected on the first visit, and marked. */
-const RECOMMENDED_SIZE = 16;
const RECOMMENDED_NOTE = "Recommended";
/** Drawn while they fit, so smaller sizes visibly show more words. */
const PREVIEW_PARAGRAPHS = [
@@ -41,7 +40,8 @@ type Face =
| { kind: "fixed"; label: string };
/**
- * The UI font's size, 12 to 18px (16 recommended, and selected at first),
+ * The UI font's size, 12 to 18px (the default size recommended, and
+ * selected at first: 16px, or 14px on the RayNeo iO),
* beside a preview of text in the selected size. The face and weight stay
* as they are (they live in the Settings font picker); a bitmap face has
* only one size, so the page just says so. The size is saved on tap, not
@@ -67,7 +67,7 @@ export class TextSizePage implements OnboardingPage {
if (sizes.length) {
this.face = { kind: "sized", file: selection.file, path, sizes };
// The recommended size the first time; on a return, what was left selected.
- this.sizeMenu.setItems(sizes, nearestIndex(sizes, this.sizeMenu.selectedItem ?? RECOMMENDED_SIZE));
+ this.sizeMenu.setItems(sizes, nearestIndex(sizes, this.sizeMenu.selectedItem ?? defaultUiFontSize()));
return;
}
}
@@ -137,7 +137,7 @@ export class TextSizePage implements OnboardingPage {
const body = onboardingFont("body");
const label = sizeLabel(size);
image.drawText(body, x + 10, y + LIST_ROW_TEXT_INSET, label, selected ? 255 : 190);
- if (size !== RECOMMENDED_SIZE) return;
+ if (size !== defaultUiFontSize()) return;
const detail = onboardingFont("detail");
const noteY = y + Math.round((height - detail.lineHeight) / 2);
image.drawText(detail, x + 10 + body.measureText(label) + NOTE_GAP, noteY, RECOMMENDED_NOTE, selected ? 210 : 150);
diff --git a/app/apps/terminal/terminal-app.worker.ts b/app/apps/terminal/terminal-app.worker.ts
index 87bf9fdc..0f32c5d3 100644
--- a/app/apps/terminal/terminal-app.worker.ts
+++ b/app/apps/terminal/terminal-app.worker.ts
@@ -6,9 +6,15 @@
* connected host's heading launches a shell there), and hosts the Manage
* Connections section
* where g2mirror:// connections are added, removed, and toggled.
- * - "terminal:view:N": opened by selecting a session in the hub; each has
- * its own websocket connection (the protocol allows one attached session
- * per connection) and its own xterm emulator.
+ * - Selecting a session in the hub shows it in the hub's own window: a view
+ * takes the hub's place in `windows` under the same window id, and
+ * double-click puts the hub back. The window grows to the view's height
+ * meanwhile. Sessions already open in a window of their own focus it instead.
+ * - "terminal:view:N": a session in a window of its own, opened with "Open in
+ * new window" from the window menu (or by launching a session).
+ *
+ * Each view has its own websocket connection (the protocol allows one attached
+ * session per connection) and its own xterm emulator.
*
* Connections are g2mirror://@[:port] strings (g2mirrors:// for
* TLS), stored as JSON in the settings store (see connections.ts). Each
@@ -69,7 +75,7 @@ import { drawSubmenuIndicator, submenuItem, type MenuItem } from "../../ui/menu"
import { Menu, type MenuDrawArgs } from "../../ui/menu-core";
import { centeredTextY, lineStep, listRowHeight, textInkHeight } from "../../ui/metrics";
import { WindowMenu, WindowMenuLayer } from "../../ui/window-menu";
-import { appViewportSize } from "../../ui/shell/geometry";
+import { appViewportSize, type WindowHeightMode } from "../../ui/shell/geometry";
import type { WorkerAppMessage, WorkerAppReply } from "../../ui/shell/worker-window";
import type { ToolResult, ToolSpec } from "../../assistant/tool-registry";
@@ -109,7 +115,10 @@ const LAUNCH_PRESETS_KEY = "terminal.launchPresets";
type BaseWindow = {
windowId: string;
surfaceId: string;
- /** Shell-side window title, echoed back in the open-window message. */
+ /**
+ * Window menu title: the shell-side window title, echoed back in the
+ * open-window message, or the session's label for a view in the hub's window.
+ */
title: string;
/** Content viewport from the shell's open-window message; grid = viewport / cell. */
viewportWidth: number;
@@ -155,6 +164,11 @@ type HubWindow = BaseWindow & {
type ViewWindow = BaseWindow & {
kind: "view";
+ /**
+ * Set when this view is showing in the hub's window rather than one of its
+ * own: the hub it replaced, which double-click restores.
+ */
+ hub: HubWindow | null;
/** Grid font and integer cell pitch, captured at window creation. */
font: UiFont;
cellWidth: number;
@@ -202,8 +216,13 @@ type PendingView = {
options: G2MirrorClientOptions;
};
+type Viewport = { width: number; height: number };
+
const windows = new Map();
const pendingViews = new Map();
+// Windows waiting on the shell's answer to a set-height-mode, by window id:
+// what to do with the viewport it comes back with (see changeWindowHeight).
+const pendingHeightChanges = new Map void>();
// The view an assistant tool acts on when the terminal isn't foregrounded:
// the last view to be foregrounded or receive input.
let activeViewId: string | null = null;
@@ -338,6 +357,12 @@ global.onmessage = (event: { data: WorkerAppMessage }) => {
openWindow(message.windowId, message.surfaceId, message.title, message.viewport);
break;
case "resize-window": {
+ const heightChange = pendingHeightChanges.get(message.windowId);
+ if (heightChange) {
+ pendingHeightChanges.delete(message.windowId);
+ heightChange(message.viewport);
+ break;
+ }
const window = windows.get(message.windowId);
if (!window || (window.viewportWidth === message.viewport.width && window.viewportHeight === message.viewport.height)) break;
window.viewportWidth = message.viewport.width;
@@ -543,18 +568,24 @@ function openWindow(windowId: string, surfaceId: string, title: string, viewport
updateHubAnimation();
}
+/** Drop a view's connection for good: its window closed or the hub took its place. */
+function stopViewConnection(window: ViewWindow): void {
+ for (const unsubscribe of window.unsubscribers.splice(0)) {
+ unsubscribe();
+ }
+ if (window.reconnectTimer) {
+ clearTimeout(window.reconnectTimer);
+ window.reconnectTimer = null;
+ }
+ window.client.stop();
+}
+
function closeWindow(windowId: string): void {
const window = windows.get(windowId);
if (!window) return;
+ pendingHeightChanges.delete(windowId);
if (window.kind === "view") {
- for (const unsubscribe of window.unsubscribers.splice(0)) {
- unsubscribe();
- }
- if (window.reconnectTimer) {
- clearTimeout(window.reconnectTimer);
- window.reconnectTimer = null;
- }
- window.client.stop();
+ stopViewConnection(window);
}
if (window.kind === "hub" && window.mode === "add") {
// Window closed mid-add: shut the phone editor down.
@@ -759,10 +790,11 @@ function routeBell(connectionId: string, socket: string, lastBellAtMs: number):
}
}
if (terminalWakeOnBellSetting.get()) {
- // Wake to the belling session's view window, or the hub if it has none.
- // The shell drops the message unless the glasses are actually asleep.
+ // Wake to the belling session's view window, or the hub's window (whatever
+ // it is showing) if it has none. The shell drops the message unless the
+ // glasses are actually asleep.
const viewId = viewWindowIdForSocket(connectionId, socket);
- const hubId = [...windows.values()].find((window) => window.kind === "hub")?.windowId ?? null;
+ const hubId = [...windows.values()].find((window) => window.kind === "hub" || window.hub)?.windowId ?? null;
const target = viewId ?? hubId;
if (target) post({ type: "wake-window", windowId: target });
}
@@ -895,6 +927,7 @@ function createViewWindow(
const client = new G2MirrorClient({ ...view.options, cols: gridCols, rows: gridRows });
const window: ViewWindow = {
kind: "view",
+ hub: null,
windowId,
surfaceId,
title,
@@ -1053,12 +1086,41 @@ function connectedControls(): ControlConnection[] {
return [...controls.values()].filter(isControlConnected);
}
+/**
+ * What the window menu's "Open in new window" does here, if it applies: to the
+ * session selected in the hub's list, or the session showing in the hub's
+ * window (which gives way to the list, as a session has one window at a time).
+ */
+function openInNewWindowAction(window: TerminalWindow): (() => void) | null {
+ if (window.kind === "hub") {
+ const row = hubMenu(window).selectedItem?.sessionRow;
+ if (!row) return null;
+ return () => {
+ if (!focusSessionWindow(row.control, row.session)) openViewWindowFor(row.control, row.session);
+ };
+ }
+ const control = window.hub && controls.get(window.connectionId);
+ if (!control) return null;
+ return () => returnToHub(window, () => openViewWindow(control, window.socket, window.label));
+}
+
function windowMenuItems(window: TerminalWindow): MenuItem[] {
- const items: MenuItem[] = [
+ const items: MenuItem[] = [];
+ const openInNewWindow = openInNewWindowAction(window);
+ if (openInNewWindow) {
+ items.push({
+ label: "Open in new window",
+ onSelect: (ctx) => {
+ ctx.stack.pop();
+ openInNewWindow();
+ },
+ });
+ }
+ items.push(
submenuItem("Settings", (ctx) => {
ctx.stack.push(new WindowMenuLayer("Terminal settings", settingsMenuItems()));
}),
- ];
+ );
if (window.kind === "hub") {
const connected = connectedControls();
const multiHost = connected.length > 1;
@@ -1142,8 +1204,14 @@ function handleInput(window: TerminalWindow, event: InputEvent, frameId: number)
return;
}
if (event.type === "double-click") {
- // Inside the hub's sub-sections, double-click backs out one level; at the
- // top level (and in views) it yields focus to the sidebar as everywhere.
+ // Inside the hub's sub-sections and a session shown in its window,
+ // double-click backs out one level; at the top level (and in views with
+ // windows of their own) it yields focus to the sidebar as everywhere.
+ if (window.kind === "view" && window.hub) {
+ frameTimings.finishFrame(frameId, "discarded: terminal returning to the session list");
+ returnToHub(window);
+ return;
+ }
if (window.kind === "hub" && window.mode === "add") {
cancelAddConnection(window);
renderAndSubmit(window, frameId);
@@ -1233,6 +1301,8 @@ type HubItem = {
active?: boolean;
/** Glyph of the view window showing this session (the number column). */
openGlyph?: string | null;
+ /** The live session this row lists, for the window menu's "Open in new window". */
+ sessionRow?: { control: ControlConnection; session: G2MirrorSession };
onSelect?: () => void;
};
@@ -1371,13 +1441,9 @@ function hubSessionItems(window: HubWindow): HubItem[] {
label: sessionLabel(session),
active: isSessionActive(control.config.id, session.socket),
openGlyph: viewGlyphForSocket(control.config.id, session.socket),
+ sessionRow: { control, session },
onSelect: () => {
- const windowId = viewWindowIdForSocket(control.config.id, session.socket);
- if (windowId) {
- post({ type: "focus-window", windowId });
- } else {
- openViewWindowFor(control, session);
- }
+ if (!focusSessionWindow(control, session)) showSessionInHub(window, control, session);
},
});
}
@@ -1587,10 +1653,89 @@ function viewWindowIdForSocket(connectionId: string, socket: string): string | n
return null;
}
+/** Focus the window already showing a session; false if it has none. */
+function focusSessionWindow(control: ControlConnection, session: G2MirrorSession): boolean {
+ const windowId = viewWindowIdForSocket(control.config.id, session.socket);
+ if (!windowId) return false;
+ post({ type: "focus-window", windowId });
+ return true;
+}
+
function openViewWindowFor(control: ControlConnection, session: G2MirrorSession): void {
openViewWindow(control, session.socket, sessionLabel(session));
}
+/**
+ * Ask the shell to move a window to another height band, then run `apply` with
+ * the viewport it answers with: only the shell knows what a band comes to (the
+ * bottom switcher's height lives on the main thread), and a view's grid goes
+ * into its websocket handshake, so the size has to be right before it starts.
+ * Ignored if the window is already waiting on an answer (a repeated gesture).
+ */
+function changeWindowHeight(windowId: string, heightMode: WindowHeightMode, apply: (viewport: Viewport) => void): void {
+ if (pendingHeightChanges.has(windowId)) return;
+ pendingHeightChanges.set(windowId, apply);
+ post({ type: "set-height-mode", windowId, heightMode });
+}
+
+/** Make `incoming` what its window id shows, in place of `outgoing`. */
+function replaceWindowContent(outgoing: TerminalWindow, incoming: TerminalWindow): void {
+ incoming.foreground = outgoing.foreground;
+ incoming.focused = outgoing.focused;
+ incoming.lastSubmittedFingerprint = "";
+ // Its pending timers and emulator callbacks must not paint over the surface.
+ outgoing.foreground = false;
+ windows.set(incoming.windowId, incoming);
+ updateHubAnimation();
+ renderAndSubmit(incoming, 0);
+}
+
+/** A session was selected in the list: show it in the hub's own window. */
+function showSessionInHub(hub: HubWindow, control: ControlConnection, session: G2MirrorSession): void {
+ const options = clientOptionsFor(control.config);
+ if (!options) return;
+ const label = sessionLabel(session);
+ // Tall like a session in its own window (see openViewWindow).
+ changeWindowHeight(hub.windowId, "max", (viewport) => {
+ const view = createViewWindow(hub.windowId, hub.surfaceId, label, viewport, {
+ connectionId: control.config.id,
+ socket: session.socket,
+ label,
+ glyph: "",
+ options,
+ });
+ view.hub = hub;
+ if (hub.foreground) activeViewId = view.windowId;
+ replaceWindowContent(hub, view);
+ });
+}
+
+/**
+ * Back from a session in the hub's window to the list. The list keeps the order
+ * it had, with this session's row selected: viewing a session bumps its
+ * recency, and re-sorting on every return would shuffle the list while the user
+ * steps through it. `then` runs once the session's connection is gone.
+ */
+function returnToHub(view: ViewWindow, then?: () => void): void {
+ const hub = view.hub;
+ if (!hub) return;
+ changeWindowHeight(view.windowId, "min", (viewport) => {
+ stopViewConnection(view);
+ view.emulator.dispose();
+ if (activeViewId === view.windowId) activeViewId = null;
+ hub.viewportWidth = viewport.width;
+ hub.viewportHeight = viewport.height;
+ hub.menu?.resize(viewport);
+ const items = hubItems(hub);
+ const row = items.findIndex(
+ (item) => item.sessionRow?.control.config.id === view.connectionId && item.sessionRow.session.socket === view.socket,
+ );
+ hubMenu(hub).setItems(items, row >= 0 ? row : undefined);
+ replaceWindowContent(view, hub);
+ then?.();
+ });
+}
+
/**
* Lowest unused sidebar-icon character for a new view window (its terminal
* icon shows ">N"). Glyphs free up when their window closes, since usage is
diff --git a/app/assistant/window-tools.ts b/app/assistant/window-tools.ts
index 44350606..9724550a 100644
--- a/app/assistant/window-tools.ts
+++ b/app/assistant/window-tools.ts
@@ -5,11 +5,11 @@
* mirrors what the user can do from the launcher grid and the sidebar.
*
* The launchable set is the built-in launcher apps plus whatever EvenHub
- * packages are installed right now, matching the launcher grid. Installs and
- * uninstalls change that set at runtime, so the tools re-register (replacing
- * themselves by name) whenever it changes to keep the id enums and
- * descriptions current; register() fires the tools-changed broadcast that
- * propagates the new specs to the assistant backends.
+ * packages are installed right now, matching the launcher grid. Installs,
+ * uninstalls and pairing different glasses change that set at runtime, so the
+ * tools re-register (replacing themselves by name) whenever it changes to keep
+ * the id enums and descriptions current; register() fires the tools-changed
+ * broadcast that propagates the new specs to the assistant backends.
*/
import { shell, type ShellWindow } from "../ui/shell/shell";
import type { AppDefinition } from "../apps/app-definition";
@@ -30,8 +30,8 @@ import { onAnySettingChanged } from "../ui/dashboard-settings";
import { toolRegistry, type ToolRegistry, type ToolResult } from "./tool-registry";
export type WindowToolsOptions = {
- /** The built-in launcher apps; installed EvenHub apps are added dynamically. */
- apps: readonly AppDefinition[];
+ /** The built-in launcher apps for the paired glasses; installed EvenHub apps are added dynamically. */
+ apps: () => readonly AppDefinition[];
/** Launch (or focus) an app exactly as the launcher grid would. */
launchApp: (appId: string) => Promise | void;
/** Repaint the shell surface so the sidebar reflects a focus change. */
@@ -47,9 +47,11 @@ export function registerWindowTools(
if (registered) return;
registered = true;
registerTools(options, registry);
- let fingerprint = getInstalledEvenHubFingerprint();
+ const launchableFingerprint = () =>
+ `${getInstalledEvenHubFingerprint()}\n${options.apps().map((app) => app.appId).join()}`;
+ let fingerprint = launchableFingerprint();
onAnySettingChanged(() => {
- const current = getInstalledEvenHubFingerprint();
+ const current = launchableFingerprint();
if (current === fingerprint) return;
fingerprint = current;
registerTools(options, registry);
@@ -58,7 +60,7 @@ export function registerWindowTools(
function registerTools(options: WindowToolsOptions, registry: ToolRegistry): void {
const installedApps = getInstalledEvenHubApps();
- const apps = new Map(options.apps.map((app) => [app.appId, app.title]));
+ const apps = new Map(options.apps().map((app) => [app.appId, app.title]));
for (const app of installedApps) {
apps.set(installedEvenHubAppId(app.packageId), app.name);
}
diff --git a/app/g1/addresses.ts b/app/g1/addresses.ts
new file mode 100644
index 00000000..c966a453
--- /dev/null
+++ b/app/g1/addresses.ts
@@ -0,0 +1,37 @@
+/** Keeping what's saved about a G1 current as an install changes its arms' addresses. */
+import {
+ loadDeviceAddresses,
+ loadPairedGlassesIdentity,
+ saveDeviceAddresses,
+ savePairedGlassesIdentity,
+} from "../g2/device-addresses";
+import type { EvenAdvertisement } from "../g2/even-advertisement";
+import type { GlassesPairCandidate } from "../g2/pairing-candidates";
+import type { G1Side } from "./flash-plan";
+
+export function saveG1Pair(pair: GlassesPairCandidate): void {
+ const stored = loadDeviceAddresses();
+ saveDeviceAddresses({ left: pair.left!.address, right: pair.right!.address, ring: stored.ring });
+ const identity = loadPairedGlassesIdentity();
+ savePairedGlassesIdentity({
+ serial: pair.serial ?? identity?.serial ?? "",
+ leftName: pair.left!.name,
+ rightName: pair.right!.name,
+ leftAddress: pair.left!.address,
+ rightAddress: pair.right!.address,
+ ringName: identity?.ringName ?? "",
+ ringAddress: stored.ring,
+ pairedAtMs: identity?.pairedAtMs ?? Date.now(),
+ });
+}
+
+/** Saved as soon as it's known: if anything stops the install after this, the next try and the session still find this arm. */
+export function saveG1Arm(side: G1Side, arm: EvenAdvertisement): void {
+ saveDeviceAddresses({ ...loadDeviceAddresses(), [side]: arm.address });
+ const identity = loadPairedGlassesIdentity();
+ if (identity) {
+ savePairedGlassesIdentity(side === "left"
+ ? { ...identity, leftName: arm.name, leftAddress: arm.address }
+ : { ...identity, rightName: arm.name, rightAddress: arm.address });
+ }
+}
diff --git a/app/g1/arm-scanner.ts b/app/g1/arm-scanner.ts
new file mode 100644
index 00000000..22b6782d
--- /dev/null
+++ b/app/g1/arm-scanner.ts
@@ -0,0 +1,86 @@
+/**
+ * Finding a G1's arms by listening for them. That's how an install knows what each arm runs before connecting to it,
+ * and how it finds an arm again afterwards, when it advertises what it runs now (and, coming from g1v0 before 0.5.66, at
+ * a new address).
+ */
+import { classifyAdvertisement, type EvenAdvertisement } from "../g2/even-advertisement";
+import { DiscoveryAggregator, type GlassesPairCandidate } from "../g2/pairing-candidates";
+import { DeviceDiscoveryBridge } from "../native/device-discovery";
+import { pickG1Pair, sameG1Serial, type G1Side, type G1Wanted } from "./flash-plan";
+
+/** A serial should tell which arm is ours, but an arm that is the only one of its side around is good enough after this. */
+const ACCEPT_ANY_SERIAL_AFTER_MS = 45_000;
+
+export class G1ArmScanner {
+ private discovery: DeviceDiscoveryBridge | null = null;
+ private finish: (() => void) | null = null;
+
+ /** Resolves with the wanted pair once both arms have been heard, or null after [timeoutMs]. */
+ waitForPair(wanted: G1Wanted, timeoutMs: number): Promise {
+ const aggregator = new DiscoveryAggregator();
+ return this.listen(timeoutMs, (raw, done) => {
+ if (aggregator.ingest(raw)) {
+ const pair = pickG1Pair(aggregator.pairs(), wanted);
+ if (pair) done(pair);
+ }
+ });
+ }
+
+ /** Resolves when an arm of this side on g1v0 is heard, or null after [timeoutMs]. */
+ waitForG1v0Arm(side: G1Side, serial: string | null | undefined, timeoutMs: number): Promise {
+ return this.waitForArm(side, serial, timeoutMs, (arm) => arm.g1Firmware !== "stock");
+ }
+
+ /** Resolves when an arm of this side is heard that [accept] takes, on any firmware, or null after [timeoutMs]. */
+ waitForArm(
+ side: G1Side,
+ serial: string | null | undefined,
+ timeoutMs: number,
+ accept: (arm: EvenAdvertisement) => boolean,
+ ): Promise {
+ const startedAt = Date.now();
+ const others = new Map();
+ return this.listen(timeoutMs, (raw, done) => {
+ const arm = classifyAdvertisement(raw);
+ if (!arm || arm.role !== side || !arm.g1Firmware || !accept(arm)) return;
+ if (!serial || sameG1Serial(arm.serial, serial)) {
+ done(arm);
+ return;
+ }
+ others.set(arm.address, arm);
+ if (others.size === 1 && Date.now() - startedAt >= ACCEPT_ANY_SERIAL_AFTER_MS) done(arm);
+ });
+ }
+
+ stop(): void {
+ this.finish?.();
+ }
+
+ private listen(timeoutMs: number, onRaw: (raw: Parameters[0], done: (value: T) => void) => void): Promise {
+ return new Promise((resolve, reject) => {
+ this.discovery ??= new DeviceDiscoveryBridge();
+ const discovery = this.discovery;
+ if (!discovery.bluetoothEnabled) {
+ reject(new Error("Bluetooth is off. Turn it on, then try again."));
+ return;
+ }
+ let settled = false;
+ const settle = (value: T | null, error?: Error) => {
+ if (settled) return;
+ settled = true;
+ clearTimeout(timer);
+ this.finish = null;
+ discovery.stopScan();
+ if (error) reject(error);
+ else resolve(value);
+ };
+ const timer = setTimeout(() => settle(null), timeoutMs);
+ this.finish = () => settle(null);
+ const started = discovery.startScan({
+ onAdvertisement: (raw) => onRaw(raw, (value) => settle(value)),
+ onScanFailed: (_code, message) => settle(null, new Error(`The Bluetooth scan failed: ${message}`)),
+ });
+ if (!started) settle(null, new Error("Could not start the Bluetooth scan. Check that Bluetooth is on."));
+ });
+ }
+}
diff --git a/app/g1/even-firmware.ts b/app/g1/even-firmware.ts
new file mode 100644
index 00000000..459c8ead
--- /dev/null
+++ b/app/g1/even-firmware.ts
@@ -0,0 +1,21 @@
+/**
+ * Even's official G1 firmware, which an uninstall puts back: both images of one public release, the application core's
+ * and the network core's (the Bluetooth controller), as Even's own update installs them, so the two always match.
+ * From Even's CDN, checked against these SHA-256 sums (scouter_kit g1_firmware/stock_images.txt). Every public image
+ * says 0.0.0 in its MCUboot header, so the hashes are the only way to tell releases apart.
+ */
+export type EvenG1Release = {
+ version: string;
+ zipUrl: string;
+ zipSha256: string;
+ appSha256: string;
+ netCoreSha256: string;
+};
+
+export const EVEN_G1_RESTORE: EvenG1Release = {
+ version: "1.6.6",
+ zipUrl: "https://cdn.evenreal.co/firmware/dcfa510c090e476c10a6f6c348a22415.zip",
+ zipSha256: "748836f2d9d092b0783cbb7672fdccec4f730051cad27f095bbb156ac3e5d316",
+ appSha256: "ae032838e27037156da98e19de90df78f5406715751f3b38adf50498db3010c1",
+ netCoreSha256: "c277749be97a2763742db399afeb10ca6916059abd60d41bbc05c8892c002c77",
+};
diff --git a/app/g1/firmware-builder.ts b/app/g1/firmware-builder.ts
new file mode 100644
index 00000000..4134443c
--- /dev/null
+++ b/app/g1/firmware-builder.ts
@@ -0,0 +1,73 @@
+/**
+ * Prepares the g1v0 image on the phone, as app/g2/firmware-builder.ts does for a G2: downloads Even's public firmware,
+ * checks it, and puts the parts this firmware embeds back into what the app ships. The result is byte for byte the
+ * image that was built, tested and signed, and it is checked to be. Also prepares Even's own images for an uninstall.
+ * It does not touch the glasses.
+ */
+import { knownFolders } from "@nativescript/core";
+
+import { firmwareSha256, writeFirmwareFile } from "../native/firmware-files";
+import { decodeBase64 } from "../util/base64";
+import { fetchWithUserAgent } from "../util/http";
+import { EVEN_G1_RESTORE } from "./even-firmware";
+import { G1V0_IMAGE } from "./firmware/g1v0-image";
+import { G1V0_OWN_BYTES_BASE64 } from "./firmware/g1v0-own-bytes";
+import { assembleG1Image, decodeG1OwnBytes, extractEvenG1Images, G1FirmwareError, readZipEntry } from "./firmware-image";
+
+export type G1BuildProgress = "downloading" | "verifying" | "assembling" | "writing";
+
+export type BuiltG1Firmware = { path: string; bytes: number; version: string };
+
+/** Even's release for an uninstall: the application core's image and the network core's. */
+export type BuiltEvenG1Firmware = { appPath: string; netCorePath: string; bytes: number; version: string };
+
+function sha256(bytes: Uint8Array): string {
+ return firmwareSha256(bytes.slice().buffer);
+}
+
+async function downloadStockZip(url: string): Promise {
+ let response: Response;
+ try {
+ response = await fetchWithUserAgent(url);
+ } catch (error) {
+ throw new G1FirmwareError(`Could not reach Even's firmware server: ${(error as Error)?.message ?? error}`);
+ }
+ if (!response.ok) throw new G1FirmwareError(`The firmware download failed (HTTP ${response.status}).`);
+ return new Uint8Array(await response.arrayBuffer());
+}
+
+export async function buildG1Firmware(onProgress?: (progress: G1BuildProgress) => void): Promise {
+ onProgress?.("downloading");
+ const zip = await downloadStockZip(G1V0_IMAGE.stockZipUrl);
+
+ onProgress?.("verifying");
+ const zipHash = sha256(zip);
+ if (zipHash !== G1V0_IMAGE.stockZipSha256) {
+ throw new G1FirmwareError(`Even's firmware download failed verification.\nexpected ${G1V0_IMAGE.stockZipSha256}\ngot ${zipHash}`);
+ }
+
+ onProgress?.("assembling");
+ const own = decodeG1OwnBytes(G1V0_OWN_BYTES_BASE64, decodeBase64);
+ const image = assembleG1Image(G1V0_IMAGE, own, (name) => readZipEntry(zip, name), sha256);
+
+ onProgress?.("writing");
+ const path = `${knownFolders.documents().path}/g1v0_${G1V0_IMAGE.version}.bin`;
+ writeFirmwareFile(path, image.slice().buffer);
+ return { path, bytes: image.length, version: G1V0_IMAGE.version };
+}
+
+export async function buildEvenG1Firmware(onProgress?: (progress: G1BuildProgress) => void): Promise {
+ onProgress?.("downloading");
+ const zip = await downloadStockZip(EVEN_G1_RESTORE.zipUrl);
+
+ onProgress?.("verifying");
+ const { app, netCore } = extractEvenG1Images(zip, EVEN_G1_RESTORE, sha256);
+
+ onProgress?.("writing");
+ const folder = knownFolders.documents().path;
+ const appPath = `${folder}/even_g1_${EVEN_G1_RESTORE.version}_app.bin`;
+ const netCorePath = `${folder}/even_g1_${EVEN_G1_RESTORE.version}_net.bin`;
+ writeFirmwareFile(appPath, app.slice().buffer);
+ writeFirmwareFile(netCorePath, netCore.slice().buffer);
+ return { appPath, netCorePath, bytes: app.length + netCore.length, version: EVEN_G1_RESTORE.version };
+}
diff --git a/app/g1/firmware-image.ts b/app/g1/firmware-image.ts
new file mode 100644
index 00000000..69350bb6
--- /dev/null
+++ b/app/g1/firmware-image.ts
@@ -0,0 +1,107 @@
+/**
+ * Rebuilding the g1v0 image from what the app ships and Even's public firmware download. No I/O, so tests can run it
+ * on real or made-up files. tools/g1_firmware_bundle.py is the other half.
+ */
+import { inflate, inflateRaw } from "pako";
+
+import type { EvenG1Release } from "./even-firmware";
+import type { G1FirmwareImage } from "./firmware/g1v0-image";
+
+export class G1FirmwareError extends Error {}
+
+/** One file from a zip; throws when it's absent or in a form a firmware zip doesn't use. */
+export function readZipEntry(zip: Uint8Array, name: string): Uint8Array {
+ const view = new DataView(zip.buffer, zip.byteOffset, zip.byteLength);
+ const END_OF_DIRECTORY = 0x06054b50;
+ const DIRECTORY_ENTRY = 0x02014b50;
+ const LOCAL_HEADER = 0x04034b50;
+ let end = zip.length - 22;
+ while (end >= 0 && view.getUint32(end, true) !== END_OF_DIRECTORY) end--;
+ if (end < 0) throw new G1FirmwareError("The firmware download is not a zip file.");
+ const count = view.getUint16(end + 10, true);
+ let at = view.getUint32(end + 16, true);
+ for (let i = 0; i < count; i++) {
+ if (at + 46 > zip.length || view.getUint32(at, true) !== DIRECTORY_ENTRY) break;
+ const method = view.getUint16(at + 10, true);
+ const packedSize = view.getUint32(at + 20, true);
+ const nameLength = view.getUint16(at + 28, true);
+ const extraLength = view.getUint16(at + 30, true);
+ const commentLength = view.getUint16(at + 32, true);
+ const headerAt = view.getUint32(at + 42, true);
+ const entryName = String.fromCharCode(...zip.subarray(at + 46, at + 46 + nameLength));
+ if (entryName === name || entryName.endsWith(`/${name}`)) {
+ if (view.getUint32(headerAt, true) !== LOCAL_HEADER) throw new G1FirmwareError(`Bad zip entry for ${name}.`);
+ const dataAt = headerAt + 30 + view.getUint16(headerAt + 26, true) + view.getUint16(headerAt + 28, true);
+ const packed = zip.subarray(dataAt, dataAt + packedSize);
+ if (method === 0) return packed.slice();
+ if (method === 8) return inflateRaw(packed);
+ throw new G1FirmwareError(`${name} uses zip method ${method}.`);
+ }
+ at += 46 + nameLength + extraLength + commentLength;
+ }
+ throw new G1FirmwareError(`The firmware download has no ${name}.`);
+}
+
+/**
+ * The two images of Even's release from its download, each checked by its own SHA-256 as well as the zip's, so what
+ * goes to the arms is byte for byte what Even published.
+ */
+export function extractEvenG1Images(
+ zip: Uint8Array,
+ release: EvenG1Release,
+ sha256: (bytes: Uint8Array) => string,
+): { app: Uint8Array; netCore: Uint8Array } {
+ const zipHash = sha256(zip);
+ if (zipHash !== release.zipSha256) {
+ throw new G1FirmwareError(`Even's firmware download failed verification.\nexpected ${release.zipSha256}\ngot ${zipHash}`);
+ }
+ const checked = (name: string, want: string) => {
+ const bytes = readZipEntry(zip, name);
+ const got = sha256(bytes);
+ if (got !== want) throw new G1FirmwareError(`${name} in Even's download failed verification.\nexpected ${want}\ngot ${got}`);
+ return bytes;
+ };
+ return {
+ app: checked("app_update.bin", release.appSha256),
+ netCore: checked("net_core_app_update.bin", release.netCoreSha256),
+ };
+}
+
+export function decodeG1OwnBytes(base64: string, decode: (text: string) => Uint8Array): Uint8Array {
+ return inflate(decode(base64));
+}
+
+/**
+ * The finished image. [fileBytes] gives one of Even's unpacked files by name, [sha256] a lowercase hex digest. Each part
+ * and the result are checked, so a success is byte for byte the image that was built and signed.
+ */
+export function assembleG1Image(
+ manifest: G1FirmwareImage,
+ own: Uint8Array,
+ fileBytes: (name: string) => Uint8Array,
+ sha256: (bytes: Uint8Array) => string,
+): Uint8Array {
+ const image = new Uint8Array(manifest.size);
+ let position = 0;
+ let ownAt = 0;
+ for (const part of [...manifest.parts].sort((a, b) => a.offset - b.offset)) {
+ const before = part.offset - position;
+ image.set(own.subarray(ownAt, ownAt + before), position);
+ ownAt += before;
+ const bytes = fileBytes(part.file).subarray(part.fileOffset, part.fileOffset + part.length);
+ if (bytes.length !== part.length || sha256(bytes) !== part.sha256) {
+ throw new G1FirmwareError(`${part.file} in Even's download is not the one this firmware was built with.`);
+ }
+ image.set(bytes, part.offset);
+ position = part.offset + part.length;
+ }
+ image.set(own.subarray(ownAt), position);
+ if (ownAt + (manifest.size - position) !== own.length) {
+ throw new G1FirmwareError("The firmware bundled with this app is damaged.");
+ }
+ const digest = sha256(image);
+ if (digest !== manifest.sha256) {
+ throw new G1FirmwareError(`The assembled firmware failed verification.\nexpected ${manifest.sha256}\ngot ${digest}`);
+ }
+ return image;
+}
diff --git a/app/g1/firmware/g1v0-image.ts b/app/g1/firmware/g1v0-image.ts
new file mode 100644
index 00000000..07b3a1fd
--- /dev/null
+++ b/app/g1/firmware/g1v0-image.ts
@@ -0,0 +1,41 @@
+// AUTO-GENERATED by tools/g1_firmware_bundle.py -- do not edit by hand.
+// What the app installs on a G1, and the parts of it that come from Even's own download.
+
+export type G1FirmwarePart = { offset: number; length: number; file: string; fileOffset: number; sha256: string };
+
+export type G1FirmwareImage = {
+ version: string;
+ sha256: string;
+ size: number;
+ source: string;
+ stockVersion: string;
+ stockZipUrl: string;
+ stockZipSha256: string;
+ parts: G1FirmwarePart[];
+};
+
+export const G1V0_IMAGE: G1FirmwareImage = {
+ "version": "0.5.66",
+ "sha256": "9861a5671ed2fab6a678feae1f22e57d0b41bbb5934d83b898c5108db3a474fd",
+ "size": 582992,
+ "source": "ceb74cce6945",
+ "stockVersion": "1.6.6",
+ "stockZipUrl": "https://cdn.evenreal.co/firmware/dcfa510c090e476c10a6f6c348a22415.zip",
+ "stockZipSha256": "748836f2d9d092b0783cbb7672fdccec4f730051cad27f095bbb156ac3e5d316",
+ "parts": [
+ {
+ "offset": 271264,
+ "length": 226020,
+ "file": "net_core_app_update.bin",
+ "fileOffset": 0,
+ "sha256": "c277749be97a2763742db399afeb10ca6916059abd60d41bbc05c8892c002c77"
+ },
+ {
+ "offset": 497312,
+ "length": 352,
+ "file": "app_update.bin",
+ "fileOffset": 531288,
+ "sha256": "92e73a6dd92da734bc21e8184d94d69e9a49e23056e378670b24334a305a953d"
+ }
+ ]
+};
diff --git a/app/g1/firmware/g1v0-own-bytes.ts b/app/g1/firmware/g1v0-own-bytes.ts
new file mode 100644
index 00000000..66afc7e8
--- /dev/null
+++ b/app/g1/firmware/g1v0-own-bytes.ts
@@ -0,0 +1,4 @@
+// AUTO-GENERATED by tools/g1_firmware_bundle.py -- do not edit by hand.
+// The built g1v0 image without Even's parts (g1v0-image.ts), deflated.
+
+export const G1V0_OWN_BYTES_BASE64 = "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";
diff --git a/app/g1/flash-plan.ts b/app/g1/flash-plan.ts
new file mode 100644
index 00000000..e6e61868
--- /dev/null
+++ b/app/g1/flash-plan.ts
@@ -0,0 +1,120 @@
+/** What installing firmware on a G1 has to decide. No I/O. */
+import type { GlassesPairCandidate } from "../g2/pairing-candidates";
+import { EVEN_G1_RESTORE } from "./even-firmware";
+
+export type G1Side = "left" | "right";
+
+/** Left first: a right arm on g1v0 next to a left arm on Even's firmware would leave the left eye dark. */
+export const G1_SIDES: readonly G1Side[] = ["left", "right"];
+
+/** Going back, right first, for the same reason: halfway, the pair is as halfway through an install. */
+export const G1_UNINSTALL_SIDES: readonly G1Side[] = ["right", "left"];
+
+export const G1_CASE_INSTRUCTIONS =
+ "Put the glasses in their charging case with the lid open, and plug the case in. Stay nearby, and leave Faceclaw open.";
+
+/** An arm bonds only once it knows it's in the case, and a full case only says so about every 5 minutes. */
+export const G1_CASE_DELAY_HINT =
+ "A fully charged arm can take up to 5 minutes to notice it's in the case, so this may take a while.";
+
+export const G1_INSTALL_NOTICE =
+ "This replaces the firmware on both arms, about two minutes each. Faceclaw can put Even's firmware back later, but as version " +
+ `${EVEN_G1_RESTORE.version}, which may not be the version you have now. Installing custom firmware is not covered by warranty.`;
+
+export const G1_UNINSTALL_NOTICE =
+ `This puts Even's official firmware ${EVEN_G1_RESTORE.version} back on both arms, Bluetooth controller included, a few minutes ` +
+ "each. It may not be the version they came with. Afterwards they work with Even's app again, and not with Faceclaw until you " +
+ "install its firmware again.";
+
+/** What the native flow says when it finishes (G1ArmFlashFlow). */
+export type G1FlashResult = {
+ flashed?: boolean;
+ firmware?: "g1v0" | "stock";
+ /** A restore erased g1v0's asset store, where Even's fonts and pictures were. */
+ wiped?: boolean;
+ version?: string;
+ safeMode?: boolean;
+ inCase?: boolean;
+ battery?: number | null;
+};
+
+export function parseG1FlashResult(detail: string): G1FlashResult {
+ try {
+ const parsed = JSON.parse(detail);
+ return parsed && typeof parsed === "object" ? (parsed as G1FlashResult) : {};
+ } catch {
+ return {};
+ }
+}
+
+/** Dotted versions, component by component; a missing component counts as 0. */
+export function compareG1Versions(a: string, b: string): number {
+ const parts = (version: string) => version.split(".").map((part) => parseInt(part, 10) || 0);
+ const left = parts(a);
+ const right = parts(b);
+ for (let i = 0; i < Math.max(left.length, right.length); i++) {
+ const delta = (left[i] ?? 0) - (right[i] ?? 0);
+ if (delta !== 0) return delta;
+ }
+ return 0;
+}
+
+export type G1Wanted = { serial?: string | null; left?: string; right?: string };
+
+const serialOf = (serial: string | null | undefined) => (serial ?? "").trim().toUpperCase();
+
+export function sameG1Serial(a: string | null | undefined, b: string | null | undefined): boolean {
+ return serialOf(a) !== "" && serialOf(a) === serialOf(b);
+}
+
+/**
+ * The pair being installed on, among those heard, once both arms have been. Its serial decides, as a flash changes an arm's
+ * address; an address it was saved under also tells. Only with neither known does the only G1 around count: firmware
+ * must never go to someone else's glasses because the wanted ones weren't heard.
+ */
+export function pickG1Pair(pairs: readonly GlassesPairCandidate[], wanted: G1Wanted): GlassesPairCandidate | null {
+ const g1 = pairs.filter((pair) => pair.g1Firmware);
+ const complete = (pair: GlassesPairCandidate | undefined) => (pair?.left && pair.right ? pair : null);
+ const bySerial = g1.find((pair) => sameG1Serial(pair.serial, wanted.serial));
+ if (bySerial) return complete(bySerial);
+ const byAddress = g1.find((pair) =>
+ (!!wanted.left && pair.left?.address === wanted.left) || (!!wanted.right && pair.right?.address === wanted.right));
+ if (byAddress) return complete(byAddress);
+ if (serialOf(wanted.serial) || wanted.left || wanted.right) return null;
+ return g1.length === 1 ? complete(g1[0]) : null;
+}
+
+/**
+ * What a check of the two arms found: "stock", Even's firmware on an arm; "safe-mode", g1v0 restarted repeatedly and only
+ * updates work; "older", older than the app ships; "current", nothing to do.
+ */
+export type G1FirmwareState = "stock" | "safe-mode" | "older" | "current";
+
+export function g1FirmwareState(arms: readonly G1FlashResult[], shipped: string): G1FirmwareState {
+ if (arms.some((arm) => arm.firmware === "stock")) return "stock";
+ if (arms.some((arm) => arm.safeMode)) return "safe-mode";
+ return arms.some((arm) => compareG1Versions(arm.version ?? "", shipped) < 0) ? "older" : "current";
+}
+
+/**
+ * What the arms' advertising alone says about their firmware, or null when an arm has to be asked: firmware before 0.5.66
+ * doesn't advertise its version.
+ */
+export function g1StateFromAdvertising(
+ pair: Pick,
+ shipped: string,
+): { state: G1FirmwareState; version: string } | null {
+ const arms = [pair.left, pair.right];
+ if (arms.some((arm) => arm?.g1Firmware === "stock")) return { state: "stock", version: "" };
+ if (arms.some((arm) => arm?.g1Firmware === "g1v0-safe")) return { state: "safe-mode", version: "" };
+ const versions = arms.map((arm) => arm?.g1Version);
+ if (!versions[0] || !versions[1]) return null;
+ const lowest = compareG1Versions(versions[0], versions[1]) <= 0 ? versions[0] : versions[1];
+ return { state: compareG1Versions(lowest, shipped) < 0 ? "older" : "current", version: lowest };
+}
+
+/** Each arm counts for half of the bar, in the order they're done. */
+export function g1FlashPercent(side: G1Side, bytesSent: number, bytesTotal: number, order: readonly G1Side[] = G1_SIDES): number {
+ const within = bytesTotal > 0 ? Math.min(1, bytesSent / bytesTotal) : 0;
+ return ((order.indexOf(side) + within) / 2) * 100;
+}
diff --git a/app/g1/pako.d.ts b/app/g1/pako.d.ts
new file mode 100644
index 00000000..8fe2e2a1
--- /dev/null
+++ b/app/g1/pako.d.ts
@@ -0,0 +1,4 @@
+declare module "pako" {
+ export function inflate(data: Uint8Array): Uint8Array;
+ export function inflateRaw(data: Uint8Array): Uint8Array;
+}
diff --git a/app/g2/ancs-client.ts b/app/g2/ancs-client.ts
index 0f11eedf..dc81813d 100644
--- a/app/g2/ancs-client.ts
+++ b/app/g2/ancs-client.ts
@@ -152,8 +152,10 @@ export class AncsClient {
if (flags & 2) {
const data = new Uint8Array(this.fragments); this.fragments = []; this.packetKind = -1
if (kind === 0) {
- if (data.length !== 1 || data[0] > 2) { this.recover(); return true }
+ if (data.length !== 1 || data[0] > 3) { this.recover(); return true }
if (data[0] === 2) { this.recover('Glasses reported a notification relay error. Retrying…'); return true }
+ // Only a G1's firmware looks for ANCS itself, so only it can say the phone isn't offering it.
+ if (data[0] === 3) { this.recover('iPhone is not sharing notifications with the glasses. Enable Share System Notifications in Settings → Bluetooth → right arm. Retrying…'); return true }
if (data[0] === 0) { this.resetReceived = true; this.log('Glasses accepted notification relay START; awaiting subscription') }
if (data[0] === 1) {
if (this.timer !== null) clearTimeout(this.timer)
diff --git a/app/g2/ble-proximity.ts b/app/g2/ble-proximity.ts
index b3a6809c..e5374c62 100644
--- a/app/g2/ble-proximity.ts
+++ b/app/g2/ble-proximity.ts
@@ -27,7 +27,7 @@
*
* It is **not** a measurement. A hand over the temple, a pocket, or a body
* between phone and glasses moves the estimate by metres. The wearer therefore
- * only ever sees a coarse zone (glyph + label), never a number in metres they
+ * only ever sees a coarse zone (a signal-strength glyph), never a number in metres they
* might over-trust; the metres value exists purely to rank and bucket.
*
* This module is pure (no NativeScript imports) so it can run under node tests.
@@ -75,19 +75,6 @@ export function zoneFromMeters(meters: number): ProximityZone {
return "distant";
}
-export function zoneLabel(zone: ProximityZone): string {
- switch (zone) {
- case "immediate":
- return "In your hand";
- case "near":
- return "Nearby";
- case "far":
- return "Across the room";
- case "distant":
- return "Far away";
- }
-}
-
/** A glyph for the zone; SF Symbols have no Android equivalent, so plain text. */
export function zoneGlyph(zone: ProximityZone): string {
switch (zone) {
diff --git a/app/g2/brightness-curve.ts b/app/g2/brightness-curve.ts
index 1695ae8d..4f215640 100644
--- a/app/g2/brightness-curve.ts
+++ b/app/g2/brightness-curve.ts
@@ -1,5 +1,18 @@
export const DEFAULT_BRIGHTNESS_CURVE = "0:0,0.2:7,1.5:33,5:100";
const PREVIOUS_DEFAULT_CURVE = "0:0,1:10,10:30,100:65,1000:100";
+/**
+ * The RayNeo iO's sensor reads real lux, far above the G2's behind-the-lens values, so the
+ * G2's curve would sit at maximum in any lit room. These knots put the default 20–100 range on
+ * the stock firmware's own scene levels: 29, 41, 41, 53, 65, 76, 94 and 100 percent at 3, 10,
+ * 200, 300, 600, 1000, 4000 and 5000 lux.
+ */
+export const RAYNEO_IO_BRIGHTNESS_CURVE = "0:0,3:11,10:26,200:26,300:41,600:56,1000:70,4000:93,5000:100";
+
+/**
+ * An Even G1's OPT3007 also reads lux (centilux on the wire). These knots are the stock firmware's table: levels 0, 10, 25,
+ * 41 and 42 of 42 at 0, 50, 200, 1000 and 2000 lux (g1_firmware/docs/VM.md §6.7).
+ */
+export const G1_BRIGHTNESS_CURVE = "0:0,50:24,200:60,1000:98,2000:100";
/** Percent of the configured range; defaults (20–100) give 20/26/46/100. */
export function brightnessCurveError(value: string): string | null {
diff --git a/app/g2/dashboard-controller.ts b/app/g2/dashboard-controller.ts
index 3666f299..9935b6f3 100644
--- a/app/g2/dashboard-controller.ts
+++ b/app/g2/dashboard-controller.ts
@@ -16,7 +16,6 @@ import { mediaControllerBridge } from "../native/media-controller";
import { nightscoutBridge } from "../native/nightscout-bridge";
import { weatherBridge } from "../native/weather";
import { ALL_NOTIFICATIONS, onAndroidNotificationPosted, onAndroidNotificationRemoved, readActiveNotifications } from "../native/notification-icons";
-import { shouldShowNotificationOnGlasses } from "../native/notification-sources";
import { watchNotificationListenerBinding } from "../native/notification-access";
import { openEvenAppSettings, readEvenAppNotificationState } from "../native/even-app-conflict";
import { defaultRingName, setGlassesRingLink } from "../native/ring-status";
@@ -56,7 +55,7 @@ import { claimGlassesOnboardingAutoLaunch, ONBOARDING_APP_ID } from "../apps/onb
import { beginRenderPass, endRenderPass } from "../util/render-freshness";
import { voiceControlBridge } from "../native/voice-control";
import { voiceActivity } from "../ui/shell/voice-activity";
-import { G2_LENS_HEIGHT, G2_LENS_WIDTH, GrayImage } from "../graphics/image";
+import { GrayImage } from "../graphics/image";
import { flattenPlanesWithDraws, planesFingerprint, type Plane } from "../graphics/plane";
import { prepareFrameDraws } from "../graphics/glyph-wire";
import { createLockScreenImage, LOCK_SCREEN_SURFACE_ID } from "./lock-screen";
@@ -75,10 +74,10 @@ import { ALL_APPS } from "../apps/all-apps";
import { type AppContext, type AppDefinition, type AppLaunchParams, type TextEditorHost } from "../apps/app-definition";
import { type InProcessAppOptions, type InProcessWindow } from "../ui/shell/in-process-window";
import { loadPersistedOpenApps, savePersistedOpenApps } from "../ui/shell/open-apps-persistence";
-import { appViewportRect, isOnSwitcherEdge, sidebarStripVisible, type ScreenRect, type WindowHeightMode } from "../ui/shell/geometry";
+import { appViewportRect, isOnSwitcherEdge, screenHeight, screenWidth, sidebarStripVisible, type ScreenRect, type WindowHeightMode } from "../ui/shell/geometry";
import { type ContinuousCaptureOptions, type LayerActions, type TextSettingsEditToggle, type TranscriptionChoice } from "../ui/layers";
import { type KeyboardInputSession } from "../ui/shell/keyboard-input";
-import { appSwitcherPositionSetting, statusBarPositionSetting, statusBarVisibilitySetting, windowBorderSetting, assistantAllowProactiveSetting, assistantBackendSetting, assistantBridgeHostSetting, assistantBridgePortSetting, assistantBridgeTokenSetting, getBrightnessPreferences, displayLayoutSetting, navigateDisplayLayoutSetting, terminalDisplayLayoutSetting, elevenLabsApiKeySetting, getStringSettingById, openAiApiKeySetting, nightscoutApiTokenSetting, firmwareDebugFlagsSetting, whisperServerApiKeySetting, whisperServerLanguageSetting, whisperServerModelSetting, whisperServerUrlSetting, lockScreenEnabledSetting, nightscoutSiteUrlSetting, onAnySettingChanged, previewColorSetting, ringConnectionModeSetting, type RingConnectionMode, saveVoiceRecordingsSetting, sonioxApiKeySetting, screenTimeoutSetting, screenTimeoutSettingToMs, suspendEvenHubWhenScreenOffSetting, voiceProviderSetting, wakeWordActionSetting, type ConfigSettingString } from "../ui/dashboard-settings";
+import { appSwitcherPositionSetting, glassesModelName, glassesTypeSetting, statusBarPositionSetting, statusBarVisibilitySetting, windowBorderSetting, assistantAllowProactiveSetting, assistantBackendSetting, assistantBridgeHostSetting, assistantBridgePortSetting, assistantBridgeTokenSetting, getBrightnessPreferences, displayLayoutSetting, navigateDisplayLayoutSetting, terminalDisplayLayoutSetting, elevenLabsApiKeySetting, getStringSettingById, openAiApiKeySetting, nightscoutApiTokenSetting, firmwareDebugFlagsSetting, whisperServerApiKeySetting, whisperServerLanguageSetting, whisperServerModelSetting, whisperServerUrlSetting, lockScreenEnabledSetting, nightscoutSiteUrlSetting, onAnySettingChanged, previewColorSetting, effectiveRingConnectionMode, type RingConnectionMode, saveVoiceRecordingsSetting, sonioxApiKeySetting, screenTimeoutSetting, screenTimeoutSettingToMs, shouldPopUpNewNotification, suspendEvenHubWhenScreenOffSetting, voiceProviderSetting, wakeWordActionSetting, type ConfigSettingString } from "../ui/dashboard-settings";
import { isIgnoringBatteryOptimizations, requestIgnoreBatteryOptimizations } from "../native/battery-optimization";
import {
getInstalledEvenHubAppById,
@@ -195,12 +194,12 @@ const LOW_BATTERY_PERCENT = 5;
const EVEN_APP_DETECTED_MESSAGE =
"The Even Realities app appears to be running. If Faceclaw has trouble connecting, open its app settings and force stop it.";
-// The launcher grid's app list; also fixes the app ids apps.launch accepts.
-const LAUNCHABLE_APPS = ALL_APPS.filter((app) => app.showInLauncher !== false);
+// The launcher grid's app list for the paired glasses; also fixes the app ids apps.launch accepts.
+const launchableApps = () => ALL_APPS.filter((app) => app.showInLauncher !== false && app.isSupported?.() !== false);
/**
- * The global settings window viewport sizes depend on: the display mode's
- * size (a band's position only moves windows), whether the app switcher
+ * The global settings window viewport sizes depend on: the paired glasses'
+ * screen, the display mode's size (a band's position only moves windows), whether the app switcher
* takes width beside windows, height below them or neither (a popup), and
* the chrome rows each window loses to it: below them, whether the status
* bar joins the row (dropping the top bar); with a popup, whether the
@@ -213,7 +212,7 @@ function viewportSizesKey(): string {
: position === "popup" ? `popup|${statusBarVisibilitySetting.get()}|${windowBorderSetting.get()}`
: "strip";
const layout = displayLayoutSetting.get();
- return `${layout.startsWith("band-") ? "band" : layout}|${switcher}`;
+ return `${screenWidth()}x${screenHeight()}|${layout.startsWith("band-") ? "band" : layout}|${switcher}`;
}
/** The global settings that move window surfaces without resizing them. */
@@ -222,7 +221,7 @@ function windowPlacementKey(): string {
}
function createInitialDisplayPreview(): ImageSource | null {
- return grayImageToPreviewSource(new GrayImage(G2_LENS_WIDTH, G2_LENS_HEIGHT, 0));
+ return grayImageToPreviewSource(new GrayImage(screenWidth(), screenHeight(), 0));
}
/** Echo the controller's appendLog() trace to the console. */
@@ -422,7 +421,7 @@ class DashboardController {
registerRoamTools((appId) => this.launchApp(appId));
// apps.* tools mirror the launcher grid and sidebar (launch, focus, close).
registerWindowTools({
- apps: LAUNCHABLE_APPS,
+ apps: launchableApps,
launchApp: (appId) => this.launchApp(appId),
requestShellRender: () => this.requestShellRender(),
});
@@ -449,7 +448,8 @@ class DashboardController {
this.emit();
},
openNotificationsWindow: () =>
- this.openInProcessAppInBackground(NOTIFICATIONS_WINDOW_ID, NOTIFICATIONS_SURFACE_ID, createNotificationsAppWindow),
+ this.openInProcessAppInBackground(NOTIFICATIONS_WINDOW_ID, NOTIFICATIONS_SURFACE_ID,
+ (options) => createNotificationsAppWindow(options, (section) => this.openSettings(section))),
onSwitcherBarHeightChanged: () => this.applySwitcherBarHeight(),
onScreenStateChanged: (on) => {
// Any wake of the regular UI replaces a showing Glanceboard.
@@ -477,6 +477,7 @@ class DashboardController {
this.pushFirmwareDebugFlags();
this.pushBrightness();
this.syncEvenHubScreenOffSetting();
+ this.syncVoiceWake();
// Display mode size first: a reflow repositions every surface too, so
// the band-position check after it then has nothing left to do.
this.applyDisplayModeIfChanged();
@@ -505,7 +506,7 @@ class DashboardController {
assistant: text => shell.sendToAssistant(text),
});
this.wearRemote = new WearRemote({
- apps: LAUNCHABLE_APPS,
+ apps: launchableApps,
injectInput: (kind) => this.injectSyntheticRingInput(kind, "watch"),
launchApp: (appId) => this.launchApp(appId),
connect: () => this.connect(),
@@ -618,14 +619,28 @@ class DashboardController {
* are. Windows that can't resize keep the surface they have, the switcher
* covering any of it that it now overlaps, rather than being relaunched
* for it.
+ *
+ * A window is judged by its own size as well as its surface's rect: other
+ * paths (connect, a launch) configure surfaces from the geometry without
+ * resizing windows, so a window laid out before the row's height was known
+ * (restored at startup, at the default height) can sit behind a surface
+ * that already matches, and its frames would not fit it.
*/
private applySwitcherBarHeight(): void {
void (async () => {
for (const window of Array.from(shell.getWindows())) {
- const rect = JSON.stringify(appViewportRect(window.heightMode, window.appId));
- if (!window.relayout || this.windowSurfaceRects.get(window.surfaceId) === rect) continue;
- window.relayout();
- await this.configureWindowSurface(window.surfaceId, this.isForegroundWindow(window.windowId), window.heightMode);
+ if (!window.relayout) continue;
+ const rect = appViewportRect(window.heightMode, window.appId);
+ const size = window.layoutSize?.();
+ const resized = !!size && (size.width !== rect.width || size.height !== rect.height);
+ if (!resized && this.windowSurfaceRects.get(window.surfaceId) === JSON.stringify(rect)) continue;
+ try {
+ window.relayout();
+ await this.configureWindowSurface(window.surfaceId, this.isForegroundWindow(window.windowId), window.heightMode);
+ } catch (error) {
+ // The rest still need to follow the row.
+ this.appendLog(`switcher height change failed for ${window.windowId}: ${this.formatError(error)}`);
+ }
}
shell.foregroundWindow()?.requestRender();
this.requestShellRender();
@@ -816,8 +831,8 @@ class DashboardController {
await communicator.configureSurface(LOCK_SCREEN_SURFACE_ID, {
x: 0,
y: 0,
- width: G2_LENS_WIDTH,
- height: G2_LENS_HEIGHT,
+ width: screenWidth(),
+ height: screenHeight(),
zOrder: 1000,
transparency: "opaque",
});
@@ -925,6 +940,24 @@ class DashboardController {
return applied;
}
+ /** What the communicator was last told about the glasses' own wake word (null: not yet). */
+ private voiceWakeSent: boolean | null = null;
+
+ /**
+ * The glasses' own wake word follows the wake action: on a RayNeo iO, its
+ * "Hey RayNeo" switch (G2 glasses use the wake lease, syncFaceclawWakeLease).
+ */
+ private syncVoiceWake(communicator = this.communicator): void {
+ if (!communicator) return;
+ const enabled = wakeWordActionSetting.get() !== "off";
+ if (this.voiceWakeSent === enabled) return;
+ this.voiceWakeSent = enabled;
+ void communicator.setVoiceWakeEnabled(enabled).catch((error) => {
+ this.voiceWakeSent = null;
+ this.appendLog(`wake word sync failed: ${this.formatError(error)}`);
+ });
+ }
+
private syncEvenHubScreenOffSetting(): void {
void this.syncFaceclawWakeLease().catch((error) => {
this.appendLog(`wake takeover lease sync failed: ${this.formatError(error)}`);
@@ -1042,9 +1075,11 @@ class DashboardController {
/**
* A Direct-mode session may have unpaired the R1 from the glasses (see
- * GlassesSessionRing.releaseRingFromGlassesLocked). The first session in
- * another mode asks the glasses to connect to it again; the ring's own
- * glasses targets were cleared, so it accepts them. Called on connect.
+ * GlassesSessionRing.releaseRingFromGlassesLocked), and a RayNeo iO
+ * session (always Direct) may have cleared the ring's glasses targets.
+ * The first G2 session in another mode asks the glasses to connect to it
+ * again; the ring's own glasses targets were cleared, so it accepts them.
+ * Called on connect.
*/
private handRingBackToGlassesIfNeeded(): void {
if (this.ringModeAtConnect === "direct" || !getBooleanSetting(RING_TAKEN_FROM_GLASSES_KEY, false)) return;
@@ -1232,6 +1267,7 @@ class DashboardController {
silentMode: this.silentMode,
screenOn: shell.isScreenOn(),
battery: this.lastHeadsetBattery,
+ glassesModel: glassesModelName(),
caseBattery: batteries.case,
caseCharging: batteries.caseCharging,
foregroundTitle: shell.getForegroundApp()?.title ?? null,
@@ -1404,12 +1440,12 @@ class DashboardController {
// is in place before any real render can reach the compositor.
this.previewTarget = target;
try {
- await target.configureCompositorScreen(G2_LENS_WIDTH, G2_LENS_HEIGHT);
+ await target.configureCompositorScreen(screenWidth(), screenHeight());
await target.configureSurface(SHELL_SURFACE_ID, {
x: 0,
y: 0,
- width: G2_LENS_WIDTH,
- height: G2_LENS_HEIGHT,
+ width: screenWidth(),
+ height: screenHeight(),
zOrder: SHELL_SURFACE_Z_ORDER,
transparency: "color-key",
});
@@ -1492,17 +1528,21 @@ class DashboardController {
this.refreshEvenAppStatus();
this.setPhase("connecting");
this.setStatus("Connecting to the glasses...");
- // "Only via glasses" (the default) means the phone never opens its own
- // link to the ring: the glasses relay its gestures to us anyway. An empty
- // address disables every direct-ring code path in the communicator.
- const ringMode = ringConnectionModeSetting.get();
+ // "Only via glasses" (the G2's default) means the phone never opens its
+ // own link to the ring: the glasses relay its gestures to us anyway. An
+ // empty address disables every direct-ring code path in the communicator.
+ // A RayNeo iO (one link, its address in both arm slots) can't relay a
+ // ring, so with one the phone always takes the ring directly.
+ const ringMode = effectiveRingConnectionMode();
this.ringModeAtConnect = ringMode;
+ const glassesType = glassesTypeSetting.get();
const ringAddress = ringMode !== "glasses" ? addresses.ring : "";
// Direct mode may unpair the ring from the glasses; remember to hand it
// back once a later session runs in another mode.
if (ringMode === "direct" && ringAddress) setBooleanSetting(RING_TAKEN_FROM_GLASSES_KEY, true);
- this.appendLog(
- `Using configured arms: R=${addresses.right} L=${addresses.left}${ringAddress ? ` ring=${ringAddress}` : ""}`,
+ this.appendLog((glassesType === "rayneo-io"
+ ? `Using configured RayNeo iO: ${addresses.right}`
+ : `Using configured arms: R=${addresses.right} L=${addresses.left}`) + (ringAddress ? ` ring=${ringAddress}` : ""),
);
let communicator: FaceclawCommunicatorBridge | null = null;
@@ -1524,6 +1564,7 @@ class DashboardController {
// sync needs the phone role, which the session borrows briefly for
// each pull (GlassesSessionRing.beginRingHealthWindowLocked).
ringRole: ringMode === "direct" ? "glasses" : "phone",
+ glassesType,
});
this.communicator = communicator;
// Size the compositor before anything else is awaited: windows opened
@@ -1531,8 +1572,11 @@ class DashboardController {
// configure their surfaces through this.communicator, and the Java call
// queue is FIFO, so enqueuing the screen size first guarantees it lands
// ahead of them. Mirrors ensurePreviewDisplay.
- await communicator.configureCompositorScreen(G2_LENS_WIDTH, G2_LENS_HEIGHT);
+ // The paired glasses' screen: the G2's 640x480 or the RayNeo iO's 540x220.
+ await communicator.configureCompositorScreen(screenWidth(), screenHeight());
await communicator.configureBrightness(getBrightnessPreferences());
+ this.voiceWakeSent = null;
+ this.syncVoiceWake(communicator);
this.offState = communicator.onStateChange((state) => {
if (state.phase !== "connected") resetRingInputFilter();
if (isHaltedSessionPhase(state.phase)) {
@@ -1724,8 +1768,8 @@ class DashboardController {
await communicator.configureSurface(SHELL_SURFACE_ID, {
x: 0,
y: 0,
- width: G2_LENS_WIDTH,
- height: G2_LENS_HEIGHT,
+ width: screenWidth(),
+ height: screenHeight(),
zOrder: SHELL_SURFACE_Z_ORDER,
transparency: "color-key",
});
@@ -2032,8 +2076,8 @@ class DashboardController {
return;
}
const at = mirrorToPanelFraction(this.displayPreviewCrop, nx, ny);
- const x = Math.round(Math.min(1, Math.max(0, at.nx)) * G2_LENS_WIDTH);
- const y = Math.round(Math.min(1, Math.max(0, at.ny)) * G2_LENS_HEIGHT);
+ const x = Math.round(Math.min(1, Math.max(0, at.nx)) * screenWidth());
+ const y = Math.round(Math.min(1, Math.max(0, at.ny)) * screenHeight());
const foreground = shell.foregroundWindow();
const stripShown = sidebarStripVisible(shell.getFocus(), foreground?.appId);
this.appendLog(`mirror tap at ${x},${y}`);
@@ -2601,11 +2645,7 @@ class DashboardController {
setSurfaceVisible: (surfaceId, visible) => this.setWindowSurfaceVisible(surfaceId, visible),
removeSurface: (surfaceId) => this.removeWindowSurface(surfaceId),
requestShellRender: () => this.requestShellRender(),
- openSettings: (section) => {
- void this.launchApp("settings", { section }).catch((error) => {
- this.appendLog(`settings launch failed: ${this.formatError(error)}`);
- });
- },
+ openSettings: (section) => this.openSettings(section),
startTextSettingEdit: (settingId) => {
const setting = getStringSettingById(settingId);
if (setting) {
@@ -2689,6 +2729,13 @@ class DashboardController {
this.requestShellRender();
}
+ /** Open or focus the Settings app, optionally on a section (by label). */
+ private openSettings(section?: string): void {
+ void this.launchApp("settings", { section }).catch((error) => {
+ this.appendLog(`settings launch failed: ${this.formatError(error)}`);
+ });
+ }
+
/**
* Launch an app by id: the launcher grid, assistant tools, window-menu
* Settings item, and open-apps restore all come through here. Apps with an
@@ -2905,7 +2952,7 @@ class DashboardController {
// The tray shows the notification at once; its popup waits out a short
// delay, so one withdrawn right away (see NotificationPopupDelay) never shows.
const notification = readActiveNotifications(ALL_NOTIFICATIONS).find((item) => item.key === notificationKey);
- if (notification && shouldShowNotificationOnGlasses(notification.packageName)) {
+ if (notification && shouldPopUpNewNotification(notification.packageName)) {
this.notificationPopups.post(notificationKey, notificationPopupDelayMs(notification));
}
this.requestShellRender();
@@ -2927,7 +2974,7 @@ class DashboardController {
private popUpAndroidNotification(notificationKey: string): void {
try {
const notification = readActiveNotifications(ALL_NOTIFICATIONS).find((item) => item.key === notificationKey);
- if (!notification || !shouldShowNotificationOnGlasses(notification.packageName)) return;
+ if (!notification || !shouldPopUpNewNotification(notification.packageName)) return;
// New notifications open a shell modal over the app viewport; if the
// screen was off, wake for it and go back to sleep when it is closed.
// Waking while already on would steal focus, so only wake from sleep.
diff --git a/app/g2/even-advertisement.ts b/app/g2/even-advertisement.ts
index 84a9c3c0..341cd286 100644
--- a/app/g2/even-advertisement.ts
+++ b/app/g2/even-advertisement.ts
@@ -30,7 +30,10 @@ export { bytesToHex, hexToBytes };
/** Even Realities' manufacturer-data company identifier (`"ER"` read little-endian). */
export const EVEN_COMPANY_IDENTIFIER = 0x5245;
-export type EvenDeviceRole = "left" | "right" | "ring";
+export type EvenDeviceRole = "left" | "right" | "ring" | "rayneo-io";
+
+/** The firmware an Even G1 arm advertises: Even's, or Faceclaw's g1v0 (in safe mode: only updates work). */
+export type G1Firmware = "stock" | "g1v0" | "g1v0-safe";
/** True when the manufacturer data opens with Even's `"ER"` marker. */
export function hasEvenManufacturerSignature(mfg: Uint8Array): boolean {
@@ -71,6 +74,61 @@ export function extractG2AdvertisementFlag(mfg: Uint8Array): number | null {
return mfg[22]!;
}
+/**
+ * ## Even G1 arm
+ *
+ * On Even's firmware the name is `Even G1___` and the manufacturer data `[01 right | 02 left]` +
+ * the ASCII serial, zero-padded (the first two bytes read as a "company id" that differs per arm). On g1v0 the name
+ * is `G1CFW__` with the same digits and address as stock's, and the scan response holds company 0xFFFF, a
+ * format byte (2), a flags byte (bit 3: safe mode), the firmware's version in three bytes, and the pair ID in ASCII:
+ * the frame serial, the same on both arms. Before 0.5.66: `G1v0_L` or `G1v0_R` (`G1v0S_…` in safe mode), format 1, no
+ * version.
+ */
+export function g1FromName(name: string | null | undefined): { side: "left" | "right"; firmware: G1Firmware } | null {
+ if (!name) return null;
+ const custom = /^G1CFW_([LR])_[0-9A-F]{6}$/i.exec(name.trim());
+ if (custom) return { side: custom[1]!.toUpperCase() === "L" ? "left" : "right", firmware: "g1v0" };
+ const g1v0 = /^G1V0(S?)_([LR])$/i.exec(name.trim());
+ if (g1v0) {
+ return {
+ side: g1v0[2]!.toUpperCase() === "L" ? "left" : "right",
+ firmware: g1v0[1] ? "g1v0-safe" : "g1v0",
+ };
+ }
+ if (!/^EVEN G1_/i.test(name.trim())) return null;
+ const side = g2SideFromName(name);
+ return side ? { side, firmware: "stock" } : null;
+}
+
+/** What g1v0's pair record says beyond the serial; null when there is no record of a format that says it. */
+export function parseG1Record(mfg: Uint8Array): { version: string; safeMode: boolean } | null {
+ if (mfg.length < 7 || mfg[0] !== 0xff || mfg[1] !== 0xff || mfg[2] !== 2) return null;
+ return { version: `${mfg[4]}.${mfg[5]}.${mfg[6]}`, safeMode: (mfg[3]! & 8) !== 0 };
+}
+
+/** The pair's serial from an arm's manufacturer data, on either firmware; null when absent. */
+export function extractG1Serial(mfg: Uint8Array, firmware: G1Firmware): string | null {
+ const record = mfg.length >= 4 && mfg[0] === 0xff && mfg[1] === 0xff;
+ const start = firmware === "stock" ? 1 : record && mfg[2] === 2 ? 7 : record && mfg[2] === 1 ? 4 : -1;
+ if (start < 0 || mfg.length <= start) return null;
+ let serial = "";
+ for (let i = start; i < mfg.length; i++) {
+ const byte = mfg[i]!;
+ if (byte === 0) break;
+ if (byte < 0x20 || byte > 0x7e) return null;
+ serial += String.fromCharCode(byte);
+ }
+ return serial.length ? serial : null;
+}
+
+/** RayNeo iO manufacturer data (company 0x5716, little-endian first): `[07][MAC x6]...`, outside pairing mode. */
+export const RAYNEO_COMPANY_IDENTIFIER = 0x5716;
+
+export function extractRayNeoMac(mfg: Uint8Array): string | null {
+ if (mfg.length < 9 || mfg[0] !== 0x16 || mfg[1] !== 0x57 || mfg[2] !== 0x07) return null;
+ return Array.from(mfg.subarray(3, 9), (byte) => byte.toString(16).padStart(2, "0").toUpperCase()).join(":");
+}
+
/**
* Which side a G2 temple advertisement belongs to, from the local name.
* Null when the name carries neither or both markers.
@@ -210,6 +268,10 @@ export type EvenAdvertisement = {
manufacturerData: string;
/** Why an otherwise Even-looking advertisement could not be fully parsed. */
note: string | null;
+ /** Set on an Even G1 arm (role left or right): its firmware. */
+ g1Firmware?: G1Firmware;
+ /** The version g1v0 advertises (0.5.66+); absent when it doesn't say. */
+ g1Version?: string;
};
/**
@@ -230,8 +292,58 @@ export function classifyAdvertisement(raw: RawAdvertisement): EvenAdvertisement
const hasSignature = hasEvenManufacturerSignature(mfg);
const looksLikeRing = /^EVEN R1([_ ]|$)/.test(upper);
const looksLikeG2 = upper.includes("G2");
+ const rayneoMac = extractRayNeoMac(mfg);
+ const looksLikeRayNeo = upper.startsWith("RAYNEO") || rayneoMac !== null;
- if (!looksLikeRing && !looksLikeG2 && !hasSignature) return null;
+ const g1 = g1FromName(name);
+ if (g1) {
+ const serial = extractG1Serial(mfg, g1.firmware);
+ const record = g1.firmware === "stock" ? null : parseG1Record(mfg);
+ return {
+ address: normalizeMacAddress(raw.address),
+ name,
+ role: g1.side,
+ serial,
+ embeddedMac: null,
+ embeddedMacMismatch: false,
+ flag: null,
+ ringSerialSuffix: null,
+ rssi: raw.rssi,
+ txPower: raw.txPower,
+ connectable: raw.connectable,
+ bonded: raw.bonded,
+ source: raw.source,
+ seenAtMs: raw.seenAtMs,
+ manufacturerData: raw.manufacturerData ?? "",
+ note: serial ? null : "no serial in the advertisement (it may still be arriving)",
+ g1Firmware: record?.safeMode ? "g1v0-safe" : g1.firmware,
+ ...(record ? { g1Version: record.version } : {}),
+ };
+ }
+
+ if (!looksLikeRing && !looksLikeG2 && !hasSignature && !looksLikeRayNeo) return null;
+
+ if (looksLikeRayNeo && !hasSignature) {
+ const address = normalizeMacAddress(raw.address);
+ return {
+ address,
+ name,
+ role: "rayneo-io",
+ serial: null,
+ embeddedMac: rayneoMac,
+ embeddedMacMismatch: !!rayneoMac && rayneoMac !== address,
+ flag: null,
+ ringSerialSuffix: null,
+ rssi: raw.rssi,
+ txPower: raw.txPower,
+ connectable: raw.connectable,
+ bonded: raw.bonded,
+ source: raw.source,
+ seenAtMs: raw.seenAtMs,
+ manufacturerData: raw.manufacturerData ?? "",
+ note: null,
+ };
+ }
const base = {
address: normalizeMacAddress(raw.address),
diff --git a/app/g2/firmware-compat.ts b/app/g2/firmware-compat.ts
index 71ee5c91..3d8508e2 100644
--- a/app/g2/firmware-compat.ts
+++ b/app/g2/firmware-compat.ts
@@ -117,6 +117,11 @@ export function firmwareIncompatibilityMessage(info: FirmwareInfo): string | nul
const versionsText = `L=${info.leftVersion || "unknown"} R=${info.rightVersion || "unknown"}`;
const required = `Faceclaw firmware revision ${REQUIRED_FACECLAW_FIRMWARE_VERSION}`;
+ // A G1's session names what the arms run instead of a revision (GlassesSessionG1.kt).
+ if (extension.kind === "none" && reportedVersions.some((version) => /^(g1v0|Even's firmware)/.test(version))) {
+ return `These G1 glasses run ${versionsText}. This version of Faceclaw needs the firmware it comes with: install it to continue.`;
+ }
+
switch (extension.kind) {
case "faceclaw":
if (extension.version >= REQUIRED_FACECLAW_FIRMWARE_VERSION) return null;
diff --git a/app/g2/glasses-display-state.ts b/app/g2/glasses-display-state.ts
index 20a7a736..ab1e673e 100644
--- a/app/g2/glasses-display-state.ts
+++ b/app/g2/glasses-display-state.ts
@@ -3,6 +3,8 @@ export type GlassesDisplayState = {
silentMode: boolean;
screenOn: boolean;
battery: number | null;
+ /** The paired glasses' model, e.g. "G2" (glassesModelName). */
+ glassesModel: string;
/**
* The charging case's last-known level, and whether it is on USB (null
* while the glasses are out of the case). Shown only while charging, when
@@ -20,7 +22,7 @@ export function glassesDisplayLabel(state: GlassesDisplayState): string {
// Charging wins over every session-local state: the glasses are in their
// case, so neither the lock screen nor the foreground window is visible.
if (state.phase === "charging") {
- return chargingDisplayLabel(state.battery);
+ return chargingDisplayLabel(state.battery, state.glassesModel);
}
// Preview mode has a live (simulated) screen despite the disconnected
// phase, so fall through to the screen-state/foreground labels.
@@ -63,8 +65,8 @@ export function glassesDisplayAsleep(state: GlassesDisplayState): boolean {
);
}
-export function chargingDisplayLabel(battery: number | null): string {
- return validBatteryLevel(battery) ? `Charging · G2 ${battery}%` : "Charging";
+export function chargingDisplayLabel(battery: number | null, glassesModel: string): string {
+ return validBatteryLevel(battery) ? `Charging: ${glassesModel} ${battery}%` : "Charging";
}
/** The shell's last-known battery levels (ShellChromeState["battery"]), as far as the phone shows them. */
@@ -81,13 +83,13 @@ export type BatteryLevels = {
* The phone Settings tab's battery row: each device whose level is known,
* e.g. "G2 100% · Case 98% ⚡ · R1 72%" (⚡ = charging), or "" when none
* is. Levels are the last known ones (the case only reports while the glasses
- * are docked), so ⚡ appears only while it is live: G2 and Case only with a
- * link to the glasses (`glassesLinked`: connected or charging), and Case only
- * while they are docked (caseCharging is null otherwise).
+ * are docked), so ⚡ appears only while it is live: the glasses and Case only
+ * with a link to the glasses (`glassesLinked`: connected or charging), and Case
+ * only while they are docked (caseCharging is null otherwise).
*/
-export function formatBatteryLine(levels: BatteryLevels, glassesLinked: boolean): string {
+export function formatBatteryLine(levels: BatteryLevels, glassesLinked: boolean, glassesModel: string): string {
const devices: Array<[string, number | null, boolean | null]> = [
- ["G2", levels.headset, glassesLinked && levels.headsetCharging],
+ [glassesModel, levels.headset, glassesLinked && levels.headsetCharging],
["Case", levels.case, glassesLinked && levels.caseCharging],
["R1", levels.ring, levels.ringCharging],
];
diff --git a/app/g2/ios-peripheral-identity.ts b/app/g2/ios-peripheral-identity.ts
index 4dd32f12..41a31151 100644
--- a/app/g2/ios-peripheral-identity.ts
+++ b/app/g2/ios-peripheral-identity.ts
@@ -1,12 +1,26 @@
-import { classifyAdvertisement, hasEvenManufacturerSignature, type EvenAdvertisement } from './even-advertisement'
+import { classifyAdvertisement, g1FromName, hasEvenManufacturerSignature, type EvenAdvertisement } from './even-advertisement'
import { hexToBytes } from '../util/hex-util'
export type IosAdvertisement = { identifier: string; name: string; manufacturerData: string; rssi: number; connectable: boolean }
export type IosDevice = EvenAdvertisement & { identifier: string }
+/**
+ * A G1 arm advertises no full MAC, and CoreBluetooth hides the real one. Faceclaw's addresses are MAC-shaped everywhere, so its
+ * address on this phone is made from the peripheral identifier. It's stable as long as the identifier is, which on firmware
+ * 0.5.66 and later is across installs too, and it only has to mean something on this phone: nobody types it in.
+ */
+export function g1IosAddress(identifier: string): string {
+ return identifier.replace(/-/g, '').slice(0, 12).toUpperCase().replace(/(..)(?=.)/g, '$1:')
+}
+
/** Only a full vendor-advertised MAC may bind a manually entered address. */
export function identifyIosPeripheral(raw: IosAdvertisement): IosDevice | null {
if (!/^[0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12}$/i.test(raw.identifier)) return null
+ if (g1FromName(raw.name)) {
+ const arm = classifyAdvertisement({ ...raw, address: g1IosAddress(raw.identifier), source: 'scan', bonded: false,
+ txPower: null, seenAtMs: Date.now() })
+ return arm && { ...arm, identifier: raw.identifier.toUpperCase() }
+ }
if (!hasEvenManufacturerSignature(hexToBytes(raw.manufacturerData))) return null
const candidate = classifyAdvertisement({ ...raw, address: '', source: 'scan', bonded: false,
txPower: null, seenAtMs: Date.now() })
diff --git a/app/g2/ios-preview-controller.ts b/app/g2/ios-preview-controller.ts
index 247d8f1d..0ffb15fb 100644
--- a/app/g2/ios-preview-controller.ts
+++ b/app/g2/ios-preview-controller.ts
@@ -2,7 +2,6 @@ import { startRemoteInput } from "../remote/service"
import type { KeyboardInputSession } from '../ui/shell/keyboard-input'
import { acceptInput, resetRingInputFilter } from "../ui/input-monitor";
import { bindIosNotifications, iosNotificationsChanged, onIosNotificationPopup, readActiveNotifications } from '../native/notification-icons.ios'
-import { shouldShowNotificationOnGlasses } from '../native/notification-sources'
import { launcherEntries } from '../apps/launcher'
import { discardZeroedEvenHubPackage, getInstalledEvenHubAppById, installedEvenHubPackageId, uninstallEvenHubPackage } from '../apps/evenhub/installed-apps'
import { isInstalledPackagePresent } from '../apps/evenhub/updates'
@@ -23,6 +22,7 @@ import { weatherBridge } from '../native/weather'
import { FaceclawCommunicatorBridge, resolveIosPeripherals, type CommunicatorState, type RawInputEvent } from '../native/faceclaw-communicator.ios'
import { PreviewDisplayTarget, type DisplayTarget } from '../native/preview-display.ios'
import { AncsClient, ANCS_FIRMWARE_VERSION } from './ancs-client'
+import { G1V0_IMAGE } from '../g1/firmware/g1v0-image'
import { GlanceHost, type GlanceDisplay } from './glance-host'
import { createLockScreenImage, LOCK_SCREEN_SURFACE_ID } from './lock-screen'
import { OsEventTypeList } from './events'
@@ -53,7 +53,7 @@ import { onAnySettingChanged,
previewColorSetting, lockScreenEnabledSetting, getBrightnessPreferences, getStringSettingById,
nightscoutSiteUrlSetting, nightscoutApiTokenSetting, voiceProviderSetting, elevenLabsApiKeySetting,
openAiApiKeySetting, sonioxApiKeySetting, whisperServerApiKeySetting, whisperServerLanguageSetting,
- whisperServerModelSetting, whisperServerUrlSetting, ringConnectionModeSetting, saveTranscribeAudioSetting } from '../ui/dashboard-settings'
+ whisperServerModelSetting, whisperServerUrlSetting, ringConnectionModeSetting, saveTranscribeAudioSetting, glassesTypeSetting, shouldPopUpNewNotification } from '../ui/dashboard-settings'
import { transcriptionKey, type VoiceProviderSelection } from '../native/cloud-stt-provider'
import type { PhoneGesture } from '../phone-ui/phone-gestures'
import { claimGlassesOnboardingAutoLaunch, ONBOARDING_APP_ID } from '../apps/onboarding/onboarding-progress'
@@ -215,7 +215,8 @@ export class IosPreviewController {
requestShellRender: () => this.requestShellRender(),
onWindowsChanged: () => { this.requestShellRender(); this.syncEvenHubPhoneUi(); this.wearRemote?.schedulePublish() },
openNotificationsWindow: () =>
- this.openInProcessAppInBackground(NOTIFICATIONS_WINDOW_ID, NOTIFICATIONS_SURFACE_ID, createNotificationsAppWindow),
+ this.openInProcessAppInBackground(NOTIFICATIONS_WINDOW_ID, NOTIFICATIONS_SURFACE_ID,
+ options => createNotificationsAppWindow(options, section => { void this.launchApp('settings', { section }) })),
onSwitcherBarHeightChanged: () => {
this.relayout()
shell.foregroundWindow()?.requestRender()
@@ -247,7 +248,7 @@ export class IosPreviewController {
shell.focusWindow(launcher.windowId)
onIosNotificationPopup(key => {
const notification = readActiveNotifications(128).find(n => n.key === key)
- if (this.glassesLocked || !notification || !shouldShowNotificationOnGlasses(notification.packageName)) return
+ if (this.glassesLocked || !notification || !shouldPopUpNewNotification(notification.packageName)) return
const woke = !shell.isScreenOn() && shell.wake('sidebar')
shell.openNotificationModal(key, woke)
this.requestShellRender()
@@ -272,7 +273,7 @@ export class IosPreviewController {
// The header's EvenHub phone-UI button hides while that UI is showing.
onPhoneShownChanged(() => this.syncEvenHubPhoneUi())
registerSystemTools()
- registerWindowTools({ apps: ALL_APPS.filter(app => !iosAppUnavailableReason(app.appId)),
+ registerWindowTools({ apps: () => ALL_APPS.filter(app => app.isSupported?.() !== false && !iosAppUnavailableReason(app.appId)),
launchApp: id => this.launchApp(id), requestShellRender: () => this.requestShellRender() })
registerNavigateTools(id => this.launchApp(id))
registerRoamTools(id => this.launchApp(id))
@@ -280,7 +281,7 @@ export class IosPreviewController {
iosVoiceInput.onSpeechEnd(() => this.syncContinuousCapture())
for (const app of ALL_APPS) if (app.appId !== 'launcher' && !iosAppUnavailableReason(app.appId)) app.boot?.(this.buildAppContext(app))
this.wearRemote = new WearRemote({
- apps: ALL_APPS.filter(app => app.showInLauncher !== false && !iosAppUnavailableReason(app.appId)),
+ apps: () => ALL_APPS.filter(app => app.showInLauncher !== false && app.isSupported?.() !== false && !iosAppUnavailableReason(app.appId)),
injectInput: kind => this.injectWatchInput(kind),
launchApp: id => this.launchApp(id),
// The watch's Connect/Disconnect are explicit user choices, like the phone's own buttons.
@@ -801,7 +802,7 @@ export class IosPreviewController {
const display = this.display
if (!display) return
await display.configureSurface(id, { ...appViewportRect(heightMode, appId), zOrder: 0, transparency: 'opaque' })
- await display.setSurfaceVisible(id, visible)
+ await display.setSurfaceVisible(id, typeof visible === 'function' ? visible() : visible)
},
setSurfaceVisible: (id, visible) => this.setWindowSurfaceVisible(id, visible),
removeSurface: id => this.removeWindowSurface(id),
@@ -880,7 +881,7 @@ export class IosPreviewController {
return
}
if (this.communicator) await this.closeCommunicator()
- const communicator = new FaceclawCommunicatorBridge(identifiers)
+ const communicator = new FaceclawCommunicatorBridge({ ...identifiers, glassesType: glassesTypeSetting.get() })
this.teardownPreviewDisplay()
this.communicator = communicator
this.wearDetectionRequested = false
@@ -984,6 +985,8 @@ export class IosPreviewController {
// (or re-pairs / installs the custom firmware, which lift the suppression).
if (isHaltedSessionPhase(state.phase)) suppressAutoReconnect()
const phase: SessionPhase = state.phase === 'charging' ? 'connected' : isHaltedSessionPhase(state.phase) ? 'error' : state.phase
+ // The relay ends with the link, so a reconnected session has to ask for it again (syncNotifications).
+ if (phase !== 'connected' && this.notifications && this.notifications.state !== 'disconnected') this.notifications.stop()
// Wear state is a per-transport snapshot: ask again on every new session.
if (phase !== 'connected') this.wearDetectionRequested = false
this.update(phase, state.status)
@@ -1027,6 +1030,11 @@ export class IosPreviewController {
if (this.state.capabilities) notifications.stop(`Update glasses to Faceclaw firmware ${ANCS_FIRMWARE_VERSION} or newer for iPhone notifications.`)
return
}
+ // A G1 reports no revision that says so: its session knows from what the right arm answered.
+ if (!communicator.ancsRelayAvailable()) {
+ notifications.stop(`Update the glasses to Faceclaw's firmware ${G1V0_IMAGE.version} for iPhone notifications, then reconnect.`)
+ return
+ }
if (notifications.state !== 'disconnected') return
notifications.start((Date.now() ^ Math.floor(Math.random() * 0xffffffff)) >>> 0, communicator.rightWriteLimit())
}
diff --git a/app/g2/lock-screen.ts b/app/g2/lock-screen.ts
index 485504bd..7f140eeb 100644
--- a/app/g2/lock-screen.ts
+++ b/app/g2/lock-screen.ts
@@ -1,23 +1,26 @@
-import { GrayImage, G2_LENS_WIDTH, G2_LENS_HEIGHT } from "../graphics/image";
+import { GrayImage } from "../graphics/image";
+import { screenHeight, screenWidth } from "../graphics/screen-size";
import { getDefaultMediumFont } from "../graphics/ui-fonts";
import { wrapText } from "../graphics/textwrap";
export const LOCK_SCREEN_SURFACE_ID = "lock-screen";
const LOCK_SCREEN_MESSAGE = "Glasses locked; unlock the phone to unlock the glasses.";
+/** The paired glasses' whole screen, black, with the message in a box at its centre. */
export function createLockScreenImage(): GrayImage {
- const image = new GrayImage(G2_LENS_WIDTH, G2_LENS_HEIGHT, 0);
+ const width = screenWidth(), height = screenHeight();
+ const image = new GrayImage(width, height, 0);
const font = getDefaultMediumFont();
const boxWidth = 480;
const boxHeight = 150;
- const boxX = Math.round((G2_LENS_WIDTH - boxWidth) / 2);
- const boxY = Math.round((G2_LENS_HEIGHT - boxHeight) / 2);
+ const boxX = Math.round((width - boxWidth) / 2);
+ const boxY = Math.round((height - boxHeight) / 2);
image.drawRoundedRect(boxX, boxY, boxWidth, boxHeight, 150, 12);
const lines = wrapText(font, LOCK_SCREEN_MESSAGE, boxWidth - 64);
const textHeight = lines.length * font.lineHeight;
const firstY = boxY + Math.round((boxHeight - textHeight) / 2);
lines.forEach((line, index) => {
- const x = Math.round((G2_LENS_WIDTH - font.measureText(line)) / 2);
+ const x = Math.round((width - font.measureText(line)) / 2);
image.drawText(font, x, firstY + index * font.lineHeight, line, 230);
});
return image;
diff --git a/app/g2/pairing-candidates.ts b/app/g2/pairing-candidates.ts
index b891581a..f6c8a059 100644
--- a/app/g2/pairing-candidates.ts
+++ b/app/g2/pairing-candidates.ts
@@ -16,12 +16,11 @@ import {
RING_CALIBRATION,
sortedByProximity,
zoneGlyph,
- zoneLabel,
type ProximityEstimate,
type ProximityZone,
} from "./ble-proximity";
-import { classifyAdvertisement, normalizeMacAddress, type EvenAdvertisement, type RawAdvertisement } from "./even-advertisement";
-import { glassesImagePath, R1_IMAGE_PATH } from "./glasses-artwork";
+import { classifyAdvertisement, normalizeMacAddress, type EvenAdvertisement, type G1Firmware, type RawAdvertisement } from "./even-advertisement";
+import { GENERIC_G2_IMAGE_PATH, glassesImagePath, R1_IMAGE_PATH } from "./glasses-artwork";
import {
colorwayDisplayName,
colorwaySwatchHex,
@@ -48,6 +47,8 @@ export type GlassesPairCandidate = {
rssi: number | null;
proximity: ProximityEstimate | null;
lastSeenMs: number;
+ /** An Even G1 pair: the arms' firmware, the "lower" of the two (stock, then safe mode). Absent on a G2. */
+ g1Firmware?: G1Firmware;
/**
* Set when this lone arm and a lone arm of the other side carry different
* serials — the mixed-pair situation the serial check exists to name.
@@ -56,6 +57,15 @@ export type GlassesPairCandidate = {
mismatchWarning: string | null;
};
+/** A RayNeo iO: one device, one address (no arms to join). */
+export type RayNeoCandidate = {
+ id: string;
+ advertisement: EvenAdvertisement;
+ rssi: number | null;
+ proximity: ProximityEstimate | null;
+ lastSeenMs: number;
+};
+
export type RingCandidate = {
id: string;
advertisement: EvenAdvertisement;
@@ -176,9 +186,10 @@ export class DiscoveryAggregator {
pairs(): GlassesPairCandidate[] {
const groups = new Map();
for (const record of this.byAddress.values()) {
- if (record.role === "ring") continue;
+ if (record.role === "ring" || record.role === "rayneo-io") continue;
const canonical = serialKey(record.serial);
- const key = canonical ? `serial:${canonical}` : `arm:${record.address}`;
+ const family = record.g1Firmware ? "g1:" : "";
+ const key = canonical ? `${family}serial:${canonical}` : `arm:${record.address}`;
const group = groups.get(key) ?? { left: null, right: null };
const slot = record.role === "left" ? "left" : "right";
const incumbent = group[slot];
@@ -199,7 +210,9 @@ export class DiscoveryAggregator {
pairs.push({
id: serialKey(serial) ?? `arm:${any.address}`,
serial,
- identity: GlassesHardwareIdentity.decode(serial),
+ // Even's G2 serial scheme; a G1's says nothing to it.
+ identity: any.g1Firmware ? null : GlassesHardwareIdentity.decode(serial),
+ ...(any.g1Firmware ? { g1Firmware: g1PairFirmware(left, right) } : {}),
left: left ? stripSmoothing(left) : null,
right: right ? stripSmoothing(right) : null,
completeness: left && right ? "complete" : left ? "left-only" : "right-only",
@@ -225,6 +238,22 @@ export class DiscoveryAggregator {
}
/** Every R1 ring seen, closest first. */
+ rayneos(): RayNeoCandidate[] {
+ const found: RayNeoCandidate[] = [];
+ for (const record of this.byAddress.values()) {
+ if (record.role !== "rayneo-io") continue;
+ const rssi = record.smoothedRssi != null ? Math.round(record.smoothedRssi) : null;
+ found.push({
+ id: `rayneo:${record.address}`,
+ advertisement: stripSmoothing(record),
+ rssi,
+ proximity: estimateProximity(rssi, GLASSES_CALIBRATION),
+ lastSeenMs: record.seenAtMs,
+ });
+ }
+ return sortedByProximity(found, (candidate) => candidate.proximity, (candidate) => candidate.id);
+ }
+
rings(): RingCandidate[] {
const rings: RingCandidate[] = [];
for (const record of this.byAddress.values()) {
@@ -281,7 +310,7 @@ export function isPreviouslyPaired(name: string | null | undefined, pairedSerial
export type PairingRowPresentation = {
id: string;
- kind: "glasses" | "ring";
+ kind: "glasses" | "ring" | "rayneo-io";
/** "Even G2 B" / "Even R1" / fallback product name. */
modelTitle: string;
/** The serial (glasses) or local name (ring). */
@@ -299,7 +328,6 @@ export type PairingRowPresentation = {
isPreviouslyPaired: boolean;
/** "Yours" / "Closest" / "". */
badge: string;
- proximitySummary: string;
proximityGlyph: string;
zone: ProximityZone | null;
/** "Left + right arms found", "Only the left arm has been seen", …; "" when there is nothing worth a line (an unbonded ring). */
@@ -325,12 +353,11 @@ function presentationBase(
isNearest: boolean,
isPaired: boolean,
warnings: readonly string[],
-): Pick {
+): Pick {
return {
isNearest,
isPreviouslyPaired: isPaired,
badge: isPaired ? "Yours" : isNearest ? "Closest" : "",
- proximitySummary: proximity ? zoneLabel(proximity.zone) : "Signal unknown",
proximityGlyph: proximity ? zoneGlyph(proximity.zone) : "○○○○",
zone: proximity?.zone ?? null,
warning: warnings.join(" "),
@@ -342,7 +369,52 @@ function embeddedMacMismatchWarning(subject: string, ad: EvenAdvertisement | nul
return `${subject} advertised address ${ad.embeddedMac} differs from its radio address ${ad.address}.`;
}
+/** The pair can only do what its less capable arm can. */
+function g1PairFirmware(left: EvenAdvertisement | null, right: EvenAdvertisement | null): G1Firmware {
+ const firmwares = [left?.g1Firmware, right?.g1Firmware];
+ if (firmwares.includes("stock")) return "stock";
+ return firmwares.includes("g1v0-safe") ? "g1v0-safe" : "g1v0";
+}
+
+export function g1Row(pair: GlassesPairCandidate, context: RowContext = {}): PairingRowPresentation {
+ const isPreviouslyPairedRow = isPreviouslyPaired(pair.serial, context.pairedSerial);
+ const isNearest = !!context.nearestId && context.nearestId === pair.id;
+ const warnings: string[] = [];
+ if (pair.mismatchWarning) warnings.push(pair.mismatchWarning);
+ let armsSummary: string;
+ let canSelect = false;
+ if (pair.completeness !== "complete") {
+ armsSummary = pair.completeness === "left-only"
+ ? "Only the left arm has been seen — waiting for the right"
+ : "Only the right arm has been seen — waiting for the left";
+ } else if (pair.g1Firmware === "stock") {
+ armsSummary = "Runs Even's firmware. Faceclaw will install its own, with the glasses in the case";
+ canSelect = true;
+ } else if (pair.g1Firmware === "g1v0-safe") {
+ armsSummary = "In safe mode: the firmware restarted repeatedly. Faceclaw can install it again, with the glasses in the case";
+ canSelect = true;
+ } else {
+ armsSummary = "Left + right arms found. To pair, keep them in the case with the lid open";
+ canSelect = true;
+ }
+ return {
+ id: pair.id,
+ kind: "glasses",
+ modelTitle: "Even Realities G1",
+ deviceName: pair.serial ?? (pair.left ?? pair.right)!.name,
+ variantSummary: null,
+ colorway: null,
+ swatchHex: null,
+ imagePath: GENERIC_G2_IMAGE_PATH,
+ hasVariantImage: false,
+ ...presentationBase(pair.proximity, isNearest, isPreviouslyPairedRow, warnings),
+ armsSummary,
+ canSelect,
+ };
+}
+
export function glassesRow(pair: GlassesPairCandidate, context: RowContext = {}): PairingRowPresentation {
+ if (pair.g1Firmware) return g1Row(pair, context);
const identity = pair.identity;
const imagePath = glassesImagePath(identity);
const isPreviouslyPairedRow = isPreviouslyPaired(pair.serial, context.pairedSerial);
@@ -416,6 +488,28 @@ export function ringRow(ring: RingCandidate, context: RowContext = {}): PairingR
};
}
+export function rayneoRow(candidate: RayNeoCandidate, context: { pairedAddress?: string; nearestId?: string | null } = {}): PairingRowPresentation {
+ const ad = candidate.advertisement;
+ const isPaired = !!context.pairedAddress && normalizeMacAddress(context.pairedAddress) === ad.address;
+ const isNearest = !!context.nearestId && context.nearestId === candidate.id;
+ const warnings: string[] = [];
+ if (ad.embeddedMacMismatch) warnings.push(`It advertises ${ad.embeddedMac} but was heard as ${ad.address}.`);
+ return {
+ id: candidate.id,
+ kind: "rayneo-io",
+ modelTitle: "RayNeo iO",
+ deviceName: ad.name || ad.address,
+ variantSummary: null,
+ colorway: null,
+ swatchHex: null,
+ imagePath: GENERIC_G2_IMAGE_PATH,
+ hasVariantImage: false,
+ ...presentationBase(candidate.proximity, isNearest, isPaired, warnings),
+ armsSummary: "Needs the Faceclaw custom firmware. First time: put it in pairing mode (on the charger, hold the button ~5 s until the light blinks blue).",
+ canSelect: true,
+ };
+}
+
/** Convenience: a colourway's display text, for rows that show the swatch alone. */
export function colorwayLabel(colorway: GlassesColorway | null): string {
return colorway ? colorwayDisplayName(colorway) : "";
diff --git a/app/g2/phone-preview-crop.ts b/app/g2/phone-preview-crop.ts
index 2eafaa51..b0138414 100644
--- a/app/g2/phone-preview-crop.ts
+++ b/app/g2/phone-preview-crop.ts
@@ -1,6 +1,5 @@
-import { G2_LENS_HEIGHT, G2_LENS_WIDTH } from "../graphics/image";
import { previewScalingSetting } from "../ui/dashboard-settings";
-import { phonePreviewRect, usedScreenRect, type ScreenRect } from "../ui/shell/geometry";
+import { phonePreviewRect, screenHeight, screenWidth, usedScreenRect, type ScreenRect } from "../ui/shell/geometry";
import { shell } from "../ui/shell/shell";
/**
@@ -14,7 +13,7 @@ export function phonePreviewCrop(locked: boolean, glanceRect: ScreenRect | null)
if (locked || previewScalingSetting.get() === "raw") return null;
const window = shell.foregroundWindow();
const crop = phonePreviewRect(glanceRect ?? usedScreenRect(window?.heightMode ?? "min", window?.appId));
- const wholePanel = crop.x === 0 && crop.y === 0 && crop.width === G2_LENS_WIDTH && crop.height === G2_LENS_HEIGHT;
+ const wholePanel = crop.x === 0 && crop.y === 0 && crop.width === screenWidth() && crop.height === screenHeight();
return wholePanel ? null : crop;
}
@@ -27,7 +26,7 @@ export function phonePreviewCrop(locked: boolean, glanceRect: ScreenRect | null)
export function mirrorToPanelFraction(crop: ScreenRect | null, nx: number, ny: number): { nx: number; ny: number } {
if (!crop) return { nx, ny };
return {
- nx: (crop.x + nx * crop.width) / G2_LENS_WIDTH,
- ny: (crop.y + ny * crop.height) / G2_LENS_HEIGHT,
+ nx: (crop.x + nx * crop.width) / screenWidth(),
+ ny: (crop.y + ny * crop.height) / screenHeight(),
};
}
diff --git a/app/g2/wear-remote.ts b/app/g2/wear-remote.ts
index c2e2b597..07571947 100644
--- a/app/g2/wear-remote.ts
+++ b/app/g2/wear-remote.ts
@@ -32,6 +32,7 @@ import { type AppDefinition } from "../apps/app-definition";
import { getInstalledEvenHubApps, installedEvenHubAppId } from "../apps/evenhub/installed-apps";
import { WEAR_PATHS, wearBridge, type WearMessage } from "../native/wear-bridge";
import {
+ glassesModelName,
onAnySettingChanged,
watchCanUnlockSetting,
watchCrownClockwiseNextSetting,
@@ -115,8 +116,8 @@ const WATCH_BATTERY_MAX_AGE_MS = 4 * 60 * 60_000;
/** What the dashboard controller lends the watch remote. */
export type WearRemoteHost = {
- /** The launcher-grid apps; installed EvenHub packages are added dynamically. */
- apps: readonly AppDefinition[];
+ /** The launcher-grid apps for the paired glasses; installed EvenHub packages are added dynamically. */
+ apps: () => readonly AppDefinition[];
injectInput: (kind: WearRemoteInputKind) => Promise;
launchApp: (appId: string) => Promise;
connect: () => Promise;
@@ -294,6 +295,7 @@ export class WearRemote {
worn: state.glassesWorn,
listening: voiceActivity.isActive(),
battery: state.lastHeadsetBattery,
+ glassesModel: glassesModelName(),
charging: state.phase === "charging" || battery.headsetCharging === true,
caseBattery: battery.case,
caseCharging: battery.caseCharging,
@@ -320,7 +322,7 @@ export class WearRemote {
/** Launchable apps, matching the launcher grid and the apps.launch tool. */
private listApps(): Array<{ appId: string; title: string }> {
- const apps = this.host.apps.map((app) => ({ appId: app.appId, title: app.title }));
+ const apps = this.host.apps().map((app) => ({ appId: app.appId, title: app.title }));
for (const installed of getInstalledEvenHubApps()) {
apps.push({ appId: installedEvenHubAppId(installed.packageId), title: installed.name });
}
diff --git a/app/graphics/evenhub-font.ts b/app/graphics/evenhub-font.ts
index d80ca2bd..bd612844 100644
--- a/app/graphics/evenhub-font.ts
+++ b/app/graphics/evenhub-font.ts
@@ -12,7 +12,8 @@
* - Text SIZING / KERNING / WRAPPING: @evenrealities/pretext, whose advance
* tables the bitmaps were validated against. Using pretext for measurement
* means our line breaks match exactly where EvenHub apps (which measure
- * with the same library) expect them.
+ * with the same library) expect them. The one exception is leading spaces
+ * after a '\n', which stock keeps and pretext drops (see lvgl-wrap.ts).
*
* Bitmaps are 4bpp, high-nibble-first, row stride floor(boxW/2)+1. The UI
* fonts are effectively 1-bit (nibbles 0 or 0xF); we keep the nibble value so
@@ -23,6 +24,7 @@ import { File, knownFolders } from "@nativescript/core";
import { getTextWidth } from "@evenrealities/pretext";
import { EVENHUB_RUNTIME_FONT_FILENAME, isEvenHubFontAsset } from "../g2/firmware-fonts";
import { lvglMetrics, lvglGlyph } from "../native/lvgl-font";
+import { wrapLvglText } from "./lvgl-wrap";
import { GrayImage, grayToNibble, type FwTextFont, type PlacedFwText, type PlacedFwTextGlyph } from "./image";
import { TtfFont } from "./ttf-font";
import { decodeBase64 } from "../util/base64";
@@ -200,63 +202,11 @@ export class EvenHubFont implements FwTextFont {
}
/**
- * Wrap text to a pixel width, returning the actual line strings. Ports
- * pretext's measureTextWrap (LVGL lv_text_get_next_line semantics) so the
- * breaks land exactly where the measurement library reports them.
+ * Wrap text to a pixel width, returning the actual line strings: pretext's
+ * breaks, but keeping leading spaces after a '\n' (see lvgl-wrap.ts).
*/
wrap(text: string, maxWidth: number): string[] {
- if (!text) return [""];
- const cps = Array.from(text).map((c) => c.codePointAt(0)!);
- const lines: string[] = [];
- let line: number[] = [];
- let lineWidth = 0;
- let lastBreak = -1; // index within `line` after which we may wrap
-
- for (let i = 0; i < cps.length; i++) {
- const cp = cps[i]!;
- if (cp === 10) {
- lines.push(String.fromCodePoint(...line));
- line = [];
- lineWidth = 0;
- lastBreak = -1;
- continue;
- }
- // LVGL drops leading spaces at the start of a wrapped line.
- if (line.length === 0 && cp === 32) continue;
- const adv = this.advanceOf(cp, cps[i + 1] ?? 0);
- if (lineWidth + adv > maxWidth) {
- if (cp === 32) {
- // The overflowing char is a space: break here, discard it.
- lines.push(String.fromCodePoint(...line));
- line = [];
- lineWidth = 0;
- lastBreak = -1;
- } else if (lastBreak !== -1) {
- // Wrap at the last break opportunity; carry the remainder forward.
- const carry = line.slice(lastBreak + 1);
- line = line.slice(0, lastBreak + 1);
- const trimmed = line[line.length - 1] === 32 ? line.slice(0, -1) : line;
- lines.push(String.fromCodePoint(...trimmed));
- line = carry;
- lineWidth = carry.reduce((sum, c, j) => sum + this.advanceOf(c, carry[j + 1] ?? 0), 0);
- lastBreak = -1;
- line.push(cp);
- lineWidth += adv;
- } else {
- // No break opportunity: hard break before the overflowing char.
- lines.push(String.fromCodePoint(...line));
- line = [cp];
- lineWidth = adv;
- lastBreak = -1;
- }
- } else {
- line.push(cp);
- lineWidth += adv;
- if (isBreakable(cp)) lastBreak = line.length - 1;
- }
- }
- lines.push(String.fromCodePoint(...line));
- return lines;
+ return wrapLvglText(text, maxWidth, kernedAdvance);
}
/**
@@ -446,8 +396,3 @@ export class EvenHubFont implements FwTextFont {
}
}
-function isBreakable(cp: number): boolean {
- if (cp === 32 || cp === 45) return true; // space, hyphen
- // CJK ranges (pretext parity) — breakable between any two ideographs.
- return (cp >= 0x2e80 && cp <= 0x9fff) || (cp >= 0xf900 && cp <= 0xfaff) || (cp >= 0xac00 && cp <= 0xd7af);
-}
diff --git a/app/graphics/image.ts b/app/graphics/image.ts
index f36a0dd7..ea4c69a2 100644
--- a/app/graphics/image.ts
+++ b/app/graphics/image.ts
@@ -4,8 +4,14 @@ import type { MenuHighlightAnimation } from "../ui/menu-highlight-motion";
import { Glyph } from "./bdffont";
import { wrapText } from "./textwrap";
+// This file is also built by tests/tsconfig.json, which has no DOM or Node types.
+declare const console: { warn(message: string): void };
+
export const G2_LENS_WIDTH = 640;
export const G2_LENS_HEIGHT = 480;
+/** RayNeo iO screen (per eye) with the Faceclaw firmware: 540x220. */
+export const RAYNEO_IO_WIDTH = 540;
+export const RAYNEO_IO_HEIGHT = 220;
const DEFAULT_CORNER_RADIUS = 8;
/**
@@ -156,9 +162,15 @@ export class GrayImage {
private memoizedSourceHash: number | null = null;
constructor(width: number, height: number, fill = 0) {
- this.width = width;
- this.height = height;
- this.pixels = new Uint8Array(width * height);
+ // A fractional width would put most rows' `y * width + x` between pixels,
+ // silently losing them. TTF text measures fractionally, so this is easy to
+ // hit; the stack is there because the size alone doesn't identify the caller.
+ if (!Number.isInteger(width) || !Number.isInteger(height)) {
+ console.warn(`GrayImage: rounding up non-integer size ${width}x${height}\n${new Error().stack}`);
+ }
+ this.width = Math.ceil(width);
+ this.height = Math.ceil(height);
+ this.pixels = new Uint8Array(this.width * this.height);
if (fill !== 0) {
this.clear(fill);
}
@@ -584,6 +596,25 @@ export class GrayImage {
}
}
+ /**
+ * bakeDeferredDrawsInPlace, but only for the draws whose ink may fall inside
+ * `rect`; the rest stay deferred. For covering part of the image with later
+ * raster (the EvenHub compositor painting an image container over text)
+ * without giving up the deferred wire path for everything else.
+ */
+ bakeDeferredDrawsWithin(rect: { x: number; y: number; width: number; height: number }): void {
+ if (!this.drawList.length) return;
+ const covered = (b: { x: number; y: number; width: number; height: number } | null) =>
+ !b || (b.x < rect.x + rect.width && rect.x < b.x + b.width && b.y < rect.y + rect.height && rect.y < b.y + b.height);
+ const bake: DeferredDraw[] = [];
+ const keep: DeferredDraw[] = [];
+ for (const placed of this.drawList) (covered(placedDrawBounds(placed)) ? bake : keep).push(placed);
+ if (!bake.length) return;
+ this.drawList.splice(0, this.drawList.length, ...bake);
+ this.bakeDeferredDrawsInPlace();
+ this.drawList.push(...keep);
+ }
+
/**
* A copy of this image with its brightness scaled by `factor` (0..1):
* raster and glyph / firmware-text draws alike, keeping the draws deferred
@@ -693,6 +724,35 @@ export function grayToNibble(value: number): number {
/** Where rasterizeGlyph writes: an image, or a clipped buffer (paintReplayDraws). */
type PixelSink = { setPixel(x: number, y: number, value: number): void };
+/** A deferred draw's ink rectangle, or null when it can't be bounded (treat as anywhere). */
+function placedDrawBounds(placed: DeferredDraw): { x: number; y: number; width: number; height: number } | null {
+ if (placed.kind === "glyph") {
+ const { glyph } = placed;
+ return {
+ x: placed.x + glyph.bbxX,
+ y: placed.y + placed.font.ascent - (glyph.bbxHeight + glyph.bbxY),
+ width: glyph.bbxWidth,
+ height: glyph.bbxHeight,
+ };
+ }
+ if (placed.kind === "image") {
+ return placed.presentation ? null : { x: placed.x, y: placed.y, width: placed.source.width, height: placed.source.height };
+ }
+ let left = Infinity, top = Infinity, right = -Infinity, bottom = -Infinity;
+ for (const member of placed.glyphs) {
+ if (!member.ink) continue;
+ const wire = placed.font.fwGlyphWireData(member.cp);
+ if (!wire) return null;
+ const x = placed.x + member.dx + wire.ofsX;
+ const y = placed.y + wire.inkTop;
+ left = Math.min(left, x);
+ top = Math.min(top, y);
+ right = Math.max(right, x + wire.boxW);
+ bottom = Math.max(bottom, y + wire.boxH);
+ }
+ return right < left ? { x: placed.x, y: placed.y, width: 0, height: 0 } : { x: left, y: top, width: right - left, height: bottom - top };
+}
+
/** Bake one glyph into an image's pixel buffer (y is the top of the line). */
function rasterizeGlyph(
target: PixelSink,
diff --git a/app/graphics/lvgl-wrap.ts b/app/graphics/lvgl-wrap.ts
new file mode 100644
index 00000000..b4626dde
--- /dev/null
+++ b/app/graphics/lvgl-wrap.ts
@@ -0,0 +1,76 @@
+/**
+ * Word wrap for EvenHub text containers, matching the stock firmware's LVGL
+ * labels as measured by running firmware 2.2.9.22 in the g2-firmware-emulator:
+ *
+ * - Spaces are kept wherever they fall: at the start of the text, after a
+ * '\n', and on soft-wrapped lines. A space that doesn't fit at the end of a
+ * line starts the next one, so "HHHHHHHH EEEE" in 100px (8 H = 96px,
+ * 5px spaces) wraps with all four spaces indenting the second line.
+ * - A line otherwise breaks after its last space, hyphen or CJK ideograph,
+ * or, with none, before the character that overflows.
+ *
+ * @evenrealities/pretext's measureTextWrap, which apps measure with, differs
+ * in one way: it drops spaces at the start of every line. Apps rely on stock's
+ * behavior, though: Iris Pro indents a line 11 spaces past a 40px glyph placed
+ * beside it, and stripping the indent slid the text under the icon.
+ */
+
+/** Wrap opportunities: space, hyphen, and between CJK ideographs. */
+export function isLvglBreakable(cp: number): boolean {
+ if (cp === 32 || cp === 45) return true;
+ return (cp >= 0x2e80 && cp <= 0x9fff) || (cp >= 0xf900 && cp <= 0xfaff) || (cp >= 0xac00 && cp <= 0xd7af);
+}
+
+/**
+ * Split text into display lines no wider than maxWidth.
+ * `advanceOf(cp, next)` is the kerned pixel advance of cp before next (0 at the end).
+ */
+export function wrapLvglText(text: string, maxWidth: number, advanceOf: (cp: number, next: number) => number): string[] {
+ if (!text) return [""];
+ const cps = Array.from(text).map((c) => c.codePointAt(0)!);
+ const lines: string[] = [];
+ let line: number[] = [];
+ let lineWidth = 0;
+ // The last break opportunity on this line, as an index into cps, and how
+ // many of `line`'s codepoints end at it.
+ let lastBreak = -1;
+ let lastBreakKeep = 0;
+
+ const endLine = (keep: number[]) => {
+ lines.push(String.fromCodePoint(...keep));
+ line = [];
+ lineWidth = 0;
+ lastBreak = -1;
+ };
+
+ let i = 0;
+ while (i < cps.length) {
+ const cp = cps[i]!;
+ if (cp === 10) {
+ endLine(line);
+ i++;
+ continue;
+ }
+ const adv = advanceOf(cp, cps[i + 1] ?? 0);
+ if (lineWidth + adv <= maxWidth || line.length === 0) {
+ // A character wider than the whole line still takes one to itself.
+ line.push(cp);
+ lineWidth += adv;
+ if (isLvglBreakable(cp)) {
+ lastBreak = i;
+ lastBreakKeep = line.length;
+ }
+ i++;
+ } else if (cp !== 32 && lastBreak !== -1) {
+ // Wrap after the last break opportunity and rescan from there.
+ const restart = lastBreak + 1;
+ endLine(line.slice(0, lastBreakKeep));
+ i = restart;
+ } else {
+ // An overflowing space, or no break opportunity: this character starts the next line.
+ endLine(line);
+ }
+ }
+ lines.push(String.fromCodePoint(...line));
+ return lines;
+}
diff --git a/app/graphics/screen-size.ts b/app/graphics/screen-size.ts
new file mode 100644
index 00000000..c5d7621f
--- /dev/null
+++ b/app/graphics/screen-size.ts
@@ -0,0 +1,27 @@
+/**
+ * The paired glasses' screen (per eye), which the shell and UI lay out in:
+ * the G2's 640x480, or the RayNeo iO's 540x220 with the Faceclaw firmware.
+ *
+ * Read straight from the settings store (the key dashboard-settings.ts's
+ * glassesTypeSetting writes), so this stays a leaf that UI primitives can
+ * import without pulling in the settings module, and every isolate (the
+ * main one, app workers, the phone preview) agrees with the session.
+ */
+import { getStringSetting } from "../native/settings-store";
+import { G2_LENS_HEIGHT, G2_LENS_WIDTH, RAYNEO_IO_HEIGHT, RAYNEO_IO_WIDTH } from "./image";
+
+/** Settings key of the paired glasses' type: "g2" (default) or "rayneo-io". */
+export const GLASSES_TYPE_KEY = "deviceType";
+
+/** Whether the paired glasses are a RayNeo iO. */
+export function isRayNeoIoConfigured(): boolean {
+ return getStringSetting(GLASSES_TYPE_KEY, "g2") === "rayneo-io";
+}
+
+export function screenWidth(): number {
+ return isRayNeoIoConfigured() ? RAYNEO_IO_WIDTH : G2_LENS_WIDTH;
+}
+
+export function screenHeight(): number {
+ return isRayNeoIoConfigured() ? RAYNEO_IO_HEIGHT : G2_LENS_HEIGHT;
+}
diff --git a/app/graphics/ui-fonts.ts b/app/graphics/ui-fonts.ts
index bcf5e786..62f4b3e3 100644
--- a/app/graphics/ui-fonts.ts
+++ b/app/graphics/ui-fonts.ts
@@ -13,6 +13,7 @@ import type { UiFont } from "./image";
import { TtfFont } from "./ttf-font";
import { ensurePreinstalledFonts, getInstalledFont, installedFontPath } from "./installed-fonts";
import { getStringSetting, onSettingsStoreChanged, setStringSetting } from "../native/settings-store";
+import { GLASSES_TYPE_KEY, isRayNeoIoConfigured } from "./screen-size";
export type BitmapFace = "terminus" | "terminusv";
@@ -72,8 +73,18 @@ export function parseFontSelection(raw: string): UiFontSelection | null {
return null;
}
-/** Default UI font when the user has never picked one. */
-const DEFAULT_UI_FONT: UiFontSelection = { kind: "ttf", file: "Roboto-Light.ttf", size: 16 };
+/**
+ * The default UI font's size, which onboarding recommends: 16, or 14 on the
+ * RayNeo iO, whose 540x220 screen fits fewer rows.
+ */
+export function defaultUiFontSize(): number {
+ return isRayNeoIoConfigured() ? 14 : 16;
+}
+
+/** Default UI font when the user has never picked one: Roboto Light at the default size. */
+function defaultUiFont(): UiFontSelection {
+ return { kind: "ttf", file: "Roboto-Light.ttf", size: defaultUiFontSize() };
+}
export function getUiFontSelection(): UiFontSelection {
const parsed = parseFontSelection(getStringSetting(UI_FONT_SELECTION_KEY, ""));
@@ -84,7 +95,7 @@ export function getUiFontSelection(): UiFontSelection {
if (legacy === "terminus" || legacy === "terminusv") {
return { kind: "bitmap", face: legacy };
}
- return DEFAULT_UI_FONT;
+ return defaultUiFont();
}
export function setUiFontSelection(selection: UiFontSelection): void {
@@ -113,7 +124,8 @@ export function fontSelectionLabel(selection: UiFontSelection): string {
type UiFontRole = "small" | "medium" | "large";
-const UI_FONT_KEYS: readonly string[] = [UI_FONT_SELECTION_KEY, LEGACY_UI_FONT_KEY];
+/** Keys whose change re-resolves the UI fonts (the glasses type picks the default size). */
+const UI_FONT_KEYS: readonly string[] = [UI_FONT_SELECTION_KEY, LEGACY_UI_FONT_KEY, GLASSES_TYPE_KEY];
/**
* The three role fonts for one selection source, resolved lazily and cached
diff --git a/app/native/faceclaw-communicator.ios.ts b/app/native/faceclaw-communicator.ios.ts
index ea6fd304..563c6eb0 100644
--- a/app/native/faceclaw-communicator.ios.ts
+++ b/app/native/faceclaw-communicator.ios.ts
@@ -1,3 +1,4 @@
+import type { GlassesType } from "../ui/dashboard-settings";
import type { RingInput } from "../g2/ring-input";
import { File, knownFolders, path, type ImageSource } from "@nativescript/core";
import { REQUIRED_FACECLAW_FIRMWARE_VERSION, type FirmwareInfo } from "../g2/firmware-compat";
@@ -248,7 +249,10 @@ export class FaceclawCommunicatorBridge {
return FaceclawCommunicatorBridge.active;
}
- constructor(addresses: { right: string; left: string; ring?: string; ringRole?: string }) {
+ constructor(addresses: { right: string; left: string; ring?: string; ringRole?: string; glassesType?: GlassesType }) {
+ if (addresses.glassesType === "rayneo-io") {
+ throw new Error("RayNeo iO glasses are not supported on iOS yet.");
+ }
this.communicator = FaceclawKitIosGlassesSession.alloc().initWithRightAddressLeftAddressRingAddress(
String(addresses.right ?? "").toUpperCase(),
String(addresses.left ?? "").toUpperCase(),
@@ -256,6 +260,7 @@ export class FaceclawCommunicatorBridge {
);
// The shared session halts on any other firmware ("incompatible-firmware").
this.communicator.setRequiredFirmwareRevisionRevision(REQUIRED_FACECLAW_FIRMWARE_VERSION);
+ if (addresses.glassesType === "g1") this.communicator.useG1();
// Guarded: an older framework build may not export it yet.
if (addresses.ringRole && typeof this.communicator.setDirectRingRoleRole === "function") {
this.communicator.setDirectRingRoleRole(addresses.ringRole);
@@ -696,6 +701,9 @@ export class FaceclawCommunicatorBridge {
return this.enqueueNativeCall(() => Boolean(this.communicator.setFaceclawWakeLeaseEnabledEnabled(Boolean(enabled))));
}
+ /** The RayNeo iO's wake word; iOS doesn't drive an iO, so nothing to do. */
+ async setVoiceWakeEnabled(_enabled: boolean): Promise {}
+
async awaitEvenHubSessionReady(timeoutMs: number): Promise {
return this.enqueueNativeCall(() => Boolean(this.communicator.awaitEvenHubSessionReadyTimeoutMs(Math.round(nonNegativeNumber(timeoutMs)))));
}
@@ -849,6 +857,11 @@ export class FaceclawCommunicatorBridge {
return Boolean(this.communicator.isAncsAuthorized());
}
+ /** False on a G1 whose firmware has no relay; a G2's depends on its firmware revision. */
+ ancsRelayAvailable(): boolean {
+ return Boolean(this.communicator.ancsRelayAvailable());
+ }
+
onAncsAuthorization(listener: (authorized: boolean) => void): () => void {
this.ancsAuthorizationListeners.add(listener);
return () => this.ancsAuthorizationListeners.delete(listener);
diff --git a/app/native/faceclaw-communicator.ts b/app/native/faceclaw-communicator.ts
index a459d348..51dd92ee 100644
--- a/app/native/faceclaw-communicator.ts
+++ b/app/native/faceclaw-communicator.ts
@@ -1,3 +1,4 @@
+import type { GlassesType } from "../ui/dashboard-settings";
import type { RingInput } from "../g2/ring-input";
import { ImageSource, Utils } from "@nativescript/core";
import * as frameTimings from "./frame-timings";
@@ -169,7 +170,7 @@ export class FaceclawCommunicatorBridge {
private readonly firmwareInfoListeners = new Set<(info: FirmwareInfo) => void>();
private readonly previewAnimationListeners = new Set<() => void>();
- constructor(addresses: { right: string; left: string; ring?: string; ringRole?: string }) {
+ constructor(addresses: { right: string; left: string; ring?: string; ringRole?: string; glassesType?: GlassesType }) {
const context = Utils.android.getApplicationContext();
if (!context) throw new Error("Android application context unavailable");
@@ -181,6 +182,10 @@ export class FaceclawCommunicatorBridge {
);
// The shared session halts on any other firmware ("incompatible-firmware").
this.communicator.setRequiredFirmwareRevision(REQUIRED_FACECLAW_FIRMWARE_VERSION);
+ // RayNeo iO: one link (its address in both arm slots), its own handshake and page lease.
+ if (addresses.glassesType === "rayneo-io") this.communicator.useRayNeoIo();
+ // Even G1 on g1v0: two links, like a G2's arms, but frames composed here and sent to each arm.
+ if (addresses.glassesType === "g1") this.communicator.useG1();
// Which R1 role the direct ring link claims; only matters with a ring address.
if (addresses.ringRole) this.communicator.setDirectRingRole(addresses.ringRole);
this.listenerProxy = new com.faceclaw.app.FaceclawBleCommunicatorListener({
@@ -756,6 +761,14 @@ export class FaceclawCommunicatorBridge {
);
}
+ /**
+ * Whether the glasses' own wake word reaches Faceclaw: on a RayNeo iO, its
+ * "Hey RayNeo" switch (G2 glasses use the wake lease above instead).
+ */
+ async setVoiceWakeEnabled(enabled: boolean): Promise {
+ await this.enqueueJavaCall(() => this.communicator.setVoiceWakeEnabled(enabled));
+ }
+
/**
* Resolve only once the recreated layout and retained frame
* are visible. CFW's deferred-dashboard READY is emitted from this barrier.
diff --git a/app/native/g1-flasher.ios.ts b/app/native/g1-flasher.ios.ts
new file mode 100644
index 00000000..f2fd9579
--- /dev/null
+++ b/app/native/g1-flasher.ios.ts
@@ -0,0 +1,80 @@
+import { Application } from '@nativescript/core'
+import { parseG1FlashResult, type G1FlashResult } from '../g1/flash-plan'
+import { iosBluetooth } from './ios-bluetooth'
+import { kotlinListener } from './kotlin-listener.ios'
+import type { G1FlasherOptions } from './g1-flasher'
+export type { G1FlashMode, G1FlasherOptions } from './g1-flasher'
+
+declare const FaceclawKitIosG1Flasher: any, FaceclawKitFaceclawFirmwareFlasherListener: any
+
+/** CoreBluetooth has no way to remove a pairing; iOS Settings does it. */
+export function forgetG1Pairing(_address: string): boolean {
+ return false
+}
+
+/**
+ * iOS twin of the Android G1Flasher: the shared Kotlin G1ArmFlashFlow over a CoreBluetooth central. As with the G2's
+ * flasher, the phone must stay in the foreground with the screen awake, and addresses are mapped to peripheral
+ * identifiers first.
+ */
+export class G1Flasher {
+ private flasher: any = null
+ private listenerProxy: object | null = null
+ private logListener: ((line: string) => void) | null = null
+ private progressListener: ((bytesSent: number, bytesTotal: number) => void) | null = null
+ private stateListener: ((state: string) => void) | null = null
+ private previousIdle = false
+ private cancelled = false
+ private foregroundError = ''
+
+ constructor(private readonly options: G1FlasherOptions) {}
+
+ onLog(listener: (line: string) => void): void { this.logListener = listener }
+ onProgress(listener: (bytesSent: number, bytesTotal: number) => void): void { this.progressListener = listener }
+ onState(listener: (state: string) => void): void { this.stateListener = listener }
+
+ private readonly backgrounded = () => {
+ this.foregroundError = 'The install stopped because Faceclaw left the foreground. Return to Faceclaw and try again.'
+ this.cancel()
+ }
+
+ run(): Promise {
+ this.previousIdle = UIApplication.sharedApplication.idleTimerDisabled
+ UIApplication.sharedApplication.idleTimerDisabled = true
+ Application.on(Application.suspendEvent, this.backgrounded)
+ const restore = () => {
+ Application.off(Application.suspendEvent, this.backgrounded)
+ UIApplication.sharedApplication.idleTimerDisabled = this.previousIdle
+ }
+ return new Promise((resolve, reject) => {
+ const identifier = iosBluetooth().peripheralIdentifier(this.options.address, this.options.side)
+ if (!identifier) throw new Error(`Could not find the ${this.options.side} arm. Keep the glasses in the case with the lid open.`)
+ this.flasher = FaceclawKitIosG1Flasher.alloc().initWithAddressSideFirmwarePathNetCorePathModeConnectWindowMs(
+ identifier, this.options.side, this.options.firmwarePath, this.options.netCorePath ?? '', this.options.mode, this.options.connectWindowMs)
+ this.listenerProxy = kotlinListener(FaceclawKitFaceclawFirmwareFlasherListener, {
+ onLogLine: (line: string) => this.logListener?.(String(line ?? '')),
+ onProgressLensComponentIndexComponentCountBlockIndexBlockCountBytesSentBytesTotal: (
+ _lens: string, _componentIndex: number, _componentCount: number, _blockIndex: number, _blockCount: number, sent: number, total: number,
+ ) => this.progressListener?.(Number(sent), Number(total)),
+ onStateStateDetail: (state: string) => this.stateListener?.(String(state)),
+ onCompleteSuccessDetail: (success: boolean, detail: string) => {
+ if (success) resolve(parseG1FlashResult(String(detail ?? '')))
+ else reject(new Error(this.foregroundError || String(detail ?? '') || 'The install failed.'))
+ },
+ })
+ this.flasher.setListenerListener(this.listenerProxy)
+ if (this.cancelled) this.flasher.cancel()
+ this.flasher.start()
+ }).finally(restore)
+ }
+
+ cancel(): void {
+ this.cancelled = true
+ try { this.flasher?.cancel() } catch { /* ignore */ }
+ }
+
+ close(): void {
+ this.cancel()
+ try { this.flasher?.close() } catch { /* ignore */ }
+ }
+}
diff --git a/app/native/g1-flasher.ts b/app/native/g1-flasher.ts
new file mode 100644
index 00000000..e27f6a0f
--- /dev/null
+++ b/app/native/g1-flasher.ts
@@ -0,0 +1,85 @@
+import { Utils } from "@nativescript/core";
+
+import { parseG1FlashResult, type G1FlashResult, type G1Side } from "../g1/flash-plan";
+
+declare const com: any;
+
+/** "restore": Even's firmware back on an arm running g1v0, both of its images. */
+export type G1FlashMode = "stock" | "update" | "probe" | "restore";
+
+export type G1FlasherOptions = {
+ address: string;
+ side: G1Side;
+ /** The application core's image. */
+ firmwarePath: string;
+ /** A restore's network-core image. */
+ netCorePath?: string;
+ mode: G1FlashMode;
+ /** How long to keep trying to reach the arm and pair with it. */
+ connectWindowMs: number;
+};
+
+/** Removes the phone's pairing with an address, which the glasses no longer use or no longer share. False: this phone can't. */
+export function forgetG1Pairing(address: string): boolean {
+ const context = Utils.android.getApplicationContext();
+ if (!context) return false;
+ com.faceclaw.app.FaceclawG1Flasher.forgetPairing(context, address);
+ return true;
+}
+
+/** TS wrapper around FaceclawG1Flasher: one arm's install, its restore to Even's firmware, or a question about what it runs. */
+export class G1Flasher {
+ private readonly flasher: any;
+ private readonly listenerProxy: any;
+ private logListener: ((line: string) => void) | null = null;
+ private progressListener: ((bytesSent: number, bytesTotal: number) => void) | null = null;
+ private stateListener: ((state: string) => void) | null = null;
+ private completion: ((success: boolean, detail: string) => void) | null = null;
+
+ constructor(options: G1FlasherOptions) {
+ const context = Utils.android.getApplicationContext();
+ if (!context) throw new Error("Android application context unavailable");
+ this.flasher = new com.faceclaw.app.FaceclawG1Flasher(
+ context, options.address, options.side, options.firmwarePath, options.netCorePath ?? "", options.mode, options.connectWindowMs,
+ );
+ this.listenerProxy = new com.faceclaw.app.FaceclawFirmwareFlasherListener({
+ onLog: (line: string) => this.logListener?.(String(line)),
+ onProgress: (_lens: string, _component: number, _components: number, _block: number, _blocks: number, sent: number, total: number) =>
+ this.progressListener?.(Number(sent), Number(total)),
+ onState: (state: string) => this.stateListener?.(String(state)),
+ onComplete: (success: boolean, detail: string) => this.completion?.(Boolean(success), String(detail ?? "")),
+ });
+ this.flasher.setListener(this.listenerProxy);
+ }
+
+ onLog(listener: (line: string) => void): void {
+ this.logListener = listener;
+ }
+
+ onProgress(listener: (bytesSent: number, bytesTotal: number) => void): void {
+ this.progressListener = listener;
+ }
+
+ onState(listener: (state: string) => void): void {
+ this.stateListener = listener;
+ }
+
+ run(): Promise {
+ return new Promise((resolve, reject) => {
+ this.completion = (success, detail) => {
+ this.completion = null;
+ if (success) resolve(parseG1FlashResult(detail));
+ else reject(new Error(detail || "The install failed."));
+ };
+ this.flasher.start();
+ });
+ }
+
+ cancel(): void {
+ this.flasher.cancel();
+ }
+
+ close(): void {
+ this.flasher.close();
+ }
+}
diff --git a/app/native/image-rgba.ios.ts b/app/native/image-rgba.ios.ts
new file mode 100644
index 00000000..7ef09dba
--- /dev/null
+++ b/app/native/image-rgba.ios.ts
@@ -0,0 +1,9 @@
+import { toData, fromData } from './kotlin-data'
+import { rgbaFromPacket } from './image-rgba'
+declare const FaceclawGraphics: any
+
+/** Decoded RGBA of encoded image bytes, or null when undecodable (transparent pixels come out black). */
+export function decodeImageRgba(bytes: Uint8Array): { width: number; height: number; rgba: Uint8Array } | null {
+ const data = FaceclawGraphics.rgbaPacketFromImageData(toData(bytes))
+ return data ? rgbaFromPacket(fromData(data)) : null
+}
diff --git a/app/native/image-rgba.ts b/app/native/image-rgba.ts
new file mode 100644
index 00000000..28c8d7b1
--- /dev/null
+++ b/app/native/image-rgba.ts
@@ -0,0 +1,22 @@
+import { toUint8Array } from '../util/array-util'
+import { copyToJavaByteBuffer } from './java-direct-buffer'
+declare const com: any
+
+/** Decoded RGBA (not premultiplied) of encoded image bytes, or null when undecodable. */
+export function decodeImageRgba(bytes: Uint8Array): { width: number; height: number; rgba: Uint8Array } | null {
+ try {
+ return rgbaFromPacket(toUint8Array(com.faceclaw.app.ImageFileLoader.decodeRgbaFromBytes(copyToJavaByteBuffer(bytes))))
+ } catch (error) {
+ console.warn(`decodeImageRgba failed: ${error}`)
+ return null
+ }
+}
+
+/** [widthLo, widthHi, heightLo, heightHi, RGBA...] as an image, or null when short. */
+export function rgbaFromPacket(packet: Uint8Array): { width: number; height: number; rgba: Uint8Array } | null {
+ if (packet.length < 4) return null
+ const width = packet[0]! | (packet[1]! << 8)
+ const height = packet[2]! | (packet[3]! << 8)
+ if (width <= 0 || height <= 0 || packet.length < 4 + width * height * 4) return null
+ return { width, height, rgba: packet.slice(4, 4 + width * height * 4) }
+}
diff --git a/app/native/ios-bluetooth.ts b/app/native/ios-bluetooth.ts
index 5c523858..aac0b385 100644
--- a/app/native/ios-bluetooth.ts
+++ b/app/native/ios-bluetooth.ts
@@ -7,6 +7,8 @@ declare const FaceclawKitIosBleCentral: any, FaceclawKitIosProtocolPlatform: any
/** CBManagerState raw values reported by the Kotlin central. */
export const BLE_STATE_UNSUPPORTED = 2, BLE_STATE_UNAUTHORIZED = 3, BLE_STATE_POWERED_OFF = 4, BLE_STATE_POWERED_ON = 5
+/** CBManagerAuthorization.allowedAlways. */
+const BLE_AUTHORIZATION_ALLOWED = 3
export type BluetoothEvent =
| { kind: 'state'; state: number; authorization: number }
@@ -50,17 +52,21 @@ export class IosBluetooth {
}
},
})
- this.native.setScanListenerListener(this.scanListener)
}
onEvent(listener: (event: BluetoothEvent) => void): () => void {
this.listeners.add(listener); return () => { this.listeners.delete(listener) }
}
private emit(event: BluetoothEvent): void { for (const listener of [...this.listeners]) listener(event) }
+ /**
+ * Whether the user has allowed Bluetooth. Unlike `state` this is accurate before the
+ * central exists, and reading it never shows the permission prompt.
+ */
+ isAuthorized(): boolean { return Number(this.native.authorization()) === BLE_AUTHORIZATION_ALLOWED }
/** Creates the central (first use shows the Bluetooth permission prompt) without blocking the JS thread. */
private ensureCentral(): void {
- // A zero timeout returns immediately after creating the central; the state arrives
- // through the scan listener on the main queue.
- this.native.waitForPoweredOnTimeoutMs(0)
+ // Registering the listener creates the central, or has an existing one re-report its
+ // state; the state arrives through the listener on the main queue.
+ this.native.setScanListenerListener(this.scanListener)
}
ensureReady(): Promise {
if (this.state === BLE_STATE_POWERED_ON) return Promise.resolve()
@@ -129,6 +135,15 @@ export class IosBluetooth {
})
return result
}
+ /** The peripheral last heard at this address, if it was on this side. */
+ peripheralIdentifier(address: string, role: string): string | null {
+ try {
+ const saved = JSON.parse(ApplicationSettings.getString(`ios.ble.peripheral.${address}`, '{}'))
+ return saved.role === role && typeof saved.identifier === 'string' ? saved.identifier : null
+ } catch {
+ return null
+ }
+ }
forget(address: string): void { ApplicationSettings.remove(`ios.ble.peripheral.${address}`); this.devices.delete(address) }
}
let instance: IosBluetooth | null = null
diff --git a/app/phone-ui/g1-flash-view-model.ts b/app/phone-ui/g1-flash-view-model.ts
new file mode 100644
index 00000000..b83d61e6
--- /dev/null
+++ b/app/phone-ui/g1-flash-view-model.ts
@@ -0,0 +1,489 @@
+import { Frame, Observable } from "@nativescript/core";
+
+import { G1ArmScanner } from "../g1/arm-scanner";
+import { EVEN_G1_RESTORE } from "../g1/even-firmware";
+import { G1V0_IMAGE } from "../g1/firmware/g1v0-image";
+import {
+ buildEvenG1Firmware,
+ buildG1Firmware,
+ type BuiltEvenG1Firmware,
+ type BuiltG1Firmware,
+ type G1BuildProgress,
+} from "../g1/firmware-builder";
+import { saveG1Arm, saveG1Pair } from "../g1/addresses";
+import {
+ G1_CASE_DELAY_HINT,
+ G1_CASE_INSTRUCTIONS,
+ G1_INSTALL_NOTICE,
+ G1_SIDES,
+ G1_UNINSTALL_NOTICE,
+ G1_UNINSTALL_SIDES,
+ g1FlashPercent,
+ type G1FlashResult,
+ type G1Side,
+} from "../g1/flash-plan";
+import { loadDeviceAddresses, loadPairedGlassesIdentity } from "../g2/device-addresses";
+import { downloadAndExtractEvenHubFonts, hasExtractedEvenHubFonts } from "../g2/firmware-builder";
+import { type GlassesPairCandidate } from "../g2/pairing-candidates";
+import { resumeAutoReconnect, suppressAutoReconnect } from "../g2/reconnect-policy";
+import { ensureBlePermissions } from "../native/ble-permissions";
+import { forgetG1Pairing, G1Flasher, type G1FlasherOptions } from "../native/g1-flasher";
+import { formatErrorMessage } from "../util/format-error";
+import { finishOnboardingNavigation } from "./onboarding-navigation";
+import { setOnboardingCompleted, setPreviewOnlyMode } from "./onboarding-state";
+
+type Phase = "intro" | "preparing" | "flashing" | "flashed" | "error";
+
+const LOCATE_MS = 45_000;
+/** An arm takes about 20 s to copy the image, and a hung boot resets itself within two minutes. */
+const RETURN_MS = 240_000;
+/** Even's image is larger than g1v0, and MCUboot first installs the network core's. */
+const RESTORE_RETURN_MS = 300_000;
+/**
+ * Just after its reset an arm may still be heard on g1v0. Later than this, one heard on g1v0 has booted it again:
+ * MCUboot didn't take Even's firmware.
+ */
+const OLD_FIRMWARE_GRACE_MS = 15_000;
+const CONNECT_MS = 60_000;
+/** A new arm pairs only once it knows it's in the case, which a full case can take a while to tell it. */
+const FIRST_PAIRING_MS = 120_000;
+
+/**
+ * The install and uninstall page on a G1, in place of OnboardingFlashViewModel. The two arms are separate devices that
+ * each take the image over MCUmgr (G1ArmFlashFlow), left first; an uninstall goes right first and puts back both of
+ * Even's images, the network core's too. There is nothing on the lens to confirm with while an arm runs Even's
+ * firmware, so the confirmation is on the phone: the page before, or this one's intro.
+ *
+ * Every run starts by listening for what each arm runs now, so a retry picks up wherever the last one stopped. An arm's
+ * new address is saved as soon as it's known.
+ */
+export class G1FlashViewModel extends Observable {
+ private phase: Phase = "intro";
+ private readonly fromOnboarding: boolean;
+ private readonly uninstalling: boolean;
+ private readonly scanner = new G1ArmScanner();
+ private image: BuiltG1Firmware | null = null;
+ private evenImage: BuiltEvenG1Firmware | null = null;
+ private flasher: G1Flasher | null = null;
+ private generation = 0;
+ private disposed = false;
+ private unpairedArm = false;
+ /** An uninstall's outcome, for the last page: an arm's store erased, a pairing this phone couldn't remove, an arm done. */
+ private wiped = false;
+ private pairingLeft = false;
+ private restoredArm = false;
+
+ headline = "Install Faceclaw's Firmware";
+ status = "";
+ log = "";
+ busy = false;
+ progress = 0;
+
+ constructor(options?: { mode?: "install" | "uninstall"; fromOnboarding?: boolean; autoStart?: boolean }) {
+ super();
+ this.fromOnboarding = options?.fromOnboarding ?? true;
+ this.uninstalling = options?.mode === "uninstall";
+ suppressAutoReconnect();
+ if (this.uninstalling) {
+ this.headline = "Back to Even's Firmware";
+ this.status = `${G1_CASE_INSTRUCTIONS}\n\n${G1_UNINSTALL_NOTICE}`;
+ } else {
+ this.status = `${G1_CASE_INSTRUCTIONS}\n\n${G1_INSTALL_NOTICE}`;
+ }
+ if (options?.autoStart) void this.run();
+ }
+
+ // --- what the page binds --------------------------------------------------
+
+ get logVisibility(): "visible" | "collapse" {
+ return this.log ? "visible" : "collapse";
+ }
+
+ get busyVisibility(): "visible" | "collapse" {
+ return this.busy ? "visible" : "collapse";
+ }
+
+ get progressVisibility(): "visible" | "collapse" {
+ return this.phase === "flashing" ? "visible" : "collapse";
+ }
+
+ get primaryLabel(): string {
+ switch (this.phase) {
+ case "intro":
+ return this.uninstalling ? "Uninstall" : "Install";
+ case "flashed":
+ return "Finish";
+ case "error":
+ return "Retry";
+ default:
+ return "";
+ }
+ }
+
+ get primaryVisibility(): "visible" | "collapse" {
+ return this.primaryLabel ? "visible" : "collapse";
+ }
+
+ get secondaryLabel(): string {
+ return "Back";
+ }
+
+ get secondaryVisibility(): "visible" | "collapse" {
+ // No way out mid-install, or after one.
+ return this.phase === "preparing" || this.phase === "flashing" || this.phase === "flashed" ? "collapse" : "visible";
+ }
+
+ onPrimaryTap(): void {
+ if (this.phase === "intro" || this.phase === "error") void this.run();
+ else if (this.phase === "flashed") this.finish();
+ }
+
+ onSecondaryTap(): void {
+ if (this.phase === "intro" || this.phase === "error") this.leave();
+ }
+
+ // --- the install ----------------------------------------------------------
+
+ private async run(): Promise {
+ const generation = ++this.generation;
+ const live = () => !this.disposed && generation === this.generation;
+ this.setPhase("preparing");
+ this.setBusy(true);
+ this.setText("Preparing Firmware", this.uninstalling ? "Getting Even's firmware ready..." : "Getting the firmware ready...");
+ try {
+ await ensureBlePermissions();
+ if (!live()) return;
+ if (this.uninstalling) {
+ if (!this.evenImage) {
+ this.evenImage = await buildEvenG1Firmware((progress) => {
+ if (live()) this.setStatus(describeEvenBuild(progress));
+ });
+ this.appendLog(`Even's firmware ${this.evenImage.version} downloaded and verified (${this.evenImage.bytes.toLocaleString()} bytes)`);
+ }
+ } else {
+ if (!this.image) {
+ this.image = await buildG1Firmware((progress) => {
+ if (live()) this.setStatus(describeBuild(progress));
+ });
+ this.appendLog(`firmware ${this.image.version} prepared and verified (${this.image.bytes.toLocaleString()} bytes)`);
+ }
+ await this.prepareFonts(live);
+ }
+ if (!live()) return;
+
+ this.setPhase("flashing");
+ this.setText(this.uninstalling ? "Restoring Even's Firmware" : "Installing Firmware", "Listening for your glasses...");
+ const identity = loadPairedGlassesIdentity();
+ const stored = loadDeviceAddresses();
+ const pair = await this.scanner.waitForPair({ serial: identity?.serial, left: stored.left, right: stored.right }, LOCATE_MS);
+ if (!live()) return;
+ if (!pair) {
+ throw new Error("Couldn't hear both arms of your glasses. Make sure they're in the case with the lid open, and that no other app " +
+ "or phone is connected to them, then retry.");
+ }
+ saveG1Pair(pair);
+
+ if (this.uninstalling) {
+ for (const side of G1_UNINSTALL_SIDES) {
+ await this.restoreArm(side, pair, live);
+ if (!live()) return;
+ }
+ this.restored();
+ return;
+ }
+ this.unpairedArm = false;
+ for (const side of G1_SIDES) {
+ await this.installArm(side, pair, live);
+ if (!live()) return;
+ }
+ this.finished();
+ } catch (error) {
+ if (live()) this.failed(formatErrorMessage(error));
+ }
+ }
+
+ private async installArm(side: G1Side, pair: GlassesPairCandidate, live: () => boolean): Promise {
+ const arm = pair[side]!;
+ const fromStock = arm.g1Firmware === "stock";
+ this.setProgress(g1FlashPercent(side, 0, 1));
+ this.setStatus(`Connecting to the ${side} arm...`);
+ const installed = await this.flash({
+ address: arm.address,
+ side,
+ firmwarePath: this.image!.path,
+ mode: fromStock ? "stock" : "update",
+ connectWindowMs: CONNECT_MS,
+ }, (state) => {
+ if (state === "pairing") this.setStatus(`Pairing with the ${side} arm. If your phone asks, accept it.`);
+ else if (state === "checking") this.setStatus(`Checking the ${side} arm...`);
+ else if (state === "flashing") this.setStatus(`Sending the firmware to the ${side} arm. Nothing has changed yet.`);
+ else if (state === "committing") this.setStatus(`Installing on the ${side} arm. Keep the glasses in the case.`);
+ }, (sent, total) => this.setProgress(g1FlashPercent(side, sent, total)));
+ if (!live()) return;
+ this.setProgress(g1FlashPercent(side, 1, 1));
+ if (!installed.flashed) {
+ this.appendLog(`${side} arm already runs ${installed.version}`);
+ return;
+ }
+
+ this.setStatus(`The ${side} arm is restarting into the new firmware. This takes about 20 seconds; keep it in the case.`);
+ const identity = loadPairedGlassesIdentity();
+ const back = await this.scanner.waitForG1v0Arm(side, identity?.serial ?? pair.serial, RETURN_MS);
+ if (!live()) return;
+ if (!back) {
+ throw new Error(`The ${side} arm hasn't come back yet. Leave the glasses in the plugged-in case for a few minutes, with the lid ` +
+ "open: an interrupted install finishes by itself. Then retry.");
+ }
+ saveG1Arm(side, back);
+ // Coming from firmware before 0.5.66, which had an address of its own: the phone needn't remember that one.
+ if (back.address !== arm.address) forgetG1Pairing(arm.address);
+ if (back.g1Firmware === "g1v0-safe") {
+ throw new Error(`The ${side} arm came back in safe mode: the new firmware restarted repeatedly. Retry to install it again.`);
+ }
+
+ this.setStatus(`Checking the ${side} arm. If your phone asks to pair, accept it. ${G1_CASE_DELAY_HINT}`);
+ // An arm at a new address has no bond yet (coming from Even's firmware the address is kept from 0.5.66 on, and so is the
+ // bond). It may refuse one for a while: it's installed either way, and the session pairs it later.
+ const newAddress = back.address !== arm.address;
+ let running: G1FlashResult;
+ try {
+ running = await this.flash({
+ address: back.address,
+ side,
+ firmwarePath: "",
+ mode: "probe",
+ connectWindowMs: newAddress ? FIRST_PAIRING_MS : RETURN_MS,
+ });
+ } catch (error) {
+ if (!newAddress || !live()) throw error;
+ // Installed, as its advertising shows; it just won't pair yet. The next connection pairs it.
+ this.appendLog(`${side} arm not paired yet: ${formatErrorMessage(error)}`);
+ this.unpairedArm = true;
+ return;
+ }
+ if (!live()) return;
+ if (running.version !== installed.version) {
+ throw new Error(`The ${side} arm runs ${running.version}, not ${installed.version}: it didn't take the new firmware. Retry to try again.`);
+ }
+ this.appendLog(`${side} arm runs ${running.version}`);
+ }
+
+ /**
+ * Even's firmware back on one arm, then a wait for it to advertise as Even's. An arm already on Even's firmware is
+ * left alone: a retry goes on from there.
+ */
+ private async restoreArm(side: G1Side, pair: GlassesPairCandidate, live: () => boolean): Promise {
+ const arm = pair[side]!;
+ if (arm.g1Firmware === "stock") {
+ this.appendLog(`${side} arm already runs Even's firmware`);
+ this.setProgress(g1FlashPercent(side, 1, 1, G1_UNINSTALL_SIDES));
+ return;
+ }
+ const even = this.evenImage!;
+ this.setProgress(g1FlashPercent(side, 0, 1, G1_UNINSTALL_SIDES));
+ this.setStatus(`Connecting to the ${side} arm...`);
+ const result = await this.flash({
+ address: arm.address,
+ side,
+ firmwarePath: even.appPath,
+ netCorePath: even.netCorePath,
+ mode: "restore",
+ connectWindowMs: CONNECT_MS,
+ }, (state) => {
+ if (state === "pairing") this.setStatus(`Pairing with the ${side} arm. If your phone asks, accept it.`);
+ else if (state === "checking") this.setStatus(`Checking the ${side} arm...`);
+ else if (state === "wiping") {
+ this.setStatus(`Erasing Faceclaw's storage on the ${side} arm, where Even's fonts were. This can take several minutes; keep the ` +
+ "glasses in the case. Nothing else has changed yet.");
+ } else if (state === "flashing") this.setStatus(`Sending Even's firmware to the ${side} arm. Its firmware hasn't changed yet.`);
+ else if (state === "committing") this.setStatus(`Installing on the ${side} arm. Keep the glasses in the case.`);
+ }, (sent, total) => this.setProgress(g1FlashPercent(side, sent, total, G1_UNINSTALL_SIDES)));
+ if (!live()) return;
+ if (result.wiped) this.wiped = true;
+ this.setProgress(g1FlashPercent(side, 1, 1, G1_UNINSTALL_SIDES));
+
+ this.setStatus(`The ${side} arm is restarting into Even's firmware. This takes a minute or two; keep it in the case.`);
+ const resetAt = Date.now();
+ const identity = loadPairedGlassesIdentity();
+ const back = await this.scanner.waitForArm(side, identity?.serial ?? pair.serial, RESTORE_RETURN_MS,
+ (heard) => heard.g1Firmware === "stock" || Date.now() - resetAt >= OLD_FIRMWARE_GRACE_MS);
+ if (!live()) return;
+ if (!back) {
+ throw new Error(`The ${side} arm hasn't come back yet. Leave the glasses in the plugged-in case for a few minutes, with the lid ` +
+ "open: an interrupted install finishes by itself. Then retry.");
+ }
+ if (back.g1Firmware !== "stock") {
+ throw new Error(`The ${side} arm came back on Faceclaw's firmware: it didn't take Even's. Retry to try again.`);
+ }
+ saveG1Arm(side, back);
+ this.restoredArm = true;
+ // Even's app makes its own pairing with Even's firmware; the one this phone made with g1v0 would only be in its way.
+ this.forgetPairing(back.address);
+ if (back.address !== arm.address) this.forgetPairing(arm.address);
+ this.appendLog(`${side} arm runs Even's firmware`);
+ }
+
+ private forgetPairing(address: string): void {
+ if (!forgetG1Pairing(address)) this.pairingLeft = true;
+ }
+
+ private async flash(
+ options: G1FlasherOptions,
+ onState?: (state: string) => void,
+ onProgress?: (sent: number, total: number) => void,
+ ) {
+ const flasher = new G1Flasher(options);
+ this.flasher = flasher;
+ flasher.onLog((line) => this.appendLog(line));
+ if (onState) flasher.onState(onState);
+ if (onProgress) flasher.onProgress(onProgress);
+ try {
+ return await flasher.run();
+ } finally {
+ if (this.flasher === flasher) this.flasher = null;
+ flasher.close();
+ }
+ }
+
+ /** A G2's install gets these from the same download; Faceclaw's fonts are a phone-side matter, so a failure here is no reason to stop. */
+ private async prepareFonts(live: () => boolean): Promise {
+ if (hasExtractedEvenHubFonts()) return;
+ if (live()) this.setStatus("Preparing fonts...");
+ try {
+ await downloadAndExtractEvenHubFonts();
+ } catch (error) {
+ this.appendLog(`fonts not prepared: ${formatErrorMessage(error)}`);
+ }
+ }
+
+ private finished(): void {
+ // The glasses are ready for the main page to connect to.
+ resumeAutoReconnect();
+ this.setBusy(false);
+ this.setProgress(100);
+ this.setPhase("flashed");
+ this.setText("All Done", `Both arms run Faceclaw's firmware ${G1V0_IMAGE.version}.` + (this.unpairedArm
+ ? " Keep the glasses in the case with the lid open until Faceclaw has connected: they only pair in the case."
+ : ""));
+ }
+
+ private restored(): void {
+ // Stays manually disconnected: Faceclaw would only find firmware it can't run.
+ this.setBusy(false);
+ this.setProgress(100);
+ this.setPhase("flashed");
+ if (!this.restoredArm) {
+ this.setText("All Done", "Both arms already run Even's firmware.");
+ return;
+ }
+ const steps = [`Both arms run Even's firmware ${EVEN_G1_RESTORE.version}.`];
+ if (this.pairingLeft) {
+ steps.push("Before pairing them in Even's app, remove both arms in this phone's Bluetooth settings (\"Forget This Device\"): " +
+ "Faceclaw's firmware made that pairing, and Even's firmware makes its own.");
+ } else {
+ steps.push("To use them, pair them in Even's app.");
+ }
+ if (this.wiped) {
+ steps.push("Even's Chinese, Japanese and Korean text and its demo pictures were erased with Faceclaw's storage, and don't come back.");
+ }
+ this.setText("All Done", steps.join("\n\n"));
+ }
+
+ private failed(message: string): void {
+ this.setBusy(false);
+ this.setPhase("error");
+ this.setText("Something Went Wrong", message);
+ }
+
+ private finish(): void {
+ if (!this.uninstalling) {
+ setPreviewOnlyMode(false);
+ setOnboardingCompleted(true);
+ }
+ this.teardown();
+ finishOnboardingNavigation();
+ }
+
+ private leave(): void {
+ this.teardown();
+ const frame = Frame.topmost();
+ if (this.fromOnboarding && frame?.canGoBack()) {
+ frame.goBack();
+ return;
+ }
+ if (!this.fromOnboarding) {
+ finishOnboardingNavigation();
+ return;
+ }
+ frame?.navigate({ moduleName: "phone-ui/onboarding-page", clearHistory: true });
+ }
+
+ dispose(): void {
+ this.disposed = true;
+ this.teardown();
+ }
+
+ private teardown(): void {
+ ++this.generation;
+ this.scanner.stop();
+ this.flasher?.close();
+ this.flasher = null;
+ }
+
+ // --- page state -----------------------------------------------------------
+
+ private setText(headline: string, status: string): void {
+ this.set("headline", headline);
+ this.set("status", status);
+ }
+
+ private setStatus(status: string): void {
+ this.set("status", status);
+ }
+
+ private setBusy(busy: boolean): void {
+ this.set("busy", busy);
+ this.notifyPropertyChange("busyVisibility", this.busyVisibility);
+ }
+
+ private setProgress(percent: number): void {
+ this.set("progress", Math.max(0, Math.min(100, Math.round(percent))));
+ }
+
+ private setPhase(phase: Phase): void {
+ this.phase = phase;
+ for (const property of ["primaryLabel", "primaryVisibility", "secondaryVisibility", "progressVisibility"] as const) {
+ this.notifyPropertyChange(property, this[property]);
+ }
+ }
+
+ private appendLog(line: string): void {
+ const stamp = new Date().toISOString().slice(11, 19);
+ this.set("log", this.log ? `${this.log}\n[${stamp}] ${line}` : `[${stamp}] ${line}`);
+ this.notifyPropertyChange("logVisibility", this.logVisibility);
+ }
+}
+
+function describeEvenBuild(progress: G1BuildProgress): string {
+ switch (progress) {
+ case "downloading":
+ return "Downloading Even's firmware from Even's firmware server...";
+ case "verifying":
+ return "Verifying the download...";
+ default:
+ return "Saving the firmware...";
+ }
+}
+
+function describeBuild(progress: G1BuildProgress): string {
+ switch (progress) {
+ case "downloading":
+ return "Downloading the parts it needs from Even's firmware server...";
+ case "verifying":
+ return "Verifying the download...";
+ case "assembling":
+ return "Assembling the firmware...";
+ default:
+ return "Saving the firmware...";
+ }
+}
diff --git a/app/phone-ui/main-page.ios.ts b/app/phone-ui/main-page.ios.ts
index 5f647c99..f42f9181 100644
--- a/app/phone-ui/main-page.ios.ts
+++ b/app/phone-ui/main-page.ios.ts
@@ -7,7 +7,7 @@ import { IosPreviewController } from '../g2/ios-preview-controller'
import { PhoneGestureRecognizer } from './phone-gestures'
import { BleBandwidthMeter } from './ble-bandwidth-meter'
import { sampleBleTraffic } from '../native/ble-traffic'
-import { onAnySettingChanged, mirrorTouchSetting, showBleBandwidthSetting } from '../ui/dashboard-settings'
+import { glassesModelName, onAnySettingChanged, mirrorTouchSetting, showBleBandwidthSetting } from '../ui/dashboard-settings'
import { loadDeviceAddresses } from '../g2/device-addresses'
import { deviceAddressError } from '../g2/ios-peripheral-identity'
import { formatBatteryLine } from '../g2/glasses-display-state'
@@ -75,7 +75,7 @@ export function createMainPage(): Page {
// The Settings tab's battery row. iOS reports charging sessions as
// connected, so "connected" is the whole live-link condition here.
let glassesLinked = false
- const refreshBatteryLine = () => { model.batteryLine = formatBatteryLine(shell.getBatteryLevels(), glassesLinked) }
+ const refreshBatteryLine = () => { model.batteryLine = formatBatteryLine(shell.getBatteryLevels(), glassesLinked, glassesModelName()) }
const keyboardField = () => keyboardPanel.getViewById('keyboardInputField')
const controller = new IosPreviewController((image, label) => {
mirror.imageSource = image; model.set('padFocusLine', label)
diff --git a/app/phone-ui/main-page.xml b/app/phone-ui/main-page.xml
index 846fa253..7868d259 100644
--- a/app/phone-ui/main-page.xml
+++ b/app/phone-ui/main-page.xml
@@ -15,6 +15,7 @@
+
diff --git a/app/phone-ui/main-view-model.ts b/app/phone-ui/main-view-model.ts
index a309f93f..7df22327 100644
--- a/app/phone-ui/main-view-model.ts
+++ b/app/phone-ui/main-view-model.ts
@@ -17,6 +17,7 @@ import {
import { dashboardController, type MirrorTouchKind } from "../g2/dashboard-controller";
import { formatBatteryLine } from "../g2/glasses-display-state";
import {
+ glassesModelName,
mirrorTouchSetting,
onAnySettingChanged,
showBleBandwidthSetting,
@@ -26,10 +27,13 @@ import { isValidMacAddress, loadDeviceAddresses } from "../g2/device-addresses";
import { isAutoReconnectSuppressed, resumeAutoReconnect } from "../g2/reconnect-policy";
import { isPreviewOnlyMode } from "./onboarding-state";
import { formatErrorMessage } from "../util/format-error";
-import { G2_LENS_HEIGHT, G2_LENS_WIDTH } from "../graphics/image";
+import { screenHeight, screenWidth } from "../ui/shell/geometry";
import { type PhoneUiButton } from "../apps/evenhub/manager";
-const LENS_ASPECT_RATIO = G2_LENS_WIDTH / G2_LENS_HEIGHT;
+/** The paired glasses' screen aspect (4:3 on the G2, 27:11 on the RayNeo iO). */
+function lensAspectRatio(): number {
+ return screenWidth() / screenHeight();
+}
type LayoutOrientation = "portrait" | "landscape";
@@ -94,6 +98,7 @@ export class MainViewModel extends RemoteControlsViewModel {
this.batteryLine = formatBatteryLine(
snapshot.batteries,
snapshot.phase === "connected" || snapshot.phase === "charging",
+ glassesModelName(),
);
this.activeTextSettingId = snapshot.activeTextSettingId;
this.activeTextEditorTitle = snapshot.activeTextEditorTitle;
@@ -233,7 +238,7 @@ export class MainViewModel extends RemoteControlsViewModel {
}
get displayPreviewHeight(): number {
- return Screen.mainScreen.widthDIPs / LENS_ASPECT_RATIO;
+ return Screen.mainScreen.widthDIPs / lensAspectRatio();
}
get landscapeDisplayPreviewWidth(): number {
@@ -249,8 +254,8 @@ export class MainViewModel extends RemoteControlsViewModel {
// and controls, and updates for rotation, split-screen, and the keyboard.
const { width, height } = args.object.getActualSize();
if (width <= 0 || height <= 0) return;
- const previewHeight = Math.min(height, width / LENS_ASPECT_RATIO);
- const previewWidth = previewHeight * LENS_ASPECT_RATIO;
+ const previewHeight = Math.min(height, width / lensAspectRatio());
+ const previewWidth = previewHeight * lensAspectRatio();
if (previewWidth === this._landscapePreviewWidth && previewHeight === this._landscapePreviewHeight) return;
this._landscapePreviewWidth = previewWidth;
this._landscapePreviewHeight = previewHeight;
@@ -659,6 +664,14 @@ export class MainViewModel extends RemoteControlsViewModel {
* auto-reconnect suppression right away.
*/
async onPrepareFontsTap(): Promise {
+ await this.openFirmwareCheck();
+ }
+
+ async onCheckFirmwareTap(): Promise {
+ await this.openFirmwareCheck();
+ }
+
+ private async openFirmwareCheck(): Promise {
this.setWarningsModalVisible(false);
if (this.phase === "connected" || this.phase === "charging" || this.phase === "connecting") {
try {
@@ -906,8 +919,9 @@ export class MainViewModel extends RemoteControlsViewModel {
}
private async openFlashPage(mode: "install" | "uninstall"): Promise {
- // The flasher needs the glasses to itself, so drop the main connection first.
- if (this.phase === "connected" || this.phase === "charging") {
+ // The flasher needs the glasses to itself, so drop the main connection first. That includes a session
+ // still retrying: an install brings arms back at the addresses it is dialling.
+ if (this.phase === "connected" || this.phase === "charging" || this.phase === "connecting") {
try {
await dashboardController.disconnect();
} catch {
diff --git a/app/phone-ui/onboarding-devices-page.ts b/app/phone-ui/onboarding-devices-page.ts
new file mode 100644
index 00000000..dfb46b2f
--- /dev/null
+++ b/app/phone-ui/onboarding-devices-page.ts
@@ -0,0 +1,10 @@
+import { EventData, Page } from "@nativescript/core";
+
+import { OnboardingDevicesViewModel } from "./onboarding-devices-view-model";
+
+export function navigatingTo(args: EventData): void {
+ const page = args.object as Page;
+ if (!page.bindingContext) {
+ page.bindingContext = new OnboardingDevicesViewModel();
+ }
+}
diff --git a/app/phone-ui/onboarding-devices-page.xml b/app/phone-ui/onboarding-devices-page.xml
new file mode 100644
index 00000000..f6dbb5a7
--- /dev/null
+++ b/app/phone-ui/onboarding-devices-page.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/phone-ui/onboarding-devices-view-model.ts b/app/phone-ui/onboarding-devices-view-model.ts
new file mode 100644
index 00000000..40c7c38e
--- /dev/null
+++ b/app/phone-ui/onboarding-devices-view-model.ts
@@ -0,0 +1,124 @@
+import { EventData, Frame, Observable, View } from "@nativescript/core";
+
+import { glassesTypeSetting, type GlassesType } from "../ui/dashboard-settings";
+import { ownsRing, ownsWatch, setOwnsRing, setOwnsWatch, setPreviewOnlyMode } from "./onboarding-state";
+
+/** A row in the glasses list: a kind of glasses, or no glasses at all. */
+type GlassesChoice = GlassesType | "preview";
+
+const GLASSES_OPTIONS: { choice: GlassesChoice; label: string; description?: string }[] = [
+ { choice: "preview", label: "Preview Only", description: "No glasses: explore Faceclaw on your phone's screen" },
+ { choice: "g1", label: "Even G1" },
+ { choice: "g2", label: "Even G2" },
+ { choice: "rayneo-io", label: "RayNeo iO" },
+];
+
+/** RayNeo iO support isn't ready to offer in a release yet; set this to show its row again. */
+const OFFER_RAYNEO_IO = false;
+
+/** Why this choice can't be made on this phone, or "" when it can. */
+function unavailableReason(choice: GlassesChoice): string {
+ // FaceclawCommunicatorBridge refuses to start a session with one on iOS.
+ return choice === "rayneo-io" && global.isIOS ? "Not supported on iOS yet" : "";
+}
+
+export type GlassesOptionItem = {
+ choice: GlassesChoice;
+ label: string;
+ selectable: boolean;
+ note: string;
+ noteVisibility: "visible" | "collapse";
+ rowClass: string;
+ /** Hidden, not collapsed: the check is what sets a row's height, so collapsing it would shift the list on every selection. */
+ checkVisibility: "visible" | "hidden";
+ onRowTap: (args: EventData) => void;
+};
+
+/**
+ * The Your Devices onboarding page, between the splash and the disclaimer: one
+ * kind of glasses (or Preview Only) plus any accessories, which later setup
+ * pages tailor themselves to. Pairing still has the last word on the glasses,
+ * since it can tell what it heard.
+ *
+ * Nothing starts out selected, whatever an earlier run stored, and Next waits
+ * for a choice. A tap stores it straight away: Preview Only sets the persisted
+ * preview-only flag and leaves the glasses type alone, so the Permissions page
+ * finishes onboarding instead of moving on to the firmware step.
+ */
+export class OnboardingDevicesViewModel extends Observable {
+ /** This visit's choice; the page keeps this model when you come Back to it. */
+ private selected: GlassesChoice | null = null;
+
+ get glassesOptions(): GlassesOptionItem[] {
+ const selected = this.selected;
+ const options = OFFER_RAYNEO_IO ? GLASSES_OPTIONS : GLASSES_OPTIONS.filter(({ choice }) => choice !== "rayneo-io");
+ return options.map(({ choice, label, description }) => {
+ const reason = unavailableReason(choice);
+ const note = reason || description || "";
+ const isSelected = choice === selected;
+ return {
+ choice,
+ label,
+ selectable: !reason,
+ note,
+ noteVisibility: note ? "visible" : "collapse",
+ rowClass: isSelected ? "pairing-row pairing-row-selected" : reason ? "pairing-row pairing-row-incomplete" : "pairing-row",
+ checkVisibility: isSelected ? "visible" : "hidden",
+ onRowTap: this.onGlassesRowTap,
+ };
+ });
+ }
+
+ // Arrow property: NativeScript fires XML event handlers with `this` bound to
+ // the tapped view's bindingContext (the row item), not the view model.
+ readonly onGlassesRowTap = (args: EventData): void => {
+ const item = (args.object as View).bindingContext as GlassesOptionItem | undefined;
+ if (!item?.selectable) return;
+ this.selected = item.choice;
+ setPreviewOnlyMode(item.choice === "preview");
+ if (item.choice !== "preview") glassesTypeSetting.set(item.choice);
+ this.notifyPropertyChange("glassesOptions", this.glassesOptions);
+ this.notifyPropertyChange("nextEnabled", this.nextEnabled);
+ };
+
+ get nextEnabled(): boolean {
+ return this.selected !== null;
+ }
+
+ get hasRing(): boolean {
+ return ownsRing();
+ }
+
+ set hasRing(value: boolean) {
+ setOwnsRing(value);
+ }
+
+ get hasWatch(): boolean {
+ return ownsWatch();
+ }
+
+ set hasWatch(value: boolean) {
+ setOwnsWatch(value);
+ }
+
+ get watchLabel(): string {
+ return global.isIOS ? "Apple Watch" : "Wear OS watch";
+ }
+
+ onNextTap(): void {
+ if (!this.nextEnabled) return;
+ Frame.topmost()?.navigate({
+ moduleName: "phone-ui/onboarding-page",
+ context: { step: 2 },
+ });
+ }
+
+ onBackTap(): void {
+ const frame = Frame.topmost();
+ if (frame?.canGoBack()) {
+ frame.goBack();
+ return;
+ }
+ frame?.navigate({ moduleName: "phone-ui/onboarding-page", clearHistory: true });
+ }
+}
diff --git a/app/phone-ui/onboarding-firmware-check-view-model.ts b/app/phone-ui/onboarding-firmware-check-view-model.ts
index 2b4cda27..bba7cd8a 100644
--- a/app/phone-ui/onboarding-firmware-check-view-model.ts
+++ b/app/phone-ui/onboarding-firmware-check-view-model.ts
@@ -18,11 +18,29 @@ import {
type OnboardingFirmwareKind,
} from "../g2/firmware-compat";
import { DeviceInfoProbe, DeviceInfoState } from "../native/device-info-probe";
+import { G1Flasher } from "../native/g1-flasher";
+import { saveG1Pair } from "../g1/addresses";
+import { G1ArmScanner } from "../g1/arm-scanner";
+import { G1V0_IMAGE } from "../g1/firmware/g1v0-image";
+import {
+ G1_CASE_DELAY_HINT,
+ G1_CASE_INSTRUCTIONS,
+ G1_INSTALL_NOTICE,
+ g1FirmwareState,
+ g1StateFromAdvertising,
+ type G1FlashResult,
+ type G1Side,
+} from "../g1/flash-plan";
+import { loadPairedGlassesIdentity } from "../g2/device-addresses";
+import { glassesTypeSetting } from "../ui/dashboard-settings";
import { setOnboardingCompleted, setPreviewOnlyMode } from "./onboarding-state";
import { formatErrorMessage } from "../util/format-error";
type CheckPhase = "checking" | "fonts" | "custom" | "flashable" | "newer-validated" | "newer" | "error";
+const G1_LOCATE_MS = 30_000;
+const G1_CHECK_CONNECT_MS = 45_000;
+
export class OnboardingFirmwareCheckViewModel extends Observable {
private _phase: CheckPhase = "checking";
private _headline = "Checking Firmware";
@@ -31,7 +49,7 @@ export class OnboardingFirmwareCheckViewModel extends Observable {
private generation = 0;
- private probeInstance: DeviceInfoProbe | null = null;
+ private probeInstance: { close(): void } | null = null;
constructor() {
super();
@@ -175,6 +193,10 @@ export class OnboardingFirmwareCheckViewModel extends Observable {
try {
await ensureBlePermissions();
if (generation !== this.generation) return;
+ if (glassesTypeSetting.get() === "g1") {
+ await this.checkG1(generation);
+ return;
+ }
const stored = loadDeviceAddresses();
if (!isValidMacAddress(stored.right)) {
this.toError("No glasses address is configured. Go back and set the device addresses.");
@@ -194,11 +216,71 @@ export class OnboardingFirmwareCheckViewModel extends Observable {
this.applyClassification(kind, version, extension);
} catch (error) {
if (generation !== this.generation) return;
- this.probeInstance = null;
this.toError(this.formatError(error));
}
}
+ /**
+ * What the arms advertise first, as that needs no connection or pairing. Only firmware from before it advertised its
+ * version (0.5.66) has to be asked.
+ */
+ private async checkG1(generation: number): Promise {
+ this.status = "Listening for your glasses...";
+ const scanner = new G1ArmScanner();
+ this.probeInstance = { close: () => scanner.stop() };
+ const stored = loadDeviceAddresses();
+ const pair = await scanner.waitForPair({ serial: loadPairedGlassesIdentity()?.serial, left: stored.left, right: stored.right }, G1_LOCATE_MS);
+ if (generation !== this.generation) return;
+ this.probeInstance = null;
+ if (!pair) {
+ this.toError(`Couldn't hear both arms of your glasses. ${G1_CASE_INSTRUCTIONS} Make sure no other app or phone is connected to them, then retry.`);
+ return;
+ }
+ saveG1Pair(pair);
+ const advertised = g1StateFromAdvertising(pair, G1V0_IMAGE.version);
+ if (advertised) {
+ if (advertised.state === "current") this.applyClassification("custom", advertised.version, { kind: "none" });
+ else if (advertised.state === "stock") this.showG1Install({ firmware: "stock" });
+ else if (advertised.state === "safe-mode") this.showG1Install({ safeMode: true });
+ else this.showG1Install({ version: advertised.version });
+ return;
+ }
+ const arms: G1FlashResult[] = [];
+ for (const side of ["left", "right"] as G1Side[]) {
+ const flasher = new G1Flasher({ address: pair[side]!.address, side, firmwarePath: "", mode: "probe", connectWindowMs: G1_CHECK_CONNECT_MS });
+ this.probeInstance = flasher;
+ flasher.onState((state) => {
+ if (generation !== this.generation) return;
+ if (state === "pairing") {
+ this.status = `Pairing with the ${side} arm. If your phone asks, accept it. A G1 pairs only in its case, with the lid open. ${G1_CASE_DELAY_HINT}`;
+ } else {
+ this.status = `Checking the ${side} arm...`;
+ }
+ });
+ arms.push(await flasher.run());
+ if (generation !== this.generation) return;
+ this.disposeProbe();
+ }
+ const state = g1FirmwareState(arms, G1V0_IMAGE.version);
+ if (state === "current") this.applyClassification("custom", arms[0]!.version ?? "", { kind: "none" });
+ else this.showG1Install(state === "stock" ? { firmware: "stock" } : state === "safe-mode" ? { safeMode: true } : arms.find((arm) => arm.version) ?? {});
+ }
+
+ private showG1Install(found: G1FlashResult): void {
+ this.busy = false;
+ this.setPhase("flashable");
+ if (found.firmware === "stock") {
+ this.headline = "Ready to Install";
+ this.status = `Your glasses run Even's firmware.\n\n${G1_CASE_INSTRUCTIONS}\n\n${G1_INSTALL_NOTICE}`;
+ } else if (found.safeMode) {
+ this.headline = "Firmware Needs Reinstalling";
+ this.status = `An arm of your glasses is in safe mode: its firmware restarted repeatedly. Installing it again usually fixes this.\n\n${G1_CASE_INSTRUCTIONS}`;
+ } else {
+ this.headline = "Firmware Update Available";
+ this.status = `Your glasses run Faceclaw's firmware ${found.version ?? ""}, and this version of Faceclaw comes with ${G1V0_IMAGE.version}.\n\n${G1_CASE_INSTRUCTIONS}`;
+ }
+ }
+
private reportProbeState(state: DeviceInfoState, detail: string): void {
// The probe brings up the right lens, then the left, and pairs with each
// in turn (they are separate Bluetooth devices with separate bonds).
@@ -326,7 +408,7 @@ export class OnboardingFirmwareCheckViewModel extends Observable {
this.busy = false;
this.setPhase("custom");
this.headline = extractedFonts ? "Fonts Ready" : "Custom Firmware Detected";
- const details = [
+ const details = glassesTypeSetting.get() === "g1" ? [version].filter(Boolean) : [
extension.kind === "faceclaw" ? `revision ${extension.version}` : "",
version ? `based on stock ${version}` : "",
].filter(Boolean);
diff --git a/app/phone-ui/onboarding-flash-page.ts b/app/phone-ui/onboarding-flash-page.ts
index 225dde33..8fa28948 100644
--- a/app/phone-ui/onboarding-flash-page.ts
+++ b/app/phone-ui/onboarding-flash-page.ts
@@ -1,5 +1,7 @@
import { NavigatedData, Page } from "@nativescript/core";
+import { glassesTypeSetting } from "../ui/dashboard-settings";
+import { G1FlashViewModel } from "./g1-flash-view-model";
import { FlashMode, OnboardingFlashViewModel } from "./onboarding-flash-view-model";
export function navigatingTo(args: NavigatedData): void {
@@ -7,16 +9,17 @@ export function navigatingTo(args: NavigatedData): void {
if (!page.bindingContext) {
const context =
(args.context as { mode?: FlashMode; fromOnboarding?: boolean; autoStart?: boolean } | undefined) ?? undefined;
- page.bindingContext = new OnboardingFlashViewModel({
+ const options = {
mode: context?.mode ?? "install",
fromOnboarding: context?.fromOnboarding ?? true,
autoStart: context?.autoStart ?? false,
- });
+ };
+ page.bindingContext = glassesTypeSetting.get() === "g1" ? new G1FlashViewModel(options) : new OnboardingFlashViewModel(options);
}
}
export function navigatingFrom(args: NavigatedData): void {
const page = args.object as Page;
- (page.bindingContext as OnboardingFlashViewModel | undefined)?.dispose();
+ (page.bindingContext as OnboardingFlashViewModel | G1FlashViewModel | undefined)?.dispose();
page.bindingContext = null;
}
diff --git a/app/phone-ui/onboarding-register.ios.ts b/app/phone-ui/onboarding-register.ios.ts
index 501e317b..538030ac 100644
--- a/app/phone-ui/onboarding-register.ios.ts
+++ b/app/phone-ui/onboarding-register.ios.ts
@@ -2,6 +2,8 @@ require('@nativescript/core/bundle-entry-points');
// iOS reuses Android's NativeScript XML forms and view models.
global.registerModule('phone-ui/onboarding-page', () => require('./onboarding-page'));
global.registerModule('phone-ui/onboarding-page.xml', () => require('./onboarding-page.xml'));
+global.registerModule('phone-ui/onboarding-devices-page', () => require('./onboarding-devices-page'));
+global.registerModule('phone-ui/onboarding-devices-page.xml', () => require('./onboarding-devices-page.xml'));
global.registerModule('phone-ui/onboarding-unpair-page', () => require('./onboarding-unpair-page'));
global.registerModule('phone-ui/onboarding-unpair-page.xml', () => require('./onboarding-unpair-page.xml'));
global.registerModule('phone-ui/pairing-page', () => require('./pairing-page'));
diff --git a/app/phone-ui/onboarding-state.ts b/app/phone-ui/onboarding-state.ts
index 9f478373..9bac3347 100644
--- a/app/phone-ui/onboarding-state.ts
+++ b/app/phone-ui/onboarding-state.ts
@@ -1,7 +1,13 @@
import { ApplicationSettings } from "@nativescript/core";
+import { getBooleanSetting, setBooleanSetting } from "../native/settings-store";
+
const ONBOARDING_COMPLETE_KEY = "onboarding.complete";
const PREVIEW_ONLY_KEY = "onboarding.previewOnly";
+// The "onboarding." prefix keeps these on this phone in config transfers and
+// lets scripts/resetOnboarding.sh clear them.
+const OWNS_RING_KEY = "onboarding.ownsRing";
+const OWNS_WATCH_KEY = "onboarding.ownsWatch";
export function hasCompletedOnboarding(): boolean {
return ApplicationSettings.getBoolean(ONBOARDING_COMPLETE_KEY, false);
@@ -27,3 +33,24 @@ export function isPreviewOnlyMode(): boolean {
export function setPreviewOnlyMode(previewOnly: boolean): void {
ApplicationSettings.setBoolean(PREVIEW_ONLY_KEY, previewOnly);
}
+
+/**
+ * Accessories chosen on the Your Devices onboarding page, for tailoring the
+ * rest of setup. The glasses chosen there go in glassesTypeSetting instead.
+ */
+export function ownsRing(): boolean {
+ return getBooleanSetting(OWNS_RING_KEY, false);
+}
+
+export function setOwnsRing(owns: boolean): void {
+ setBooleanSetting(OWNS_RING_KEY, owns);
+}
+
+/** An Apple Watch on iOS, a Wear OS watch on Android. */
+export function ownsWatch(): boolean {
+ return getBooleanSetting(OWNS_WATCH_KEY, false);
+}
+
+export function setOwnsWatch(owns: boolean): void {
+ setBooleanSetting(OWNS_WATCH_KEY, owns);
+}
diff --git a/app/phone-ui/onboarding-unpair-page.xml b/app/phone-ui/onboarding-unpair-page.xml
index 99fed9b6..5e79aab3 100644
--- a/app/phone-ui/onboarding-unpair-page.xml
+++ b/app/phone-ui/onboarding-unpair-page.xml
@@ -4,10 +4,11 @@
diff --git a/app/phone-ui/onboarding-unpair-view-model.ts b/app/phone-ui/onboarding-unpair-view-model.ts
index 1762896e..5be12684 100644
--- a/app/phone-ui/onboarding-unpair-view-model.ts
+++ b/app/phone-ui/onboarding-unpair-view-model.ts
@@ -1,10 +1,28 @@
import { Frame, Observable, Screen } from "@nativescript/core";
import { openEvenAppSettings } from "../native/even-app-conflict";
+import { glassesTypeSetting } from "../ui/dashboard-settings";
+import { hasCompletedOnboarding } from "./onboarding-state";
export class OnboardingUnpairViewModel extends Observable {
+ /**
+ * Setting up a RayNeo iO, so the Even app doesn't apply. Only during first-run
+ * setup: "Pair glasses" in the main menu also opens this page, and you may be
+ * pairing something other than the glasses you paired before.
+ */
+ private readonly settingUpIo = !hasCompletedOnboarding() && glassesTypeSetting.get() === "rayneo-io";
+
+ get otherAppsInstructions(): string {
+ const apps = this.settingUpIo ? "another app" : "another app (such as Even Realities or MentraOS)";
+ return `Your glasses can only be connected to one app or phone at a time. If they're connected to ${apps} or another phone, disconnect them there before continuing. If nothing else is connected, you can continue.`;
+ }
+
+ get evenAppVisibility(): "visible" | "collapse" {
+ return this.settingUpIo ? "collapse" : "visible";
+ }
+
get settingsButtonVisibility(): "visible" | "collapse" {
- return global.isAndroid ? "visible" : "collapse";
+ return global.isAndroid && !this.settingUpIo ? "visible" : "collapse";
}
get evenAppInstructions(): string {
diff --git a/app/phone-ui/onboarding-view-model.ts b/app/phone-ui/onboarding-view-model.ts
index 897c2ffc..f348a1fe 100644
--- a/app/phone-ui/onboarding-view-model.ts
+++ b/app/phone-ui/onboarding-view-model.ts
@@ -1,9 +1,10 @@
-import { finishOnboardingNavigation } from "./onboarding-navigation";
import { Frame, Observable, Screen } from "@nativescript/core";
-import { IOS_PRIVACY_NOTICE } from "../analytics/privacy-disclosure";
+import { EVEN_G1_RESTORE } from "../g1/even-firmware";
+import { glassesTypeSetting, type GlassesType } from "../ui/dashboard-settings";
-import { setOnboardingCompleted, setPreviewOnlyMode } from "./onboarding-state";
+import { isPreviewOnlyMode } from "./onboarding-state";
+/** Steps are separate pages in the flow; the devices page follows the splash. */
type OnboardingStep = 1 | 2 | 3;
type StepContent = {
@@ -17,52 +18,84 @@ type StepContent = {
showSecondary: boolean;
};
-const STEP_CONTENT: Record = {
- 1: {
- headline: "Faceclaw",
- tagline: "Perching on the faces of giants",
- body: "",
- primaryLabel: "Next",
- secondaryLabel: "",
- splash: true,
- showSecondary: false,
- },
- 2: {
- headline: "Before You Continue",
- tagline: "",
- body: "This software provides a custom user interface and functionality for the Even Realities G2 smart glasses. It is not created or supported by Even Realities. If this software somehow breaks your headset, this is not Even's fault and is not covered by the hardware's warranty. If this software doesn't break you headset, using this software may void the hardware's warranty anyways, at the sole discretion of Even Realities. This software is beta; don't rely on it for anything critically important." +
- (global.isIOS ? "\n\niOS / TestFlight privacy\n\n" + IOS_PRIVACY_NOTICE : ""),
- primaryLabel: "Agree",
- secondaryLabel: "Back",
- splash: false,
- showSecondary: true,
- },
- 3: {
- headline: "Custom Firmware Required",
- tagline: "",
- body: "Faceclaw only runs on Even Realities G2 glasses that have Faceclaw's custom firmware installed. You have two choices:\n\n• Preview Only — explore Faceclaw's interface on your phone's screen without pairing any glasses. Nothing is written to a headset.\n\n• Flash Firmware — install the custom firmware on your glasses now, then use Faceclaw for real.\n\nFlashing replaces the official firmware. You can uninstall and return to the official firmware later, by reconnecting the official Even Realities app. Installing custom firmware is not covered by warranty.",
- primaryLabel: "Flash Firmware",
- secondaryLabel: "Preview Only",
- splash: false,
- showSecondary: true,
- },
+type Makers = { product: string; maker: string; makerPossessive: string };
+
+const GLASSES_MAKER: Record = {
+ g1: { product: "Even Realities G1", maker: "Even Realities", makerPossessive: "Even's" },
+ g2: { product: "Even Realities G2", maker: "Even Realities", makerPossessive: "Even's" },
+ "rayneo-io": { product: "RayNeo iO", maker: "RayNeo", makerPossessive: "RayNeo's" },
};
+/** Preview Only: no particular glasses yet, so the disclaimer covers every kind Faceclaw supports. */
+const ANY_GLASSES_MAKER: Makers = { product: "Even Realities G1 and G2 and RayNeo iO", maker: "Even Realities or RayNeo", makerPossessive: "their" };
+
+const WARRANTY_NOTE = "Installing custom firmware is not covered by warranty.";
+// Preview Only is chosen on Your Devices, which is three pages back from here.
+const PREVIEW_HINT = "Not ready? Go back to Your Devices and choose Preview Only to explore Faceclaw on your phone's screen instead.";
+
+function firmwareBody(glasses: GlassesType): string {
+ // Pairing skips the firmware pages for an iO: the app has no flasher for it.
+ if (glasses === "rayneo-io") {
+ return `Faceclaw only runs on a RayNeo iO that has Faceclaw's custom firmware installed. This app can't install it on an iO, so that has to be done separately before you pair your glasses. ${WARRANTY_NOTE}\n\n${PREVIEW_HINT}`;
+ }
+ const restore = glasses === "g1"
+ ? `You can return to the official firmware later from Faceclaw, as version ${EVEN_G1_RESTORE.version}.`
+ : "You can uninstall and return to the official firmware later, by reconnecting the official Even Realities app.";
+ return `Faceclaw only runs on ${GLASSES_MAKER[glasses].product} glasses that have Faceclaw's custom firmware installed. Next, Faceclaw will pair with your glasses, check their firmware, and install the custom firmware if it isn't there yet.\n\nFlashing replaces the official firmware. ${restore} ${WARRANTY_NOTE}\n\n${PREVIEW_HINT}`;
+}
+
+function stepContent(step: OnboardingStep, glasses: GlassesType, previewOnly: boolean): StepContent {
+ const { product, maker, makerPossessive } = previewOnly ? ANY_GLASSES_MAKER : GLASSES_MAKER[glasses];
+ switch (step) {
+ case 1:
+ return {
+ headline: "Faceclaw",
+ tagline: "Perching on the faces of giants",
+ body: "",
+ primaryLabel: "Next",
+ secondaryLabel: "",
+ splash: true,
+ showSecondary: false,
+ };
+ case 2:
+ return {
+ headline: "Before You Continue",
+ tagline: "",
+ body: `This software provides a custom user interface and functionality for the ${product} smart glasses. It is not created or supported by ${maker}. If this software somehow breaks your headset, this is not ${makerPossessive} fault and is not covered by the hardware's warranty. If this software doesn't break your headset, using this software may void the hardware's warranty anyways, at the sole discretion of ${maker}. This software is beta; don't rely on it for anything critically important.`,
+ primaryLabel: "Agree",
+ secondaryLabel: "Back",
+ splash: false,
+ showSecondary: true,
+ };
+ case 3:
+ return {
+ headline: "Custom Firmware Required",
+ tagline: "",
+ body: firmwareBody(glasses),
+ primaryLabel: glasses === "rayneo-io" ? "Pair Glasses" : "Flash Firmware",
+ secondaryLabel: "Back",
+ splash: false,
+ showSecondary: true,
+ };
+ }
+}
+
export class OnboardingViewModel extends Observable {
- private _step: OnboardingStep = 1;
+ private readonly step: OnboardingStep;
+ private readonly content: StepContent;
constructor(initialStep?: number) {
super();
- if (initialStep === 2 || initialStep === 3) this._step = initialStep;
- this.publish();
+ this.step = initialStep === 2 || initialStep === 3 ? initialStep : 1;
+ this.content = stepContent(this.step, glassesTypeSetting.get(), isPreviewOnlyMode());
}
onPrimaryTap(): void {
- if (this._step === 1) {
- this.setStep(2);
+ if (this.step === 1) {
+ Frame.topmost()?.navigate({ moduleName: "phone-ui/onboarding-devices-page" });
return;
}
- if (this._step === 2) {
+ if (this.step === 2) {
// The Permissions screen sits between the disclaimer and the firmware
// step; it navigates forward to a fresh onboarding page at step 3.
Frame.topmost()?.navigate({
@@ -93,49 +126,47 @@ export class OnboardingViewModel extends Observable {
});
}
+ /** Back, on the disclaimer and firmware steps. */
onSecondaryTap(): void {
- if (this._step === 2) {
- this.setStep(1);
+ const frame = Frame.topmost();
+ if (frame?.canGoBack()) {
+ frame.goBack();
return;
}
- if (this._step === 3) {
- // Step 3 secondary: skip flashing, use the on-phone preview only.
- setPreviewOnlyMode(true);
- setOnboardingCompleted(true);
- finishOnboardingNavigation();
- }
+ // The disconnect page's Back can open step 3 on a fresh history.
+ frame?.navigate({ moduleName: "phone-ui/onboarding-devices-page", clearHistory: true });
}
get headline(): string {
- return STEP_CONTENT[this._step].headline;
+ return this.content.headline;
}
get tagline(): string {
- return STEP_CONTENT[this._step].tagline;
+ return this.content.tagline;
}
get body(): string {
- return STEP_CONTENT[this._step].body;
+ return this.content.body;
}
get primaryLabel(): string {
- return STEP_CONTENT[this._step].primaryLabel;
+ return this.content.primaryLabel;
}
get secondaryLabel(): string {
- return STEP_CONTENT[this._step].secondaryLabel;
+ return this.content.secondaryLabel;
}
get showSecondary(): boolean {
- return STEP_CONTENT[this._step].showSecondary;
+ return this.content.showSecondary;
}
get splashVisibility(): "visible" | "collapse" {
- return STEP_CONTENT[this._step].splash ? "visible" : "collapse";
+ return this.content.splash ? "visible" : "collapse";
}
get contentVisibility(): "visible" | "collapse" {
- return STEP_CONTENT[this._step].splash ? "collapse" : "visible";
+ return this.content.splash ? "collapse" : "visible";
}
/**
@@ -153,25 +184,6 @@ export class OnboardingViewModel extends Observable {
/** License and privacy-policy links, shown only under the disclaimer step. */
get footerVisibility(): "visible" | "collapse" {
- return this._step === 2 ? "visible" : "collapse";
- }
-
- private setStep(step: OnboardingStep): void {
- if (this._step === step) return;
- this._step = step;
- this.publish();
- }
-
- private publish(): void {
- this.notifyPropertyChange("headline", this.headline);
- this.notifyPropertyChange("tagline", this.tagline);
- this.notifyPropertyChange("body", this.body);
- this.notifyPropertyChange("primaryLabel", this.primaryLabel);
- this.notifyPropertyChange("secondaryLabel", this.secondaryLabel);
- this.notifyPropertyChange("showSecondary", this.showSecondary);
- this.notifyPropertyChange("splashVisibility", this.splashVisibility);
- this.notifyPropertyChange("contentVisibility", this.contentVisibility);
- this.notifyPropertyChange("secondaryVisibility", this.secondaryVisibility);
- this.notifyPropertyChange("footerVisibility", this.footerVisibility);
+ return this.step === 2 ? "visible" : "collapse";
}
}
diff --git a/app/phone-ui/pairing-page.xml b/app/phone-ui/pairing-page.xml
index 60af9a44..b038f67f 100644
--- a/app/phone-ui/pairing-page.xml
+++ b/app/phone-ui/pairing-page.xml
@@ -45,29 +45,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/phone-ui/pairing-view-model.ts b/app/phone-ui/pairing-view-model.ts
index 3323a20a..d34046eb 100644
--- a/app/phone-ui/pairing-view-model.ts
+++ b/app/phone-ui/pairing-view-model.ts
@@ -10,13 +10,16 @@ import {
DiscoveryAggregator,
glassesRow,
nearestCandidateId,
+ rayneoRow,
ringRow,
type GlassesPairCandidate,
type PairingRowPresentation,
+ type RayNeoCandidate,
type RingCandidate,
} from "../g2/pairing-candidates";
+import { glassesTypeSetting, type GlassesType } from "../ui/dashboard-settings";
import { DeviceDiscoveryBridge } from "../native/device-discovery";
-import { setPreviewOnlyMode } from "./onboarding-state";
+import { hasCompletedOnboarding, ownsRing, setPreviewOnlyMode } from "./onboarding-state";
/** One Repeater row: the presentation plus the display-only fields the XML binds. */
export type PairingRowItem = PairingRowPresentation & {
@@ -42,6 +45,12 @@ export type PairingRowItem = PairingRowPresentation & {
const REFRESH_INTERVAL_MS = 500;
const NO_RESULTS_HINT_AFTER_MS = 10_000;
+const SETUP_GLASSES_NAME: Record = {
+ g1: "G1 glasses",
+ g2: "G2 glasses",
+ "rayneo-io": "RayNeo iO",
+};
+
/**
* Live pairing scan. Streams advertisements into a `DiscoveryAggregator`,
* re-renders the pair/ring lists at a calm cadence, and saves the chosen
@@ -65,12 +74,25 @@ export class PairingViewModel extends Observable {
private _ringRows: PairingRowItem[] = [];
private selectedPair: GlassesPairCandidate | null = null;
private selectedRing: RingCandidate | null = null;
+ /** A RayNeo iO instead of a G2 pair (the two are exclusive; either takes a ring). */
+ private selectedIo: RayNeoCandidate | null = null;
private readonly previouslyPairedSerial: string | null;
private readonly previouslyPairedRing: string;
+ /**
+ * The glasses chosen on the Your Devices page, during first-run setup. Null
+ * otherwise: the main menu's "Pair glasses" also comes here with onboarding
+ * set, to pair whatever you've got now, so it offers everything. Only the
+ * wording follows this; any glasses heard are still listed, so a wrong choice
+ * can't strand anyone.
+ */
+ private readonly setupGlasses: GlassesType | null;
+ private readonly showRings: boolean;
constructor(options?: { onboarding?: boolean }) {
super();
this.onboarding = options?.onboarding ?? false;
+ this.setupGlasses = this.onboarding && !hasCompletedOnboarding() ? glassesTypeSetting.get() : null;
+ this.showRings = !this.setupGlasses || ownsRing();
this.previouslyPairedSerial = loadPairedGlassesIdentity()?.serial ?? null;
this.previouslyPairedRing = loadDeviceAddresses().ring;
// A backgrounded phone (Home, screen lock, a call) must not keep the
@@ -180,10 +202,18 @@ export class PairingViewModel extends Observable {
}
get instructions(): string {
+ if (this.setupGlasses) {
+ const name = SETUP_GLASSES_NAME[this.setupGlasses];
+ const ready = this.setupGlasses === "g1"
+ ? "Put the glasses in their case with the lid open"
+ : "Wear the glasses or take them out of the case";
+ return `Select your ${name}${this.showRings ? " and your R1 ring" : ""} below. ${ready}, and keep them near your phone. ` +
+ "If they are not detected, make sure no other apps are connected.";
+ }
return (
- "Select your G2 glasses and R1 ring below. Wear the glasses or take them out of the case, " +
- "and keep the glasses and phone nearby. If your glasses are not detected, make sure no other " +
- "apps are connected."
+ "Select your G2 or G1 glasses or RayNeo iO, and your R1 ring if you have one, below. Wear the glasses or take them out of the case " +
+ "(a G1 pairs only in its case, with the lid open), and keep the glasses and phone nearby. If your glasses are not detected, " +
+ "make sure no other apps are connected."
);
}
@@ -235,11 +265,15 @@ export class PairingViewModel extends Observable {
const elapsed = Date.now() - this.startedAtMs;
if (elapsed < NO_RESULTS_HINT_AFTER_MS) return "Listening for glasses…";
return (
- "No glasses heard yet. Make sure they are out of the case and not connected to another app. " +
+ `No glasses heard yet. Make sure they are ${this.setupGlasses === "g1" ? "in their case with the lid open" : "out of the case"} and not connected to another app. ` +
"On Android 11 and older, Location must also be switched on for Bluetooth scanning to return results."
);
}
+ get ringSectionVisibility(): "visible" | "collapse" {
+ return this.showRings ? "visible" : "collapse";
+ }
+
get emptyRingVisibility(): "visible" | "collapse" {
return this._ringRows.length ? "collapse" : "visible";
}
@@ -249,14 +283,17 @@ export class PairingViewModel extends Observable {
}
get selectionVisibility(): "visible" | "collapse" {
- return this.selectedPair || this.selectedRing ? "visible" : "collapse";
+ return this.selectedPair || this.selectedRing || this.selectedIo ? "visible" : "collapse";
}
get selectionSummary(): string {
const parts: string[] = [];
+ if (this.selectedIo) {
+ parts.push(`RayNeo iO · ${this.selectedIo.advertisement.name} · ${this.selectedIo.advertisement.address}`);
+ }
if (this.selectedPair) {
const identity = this.selectedPair.identity;
- const label = identity ? identity.displayName : "Even Realities G2";
+ const label = identity ? identity.displayName : this.selectedPair.g1Firmware ? "Even Realities G1" : "Even Realities G2";
parts.push(
`${label} · serial ${this.selectedPair.serial ?? "unknown"}\n` +
`Left ${this.selectedPair.left?.address ?? "?"} · Right ${this.selectedPair.right?.address ?? "?"}`,
@@ -273,7 +310,7 @@ export class PairingViewModel extends Observable {
}
get primaryEnabled(): boolean {
- return !!this.selectedPair || (!this.onboarding && !!this.selectedRing);
+ return !!this.selectedPair || !!this.selectedIo || (!this.onboarding && !!this.selectedRing);
}
get secondaryLabel(): string {
@@ -287,7 +324,11 @@ export class PairingViewModel extends Observable {
readonly onRowTap = (args: EventData): void => {
const row = (args.object as View).bindingContext as PairingRowItem | undefined;
if (!row) return;
- if (row.kind === "glasses") {
+ if (row.kind === "rayneo-io") {
+ const io = this.aggregator.rayneos().find((candidate) => candidate.id === row.id) ?? null;
+ this.selectedIo = this.selectedIo?.id === io?.id ? null : io;
+ if (this.selectedIo) this.selectedPair = null;
+ } else if (row.kind === "glasses") {
const pair = this.aggregator.pairs().find((candidate) => candidate.id === row.id) ?? null;
if (!pair) return;
if (!row.canSelect) {
@@ -295,6 +336,7 @@ export class PairingViewModel extends Observable {
return;
}
this.selectedPair = this.selectedPair?.id === pair.id ? null : pair;
+ if (this.selectedPair) this.selectedIo = null;
} else {
const ring = this.aggregator.rings().find((candidate) => candidate.id === row.id) ?? null;
this.selectedRing = this.selectedRing?.id === ring?.id ? null : ring;
@@ -303,20 +345,49 @@ export class PairingViewModel extends Observable {
};
onPrimaryTap(): void {
+ const io = this.selectedIo;
const pair = this.selectedPair;
const ring = this.selectedRing;
+ const existing = loadDeviceAddresses();
+ // Glasses saved without a ring selected keep the ring paired before.
+ const ringAddress = ring?.advertisement.address ?? existing.ring;
+ const ringName = ring?.advertisement.name ??
+ (ringAddress === existing.ring ? (loadPairedGlassesIdentity()?.ringName ?? "") : "");
+ if (io) {
+ // One link: the same address stands for both arms. The iO can't relay a
+ // ring, so the session connects to it directly (Direct ring mode).
+ const address = io.advertisement.address;
+ saveDeviceAddresses({ right: address, left: address, ring: ringAddress });
+ glassesTypeSetting.set("rayneo-io");
+ savePairedGlassesIdentity({
+ serial: io.advertisement.embeddedMac ?? address,
+ leftName: io.advertisement.name,
+ rightName: io.advertisement.name,
+ leftAddress: address,
+ rightAddress: address,
+ ringName,
+ ringAddress,
+ pairedAtMs: Date.now(),
+ });
+ this.dispose();
+ if (this.onboarding) setPreviewOnlyMode(false);
+ // The G2 firmware check/flash pages don't apply; the session reports
+ // incompatible firmware if the iO lacks the Faceclaw build.
+ finishOnboardingNavigation();
+ return;
+ }
if (!pair && !ring) return;
// refresh() drops a selection whose pair regressed below complete, but the
// tap can race a prune: never fall back to previously stored addresses for
// a missing arm — that silently welds together arms of two different pairs.
if (pair && (!pair.left || !pair.right)) return;
- const existing = loadDeviceAddresses();
const addresses = {
right: pair ? pair.right!.address : existing.right,
left: pair ? pair.left!.address : existing.left,
- ring: ring?.advertisement.address ?? existing.ring,
+ ring: ringAddress,
};
saveDeviceAddresses(addresses);
+ if (pair) glassesTypeSetting.set(pair.g1Firmware ? "g1" : "g2");
if (pair) {
savePairedGlassesIdentity({
serial: pair.serial ?? "",
@@ -324,8 +395,8 @@ export class PairingViewModel extends Observable {
rightName: pair.right!.name,
leftAddress: pair.left!.address,
rightAddress: pair.right!.address,
- ringName: ring?.advertisement.name ?? (addresses.ring === existing.ring ? (loadPairedGlassesIdentity()?.ringName ?? "") : ""),
- ringAddress: addresses.ring,
+ ringName,
+ ringAddress,
pairedAtMs: Date.now(),
});
} else if (ring) {
@@ -341,9 +412,10 @@ export class PairingViewModel extends Observable {
}
}
this.dispose();
- if (this.onboarding) {
- setPreviewOnlyMode(false);
- // Continue the onboarding chain: check the glasses' firmware next.
+ if (this.onboarding) setPreviewOnlyMode(false);
+ // Onboarding checks the glasses' firmware next. So does choosing a G1 from anywhere: it may run Even's firmware,
+ // and whether it does is known without connecting.
+ if (this.onboarding || pair?.g1Firmware) {
Frame.topmost()?.navigate({ moduleName: "phone-ui/onboarding-firmware-check-page" });
return;
}
@@ -386,7 +458,11 @@ export class PairingViewModel extends Observable {
private refresh(): void {
this.aggregator.prune(Date.now(), DEFAULT_STALE_AFTER_MS);
const pairs = this.aggregator.pairs();
- const rings = this.aggregator.rings();
+ const rings = this.showRings ? this.aggregator.rings() : [];
+ const rayneos = this.aggregator.rayneos();
+ if (this.selectedIo) {
+ this.selectedIo = rayneos.find((candidate) => candidate.id === this.selectedIo!.id) ?? null;
+ }
// Keep the selection pointing at live data (addresses can only change if a
// side was replaced); drop it if the pair disappeared — or if it degraded
@@ -402,13 +478,24 @@ export class PairingViewModel extends Observable {
const nearestPair = nearestCandidateId(pairs);
const nearestRing = nearestCandidateId(rings);
- this._glassesRows = pairs.map((pair) =>
- toRowItem(
- glassesRow(pair, { pairedSerial: this.previouslyPairedSerial, nearestId: nearestPair }),
- this.selectedPair?.id === pair.id,
- this.onRowTap,
+ const pairedAddress = glassesTypeSetting.get() === "rayneo-io" ? loadDeviceAddresses().right : "";
+ const nearestIo = nearestCandidateId(rayneos);
+ this._glassesRows = [
+ ...rayneos.map((candidate) =>
+ toRowItem(
+ rayneoRow(candidate, { pairedAddress, nearestId: nearestIo }),
+ this.selectedIo?.id === candidate.id,
+ this.onRowTap,
+ ),
),
- );
+ ...pairs.map((pair) =>
+ toRowItem(
+ glassesRow(pair, { pairedSerial: this.previouslyPairedSerial, nearestId: nearestPair }),
+ this.selectedPair?.id === pair.id,
+ this.onRowTap,
+ ),
+ ),
+ ];
this._ringRows = rings.map((ring) =>
toRowItem(
ringRow(ring, { pairedRingAddress: this.previouslyPairedRing, nearestId: nearestRing }),
@@ -417,21 +504,12 @@ export class PairingViewModel extends Observable {
),
);
- const complete = pairs.filter((pair) => pair.completeness === "complete").length;
- const partial = pairs.length - complete;
if (this.scanFailure) {
this.status = `Scan failed: ${this.scanFailure}`;
} else if (!this._scanning) {
this.status = "Scan paused.";
- } else if (!pairs.length && !rings.length) {
- this.status = "Scanning…";
} else {
- const bits = [
- complete ? `${complete} ${complete === 1 ? "pair" : "pairs"} ready` : null,
- partial ? `${partial} with one arm heard` : null,
- rings.length ? `${rings.length} ${rings.length === 1 ? "ring" : "rings"}` : null,
- ].filter(Boolean);
- this.status = `Scanning… ${bits.join(" · ")}. Tap a pair to select it.`;
+ this.status = "Scanning…";
}
for (const property of [
@@ -466,7 +544,7 @@ function toRowItem(row: PairingRowPresentation, selected: boolean, onRowTap: (ar
colorwayLabel: colorwayLabel(row.colorway),
badgeVisibility: row.badge ? "visible" : "collapse",
variantVisibility: row.variantSummary ? "visible" : "collapse",
- proximityLine: `${row.proximityGlyph} ${row.proximitySummary}`,
+ proximityLine: row.proximityGlyph,
proximityClass: row.zone === "immediate" ? "pairing-proximity pairing-proximity-immediate" : "pairing-proximity",
armsVisibility: row.armsSummary ? "visible" : "collapse",
warningVisibility: row.warning ? "visible" : "collapse",
diff --git a/app/phone-ui/pairing.css b/app/phone-ui/pairing.css
index 2ea8ddb9..2fb5ea91 100644
--- a/app/phone-ui/pairing.css
+++ b/app/phone-ui/pairing.css
@@ -236,3 +236,10 @@ Button.permissions-primary-dimmed {
.ns-dark .permissions-check {
color: #7bc47f;
}
+
+/* Onboarding splash (phone-ui/onboarding-page). The logo art is
+ * black-on-transparent; tint it white in dark mode so it doesn't vanish into
+ * the dark page background. */
+.ns-dark .onboarding-logo {
+ tint-color: #ffffff;
+}
diff --git a/app/phone-ui/permissions-view-model.ts b/app/phone-ui/permissions-view-model.ts
index 51e40986..f5fcde4e 100644
--- a/app/phone-ui/permissions-view-model.ts
+++ b/app/phone-ui/permissions-view-model.ts
@@ -16,6 +16,8 @@ import { isIgnoringBatteryOptimizations, requestIgnoreBatteryOptimizations } fro
import { hasAllFilesAccess, requestAllFilesAccess } from "../native/file-access";
import { isNotificationListenerEnabled, requestNotificationListenerAccess } from "../native/notification-access";
import { mediaControllerBridge } from "../native/media-controller";
+import { finishOnboardingNavigation } from "./onboarding-navigation";
+import { isPreviewOnlyMode, setOnboardingCompleted } from "./onboarding-state";
type PermissionDefinition = {
id: string;
@@ -105,7 +107,7 @@ const ANDROID_PERMISSIONS: PermissionDefinition[] = [
const PERMISSIONS: PermissionDefinition[] = global.isIOS ? [{
id: "nearby-devices", title: "Nearby Devices",
description: "Needed to communicate with your smart glasses over Bluetooth.", optional: false,
- isGranted: () => iosBluetooth().state === 5,
+ isGranted: () => iosBluetooth().isAuthorized(),
request: () => iosBluetooth().ensureReady(),
}, {
id: "calendar", title: "Calendar",
@@ -141,6 +143,7 @@ export class PermissionsViewModel extends Observable {
private readonly onboarding: boolean;
private _cards: PermissionCardItem[] = [];
private requesting = false;
+ private stopWatchingBluetooth: (() => void) | null = null;
constructor(options?: { onboarding?: boolean }) {
super();
@@ -157,11 +160,20 @@ export class PermissionsViewModel extends Observable {
onPageLoaded(): void {
Application.on(Application.resumeEvent, this.onAppResume);
+ // The answer to the Bluetooth prompt can arrive after request() has stopped
+ // waiting for it, and with no resume to re-check on.
+ if (global.isIOS) {
+ this.stopWatchingBluetooth = iosBluetooth().onEvent((event) => {
+ if (event.kind === "state") this.refresh();
+ });
+ }
this.refresh();
}
onPageUnloaded(): void {
Application.off(Application.resumeEvent, this.onAppResume);
+ this.stopWatchingBluetooth?.();
+ this.stopWatchingBluetooth = null;
}
// --- observable properties -------------------------------------------------
@@ -175,7 +187,7 @@ export class PermissionsViewModel extends Observable {
}
get instructions(): string {
- if (global.isIOS) return "Faceclaw uses Bluetooth to communicate with your smart glasses. Calendar and Apple Music access are optional. Tap a card to allow access; a checkmark means it is ready.";
+ if (global.isIOS) return "Faceclaw uses Bluetooth to communicate with your smart glasses. Calendar and Apple Music access are optional. Tap a card to allow access; a checkmark means access is allowed.";
return this.onboarding
? `Faceclaw uses these ${global.isIOS ? "iOS" : "Android"} permissions. Tap a card to grant one; a checkmark means it is already granted. ` +
"Optional permissions can also be granted later, from the Permissions item in the main-screen menu."
@@ -228,6 +240,13 @@ export class PermissionsViewModel extends Observable {
});
if (!proceed) return;
}
+ if (isPreviewOnlyMode()) {
+ // Preview Only was chosen on Your Devices: with no glasses to set up,
+ // this is the last page.
+ setOnboardingCompleted(true);
+ finishOnboardingNavigation();
+ return;
+ }
// Continue the onboarding chain at the Custom Firmware Required step.
Frame.topmost()?.navigate({
moduleName: "phone-ui/onboarding-page",
diff --git a/app/phone-ui/remote-controls.css b/app/phone-ui/remote-controls.css
index 474e61c5..d096bb6d 100644
--- a/app/phone-ui/remote-controls.css
+++ b/app/phone-ui/remote-controls.css
@@ -116,7 +116,7 @@
color: #6a6a6a;
margin-top: 4;
}
-/* The charging case's level under "Charging · G2 n%". */
+/* The charging case's level under "Charging: G2 n%". */
.pad-detail {
font-size: 15;
color: #b0b0b0;
diff --git a/app/ui/dashboard-settings.ts b/app/ui/dashboard-settings.ts
index 6bed4672..fdf914e0 100644
--- a/app/ui/dashboard-settings.ts
+++ b/app/ui/dashboard-settings.ts
@@ -1,6 +1,6 @@
import { normalizeNightscoutThreshold, type NightscoutThresholds } from "../apps/nightscout/nightscout-alerts";
import { GESTURE_DOUBLE_CLICK, InputEvent } from "./gestures";
-import { DEFAULT_BRIGHTNESS_CURVE, normalizeBrightnessCurve, brightnessCurveError } from "../g2/brightness-curve";
+import { DEFAULT_BRIGHTNESS_CURVE, G1_BRIGHTNESS_CURVE, RAYNEO_IO_BRIGHTNESS_CURVE, normalizeBrightnessCurve, brightnessCurveError } from "../g2/brightness-curve";
import {
getBooleanSetting,
getStringSetting,
@@ -17,6 +17,7 @@ import {
type AssistantModel,
} from "~/assistant/models";
import { isLocalModelReady } from "../native/local-llm";
+import { shouldShowNotificationOnGlasses } from "../native/notification-sources";
import { normalizeWhisperServerUrl } from "../native/whisper-server-stt";
import { normalizeOpenAiCompatibleUrl } from "../native/openai-chat";
import { isValidSpotifyClientId, SPOTIFY_CLIENT_ID_KEY } from "../native/spotify-auth";
@@ -40,6 +41,8 @@ export type TimeFormat = "24h" | "12h";
export type TemperatureUnit = "fahrenheit" | "celsius";
export type DistanceUnit = "miles" | "kilometers";
export type ScreenTimeoutSetting = "15s" | "30s" | "1m" | "3m" | "never";
+/** Whether new phone notifications pop up on the glasses, and for how long without interaction. */
+export type NewNotificationDisplay = "off" | "until-dismissed" | "5s" | "15s" | "1m";
// Auto runs Faceclaw's light curve. Numeric values use the calibrated firmware
// scale, clamped to 2–100; 2 is also the endpoint for screen fades.
export const BRIGHTNESS_VALUES = ["auto", "2", "10", "20", "30", "40", "50", "60", "70", "80", "90", "100"] as const;
@@ -153,31 +156,40 @@ type ConfigSettingEnumOptions = Confi
normalize?: (value: string | null | undefined) => TValue;
/** Dynamic availability check used by enum picker rows. */
isDisabled?: (value: TValue) => boolean;
+ /** The default while nothing is stored, when it depends on context (else `defaultValue`). */
+ dynamicDefault?: () => TValue | undefined;
};
export class ConfigSettingEnum extends ConfigSetting {
readonly values: readonly TValue[];
private readonly normalizer: (value: string | null | undefined) => TValue;
private readonly disabledPredicate: (value: TValue) => boolean;
+ private readonly dynamicDefault: (() => TValue | undefined) | undefined;
constructor(options: ConfigSettingEnumOptions) {
super(options);
+ this.dynamicDefault = options.dynamicDefault;
if (options.reportInAnalytics !== false) fixedChoiceSettings.set(options.storageKey, this);
this.values = options.values;
this.disabledPredicate = options.isDisabled ?? (() => false);
if (options.normalize) {
this.normalizer = (value: string | null | undefined) => {
const normalized = options.normalize(value) as TValue|undefined;
- if (normalized === undefined) return this.defaultValue;
+ if (normalized === undefined) return this.currentDefault();
return normalized;
}
} else {
- this.normalizer = (value) => this.values.includes(value as TValue) ? value as TValue : this.defaultValue;
+ this.normalizer = (value) => this.values.includes(value as TValue) ? value as TValue : this.currentDefault();
}
}
+ /** What an unset (or invalid) value reads as now. */
+ protected currentDefault(): TValue {
+ return this.dynamicDefault?.() ?? this.defaultValue;
+ }
+
get(): TValue {
- return this.normalizer(getStringSetting(this.storageKey, this.defaultValue));
+ return this.normalizer(getStringSetting(this.storageKey, this.currentDefault()));
}
set(value: TValue): TValue {
@@ -206,6 +218,8 @@ type ConfigSettingStringOptions = ConfigSettingOptions string;
validate?: (value: string) => string | null;
+ /** The default while nothing is stored, when it depends on context (else `defaultValue`). */
+ dynamicDefault?: () => string | undefined;
};
// Every string setting by id, so isolates that can only pass an id over a
@@ -223,6 +237,7 @@ export class ConfigSettingString extends ConfigSett
readonly inputKind: "text" | "email" | "password";
private readonly normalizer: (value: string | null | undefined) => string;
private readonly validator?: (value: string) => string | null;
+ private readonly dynamicDefault: (() => string | undefined) | undefined;
constructor(options: ConfigSettingStringOptions) {
super(options);
@@ -231,11 +246,16 @@ export class ConfigSettingString extends ConfigSett
this.inputKind = options.inputKind ?? "text";
this.normalizer = options.normalize ?? ((value) => value ?? "");
this.validator = options.validate;
+ this.dynamicDefault = options.dynamicDefault;
stringSettingsById.set(this.id, this);
}
+ private currentDefault(): string {
+ return this.dynamicDefault?.() ?? this.defaultValue;
+ }
+
get(): string {
- return this.normalizer(getStringSetting(this.storageKey, this.defaultValue));
+ return this.normalizer(getStringSetting(this.storageKey, this.currentDefault()));
}
set(value: string): string {
@@ -254,8 +274,8 @@ export class ConfigSettingString extends ConfigSett
getValidValue(): string {
const value = this.get();
if (!this.validationError(value)) return value;
- const saved = this.normalizer(getStringSetting(this.storageKey + ".valid", this.defaultValue));
- return this.validationError(saved) ? this.defaultValue : saved;
+ const saved = this.normalizer(getStringSetting(this.storageKey + ".valid", this.currentDefault()));
+ return this.validationError(saved) ? this.currentDefault() : saved;
}
}
@@ -293,7 +313,7 @@ export const phoneBatteryVisibilitySetting = batteryVisibilitySetting(
"phoneBatteryVisibility", "Phone", "display.battery.phoneVisibility",
);
export const glassesBatteryVisibilitySetting = batteryVisibilitySetting(
- "glassesBatteryVisibility", "G2", "display.battery.glassesVisibility",
+ "glassesBatteryVisibility", "Glasses", "display.battery.glassesVisibility",
);
export const ringBatteryVisibilitySetting = batteryVisibilitySetting(
"ringBatteryVisibility", "R1", "display.battery.ringVisibility",
@@ -367,6 +387,34 @@ export const distanceUnitSetting = new ConfigSettingEnum({
*/
export type AppSwitcherPosition = "left" | "right" | "bottom" | "popup";
+/** Which glasses the saved addresses belong to (set by pairing; see g2/device-addresses.ts). */
+export type GlassesType = "g2" | "rayneo-io" | "g1";
+
+export const glassesTypeSetting = new ConfigSettingEnum({
+ id: "glasses-type",
+ label: "Glasses",
+ storageKey: "deviceType", // graphics/screen-size.ts GLASSES_TYPE_KEY reads it directly
+ defaultValue: "g2",
+ values: ["g2", "rayneo-io", "g1"],
+ reportInAnalytics: false,
+});
+
+/**
+ * Whether the paired glasses can report a heading. A G1 has an accelerometer
+ * and a gyroscope but no magnetometer; the RayNeo iO's firmware has no compass
+ * messages.
+ */
+export function glassesHaveCompass(): boolean {
+ return glassesTypeSetting.get() === "g2";
+}
+
+const GLASSES_MODEL_NAMES: Record = { g2: "G2", g1: "G1", "rayneo-io": "iO" };
+
+/** The paired glasses' model without the brand, short enough for battery labels and a watch's one-line charging status. */
+export function glassesModelName(): string {
+ return GLASSES_MODEL_NAMES[glassesTypeSetting.get()];
+}
+
const APP_SWITCHER_POSITION_LABELS: Record = {
left: "Left",
right: "Right",
@@ -380,6 +428,8 @@ export const appSwitcherPositionSetting = new ConfigSettingEnum (glassesTypeSetting.get() === "rayneo-io" ? "left" : undefined),
formatValue: (value) => APP_SWITCHER_POSITION_LABELS[value] ?? value,
description:
"Where the open-app icons go. Left and right take a column beside windows; bottom puts a row beneath the window, which makes full-height windows a little shorter; popup shows them only while you're in the app switcher, in a box over the dimmed window. Bottom and popup leave room at the sides to set the display's depth. Open apps reopen at their new size when a change resizes windows.",
@@ -569,6 +619,10 @@ export const autoBrightnessMaxSetting = new ConfigSettingEnum({
export const autoBrightnessCurveSetting = new ConfigSettingString({
id: "autoBrightnessCurve", label: "Auto light curve", storageKey: "display.autoBrightnessCurve",
defaultValue: DEFAULT_BRIGHTNESS_CURVE, normalize: normalizeBrightnessCurve, validate: brightnessCurveError,
+ dynamicDefault: () => {
+ const glasses = glassesTypeSetting.get();
+ return glasses === "rayneo-io" ? RAYNEO_IO_BRIGHTNESS_CURVE : glasses === "g1" ? G1_BRIGHTNESS_CURVE : undefined;
+ },
description: "2–16 lux:percent pairs, separated by commas. Percent is within your minimum–maximum range. Start at 0:0, end at 100%, and increase lux without decreasing percent. Incomplete edits stay in the preview; brightness keeps using the last valid curve.",
});
/** The screen on/off fade at Normal speed. */
@@ -619,6 +673,23 @@ export const screenTimeoutSetting = new ConfigSettingEnum(
description: "How long the display stays on after the last input before turning itself off. \"Never\" keeps it on until turned off manually.",
});
+export const newNotificationDisplaySetting = new ConfigSettingEnum({
+ id: "new-notification-display",
+ label: "Display new notifications",
+ storageKey: "notifications.newNotificationDisplay",
+ defaultValue: "15s",
+ values: ["off", "until-dismissed", "5s", "15s", "1m"],
+ formatValue: newNotificationDisplayLabel,
+ description:
+ "Pop up new phone notifications on the glasses. A timed popup closes once left untouched that long; " +
+ "the notification stays on the phone and in the status bar.",
+});
+
+/** Whether a newly posted phone notification from this app pops up on the glasses (the global setting, then the app's filter toggle). */
+export function shouldPopUpNewNotification(packageName: string): boolean {
+ return newNotificationDisplaySetting.get() !== "off" && shouldShowNotificationOnGlasses(packageName);
+}
+
export const lockScreenEnabledSetting = new ConfigSettingBoolean({
id: "lock-screen-enabled",
label: "Enable lock screen",
@@ -872,9 +943,18 @@ export const ringConnectionModeSetting = new ConfigSettingEnum
value === "direct" ? "Direct to phone" : value === "health" ? "Via glasses + health sync" : "Only via glasses",
description:
- "How the R1 ring reaches the phone. Only via glasses: the glasses relay the ring's gestures and the phone never connects to it. Via glasses + health sync: the same, plus the phone connects to the ring to sync health data. Direct to phone (experimental): the phone takes the ring over from the glasses and gets its gestures and battery itself; the glasses lose ring input. Health still syncs, but each sync (on opening Health, and at :01 and :31) pauses ring gestures for up to a minute while the phone briefly reconnects to the ring in its health role. Leaving Direct hands the ring back to the glasses. Takes effect on the next connection to the glasses.",
+ "How the R1 ring reaches the phone. Only via glasses: the glasses relay the ring's gestures and the phone never connects to it. Via glasses + health sync: the same, plus the phone connects to the ring to sync health data. Direct to phone (experimental): the phone takes the ring over from the glasses and gets its gestures and battery itself; the glasses lose ring input. Health still syncs, but each sync (on opening Health, and at :01 and :31) pauses ring gestures for up to a minute while the phone briefly reconnects to the ring in its health role. Leaving Direct hands the ring back to the glasses. A RayNeo iO has no ring link of its own, so with one the phone always connects to the ring directly. Takes effect on the next connection to the glasses.",
});
+/**
+ * The ring connection in effect: the setting with G2 glasses; Direct with a
+ * RayNeo iO or Even G1, which cannot relay a ring, so the phone holds the ring's
+ * glasses role itself (gestures, battery; health in brief phone-role windows).
+ */
+export function effectiveRingConnectionMode(): RingConnectionMode {
+ return glassesTypeSetting.get() !== "g2" ? "direct" : ringConnectionModeSetting.get();
+}
+
// "whisper" (no "onboard-" prefix) is OpenAI's CLOUD realtime model
// (gpt-realtime-whisper); "onboard-whisper" is the on-device sherpa-onnx
// Whisper backend. Same underlying model family, two different places it
@@ -1518,6 +1598,34 @@ export function screenTimeoutSettingToMs(value: ScreenTimeoutSetting): number |
}
}
+/** How long an untouched new-notification popup stays up; null keeps it until dismissed (and for "off", which never opens one). */
+export function newNotificationDisplayTimeoutMs(value: NewNotificationDisplay): number | null {
+ switch (value) {
+ case "5s":
+ return 5_000;
+ case "15s":
+ return 15_000;
+ case "1m":
+ return 60_000;
+ case "off":
+ case "until-dismissed":
+ return null;
+ }
+}
+
+export function newNotificationDisplayLabel(value: NewNotificationDisplay): string {
+ switch (value) {
+ case "off":
+ return "Off";
+ case "until-dismissed":
+ return "Until dismissed";
+ case "1m":
+ return "1min";
+ default:
+ return value;
+ }
+}
+
export function brightnessLabel(value: BrightnessSetting): string {
return value === "auto" ? "Auto" : value;
}
@@ -1680,11 +1788,17 @@ export class EditTextSettingLayer implements Layer {
for (let index = 0; index < message.length; index++) {
image.drawText(font, 22, messageTop + index * step, message[index]!, 200);
}
- image.drawText(font, 22, messageTop + (message.length + 2) * step, truncateSetting(this.setting.get(), 52), 220);
+ const valueY = messageTop + (message.length + 2) * step;
+ image.drawText(font, 22, valueY, truncateSetting(this.setting.get(), 52), 220);
const error = this.setting.validationError();
- if (error) wrapText(font, error, width - 48).forEach((line, index) =>
+ const errorLines = error ? wrapText(font, error, width - 48) : [];
+ errorLines.forEach((line, index) =>
image.drawText(font, 22, messageTop + (message.length + 4 + index) * step, line, 180));
- image.drawText(font, 22, height - 24 - font.lineHeight, `${GESTURE_DOUBLE_CLICK} back`, 110);
+ // The back hint at the bottom, unless a short window (the RayNeo iO's)
+ // leaves it no room under the value and error.
+ const contentBottom = errorLines.length ? messageTop + (message.length + 4 + errorLines.length) * step : valueY + step;
+ const hintY = height - 24 - font.lineHeight;
+ if (hintY >= contentBottom) image.drawText(font, 22, hintY, `${GESTURE_DOUBLE_CLICK} back`, 110);
return image;
}
diff --git a/app/ui/dashboard/settings-menus.ts b/app/ui/dashboard/settings-menus.ts
index f974bb8f..d57f3cfb 100644
--- a/app/ui/dashboard/settings-menus.ts
+++ b/app/ui/dashboard/settings-menus.ts
@@ -23,7 +23,6 @@ import {
type AsrModelId,
} from "../../native/asr-model";
import { TextViewerLayer } from "../../apps/files/text-viewer";
-import { IOS_PRIVACY_NOTICE } from "../../analytics/privacy-disclosure";
import type { LayerContext } from "../layers";
import { drawRightValueMenuItem, openModalMenu, submenuItem, type MenuItem } from "../menu";
import { shell } from "../shell/shell";
@@ -55,6 +54,7 @@ import {
dataCollectionSetting,
distanceUnitSetting,
glassesBatteryVisibilitySetting,
+ glassesModelName,
phoneBatteryVisibilitySetting,
ringBatteryVisibilitySetting,
watchBatteryVisibilitySetting,
@@ -67,6 +67,7 @@ import {
previewScalingSetting,
phoneRotationSetting,
ringConnectionModeSetting,
+ glassesTypeSetting,
sonioxApiKeySetting,
saveTranscribeAudioSetting,
whisperServerApiKeySetting,
@@ -78,6 +79,7 @@ import {
firmwareDebugFlagsSetting,
lockScreenEnabledSetting,
menuAnimationSetting,
+ newNotificationDisplaySetting,
saveVoiceRecordingsSetting,
showBleBandwidthSetting,
suspendEvenHubWhenScreenOffSetting,
@@ -100,9 +102,13 @@ import {
import { wearBridge } from "../../native/wear-bridge";
import { openSettingsSubMenu, SettingsPanelLayer, type SettingsSection } from "./settings-panel";
import { uiFontPickerMenuItem } from "../font-picker";
+import { NotificationFilterLayer } from "../notification-filter";
import { compatibleModelDiscoveryMenuItem } from "../openai-compatible-model-picker";
import { isVeniceApiBaseUrl } from "../../native/openai-chat";
+/** The Settings section the Notifications app's "Settings" menu item opens. */
+export const NOTIFICATIONS_SETTINGS_SECTION = "Notifications";
+
/** The Settings app's master-detail panel (sections on the left, contents on the right). */
export function createSettingsPanelLayer(): SettingsPanelLayer {
return new SettingsPanelLayer(settingsSections());
@@ -138,6 +144,14 @@ function settingsSections(): SettingsSection[] {
return customizationItems();
},
},
+ {
+ // Also opened from the Notifications app's menu (deep link by label).
+ label: NOTIFICATIONS_SETTINGS_SECTION,
+ items: [
+ enumSettingMenuItem(newNotificationDisplaySetting),
+ notificationFilterMenuItem(),
+ ],
+ },
{
label: "Voice",
items: [
@@ -231,7 +245,7 @@ function settingsSections(): SettingsSection[] {
items: [
// Whether and how the phone opens its own BLE link to the R1 ring.
// Applied at connect time.
- enumSettingMenuItem(ringConnectionModeSetting),
+ ringConnectionMenuItem(),
toggleSettingMenuItem(saveVoiceRecordingsSetting),
toggleSettingMenuItem(firmwareDebugFlagsSetting),
toggleSettingMenuItem(suspendEvenHubWhenScreenOffSetting),
@@ -244,11 +258,6 @@ function settingsSections(): SettingsSection[] {
items: [
// First chosen in the on-glasses onboarding (app/apps/onboarding/).
enumSettingMenuItem(dataCollectionSetting),
- ...(global.isIOS ? [{
- label: "iOS / TestFlight privacy",
- description: "Apple's beta reports are separate from Faceclaw statistics. Tap to read.",
- onSelect: (ctx: LayerContext) => ctx.stack.push(new TextViewerLayer(IOS_PRIVACY_NOTICE, "iOS / TestFlight privacy")),
- }] : []),
bundledDocMenuItem("PRIVACY", "Privacy policy"),
],
},
@@ -339,6 +348,17 @@ function customizationRows(): () => MenuItem[] {
};
}
+/** Notifications > Notification filter: per-app toggles for which notifications pop up. */
+function notificationFilterMenuItem(): MenuItem {
+ return submenuItem(
+ "Notification filter",
+ (ctx) => {
+ ctx.stack.push(new NotificationFilterLayer());
+ },
+ { description: "Choose which apps' new notifications pop up on the glasses. All of them still appear in the Notifications app." },
+ );
+}
+
function autoBrightnessMenuItem(): MenuItem {
return submenuItem(
"Auto-brightness",
@@ -368,7 +388,8 @@ function batteryIndicatorsMenuItem(): MenuItem {
enumSettingMenuItem(batteryDisplayModeSetting),
enumSettingMenuItem(phoneBatteryVisibilitySetting),
enumSettingMenuItem(watchBatteryVisibilitySetting),
- enumSettingMenuItem(glassesBatteryVisibilitySetting),
+ // Named as the top bar names this indicator.
+ enumSettingMenuItem(glassesBatteryVisibilitySetting, { label: glassesModelName() }),
enumSettingMenuItem(ringBatteryVisibilitySetting),
]);
},
@@ -600,6 +621,24 @@ function readBundledDoc(fileName: string): string {
}
}
+/**
+ * Developer > Ring connection: the setting, except with a RayNeo iO, which
+ * always takes the ring directly (effectiveRingConnectionMode): then a fixed,
+ * disabled "Direct" row, the stored choice kept for G2 glasses.
+ */
+function ringConnectionMenuItem(): MenuItem {
+ const item = enumSettingMenuItem(ringConnectionModeSetting);
+ const io = () => glassesTypeSetting.get() !== "g2";
+ return {
+ ...item,
+ disabled: io,
+ render: (args) => {
+ if (!io()) return item.render?.(args);
+ drawRightValueMenuItem(args.image, getDefaultSmallFont(), args.x, args.y, args.width, item.label, glassesTypeSetting.get() === "g1" ? "Direct (Even G1)" : "Direct (RayNeo iO)");
+ },
+ };
+}
+
function renderWatchStatus(args: { image: GrayImage; x: number; y: number; width: number }): number {
const { image, x, y, width } = args;
const font = getDefaultSmallFont();
diff --git a/app/ui/dashboard/settings-panel.ts b/app/ui/dashboard/settings-panel.ts
index 687c3f97..1e0bcf40 100644
--- a/app/ui/dashboard/settings-panel.ts
+++ b/app/ui/dashboard/settings-panel.ts
@@ -36,6 +36,8 @@ const ROW_GAP = 2;
/** Horizontal inset of row text (and custom row content) from its selection box. */
const ROW_TEXT_X = 10;
const MAX_DESCRIPTION_LINES = 3;
+/** Rows a section's list keeps beside its detail while focus is in it (see detailCrowdsList). */
+const MIN_LIST_ROWS = 3;
// A throwaway menu to satisfy MenuItem.onSelect's second parameter; the
// settings items never use it (they act via ctx only).
const NO_MENU = new MenuLayer(null, []);
@@ -134,7 +136,7 @@ export class SettingsPanelLayer implements Layer {
const rightX = divX + 14;
const rightW = width - rightX - PAD;
let rightTop = top;
- if (section.renderDetail) {
+ if (section.renderDetail && !this.detailCrowdsList(section, ctx, font, { x: rightX, y: top, width: rightW, height: listBottom - top })) {
const used = section.renderDetail({ image, x: rightX, y: top, width: rightW, height: listBottom - top, ctx });
rightTop = typeof used === "number" ? Math.min(top + used, listBottom) : listBottom;
}
@@ -157,6 +159,28 @@ export class SettingsPanelLayer implements Layer {
return image;
}
+ /**
+ * Whether the section's detail (About's blurb, the watch status) would
+ * leave its rows less than MIN_LIST_ROWS while focus is in them, as on a
+ * short screen (the RayNeo iO's): the list then takes the whole pane, the
+ * detail staying in the preview. Measured by drawing the detail on a
+ * scratch image.
+ */
+ private detailCrowdsList(
+ section: SettingsSection,
+ ctx: LayerContext,
+ font: UiFont,
+ pane: { x: number; y: number; width: number; height: number },
+ ): boolean {
+ if (this.focus !== "right" || !section.items.length || !section.renderDetail) return false;
+ const scratch = new GrayImage(pane.x + pane.width, pane.y + pane.height, 0);
+ const used = section.renderDetail({ image: scratch, ...pane, ctx });
+ if (typeof used !== "number") return false;
+ const rows = Math.min(MIN_LIST_ROWS, section.items.length);
+ const room = pane.height - used - this.descriptionHeight(font, pane.width);
+ return room < rows * (listRowHeight(font) + ROW_GAP);
+ }
+
/** The selected item's wrapped help text, or [] when none applies. */
private descriptionLines(font: UiFont, rightW: number): string[] {
if (this.focus !== "right") return [];
diff --git a/app/ui/font-picker.ts b/app/ui/font-picker.ts
index f9fdac7c..7698904c 100644
--- a/app/ui/font-picker.ts
+++ b/app/ui/font-picker.ts
@@ -13,6 +13,7 @@ import { getFont } from "../graphics/bdffont";
import { GrayImage, type UiFont } from "../graphics/image";
import { TtfFont } from "../graphics/ttf-font";
import { listInstalledFonts, type InstalledFont } from "../graphics/installed-fonts";
+import { wrapText } from "../graphics/textwrap";
import {
fontSelectionLabel,
getDefaultSmallFont,
@@ -140,18 +141,40 @@ export class FontPickerLayer implements Layer {
const rowWidth = width - 2 * rowX;
const rowHeight = listRowHeight(font);
const rowsTop = 24 + font.lineHeight;
- this.menu.paint(image, { x: rowX - 10, y: rowsTop, width: rowWidth + 20, height: ROWS.length * rowHeight }, focused);
-
- // Preview: a separator, then the sample line in the draft font.
- const previewTop = rowsTop + ROWS.length * rowHeight + 10;
- image.drawLine(rowX - 10, previewTop, rowX + rowWidth + 10, previewTop, 60);
+ const rowsHeight = ROWS.length * rowHeight;
const preview = this.previewFont();
- const sample =
- preview.measureText(PREVIEW_TEXT) <= rowWidth + 20 ? PREVIEW_TEXT : "The quick brown fox 0123";
- preview.drawText(image, rowX - 4, previewTop + 8, sample, 230);
const info = `Line height: ${preview.lineHeight}px`;
- image.drawText(font, rowX - 4, previewTop + 8 + preview.lineHeight + 6, info, 110);
+ // Preview under the rows, where its sample line and the info line fit
+ // (the G2's window): a separator, then the sample line in the draft font.
+ const previewTop = rowsTop + rowsHeight + 10;
+ if (previewTop + 8 + preview.lineHeight + 6 + font.lineHeight <= height) {
+ this.menu.paint(image, { x: rowX - 10, y: rowsTop, width: rowWidth + 20, height: rowsHeight }, focused);
+ image.drawLine(rowX - 10, previewTop, rowX + rowWidth + 10, previewTop, 60);
+ const sample =
+ preview.measureText(PREVIEW_TEXT) <= rowWidth + 20 ? PREVIEW_TEXT : "The quick brown fox 0123";
+ preview.drawText(image, rowX - 4, previewTop + 8, sample, 230);
+ image.drawText(font, rowX - 4, previewTop + 8 + preview.lineHeight + 6, info, 110);
+ return image;
+ }
+
+ // Else beside them (a short window, as on the RayNeo iO), the sample
+ // wrapped to the column, as many lines as fit above the info line.
+ const columnWidth = Math.round(rowWidth / 2);
+ const bottom = height - 8;
+ this.menu.paint(image, { x: rowX - 10, y: rowsTop, width: columnWidth + 20, height: Math.min(rowsHeight, bottom - rowsTop) }, focused);
+ const dividerX = rowX + columnWidth + 20;
+ image.drawLine(dividerX, rowsTop, dividerX, Math.min(rowsTop + rowsHeight, bottom), 60);
+ const previewX = dividerX + 12;
+ const lines = wrapText(preview, PREVIEW_TEXT, width - previewX - 12);
+ const infoY = bottom - font.lineHeight;
+ let y = rowsTop + 4;
+ for (const line of lines) {
+ if (y + preview.lineHeight > infoY - 6) break;
+ preview.drawText(image, previewX, y, line, 230);
+ y += preview.lineHeight;
+ }
+ image.drawText(font, previewX, Math.min(infoY, y + 6), info, 110);
return image;
}
diff --git a/app/ui/layers.ts b/app/ui/layers.ts
index 1553216d..e55502b4 100644
--- a/app/ui/layers.ts
+++ b/app/ui/layers.ts
@@ -1,4 +1,5 @@
-import { G2_LENS_HEIGHT, G2_LENS_WIDTH, GrayImage } from "../graphics/image";
+import { GrayImage } from "../graphics/image";
+import { screenHeight, screenWidth } from "../graphics/screen-size";
import { dimPlanes, type Plane } from "../graphics/plane";
import { spanCurrent } from "../native/frame-timings";
import { type ConfigSettingBoolean, type ConfigSettingString, type VoiceProvider } from "./dashboard-settings";
@@ -153,8 +154,12 @@ export class LayerStack {
}
private readonly shellKeys = new WeakMap();
private readonly ctx: LayerContext;
- private baseWidth: number;
- private baseHeight: number;
+ /**
+ * The base viewport's size, or null to follow the paired glasses' screen
+ * as it is now: the shell's own stack lives for the whole process, and
+ * re-pairing with the other glasses type changes the screen under it.
+ */
+ private baseSize: { width: number; height: number } | null;
private readonly focusedFn: () => boolean;
private lastBaseDim: number | false = 1;
@@ -172,8 +177,7 @@ export class LayerStack {
stack: this,
actions,
};
- this.baseWidth = baseSize?.width ?? G2_LENS_WIDTH;
- this.baseHeight = baseSize?.height ?? G2_LENS_HEIGHT;
+ this.baseSize = baseSize ? { width: baseSize.width, height: baseSize.height } : null;
this.focusedFn = isFocused;
}
@@ -244,13 +248,12 @@ export class LayerStack {
}
getBaseSize(): { width: number; height: number } {
- return { width: this.baseWidth, height: this.baseHeight };
+ return this.baseSize ? { ...this.baseSize } : { width: screenWidth(), height: screenHeight() };
}
/** Resize the base viewport (e.g. an EvenHub window switching to the tall canvas). */
setBaseSize(size: { width: number; height: number }): void {
- this.baseWidth = size.width;
- this.baseHeight = size.height;
+ this.baseSize = { width: size.width, height: size.height };
}
setActions(actions: Partial): void {
@@ -321,7 +324,8 @@ export class LayerStack {
layer.paint(this.ctx, () => {
belowRequested = true;
if (!canvas) {
- canvas = new GrayImage(this.baseWidth, this.baseHeight, 0);
+ const { width, height } = this.getBaseSize();
+ canvas = new GrayImage(width, height, 0);
}
return canvas;
}),
diff --git a/app/ui/menu.ts b/app/ui/menu.ts
index e8205418..104b3925 100644
--- a/app/ui/menu.ts
+++ b/app/ui/menu.ts
@@ -1,4 +1,5 @@
-import { G2_LENS_HEIGHT, GrayImage, type UiFont } from "../graphics/image";
+import { GrayImage, type UiFont } from "../graphics/image";
+import { screenHeight } from "../graphics/screen-size";
import { wrapText } from "../graphics/textwrap";
import { getDefaultSmallFont } from "../graphics/ui-fonts";
import { getStringSetting } from "../native/settings-store";
@@ -18,9 +19,14 @@ setMenuAnimationReader(() => normalizeAnimationSpeed(getStringSetting(MENU_ANIMA
const DEFAULT_MENU_X = 8;
const DEFAULT_MENU_Y = 8;
const DEFAULT_MENU_WIDTH = 272;
+/** Windows shorter than this (the RayNeo iO's, not the G2's) get tighter modal margins. */
+const SHORT_WINDOW_HEIGHT = 200;
// Menus grow with their item count, from half the screen (matching the old
// fixed quarter-screen-era look) up to the full screen, then scroll.
-const DEFAULT_MENU_MIN_HEIGHT = G2_LENS_HEIGHT / 2 - 2 * DEFAULT_MENU_Y;
+/** Half the screen, less the menu's top and bottom offsets. */
+function defaultMenuMinHeight(): number {
+ return screenHeight() / 2 - 2 * DEFAULT_MENU_Y;
+}
const MENU_BODY_PADDING = 8;
/** Gap between the last item row and a footer hint line. */
const MENU_FOOTER_GAP = 8;
@@ -302,7 +308,7 @@ export class MenuLayer implements Layer {
const { y, width } = this.layout;
const x = this.layout.x === "center" ? ((image.width - width) / 2) | 0 : this.layout.x;
const chromeTop = (this.title ? menuTitleHeight(font) : 0) + MENU_BODY_PADDING;
- const minHeight = this.layout.minHeight ?? DEFAULT_MENU_MIN_HEIGHT;
+ const minHeight = this.layout.minHeight ?? defaultMenuMinHeight();
// Cap to the surface being painted on: a window's stack image may be much
// shorter than the full screen (min-height windows).
const maxHeight = Math.min(
@@ -376,7 +382,10 @@ export function openModalMenu(
const font = getDefaultSmallFont();
const menuWidth = Math.min(320, width - 40);
const naturalHeight = menuTitleHeight(font) + 2 * MENU_BODY_PADDING + items.length * listRowHeight(font);
- const menuHeight = Math.min(naturalHeight, height - 40);
+ // 20px clear above and below, or 8 in a short window (the RayNeo iO's),
+ // where those rows are worth more than the margin.
+ const marginY = height < SHORT_WINDOW_HEIGHT ? 8 : 20;
+ const menuHeight = Math.min(naturalHeight, height - 2 * marginY);
const layout: MenuLayout = {
x: ((width - menuWidth) / 2) | 0,
y: ((height - menuHeight) / 2) | 0,
diff --git a/app/ui/shell/brightness-picker-layer.ts b/app/ui/shell/brightness-picker-layer.ts
index f735b0ab..cb7ee08f 100644
--- a/app/ui/shell/brightness-picker-layer.ts
+++ b/app/ui/shell/brightness-picker-layer.ts
@@ -8,7 +8,11 @@ import { appViewportRect, SHELL_OPAQUE_BLACK } from "./geometry";
const DIALOG_WIDTH = 272;
const BAR_WIDTH = 12;
+/** The bar's height where the window has room (the G2's); it shrinks to fit a shorter one, down to MIN_BAR_HEIGHT. */
const BAR_HEIGHT = 100;
+const MIN_BAR_HEIGHT = 24;
+/** Clear space kept above and below the dialog in the window. */
+const MARGIN_Y = 4;
/** Manual brightness changes apply immediately so the wearer can judge the level. */
export class BrightnessPickerLayer implements Layer {
@@ -22,7 +26,9 @@ export class BrightnessPickerLayer implements Layer {
const image = paintBelow();
const font = getDefaultSmallFont();
const viewport = appViewportRect("min");
- const height = BAR_HEIGHT + 3 * font.lineHeight + 56;
+ const chrome = 3 * font.lineHeight + 56;
+ const barHeight = clamp(viewport.height - 2 * MARGIN_Y - chrome, MIN_BAR_HEIGHT, BAR_HEIGHT);
+ const height = barHeight + chrome;
const left = viewport.x + Math.round((viewport.width - DIALOG_WIDTH) / 2);
const top = viewport.y + Math.round((viewport.height - height) / 2);
image.fillRect(left, top, DIALOG_WIDTH, height, SHELL_OPAQUE_BLACK);
@@ -35,14 +41,14 @@ export class BrightnessPickerLayer implements Layer {
const barX = left + Math.round((DIALOG_WIDTH - BAR_WIDTH) / 2);
const barY = top + font.lineHeight + 24;
const level = brightnessSettingToLevel(brightnessSetting.get());
- image.drawRect(barX - 2, barY - 2, BAR_WIDTH + 4, BAR_HEIGHT + 4, 150);
- const filledHeight = Math.round(BAR_HEIGHT * (level ?? 0) / 100);
- image.fillRect(barX, barY + BAR_HEIGHT - filledHeight, BAR_WIDTH, filledHeight, 255);
- image.drawText(font, barX + BAR_WIDTH + 12, barY + Math.round((BAR_HEIGHT - font.lineHeight) / 2),
+ image.drawRect(barX - 2, barY - 2, BAR_WIDTH + 4, barHeight + 4, 150);
+ const filledHeight = Math.round(barHeight * (level ?? 0) / 100);
+ image.fillRect(barX, barY + barHeight - filledHeight, BAR_WIDTH, filledHeight, 255);
+ image.drawText(font, barX + BAR_WIDTH + 12, barY + Math.round((barHeight - font.lineHeight) / 2),
level === null ? "Auto" : `${level}%`, 235);
- centeredText(gestureHints([[GESTURE_SCROLL, "adjust"]]), barY + BAR_HEIGHT + 12, 150);
+ centeredText(gestureHints([[GESTURE_SCROLL, "adjust"]]), barY + barHeight + 12, 150);
centeredText(gestureHints([[`${GESTURE_CLICK} / ${GESTURE_DOUBLE_CLICK}`, "confirm"]]),
- barY + BAR_HEIGHT + font.lineHeight + 16, 150);
+ barY + barHeight + font.lineHeight + 16, 150);
return image;
}
diff --git a/app/ui/shell/chrome-layer.ts b/app/ui/shell/chrome-layer.ts
index 3361a651..33d152d3 100644
--- a/app/ui/shell/chrome-layer.ts
+++ b/app/ui/shell/chrome-layer.ts
@@ -1,7 +1,7 @@
import { shellCrop } from "../../graphics/shell-scene";
import type { Plane } from "../../graphics/plane";
import { DrawOp, type ListCall, type ListClip } from "../../graphics/display-list";
-import { G2_LENS_HEIGHT, G2_LENS_WIDTH, GrayImage, grayToNibble } from "../../graphics/image";
+import { GrayImage, grayToNibble } from "../../graphics/image";
import { getDefaultMediumFont, getDefaultSmallFont } from "../../graphics/ui-fonts";
import { truncateText } from "../../graphics/textwrap";
import { activeAmbientCards } from "./ambient-cards";
@@ -15,6 +15,7 @@ import {
batteryDisplayModeSetting,
batteryIndicatorVisible,
glassesBatteryVisibilitySetting,
+ glassesModelName,
phoneBatteryVisibilitySetting,
ringBatteryVisibilitySetting,
watchBatteryVisibilitySetting,
@@ -29,7 +30,9 @@ import { lineStep } from "../metrics";
import {
appViewportRect,
isImmersive,
- MIN_WINDOW_HEIGHT,
+ minWindowHeight,
+ screenHeight,
+ screenWidth,
minWindowTop,
setSwitcherBarHeight,
SHELL_OPAQUE_BLACK,
@@ -68,7 +71,10 @@ const TWO_COLUMN: SidebarVariant = { columns: 2, columnWidth: 32, iconSize: 28 }
const ICON_SPACING = 8;
/** Icon list top/bottom margins within the sidebar band, below the top bar (and a bottom row's end margins). */
const LIST_MARGIN = 10;
-const LIST_HEIGHT = MIN_WINDOW_HEIGHT - TOP_BAR_HEIGHT - 2 * LIST_MARGIN;
+/** Height of the sidebar's icon list: the min-height band less its top bar and margins. */
+function listHeight(appId?: string): number {
+ return minWindowHeight(appId) - TOP_BAR_HEIGHT - 2 * LIST_MARGIN;
+}
/** Bottom-row icons: one tall tab's worth of row, the icon inset 2px all round. */
const ROW_ICON_SIZE = SWITCHER_ROW_HEIGHT - 4;
@@ -123,7 +129,7 @@ const POPUP_DIM = 0.5;
/** Icon rows that fit in one sidebar column. */
function rowsPerColumn(variant: SidebarVariant): number {
- return Math.max(1, ((LIST_HEIGHT + ICON_SPACING) / (variant.iconSize + ICON_SPACING)) | 0);
+ return Math.max(1, ((listHeight() + ICON_SPACING) / (variant.iconSize + ICON_SPACING)) | 0);
}
function sidebarVariant(windowCount: number): SidebarVariant {
@@ -136,7 +142,7 @@ function sidebarVariant(windowCount: number): SidebarVariant {
*/
function columnLeft(variant: SidebarVariant, column: number, position: AppSwitcherPosition): number {
return position === "right"
- ? G2_LENS_WIDTH - SIDEBAR_WIDTH + column * variant.columnWidth
+ ? screenWidth() - SIDEBAR_WIDTH + column * variant.columnWidth
: SIDEBAR_WIDTH - (column + 1) * variant.columnWidth;
}
@@ -382,7 +388,7 @@ export function sidebarContentSpan(windowCount: number): { left: number; right:
const variant = sidebarVariant(windowCount);
const width = variant.columns * variant.columnWidth;
return switcherPosition() === "right"
- ? { left: G2_LENS_WIDTH - SIDEBAR_WIDTH, right: G2_LENS_WIDTH - SIDEBAR_WIDTH + width }
+ ? { left: screenWidth() - SIDEBAR_WIDTH, right: screenWidth() - SIDEBAR_WIDTH + width }
: { left: SIDEBAR_WIDTH - width, right: SIDEBAR_WIDTH };
}
@@ -396,7 +402,7 @@ function topBarSpan(state: ShellChromeState): { left: number; right: number } {
if (sidebarStripVisible(state.focus, state.foregroundAppId)) {
const position = switcherPosition();
if (position === "left") left = Math.max(left, SIDEBAR_WIDTH);
- if (position === "right") right = Math.min(right, G2_LENS_WIDTH - SIDEBAR_WIDTH);
+ if (position === "right") right = Math.min(right, screenWidth() - SIDEBAR_WIDTH);
}
return { left, right };
}
@@ -632,7 +638,7 @@ export class ShellChromeLayer implements Layer {
) {}
paint(): GrayImage {
- const image = new GrayImage(G2_LENS_WIDTH, G2_LENS_HEIGHT, 0);
+ const image = new GrayImage(screenWidth(), screenHeight(), 0);
const state = this.getState();
this.statusEntries = [];
this.bottomBar = this.layoutBottomBar(state);
@@ -659,7 +665,7 @@ export class ShellChromeLayer implements Layer {
this.statusEntries = [];
this.bottomBar = this.layoutBottomBar(state);
const statusInRow = statusInSwitcherRow(state.foregroundAppId);
- const canvas = new GrayImage(G2_LENS_WIDTH, G2_LENS_HEIGHT, 0);
+ const canvas = new GrayImage(screenWidth(), screenHeight(), 0);
const span = topBarSpan(state);
const bar = statusBarPlacement(state);
if (bar) {
@@ -672,7 +678,7 @@ export class ShellChromeLayer implements Layer {
return parts;
}
if (switcherShown) {
- const stripCanvas = new GrayImage(G2_LENS_WIDTH, G2_LENS_HEIGHT, 0);
+ const stripCanvas = new GrayImage(screenWidth(), screenHeight(), 0);
const statusLeft = this.drawSidebar(stripCanvas, state, statusInRow ? canvas : undefined);
// The window frame rides on the switcher row, whose top edge is its
// bottom side, and so replays after any top bar, whose bottom row is
@@ -712,14 +718,14 @@ export class ShellChromeLayer implements Layer {
// to be sent at all, so the frame rides on one at its top-left corner,
// outside its curve, which it paints black anyway. As in the bottom
// row's case, it plays at the screen's own depth.
- const frameCanvas = new GrayImage(G2_LENS_WIDTH, G2_LENS_HEIGHT, 0);
+ const frameCanvas = new GrayImage(screenWidth(), screenHeight(), 0);
frameCanvas.fillRect(frame.x, frame.y, 1, 1, SHELL_OPAQUE_BLACK);
drawWindowFrame(frameCanvas, frame, false, true);
parts.push(shellCrop(frameCanvas, frame.x, frame.y, 1, 1, 1));
}
drawAmbientCards(canvas, topBarSpan(state).right, parts);
if (!switcherShown) return;
- const popupCanvas = new GrayImage(G2_LENS_WIDTH, G2_LENS_HEIGHT, 0);
+ const popupCanvas = new GrayImage(screenWidth(), screenHeight(), 0);
const box = this.drawPopup(popupCanvas, state);
this.popupKey ??= LayerStack.allocateShellKey();
parts.push({ ...shellCrop(popupCanvas, box.x, box.y, box.width, box.height, this.popupKey), depth: POPUP_DEPTH });
@@ -900,8 +906,8 @@ export class ShellChromeLayer implements Layer {
const batteries = batteryItems(state);
if (batteries.length) {
// Measured by drawing it: each battery style lays itself out as it draws.
- const scratch = new GrayImage(G2_LENS_WIDTH, TOP_BAR_HEIGHT, 0);
- const width = G2_LENS_WIDTH - BATTERY_BLOCK_RIGHT_MARGIN - drawBatteryBlock(scratch, batteries, 0, G2_LENS_WIDTH);
+ const scratch = new GrayImage(screenWidth(), TOP_BAR_HEIGHT, 0);
+ const width = screenWidth() - BATTERY_BLOCK_RIGHT_MARGIN - drawBatteryBlock(scratch, batteries, 0, screenWidth());
// The block keeps its usual right margin inside the edge it's given.
items.push({ kind: "batteries", width,
draw: (image, x, top) => drawBatteryBlock(image, batteries, top, x + width + BATTERY_BLOCK_RIGHT_MARGIN) });
@@ -1084,7 +1090,7 @@ function batteryItems(state: ShellChromeState): BatteryItem[] {
Boolean(state.battery.watchCharging));
}
if (state.battery.headset !== null && Number.isFinite(state.battery.headset)) {
- pushBatteryItem(items, glassesBatteryVisibilitySetting.get(), "G2", "glasses", state.battery.headset,
+ pushBatteryItem(items, glassesBatteryVisibilitySetting.get(), glassesModelName(), "glasses", state.battery.headset,
Boolean(state.battery.headsetCharging));
}
if (state.battery.ring !== null && Number.isInteger(state.battery.ring)
@@ -1245,7 +1251,7 @@ function drawAmbientCards(image: GrayImage, right: number, parts?: Plane[]): voi
if (!cards.length) return;
const font = getDefaultSmallFont();
const bandTop = minWindowTop();
- const bandBottom = bandTop + MIN_WINDOW_HEIGHT - windowFooterHeight();
+ const bandBottom = bandTop + minWindowHeight() - windowFooterHeight();
// Right-aligned with the top bar: clear of a right-hand sidebar.
const x = right - AMBIENT_CARD_WIDTH - AMBIENT_CARD_MARGIN;
const textWidth = AMBIENT_CARD_WIDTH - 2 * AMBIENT_CARD_PADDING_X;
diff --git a/app/ui/shell/geometry.ts b/app/ui/shell/geometry.ts
index b3b0c75e..f1deb9d4 100644
--- a/app/ui/shell/geometry.ts
+++ b/app/ui/shell/geometry.ts
@@ -1,4 +1,4 @@
-import { G2_LENS_HEIGHT, G2_LENS_WIDTH } from "../../graphics/image";
+import { screenHeight, screenWidth } from "../../graphics/screen-size";
import {
appSwitcherPositionSetting,
type AppSwitcherPosition,
@@ -12,6 +12,9 @@ import {
windowBorderSetting,
} from "../dashboard-settings";
+/** The paired glasses' screen, which the shell lays out in (graphics/screen-size.ts). */
+export { screenHeight, screenWidth };
+
/** Top bar: 24px notification icons plus a little padding. */
export const TOP_BAR_HEIGHT = 28;
/**
@@ -174,15 +177,15 @@ export function switcherRect(heightMode: WindowHeightMode, appId?: string): { x:
const height = reserved || switcherBarHeights.overlay;
return {
x: appViewportLeft(appId),
- y: reserved > 0 ? windowTop(heightMode, appId) + windowBandHeight(heightMode, appId) : G2_LENS_HEIGHT - height,
+ y: reserved > 0 ? windowTop(heightMode, appId) + windowBandHeight(heightMode, appId) : screenHeight() - height,
width: appViewportWidth(appId),
height,
};
}
case "right":
- return { x: G2_LENS_WIDTH - SIDEBAR_WIDTH, y: minWindowTop(appId), width: SIDEBAR_WIDTH, height: MIN_WINDOW_HEIGHT };
+ return { x: screenWidth() - SIDEBAR_WIDTH, y: minWindowTop(appId), width: SIDEBAR_WIDTH, height: minWindowHeight(appId) };
default:
- return { x: 0, y: minWindowTop(appId), width: SIDEBAR_WIDTH, height: MIN_WINDOW_HEIGHT };
+ return { x: 0, y: minWindowTop(appId), width: SIDEBAR_WIDTH, height: minWindowHeight(appId) };
}
}
@@ -293,15 +296,15 @@ export function isOnSwitcherEdge(x: number, y: number, heightMode: WindowHeightM
case "bottom":
return y >= switcherRect(heightMode, appId).y;
case "right":
- return x >= G2_LENS_WIDTH - SIDEBAR_WIDTH;
+ return x >= screenWidth() - SIDEBAR_WIDTH;
default:
return x < SIDEBAR_WIDTH;
}
}
-/** Width of app windows: the panel's when Full Screen or immersive, else 576 (see SIDEBAR_WIDTH). */
+/** Width of app windows: the screen's when Full Screen or immersive, else SIDEBAR_WIDTH less (576 on the G2). */
function appViewportWidth(appId?: string): number {
- return fullWidth(appId) ? G2_LENS_WIDTH : G2_LENS_WIDTH - SIDEBAR_WIDTH;
+ return fullWidth(appId) ? screenWidth() : screenWidth() - SIDEBAR_WIDTH;
}
/**
@@ -353,7 +356,7 @@ export function effectiveHeightMode(mode: WindowHeightMode, appId?: string): Win
* rather than use the viewport's own centre.
*/
export function screenCenterInViewportX(): number {
- return Math.round(G2_LENS_WIDTH / 2) - appViewportLeft();
+ return Math.round(screenWidth() / 2) - appViewportLeft();
}
/**
@@ -374,15 +377,23 @@ export const SHELL_OPAQUE_BLACK = 1;
*/
export type WindowHeightMode = "min" | "medium" | "max";
-/** Total height (header + content) of a min-height window. */
+/** Total height (header + content) of a min-height window on a screen with room for it: the G2's stock band. */
export const MIN_WINDOW_HEIGHT = 288;
+/**
+ * Total height of a min-height window here: the stock 288px band, or the
+ * whole window area on a screen too short for it (the RayNeo iO's 220 rows).
+ */
+export function minWindowHeight(appId?: string): number {
+ return Math.min(MIN_WINDOW_HEIGHT, windowAreaHeight(appId));
+}
+
/**
* Height of the screen area windows are placed in: the whole screen, less
* a bottom switcher's height.
*/
function windowAreaHeight(appId?: string): number {
- return G2_LENS_HEIGHT - switcherRowHeight(appId);
+ return screenHeight() - switcherRowHeight(appId);
}
/** Total height (header + content + footer) of a window's band in the given mode. */
@@ -391,9 +402,9 @@ export function windowBandHeight(mode: WindowHeightMode, appId?: string): number
case "max":
return windowAreaHeight(appId);
case "medium":
- return MIN_WINDOW_HEIGHT + windowHeaderHeight(appId) + windowFooterHeight(appId);
+ return Math.min(windowAreaHeight(appId), minWindowHeight(appId) + windowHeaderHeight(appId) + windowFooterHeight(appId));
default:
- return MIN_WINDOW_HEIGHT;
+ return minWindowHeight(appId);
}
}
@@ -425,7 +436,7 @@ export function minWindowTop(appId?: string): number {
*/
export function windowTop(mode: WindowHeightMode, appId?: string): number {
const band = windowBandHeight(mode, appId);
- const oneRowArea = G2_LENS_HEIGHT - (switcherRowHeight(appId) > 0 ? SWITCHER_ROW_HEIGHT : 0);
+ const oneRowArea = screenHeight() - (switcherRowHeight(appId) > 0 ? SWITCHER_ROW_HEIGHT : 0);
const top = Math.round((oneRowArea - band) * verticalPositionFraction(appId));
return Math.min(top, windowAreaHeight(appId) - band);
}
@@ -473,13 +484,13 @@ function unionRect(a: ScreenRect, b: ScreenRect): ScreenRect {
* the whole panel. The phone mirror's Scaled preview zooms to this.
*/
export function usedScreenRect(heightMode: WindowHeightMode, appId?: string): ScreenRect {
- if (isImmersive(appId)) return { x: 0, y: 0, width: G2_LENS_WIDTH, height: G2_LENS_HEIGHT };
+ if (isImmersive(appId)) return { x: 0, y: 0, width: screenWidth(), height: screenHeight() };
const frame = windowFramed(appId) ? 1 : 0;
const x = appViewportLeft(appId) - frame;
const width = appViewportWidth(appId) + 2 * frame;
let used = unionRect(
{ x, y: windowTop(heightMode, appId), width, height: windowBandHeight(heightMode, appId) },
- { x, y: minWindowTop(appId), width, height: MIN_WINDOW_HEIGHT },
+ { x, y: minWindowTop(appId), width, height: minWindowHeight(appId) },
);
if (switcherPosition() !== "popup") used = unionRect(used, switcherRect(heightMode, appId));
return used;
@@ -487,15 +498,18 @@ export function usedScreenRect(heightMode: WindowHeightMode, appId?: string): Sc
/**
* The screen area the phone mirror shows to present `used` as large as it
- * fits, centred, at the panel's own 4:3 aspect (so the mirror keeps its
- * shape whatever the display mode): `used` grown along one axis, past the
- * panel's edges if need be (the mirror shows black there).
+ * fits, centred, at the screen's own aspect (4:3 on the G2, 27:11 on the iO),
+ * so the mirror keeps its shape whatever the display mode: `used` grown along
+ * one axis, past the screen's edges if need be (the mirror shows black there).
*/
export function phonePreviewRect(used: ScreenRect): ScreenRect {
- // Whole 4:3 units, so the aspect is exact.
- const units = Math.ceil(Math.max(used.width / 4, used.height / 3));
- const width = units * 4;
- const height = units * 3;
+ // Whole aspect units, so the aspect is exact.
+ const gcd = (a: number, b: number): number => (b ? gcd(b, a % b) : a);
+ const unit = gcd(screenWidth(), screenHeight());
+ const aspectW = screenWidth() / unit, aspectH = screenHeight() / unit;
+ const units = Math.ceil(Math.max(used.width / aspectW, used.height / aspectH));
+ const width = units * aspectW;
+ const height = units * aspectH;
return {
x: Math.round(used.x + (used.width - width) / 2),
y: Math.round(used.y + (used.height - height) / 2),
diff --git a/app/ui/shell/in-process-window.ts b/app/ui/shell/in-process-window.ts
index d51e1f5f..dc5a25e3 100644
--- a/app/ui/shell/in-process-window.ts
+++ b/app/ui/shell/in-process-window.ts
@@ -226,6 +226,7 @@ export function createInProcessWindow(options: InProcessWindowOptions): InProces
options.reconfigureSurface?.(heightMode);
requestRender();
},
+ layoutSize: () => stack.getBaseSize(),
hitTest: async (x, y) => {
const handled = await stack.hitTest(x, y);
if (handled) requestRender();
diff --git a/app/ui/shell/input-dialog.ts b/app/ui/shell/input-dialog.ts
index c2cdb6cd..6d8f3855 100644
--- a/app/ui/shell/input-dialog.ts
+++ b/app/ui/shell/input-dialog.ts
@@ -1,9 +1,9 @@
-import { G2_LENS_WIDTH, GrayImage, type UiFont } from "../../graphics/image";
+import { GrayImage, type UiFont } from "../../graphics/image";
import { wrapText, truncateText } from "../../graphics/textwrap";
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
import { Menu, type MenuDrawArgs } from "../menu-core";
import { listRowHeight, textInkBounds } from "../metrics";
-import { MIN_WINDOW_HEIGHT, minWindowTop } from "./geometry";
+import { minWindowHeight, minWindowTop, screenWidth } from "./geometry";
/**
* The shared look of the shell's text dialogs (voice input, phone keyboard
@@ -13,17 +13,26 @@ import { MIN_WINDOW_HEIGHT, minWindowTop } from "./geometry";
*/
const DIALOG_X = 40;
-const DIALOG_W = G2_LENS_WIDTH - 80;
+/** The screen less DIALOG_X on each side. */
+function dialogW(): number {
+ return screenWidth() - 2 * DIALOG_X;
+}
// The dialog fits inside the min-height window band (like the other shell
// overlays), wherever the vertical position setting puts it.
const DIALOG_MARGIN_Y = 28;
-const DIALOG_H = MIN_WINDOW_HEIGHT - 2 * DIALOG_MARGIN_Y;
-const TEXT_MAX_WIDTH = DIALOG_W - 32;
+function dialogH(): number {
+ return minWindowHeight() - 2 * DIALOG_MARGIN_Y;
+}
+function textMaxWidth(): number {
+ return dialogW() - 32;
+}
const TEXT_LEFT = DIALOG_X + 16;
// Menu row boxes: 4px left of the text column, 2px shorter than the row
// pitch, with each row's label inset 8px / 4px into its box.
const MENU_X = TEXT_LEFT - 4;
-const MENU_W = DIALOG_W - 24;
+function menuW(): number {
+ return dialogW() - 24;
+}
const MENU_ROW_GAP = 2;
const MENU_LABEL_INSET_X = 8;
const MENU_LABEL_INSET_Y = 4;
@@ -89,28 +98,28 @@ export function paintInputDialog(image: GrayImage, con
// Solid dialog box over the underlying UI. Fill 1, not 0: identical after
// 4bpp quantization, but 0 is transparent on the color-key shell surface.
- image.fillRect(DIALOG_X, top, DIALOG_W, DIALOG_H, 1);
- image.drawRect(DIALOG_X, top, DIALOG_W, DIALOG_H, 90);
+ image.fillRect(DIALOG_X, top, dialogW(), dialogH(), 1);
+ image.drawRect(DIALOG_X, top, dialogW(), dialogH(), 90);
// Title and status share one header line, the status in the space after the title.
const left = TEXT_LEFT;
const headerY = top + 12;
image.drawText(font, left, headerY, content.title, 220);
const statusLeft = left + Math.ceil(font.measureText(content.title)) + HEADER_STATUS_GAP;
- const statusWidth = TEXT_LEFT + TEXT_MAX_WIDTH - statusLeft;
+ const statusWidth = TEXT_LEFT + textMaxWidth() - statusLeft;
image.drawText(font, statusLeft, headerY, truncateText(font, content.status, statusWidth), content.statusValue ?? 130);
const menu = content.menu;
const rowCount = menu?.items.length ?? 0;
// Reserve space for the actual number of rows this menu has, or one row for the hint.
const reservedRows = rowCount > 0 ? rowCount : content.hint ? 1 : 0;
- const textBottom = top + DIALOG_H - reservedRows * menuRowH - 8;
+ const textBottom = top + dialogH() - reservedRows * menuRowH - 8;
const textTop = headerY + font.lineHeight + 12;
const maxLines = Math.max(1, ((textBottom - textTop) / 16) | 0);
// The tail of a long message stays in view: it is what was said last (or
// where the phone keyboard is typing).
- const wrapped = wrapText(font, content.text, TEXT_MAX_WIDTH);
+ const wrapped = wrapText(font, content.text, textMaxWidth());
const firstLine = Math.max(0, wrapped.length - maxLines);
for (let index = firstLine; index < wrapped.length; index++) {
image.drawText(font, left, textTop + (index - firstLine) * 16, wrapped[index]!, 235);
@@ -118,11 +127,11 @@ export function paintInputDialog(image: GrayImage, con
if (menu && rowCount > 0) {
// Row boxes are one pitch apart, the last ending 6px above the dialog's bottom edge.
- const menuTop = top + DIALOG_H - rowCount * menuRowH - 4;
- menu.paint(image, { x: MENU_X, y: menuTop, width: MENU_W, height: rowCount * menuRowH - MENU_ROW_GAP }, true);
+ const menuTop = top + dialogH() - rowCount * menuRowH - 4;
+ menu.paint(image, { x: MENU_X, y: menuTop, width: menuW(), height: rowCount * menuRowH - MENU_ROW_GAP }, true);
} else if (content.hint) {
// On the line the last menu row's label would occupy, floating in front of the dialog.
- drawDepthText(image, font, truncateText(font, content.hint, TEXT_MAX_WIDTH), left, top + DIALOG_H - menuRowH, HINT_VALUE, HINT_DEPTH);
+ drawDepthText(image, font, truncateText(font, content.hint, textMaxWidth()), left, top + dialogH() - menuRowH, HINT_VALUE, HINT_DEPTH);
}
}
diff --git a/app/ui/shell/modal-layer.ts b/app/ui/shell/modal-layer.ts
index 1ca89df6..05bd9027 100644
--- a/app/ui/shell/modal-layer.ts
+++ b/app/ui/shell/modal-layer.ts
@@ -40,12 +40,21 @@ export function modalRect(): { x: number; y: number; width: number; height: numb
export class ShellModalLayer implements Layer {
private readonly stack: LayerStack;
- constructor(baseLayer: Layer, actions: LayerActions, private readonly removed?: () => void) {
+ constructor(
+ baseLayer: Layer,
+ actions: LayerActions,
+ private readonly hooks: {
+ /** The modal left the shell stack, however it went. */
+ removed?: () => void;
+ /** Input reached the modal (before its inner stack handles it). */
+ input?: (event: InputEvent) => void;
+ } = {},
+ ) {
this.stack = new LayerStack(baseLayer, actions, modalInterior());
}
onRemoved(): void {
- this.removed?.();
+ this.hooks.removed?.();
}
paint(_ctx: LayerContext, paintBelow: PaintBelow): GrayImage {
@@ -73,6 +82,7 @@ export class ShellModalLayer implements Layer {
}
async handleInput(event: InputEvent, _ctx: LayerContext): Promise {
+ this.hooks.input?.(event);
await this.stack.handleInput(event);
}
}
diff --git a/app/ui/shell/notification-popup-delay.ts b/app/ui/shell/notification-popup-delay.ts
index 7bf16d45..605ffd7c 100644
--- a/app/ui/shell/notification-popup-delay.ts
+++ b/app/ui/shell/notification-popup-delay.ts
@@ -27,7 +27,7 @@ export function notificationPopupDelayMs(notification: { foregroundService?: boo
/** Runs `run` after `delayMs`; returns a function that cancels it. */
export type ScheduleFn = (run: () => void, delayMs: number) => () => void;
-const scheduleTimeout: ScheduleFn = (run, delayMs) => {
+export const scheduleTimeout: ScheduleFn = (run, delayMs) => {
const timer = setTimeout(run, delayMs);
return () => clearTimeout(timer);
};
diff --git a/app/ui/shell/notification-popup-timeout.ts b/app/ui/shell/notification-popup-timeout.ts
new file mode 100644
index 00000000..e660882b
--- /dev/null
+++ b/app/ui/shell/notification-popup-timeout.ts
@@ -0,0 +1,38 @@
+import { scheduleTimeout, type ScheduleFn } from "./notification-popup-delay";
+
+/**
+ * Closes a new-notification popup that is left untouched for its timeout
+ * ("Display new notifications"). The host restarts the countdown when the
+ * popup opens and on each interaction with it (any input, including moving
+ * its menu selection), and stops it when the popup goes away.
+ */
+export class NotificationPopupTimeout {
+ private cancel: (() => void) | null = null;
+
+ /** `timeoutMs` null never expires (the popup stays until dismissed). */
+ constructor(
+ private readonly timeoutMs: number | null,
+ private readonly expired: () => void,
+ private readonly schedule: ScheduleFn = scheduleTimeout,
+ ) {}
+
+ /** Start the countdown over. */
+ restart(): void {
+ this.stop();
+ if (this.timeoutMs === null) return;
+ this.cancel = this.schedule(() => {
+ this.cancel = null;
+ this.expired();
+ }, this.timeoutMs);
+ }
+
+ stop(): void {
+ this.cancel?.();
+ this.cancel = null;
+ }
+
+ /** Whether a countdown is running (for tests). */
+ isRunning(): boolean {
+ return this.cancel !== null;
+ }
+}
diff --git a/app/ui/shell/shell.ts b/app/ui/shell/shell.ts
index d96191c4..fd6ba8fc 100644
--- a/app/ui/shell/shell.ts
+++ b/app/ui/shell/shell.ts
@@ -1,5 +1,5 @@
import { encodeShellScene } from "../../graphics/shell-scene";
-import { G2_LENS_HEIGHT, G2_LENS_WIDTH, GrayImage } from "../../graphics/image";
+import { GrayImage } from "../../graphics/image";
import { singlePlane, type Plane } from "../../graphics/plane";
import { getDefaultSmallFont } from "../../graphics/ui-fonts";
import { EvenAIStatus, EventSourceType, OsEventTypeList, WatchGestureType } from "../../g2/events";
@@ -45,8 +45,11 @@ import {
veniceWebSearchSetting,
batteryIndicatorSettingsKey,
brightnessSetting,
+ newNotificationDisplaySetting,
+ newNotificationDisplayTimeoutMs,
onAnySettingChanged,
openAiApiKeySetting,
+ shouldPopUpNewNotification,
statusBarPositionSetting,
statusBarVisibilitySetting,
timeFormatSetting,
@@ -65,8 +68,8 @@ import {
} from "./chrome-layer";
import { ShellModalLayer } from "./modal-layer";
import { NotificationModalQueue } from "./notification-modal-queue";
+import { NotificationPopupTimeout } from "./notification-popup-timeout";
import { ALL_NOTIFICATIONS, readActiveNotifications } from "../../native/notification-icons";
-import { shouldShowNotificationOnGlasses } from "../../native/notification-sources";
import { ToolDebugMenuLayer } from "./tool-debug-layer";
import type { InProcessWindow } from "./in-process-window";
import { BrightnessPickerLayer } from "./brightness-picker-layer";
@@ -82,6 +85,8 @@ import {
windowFramed,
windowTop,
type WindowHeightMode,
+ screenHeight,
+ screenWidth,
} from "./geometry";
import type { AppSwitcherPosition } from "../dashboard-settings";
@@ -163,6 +168,12 @@ export type ShellWindow = {
* they opened with when the bottom switcher changes height.
*/
relayout?: () => void;
+ /**
+ * The viewport size the window is laid out at (it changes on relayout), so
+ * the controller can tell a window whose size fell behind the geometry from
+ * one whose surface merely moved.
+ */
+ layoutSize?: () => { width: number; height: number };
/**
* A touch from the phone's mirror at (x, y) in app-viewport coordinates.
* True if the window acted on it; otherwise the controller sends a select.
@@ -354,7 +365,10 @@ class ShellOverlayMenuLayer extends MenuLayer {
/** How long a show_alert popup stays before auto-dismissing. */
const ALERT_DISMISS_MS = 6000;
const ALERT_X = 40;
-const ALERT_W = G2_LENS_WIDTH - 80;
+/** Alert width: the screen less ALERT_X on each side. */
+function alertW(): number {
+ return screenWidth() - 2 * ALERT_X;
+}
const ALERT_Y = 96;
const ALERT_H = 96;
@@ -378,14 +392,14 @@ class ShellAlertLayer implements Layer {
const font = getDefaultSmallFont();
// Positioned within the min-height window band, like the other shell overlays.
const alertY = minWindowTop() + ALERT_Y;
- image.fillRect(ALERT_X, alertY, ALERT_W, ALERT_H, 1);
- image.drawRect(ALERT_X, alertY, ALERT_W, ALERT_H, 90);
+ image.fillRect(ALERT_X, alertY, alertW(), ALERT_H, 1);
+ image.drawRect(ALERT_X, alertY, alertW(), ALERT_H, 90);
image.drawText(font, ALERT_X + 16, alertY + 12, "Assistant", 200);
image.drawTextWrapped({
font,
x: ALERT_X + 16,
y: alertY + 18 + font.lineHeight + 4,
- width: ALERT_W - 32,
+ width: alertW() - 32,
text: this.text,
value: 235,
});
@@ -472,7 +486,7 @@ class Shell {
isAvailable: (notificationKey) => {
if (this.appNotifications.has(notificationKey)) return true;
const notification = readActiveNotifications(ALL_NOTIFICATIONS).find((item) => item.key === notificationKey);
- return !!notification && shouldShowNotificationOnGlasses(notification.packageName);
+ return !!notification && shouldPopUpNewNotification(notification.packageName);
},
sleep: () => this.sleep(),
});
@@ -918,18 +932,36 @@ class Shell {
const content = appNotification
? null
: new SingleNotificationLayer(notificationKey, { origin: "new-notification-modal", onClose: close });
+ // A phone notification's popup closes once left untouched for the
+ // "Display new notifications" time, as if closed by hand: the notification
+ // stays on the phone and in the status bar. An app's own notification
+ // (e.g. a Nightscout alert) is nowhere else to be found, so it stays up.
+ const timeout = new NotificationPopupTimeout(
+ appNotification ? null : newNotificationDisplayTimeoutMs(newNotificationDisplaySetting.get()),
+ () => {
+ // Something over the popup (a voice dialog, the system menu) is in
+ // use; count that as interaction rather than closing underneath it.
+ if (this.stack.topMatches((layer) => layer === popup.modal)) close();
+ else timeout.restart();
+ },
+ );
const popup: NotificationPopup = {
content,
modal: new ShellModalLayer(
appNotification ? appNotification.createLayer(close) : content!,
this.config.actions,
- () => {
- this.appNotifications.delete(notificationKey);
- this.notificationModals.removed(popup, this.screenOn);
+ {
+ removed: () => {
+ timeout.stop();
+ this.appNotifications.delete(notificationKey);
+ this.notificationModals.removed(popup, this.screenOn);
+ },
+ input: () => timeout.restart(),
},
),
};
this.stack.push(popup.modal);
+ timeout.restart();
return popup;
}
@@ -966,7 +998,7 @@ class Shell {
paintSurface(): Plane[] {
if (!this.screenOn) {
- return singlePlane(new GrayImage(G2_LENS_WIDTH, G2_LENS_HEIGHT, 0));
+ return singlePlane(new GrayImage(screenWidth(), screenHeight(), 0));
}
return this.stack.paint();
}
diff --git a/app/ui/shell/worker-window.ts b/app/ui/shell/worker-window.ts
index 79cb3799..59728842 100644
--- a/app/ui/shell/worker-window.ts
+++ b/app/ui/shell/worker-window.ts
@@ -79,6 +79,16 @@ export type WorkerAppReply =
/** Window height: the standard 288px band ("min", default) or full screen ("max"). */
heightMode?: WindowHeightMode;
}
+ | {
+ /**
+ * Move a window to another height band at runtime. The host resizes its
+ * surface and then always answers with resize-window, even if the size
+ * came out the same, so the worker can wait for the new viewport.
+ */
+ type: "set-height-mode";
+ windowId: string;
+ heightMode: WindowHeightMode;
+ }
| { type: "set-title"; windowId: string; title: string }
| { type: "set-attention"; windowId: string; attention: boolean }
/** App-driven animation phase for sidebar icons that support an activity cursor. */
@@ -193,8 +203,12 @@ export type WorkerAppHostOptions = {
navigationSensors?: { handle(request: NavigationSensorRequest): void; stop(): void };
openUrl?: (url: string) => void;
playBuzzerSequence?: (payload: Uint8Array) => Promise | void;
- /** Create/refresh a window surface on the compositor (no-op when disconnected). */
- configureSurface: (surfaceId: string, visible: boolean, heightMode: WindowHeightMode) => Promise;
+ /**
+ * Create/refresh a window surface on the compositor (no-op when disconnected).
+ * `visible` may be a function, read once the surface is configured, for a
+ * window that can lose the foreground in the meantime.
+ */
+ configureSurface: (surfaceId: string, visible: boolean | (() => boolean), heightMode: WindowHeightMode) => Promise;
setSurfaceVisible: (surfaceId: string, visible: boolean) => void;
removeSurface: (surfaceId: string) => void;
requestShellRender: () => void;
@@ -320,6 +334,9 @@ export class WorkerAppHost {
heightMode: message.heightMode,
});
break;
+ case "set-height-mode":
+ this.setWindowHeightMode(message.windowId, message.heightMode);
+ break;
case "set-attention":
shell.setWindowAttention(message.windowId, message.attention);
break;
@@ -445,12 +462,13 @@ export class WorkerAppHost {
const surfaceId = `window:${spec.windowId}`;
const heightMode = spec.heightMode ?? "min";
this.openWindows.add(spec.windowId);
+ let viewport = appViewportSize(heightMode, this.options.appId);
this.post({
type: "open-window",
windowId: spec.windowId,
surfaceId,
title: spec.title,
- viewport: appViewportSize(heightMode, this.options.appId),
+ viewport,
});
const window: ShellWindow = {
appId: this.options.appId,
@@ -463,7 +481,11 @@ export class WorkerAppHost {
// Every app worker resizes its live content in place, keeping its state
// (a game in progress, a route): the bottom switcher's height changes
// with what it holds, and full-height windows give way to it.
- relayout: () => this.post({ type: "resize-window", windowId: spec.windowId, viewport: appViewportSize(heightMode, this.options.appId) }),
+ relayout: () => {
+ viewport = appViewportSize(window.heightMode, this.options.appId);
+ this.post({ type: "resize-window", windowId: spec.windowId, viewport });
+ },
+ layoutSize: () => viewport,
hasAppMenu: () => this.windowGestures.get(spec.windowId)?.hasAppMenu ?? false,
claimsLongPress: () => this.windowGestures.get(spec.windowId)?.claimsLongPress ?? false,
close: () => {
@@ -536,6 +558,24 @@ export class WorkerAppHost {
return window;
}
+ /** The worker asked for another height band (see set-height-mode). */
+ private setWindowHeightMode(windowId: string, heightMode: WindowHeightMode): void {
+ const window = this.openWindows.has(windowId) ? shell.getWindows().find((w) => w.windowId === windowId) : undefined;
+ if (!window) return;
+ window.heightMode = heightMode;
+ // Resize the surface first, so the frame answering resize-window fits it.
+ void this.options
+ .configureSurface(window.surfaceId, () => shell.foregroundWindow()?.windowId === windowId, heightMode)
+ .catch((error) => {
+ console.error(`surface resize for ${windowId} failed: ${error}`);
+ })
+ .then(() => {
+ window.relayout?.();
+ // The chrome (top bar, bottom switcher) follows the foreground's band.
+ this.options.requestShellRender();
+ });
+ }
+
/**
* Post a tool-call to the worker and resolve when its tool-result comes back.
* Resolves with a tool error on timeout so a hung worker yields a tool error
diff --git a/app/version.ts b/app/version.ts
index c24da02f..fc46f663 100644
--- a/app/version.ts
+++ b/app/version.ts
@@ -1,2 +1,2 @@
-export const FACECLAW_VERSION = "0.8.6";
+export const FACECLAW_VERSION = "0.9.0";
export const USER_AGENT = "Faceclaw/"+FACECLAW_VERSION;
diff --git a/apple-watch/Faceclaw.xcodeproj/project.pbxproj b/apple-watch/Faceclaw.xcodeproj/project.pbxproj
index 492f5d64..11f5a3a4 100644
--- a/apple-watch/Faceclaw.xcodeproj/project.pbxproj
+++ b/apple-watch/Faceclaw.xcodeproj/project.pbxproj
@@ -224,12 +224,12 @@
INFOPLIST_KEY_CFBundleDisplayName = Faceclaw;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
INFOPLIST_KEY_WKCompanionAppBundleIdentifier = "$(FACECLAW_IOS_BUNDLE_ID)";
- INFOPLIST_KEY_WKRunsIndependentlyOfCompanionApp = YES;
+ INFOPLIST_KEY_WKRunsIndependentlyOfCompanionApp = NO;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = "$(FACECLAW_IOS_BUNDLE_ID).watchkitapp";
+ PRODUCT_BUNDLE_IDENTIFIER = "$(FACECLAW_IOS_BUNDLE_ID).watchremote";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -245,12 +245,12 @@
INFOPLIST_KEY_CFBundleDisplayName = Faceclaw;
INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
INFOPLIST_KEY_WKCompanionAppBundleIdentifier = "$(FACECLAW_IOS_BUNDLE_ID)";
- INFOPLIST_KEY_WKRunsIndependentlyOfCompanionApp = YES;
+ INFOPLIST_KEY_WKRunsIndependentlyOfCompanionApp = NO;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
- PRODUCT_BUNDLE_IDENTIFIER = "$(FACECLAW_IOS_BUNDLE_ID).watchkitapp";
+ PRODUCT_BUNDLE_IDENTIFIER = "$(FACECLAW_IOS_BUNDLE_ID).watchremote";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -261,7 +261,7 @@
isa = XCBuildConfiguration;
buildSettings = {
GENERATE_INFOPLIST_FILE = YES;
- PRODUCT_BUNDLE_IDENTIFIER = "$(FACECLAW_IOS_BUNDLE_ID).watchkitapp.uitests";
+ PRODUCT_BUNDLE_IDENTIFIER = "$(FACECLAW_IOS_BUNDLE_ID).watchremote.uitests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
TEST_TARGET_NAME = Faceclaw;
@@ -272,7 +272,7 @@
isa = XCBuildConfiguration;
buildSettings = {
GENERATE_INFOPLIST_FILE = YES;
- PRODUCT_BUNDLE_IDENTIFIER = "$(FACECLAW_IOS_BUNDLE_ID).watchkitapp.uitests";
+ PRODUCT_BUNDLE_IDENTIFIER = "$(FACECLAW_IOS_BUNDLE_ID).watchremote.uitests";
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_EMIT_LOC_STRINGS = NO;
TEST_TARGET_NAME = Faceclaw;
diff --git a/apple-watch/Faceclaw/PadStatus.swift b/apple-watch/Faceclaw/PadStatus.swift
index 5007efa0..669fa5e5 100644
--- a/apple-watch/Faceclaw/PadStatus.swift
+++ b/apple-watch/Faceclaw/PadStatus.swift
@@ -42,7 +42,7 @@ func padLine(state: PhoneState?, link: LinkStatus) -> StatusLine {
if !state.remoteEnabled { return StatusLine(text: "Watch control off", tone: .problem) }
if state.connected {
if state.charging || state.phase == "charging" {
- return StatusLine(text: chargingLine(state.battery), tone: .busy, detail: caseLine(state))
+ return StatusLine(text: chargingLine(state), tone: .busy, detail: caseLine(state))
}
if state.silentMode { return StatusLine(text: "Silent mode", tone: .off) }
if state.locked { return StatusLine(text: "Locked", tone: .off) }
@@ -64,8 +64,8 @@ func padLine(state: PhoneState?, link: LinkStatus) -> StatusLine {
return StatusLine(text: "Disconnected", tone: .off)
}
-private func chargingLine(_ battery: Int?) -> String {
- battery.map { "Charging · G2 \($0)%" } ?? "Charging"
+private func chargingLine(_ state: PhoneState) -> String {
+ state.battery.map { "Charging: \(state.glassesModel) \($0)%" } ?? "Charging"
}
/**
diff --git a/apple-watch/Faceclaw/PrivacyInfo.xcprivacy b/apple-watch/Faceclaw/PrivacyInfo.xcprivacy
new file mode 100644
index 00000000..ef7bb226
--- /dev/null
+++ b/apple-watch/Faceclaw/PrivacyInfo.xcprivacy
@@ -0,0 +1,23 @@
+
+
+
+
+ NSPrivacyAccessedAPITypes
+
+
+
+ NSPrivacyAccessedAPIType
+ NSPrivacyAccessedAPICategoryUserDefaults
+ NSPrivacyAccessedAPITypeReasons
+ CA92.1
+
+
+
+ NSPrivacyAccessedAPIType
+ NSPrivacyAccessedAPICategorySystemBootTime
+ NSPrivacyAccessedAPITypeReasons
+ 35F9.1
+
+
+
+
diff --git a/apple-watch/Faceclaw/Protocol.swift b/apple-watch/Faceclaw/Protocol.swift
index b7574d69..7ce85d7b 100644
--- a/apple-watch/Faceclaw/Protocol.swift
+++ b/apple-watch/Faceclaw/Protocol.swift
@@ -103,8 +103,10 @@ struct PhoneState: Equatable {
var locked = false
var worn: Bool?
var listening = false
- /** Current or last-known G2 charge percentage. */
+ /** The glasses' current or last-known charge percentage. */
var battery: Int?
+ /** The paired glasses' model, as the charging line names it. */
+ var glassesModel = "G2"
var charging = false
/** Last-known charging-case percentage; live only while the glasses are docked. */
var caseBattery: Int?
@@ -139,6 +141,7 @@ struct PhoneState: Equatable {
state.worn = o["worn"] as? Bool
state.listening = o["listening"] as? Bool ?? false
state.battery = percent(o["battery"])
+ state.glassesModel = o["glassesModel"] as? String ?? "G2"
state.charging = o["charging"] as? Bool ?? false
state.caseBattery = percent(o["caseBattery"])
state.caseCharging = o["caseCharging"] as? Bool
diff --git a/apple-watch/README.md b/apple-watch/README.md
index ca107eab..c510e8c6 100644
--- a/apple-watch/README.md
+++ b/apple-watch/README.md
@@ -112,9 +112,37 @@ xcrun devicectl device capture screenshot --device --destination wa
A hook (`scripts/apple-watch-embed.cjs`) adds the watch project to the generated iOS
project after each prepare, and takes it back out if the setting is removed. The
-bundle ID follows `IOS_BUNDLE_ID` (the watch app's is `.watchkitapp`) and the
+bundle ID follows `IOS_BUNDLE_ID` (the watch app's is `.watchremote`) and the
version follows `app/version.ts`.
+### TestFlight releases
+
+Build the iPhone release with embedding enabled:
+
+```bash
+FACECLAW_EMBED_WATCH=1 npm run build:ios -- --release
+```
+
+Keep `FACECLAW_EMBED_WATCH=1` in `build_paths.sh` if that file sets the option.
+Distribute the resulting `platforms/ios/build/Release-iphoneos/faceclaw.xcarchive`
+through Xcode Organizer using App Store Connect. The watch companion travels inside
+the iOS archive; do not upload the standalone watch development build.
+
+Before uploading, check that `Products/Applications/faceclaw.app/Watch/Faceclaw.app`
+exists in the archive. Its bundle ID must be `com.faceclaw.app.watchremote` for the
+public release, with `WKCompanionAppBundleIdentifier` set to `com.faceclaw.app`.
+Both apps must have the same version and build number; the hook copies the build
+number from `App_Resources/iOS/Info.plist`. The watch app is dependent on the phone
+app, and includes its own privacy manifest for preferences and gesture timing.
+
+Include UUID-matching debug symbols for both apps and their embedded frameworks in
+the archive's `dSYMs` directory. Name the watch symbol bundle
+`FaceclawWatch.app.dSYM` when copying it from `Release-watchos/Faceclaw.app.dSYM`,
+so it doesn't overwrite the phone's `faceclaw.app.dSYM` on a case-insensitive disk.
+After Apple processes the upload, verify that
+TestFlight's build metadata recognizes the Apple Watch companion before adding it
+to Public Beta.
+
## Testing
```bash
diff --git a/build_paths.sh.template b/build_paths.sh.template
index 5cc81e1c..ac9baf4c 100644
--- a/build_paths.sh.template
+++ b/build_paths.sh.template
@@ -11,6 +11,8 @@
# iOS bundle ID; set one your signing team owns to sideload alongside the
# official build (default com.faceclaw.app). Also used by the iOS config scripts.
#export IOS_BUNDLE_ID=
+# Which iPhone scripts target (default: the only one connected)
+#export IOS_DEVICE=
# Embed the Apple Watch app in the iOS app. Its link to the phone needs this, and
# signing it needs a watch registered to your team, so it's off by default.
#export FACECLAW_EMBED_WATCH=1
diff --git a/native/kotlin/README.md b/native/kotlin/README.md
index edad410e..4ad08a49 100644
--- a/native/kotlin/README.md
+++ b/native/kotlin/README.md
@@ -13,7 +13,7 @@ local `@faceclaw/kotlin` plugin. Generated binaries and Gradle caches are ignore
primitives, sha256/clock/log/file expects), `g2protocol/FirmwareImage`,
`audio/` (Lc3PacketFramer, AudioSegmentation, VoicePrint, WavPcmReader),
`graphics/` (GrayPacket, PreviewPalette, StatusIconArt, NotificationIconArt,
- GlyphPacket, OpenTypeNames, SvgIconSource), `net/` (HttpIdentity, SseStream,
+ ColorGlyphArt, GlyphPacket, OpenTypeNames, SvgIconSource), `net/` (HttpIdentity, SseStream,
ResumableDownload, RemoteInputSession), `evenhub/EvenHubAssetServer`,
`alarms/` (AlarmSchedule, AlarmRingingPolicy), `settings/SettingsChangeHub`,
the stock-firmware flows over a `StockLink` GATT port (`g2protocol/StockLinkSession`,
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/audio/VoiceCaptureSession.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/audio/VoiceCaptureSession.kt
index 33c81cf1..3a68f866 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/audio/VoiceCaptureSession.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/audio/VoiceCaptureSession.kt
@@ -449,9 +449,10 @@ class VoiceCaptureSession(
}
private fun processG2Audio() {
- val pcm = ShortArray(PACKET_SAMPLES)
+ var pcm = ShortArray(PACKET_SAMPLES)
while (started) {
val currentDecoder = packetDecoder ?: return
+ if (pcm.size < currentDecoder.maxSamplesPerPacket) pcm = ShortArray(currentDecoder.maxSamplesPerPacket)
val packet = takeAudioPacket()
if (packet == null) {
continue
@@ -474,7 +475,7 @@ class VoiceCaptureSession(
maybeEmitAudioStats(false)
continue
}
- processPcmChunk(pcm, count, angleDegrees, ssr, true)
+ processPcmChunk(pcm, count, angleDegrees, ssr, currentDecoder.hasFrameMeta)
maybeEmitAudioStats(false)
}
}
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/audio/VoicePorts.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/audio/VoicePorts.kt
index 148c68a4..1844459a 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/audio/VoicePorts.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/audio/VoicePorts.kt
@@ -39,10 +39,19 @@ fun interface RecordingSink {
fun save(pcm16le: ByteArray, sampleRate: Int)
}
-/** A G2 microphone packet decoder (the shared [Lc3PacketFramer] over a platform LC3 codec). */
+/**
+ * A glasses microphone packet decoder to 16 kHz mono PCM: the G2's LC3 (the shared
+ * [Lc3PacketFramer] over a platform LC3 codec) or the RayNeo iO's Opus.
+ */
interface AudioPacketDecoder {
fun decodePacket(packet: ByteArray?, pcmOut: ShortArray?): Int
+ /** The most samples one packet decodes to: the size [decodePacket]'s pcmOut needs. */
+ val maxSamplesPerPacket: Int get() = Lc3PacketFramer.SAMPLES_PER_PACKET
+
+ /** Whether packets carry the G2 firmware's DSP metadata ([lastAngleDegrees], [lastSsr]). */
+ val hasFrameMeta: Boolean get() = true
+
val lastAngleDegrees: Int
val lastSsr: Int
val realPackets: Long
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g1/G1ArmFlashFlow.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g1/G1ArmFlashFlow.kt
new file mode 100644
index 00000000..fa340193
--- /dev/null
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g1/G1ArmFlashFlow.kt
@@ -0,0 +1,794 @@
+package com.faceclaw.app
+
+import kotlin.concurrent.Volatile
+import kotlin.jvm.JvmField
+
+class G1FlashTimings(
+ @JvmField val connectTimeoutMs: Int = ConnectionOptions.CONNECT_TIMEOUT_MS,
+ @JvmField val servicesTimeoutMs: Int = ConnectionOptions.SERVICES_TIMEOUT_MS,
+ @JvmField val descriptorTimeoutMs: Int = ConnectionOptions.DESCRIPTOR_TIMEOUT_MS,
+ @JvmField val writeTimeoutMs: Int = ConnectionOptions.WRITE_TIMEOUT_MS,
+ /** The OS may be showing its pairing dialog. */
+ @JvmField val pairingMs: Int = 60_000,
+ @JvmField val retryDelayMs: Int = 2_000,
+ @JvmField val controlReplyMs: Int = 1_500,
+ @JvmField val controlTries: Int = 4,
+ /** The first chunk of an upload waits for the arm to erase its slot. */
+ @JvmField val uploadReplyMs: Int = 30_000,
+ @JvmField val smpReplyMs: Int = 20_000,
+ /** The arm may go down before its reply leaves. */
+ @JvmField val resetReplyMs: Int = 5_000,
+ @JvmField val heartbeatMs: Int = 8_000,
+ @JvmField val pollMs: Int = 200,
+ @JvmField val uploadRetries: Int = 40,
+ /** How often a store job's state is asked for while its notice hasn't come. */
+ @JvmField val storePollMs: Int = 2_000,
+ /** Erasing the store over Even's old fonts and pictures takes minutes. */
+ @JvmField val wipeMs: Int = 1_800_000,
+ @JvmField val crcMs: Int = 30_000,
+)
+
+/**
+ * Installs an MCUboot image on one G1 arm through MCUmgr SMP, or asks an arm what it runs; a port of scouter_kit's
+ * g1_firmware/flash.py. The caller handles one arm at a time and looks for the arm again afterwards: it restarts, and
+ * coming off firmware older than g1v0 0.5.66 it has a new address.
+ *
+ * Nothing changes on the arm until the confirm, which comes only after the arm's image list shows that its second slot
+ * holds exactly this image. MCUboot then overwrites the running firmware with no way back. [run] blocks; the worker thread
+ * is the host's.
+ *
+ * [Mode.RESTORE] puts Even's firmware back on an arm running g1v0: both of a release's images, the application core's
+ * ([firmwarePath]) and the network core's ([netCorePath]), as Even's own update does, so the two always match.
+ */
+class G1ArmFlashFlow(
+ private val link: StockLink,
+ private val address: String,
+ private val side: String,
+ private val firmwarePath: String,
+ private val netCorePath: String,
+ private val mode: Mode,
+ /** How long to keep trying to reach the arm and pair with it. */
+ private val connectWindowMs: Int,
+ private val listener: FaceclawFirmwareFlasherListener,
+ private val timings: G1FlashTimings = G1FlashTimings(),
+ platform: ProtocolPlatform = protocolPlatform(),
+ private val readImage: (String) -> ByteArray = ::readFileData,
+) : StockLinkListener {
+ enum class Mode {
+ /** The arm runs Even's firmware. */
+ STOCK,
+ /** The arm runs g1v0: it answers what it runs, and an arm that already has this version is left alone. */
+ UPDATE,
+ /** Only say what the arm runs, and pair with it. */
+ PROBE,
+ /** The arm runs g1v0 and gets Even's firmware back. */
+ RESTORE,
+ }
+
+ companion object {
+ const val TAG = "FaceclawG1Flash"
+ private const val MIN_BATTERY_PERCENT = 30
+ private const val ANY_STORE_JOB = -1
+ private const val STORE_JOB_INTERRUPTED = -1
+
+ fun mode(name: String): Mode = when (name) {
+ "stock" -> Mode.STOCK
+ "update" -> Mode.UPDATE
+ "probe" -> Mode.PROBE
+ "restore" -> Mode.RESTORE
+ else -> throw IllegalArgumentException("unknown mode $name")
+ }
+ }
+
+ /** One image of an install: MCUboot's number for it, its bytes and the hash its slot is checked against. */
+ private class Part(val imageIndex: Int, val bytes: ByteArray, val label: String) {
+ val hash: ByteArray = G1Smp.imageHash(bytes)
+ }
+
+ private class LinkLostException(message: String) : Exception(message)
+
+ /** The arm has no g1v0 service. */
+ private class NotG1v0Exception : Exception("this arm doesn't run g1v0")
+
+ private val platform = platform
+ private val lock = platform.createLock()
+ private val sleeper = InterruptibleSleep(platform)
+ private val assembler = G1Smp.Assembler()
+
+ private var smpSeq = -1
+ private var smpReply: Map<*, *>? = null
+ private var smpLatch: Latch? = null
+ private var nextSmpSeq = 0
+
+ private var controlTag = -1
+ private var controlReply: G1Protocol.Reply? = null
+ private var controlLatch: Latch? = null
+ private var nextControlTag = 0
+
+ private var stockBattery: Int? = null
+ private var stockBatteryLatch: Latch? = null
+
+ /** `NOTICE` 8s since the store job now waited for was asked for. */
+ private val storeNotices = ArrayList()
+
+ /** The OS's half of a stale pairing goes once per run: a second failure isn't that. */
+ private var bondRemoved = false
+
+ private var linkLost = false
+ private var heartbeats = 0
+ private var nextHeartbeatAtMs = 0L
+
+ @Volatile
+ private var cancelled = false
+
+ fun cancel() {
+ cancelled = true
+ lock.withLock {
+ smpLatch?.countDown()
+ controlLatch?.countDown()
+ }
+ sleeper.interrupt()
+ }
+
+ fun run() {
+ link.setListener(this)
+ try {
+ when (mode) {
+ Mode.PROBE -> probe()
+ Mode.RESTORE -> restore()
+ else -> install()
+ }
+ } catch (e: Exception) {
+ val message = if (cancelled) "Cancelled." else StockLinkSession.messageOf(e)
+ log("failed: $message")
+ listener.onState("error", message)
+ listener.onComplete(false, message)
+ } finally {
+ quietly { link.disconnect(address) }
+ }
+ }
+
+ private fun probe() {
+ listener.onState("connecting", side)
+ try {
+ bringUp()
+ } catch (e: NotG1v0Exception) {
+ listener.onComplete(true, """{"firmware":"stock"}""")
+ return
+ }
+ listener.onState("checking", side)
+ val hello = hello()
+ listener.onComplete(true, """{"firmware":"g1v0","version":"${hello.version}","safeMode":${hello.safeMode},"inCase":${hello.inCase},"battery":${batteryPercent()}}""")
+ }
+
+ private fun readFirmware(path: String): ByteArray = try {
+ readImage(path)
+ } catch (e: Exception) {
+ throw IllegalStateException("could not read the firmware: " + StockLinkSession.messageOf(e), e)
+ }
+
+ private fun install() {
+ listener.onState("validating", side)
+ val image = readFirmware(firmwarePath)
+ val version = G1Smp.imageVersion(image)
+ val hash = G1Smp.imageHash(image)
+ log("image $version, ${image.size} bytes, hash ${BinaryEncoding.bytesToHex(hash.copyOf(8))}")
+
+ listener.onState("connecting", side)
+ bringUp()
+ if (mode == Mode.UPDATE) {
+ listener.onState("checking", side)
+ val hello = hello()
+ log("runs g1v0 ${hello.version}, safe mode ${hello.safeMode}, in the case ${hello.inCase}, encrypted ${hello.encrypted}")
+ if (hello.version == version && !hello.safeMode) {
+ listener.onComplete(true, """{"flashed":false,"version":"$version"}""")
+ return
+ }
+ requireBattery(batteryPercent())
+ } else {
+ val battery = stockBatteryPercent()
+ log(if (battery == null) "battery unknown; going on, as the arm is in the case" else "battery $battery%")
+ requireBattery(battery)
+ }
+
+ val slots = retrying { images() }
+ for (slot in slots) log(slot.toString())
+ listener.onState("flashing", side)
+ if (holdsImage(slots, G1Smp.IMAGE_APP, hash)) {
+ log("the second slot already holds this image")
+ listener.onProgress(side, 1, 1, image.size, image.size, image.size.toLong(), image.size.toLong())
+ } else {
+ val startedAt = now()
+ upload(image, G1Smp.IMAGE_APP)
+ log("uploaded in ${(now() - startedAt) / 1000} s")
+ }
+ if (!holdsImage(retrying { images() }, G1Smp.IMAGE_APP, hash)) {
+ throw IllegalStateException("The $side arm's second slot doesn't hold the image after the upload. Nothing was installed.")
+ }
+ throwIfCancelled()
+
+ listener.onState("committing", side)
+ val confirm = smp(G1Smp.OP_WRITE, G1Smp.GROUP_IMAGE, G1Smp.CMD_IMAGE_STATE, G1Smp.confirmRequest(hash), timings.smpReplyMs)
+ val code = G1Smp.replyCode(confirm)
+ if (code != 0) throw IllegalStateException("The $side arm refused the image (error $code). Nothing was installed.")
+ log("confirmed: MCUboot installs it at the next boot")
+ reset()
+ listener.onState("rebooting", side)
+ listener.onComplete(true, """{"flashed":true,"version":"$version"}""")
+ }
+
+ /**
+ * Even's firmware back on an arm running g1v0: the store cleared if g1v0 ever wrote to it, then both images uploaded
+ * and checked, and only then marked for MCUboot, the network core first. MCUboot installs both at the reset, the
+ * network core through its own path to that core, as at every update from Even.
+ */
+ private fun restore() {
+ listener.onState("validating", side)
+ val parts = listOf(
+ Part(G1Smp.IMAGE_NET_CORE, readFirmware(netCorePath), "network core"),
+ Part(G1Smp.IMAGE_APP, readFirmware(firmwarePath), "application"),
+ )
+ for (part in parts) log("${part.label} image: ${part.bytes.size} bytes, hash ${BinaryEncoding.bytesToHex(part.hash.copyOf(8))}")
+
+ listener.onState("connecting", side)
+ bringUp()
+ listener.onState("checking", side)
+ val hello = hello()
+ log("runs g1v0 ${hello.version}, safe mode ${hello.safeMode}, in the case ${hello.inCase}, encrypted ${hello.encrypted}")
+ requireBattery(batteryPercent())
+ val wiped = clearStore(hello)
+
+ val slots = retrying { images() }
+ for (slot in slots) log(slot.toString())
+ listener.onState("flashing", side)
+ val total = parts.sumOf { it.bytes.size }
+ var before = 0
+ for ((index, part) in parts.withIndex()) {
+ if (holdsImage(slots, part.imageIndex, part.hash)) {
+ log("the ${part.label}'s second slot already holds Even's image")
+ listener.onProgress(side, index + 1, parts.size, part.bytes.size, part.bytes.size, (before + part.bytes.size).toLong(), total.toLong())
+ } else {
+ val startedAt = now()
+ upload(part.bytes, part.imageIndex, index + 1, parts.size, before, total)
+ log("${part.label} uploaded in ${(now() - startedAt) / 1000} s")
+ }
+ before += part.bytes.size
+ }
+ val uploaded = retrying { images() }
+ for (part in parts) {
+ if (!holdsImage(uploaded, part.imageIndex, part.hash)) {
+ throw IllegalStateException("The $side arm's slot for its ${part.label} doesn't hold Even's image after the upload. Nothing was installed.")
+ }
+ }
+ throwIfCancelled()
+
+ listener.onState("committing", side)
+ // The network core first. If the second request fails, what's left pending is Even's network core under g1v0,
+ // which g1v0 works with (its fallback installs this very image); Even's application over the older network core
+ // is the combination that has never been tried.
+ for (part in parts) {
+ val permanent = part.imageIndex == G1Smp.IMAGE_APP
+ val reply = smp(G1Smp.OP_WRITE, G1Smp.GROUP_IMAGE, G1Smp.CMD_IMAGE_STATE, G1Smp.confirmRequest(part.hash, permanent), timings.smpReplyMs)
+ val code = G1Smp.replyCode(reply)
+ if (code != 0) {
+ throw IllegalStateException("The $side arm refused Even's ${part.label} image (error $code). The arm wasn't restarted; retry to try again.")
+ }
+ }
+ val marked = retrying { images() }
+ for (slot in marked) log(slot.toString())
+ for (part in parts) {
+ if (!marked.any { it.image == part.imageIndex && it.slot == 1 && it.hash.contentEquals(part.hash) && "pending" in it.flags }) {
+ throw IllegalStateException("The $side arm didn't mark Even's ${part.label} image for installing. The arm wasn't restarted; retry to try again.")
+ }
+ }
+ log("both images marked: MCUboot installs them at the next boot")
+ reset()
+ listener.onState("rebooting", side)
+ listener.onComplete(true, """{"flashed":true,"firmware":"stock","wiped":$wiped}""")
+ }
+
+ private fun reset() {
+ try {
+ smp(G1Smp.OP_WRITE, G1Smp.GROUP_OS, G1Smp.CMD_OS_RESET, emptyMap(), timings.resetReplyMs)
+ } catch (e: StockTimeoutException) {
+ log("no answer to the reset")
+ } catch (e: LinkLostException) {
+ log("the link went down with the reset")
+ }
+ }
+
+ // ---- the asset store ---------------------------------------------------------
+
+ /**
+ * Before Even's firmware goes back: g1v0's asset store took the flash where Even's fonts and pictures were, so if it
+ * ever wrote there, Even's firmware must meet erased flash (flash.py's `wipe_store`). A store that was never written
+ * is left alone, and Even's data with it. True when it was erased.
+ */
+ private fun clearStore(hello: G1Protocol.Hello): Boolean {
+ repeat(3) {
+ val info = assetInfo()
+ if (info == null) {
+ log("no asset store: this firmware never wrote where Even's data is")
+ return false
+ }
+ if (!info.available) {
+ log("the asset store is unavailable, so nothing was written to it")
+ return false
+ }
+ if (info.running) {
+ // A retried request can find its own job running, as can a retry after a link lost during a wipe.
+ log("a storage job is running: waiting for it to end")
+ clearStoreNotices()
+ waitStoreJob(ANY_STORE_JOB, timings.wipeMs.toLong())
+ return@repeat
+ }
+ if (!storeWritten(info, hello)) {
+ log("the asset store was never written: Even's fonts and pictures stay as they are")
+ return false
+ }
+ if (hello.safeMode) throw IllegalStateException(safeModeMessage())
+ listener.onState("wiping", side)
+ log("erasing the asset store (${info.assets} assets, commit ${info.seq})")
+ val startedAt = now()
+ clearStoreNotices()
+ when (val status = control(G1Protocol.OP_ASSET_FORMAT, G1Protocol.assetFormatRequest(wipe = true)).status) {
+ 0 -> {
+ val result = waitStoreJob(G1Protocol.STORE_JOB_FORMAT, timings.wipeMs.toLong())
+ if (result == STORE_JOB_INTERRUPTED) {
+ throw IllegalStateException("The $side arm restarted while erasing Faceclaw's storage. Nothing was installed; retry to finish it.")
+ }
+ if (result != 0) {
+ throw IllegalStateException("The $side arm couldn't erase Faceclaw's storage (error $result). Nothing was installed.")
+ }
+ log("asset store erased in ${(now() - startedAt) / 1000} s")
+ return true
+ }
+ G1Protocol.STATUS_SAFE_MODE -> throw IllegalStateException(safeModeMessage())
+ // A job runs: the next round waits for it.
+ G1Protocol.STATUS_ASSET -> {}
+ else -> throw IllegalStateException("The $side arm refused to erase Faceclaw's storage (error $status). Nothing was installed.")
+ }
+ }
+ throw IllegalStateException("The $side arm's storage couldn't be erased. Nothing was installed.")
+ }
+
+ private fun safeModeMessage(): String =
+ "The $side arm is in safe mode (its firmware restarted repeatedly), where it can't erase Faceclaw's storage, and that has to " +
+ "happen before Even's firmware goes back. Install Faceclaw's firmware again, then uninstall it. Nothing was installed."
+
+ /**
+ * Whether g1v0 ever wrote to the store. It only reads it at boot, so with no assets and no commit nothing was written,
+ * unless a format erased the directory's two sectors (a format resets the commit count), which their fingerprint shows.
+ */
+ private fun storeWritten(info: G1Protocol.AssetInfo, hello: G1Protocol.Hello): Boolean {
+ if (info.assets > 0 || info.seq != 0L) return true
+ if (hello.safeMode) {
+ log("safe mode: the directory can't be checked")
+ return true
+ }
+ val nonErased = flashNonErased(G1Protocol.STORE_ADDRESS, G1Protocol.STORE_DIRECTORY_BYTES)
+ log("the store's directory sectors: ${nonErased ?: "unknown"} bytes not erased")
+ return nonErased == null || nonErased == 0L
+ }
+
+ /** How many bytes of flash [from]…[from] + [n] - 1 aren't 0xFF, or null when the arm didn't say. */
+ private fun flashNonErased(from: Int, n: Int): Long? {
+ clearStoreNotices()
+ val status = try {
+ control(G1Protocol.OP_FLASH_CRC, G1Protocol.flashCrcRequest(from, n)).status
+ } catch (e: StockTimeoutException) {
+ return null
+ }
+ // 13: a crc job runs, which a retried request finds when the first one's reply was lost; its notice says the same.
+ if (status != 0 && status != G1Protocol.STATUS_ASSET) return null
+ val deadline = now() + timings.crcMs
+ while (now() < deadline) {
+ throwIfCancelled()
+ val notice = lock.withLock {
+ storeNotices.firstOrNull { it.job == G1Protocol.STORE_JOB_CRC && it.address == from && it.n == n }
+ }
+ if (notice != null) return if (notice.result == 0) notice.nonErased else null
+ if (!link.isConnected(address)) return null
+ sleeper.sleep(timings.pollMs.toLong())
+ }
+ return null
+ }
+
+ private fun assetInfo(): G1Protocol.AssetInfo? {
+ val reply = control(G1Protocol.OP_ASSET_INFO)
+ return if (reply.status == 0) G1Protocol.parseAssetInfo(reply.body) else null
+ }
+
+ private fun clearStoreNotices() = lock.withLock { storeNotices.clear() }
+
+ /**
+ * The result of the store job running now: its `NOTICE` 8, or `ASSET_INFO`'s state once it has ended (a notice is lost
+ * with the link, and the job goes on without it). [STORE_JOB_INTERRUPTED] when the arm restarted meanwhile, which ends
+ * a job unfinished.
+ */
+ private fun waitStoreJob(job: Int, timeoutMs: Long): Int {
+ val deadline = now() + timeoutMs
+ var askAt = now() + timings.storePollMs
+ while (true) {
+ throwIfCancelled()
+ val notice = lock.withLock { storeNotices.firstOrNull { job == ANY_STORE_JOB || it.job == job } }
+ if (notice != null) return notice.result
+ if (now() >= deadline) throw StockTimeoutException("the $side arm's storage job didn't end within ${timeoutMs / 60_000} minutes")
+ if (now() >= askAt) {
+ askAt = now() + timings.storePollMs
+ val info = try {
+ assetInfo()
+ } catch (e: Exception) {
+ if (e !is StockTimeoutException && e !is LinkLostException) throw e
+ log("no answer while the storage job runs (${e.message})")
+ reconnectIfNeeded()
+ null
+ }
+ when (info?.state) {
+ G1Protocol.STORE_DONE -> return info.lastError
+ G1Protocol.STORE_FAILED -> return if (info.lastError != 0) info.lastError else G1Protocol.STATUS_ASSET
+ // A job leaves the state at done or failed until the next boot.
+ G1Protocol.STORE_IDLE -> return STORE_JOB_INTERRUPTED
+ }
+ }
+ sleeper.sleep(timings.pollMs.toLong())
+ }
+ }
+
+ private fun requireBattery(percent: Int?) {
+ if (percent != null && percent < MIN_BATTERY_PERCENT) {
+ throw IllegalStateException("The $side arm's battery is at $percent%, too low to install safely. " +
+ "Charge both arms to at least $MIN_BATTERY_PERCENT% in the case, then try again.")
+ }
+ }
+
+ private fun holdsImage(slots: List, imageIndex: Int, hash: ByteArray): Boolean =
+ slots.any { it.image == imageIndex && it.slot == 1 && it.hash.contentEquals(hash) }
+
+ private fun images(): List =
+ G1Smp.parseSlots(smp(G1Smp.OP_READ, G1Smp.GROUP_IMAGE, G1Smp.CMD_IMAGE_STATE, emptyMap(), timings.smpReplyMs))
+
+ /**
+ * MCUmgr answers each chunk with the offset it wants next, so an upload resumes after a lost link. Progress counts
+ * [before] bytes of earlier parts out of [total].
+ */
+ private fun upload(image: ByteArray, imageIndex: Int, part: Int = 1, parts: Int = 1, before: Int = 0, total: Int = image.size) {
+ val fileSha = sha256(image)
+ var offset = 0
+ var failures = 0
+ while (offset < image.size) {
+ throwIfCancelled()
+ val reply = try {
+ smp(G1Smp.OP_WRITE, G1Smp.GROUP_IMAGE, G1Smp.CMD_IMAGE_UPLOAD, G1Smp.uploadRequest(image, offset, fileSha, imageIndex), timings.uploadReplyMs)
+ } catch (e: Exception) {
+ if (e !is StockTimeoutException && e !is LinkLostException) throw e
+ failures++
+ if (failures > timings.uploadRetries) throw e
+ log("chunk at $offset failed (${e.message}), trying again")
+ reconnectIfNeeded()
+ continue
+ }
+ val code = G1Smp.replyCode(reply)
+ val next = G1Smp.replyOffset(reply)
+ if (code != 0 || next == null || next < 0 || next > image.size) {
+ throw IllegalStateException("The $side arm refused the upload at $offset (error $code). Nothing was installed.")
+ }
+ offset = next
+ listener.onProgress(side, part, parts, offset, image.size, (before + offset).toLong(), total.toLong())
+ }
+ }
+
+ private fun retrying(request: () -> T): T {
+ var attempt = 0
+ while (true) {
+ try {
+ return request()
+ } catch (e: Exception) {
+ if (e !is StockTimeoutException && e !is LinkLostException) throw e
+ attempt++
+ if (attempt >= 10) throw e
+ log("request failed (${e.message}), trying again")
+ reconnectIfNeeded()
+ }
+ }
+ }
+
+ private fun reconnectIfNeeded() {
+ throwIfCancelled()
+ lock.withLock { assembler.reset() }
+ if (!link.isConnected(address)) bringUp()
+ }
+
+ // ---- the link ------------------------------------------------------------
+
+ private fun bringUp() {
+ val deadline = now() + connectWindowMs
+ var attempt = 0
+ while (true) {
+ throwIfCancelled()
+ attempt++
+ val failure = try {
+ connectOnce()
+ log("connected (attempt $attempt)")
+ return
+ } catch (e: NotG1v0Exception) {
+ throw e
+ } catch (e: Exception) {
+ StockLinkSession.messageOf(e)
+ }
+ log("connect attempt $attempt failed: $failure")
+ quietly { link.disconnect(address) }
+ if (now() >= deadline) {
+ throw IllegalStateException("Couldn't reach the $side arm: $failure. Keep the glasses in the case with the lid open; a fully " +
+ "charged arm can take up to 5 minutes to notice it's in the case. If this phone was paired with these glasses before and " +
+ "this keeps happening, remove them from its Bluetooth settings and try again.")
+ }
+ sleeper.sleep(timings.retryDelayMs.toLong())
+ }
+ }
+
+ private fun connectOnce() {
+ if (!link.connect(address, timings.connectTimeoutMs)) throw IllegalStateException("connect failed")
+ lock.withLock {
+ linkLost = false
+ assembler.reset()
+ }
+ link.prepareLink(address, G1Ble.REQUESTED_MTU, timings.connectTimeoutMs)
+ if (!link.discoverServices(address, timings.servicesTimeoutMs)) throw IllegalStateException("service discovery failed")
+ if (mode == Mode.STOCK) {
+ // Even's firmware serves its own service only on an encrypted link, and the heartbeat goes there.
+ settleBond()
+ if (!haveCharacteristic(G1Smp.NUS_TX_UUID)) throw IllegalStateException("no link to Even's service")
+ if (!subscribe(G1Smp.NUS_TX_UUID)) {
+ // Bonded and refused: Even's firmware keeps one bond and has lost this one. This run started in the case.
+ removeStaleBond()
+ throw IllegalStateException("no link to Even's service")
+ }
+ heartbeats = 0
+ nextHeartbeatAtMs = 0
+ } else {
+ if (!haveCharacteristic(G1Ble.EVT_CHAR_UUID)) {
+ if (!link.isConnected(address)) throw LinkLostException("the link went down")
+ throw NotG1v0Exception()
+ }
+ if (!subscribe(G1Ble.EVT_CHAR_UUID)) throw IllegalStateException("no events from the arm")
+ // Out of the case the arm obeys only an encrypted link.
+ settleBond()
+ val paired = try {
+ link.writeFrames(address, G1Ble.PAIR_CHAR_UUID, listOf(byteArrayOf(1)), GattWriteMode.WITH_RESPONSE, timings.pairingMs)
+ } catch (e: IllegalStateException) {
+ false
+ }
+ if (!paired) {
+ // The OS says bonded and the arm disagrees. Giving that up is safe only where a new bond can be made.
+ if (link.isConnected(address) && inCaseWithoutEncryption()) removeStaleBond()
+ throw IllegalStateException("no encrypted link: an arm pairs only in its case")
+ }
+ }
+ if (mode != Mode.PROBE && (!haveCharacteristic(G1Smp.SMP_CHAR_UUID) || !subscribe(G1Smp.SMP_CHAR_UUID))) {
+ throw IllegalStateException("no update service")
+ }
+ }
+
+ /** An arm keeps its address across an install, and the OS may remember the services it had before: look again before believing that. */
+ private fun haveCharacteristic(uuid: String): Boolean {
+ if (link.hasCharacteristic(address, uuid)) return true
+ log("no $uuid in the service table: reading it again")
+ link.refreshServices(address, timings.servicesTimeoutMs)
+ return link.hasCharacteristic(address, uuid)
+ }
+
+ private fun subscribe(uuid: String): Boolean = try {
+ link.enableNotifications(address, uuid, timings.descriptorTimeoutMs)
+ } catch (e: IllegalStateException) {
+ false
+ }
+
+ private fun removeStaleBond() {
+ if (bondRemoved || link.bondState(address) != BondState.BONDED) return
+ if (link.removeBond(address)) {
+ bondRemoved = true
+ log("the arm no longer has this phone's pairing: removed it, pairing again")
+ }
+ }
+
+ /** An unencrypted link gets an answer only from an arm in the case. */
+ private fun inCaseWithoutEncryption(): Boolean = try {
+ val hello = G1Protocol.parseHello(control(G1Protocol.OP_HELLO, tries = 1).body)
+ hello != null && hello.inCase && !hello.encrypted
+ } catch (e: Exception) {
+ false
+ }
+
+ /** Null when no answer came, which firmware that doesn't have the query also gives. */
+ private fun stockBatteryPercent(): Int? {
+ repeat(timings.controlTries) {
+ val latch = Latch(1, platform)
+ lock.withLock {
+ stockBattery = null
+ stockBatteryLatch = latch
+ }
+ try {
+ link.writeFrames(address, G1Smp.NUS_RX_UUID, listOf(G1Smp.STOCK_BATTERY_QUERY), GattWriteMode.WITHOUT_RESPONSE, timings.writeTimeoutMs)
+ } catch (e: IllegalStateException) {
+ return null
+ }
+ latch.await(timings.controlReplyMs.toLong())
+ throwIfCancelled()
+ val answer = lock.withLock {
+ stockBatteryLatch = null
+ stockBattery
+ }
+ if (answer != null) return answer
+ }
+ return null
+ }
+
+ /** Asks the OS to pair if it hasn't, and waits for that to end; a platform that doesn't say pairs by itself. */
+ private fun settleBond() {
+ if (link.bondState(address) == BondState.NONE) {
+ listener.onState("pairing", side)
+ link.requestBond(address)
+ }
+ val deadline = now() + timings.pairingMs
+ var sawBonding = false
+ while (true) {
+ throwIfCancelled()
+ when (link.bondState(address)) {
+ BondState.BONDED, BondState.UNKNOWN -> return
+ BondState.BONDING -> sawBonding = true
+ BondState.NONE -> if (sawBonding) throw IllegalStateException("pairing was refused")
+ }
+ if (!link.isConnected(address)) throw LinkLostException("the link went down while pairing")
+ if (now() >= deadline) throw IllegalStateException("pairing took too long")
+ sleeper.sleep(timings.pollMs.toLong())
+ }
+ }
+
+ private fun heartbeatIfDue() {
+ if (mode != Mode.STOCK || now() < nextHeartbeatAtMs) return
+ val seq = heartbeats % 0xff
+ heartbeats++
+ nextHeartbeatAtMs = now() + timings.heartbeatMs
+ try {
+ link.writeFrames(address, G1Smp.NUS_RX_UUID, listOf(G1Smp.stockHeartbeat(seq)), GattWriteMode.WITHOUT_RESPONSE, timings.writeTimeoutMs)
+ } catch (e: IllegalStateException) {
+ // The request waiting now finds out.
+ }
+ }
+
+ private fun smp(op: Int, group: Int, cmd: Int, payload: Map, timeoutMs: Int): Map<*, *> {
+ val seq = nextSmpSeq
+ nextSmpSeq = (nextSmpSeq + 1) and 0xff
+ val latch = Latch(1, platform)
+ lock.withLock {
+ smpSeq = seq
+ smpReply = null
+ smpLatch = latch
+ }
+ try {
+ heartbeatIfDue()
+ val frames = G1Smp.split(G1Smp.frame(op, group, seq, cmd, payload), link.negotiatedMtu(address))
+ val written = try {
+ link.writeFrames(address, G1Smp.SMP_CHAR_UUID, frames, GattWriteMode.WITHOUT_RESPONSE, timings.writeTimeoutMs)
+ } catch (e: IllegalStateException) {
+ false
+ }
+ if (!written) throw LinkLostException("write failed")
+ val deadline = now() + timeoutMs
+ while (true) {
+ throwIfCancelled()
+ heartbeatIfDue()
+ val remaining = deadline - now()
+ if (remaining <= 0) throw StockTimeoutException("no answer from the $side arm within $timeoutMs ms")
+ latch.await(minOf(remaining, timings.pollMs.toLong()))
+ val (reply, lost) = lock.withLock { smpReply to linkLost }
+ if (reply != null) return reply
+ if (lost) throw LinkLostException("the link went down")
+ }
+ } finally {
+ lock.withLock {
+ if (smpLatch === latch) smpLatch = null
+ }
+ }
+ }
+
+ private fun control(op: Int, body: ByteArray = ByteArray(0), tries: Int = timings.controlTries): G1Protocol.Reply {
+ repeat(tries) {
+ val tag = nextControlTag % 255 + 1
+ nextControlTag = tag
+ val latch = Latch(1, platform)
+ lock.withLock {
+ controlTag = tag
+ controlReply = null
+ controlLatch = latch
+ }
+ val written = try {
+ link.writeFrames(address, G1Ble.CTRL_CHAR_UUID, listOf(G1Protocol.control(op, tag, body)), GattWriteMode.WITHOUT_RESPONSE, timings.writeTimeoutMs)
+ } catch (e: IllegalStateException) {
+ false
+ }
+ if (!written) throw LinkLostException("write failed")
+ latch.await(timings.controlReplyMs.toLong())
+ throwIfCancelled()
+ val (reply, lost) = lock.withLock {
+ controlLatch = null
+ controlReply to linkLost
+ }
+ if (reply != null) return reply
+ if (lost) throw LinkLostException("the link went down")
+ }
+ throw StockTimeoutException("no answer to request $op from the $side arm")
+ }
+
+ private fun hello(): G1Protocol.Hello {
+ val reply = control(G1Protocol.OP_HELLO)
+ return G1Protocol.parseHello(reply.body) ?: throw IllegalStateException("The $side arm's firmware isn't one this app knows.")
+ }
+
+ /** Null when the arm doesn't know yet, or a firmware doesn't say. */
+ private fun batteryPercent(): Int? {
+ val reply = control(G1Protocol.OP_PROPS, byteArrayOf(G1Protocol.PROP_BATT_PCT.toByte()))
+ if (reply.status != 0) return null
+ val value = G1Protocol.parseProps(reply.body, 1)?.get(0) ?: return null
+ return if (value in 0..100) value else null
+ }
+
+ private fun throwIfCancelled() {
+ if (cancelled) throw IllegalStateException("Cancelled.")
+ }
+
+ private fun now(): Long = platform.elapsedRealtimeMs()
+
+ private fun log(line: String) = listener.onLog("$side arm: $line")
+
+ private inline fun quietly(action: () -> Unit) {
+ try {
+ action()
+ } catch (ignored: Exception) {
+ }
+ }
+
+ // ---- inbound -------------------------------------------------------------
+
+ override fun onNotification(address: String, characteristicUuid: String, data: ByteArray) {
+ if (characteristicUuid.equals(G1Smp.SMP_CHAR_UUID, ignoreCase = true)) {
+ lock.withLock {
+ for ((seq, body) in assembler.feed(data)) {
+ if (seq == smpSeq) {
+ smpReply = body
+ smpLatch?.countDown()
+ }
+ }
+ }
+ } else if (characteristicUuid.equals(G1Smp.NUS_TX_UUID, ignoreCase = true)) {
+ val percent = G1Smp.parseStockBattery(data) ?: return
+ lock.withLock {
+ stockBattery = percent
+ stockBatteryLatch?.countDown()
+ }
+ } else if (characteristicUuid.equals(G1Ble.EVT_CHAR_UUID, ignoreCase = true)) {
+ val notice = G1Protocol.parseStoreNotice(data)
+ if (notice != null) {
+ lock.withLock { storeNotices.add(notice) }
+ return
+ }
+ val reply = G1Protocol.parseReply(data) ?: return
+ lock.withLock {
+ if (reply.tag == controlTag) {
+ controlReply = reply
+ controlLatch?.countDown()
+ }
+ }
+ }
+ }
+
+ override fun onConnectionStateChange(address: String, connected: Boolean) {
+ if (connected) return
+ lock.withLock {
+ linkLost = true
+ smpLatch?.countDown()
+ controlLatch?.countDown()
+ }
+ }
+}
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g1/G1FramePlanner.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g1/G1FramePlanner.kt
new file mode 100644
index 00000000..d1ff0abc
--- /dev/null
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g1/G1FramePlanner.kt
@@ -0,0 +1,57 @@
+package com.faceclaw.app
+
+/**
+ * One lens's update on an Even G1: the rectangles that differ from what the arm's frame holds, as RLE bbox calls
+ * in draw messages. The transport's deflate runs over these messages, as on the G2; there is no resource cache,
+ * so everything visible arrives as pixels.
+ */
+object G1FramePlanner {
+ /** The firmware's limit on a decoded message is 16384 bytes (scouter_kit fc.c MAX_MESSAGE). */
+ const val MAX_MESSAGE = 16000
+
+ /** A big rectangle goes out in bands, so that one noisy area doesn't need a long binary split. */
+ private const val BAND_ROWS = 32
+ private const val MAX_RECTS = ConnectionOptions.MULTI_RECT_MAX_RECTS
+
+ /** [previous] null or of another size: a full frame. Empty when nothing changed. */
+ fun plan(previous: ByteArray?, next: ByteArray, width: Int, height: Int): List {
+ val stride = (width + 1) / 2
+ require(next.size == stride * height)
+ val rects = changedRects(previous, next, width, height)
+ if (rects.isEmpty()) return emptyList()
+ val calls = ArrayList()
+ for (r in rects) {
+ var top = r[1]
+ val bottom = r[1] + r[3]
+ while (top < bottom) {
+ val rows = minOf(BAND_ROWS, bottom - top)
+ addRect(calls, next, stride, r[0], top, r[2], rows)
+ top += rows
+ }
+ }
+ return DrawProtocol.messages(calls, MAX_MESSAGE)
+ }
+
+ private fun changedRects(previous: ByteArray?, next: ByteArray, width: Int, height: Int): List {
+ if (previous == null || previous.size != next.size) return listOf(intArrayOf(0, 0, width, height))
+ BleImageOptimizer.computeChangedRects(previous, next, width, height, MAX_RECTS)?.let { return it }
+ return listOfNotNull(BleImageOptimizer.computeChangedBox(previous, next, width, height))
+ }
+
+ /** Splits until the call fits a message; a single pixel always does. */
+ private fun addRect(calls: MutableList, packed: ByteArray, stride: Int, x: Int, y: Int, w: Int, h: Int) {
+ val call = DrawProtocol.bbox(packed, stride, x, y, w, h)
+ if (call.size + MESSAGE_OVERHEAD <= MAX_MESSAGE) {
+ calls.add(call)
+ } else if (h > 1) {
+ addRect(calls, packed, stride, x, y, w, h / 2)
+ addRect(calls, packed, stride, x, y + h / 2, w, h - h / 2)
+ } else {
+ addRect(calls, packed, stride, x, y, w / 2, h)
+ addRect(calls, packed, stride, x + w / 2, y, w - w / 2, h)
+ }
+ }
+
+ /** The message type, the call count and the call's length (DrawProtocol.sequence). */
+ private const val MESSAGE_OVERHEAD = 5
+}
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g1/G1Protocol.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g1/G1Protocol.kt
new file mode 100644
index 00000000..5990c962
--- /dev/null
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g1/G1Protocol.kt
@@ -0,0 +1,336 @@
+package com.faceclaw.app
+
+import kotlin.jvm.JvmField
+
+/** The GATT service of g1v0, the firmware of an Even G1 (scouter_kit g1_firmware/docs/VM.md §6.1). */
+object G1Ble {
+ const val CTRL_CHAR_UUID = "f3da4d59-277a-4fc9-a1ed-41c9c22d4402"
+ const val EVT_CHAR_UUID = "f3da4d59-277a-4fc9-a1ed-41c9c22d4403"
+ /** Readable and writable only on an encrypted link: a write with response makes the OS pair, then proves the link is encrypted. */
+ const val PAIR_CHAR_UUID = "f3da4d59-277a-4fc9-a1ed-41c9c22d4404"
+ /** Faceclaw's records (VM.md §6.11). */
+ const val FC_CHAR_UUID = "f3da4d59-277a-4fc9-a1ed-41c9c22d4405"
+ /** The iPhone notification relay (VM.md §6.12): the G2's `AN` commands and frames, with this characteristic to itself. */
+ const val ANCS_CHAR_UUID = "f3da4d59-277a-4fc9-a1ed-41c9c22d4406"
+ const val REQUESTED_MTU = 247
+ /** The oldest firmware this app works with: `PROP_SET` came in here. */
+ const val REQUIRED_FIRMWARE = "0.5.63"
+
+ /** Dotted versions, component by component. */
+ fun firmwareAtLeast(version: String, required: String = REQUIRED_FIRMWARE): Boolean {
+ val have = version.split(".").map { it.toIntOrNull() ?: 0 }
+ val want = required.split(".").map { it.toIntOrNull() ?: 0 }
+ for (i in 0 until maxOf(have.size, want.size)) {
+ val delta = have.getOrElse(i) { 0 } - want.getOrElse(i) { 0 }
+ if (delta != 0) return delta > 0
+ }
+ return true
+ }
+}
+
+/**
+ * The wire formats of an Even G1 on g1v0: control requests and events (VM.md §6.3, §6.4), which Faceclaw uses as they
+ * are, and the display path's packets and answers (§6.11). No VM instruction is sent; the records inside the packets
+ * are [CfwTransport]'s, the same as on the G2.
+ */
+object G1Protocol {
+ const val OP_HELLO = 0x01
+ const val OP_HEALTH_OK = 0x07
+ const val OP_PROPS = 0x0A
+ const val OP_MIC = 0x13
+ const val OP_EVENTS = 0x14
+ const val OP_ASSET_INFO = 0x17
+ const val OP_ASSET_FORMAT = 0x1B
+ const val OP_FLASH_CRC = 0x1C
+ const val OP_FC_INFO = 0x1D
+ const val OP_PROP_SET = 0x1E
+
+ /** Control statuses (VM.md §1). */
+ const val STATUS_SAFE_MODE = 7
+ /** A store request: a job runs, no space, no store. */
+ const val STATUS_ASSET = 13
+
+ const val EV_NOTICE = 0x05
+ const val EV_MIC_DATA = 0x06
+ const val EV_INPUT = 0x07
+ const val EV_FC_ACK = 0x08
+ private const val EV_REPLY = 0x80
+ private const val EVENT_HEADER = 9
+ private const val OPT_START = 0x80
+ private const val OPT_END = 0x40
+ private const val MAX_PACKET = 244
+ private const val PACKET_HEADER = 2
+
+ /** The light sensor converts only while something uses it, as this bit of `EVENTS` does; the left arm has none. */
+ const val TRIGGER_LIGHT = 4
+ const val TRIGGER_BATTERY = 5
+ const val TRIGGER_CASE = 6
+ const val TRIGGER_WEAR = 7
+ const val TRIGGER_TOUCH = 8
+ const val EVENTS_MASK = (1 shl TRIGGER_LIGHT) or (1 shl TRIGGER_BATTERY) or (1 shl TRIGGER_CASE) or
+ (1 shl TRIGGER_WEAR) or (1 shl TRIGGER_TOUCH)
+
+ const val NOTICE_MIC_STOPPED = 5
+ const val MIC_STOPPED_LEASE = 3
+ const val NOTICE_GUARD = 7
+ /** A store job ended (VM.md §6.10). */
+ const val NOTICE_STORE_JOB = 8
+
+ const val STORE_JOB_FORMAT = 3
+ const val STORE_JOB_CRC = 4
+ /** `ASSET_INFO`'s job states. */
+ const val STORE_IDLE = 0
+ const val STORE_DONE = 4
+ const val STORE_FAILED = 5
+ /** The asset store's partition in the arm's QSPI flash, where Even's fonts and pictures were; its first two sectors hold its directory. */
+ const val STORE_ADDRESS = 0x140000
+ const val STORE_DIRECTORY_BYTES = 2 * 4096
+
+ const val PROP_BATT_PCT = 0x11
+ const val PROP_CHARGE = 0x12
+ const val PROP_IN_CASE = 0x13
+ const val PROP_WORN = 0x14
+ const val PROP_ACC_X = 0x18
+ const val PROP_ACC_Y = 0x19
+ const val PROP_ACC_Z = 0x1A
+ /** 0.01 lux, on the right arm, while the panel is on. */
+ const val PROP_LIGHT = 0x1C
+ const val PROP_IMU_RATE = 0x28
+ const val PROP_BRIGHTNESS_MAX = 0x29
+ const val IMU_RATE_IDLE = 13
+ const val IMU_RATE_STREAM = 26
+ const val BRIGHTNESS_LEVEL_MAX = 42
+ /** A property without a value yet (VM_UNKNOWN). */
+ const val UNKNOWN = Int.MIN_VALUE
+
+ const val CHARGE_CHARGING = 1
+
+ const val GESTURE_TAP = 1
+ const val GESTURE_DOUBLE_TAP = 2
+ const val GESTURE_TRIPLE_TAP = 3
+ const val GESTURE_LONG_START = 4
+ const val GESTURE_LONG_END = 5
+
+ /** The packets of one record: `[0x80 first | 0x40 last][stream][the next bytes]`. */
+ fun packets(record: ByteArray, stream: Int, mtu: Int): List {
+ val chunk = minOf(mtu - 3, MAX_PACKET) - PACKET_HEADER
+ require(record.isNotEmpty() && chunk >= 5 && stream in 0..255)
+ val packets = ArrayList(record.size / chunk + 1)
+ var offset = 0
+ while (offset < record.size) {
+ val count = minOf(chunk, record.size - offset)
+ val packet = ByteArray(PACKET_HEADER + count)
+ packet[0] = ((if (offset == 0) OPT_START else 0) or (if (offset + count == record.size) OPT_END else 0)).toByte()
+ packet[1] = stream.toByte()
+ record.copyInto(packet, PACKET_HEADER, offset, offset + count)
+ packets.add(packet)
+ offset += count
+ }
+ return packets
+ }
+
+ fun control(op: Int, tag: Int, body: ByteArray = ByteArray(0)): ByteArray =
+ byteArrayOf(op.toByte(), tag.toByte()) + body
+
+ fun eventsRequest(mask: Int): ByteArray = byteArrayOf(mask.toByte(), (mask ushr 8).toByte())
+
+ /** `PROP_SET` (0.5.63+): what SYS_WRITE does, for a host that runs no instructions. */
+ fun propSet(id: Int, value: Int): ByteArray =
+ byteArrayOf(id.toByte(), value.toByte(), (value ushr 8).toByte(), (value ushr 16).toByte(), (value ushr 24).toByte())
+
+ /** On, or a renewal of the lease; 32 kbps, the rate [Lc3PacketFramer] decodes. */
+ fun micRequest(on: Boolean): ByteArray = byteArrayOf(if (on) 1 else 0, 0)
+
+ /** An event's type, or -1 for bytes too short to be one. */
+ fun eventType(data: ByteArray): Int = if (data.size >= EVENT_HEADER) data[0].toInt() and 255 else -1
+
+ class Reply(@JvmField val op: Int, @JvmField val tag: Int, @JvmField val status: Int, @JvmField val body: ByteArray)
+
+ fun parseReply(data: ByteArray): Reply? {
+ val type = eventType(data)
+ if (type < EV_REPLY || data.size < EVENT_HEADER + 2) return null
+ return Reply(type and 0x7f, data[EVENT_HEADER].toInt() and 255, data[EVENT_HEADER + 1].toInt() and 255,
+ data.copyOfRange(EVENT_HEADER + 2, data.size))
+ }
+
+ /** Same shape as [CfwTransport.parseAcks]'s, so the shared window takes it. */
+ fun parseFcAck(data: ByteArray): CfwTransport.Ack? {
+ if (eventType(data) != EV_FC_ACK || data.size < EVENT_HEADER + 9) return null
+ val kind = data[EVENT_HEADER].toInt() and 255
+ if (kind != 1 && kind != 3) return null
+ return CfwTransport.Ack(kind == 3, data[EVENT_HEADER + 1].toInt() and 255, u16(data, EVENT_HEADER + 2),
+ data[EVENT_HEADER + 4].toInt() and 255, u16(data, EVENT_HEADER + 5), u16(data, EVENT_HEADER + 7))
+ }
+
+ class Input(@JvmField val trigger: Int, @JvmField val value: Int)
+
+ fun parseInput(data: ByteArray): Input? {
+ if (eventType(data) != EV_INPUT || data.size < EVENT_HEADER + 7) return null
+ return Input(data[EVENT_HEADER + 2].toInt() and 255, u32(data, EVENT_HEADER + 3))
+ }
+
+ class Notice(@JvmField val kind: Int, @JvmField val body: ByteArray)
+
+ fun parseNotice(data: ByteArray): Notice? {
+ if (eventType(data) != EV_NOTICE || data.size < EVENT_HEADER + 1) return null
+ return Notice(data[EVENT_HEADER].toInt() and 255, data.copyOfRange(EVENT_HEADER + 1, data.size))
+ }
+
+ /** `ASSET_FORMAT` frees the whole store; with [wipe] it also erases every sector that isn't erased already. */
+ fun assetFormatRequest(wipe: Boolean): ByteArray =
+ le32(0x534B4153) + if (wipe) le32(0x50570000) else ByteArray(0)
+
+ /** `FLASH_CRC`: a read-only fingerprint of flash bytes address…address + n - 1, given in `NOTICE` 8. */
+ fun flashCrcRequest(address: Int, n: Int): ByteArray = le32(address) + le32(n)
+
+ class AssetInfo(
+ @JvmField val assets: Int,
+ @JvmField val state: Int,
+ @JvmField val lastError: Int,
+ /** Without a usable flash there is no store, and nothing was ever written to it. */
+ @JvmField val available: Boolean,
+ /** The directory's commit count: 0 for a store that is empty and never was written, or was formatted since. */
+ @JvmField val seq: Long,
+ ) {
+ val running: Boolean get() = state in 1..3
+ }
+
+ fun parseAssetInfo(body: ByteArray): AssetInfo? {
+ if (body.size < 20) return null
+ return AssetInfo(body[12].toInt() and 255, body[13].toInt() and 255, body[14].toInt() and 255, body[15].toInt() and 1 != 0,
+ u32(body, 16).toLong() and 0xffffffffL)
+ }
+
+ class StoreNotice(
+ @JvmField val job: Int,
+ @JvmField val result: Int,
+ /** A crc job's range, crc32 and how many of its bytes are not 0xFF; 0 for the other jobs. */
+ @JvmField val address: Int,
+ @JvmField val n: Int,
+ @JvmField val nonErased: Long,
+ )
+
+ fun parseStoreNotice(data: ByteArray): StoreNotice? {
+ val notice = parseNotice(data) ?: return null
+ val body = notice.body
+ if (notice.kind != NOTICE_STORE_JOB || body.size < 18) return null
+ return StoreNotice(body[0].toInt() and 255, body[1].toInt() and 255, u32(body, 2), u32(body, 6), u32(body, 14).toLong() and 0xffffffffL)
+ }
+
+ private fun le32(value: Int): ByteArray =
+ byteArrayOf(value.toByte(), (value ushr 8).toByte(), (value ushr 16).toByte(), (value ushr 24).toByte())
+
+ /**
+ * What the arm's light reading looks like to [BrightnessPolicy] and the Developer app: a live passive poll in the
+ * G2 custom firmware's report (settings field 105), whose value counts tenths of a lux.
+ */
+ fun alsReport(centilux: Int, brightness: Int, tickMs: Long): ByteArray {
+ val report = ByteArray(24)
+ report[0] = 0x41
+ report[1] = 0x4c
+ report[2] = 1
+ report[3] = 2 // a poll
+ report[4] = 0x0b // opened, passive, read ok
+ report[5] = 3 // polling
+ val tenths = centilux / 10
+ for (i in 0..3) {
+ report[6 + i] = (tenths ushr (8 * i)).toByte()
+ report[10 + i] = (tenths ushr (8 * i)).toByte()
+ report[20 + i] = (tickMs ushr (8 * i)).toByte()
+ }
+ report[14] = brightness.toByte()
+ report[16] = brightness.toByte()
+ report[18] = 0
+ report[19] = 4 // scale 1.0 in Q10
+ return report
+ }
+
+ class Hello(
+ @JvmField val version: String,
+ @JvmField val leftArm: Boolean,
+ @JvmField val safeMode: Boolean,
+ @JvmField val panelOk: Boolean,
+ @JvmField val encrypted: Boolean,
+ @JvmField val inCase: Boolean,
+ /** `MIC` captures here: the right arm. */
+ @JvmField val mic: Boolean,
+ /** The iPhone notification relay answers here (0.5.65+). */
+ @JvmField val ancs: Boolean,
+ )
+
+ fun parseHello(body: ByteArray): Hello? {
+ if (body.size < 7 || body[0].toInt() != 5) return null
+ val flags = body[5].toInt() and 255
+ return Hello("${body[1].toInt() and 255}.${body[2].toInt() and 255}.${body[3].toInt() and 255}",
+ body[4].toInt() == 1, flags and 1 != 0, flags and 2 != 0, flags and 64 != 0, flags and 128 != 0, body[6].toInt() and 4 != 0,
+ body[6].toInt() and 8 != 0)
+ }
+
+ /** The display path's version, or -1 for a body that isn't FC_INFO's. */
+ fun parseFcVersion(body: ByteArray): Int = if (body.size >= 14) body[0].toInt() and 255 else -1
+
+ /** One value per requested property, or null if the reply is short. */
+ fun parseProps(body: ByteArray, count: Int): IntArray? =
+ if (body.size < 4 * count) null else IntArray(count) { u32(body, 4 * it) }
+
+ /**
+ * What a TouchBar gesture means to Faceclaw, which expects a G2's temple: a tap, a double tap and two slides. A
+ * G1's TouchBar cannot slide, but it has one per arm, so a tap moves (left up, right down), a double tap selects
+ * and a triple tap or long press goes back. Null: no event. With the display [dark] nothing can scroll: a tap is
+ * the G2's tap, which shows the Glanceboard, and the session reports a double tap as a wake.
+ */
+ fun gestureEventType(gesture: Int, leftArm: Boolean, dark: Boolean = false): Int? = when (gesture) {
+ GESTURE_TAP -> if (dark) BleProtocol.EVENT_CLICK else if (leftArm) BleProtocol.EVENT_SCROLL_TOP else BleProtocol.EVENT_SCROLL_BOTTOM
+ GESTURE_DOUBLE_TAP -> if (dark) BleProtocol.EVENT_DOUBLE_CLICK else BleProtocol.EVENT_CLICK
+ GESTURE_TRIPLE_TAP, GESTURE_LONG_START -> BleProtocol.EVENT_DOUBLE_CLICK
+ else -> null
+ }
+
+ /** `MIC_DATA`'s frames: the counter of the first one, how many, and where they start in [data]. */
+ fun micFrames(data: ByteArray): Triple? {
+ if (eventType(data) != EV_MIC_DATA || data.size < EVENT_HEADER + 3) return null
+ val count = data[EVENT_HEADER + 2].toInt() and 255
+ val start = EVENT_HEADER + 3
+ return if (data.size - start < count * Lc3PacketFramer.FRAME_BYTES) null else Triple(u16(data, EVENT_HEADER), count, start)
+ }
+
+ private fun u16(b: ByteArray, p: Int): Int = (b[p].toInt() and 255) or ((b[p + 1].toInt() and 255) shl 8)
+
+ private fun u32(b: ByteArray, p: Int): Int = u16(b, p) or (u16(b, p + 2) shl 16)
+}
+
+/**
+ * A G1's microphone frames as the packets [Lc3PacketFramer] takes from a G2: five 10 ms LC3 frames, then the two values
+ * of the G2's stereo capture (a G1 has one mic: zero) and a packet counter. A gap loses the part-filled packet, and the
+ * counter tells the decoder to conceal it.
+ */
+class G1MicAssembler {
+ private val frames = ByteArray(Lc3PacketFramer.LC3_BYTES)
+ private var have = 0
+ private var firstCounter = 0
+ private var nextCounter = -1
+
+ fun reset() {
+ have = 0
+ nextCounter = -1
+ }
+
+ fun ingest(first: Int, count: Int, data: ByteArray, start: Int, emit: (ByteArray) -> Unit) {
+ val size = Lc3PacketFramer.FRAME_BYTES
+ for (i in 0 until count) {
+ val counter = (first + i) and 0xffff
+ if (counter != nextCounter) have = 0
+ if (have == 0) firstCounter = counter
+ data.copyInto(frames, have * size, start + i * size, start + (i + 1) * size)
+ have++
+ nextCounter = (counter + 1) and 0xffff
+ if (have == Lc3PacketFramer.FRAMES_PER_PACKET) {
+ val packet = ByteArray(Lc3PacketFramer.PACKET_BYTES)
+ frames.copyInto(packet)
+ packet[Lc3PacketFramer.COUNTER_OFFSET] = (firstCounter / Lc3PacketFramer.FRAMES_PER_PACKET).toByte()
+ emit(packet)
+ have = 0
+ }
+ }
+ }
+}
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g1/G1Smp.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g1/G1Smp.kt
new file mode 100644
index 00000000..826ca1ba
--- /dev/null
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g1/G1Smp.kt
@@ -0,0 +1,311 @@
+package com.faceclaw.app
+
+import kotlin.jvm.JvmField
+
+/** The part of CBOR that MCUmgr uses: integers, byte and text strings, arrays, maps, booleans and null. */
+object G1Cbor {
+ fun encode(value: Any?): ByteArray {
+ val out = Output()
+ write(out, value)
+ return out.toByteArray()
+ }
+
+ fun decode(data: ByteArray, start: Int = 0): Any? = Reader(data, start).value()
+
+ private class Output {
+ private var bytes = ByteArray(256)
+ private var size = 0
+
+ private fun reserve(extra: Int) {
+ if (size + extra > bytes.size) bytes = bytes.copyOf(maxOf(bytes.size * 2, size + extra))
+ }
+
+ fun add(byte: Int) {
+ reserve(1)
+ bytes[size++] = byte.toByte()
+ }
+
+ fun add(data: ByteArray) {
+ reserve(data.size)
+ data.copyInto(bytes, size)
+ size += data.size
+ }
+
+ fun toByteArray(): ByteArray = bytes.copyOf(size)
+ }
+
+ private fun head(out: Output, major: Int, n: Long) {
+ val first = major shl 5
+ val width = when {
+ n < 24 -> {
+ out.add(first or n.toInt())
+ return
+ }
+ n < 0x100L -> 1
+ n < 0x10000L -> 2
+ n < 0x100000000L -> 4
+ else -> 8
+ }
+ out.add(first or (24 + width.countTrailingZeroBits()))
+ for (i in width - 1 downTo 0) out.add(((n ushr (8 * i)) and 0xff).toInt())
+ }
+
+ private fun write(out: Output, value: Any?) {
+ when (value) {
+ null -> out.add(0xf6)
+ is Boolean -> out.add(if (value) 0xf5 else 0xf4)
+ is Int -> write(out, value.toLong())
+ is Long -> if (value >= 0) head(out, 0, value) else head(out, 1, -1 - value)
+ is ByteArray -> {
+ head(out, 2, value.size.toLong())
+ out.add(value)
+ }
+ is String -> {
+ val text = value.encodeToByteArray()
+ head(out, 3, text.size.toLong())
+ out.add(text)
+ }
+ is List<*> -> {
+ head(out, 4, value.size.toLong())
+ for (item in value) write(out, item)
+ }
+ is Map<*, *> -> {
+ head(out, 5, value.size.toLong())
+ for ((key, item) in value) {
+ write(out, key)
+ write(out, item)
+ }
+ }
+ else -> throw IllegalArgumentException("not CBOR: $value")
+ }
+ }
+
+ private class Reader(private val data: ByteArray, private var at: Int) {
+ private fun u8(): Int {
+ if (at >= data.size) throw IllegalArgumentException("CBOR cut short")
+ return data[at++].toInt() and 0xff
+ }
+
+ fun value(): Any? {
+ val first = u8()
+ val major = first ushr 5
+ val info = first and 31
+ val n: Long? = when {
+ info < 24 -> info.toLong()
+ info in 24..27 -> {
+ var v = 0L
+ repeat(1 shl (info - 24)) { v = (v shl 8) or u8().toLong() }
+ v
+ }
+ info == 31 -> null
+ else -> throw IllegalArgumentException("bad CBOR header $first")
+ }
+ return when (major) {
+ 0 -> n ?: throw IllegalArgumentException("bad CBOR integer")
+ 1 -> -1 - (n ?: throw IllegalArgumentException("bad CBOR integer"))
+ 2, 3 -> {
+ val size = (n ?: throw IllegalArgumentException("indefinite CBOR string")).toInt()
+ if (size < 0 || at + size > data.size) throw IllegalArgumentException("CBOR cut short")
+ val bytes = data.copyOfRange(at, at + size)
+ at += size
+ if (major == 2) bytes else bytes.decodeToString()
+ }
+ 4 -> {
+ val items = ArrayList()
+ while (more(n, items.size)) items.add(value())
+ if (n == null) at++
+ items
+ }
+ 5 -> {
+ val items = LinkedHashMap()
+ while (more(n, items.size)) {
+ val key = value()
+ items[key] = value()
+ }
+ if (n == null) at++
+ items
+ }
+ 7 -> when (info) {
+ 20 -> false
+ 21 -> true
+ 22 -> null
+ else -> throw IllegalArgumentException("unsupported CBOR simple value $info")
+ }
+ else -> throw IllegalArgumentException("unsupported CBOR major type $major")
+ }
+ }
+
+ /** An indefinite-length array or map (what Zephyr's image list uses) ends at a 0xFF. */
+ private fun more(n: Long?, count: Int): Boolean {
+ if (n != null) return count < n
+ if (at >= data.size) throw IllegalArgumentException("CBOR cut short")
+ return (data[at].toInt() and 0xff) != 0xff
+ }
+ }
+}
+
+/**
+ * MCUmgr SMP, the update service of both Even's firmware and g1v0: as much of it as installing an image takes, and what
+ * an MCUboot image says about itself. The same requests as scouter_kit's tools/g1host.py (class Smp), which was proven on
+ * real arms first.
+ */
+object G1Smp {
+ const val SMP_CHAR_UUID = "da2e7828-fbce-4e01-ae9e-261174997c48"
+ const val NUS_RX_UUID = "6e400002-b5a3-f393-e0a9-e50e24dcca9e"
+ const val NUS_TX_UUID = "6e400003-b5a3-f393-e0a9-e50e24dcca9e"
+
+ const val OP_READ = 0
+ const val OP_WRITE = 2
+ const val GROUP_OS = 0
+ const val GROUP_IMAGE = 1
+ const val CMD_IMAGE_STATE = 0
+ const val CMD_IMAGE_UPLOAD = 1
+ const val CMD_OS_RESET = 5
+ const val UPLOAD_CHUNK = 2048
+ private const val HEADER = 8
+
+ /** Even's firmware drops a link it hears no heartbeat on. */
+ fun stockHeartbeat(seq: Int): ByteArray =
+ byteArrayOf(0x25, 0x06, 0x00, seq.toByte(), 0x04, seq.toByte())
+
+ /** Even's firmware's battery query; its reply is `2C 66`, then the percentage. The bytes its real firmware answered in emulation. */
+ val STOCK_BATTERY_QUERY = byteArrayOf(0x2c, 0x04, 0x00, 0x00)
+
+ /** The percentage in a reply to [STOCK_BATTERY_QUERY]; null for anything else, or a value that can't be one. */
+ fun parseStockBattery(data: ByteArray): Int? {
+ if (data.size < 3 || data[0].toInt() != 0x2c || (data[1].toInt() and 0xff) != 0x66) return null
+ return (data[2].toInt() and 0xff).takeIf { it in 1..100 }
+ }
+
+ fun frame(op: Int, group: Int, seq: Int, cmd: Int, payload: Map): ByteArray {
+ val body = G1Cbor.encode(payload)
+ val out = ByteArray(HEADER + body.size)
+ out[0] = op.toByte()
+ out[2] = (body.size ushr 8).toByte()
+ out[3] = body.size.toByte()
+ out[4] = (group ushr 8).toByte()
+ out[5] = group.toByte()
+ out[6] = seq.toByte()
+ out[7] = cmd.toByte()
+ body.copyInto(out, HEADER)
+ return out
+ }
+
+ /** One ATT write at most [mtu] - 3 bytes long; MCUmgr joins them again. */
+ fun split(frame: ByteArray, mtu: Int): List {
+ val size = maxOf(mtu - 3, 20)
+ return (frame.indices step size).map { frame.copyOfRange(it, minOf(it + size, frame.size)) }
+ }
+
+ /** MCUboot's image numbers on an nRF5340: the application core, and the network core (the Bluetooth controller). */
+ const val IMAGE_APP = 0
+ const val IMAGE_NET_CORE = 1
+
+ /**
+ * The first chunk also says what is coming, which lets the arm resume an upload of the same file, and which image it
+ * is: each has its own second slot.
+ */
+ fun uploadRequest(image: ByteArray, offset: Int, fileSha256: ByteArray, imageIndex: Int = IMAGE_APP): Map {
+ val data = image.copyOfRange(offset, minOf(offset + UPLOAD_CHUNK, image.size))
+ return if (offset == 0) {
+ mapOf("image" to imageIndex, "len" to image.size, "off" to 0, "sha" to fileSha256, "data" to data, "upgrade" to false)
+ } else {
+ mapOf("off" to offset, "data" to data)
+ }
+ }
+
+ /**
+ * Marks the image with this hash for MCUboot's next boot. [permanent] false is a test install, which is what Even's app
+ * and g1v0's own network-core fallback ask for on image 1; the network core has no copy to go back to either way.
+ */
+ fun confirmRequest(imageHash: ByteArray, permanent: Boolean = true): Map = mapOf("hash" to imageHash, "confirm" to permanent)
+
+ /** Joins notifications into replies; [feed] gives each complete one as sequence number and body. */
+ class Assembler {
+ private var pending = ByteArray(0)
+
+ fun reset() {
+ pending = ByteArray(0)
+ }
+
+ fun feed(data: ByteArray): List>> {
+ pending += data
+ val replies = ArrayList>>()
+ while (pending.size >= HEADER) {
+ val size = ((pending[2].toInt() and 0xff) shl 8) or (pending[3].toInt() and 0xff)
+ if (pending.size < HEADER + size) break
+ val seq = pending[6].toInt() and 0xff
+ val body = try {
+ if (size == 0) emptyMap() else G1Cbor.decode(pending, HEADER) as? Map<*, *>
+ } catch (e: IllegalArgumentException) {
+ null
+ }
+ if (body == null) {
+ // A frame cut by a lost link: the request is sent again.
+ pending = ByteArray(0)
+ break
+ }
+ pending = pending.copyOfRange(HEADER + size, pending.size)
+ replies.add(seq to body)
+ }
+ return replies
+ }
+ }
+
+ class Slot(
+ @JvmField val image: Int,
+ @JvmField val slot: Int,
+ @JvmField val version: String,
+ @JvmField val hash: ByteArray,
+ @JvmField val flags: List,
+ ) {
+ override fun toString(): String =
+ "image $image slot $slot: $version ${BinaryEncoding.bytesToHex(hash.copyOf(minOf(8, hash.size)))} ${flags.joinToString(" ")}".trim()
+ }
+
+ fun parseSlots(reply: Map<*, *>): List {
+ val images = reply["images"] as? List<*> ?: return emptyList()
+ return images.mapNotNull { item ->
+ val entry = item as? Map<*, *> ?: return@mapNotNull null
+ val hash = entry["hash"] as? ByteArray ?: return@mapNotNull null
+ Slot((entry["image"] as? Long ?: 0L).toInt(), (entry["slot"] as? Long ?: -1L).toInt(), entry["version"] as? String ?: "?", hash,
+ listOf("bootable", "pending", "confirmed", "active", "permanent").filter { entry[it] == true })
+ }
+ }
+
+ fun replyCode(reply: Map<*, *>): Int = (reply["rc"] as? Long ?: 0L).toInt()
+
+ fun replyOffset(reply: Map<*, *>): Int? = (reply["off"] as? Long)?.toInt()
+
+ /** The dotted version in an MCUboot header. */
+ fun imageVersion(image: ByteArray): String {
+ requireImage(image)
+ val revision = (image[22].toInt() and 0xff) or ((image[23].toInt() and 0xff) shl 8)
+ return "${image[20].toInt() and 0xff}.${image[21].toInt() and 0xff}.$revision"
+ }
+
+ /** The SHA-256 TLV: how MCUmgr names an image. */
+ fun imageHash(image: ByteArray): ByteArray {
+ requireImage(image)
+ var at = u16(image, 8) + u32(image, 12)
+ require(at + 4 <= image.size && u16(image, at) == 0x6907) { "the image has no TLV area" }
+ val end = at + u16(image, at + 2)
+ require(end <= image.size) { "the image's TLV area is cut short" }
+ at += 4
+ while (at + 4 <= end) {
+ val type = u16(image, at)
+ val size = u16(image, at + 2)
+ if (type == 0x10 && size == 32 && at + 4 + size <= end) return image.copyOfRange(at + 4, at + 4 + size)
+ at += 4 + size
+ }
+ throw IllegalArgumentException("the image has no SHA-256 TLV")
+ }
+
+ private fun requireImage(image: ByteArray) {
+ require(image.size > 32 && u32(image, 0) == 0x96f3b83d.toInt()) { "not an MCUboot image" }
+ }
+
+ private fun u16(data: ByteArray, at: Int): Int = (data[at].toInt() and 0xff) or ((data[at + 1].toInt() and 0xff) shl 8)
+
+ private fun u32(data: ByteArray, at: Int): Int = u16(data, at) or (u16(data, at + 2) shl 16)
+}
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/CfwMessageWindow.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/CfwMessageWindow.kt
index 73b9e79e..bdc2a32c 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/CfwMessageWindow.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/CfwMessageWindow.kt
@@ -33,7 +33,7 @@ class CfwMessageWindow private constructor() {
fun acknowledgedHead(messages: Iterable): OutboundMessage? {
for (message in messages) {
if (message.sid != CfwTransport.SID) continue
- return if (!message.cfwRetryPending && message.cfwAckLenses == CfwTransport.BOTH)
+ return if (!message.cfwRetryPending && message.isCfwAcked)
message
else null
}
@@ -49,7 +49,7 @@ class CfwMessageWindow private constructor() {
failed =
failed ||
message.cfwRetryPending ||
- (message.cfwAckLenses != CfwTransport.BOTH &&
+ (!message.isCfwAcked &&
message.ackDeadlineAtMs > 0 &&
message.ackDeadlineAtMs <= nowMs)
replay.add(message)
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/CfwTransport.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/CfwTransport.kt
index 75d47d36..88c252fa 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/CfwTransport.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/CfwTransport.kt
@@ -28,7 +28,18 @@ class CfwTransport(private val platform: ProtocolPlatform) {
fun encode(message: ByteArray?, streamId: Int, lenses: Int, mtu: Int): List =
lock.withLock {
validate(message, streamId, lenses, mtu)
- val input = message!!
+ g2Packets(encodeRecord(message!!, lenses), streamId, mtu)
+ }
+
+ /**
+ * One record, `[flags][wire length u16][decoded CRC u16][body]`, compressed with this
+ * transport's persistent context. The packet envelope is the caller's: [encode] wraps it
+ * in G2 TPL packets, [RayNeoIoProtocol.cfwPackets] in RayNeo iO business-0xF0 packets.
+ */
+ fun encodeRecord(message: ByteArray, lenses: Int): ByteArray =
+ lock.withLock {
+ require(message.size <= MAX_MESSAGE && lenses in 1..BOTH) { "invalid CFW record parameters" }
+ val input = message
if (previousLenses != lenses) reset()
val reset = resetPending
val encoder = deflater ?: platform.createDeflater().also { deflater = it }
@@ -44,7 +55,7 @@ class CfwTransport(private val platform: ProtocolPlatform) {
resetPending = false
previousLenses = lenses
}
- frameRecord(body, crc(input), streamId, flags, mtu)
+ record(body, crc(input), flags)
}
companion object {
@@ -71,18 +82,12 @@ class CfwTransport(private val platform: ProtocolPlatform) {
@JvmStatic
fun frame(message: ByteArray?, streamId: Int, lenses: Int, mtu: Int): List {
validate(message, streamId, lenses, mtu)
- return frameRecord(message!!, crc(message), streamId, lenses or RESET_CONTEXT, mtu)
+ return g2Packets(record(message!!, crc(message), lenses or RESET_CONTEXT), streamId, mtu)
}
- private fun frameRecord(
- body: ByteArray,
- checksum: Int,
- streamId: Int,
- flags: Int,
- mtu: Int,
- ): List {
- val lenses = flags and BOTH
- val capacity = minOf(252, mtu - 14)
+ /** `[flags][wire length u16][decoded CRC u16][body]`, shared by every packet envelope. */
+ @JvmStatic
+ fun record(body: ByteArray, checksum: Int, flags: Int): ByteArray {
val stream = ByteArray(body.size + 5)
stream[0] = flags.toByte()
stream[1] = body.size.toByte()
@@ -90,6 +95,13 @@ class CfwTransport(private val platform: ProtocolPlatform) {
stream[3] = checksum.toByte()
stream[4] = (checksum ushr 8).toByte()
body.copyInto(stream, 5)
+ return stream
+ }
+
+ /** G2 TPL packets (SID 0xf0) carrying one record: options byte = lenses | RESET | END. */
+ private fun g2Packets(stream: ByteArray, streamId: Int, mtu: Int): List {
+ val lenses = stream[0].toInt() and BOTH
+ val capacity = minOf(252, mtu - 14)
val packets = mutableListOf()
for (offset in stream.indices step capacity) {
val count = minOf(capacity, stream.size - offset)
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/OutboundMessage.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/OutboundMessage.kt
index 43ee91db..425bfbdb 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/OutboundMessage.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/OutboundMessage.kt
@@ -18,6 +18,8 @@ class OutboundMessage(
@JvmField
val cfwChecksum: Int = if (sid == CfwTransport.SID) CfwTransport.crc(this.message) else 0
@JvmField var cfwAckLenses = 0
+ /** The lenses that must ACK this attempt: both on a G2, whichever the message went to on a G1. */
+ @JvmField var cfwRequiredLenses = CfwTransport.BOTH
@JvmField var cfwRetries = 0
@JvmField var cfwRetryPending = false
@JvmField var imageUpdateId = 0
@@ -47,9 +49,11 @@ class OutboundMessage(
}
if (message.size != ack.size || cfwChecksum != ack.checksum) return false
cfwAckLenses = cfwAckLenses or ack.lens
- return !cfwRetryPending && cfwAckLenses == CfwTransport.BOTH
+ return !cfwRetryPending && isCfwAcked
}
+ val isCfwAcked: Boolean get() = cfwAckLenses and cfwRequiredLenses == cfwRequiredLenses
+
/** Replace an attempt atomically under the communicator lock. */
fun prepareCfwReplay(streamId: Int) {
magic = streamId
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/StockLink.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/StockLink.kt
index b7a200f2..c291a6a4 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/StockLink.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/StockLink.kt
@@ -48,6 +48,21 @@ interface StockLink {
fun bondState(address: String): BondState
+ /** The ATT MTU agreed on this link. */
+ fun negotiatedMtu(address: String): Int = 23
+
+ /** Ask the OS to pair with a connected device; a platform that pairs by itself on demand does nothing. */
+ fun requestBond(address: String) {}
+
+ /** Remove this phone's half of a pairing; false where the platform can't or refused. */
+ fun removeBond(address: String): Boolean = false
+
+ /** After discovery: whether the service table has this characteristic. Enabling notifications on one it lacks may throw. */
+ fun hasCharacteristic(address: String, characteristicUuid: String): Boolean = true
+
+ /** Read the service table again, past whatever the OS cached for this address. */
+ fun refreshServices(address: String, timeoutMs: Int): Boolean = discoverServices(address, timeoutMs)
+
fun disconnect(address: String)
fun close()
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionBrightness.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionBrightness.kt
index 5a3c0418..2b0b034f 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionBrightness.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionBrightness.kt
@@ -4,6 +4,11 @@ package com.faceclaw.app
* queued state and sensor freshness do not. Private commands are ordered with
* frames, so wake starts on the intended PRESENT, never on an older black frame. */
internal fun GlassesSessionCore.enqueueBrightnessLocked(frameVisible: Boolean? = null) {
+ if (isIo) {
+ ioNoteFrameVisibleLocked(frameVisible)
+ // Older iO firmware has no message 30; ioMaintain drives the launcher's (and the screen) instead.
+ if (!ioFirmwareOwnsBrightness) return
+ }
if (!customFirmwareDetected || !sessionReady || !fixedLayoutCreated || shutdownRequested) return
val visible = frameVisible ?: brightnessSentVisible ?: return
val target = brightnessPolicy.target
@@ -14,29 +19,38 @@ internal fun GlassesSessionCore.enqueueBrightnessLocked(frameVisible: Boolean? =
else if (brightnessPolicy.automatic) 1200 else 120
val payload = byteArrayOf(CFW_MSG_BRIGHTNESS.toByte(), 1, target.toByte(),
(if (visible) 1 else 0).toByte(), duration.toByte(), (duration shr 8).toByte())
- val message = messageBuilder.customMessage("brightness-output", payload,
- "brightness target=$target visible=$visible fade=$duration", -1, connectionOptions.sendImagesToLeft)
- message.onTimeout = MessageCallback {
+ val label = "brightness target=$target visible=$visible fade=$duration"
+ val retry = MessageCallback {
brightnessSentLevel = -1
brightnessSentVisible = null
// Retry with a PRESENT even if the scene did not change during recovery.
lastEnqueuedFingerprint = ""
}
- pendingMessages.addLast(message)
+ if (isG1) {
+ g1EnqueueBrightnessLocked(payload, label, brightnessSentVisible != visible, retry)
+ } else {
+ val message = messageBuilder.customMessage("brightness-output", payload, label, -1, connectionOptions.sendImagesToLeft)
+ message.onTimeout = retry
+ pendingMessages.addLast(message)
+ }
brightnessSentLevel = target
brightnessSentVisible = visible
+ if (isIo) io.lastBrightnessAtMs = now()
}
internal fun GlassesSessionCore.maintainBrightnessLocked(now: Long) {
if (!customFirmwareDetected || !sessionReady || !fixedLayoutCreated || shutdownRequested) return
// Passive polling owns stock ALS even in manual mode. Slower manual polling
// keeps stock from writing the panel without needlessly streaming samples.
- if (now - brightnessAlsStartedAt >= 2000 && !hasPendingOrInflightKindLocked("als-control")) {
- val interval = if (brightnessDemoPolling) 250 else if (brightnessPolicy.automatic) 500 else 5000
+ val interval = if (brightnessDemoPolling) 250 else if (brightnessPolicy.automatic) 500 else 5000
+ // The G2's stock can close the sensor, so it hears this again; the iO's polling lasts as long as the page.
+ val alsDue = if (isIo) interval != io.alsIntervalSent else now - brightnessAlsStartedAt >= 2000
+ if (alsDue && !hasPendingOrInflightKindLocked("als-control")) {
val payload = byteArrayOf(CFW_MSG_AMBIENT_LIGHT.toByte(), 1, 1,
interval.toByte(), (interval shr 8).toByte(), 0, 0, 0xe8.toByte(), 3)
enqueueAmbientLightControlLocked(payload, "brightness passive ALS", false)
brightnessAlsStartedAt = now
+ if (isIo) io.alsIntervalSent = interval
}
enqueueBrightnessLocked()
}
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionControls.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionControls.kt
index 2e7ad976..badd9509 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionControls.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionControls.kt
@@ -86,13 +86,16 @@ internal fun GlassesSessionCore.enqueueBenchmarkMessageLocked() {
kotlin.random.Random.nextBytes(payload)
payload[0] = CFW_MSG_DIAGNOSTICS.toByte() // CFW diagnostic-control mode...
payload[1] = 0x7f.toByte() // ...with an unused sub-op: acked, no effect
+ // A G1's arms are two links and every frame goes down both, so the run alternates between them.
+ val leftArm = if (isG1) benchmarkMessageCounter++ % 2 == 0 else connectionOptions.sendImagesToLeft
val message = messageBuilder.imagePayload(
"bandwidth",
DASHBOARD_TILE,
nextMapSessionId(),
payload,
"bandwidth no-op " + payload.size + "B",
- connectionOptions.sendImagesToLeft)
+ leftArm)
+ if (isG1) message.cfwRequiredLenses = if (leftArm) G1Timings.LENS_LEFT else G1Timings.LENS_RIGHT
val payloadBytes = payload.size
// Logical custom-message bytes; excludes length tag and packet framing.
val wireBytes = message.message.size
@@ -345,6 +348,8 @@ internal fun GlassesSessionCore.releaseFaceclawFramebufferLease(): Boolean {
/** The address of a configured arm the OS no longer holds a bond for, or null. */
internal fun GlassesSessionCore.firstUnpairedArm(): String? {
+ // The iO identifies the phone by its protocol id, not an OS bond.
+ if (isIo) return null
if (!link.isBonded(rightAddress)) return rightAddress
if (!link.isBonded(leftAddress)) return leftAddress
return null
@@ -491,7 +496,7 @@ internal fun GlassesSessionCore.scheduleReconnectLocked(sessionWasReady: Boolean
if (sessionWasReady && now - lastSessionReadyAtMs >= ConnectionOptions.STABLE_SESSION_MS) {
consecutiveReconnects = 0
}
- val schedule = ConnectionOptions.RECONNECT_BACKOFF_MS
+ val schedule = if (isG1) G1Timings.RECONNECT_BACKOFF_MS else ConnectionOptions.RECONNECT_BACKOFF_MS
val delayMs = schedule[minOf(consecutiveReconnects, schedule.size - 1)].toLong()
consecutiveReconnects++
reconnectAfterMs = now + delayMs
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionCore.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionCore.kt
index 71b4e074..f64886f8 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionCore.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionCore.kt
@@ -107,6 +107,13 @@ class GlassesSessionCore(
@Volatile internal var listener: FaceclawBleCommunicatorListener? = null
+ /** G2 unless [useRayNeoIo] was called before [start]. */
+ @Volatile internal var glassesType = GlassesType.G2
+ /** RayNeo iO link state (GlassesSessionIo.kt); guarded by [monitor]. */
+ internal val io = IoSessionState()
+ /** Even G1 link state (GlassesSessionG1.kt); guarded by [monitor]. */
+ internal val g1 = G1SessionState()
+
/**
* Optional tap for relay frames the session does not interpret: notifications on the
* right arm's data characteristic whose first two bytes are 'A','N' (the iOS ANCS
@@ -431,6 +438,7 @@ class GlassesSessionCore(
internal var benchmarkLastAckAtMs = 0L
internal var benchmarkEndAtMs = 0L // 0 while running; set when the run drains
internal var benchmarkMessagesSent = 0
+ internal var benchmarkMessageCounter = 0
internal var benchmarkMessagesAcked = 0
internal var benchmarkTimeouts = 0
internal var benchmarkPayloadBytesAcked = 0L
@@ -518,7 +526,8 @@ class GlassesSessionCore(
/**
* Write one already-framed packet to an arm outside the message scheduler (the ANCS
* relay client builds its own packets). Blocks like any link write; false when the
- * arm is unknown, the link rejects the write, or the session is not running.
+ * arm is unknown, the link rejects the write, or the session is not running. A G1 has a
+ * characteristic for them, whose ATT errors say why a command was refused.
*/
fun writeRawPacket(arm: String, packet: ByteArray): Boolean {
val address = when (arm.uppercase()) {
@@ -529,8 +538,11 @@ class GlassesSessionCore(
val active = monitor.withLock { running }
if (!active) return false
return try {
- val result = link.writeFrames(address, BleProtocol.WRITE_CHAR_UUID, listOf(packet), ConnectionOptions.WRITE_MODE,
- ConnectionOptions.WRITE_TIMEOUT_MS)
+ val result = if (isG1) {
+ link.writeFrames(address, G1Ble.ANCS_CHAR_UUID, listOf(packet), GattWriteMode.WITH_RESPONSE, ConnectionOptions.WRITE_TIMEOUT_MS)
+ } else {
+ link.writeFrames(address, BleProtocol.WRITE_CHAR_UUID, listOf(packet), ConnectionOptions.WRITE_MODE, ConnectionOptions.WRITE_TIMEOUT_MS)
+ }
if (result) monitor.withLock { noteWriteCompletedLocked(address, now()) }
result
} catch (t: Throwable) {
@@ -554,6 +566,39 @@ class GlassesSessionCore(
requiredFirmwareRevision = revision
}
+ /**
+ * Drive a RayNeo iO instead of a G2: one BLE link (pass its address as both arms; no
+ * ring), the iO handshake and page lease, and the Faceclaw display lists of the
+ * faceclaw-rayneo-cfw firmware. [phoneId] is this phone's stable 6-byte protocol identity:
+ * the glasses bind to the first one that authenticates and refuse others until they are
+ * put in pairing mode. Call before [start].
+ */
+ fun useRayNeoIo(phoneId: ByteArray, phoneName: String, manufacturer: String, model: String) {
+ require(phoneId.size == 6) { "RayNeo iO phone id must be 6 bytes" }
+ require(rightAddress.equals(leftAddress, ignoreCase = true)) { "RayNeo iO uses one address for both arms" }
+ monitor.withLock {
+ glassesType = GlassesType.RAYNEO_IO
+ io.phoneId = phoneId.copyOf()
+ io.phoneName = phoneName.ifEmpty { "Faceclaw" }
+ io.manufacturer = manufacturer.ifEmpty { "Android" }
+ io.model = model.ifEmpty { "Android" }
+ }
+ }
+
+ /** Drive an Even G1 on g1v0 instead of a G2 (see [G1SessionState]). Before [start]. */
+ fun useG1() {
+ monitor.withLock { glassesType = GlassesType.G1 }
+ }
+
+ /** True when this session drives an Even G1. */
+ fun isEvenG1(): Boolean = isG1
+
+ /** Whether the glasses can relay iPhone notifications, as far as the session knows: a G2's depends on its firmware revision, which TS checks. */
+ fun ancsRelayAvailable(): Boolean = !isG1 || monitor.withLock { g1.ancsRelay }
+
+ /** True when this session drives a RayNeo iO. */
+ fun isRayNeoIo(): Boolean = isIo
+
/** Start the worker (through the host); false when it was already running. */
fun start(): Boolean {
monitor.withLock {
@@ -586,7 +631,7 @@ class GlassesSessionCore(
* quiescing its producers. Also cover direct/early close callers here;
* a successful cleanup must remain the final BLE message. Older CFWs
* fall back to the standalone framebuffer-lease release. */
- if (!cfwCleanupDelivered && !sendCfwCleanup()) {
+ if (!cfwCleanupDelivered && !sendCfwCleanup() && isG2) {
releaseFaceclawFramebufferLease()
}
monitor.withLock {
@@ -605,6 +650,14 @@ class GlassesSessionCore(
host.joinWorker(5_000)
ringDone?.await(5_000)
ringWorkerDone = null
+ if (isIo && link.isConnected(rightAddress)) {
+ // Otherwise the blank page stays up until the firmware's 120 s lease runs out.
+ try {
+ ioWriteControl(RayNeoIoProtocol.CTRL_PAGE_CLOSE)
+ } catch (t: Throwable) {
+ logLine("RayNeo iO page close failed: " + safeMessage(t))
+ }
+ }
monitor.withLock {
resetSessionStateLocked()
clearAllMessagesLocked("disconnect")
@@ -646,6 +699,9 @@ class GlassesSessionCore(
if (listener == null) {
throw IllegalArgumentException("listener is required")
}
+ // The iO's packets are Opus from its remote audio stream (see ioStartAudioCapture).
+ if (isIo) return ioStartAudioCapture(listener)
+ if (isG1) return g1StartAudioCapture(listener)
var magic = 0
monitor.withLock {
if (!running || !sessionReady || shutdownRequested || !fixedLayoutCreated) {
@@ -663,6 +719,8 @@ class GlassesSessionCore(
}
fun stopG2AudioCapture() {
+ if (isIo) return ioStopAudioCapture()
+ if (isG1) return g1StopAudioCapture()
var magic = 0
monitor.withLock {
audioPacketListener = null
@@ -770,6 +828,15 @@ class GlassesSessionCore(
* that track a capture across those events must check this rather than
* assume their earlier enable still holds.
*/
+ /**
+ * Whether the glasses' own wake word should reach Faceclaw (its configured wake action).
+ * RayNeo iO: the launcher's "Hey RayNeo" switch, and the stock session it opens is
+ * ended in favor of Faceclaw's. G2 glasses use the wake lease instead (no-op here).
+ */
+ fun setVoiceWakeEnabled(enabled: Boolean) {
+ if (isIo) ioSetVoiceWakeEnabled(enabled)
+ }
+
fun isAudioCaptureActive(): Boolean {
monitor.withLock {
return running && sessionReady && !shutdownRequested && audioCaptureActive
@@ -786,6 +853,8 @@ class GlassesSessionCore(
val generation: Int
monitor.withLock {
faceclawWakeLeaseEnabled = enabled
+ // A G2 firmware lease; the iO's wake word is setVoiceWakeEnabled.
+ if (!isG2) return true
if (!running || !sessionReady) {
return !enabled
}
@@ -854,6 +923,7 @@ class GlassesSessionCore(
* (ignored on disable).
*/
fun setImuReportEnabled(enable: Boolean, reportFrq: Int) {
+ if (isG1) return g1SetImuReport(enable)
monitor.withLock {
if (!running || !sessionReady) {
logLine("skip IMU " + (if (enable) "enable" else "disable") + "; session not ready")
@@ -1211,6 +1281,11 @@ class GlassesSessionCore(
/** Request one CFW ambient-light report (image-handler mode 16 op 0). */
fun queryAmbientLight() {
monitor.withLock {
+ if (isG1) {
+ g1.lastLightAtMs = 0
+ interruptibleSleep.interrupt()
+ return
+ }
enqueueAmbientLightControlLocked(byteArrayOf(CFW_MSG_AMBIENT_LIGHT.toByte(), 0.toByte()), "als query", false)
}
interruptibleSleep.interrupt()
@@ -1293,7 +1368,7 @@ class GlassesSessionCore(
* queued (no session, or a malformed record).
*/
fun sendFaceclawMicControl(record: ByteArray?, label: String, rightTemple: Boolean, leftTemple: Boolean): Boolean {
- if (record == null || record.size < 4) {
+ if (!isG2 || record == null || record.size < 4) {
return false
}
monitor.withLock {
@@ -1544,6 +1619,8 @@ class GlassesSessionCore(
// EvenHub page lifecycle
fun sendShutdown(exitMode: Int): Boolean {
+ if (isIo) return ioSuspend()
+ if (isG1) return g1Suspend()
return sendShutdownInternal(exitMode, true)
}
@@ -1554,6 +1631,17 @@ class GlassesSessionCore(
* can use the legacy shutdown-and-lease-release path.
*/
fun sendCfwCleanup(): Boolean {
+ if (isG1) {
+ // Fire and forget: the firmware keeps no session that could outlive the link.
+ monitor.withLock {
+ if (cfwCleanupDelivered) return true
+ shutdownRequested = true
+ cfwCleanupDelivered = true
+ clearPendingMessagesLocked("G1 cleanup")
+ }
+ g1HideBeforeDisconnect()
+ return true
+ }
val magic: Int
monitor.withLock {
if (cfwCleanupDelivered) {
@@ -1635,6 +1723,8 @@ class GlassesSessionCore(
* reconnecting Bluetooth here would defeat the power-saving mode.
*/
fun suspendEvenHubSession(): Boolean {
+ if (isIo) return ioSuspend()
+ if (isG1) return g1Suspend()
// Ending the plugin task releases the fb lease, which frees the
// on-glasses resource cache; forget it phone-side either way (a lost
// ack may still have taken effect).
@@ -1658,6 +1748,8 @@ class GlassesSessionCore(
* the desired frame.
*/
fun resumeEvenHubSession(): Boolean {
+ if (isIo) return ioResume()
+ if (isG1) return g1Resume()
var claimGeneration = 0
monitor.withLock {
if (!running || !sessionReady || chargingMode) {
@@ -1738,13 +1830,13 @@ class GlassesSessionCore(
continue
}
logWarn("Attempting to connect")
- connectLoopOnce()
+ if (isIo) ioConnectLoopOnce() else if (isG1) g1ConnectLoopOnce() else connectLoopOnce()
continue
}
val sleepMs = driveSession()
if (sleepMs > 0) {
- interruptibleSleep.sleep(sleepMs)
+ interruptibleSleep.sleep(if (isG1) minOf(sleepMs, g1MaxSleepMs()) else sleepMs)
}
} catch (t: Throwable) {
if (!running) {
@@ -1765,10 +1857,19 @@ class GlassesSessionCore(
return
}
val uuid = characteristicUuid.lowercase()
+ // The phone's own R1 link, beside either glasses (the iO's ring is always direct).
if (isDirectRingNotification(address, uuid)) {
handleDirectRingNotification(uuid, data)
return
}
+ if (isIo) {
+ ioOnNotification(address, uuid, data)
+ return
+ }
+ if (isG1) {
+ g1OnNotification(address, uuid, data)
+ return
+ }
if (BleProtocol.RENDER_NOTIFY_UUID == uuid) {
handleRenderNotification(address, data)
return
@@ -1779,28 +1880,7 @@ class GlassesSessionCore(
if (data.size >= 7 && (data[6].toInt() and 255) == CfwTransport.SID) {
val acks = CfwTransport.parseAcks(data) ?: return
monitor.withLock {
- lastIncomingAtMs = now()
- val arm = armIndex(address)
- if (arm >= 0) lastArmCfwAckAtMs[arm] = lastIncomingAtMs
- for (ack in acks) {
- for (message in inFlightMessages) {
- val ingress = if (message.isLeftArmMessage) leftAddress else rightAddress
- if (message.sid == CfwTransport.SID && address.equals(ingress, ignoreCase = true) && message.magic == ack.streamId) {
- message.acceptCfwAck(ack)
- if (ack.nack) ConnectionCounters.increment("g2.cfw-nack")
- logLine("CFW " + (if (ack.nack) "NACK" else "ACK") + " id=" + ack.streamId
- + " ordinal=" + ack.messageId + " lens=" + ack.lens + " txseq=" + (data[2].toInt() and 255)
- + " redundant=" + (ack !== acks[0])
- + " size=" + ack.size + " crc=" + ack.checksum
- + " expected=" + message.message.size + "/" + message.cfwChecksum
- + " ackedLenses=" + message.cfwAckLenses
- + " ageMs=" + (lastIncomingAtMs - message.sentAtMs))
- message.ackPayload = data.copyOf()
- break
- }
- }
- }
- drainCfwAcknowledgementsLocked()
+ acceptCfwAcksLocked(address, acks, data[2].toInt() and 255, data)
}
interruptibleSleep.interrupt()
return
@@ -2095,6 +2175,7 @@ class GlassesSessionCore(
lastConnectionOrInputAtMs = arrivalMs
lastDirectRingInputAtMs = arrivalMs
lastDirectRingInputLabel = decoded.label + " " + decoded.detail
+ if (isIo) ioReclaimPageOnInputLocked()
}
logLine("direct ring " + decoded.label + " " + decoded.detail + " raw=" + hex(data))
val frameId = frameTimings.startFrame("input:ring:" + decoded.label)
@@ -2122,6 +2203,35 @@ class GlassesSessionCore(
}
}
+ /**
+ * Apply CFW ACKs/NACKs from [address] (the G2's `aa 12` frames, or the iO's 9-byte bodies)
+ * to the in-flight messages they name, then complete what they finished.
+ */
+ internal fun acceptCfwAcksLocked(address: String, acks: Array, txSeq: Int, payload: ByteArray) {
+ lastIncomingAtMs = now()
+ val arm = armIndex(address)
+ if (arm >= 0) lastArmCfwAckAtMs[arm] = lastIncomingAtMs
+ for (ack in acks) {
+ for (message in inFlightMessages) {
+ val ingress = if (message.isLeftArmMessage) leftAddress else rightAddress
+ if (message.sid == CfwTransport.SID && address.equals(ingress, ignoreCase = true) && message.magic == ack.streamId) {
+ message.acceptCfwAck(ack)
+ if (ack.nack) ConnectionCounters.increment("g2.cfw-nack")
+ logLine("CFW " + (if (ack.nack) "NACK" else "ACK") + " id=" + ack.streamId
+ + " ordinal=" + ack.messageId + " lens=" + ack.lens + " txseq=" + txSeq
+ + " redundant=" + (ack !== acks[0])
+ + " size=" + ack.size + " crc=" + ack.checksum
+ + " expected=" + message.message.size + "/" + message.cfwChecksum
+ + " ackedLenses=" + message.cfwAckLenses
+ + " ageMs=" + (lastIncomingAtMs - message.sentAtMs))
+ message.ackPayload = payload.copyOf()
+ break
+ }
+ }
+ }
+ drainCfwAcknowledgementsLocked()
+ }
+
override fun onConnectionStateChange(address: String?, connected: Boolean) {
if (address == null) {
return
@@ -2157,12 +2267,17 @@ class GlassesSessionCore(
monitor.withLock {
if (address.equals(rightAddress, ignoreCase = true)) {
rightConnected = connected
+ // The iO's one link stands for both arms.
+ if (isIo) leftConnected = connected
} else if (address.equals(leftAddress, ignoreCase = true)) {
leftConnected = connected
} else {
return
}
- if (!connected) {
+ if (!connected && isIo) io.reassembler.reset()
+ if (!connected && isG1 && g1CarryOnWithoutArmLocked(address)) {
+ // The session goes on; the worker brings this arm back.
+ } else if (!connected) {
// Before the session is ready, this is an attempt failing (or an arm
// dropping mid-setup): the connect sequence notices on its own and
// schedules the retry, so leave the backoff alone.
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionG1.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionG1.kt
new file mode 100644
index 00000000..856ca6e2
--- /dev/null
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionG1.kt
@@ -0,0 +1,1033 @@
+package com.faceclaw.app
+
+import com.faceclaw.app.GlassesSessionCore.Companion.DASHBOARD_TILE
+import com.faceclaw.app.GlassesSessionCore.Companion.safeMessage
+
+/** Bytes of the arm's frame once everything queued for it has run, and what each arm last reported. */
+internal class G1ArmState {
+ var hello: G1Protocol.Hello? = null
+ var battery = -1
+ var charge = -1
+ var inCase = -1
+ var worn = -1
+
+ /** Null: unknown, so the next update is a full frame. */
+ var frame: ByteArray? = null
+
+ fun resetLink() {
+ hello = null
+ battery = -1
+ charge = -1
+ inCase = -1
+ worn = -1
+ frame = null
+ }
+}
+
+/**
+ * Even G1 session state ([GlassesSessionCore.g1]); guarded by the core's monitor.
+ *
+ * A G1 is two independent devices on two BLE links, and neither hears what the other is sent. Each arm has its own
+ * deflate stream (cfwTransports) and frame, each message goes to one arm and only that lens ACKs it, and the phone
+ * composes each lens: the firmware has no display lists, so the shell scene is drawn here in its settled state.
+ * Firmware: scouter_kit's g1v0 (g1_firmware/docs/VM.md §6.11, firmware/src/fc.c).
+ */
+internal class G1SessionState {
+ val arms = arrayOf(G1ArmState(), G1ArmState())
+ private var tag = 0
+ val replies = HashMap()
+ var lastPropsAtMs = 0L
+
+ /** The panel may be blank: the next update ends in PRESENT even with no pixels to send. */
+ var presentPending = false
+
+ /** What a PROPS request asked for, by arm and tag: a reply doesn't repeat it. */
+ val propRequests = HashMap()
+ /** `PROP_SET`s for the worker thread to write: arm to body. */
+ val pendingPropSets = ArrayList>()
+ var lastLightAtMs = 0L
+ /** The last reading that made it to the log, in 0.01 lux. */
+ var loggedLight = -1
+ /** IMU samples are polled this often while someone wants them; 0: nobody does. */
+ var imuPeriodMs = 0L
+ var lastImuAtMs = 0L
+ var micOn = false
+ var lastMicRenewAtMs = 0L
+ val mic = G1MicAssembler()
+ /** The right arm's relay is there and this host listens to it. */
+ var ancsRelay = false
+
+ /** When an arm dropped while the session carried on with the other; 0: its link is up. */
+ val armDownSinceMs = LongArray(2)
+ /** When to ask for a lost arm's link again. */
+ val armRetryAtMs = LongArray(2)
+ /** How long the session carries on with one arm before it starts over. */
+ var armRecoveryMs = G1Timings.ARM_RECOVERY_MS
+
+ fun nextTag(): Int {
+ tag = tag % 255 + 1
+ return tag
+ }
+
+ fun resetLink() {
+ for (arm in arms) arm.resetLink()
+ replies.clear()
+ lastPropsAtMs = 0
+ presentPending = true
+ propRequests.clear()
+ pendingPropSets.clear()
+ lastLightAtMs = 0
+ lastImuAtMs = 0
+ micOn = false
+ lastMicRenewAtMs = 0
+ mic.reset()
+ ancsRelay = false
+ armDownSinceMs.fill(0)
+ armRetryAtMs.fill(0)
+ }
+}
+
+internal object G1Timings {
+ const val CONTROL_REPLY_MS = 1_500L
+ const val CONTROL_TRIES = 4
+ /** The OS may be showing its pairing dialog. */
+ const val PAIRING_MS = 30_000
+ const val PROPS_MS = 60_000L
+ /** Well inside the arm's 2 s lease. */
+ const val MIC_RENEW_MS = 1_000L
+ /** The sensor converts in 800 ms. */
+ const val LIGHT_DEMO_MS = 800L
+ const val LIGHT_AUTO_MS = 1_000L
+ const val LIGHT_MANUAL_MS = 5_000L
+ /** The G2's IMU rate is a pace code with no meaning here, and a poll is one round trip. */
+ const val IMU_POLL_MS = 50L
+ const val IDLE_WAKE_MS = 500L
+ const val LENS_LEFT = 1
+ const val LENS_RIGHT = 2
+ const val ARM_RECOVERY_MS = 15_000L
+ const val ARM_RETRY_MS = 1_000L
+ /** With the other arm's traffic waiting behind it. */
+ const val ARM_RECOVERY_WRITE_MS = 5_000
+
+ /** An arm advertises fast for a minute after a disconnection, so most links are back at once. */
+ val RECONNECT_BACKOFF_MS = intArrayOf(500, 1_000, 2_000, 4_000, 8_000)
+}
+
+/** An arm bonds only once it knows it's in the case, and a full case only says so about every 5 minutes. */
+private const val G1_CASE_DELAY_HINT = "A fully charged arm can take up to 5 minutes to notice it's in the case."
+
+/** What the Install prompt says an arm runs when it isn't g1v0. */
+private const val G1_OTHER_FIRMWARE = "Even's firmware"
+private val G1_PROPS = intArrayOf(G1Protocol.PROP_BATT_PCT, G1Protocol.PROP_CHARGE, G1Protocol.PROP_IN_CASE, G1Protocol.PROP_WORN)
+private val G1_LIGHT = intArrayOf(G1Protocol.PROP_LIGHT)
+private val G1_IMU = intArrayOf(G1Protocol.PROP_ACC_X, G1Protocol.PROP_ACC_Y, G1Protocol.PROP_ACC_Z)
+
+internal val GlassesSessionCore.isG1: Boolean get() = glassesType == GlassesType.G1
+
+internal val GlassesSessionCore.isG2: Boolean get() = glassesType == GlassesType.G2
+
+/** What the display path takes (fc.c); anything else a shared feature queues never goes out. */
+internal fun g1SupportsMessage(message: OutboundMessage): Boolean {
+ if (message.sid != CfwTransport.SID || message.message.isEmpty()) return false
+ return when (message.message[0].toInt() and CFW_MSG_TYPE_MASK) {
+ CFW_MSG_DRAW_CALLS, CFW_MSG_PRESENT, CFW_MSG_BRIGHTNESS -> true
+ // The bandwidth benchmark's no-op: the firmware acknowledges what it doesn't know.
+ CFW_MSG_DIAGNOSTICS -> message.kind == "bandwidth"
+ else -> false
+ }
+}
+
+private fun GlassesSessionCore.g1ArmAddress(arm: Int): String = if (arm == 0) leftAddress else rightAddress
+
+private fun g1Side(arm: Int): String = if (arm == 0) "left" else "right"
+
+private fun g1Lens(arm: Int): Int = if (arm == 0) G1Timings.LENS_LEFT else G1Timings.LENS_RIGHT
+
+// ---------------------------------------------------------------------------------------------
+// Writes
+
+/** The packets of one queued message, its record from this arm's persistent deflate stream. */
+internal fun GlassesSessionCore.g1CfwWrites(message: OutboundMessage, mtu: Int): List {
+ val arm = if (message.isLeftArmMessage) 0 else 1
+ val transport = cfwTransports[arm]
+ if (message.cfwRetries > 0) transport.reset()
+ return G1Protocol.packets(transport.encodeRecord(message.message, g1Lens(arm)), message.magic, mtu)
+}
+
+private fun GlassesSessionCore.g1WriteControl(address: String, op: Int, tag: Int, body: ByteArray): Boolean =
+ link.writeFrames(address, G1Ble.CTRL_CHAR_UUID, listOf(G1Protocol.control(op, tag, body)),
+ GattWriteMode.WITHOUT_RESPONSE, ConnectionOptions.WRITE_TIMEOUT_MS)
+
+/**
+ * A control request and its reply; worker thread, outside the monitor. Writes on a link the arm doesn't yet obey
+ * (out of the case, before encryption) are ignored and control requests can be lost, so it asks again.
+ */
+private fun GlassesSessionCore.g1Control(arm: Int, op: Int, body: ByteArray = ByteArray(0), tries: Int = G1Timings.CONTROL_TRIES): G1Protocol.Reply {
+ val address = g1ArmAddress(arm)
+ repeat(tries) {
+ val tag = monitor.withLock { g1.nextTag() }
+ val key = arm * 256 + tag
+ val written = try {
+ g1WriteControl(address, op, tag, body)
+ } catch (e: IllegalStateException) {
+ false
+ }
+ if (!written) throw G1ConnectException(g1Side(arm) + " arm dropped", "The " + g1Side(arm) + " arm dropped the connection.")
+ val deadline = now() + G1Timings.CONTROL_REPLY_MS
+ monitor.withLock {
+ while (true) {
+ g1.replies.remove(key)?.let { return it }
+ if (!running || userDisconnectRequested) throw IllegalStateException("stopped while waiting for control $op")
+ if (!(if (arm == 0) leftConnected else rightConnected)) {
+ throw G1ConnectException(g1Side(arm) + " arm dropped", "The " + g1Side(arm) + " arm dropped the connection.")
+ }
+ val remaining = deadline - now()
+ if (remaining <= 0) break
+ monitor.awaitMs(minOf(remaining, 100L))
+ }
+ }
+ }
+ throw G1ConnectException(g1Side(arm) + " arm silent", "The " + g1Side(arm) + " arm isn't answering.")
+}
+
+private fun GlassesSessionCore.g1RequestProps(arm: Int, ids: IntArray) {
+ val tag = monitor.withLock {
+ val tag = g1.nextTag()
+ g1.propRequests[arm * 256 + tag] = ids
+ tag
+ }
+ g1WriteControl(g1ArmAddress(arm), G1Protocol.OP_PROPS, tag, ByteArray(ids.size) { ids[it].toByte() })
+}
+
+/**
+ * The firmware keeps no session of its own for most of this: the worker polls what it wants to know, keeps the
+ * microphone's lease and writes the properties that were asked for. Worker thread, outside the monitor.
+ */
+internal fun GlassesSessionCore.g1Maintain() {
+ g1RecoverArms()
+ var status = false
+ var mic: Boolean? = null
+ var light = false
+ var imu = false
+ var sets: List> = emptyList()
+ val up = BooleanArray(2)
+ monitor.withLock {
+ if (!sessionReady) return
+ val now = now()
+ for (arm in 0..1) up[arm] = g1.armDownSinceMs[arm] == 0L
+ if (now - g1.lastPropsAtMs >= G1Timings.PROPS_MS) {
+ status = true
+ g1.lastPropsAtMs = now
+ }
+ // What only the right arm has waits for it to come back, which starts all of it again.
+ if (!up[1]) {
+ // Nothing to do here.
+ } else if (audioCaptureActive) {
+ if (now - g1.lastMicRenewAtMs >= G1Timings.MIC_RENEW_MS) {
+ mic = true
+ g1.micOn = true
+ g1.lastMicRenewAtMs = now
+ }
+ } else if (g1.micOn) {
+ mic = false
+ g1.micOn = false
+ }
+ // The sensor only reads while the panel is on; a dark panel keeps the last filtered value.
+ val interval = if (brightnessDemoPolling) G1Timings.LIGHT_DEMO_MS
+ else if (brightnessPolicy.automatic) G1Timings.LIGHT_AUTO_MS else G1Timings.LIGHT_MANUAL_MS
+ if (up[1] && brightnessSentVisible == true && !chargingMode && !shutdownRequested && now - g1.lastLightAtMs >= interval) {
+ light = true
+ g1.lastLightAtMs = now
+ }
+ if (up[1] && g1.imuPeriodMs > 0 && now - g1.lastImuAtMs >= g1.imuPeriodMs) {
+ imu = true
+ g1.lastImuAtMs = now
+ }
+ if (g1.pendingPropSets.isNotEmpty()) {
+ sets = g1.pendingPropSets.filter { up[it.first] }
+ g1.pendingPropSets.clear()
+ }
+ }
+ if (status) {
+ for (arm in 0..1) if (up[arm]) g1RequestProps(arm, G1_PROPS)
+ }
+ mic?.let { on ->
+ val tag = monitor.withLock { g1.nextTag() }
+ g1WriteControl(rightAddress, G1Protocol.OP_MIC, tag, G1Protocol.micRequest(on))
+ }
+ if (light) g1RequestProps(1, G1_LIGHT)
+ if (imu) g1RequestProps(1, G1_IMU)
+ for ((arm, body) in sets) {
+ val tag = monitor.withLock { g1.nextTag() }
+ g1WriteControl(g1ArmAddress(arm), G1Protocol.OP_PROP_SET, tag, body)
+ }
+}
+
+/** The longest the session worker may sleep and keep up with [g1Maintain]. */
+internal fun GlassesSessionCore.g1MaxSleepMs(): Long =
+ monitor.withLock { if (g1.imuPeriodMs > 0) g1.imuPeriodMs else G1Timings.IDLE_WAKE_MS }
+
+/**
+ * The right arm's microphone: 16 kHz mono LC3, in the packets the G2's decoder takes. The arm stops it 2 s after the last
+ * renewal and at a disconnection; meanwhile it shows its indicator in a corner of the panel (VM.md §6.5).
+ */
+internal fun GlassesSessionCore.g1StartAudioCapture(listener: FaceclawAudioPacketListener): Boolean {
+ monitor.withLock {
+ if (!running || !sessionReady || shutdownRequested) {
+ logLine("skip G1 mic: session not ready")
+ return false
+ }
+ if (g1.arms[1].hello?.mic != true) {
+ logLine("skip G1 mic: this arm has no capture")
+ return false
+ }
+ g1.mic.reset()
+ audioPacketListener = listener
+ audioCaptureActive = true
+ g1.lastMicRenewAtMs = 0
+ }
+ interruptibleSleep.interrupt()
+ return true
+}
+
+internal fun GlassesSessionCore.g1StopAudioCapture() {
+ monitor.withLock {
+ audioPacketListener = null
+ audioCaptureActive = false
+ }
+ interruptibleSleep.interrupt()
+}
+
+/**
+ * There is no magnetometer on a G1, only the accelerometer and gyroscope: x, y, z in g, head frame, from the right arm.
+ * [enable] raises the sample rate and polls it; [g1MaxSleepMs] follows.
+ */
+internal fun GlassesSessionCore.g1SetImuReport(enable: Boolean) {
+ monitor.withLock {
+ g1.imuPeriodMs = if (enable) G1Timings.IMU_POLL_MS else 0
+ g1.lastImuAtMs = 0
+ g1.pendingPropSets.add(1 to G1Protocol.propSet(G1Protocol.PROP_IMU_RATE,
+ if (enable) G1Protocol.IMU_RATE_STREAM else G1Protocol.IMU_RATE_IDLE))
+ }
+ interruptibleSleep.interrupt()
+}
+
+// ---------------------------------------------------------------------------------------------
+// Frames (under the monitor, from enqueueDesiredImageLocked)
+
+/** Whatever was queued is gone, so what the arms' frames will hold is unknown. */
+internal fun GlassesSessionCore.g1ForgetFramesLocked() {
+ if (!isG1) return
+ for (arm in g1.arms) arm.frame = null
+ g1.presentPending = true
+ for (transport in cfwTransports) transport.reset()
+}
+
+/**
+ * Compose each lens in the frame's settled state, send what changed against the arm's frame, and end with PRESENT.
+ * The two arms' messages alternate so that neither eye runs far ahead, and the PRESENTs go out last and side by side.
+ * A blanked frame sends nothing: the panel waits in standby with the last picture in the arm's frame, and the next
+ * visible frame is a delta against it.
+ */
+internal fun GlassesSessionCore.g1EnqueueFrameLocked(
+ packed: ByteArray, width: Int, height: Int, scene: ShellScene, fingerprint: String, paintMs: Int, frameId: Int,
+) {
+ if (fingerprint.startsWith("blanked:")) {
+ lastEnqueuedFingerprint = fingerprint
+ displayedFingerprint = fingerprint
+ finishFrame(frameId, "blanked: the panel is in standby")
+ return
+ }
+ frameTimings.spanStart(frameId, "compose-lenses")
+ val updates: List>
+ val composed: Array
+ try {
+ val left = scene.composed(packed, width, height, false)
+ val right = if (scene.hasStereoDepth) scene.composed(packed, width, height, true) else left
+ composed = arrayOf(left, right)
+ // An arm that's away gets all of this when it's back: its frame stays unknown until then.
+ updates = List(2) { arm ->
+ if (g1.armDownSinceMs[arm] != 0L) emptyList() else G1FramePlanner.plan(g1.arms[arm].frame, composed[arm], width, height)
+ }
+ } catch (e: Exception) {
+ // As in the G2's path: this frame would fail the same way after a reconnect (#42), so drop it.
+ lastEnqueuedFingerprint = fingerprint
+ logLine("frame plan failed; frame dropped: " + safeMessage(e))
+ finishFrame(frameId, "discarded: frame plan failed")
+ return
+ }
+ frameTimings.spanEnd(frameId, "compose-lenses")
+ val force = g1.presentPending
+ val queues = List(2) { arm ->
+ ArrayDeque(updates[arm]).also {
+ if (g1.armDownSinceMs[arm] == 0L && (it.isNotEmpty() || force)) it.addLast(byteArrayOf(CFW_MSG_PRESENT.toByte()))
+ }
+ }
+ g1.presentPending = false
+ for (arm in 0..1) if (g1.armDownSinceMs[arm] == 0L) g1.arms[arm].frame = composed[arm]
+ lastEnqueuedFingerprint = fingerprint
+ val messageCount = queues.sumOf { it.size }
+ if (messageCount == 0) {
+ displayedFingerprint = fingerprint
+ finishFrame(frameId, "no change on either lens")
+ return
+ }
+ val updateId = nextImageUpdateId++
+ imageUpdateStats[updateId] = BleImageOptimizer.ImageUpdateStats(paintMs, 1, frameId)
+ var number = 0
+ var payloadBytes = 0
+ var arm = 0
+ while (queues[0].isNotEmpty() || queues[1].isNotEmpty()) {
+ // The other arm's turn once this one is down to its PRESENT, so that both PRESENTs come last.
+ val other = 1 - arm
+ val waiting = queues[arm].size == 1 && queues[other].size > 1
+ if (queues[arm].isEmpty() || waiting) {
+ arm = other
+ continue
+ }
+ val payload = queues[arm].removeFirst()
+ payloadBytes += payload.size
+ number++
+ val plan = BleImageOptimizer.TileImagePlan(arm, DASHBOARD_TILE, composed[arm], width, height, nextMapSessionId(), payload)
+ enqueueCustomImageLocked(plan, payload, fingerprint, updateId, number, messageCount, arm == 0, g1Lens(arm))
+ arm = other
+ }
+ frameTimings.log(frameId, "queued image update#$updateId messages=$messageCount payload=${payloadBytes}B")
+ logLine("queue image update#$updateId fingerprint=$fingerprint messages=$messageCount")
+}
+
+/** Message 30 for both arms, its visibility ordered with the frames around it. */
+internal fun GlassesSessionCore.g1EnqueueBrightnessLocked(payload: ByteArray, label: String, visibleChanged: Boolean, onTimeout: MessageCallback) {
+ for (arm in 0..1) {
+ if (g1.armDownSinceMs[arm] != 0L) continue
+ val message = messageBuilder.customMessage("brightness-output", payload, label, -1, arm == 0)
+ message.cfwRequiredLenses = g1Lens(arm)
+ message.onTimeout = onTimeout
+ pendingMessages.addLast(message)
+ }
+ if (visibleChanged) g1.presentPending = true
+}
+
+private fun GlassesSessionCore.g1HidePayload(): ByteArray =
+ byteArrayOf(CFW_MSG_BRIGHTNESS.toByte(), 1, brightnessPolicy.target.coerceIn(0, 100).toByte(), 0, 0, 0)
+
+/** Stop drawing, keeping the links and the arms' frames: the panels wait in standby (the EvenHub suspend analogue). */
+internal fun GlassesSessionCore.g1Suspend(): Boolean {
+ monitor.withLock {
+ if (!running || !sessionReady) return false
+ val idle = pendingMessages.isEmpty() && inFlightMessages.isEmpty()
+ val frames = g1.arms.map { it.frame }
+ shutdownRequested = true
+ clearAllMessagesLocked("G1 suspend")
+ // Nothing was lost, so the arms still hold what the phone thinks and a wake is a delta.
+ if (idle) for (arm in 0..1) g1.arms[arm].frame = frames[arm]
+ g1EnqueueBrightnessLocked(g1HidePayload(), "suspend: hide", true) { }
+ brightnessSentVisible = false
+ displayedFingerprint = ""
+ }
+ interruptibleSleep.interrupt()
+ return true
+}
+
+/** The drive loop resends the desired frame; its PRESENT brings the panels back. */
+internal fun GlassesSessionCore.g1Resume(): Boolean {
+ monitor.withLock {
+ if (!running || !sessionReady) return false
+ shutdownRequested = false
+ displayedFingerprint = ""
+ lastEnqueuedFingerprint = ""
+ imageRetryAfterMs = 0
+ g1.presentPending = true
+ }
+ interruptibleSleep.interrupt()
+ return true
+}
+
+/**
+ * At the end of a session: the panels off now rather than 30 s from now, when the firmware's own rule would do it.
+ * A raw record that resets the stream, not waited on; nothing follows it.
+ */
+internal fun GlassesSessionCore.g1HideBeforeDisconnect() {
+ val message = g1HidePayload()
+ val record = CfwTransport.record(message, CfwTransport.crc(message), CfwTransport.BOTH or CfwTransport.RESET_CONTEXT)
+ for (arm in 0..1) {
+ val address = g1ArmAddress(arm)
+ if (!link.isConnected(address)) continue
+ try {
+ link.writeFrames(address, G1Ble.FC_CHAR_UUID, G1Protocol.packets(record, 0, link.negotiatedMtu(address)),
+ GattWriteMode.WITHOUT_RESPONSE, ConnectionOptions.WRITE_TIMEOUT_MS)
+ } catch (t: Throwable) {
+ logLine("G1 hide failed: " + safeMessage(t))
+ }
+ }
+}
+
+// ---------------------------------------------------------------------------------------------
+// Connect (worker thread)
+
+/** The arm has no g1v0 service: it runs Even's firmware. */
+private class G1OtherFirmwareException : Exception("not g1v0 firmware")
+
+/**
+ * A connection that failed in a way the wearer can be told: [reason] for the log and counters, [display] for the screen.
+ * [repairing]: a stale pairing was just removed, and the next attempt makes a new one.
+ */
+private class G1ConnectException(reason: String, val display: String, val repairing: Boolean = false) : Exception(reason)
+
+/**
+ * Subscribes to the arm's events, which is also where its firmware shows. An arm keeps its address across an install, and the
+ * OS may remember the services it had before: read them again before believing the table either way.
+ */
+private fun GlassesSessionCore.g1SubscribeEvents(arm: Int) {
+ val address = g1ArmAddress(arm)
+ val timeoutMs = ConnectionOptions.SERVICES_TIMEOUT_MS
+ if (!link.hasCharacteristic(address, G1Ble.EVT_CHAR_UUID)) {
+ logLine("G1 " + g1Side(arm) + " arm: no event characteristic, reading its services again")
+ link.refreshServices(address, timeoutMs)
+ }
+ if (!link.hasCharacteristic(address, G1Ble.EVT_CHAR_UUID)) {
+ if (!link.isConnected(address)) throw G1ConnectException(g1Side(arm) + " arm dropped", "The " + g1Side(arm) + " arm dropped the connection.")
+ throw G1OtherFirmwareException()
+ }
+ fun subscribe(): Boolean = try {
+ link.enableNotifications(address, G1Ble.EVT_CHAR_UUID, true, ConnectionOptions.DESCRIPTOR_TIMEOUT_MS)
+ } catch (e: IllegalStateException) {
+ false
+ }
+ if (subscribe()) return
+ if (link.isConnected(address)) {
+ // A table that lists it and an arm that refuses: the table may be old in the other direction.
+ link.refreshServices(address, timeoutMs)
+ if (!link.hasCharacteristic(address, G1Ble.EVT_CHAR_UUID)) throw G1OtherFirmwareException()
+ if (subscribe()) return
+ }
+ throw G1ConnectException(g1Side(arm) + " arm dropped", "The " + g1Side(arm) + " arm dropped the connection.")
+}
+
+private fun GlassesSessionCore.g1ConnectArm(arm: Int, deadlineMs: Long) {
+ val address = g1ArmAddress(arm)
+ val timeoutMs = maxOf(deadlineMs - now(), ConnectionOptions.CONNECT_TIMEOUT_MS.toLong())
+ if (!link.connect(address, timeoutMs.toInt())) {
+ throw ArmUnreachableException(if (arm == 0) "left" else "right", address)
+ }
+ link.requestHighPriority(address)
+ link.requestMtu(address, G1Ble.REQUESTED_MTU, ConnectionOptions.CONNECT_TIMEOUT_MS)
+ if (!link.discoverServices(address, ConnectionOptions.SERVICES_TIMEOUT_MS)) {
+ throw G1ConnectException(g1Side(arm) + " arm dropped", "The " + g1Side(arm) + " arm dropped the connection.")
+ }
+ g1SubscribeEvents(arm)
+ link.requestLe2mPhy(address)
+ monitor.withLock {
+ if (arm == 0) leftConnected = true else rightConnected = true
+ }
+}
+
+/**
+ * A write with response to PAIR needs an encrypted link. A bonded arm gets one at once; an arm in the case bonds here,
+ * through whatever the OS does (Android's dialog, iOS's); out of the case the arm refuses a new bond and the write fails.
+ * Either way this is where the link is known to be encrypted, so the arm obeys everything that follows.
+ */
+private fun GlassesSessionCore.g1Pair(arm: Int, writeTimeoutMs: Int = G1Timings.PAIRING_MS) {
+ val address = g1ArmAddress(arm)
+ if (!link.isBonded(address)) {
+ logLine("G1 " + g1Side(arm) + " arm: asking the OS to pair")
+ setStateDisplay("connecting", "Pairing with the glasses...")
+ link.requestBond(address)
+ val deadline = now() + G1Timings.PAIRING_MS
+ while (!link.isBonded(address) && now() < deadline) {
+ interruptibleSleep.sleep(200)
+ if (!monitor.withLock { running && !userDisconnectRequested }) throw IllegalStateException("stopped while pairing")
+ }
+ }
+ val encrypted = try {
+ link.writeFrames(address, G1Ble.PAIR_CHAR_UUID, listOf(byteArrayOf(1)), GattWriteMode.WITH_RESPONSE, writeTimeoutMs)
+ } catch (e: IllegalStateException) {
+ false
+ }
+ if (encrypted) return
+ if (!link.isConnected(address)) {
+ throw G1ConnectException(g1Side(arm) + " arm dropped", "The " + g1Side(arm) + " arm dropped the connection.")
+ }
+ // The link is up and the arm won't encrypt it. If the OS says this phone is bonded, the arm has lost its half: it has
+ // since paired on Even's firmware or with other hosts. Only an arm in the case can pair again, so that's the only time a
+ // bond is safe to give up. An unencrypted link gets an answer from nothing else, and this is the only way to ask.
+ if (link.isBonded(address) && g1InCaseWithoutEncryption(arm) && link.removeBond(address)) {
+ logLine("G1 " + g1Side(arm) + " arm: it lost this phone's pairing; removed it, pairing again")
+ throw G1ConnectException(g1Side(arm) + " arm pairing removed", "Pairing with the glasses again.", repairing = true)
+ }
+ throw G1ConnectException(g1Side(arm) + " arm stale pairing", "The glasses don't recognize this phone's pairing. Put them in their "
+ + "charging case with the lid open to pair again; if that doesn't help, remove them from this phone's Bluetooth settings. "
+ + G1_CASE_DELAY_HINT)
+}
+
+private fun GlassesSessionCore.g1InCaseWithoutEncryption(arm: Int): Boolean = try {
+ val hello = G1Protocol.parseHello(g1Control(arm, G1Protocol.OP_HELLO, tries = 1).body)
+ hello != null && hello.inCase && !hello.encrypted
+} catch (e: G1ConnectException) {
+ false
+}
+
+/** What an arm needs to hear each time its link comes up. */
+private fun GlassesSessionCore.g1StartArm(arm: Int) {
+ val events = g1Control(arm, G1Protocol.OP_EVENTS, G1Protocol.eventsRequest(G1Protocol.EVENTS_MASK))
+ if (events.status != 0) throw G1ConnectException(g1Side(arm) + " arm refused events", "The " + g1Side(arm) + " arm isn't answering.")
+ // The arm counts a boot healthy only after a host has said so (VM.md §6.4, safe mode).
+ g1Control(arm, G1Protocol.OP_HEALTH_OK)
+ // A limit the last session left, when the other eye's panel guard had capped it.
+ g1Control(arm, G1Protocol.OP_PROP_SET, G1Protocol.propSet(G1Protocol.PROP_BRIGHTNESS_MAX, G1Protocol.BRIGHTNESS_LEVEL_MAX))
+}
+
+// ---------------------------------------------------------------------------------------------
+// One arm lost
+
+/**
+ * The arms are independent links, and in crowded 2.4 GHz one often drops alone. Carry on with the other, and bring this one
+ * back by itself, instead of dropping both and showing the wearer a reconnect for a blip. Whatever was on its way to this
+ * arm is gone, and so is what the phone knew about its frame. False: the session can't go on without it. Under the monitor,
+ * on the BLE callback thread.
+ */
+internal fun GlassesSessionCore.g1CarryOnWithoutArmLocked(address: String): Boolean {
+ val arm = armIndex(address)
+ if (arm < 0 || !running || !sessionReady || userDisconnectRequested) return false
+ val otherUp = g1.armDownSinceMs[1 - arm] == 0L && (if (arm == 0) rightConnected else leftConnected)
+ if (!otherUp) return false
+ // The relay's client has to be told to start again, and only a new session tells it.
+ if (arm == 1 && g1.ancsRelay) return false
+ if (benchmarkActive) finishBenchmarkLocked(true, "an arm dropped")
+ g1.armDownSinceMs[arm] = now()
+ g1.armRetryAtMs[arm] = 0
+ g1DropArmMessagesLocked(arm)
+ logLine("G1 " + g1Side(arm) + " arm dropped: carrying on with the other while it comes back")
+ ConnectionCounters.increment("g1.arm-drop.carried-on")
+ return true
+}
+
+private fun GlassesSessionCore.g1DropArmMessagesLocked(arm: Int) {
+ val left = arm == 0
+ val reason = "the " + g1Side(arm) + " arm dropped"
+ val pending = pendingMessages.iterator()
+ while (pending.hasNext()) {
+ val message = pending.next()
+ if (message.sid != CfwTransport.SID || message.isLeftArmMessage != left) continue
+ pending.remove()
+ discardPrewriteIfMatchesLocked(message)
+ discardImageUpdateStatsLocked(message.imageUpdateId, reason)
+ magicPool.release(message.sid, message.magic, message.label, reason)
+ }
+ val inFlight = inFlightMessages.iterator()
+ while (inFlight.hasNext()) {
+ val message = inFlight.next()
+ if (message.sid != CfwTransport.SID || message.isLeftArmMessage != left) continue
+ inFlight.remove()
+ discardImageUpdateStatsLocked(message.imageUpdateId, reason)
+ magicPool.release(message.sid, message.magic, message.label, reason)
+ }
+ cfwTransports[arm].reset()
+ g1.arms[arm].frame = null
+ g1.presentPending = true
+ // What's displayed is no longer what the drive loop thinks; it gets another look.
+ lastEnqueuedFingerprint = ""
+ displayedFingerprint = ""
+}
+
+/** A message for an arm that's away would only fail the write or wait for an ACK that can't come. */
+internal fun GlassesSessionCore.g1ArmIsAway(message: OutboundMessage): Boolean =
+ monitor.withLock { g1.armDownSinceMs[if (message.isLeftArmMessage) 0 else 1] != 0L }
+
+/** Worker thread, outside the monitor. Blocks the other arm's traffic only for the setup, not while waiting for a link. */
+private fun GlassesSessionCore.g1RecoverArms() {
+ for (arm in 0..1) {
+ val address = g1ArmAddress(arm)
+ var downSince = 0L
+ var retryAt = 0L
+ var limit = 0L
+ monitor.withLock {
+ downSince = if (sessionReady) g1.armDownSinceMs[arm] else 0L
+ retryAt = g1.armRetryAtMs[arm]
+ limit = g1.armRecoveryMs
+ }
+ if (downSince == 0L) continue
+ val now = now()
+ if (now - downSince >= limit) {
+ handleTransportFailure(g1Side(arm) + " arm lost", "Can't reach the " + g1Side(arm) + " arm of the glasses.")
+ return
+ }
+ if (!link.isConnected(address)) {
+ if (now >= retryAt) {
+ monitor.withLock { g1.armRetryAtMs[arm] = now + G1Timings.ARM_RETRY_MS }
+ link.beginConnect(address, false)
+ }
+ continue
+ }
+ try {
+ // A missing bond isn't a blip: that goes to the full connect, which knows what to say and can wait for the OS.
+ if (!link.isBonded(address)) throw G1ConnectException(g1Side(arm) + " arm not bonded", "The glasses aren't paired.")
+ g1ConnectArm(arm, now + ConnectionOptions.CONNECT_TIMEOUT_MS)
+ g1Pair(arm, G1Timings.ARM_RECOVERY_WRITE_MS)
+ val hello = G1Protocol.parseHello(g1Control(arm, G1Protocol.OP_HELLO).body)
+ ?: throw G1ConnectException(g1Side(arm) + " arm bad hello", "The " + g1Side(arm) + " arm isn't answering.")
+ g1StartArm(arm)
+ monitor.withLock {
+ g1.arms[arm].hello = hello
+ logLine("G1 " + g1Side(arm) + " arm back after " + (now() - downSince) + " ms")
+ ConnectionCounters.increment("g1.arm-recovered")
+ g1.armDownSinceMs[arm] = 0
+ g1.armRetryAtMs[arm] = 0
+ cfwTransports[arm].reset()
+ g1.presentPending = true
+ // It's had no frames: all of it again, the brightness too. The drive loop sends the desired frame.
+ brightnessSentLevel = -1
+ brightnessSentVisible = null
+ displayedFingerprint = ""
+ lastEnqueuedFingerprint = ""
+ imageRetryAfterMs = 0
+ g1.lastPropsAtMs = 0
+ if (arm == 1) {
+ g1.lastLightAtMs = 0
+ g1.lastMicRenewAtMs = 0
+ g1.mic.reset()
+ g1.lastImuAtMs = 0
+ if (g1.imuPeriodMs > 0) g1.pendingPropSets.add(1 to G1Protocol.propSet(G1Protocol.PROP_IMU_RATE, G1Protocol.IMU_RATE_STREAM))
+ }
+ monitor.signalAll()
+ }
+ interruptibleSleep.interrupt()
+ } catch (t: Exception) {
+ logLine("G1 " + g1Side(arm) + " arm not back yet: " + (t.message ?: t.toString()))
+ monitor.withLock { g1.armRetryAtMs[arm] = now() + G1Timings.ARM_RETRY_MS }
+ try {
+ link.disconnect(address)
+ } catch (ignored: Exception) {
+ }
+ }
+ }
+}
+
+internal fun GlassesSessionCore.g1ConnectLoopOnce() {
+ monitor.withLock {
+ wearState = -1
+ g1.resetLink()
+ }
+ setStateDisplay("connecting", "Connecting to the glasses...")
+ ConnectionCounters.increment("g1.connect-attempt")
+ try {
+ val deadlineMs = now() + ConnectionOptions.ARM_CONNECT_WINDOW_MS
+ link.beginConnect(rightAddress, false)
+ link.beginConnect(leftAddress, false)
+ // The left first, as the arms were installed; each stands alone.
+ g1ConnectArm(0, deadlineMs)
+ g1ConnectArm(1, deadlineMs)
+ g1Pair(0)
+ g1Pair(1)
+
+ val versions = arrayOf("", "")
+ var compatible = true
+ for (arm in 0..1) {
+ val reply = g1Control(arm, G1Protocol.OP_HELLO)
+ val hello = G1Protocol.parseHello(reply.body)
+ ?: throw G1ConnectException(g1Side(arm) + " arm bad hello", "The " + g1Side(arm) + " arm isn't answering.")
+ monitor.withLock { g1.arms[arm].hello = hello }
+ versions[arm] = "g1v0 " + hello.version + (if (hello.safeMode) " (safe mode)" else "")
+ if (hello.leftArm != (arm == 0)) {
+ logWarn("G1: the arm paired as " + (if (arm == 0) "left" else "right") + " says it is the other one; its lens gets the other eye's frame")
+ }
+ val info = g1Control(arm, G1Protocol.OP_FC_INFO)
+ val fcVersion = if (info.status == 0) G1Protocol.parseFcVersion(info.body) else -1
+ logLine("G1 " + (if (arm == 0) "left" else "right") + " arm: " + versions[arm]
+ + " display path " + fcVersion + " encrypted=" + hello.encrypted + " inCase=" + hello.inCase
+ + " panelOk=" + hello.panelOk + " phy=" + link.describePhy(g1ArmAddress(arm)))
+ compatible = compatible && fcVersion >= 1 && G1Ble.firmwareAtLeast(hello.version)
+ }
+ // Not the G2 custom firmware's revision: this firmware has its own version, compared here, and TS compares this.
+ val firmware = BleProtocol.FirmwareInfo(versions[0], versions[1],
+ if (compatible) BleProtocol.FirmwareInfo.FACECLAW_EXTENSION_PREFIX + requiredFirmwareRevision else "")
+ emitFirmwareInfo(firmware)
+ if (!compatible) {
+ monitor.withLock { incompatibleFirmware = firmware }
+ return
+ }
+ for (arm in 0..1) g1StartArm(arm)
+ g1ListenToAncsRelay()
+ monitor.withLock {
+ sessionReady = true
+ shutdownRequested = false
+ customFirmwareDetected = true
+ clearAllMessagesLocked("session ready")
+ fixedLayoutCreated = true
+ displayedFingerprint = ""
+ lastAckAtMs = now()
+ lastIncomingAtMs = lastAckAtMs
+ lastConnectionOrInputAtMs = lastAckAtMs
+ lastSessionReadyAtMs = lastAckAtMs
+ imageRetryAfterMs = 0
+ consecutiveAckTimeouts = 0
+ cfwCleanupDelivered = false
+ lastCfwCleanupAckMagic = 0
+ g1.lastPropsAtMs = 0
+ monitor.signalAll()
+ }
+ setStateDisplay("connected", "Connected.")
+ interruptibleSleep.interrupt()
+ } catch (t: G1OtherFirmwareException) {
+ logLine("G1: an arm runs Even's firmware")
+ val firmware = BleProtocol.FirmwareInfo(G1_OTHER_FIRMWARE, G1_OTHER_FIRMWARE, "")
+ emitFirmwareInfo(firmware)
+ monitor.withLock { incompatibleFirmware = firmware }
+ } catch (t: Throwable) {
+ // The ways this is expected to fail have a reason of their own; the stack is for what isn't expected.
+ logLine("G1 connect failed: " + (if (t is G1ConnectException) t.message else safeMessage(t)))
+ val unpaired = if (t is G1ConnectException && t.repairing) null else firstUnpairedArm()
+ if (unpaired != null) {
+ logError("G1 connect failed and $unpaired is not paired; suspending reconnect")
+ ConnectionCounters.increment("g1.unpaired")
+ monitor.withLock { haltReconnectLocked("arm not paired: $unpaired") }
+ if (!userDisconnectRequested) {
+ setStateDisplay("unpaired", "The glasses are not paired with this phone. Put them in their charging case"
+ + " with the lid open, then connect: they only pair in the case. " + G1_CASE_DELAY_HINT)
+ }
+ interruptibleSleep.interrupt()
+ } else if (t is ArmUnreachableException) {
+ val other = if (t.side == "left") rightAddress else leftAddress
+ if (link.isConnected(other)) {
+ handleTransportFailure(t.side + " arm not found", "Can't reach the " + t.side + " arm of the glasses."
+ + " It may be connected to another device, or be off or out of range.")
+ } else {
+ handleTransportFailure("glasses not found", "Can't find the glasses. They may be off or out of range.")
+ }
+ } else if (t is G1ConnectException) {
+ handleTransportFailure(t.message, t.display)
+ } else {
+ handleTransportFailure("connect failed", "Couldn't connect to the glasses.")
+ }
+ }
+}
+
+/**
+ * Only a host with a relay client listens, and the arm does nothing until that client says START. An arm updated just now
+ * may still look old to the OS, which keeps the GATT layout it last saw until it hears otherwise: not worth failing the
+ * session, and the next connection sees it.
+ */
+private fun GlassesSessionCore.g1ListenToAncsRelay() {
+ val wanted = rawFrameTap != null && monitor.withLock { g1.arms[1].hello?.ancs == true }
+ val listening = wanted && link.hasCharacteristic(rightAddress, G1Ble.ANCS_CHAR_UUID)
+ && link.enableNotifications(rightAddress, G1Ble.ANCS_CHAR_UUID, true, ConnectionOptions.DESCRIPTOR_TIMEOUT_MS)
+ if (wanted && !listening) logWarn("G1: the right arm has a notification relay, but subscribing to it failed")
+ monitor.withLock { g1.ancsRelay = listening }
+}
+
+// ---------------------------------------------------------------------------------------------
+// Inbound (BLE callback thread)
+
+internal fun GlassesSessionCore.g1OnNotification(address: String, characteristicUuid: String, data: ByteArray) {
+ if (G1Ble.ANCS_CHAR_UUID == characteristicUuid) {
+ val tap = rawFrameTap
+ if (tap != null && data.size >= 2 && data[0] == GlassesSessionCore.RELAY_TAG_A && data[1] == GlassesSessionCore.RELAY_TAG_N
+ && address.equals(rightAddress, ignoreCase = true)) {
+ monitor.withLock { lastIncomingAtMs = now() }
+ tap(data.copyOf())
+ }
+ return
+ }
+ if (G1Ble.EVT_CHAR_UUID != characteristicUuid) return
+ val arm = armIndex(address)
+ if (arm < 0) return
+ when (val type = G1Protocol.eventType(data)) {
+ G1Protocol.EV_FC_ACK -> {
+ val ack = G1Protocol.parseFcAck(data) ?: return
+ monitor.withLock { acceptCfwAcksLocked(address, arrayOf(ack), 0, data) }
+ interruptibleSleep.interrupt()
+ }
+ G1Protocol.EV_INPUT -> g1HandleInput(arm, G1Protocol.parseInput(data) ?: return)
+ G1Protocol.EV_MIC_DATA -> g1HandleMicData(address, data)
+ G1Protocol.EV_NOTICE -> g1HandleNotice(arm, G1Protocol.parseNotice(data) ?: return)
+ else -> if (type >= 0x80) {
+ val reply = G1Protocol.parseReply(data) ?: return
+ if (reply.op == G1Protocol.OP_PROPS) {
+ val ids = monitor.withLock { g1.propRequests.remove(arm * 256 + reply.tag) } ?: return
+ val values = if (reply.status == 0) G1Protocol.parseProps(reply.body, ids.size) else null
+ if (values != null) g1HandlePropsReply(arm, ids, values)
+ return
+ }
+ if (reply.op == G1Protocol.OP_MIC) {
+ if (reply.status != 0) g1MicRefused(reply.status)
+ return
+ }
+ if (reply.op == G1Protocol.OP_PROP_SET && reply.status != 0) {
+ logLine("G1 PROP_SET refused: " + reply.status + " (firmware before 0.5.63?)")
+ }
+ monitor.withLock {
+ lastIncomingAtMs = now()
+ g1.replies[arm * 256 + reply.tag] = reply
+ monitor.signalAll()
+ }
+ }
+ }
+}
+
+private fun GlassesSessionCore.g1HandleMicData(address: String, data: ByteArray) {
+ val (first, count, start) = G1Protocol.micFrames(data) ?: return
+ val packets = ArrayList(1)
+ monitor.withLock { g1.mic.ingest(first, count, data, start) { packets.add(it) } }
+ for (packet in packets) handleRenderNotification(address, packet)
+}
+
+private fun GlassesSessionCore.g1MicRefused(status: Int) {
+ logWarn("G1 mic refused: status $status (12: no capture, or the link isn't encrypted)")
+ monitor.withLock {
+ audioCaptureActive = false
+ audioPacketListener = null
+ g1.micOn = false
+ }
+}
+
+private fun GlassesSessionCore.g1HandleNotice(arm: Int, notice: G1Protocol.Notice) {
+ when (notice.kind) {
+ G1Protocol.NOTICE_MIC_STOPPED -> {
+ val reason = if (notice.body.isNotEmpty()) notice.body[0].toInt() and 255 else 0
+ logLine("G1 mic stopped by the arm: reason $reason")
+ if (reason == G1Protocol.MIC_STOPPED_LEASE) {
+ // A renewal came late: ask again, the capture still wants it.
+ monitor.withLock { g1.lastMicRenewAtMs = 0 }
+ interruptibleSleep.interrupt()
+ } else {
+ g1MicRefused(reason)
+ }
+ }
+ G1Protocol.NOTICE_GUARD -> {
+ if (notice.body.isEmpty()) return
+ // This arm's panel guard capped its level (a mostly white screen): keep the eyes matched.
+ val cap = notice.body[0].toInt() and 255
+ logLine("G1 panel guard on the " + (if (arm == 0) "left" else "right") + " arm: cap $cap")
+ monitor.withLock { g1.pendingPropSets.add((1 - arm) to G1Protocol.propSet(G1Protocol.PROP_BRIGHTNESS_MAX, cap)) }
+ interruptibleSleep.interrupt()
+ }
+ }
+}
+
+private fun GlassesSessionCore.g1HandlePropsReply(arm: Int, ids: IntArray, values: IntArray) {
+ when {
+ ids === G1_PROPS -> g1HandleProps(arm, values)
+ ids === G1_LIGHT -> if (values[0] != G1Protocol.UNKNOWN) g1HandleLight(values[0])
+ ids === G1_IMU -> if (values.none { it == G1Protocol.UNKNOWN }) {
+ emitImuData(values[0] / 1000.0, values[1] / 1000.0, values[2] / 1000.0, BleProtocol.EVENT_SOURCE_GLASSES_R)
+ }
+ }
+}
+
+/** A reading in the shape of the G2's report, so the brightness policy and the Developer app need nothing new. */
+private fun GlassesSessionCore.g1HandleLight(centilux: Int) {
+ val report = monitor.withLock {
+ val logged = g1.loggedLight
+ if (logged < 0 || kotlin.math.abs(centilux - logged) > maxOf(100, logged / 2)) {
+ g1.loggedLight = centilux
+ logLine("G1 light: " + centilux / 100 + " lux")
+ }
+ val report = G1Protocol.alsReport(centilux, brightnessPolicy.target, now())
+ lastIncomingAtMs = now()
+ brightnessPolicy.sample(report, lastIncomingAtMs)
+ report
+ }
+ emitAmbientLight(report)
+ interruptibleSleep.interrupt()
+}
+
+private fun GlassesSessionCore.g1HandleInput(arm: Int, input: G1Protocol.Input) {
+ when (input.trigger) {
+ G1Protocol.TRIGGER_TOUCH -> g1HandleGesture(arm, input.value)
+ G1Protocol.TRIGGER_BATTERY -> g1HandleProps(arm, intArrayOf(input.value, G1Protocol.UNKNOWN, G1Protocol.UNKNOWN, G1Protocol.UNKNOWN), true)
+ G1Protocol.TRIGGER_WEAR -> g1HandleProps(arm, intArrayOf(G1Protocol.UNKNOWN, G1Protocol.UNKNOWN, G1Protocol.UNKNOWN, input.value))
+ G1Protocol.TRIGGER_CASE -> g1HandleProps(arm, intArrayOf(G1Protocol.UNKNOWN, G1Protocol.UNKNOWN, input.value and 1, G1Protocol.UNKNOWN))
+ }
+}
+
+private fun GlassesSessionCore.g1HandleGesture(arm: Int, gesture: Int) {
+ val leftArm = arm == 0
+ val dark = monitor.withLock { shutdownRequested || brightnessSentVisible == false }
+ val eventType = G1Protocol.gestureEventType(gesture, leftArm, dark)
+ monitor.withLock {
+ lastIncomingAtMs = now()
+ if (eventType != null) lastConnectionOrInputAtMs = lastIncomingAtMs
+ }
+ logLine("G1 gesture " + gesture + " on the " + (if (leftArm) "left" else "right") + " arm" + (if (eventType == null) " (ignored)" else ""))
+ if (eventType == null) return
+ val source = if (leftArm) BleProtocol.EVENT_SOURCE_GLASSES_L else BleProtocol.EVENT_SOURCE_GLASSES_R
+ // As the G2's firmware reports its own double tap on a dark display: it can only wake, whatever the delay.
+ val event = if (dark && gesture == G1Protocol.GESTURE_DOUBLE_TAP) G2Event("display-wake", "", eventType, 0, 0)
+ else G2Event("sys-event", "", eventType, source, 0)
+ val frameId = frameTimings.startFrame("input:" + event.kind + " type=$eventType src=$source")
+ frameTimings.log(frameId, "input event decoded from G1 notification")
+ emitRingEvent(event, frameId)
+ interruptibleSleep.interrupt()
+}
+
+/**
+ * New values in the order of [G1_PROPS], [G1Protocol.UNKNOWN] for those it doesn't say. The pair's battery is the lower
+ * arm's, the pair is charging if either arm is, worn if either arm says so, and in the case when both are.
+ * [batteryChanged]: a BATTERY event, which may also mean CHARGE changed, so that is read again.
+ */
+private fun GlassesSessionCore.g1HandleProps(arm: Int, values: IntArray, batteryChanged: Boolean = false) {
+ var batteryEmit = false
+ var wearEmit = -1
+ var putOn = false
+ val state = g1.arms[arm]
+ monitor.withLock {
+ lastIncomingAtMs = now()
+ if (values[0] != G1Protocol.UNKNOWN) state.battery = values[0]
+ if (values[1] != G1Protocol.UNKNOWN) state.charge = values[1]
+ if (values[2] != G1Protocol.UNKNOWN) state.inCase = values[2]
+ if (values[3] != G1Protocol.UNKNOWN) {
+ if (values[3] != state.worn) logLine("G1 " + (if (arm == 0) "left" else "right") + " arm: worn " + values[3])
+ state.worn = values[3]
+ }
+
+ val batteries = g1.arms.map { it.battery }.filter { it >= 0 }
+ val battery = if (batteries.isEmpty()) -1 else batteries.min()
+ val charging = if (g1.arms.any { it.charge == G1Protocol.CHARGE_CHARGING }) 1 else if (g1.arms.all { it.charge < 0 }) -1 else 0
+ if (battery != headsetBattery || charging != headsetCharging) {
+ headsetBattery = battery
+ headsetCharging = charging
+ batteryEmit = true
+ }
+ val worn = if (g1.arms.any { it.worn == 1 }) 1 else if (g1.arms.all { it.worn < 0 }) -1 else 0
+ if (worn >= 0 && worn != wearState) {
+ putOn = chargingMode && wearState == 0 && worn == 1
+ wearState = worn
+ wearEmit = worn
+ }
+ if (sessionReady) {
+ val inCase = g1.arms.all { it.inCase == 1 }
+ if (putOn) {
+ endChargingModeLocked("glasses put on")
+ } else if (inCase != chargingMode && g1.arms.all { it.inCase >= 0 }) {
+ g1SetInCaseLocked(inCase, battery)
+ }
+ }
+ }
+ if (batteryEmit) emitBatteryState(headsetBattery, headsetCharging)
+ if (wearEmit >= 0) emitWearState(wearEmit == 1)
+ if (batteryChanged) g1RequestPropsLater()
+ interruptibleSleep.interrupt()
+}
+
+private fun GlassesSessionCore.g1RequestPropsLater() {
+ monitor.withLock { g1.lastPropsAtMs = 0 }
+}
+
+/**
+ * In the case nobody can see the panels, and lit pixels disturb the case's charging link: they go dark and frames stop.
+ * Leaving the case reconnects, as on a G2, which also picks up a firmware the arms got meanwhile.
+ */
+private fun GlassesSessionCore.g1SetInCaseLocked(inCase: Boolean, battery: Int) {
+ if (inCase) {
+ chargingMode = true
+ clearAllMessagesLocked("glasses in the case")
+ fixedLayoutCreated = false
+ displayedFingerprint = ""
+ g1EnqueueBrightnessLocked(g1HidePayload(), "in the case: hide", true) { }
+ finishDesiredFrameLocked("discarded: glasses in the case")
+ logLine("glasses are in the case; pausing display communication")
+ setStateDisplay("charging", GlassesSessionCore.chargingStatusText(battery))
+ } else {
+ endChargingModeLocked("glasses out of the case")
+ }
+}
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionIo.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionIo.kt
new file mode 100644
index 00000000..ba8a00ee
--- /dev/null
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionIo.kt
@@ -0,0 +1,774 @@
+package com.faceclaw.app
+
+import com.faceclaw.app.GlassesSessionCore.Companion.hex
+import com.faceclaw.app.GlassesSessionCore.Companion.safeMessage
+import kotlin.random.Random
+
+/** Which glasses a session drives. Set before [GlassesSessionCore.start]; see [GlassesSessionCore.useRayNeoIo]. */
+enum class GlassesType { G2, RAYNEO_IO, G1 }
+
+/**
+ * RayNeo iO session state ([GlassesSessionCore.io]); guarded by the core's monitor.
+ *
+ * The iO is one SoC on ONE BLE link that drives both eyes, so the core runs it with the same
+ * address in both arm slots: CFW messages keep going to the "left" arm, per-arm bookkeeping
+ * resolves to index 0, and the firmware ACKs each lens of a record separately, exactly what
+ * the existing window expects. What differs lives here: the AA55 envelope, the TLV handshake
+ * and guest authentication, IDENT-based capability detection, and the page lease
+ * (PAGE_OPEN + KEEPALIVE) that stands in for the G2's EvenHub page and framebuffer lease.
+ * Wire codecs: [RayNeoIoProtocol]; firmware: faceclaw-rayneo-cfw (docs/FACECLAW.md).
+ */
+internal class IoSessionState {
+ var phoneId = ByteArray(6)
+ var phoneName = "Faceclaw"
+ var manufacturer = "Android"
+ var model = "Android"
+
+ val reassembler = RayNeoIoProtocol.FrameReassembler()
+ var messageNumber = Random.nextInt(0, 0x10000)
+ var launcherSequence = 0
+
+ var versionReply: RayNeoIoProtocol.VersionReply? = null
+ var authReply: ByteArray? = null
+ var ident: RayNeoIoProtocol.Ident? = null
+ var osVersion = ""
+ var maxChunk = RayNeoIoProtocol.DEFAULT_MAX_CHUNK
+
+ /** Last PAGE state the glasses reported: 1 open, 0 closed, -1 none yet this link. */
+ var pageState = -1
+ var pageReason = 0
+ var pageReplies = 0
+ /** Whether the phone wants the page open (false while suspended or after the wearer closed it). */
+ var pageWanted = true
+ var pageRequestSentAtMs = 0L
+ var lastKeepaliveAtMs = 0L
+ var lastStatusAtMs = 0L
+ var refusals = 0
+
+ /** Whether Faceclaw's latest frame is meant to be seen (false for its blanked frames). */
+ var displayVisible = false
+ var brightnessSentLevel = -1
+ var lastBrightnessAtMs = 0L
+ /** The light sensor poll interval this page was last asked for ([ioFirmwareOwnsBrightness]), -1 none. */
+ var alsIntervalSent = -1
+ /** Last `screen_status` push: 1 on, 0 off, -1 unknown. */
+ var screenStatus = -1
+
+ /** Whether Faceclaw answers "Hey RayNeo" (null until the dashboard says); what this link was last told. */
+ var voiceWakeWanted: Boolean? = null
+ var voiceWakeSent = -1
+ /** The stock assistant opened a session (wake word): end it, it must not take the display. */
+ var voiceAbortPending = false
+ /** Ask for the launcher's general settings (logged: the wake-word preferences among them). */
+ var settingsRequestPending = true
+ /** When a wake was last reported: one phrase can wake twice (fast and second stage). */
+ var lastVoiceWakeAtMs = 0L
+
+ /** A capture wants the remote mic stream; whether this link was asked to open it, and when. */
+ var micWanted = false
+ var micStreamOpen = false
+ var micStartSentAtMs = 0L
+ var micPackets = 0L
+ var lastMicPacketAtMs = 0L
+
+ fun resetLink() {
+ reassembler.reset()
+ versionReply = null
+ authReply = null
+ ident = null
+ pageState = -1
+ pageReason = 0
+ pageRequestSentAtMs = 0
+ lastKeepaliveAtMs = 0
+ lastStatusAtMs = 0
+ brightnessSentLevel = -1
+ lastBrightnessAtMs = 0
+ alsIntervalSent = -1
+ screenStatus = -1
+ voiceWakeSent = -1
+ voiceAbortPending = false
+ settingsRequestPending = true
+ micStreamOpen = false
+ micStartSentAtMs = 0
+ }
+}
+
+internal object IoTimings {
+ const val VERSION_REPLY_MS = 4_000L
+ const val AUTH_REPLY_MS = 4_000L
+ const val OS_VERSION_MS = 1_500L
+ const val IDENT_MS = 3_000L
+ const val PAGE_REPLY_MS = 4_000L
+ /** Well inside the firmware's 120 s page lease. */
+ const val KEEPALIVE_MS = 30_000L
+ const val STATUS_MS = 60_000L
+ const val PAGE_RETRY_MS = 3_000L
+ /** Retry cadence while the glasses refuse this phone id (waiting for pairing mode). */
+ const val PAIRING_RETRY_MS = 2_000L
+ const val PAGE_REASON_USER = 4
+ /** While Faceclaw shows content, re-assert the screen this often (the stock auto-off is short). */
+ const val SCREEN_REFRESH_MS = 5_000L
+ /** A wanted mic stream that hasn't delivered a packet this long is asked for again. */
+ const val MIC_RETRY_MS = 3_000L
+ /** Wakes this close to a reported one are the same phrase (fast stage, then second stage). */
+ const val VOICE_WAKE_DEDUP_MS = 3_000L
+}
+
+/** The glasses hung up at the version request: bound to another phone id, or not in pairing mode. */
+internal class IoPairingRefusedException : IllegalStateException("glasses hung up at the version request")
+
+/** CFW message types the iO firmware implements (fc_glue.c + raster cleanup). */
+internal fun ioSupportsCfwType(type: Int): Boolean =
+ type == CFW_MSG_CLEANUP || type == CFW_MSG_UPLOAD_RESOURCE || type == CFW_MSG_EVICT_RESOURCE ||
+ type == CFW_MSG_DRAW_CALLS || type == CFW_MSG_SET_ROOT_DISPLAY_LIST ||
+ type == CFW_MSG_PRESENT || type == CFW_MSG_CREATE_SURFACE
+
+internal val GlassesSessionCore.isIo: Boolean get() = glassesType == GlassesType.RAYNEO_IO
+
+/**
+ * The firmware runs message 30 and the light sensor (faceclaw-rayneo-cfw bright.c), with the G2's
+ * wire formats, so the shared brightness code drives it. Older firmware gets the launcher's
+ * brightness command, which is all it has (see [ioMaintain]).
+ */
+internal val GlassesSessionCore.ioFirmwareOwnsBrightness: Boolean get() = io.ident?.brightnessControl == true
+
+/** Messages the iO cannot take (stock EvenHub/settings traffic, the G2's other hardware CFW modes). */
+internal fun GlassesSessionCore.ioSupportsMessage(message: OutboundMessage): Boolean {
+ if (message.sid != CfwTransport.SID || message.message.isEmpty()) return false
+ val type = message.message[0].toInt() and 255
+ return ioSupportsCfwType(type) ||
+ (ioFirmwareOwnsBrightness && (type == CFW_MSG_BRIGHTNESS || type == CFW_MSG_AMBIENT_LIGHT))
+}
+
+/** A page opened (or reopened): the firmware gave brightness back when the last one closed. */
+private fun GlassesSessionCore.ioResetBrightnessLocked() {
+ brightnessSentVisible = null
+ brightnessSentLevel = -1
+ brightnessAlsStartedAt = -2000
+ brightnessPolicy.resetSamples()
+ io.alsIntervalSent = -1
+}
+
+// ---------------------------------------------------------------------------------------------
+// Writes
+
+private fun GlassesSessionCore.ioNextMessageNumberLocked(): Int {
+ val n = io.messageNumber and 0xffff
+ io.messageNumber = (io.messageNumber + 1) and 0xffff
+ return n
+}
+
+/** One AA55 frame on the iO write characteristic; worker thread, outside the monitor. */
+internal fun GlassesSessionCore.ioWriteFrame(business: Int, payload: ByteArray): Boolean {
+ val frame = monitor.withLock { RayNeoIoProtocol.encodeFrame(ioNextMessageNumberLocked(), business, payload) }
+ return link.writeFrames(
+ rightAddress, RayNeoIoBle.WRITE_CHAR_UUID,
+ RayNeoIoProtocol.writes(frame, link.negotiatedMtu(rightAddress)),
+ GattWriteMode.WITHOUT_RESPONSE, ConnectionOptions.WRITE_TIMEOUT_MS,
+ )
+}
+
+internal fun GlassesSessionCore.ioWriteControl(ctrl: Int): Boolean =
+ ioWriteFrame(RayNeoIoProtocol.BUSINESS_CFW, RayNeoIoProtocol.controlPacket(ctrl))
+
+private fun GlassesSessionCore.ioWriteLauncher(type: Int, json: String): Boolean {
+ val sequence = monitor.withLock {
+ io.launcherSequence = if (io.launcherSequence >= 0xffff) 1 else io.launcherSequence + 1
+ io.launcherSequence
+ }
+ val envelope = RayNeoIoProtocol.Envelope(type, json, sequence = sequence, mode = RayNeoIoProtocol.MODE_REQUEST)
+ return ioWriteFrame(RayNeoIoProtocol.BUSINESS_LAUNCHER, RayNeoIoProtocol.encodeEnvelope(envelope))
+}
+
+internal fun GlassesSessionCore.ioRequestStatus(): Boolean =
+ ioWriteLauncher(RayNeoIoProtocol.LAUNCHER_GENERAL_STATUS, RayNeoIoProtocol.GENERAL_STATUS_REQUEST)
+
+/** From the image path (enqueueBrightnessLocked): a visible frame wakes the screen at once. */
+internal fun GlassesSessionCore.ioNoteFrameVisibleLocked(frameVisible: Boolean?) {
+ if (frameVisible == null) return
+ if (frameVisible && !io.displayVisible) io.lastBrightnessAtMs = 0
+ io.displayVisible = frameVisible
+}
+
+/**
+ * The writes for one queued CFW message: the shared record (persistent deflate context, as
+ * on the G2) in `[opt][stream][chunk]` packets, each its own AA55 frame. The stream byte is
+ * the message's magic, which the firmware echoes in its per-lens ACKs.
+ */
+internal fun GlassesSessionCore.ioCfwWrites(message: OutboundMessage, mtu: Int): List {
+ val transport = cfwTransports[0]
+ if (message.cfwRetries > 0) transport.reset()
+ val record = transport.encodeRecord(message.message, CfwTransport.BOTH)
+ return monitor.withLock {
+ RayNeoIoProtocol.cfwPackets(record, message.magic, io.maxChunk).flatMap { packet ->
+ RayNeoIoProtocol.writes(RayNeoIoProtocol.encodeFrame(ioNextMessageNumberLocked(), RayNeoIoProtocol.BUSINESS_CFW, packet), mtu)
+ }
+ }
+}
+
+/** A message the iO can't run (see [ioSupportsMessage]): never sent, never waited on. */
+internal fun GlassesSessionCore.ioDropUnsupported(message: OutboundMessage) {
+ monitor.withLock {
+ inFlightMessages.remove(message)
+ if (message.magic != 0) magicPool.release(message.sid, message.magic, message.label, "unsupported on these glasses")
+ }
+ logDebug("dropped a message these glasses don't take: " + message.label + " sid=" + message.sid)
+}
+
+// ---------------------------------------------------------------------------------------------
+// Connect (worker thread)
+
+private fun GlassesSessionCore.ioAwait(timeoutMs: Long, what: String, ready: () -> Boolean) {
+ val deadline = now() + timeoutMs
+ monitor.withLock {
+ while (true) {
+ if (ready()) return
+ if (!running || userDisconnectRequested) throw IllegalStateException("stopped while waiting for $what")
+ if (!rightConnected) throw IoLinkLostException(what)
+ val remaining = deadline - now()
+ if (remaining <= 0) throw IllegalStateException("$what timed out")
+ monitor.awaitMs(minOf(remaining, 100L))
+ }
+ }
+}
+
+private class IoLinkLostException(what: String) : IllegalStateException("link lost while waiting for $what")
+
+internal fun GlassesSessionCore.ioConnectLoopOnce() {
+ monitor.withLock {
+ wearState = -1
+ io.resetLink()
+ }
+ setStateDisplay("connecting", "Connecting to the glasses...")
+ ConnectionCounters.increment("io.connect-attempt")
+ val address = rightAddress
+ try {
+ if (!link.connect(address, ConnectionOptions.ARM_CONNECT_WINDOW_MS)) {
+ handleTransportFailure("glasses not found", "Can't find the glasses. They may be off, in their case, or out of range.")
+ return
+ }
+ link.requestHighPriority(address)
+ link.requestMtu(address, RayNeoIoBle.REQUESTED_MTU, ConnectionOptions.CONNECT_TIMEOUT_MS)
+ if (!link.discoverServices(address, ConnectionOptions.SERVICES_TIMEOUT_MS)) throw IllegalStateException("discoverServices failed: $address")
+ if (!link.enableNotifications(address, RayNeoIoBle.NOTIFY_CHAR_UUID, true, ConnectionOptions.DESCRIPTOR_TIMEOUT_MS)) {
+ throw IllegalStateException("enableNotifications failed: $address")
+ }
+ link.requestLe2mPhy(address)
+ monitor.withLock {
+ rightConnected = true
+ leftConnected = true
+ }
+
+ // Version exchange. Glasses bound to another phone id (or not in pairing mode)
+ // hang up ~100 ms after this request instead of answering.
+ val phone = monitor.withLock { io.phoneId.copyOf() }
+ logDebug("RayNeo iO: phone id " + hex(phone))
+ if (!ioWriteFrame(RayNeoIoProtocol.BUSINESS_HANDSHAKE,
+ RayNeoIoProtocol.versionRequest(phone, io.phoneName, io.manufacturer, io.model))) {
+ throw IllegalStateException("version request write failed")
+ }
+ try {
+ ioAwait(IoTimings.VERSION_REPLY_MS, "version reply") { io.versionReply != null }
+ } catch (lost: IoLinkLostException) {
+ throw IoPairingRefusedException()
+ }
+ val reply = monitor.withLock { io.versionReply!! }
+ if (reply.accountBound) throw IoPairingRefusedException()
+ logLine("RayNeo iO: glasses " + hex(reply.glassesId) + " serial " + reply.serial + " protocol " + reply.protocolVersion)
+
+ val random = Random.nextBytes(4)
+ if (!ioWriteFrame(RayNeoIoProtocol.BUSINESS_HANDSHAKE, RayNeoIoProtocol.guestAuthRequest(random, phone, reply.glassesId))) {
+ throw IllegalStateException("guest auth write failed")
+ }
+ ioAwait(IoTimings.AUTH_REPLY_MS, "guest auth reply") { io.authReply != null }
+ val authReply = monitor.withLock { io.authReply!! }
+ if (!RayNeoIoProtocol.verifyGuestAuthReply(authReply, phone, reply.glassesId)) {
+ throw IllegalStateException("guest auth proof mismatch")
+ }
+ monitor.withLock { io.refusals = 0 }
+
+ // Battery and the OS version: answers arrive asynchronously; the version only labels
+ // the firmware info, so a missing one is not fatal.
+ ioRequestStatus()
+ ioWriteFrame(RayNeoIoProtocol.BUSINESS_OTA,
+ RayNeoIoProtocol.encodeEnvelope(RayNeoIoProtocol.Envelope(RayNeoIoProtocol.OTA_VERSION, "{}")))
+ try {
+ ioAwait(IoTimings.OS_VERSION_MS, "OS version") { io.osVersion.isNotEmpty() }
+ } catch (e: IoLinkLostException) {
+ throw e
+ } catch (_: IllegalStateException) {
+ }
+
+ // Capability: the custom firmware answers QUERY with IDENT; stock firmware stays silent.
+ ioWriteControl(RayNeoIoProtocol.CTRL_QUERY)
+ val ident = try {
+ ioAwait(IoTimings.IDENT_MS, "IDENT") { io.ident != null }
+ monitor.withLock { io.ident }
+ } catch (e: IoLinkLostException) {
+ throw e
+ } catch (_: IllegalStateException) {
+ null
+ }
+ val os = monitor.withLock { io.osVersion.ifEmpty { "RayNeo iO" } }
+ val info = BleProtocol.FirmwareInfo(os, os,
+ if (ident != null && ident.faceclaw) "Faceclaw/" + ident.faceclawRevision else "")
+ logLine("RayNeo iO: " + os + ", " + (if (ident == null) "no IDENT (stock firmware)"
+ else ident.name + " " + ident.width + "x" + ident.height + " chunk " + ident.maxChunk
+ + " flags 0x" + ident.flags.toString(16) + " faceclaw " + ident.faceclawRevision))
+ emitFirmwareInfo(info)
+ if (!info.isCompatible(requiredFirmwareRevision)) {
+ monitor.withLock {
+ // The worker loop halts on this and explains it (handleIncompatibleFirmware).
+ incompatibleFirmware = info
+ }
+ return
+ }
+ monitor.withLock {
+ io.maxChunk = ident!!.maxChunk.coerceIn(16, 4000)
+ io.pageWanted = true
+ io.pageRequestSentAtMs = now()
+ }
+
+ ioWriteControl(RayNeoIoProtocol.CTRL_PAGE_OPEN)
+ try {
+ ioAwait(IoTimings.PAGE_REPLY_MS, "page open") { io.pageReplies > 0 }
+ } catch (e: IoLinkLostException) {
+ throw e
+ } catch (_: IllegalStateException) {
+ // The launcher may be busy; ioMaintain keeps asking.
+ }
+
+ monitor.withLock {
+ sessionReady = true
+ shutdownRequested = false
+ customFirmwareDetected = true
+ clearAllMessagesLocked("session ready")
+ fixedLayoutCreated = io.pageState == 1
+ displayedFingerprint = ""
+ lastAckAtMs = now()
+ lastIncomingAtMs = lastAckAtMs
+ lastConnectionOrInputAtMs = lastAckAtMs
+ lastSessionReadyAtMs = lastAckAtMs
+ imageRetryAfterMs = 0
+ consecutiveAckTimeouts = 0
+ cfwCleanupDelivered = false
+ lastCfwCleanupAckMagic = 0
+ for (transport in cfwTransports) transport.reset()
+ io.lastKeepaliveAtMs = lastAckAtMs
+ io.lastStatusAtMs = lastAckAtMs
+ ioResetBrightnessLocked()
+ }
+ setStateDisplay("connected", "Connected.")
+ ConnectionCounters.increment("io.session-ready")
+ logLine("RayNeo iO session ready (page " + (if (fixedLayoutCreated) "open" else "pending") + ")")
+ } catch (refused: IoPairingRefusedException) {
+ val count = monitor.withLock {
+ io.refusals++
+ reconnectAfterMs = now() + IoTimings.PAIRING_RETRY_MS
+ io.refusals
+ }
+ ConnectionCounters.increment("io.pairing-refused")
+ logLine("RayNeo iO refused this phone (" + count + "); waiting for pairing mode")
+ link.disconnect(address)
+ monitor.withLock {
+ rightConnected = false
+ leftConnected = false
+ }
+ setStateDisplay("retrying",
+ "The glasses aren't accepting this phone yet. Put them in pairing mode: on the charger, "
+ + "hold the button about 5 seconds until the light blinks blue.")
+ } catch (t: Throwable) {
+ logLine("RayNeo iO connect failed: " + safeMessage(t))
+ handleTransportFailure("connect failed")
+ }
+}
+
+// ---------------------------------------------------------------------------------------------
+// Session upkeep (worker thread, from driveSession, outside the monitor)
+
+/** Page open/close requests, keepalives, status polls and the screen (launcher brightness). */
+internal fun GlassesSessionCore.ioMaintain() {
+ var ctrl = -1
+ var status = false
+ var brightness = -1
+ var wakeword = -1
+ var micRc = -1
+ var abortVoice = false
+ var settings = false
+ monitor.withLock {
+ if (!sessionReady) return
+ val now = now()
+ val wake = io.voiceWakeWanted
+ if (wake != null && io.voiceWakeSent != (if (wake) 1 else 0)) {
+ wakeword = if (wake) 1 else 0
+ io.voiceWakeSent = wakeword
+ // Read back what the switch did.
+ io.settingsRequestPending = true
+ }
+ if (io.settingsRequestPending) {
+ settings = true
+ io.settingsRequestPending = false
+ }
+ if (io.voiceAbortPending) {
+ abortVoice = true
+ io.voiceAbortPending = false
+ }
+ if (io.micWanted && (!io.micStreamOpen
+ || (io.lastMicPacketAtMs < io.micStartSentAtMs && now - io.micStartSentAtMs >= IoTimings.MIC_RETRY_MS))) {
+ // Not yet asked on this link, a voice session took the recorder, or the ask was lost.
+ micRc = RayNeoIoProtocol.VOICE_RC_START
+ io.micStreamOpen = true
+ io.micStartSentAtMs = now
+ } else if (!io.micWanted && io.micStreamOpen) {
+ micRc = RayNeoIoProtocol.VOICE_RC_STOP
+ io.micStreamOpen = false
+ }
+ if (io.pageWanted && !fixedLayoutCreated && now - io.pageRequestSentAtMs >= IoTimings.PAGE_RETRY_MS) {
+ ctrl = RayNeoIoProtocol.CTRL_PAGE_OPEN
+ io.pageRequestSentAtMs = now
+ } else if (!io.pageWanted && io.pageState == 1 && now - io.pageRequestSentAtMs >= IoTimings.PAGE_RETRY_MS) {
+ ctrl = RayNeoIoProtocol.CTRL_PAGE_CLOSE
+ io.pageRequestSentAtMs = now
+ } else if (io.pageWanted && fixedLayoutCreated && now - io.lastKeepaliveAtMs >= IoTimings.KEEPALIVE_MS) {
+ ctrl = RayNeoIoProtocol.CTRL_KEEPALIVE
+ io.lastKeepaliveAtMs = now
+ }
+ if (now - io.lastStatusAtMs >= IoTimings.STATUS_MS) {
+ status = true
+ io.lastStatusAtMs = now
+ }
+ // Faceclaw decides when the display is dark (blanked frames); while it shows
+ // content, keep the iO's screen on and at Faceclaw's brightness.
+ val showing = fixedLayoutCreated && io.pageWanted && io.displayVisible && !shutdownRequested
+ if (ioFirmwareOwnsBrightness) {
+ // Repeating message 30 starts no fade; visible=1 is what holds the screen on.
+ if (showing && now - io.lastBrightnessAtMs >= IoTimings.SCREEN_REFRESH_MS) {
+ io.lastBrightnessAtMs = now
+ brightnessSentLevel = -1
+ enqueueBrightnessLocked()
+ }
+ } else {
+ val level = RayNeoIoProtocol.brightnessLevel(brightnessPolicy.target)
+ if (showing && (level != io.brightnessSentLevel || now - io.lastBrightnessAtMs >= IoTimings.SCREEN_REFRESH_MS)) {
+ brightness = level
+ io.brightnessSentLevel = level
+ io.lastBrightnessAtMs = now
+ }
+ }
+ }
+ if (ctrl >= 0) {
+ logDebug("RayNeo iO: control $ctrl")
+ ioWriteControl(ctrl)
+ }
+ if (status) ioRequestStatus()
+ if (brightness > 0) ioWriteLauncher(RayNeoIoProtocol.LAUNCHER_BRIGHTNESS, RayNeoIoProtocol.launcherBrightness(brightness))
+ if (wakeword >= 0) {
+ logLine("RayNeo iO: wake word " + (if (wakeword == 1) "on" else "off"))
+ ioWriteLauncher(RayNeoIoProtocol.LAUNCHER_AI_VOICE_WAKEUP, RayNeoIoProtocol.launcherSetAiVoiceWakeup(wakeword == 1))
+ }
+ if (settings) ioWriteLauncher(RayNeoIoProtocol.LAUNCHER_GENERAL_SETTINGS, RayNeoIoProtocol.GENERAL_SETTINGS_REQUEST)
+ if (abortVoice) {
+ // As Glassly does: decline the stock session, then abort it, so its page goes.
+ ioWriteFrame(RayNeoIoProtocol.BUSINESS_VOICE, RayNeoIoProtocol.voiceRc(RayNeoIoProtocol.VOICE_RC, RayNeoIoProtocol.VOICE_RC_STOP))
+ ioWriteFrame(RayNeoIoProtocol.BUSINESS_VOICE, RayNeoIoProtocol.voiceRc(RayNeoIoProtocol.VOICE_ABORT, RayNeoIoProtocol.VOICE_RC_START))
+ }
+ if (micRc > 0) {
+ logLine("RayNeo iO mic: " + (if (micRc == RayNeoIoProtocol.VOICE_RC_START) "open" else "close") + " the remote audio stream")
+ ioWriteFrame(RayNeoIoProtocol.BUSINESS_VOICE, RayNeoIoProtocol.voiceRc(RayNeoIoProtocol.VOICE_STREAM_CONTROL, micRc))
+ }
+}
+
+/**
+ * The glasses' mic for a voice capture: the remote audio stream (16 kHz mono Opus packets to
+ * [listener]), which needs IDENT_FLAG_MIC firmware. ioMaintain sends the open (and repeats it
+ * while no packet comes); a voice session or a call can take the recorder meanwhile.
+ */
+internal fun GlassesSessionCore.ioStartAudioCapture(listener: FaceclawAudioPacketListener): Boolean {
+ monitor.withLock {
+ if (!running || !sessionReady || shutdownRequested) {
+ logLine("skip RayNeo iO mic: session not ready")
+ return false
+ }
+ if (io.ident?.micStream != true) {
+ logLine("skip RayNeo iO mic: the firmware has no remote audio stream (IDENT flag 0x20)")
+ return false
+ }
+ audioPacketListener = listener
+ audioCaptureActive = true
+ io.micWanted = true
+ io.micStreamOpen = false
+ io.micPackets = 0
+ }
+ interruptibleSleep.interrupt()
+ return true
+}
+
+internal fun GlassesSessionCore.ioStopAudioCapture() {
+ monitor.withLock {
+ audioPacketListener = null
+ audioCaptureActive = false
+ io.micWanted = false
+ }
+ interruptibleSleep.interrupt()
+}
+
+/** Whether "Hey RayNeo" should reach Faceclaw (the launcher's wake-word switch). */
+internal fun GlassesSessionCore.ioSetVoiceWakeEnabled(enabled: Boolean) {
+ monitor.withLock { io.voiceWakeWanted = enabled }
+ interruptibleSleep.interrupt()
+}
+
+/** Stop drawing and close the page, keeping the BLE link (the EvenHub suspend analogue). */
+internal fun GlassesSessionCore.ioSuspend(): Boolean {
+ monitor.withLock {
+ if (!running || !sessionReady) return false
+ shutdownRequested = true
+ io.pageWanted = false
+ io.pageRequestSentAtMs = 0
+ clearAllMessagesLocked("RayNeo iO suspend")
+ displayedFingerprint = ""
+ }
+ interruptibleSleep.interrupt()
+ return true
+}
+
+/** Reopen the page; the drive loop resends the desired frame once it is open. */
+internal fun GlassesSessionCore.ioResume(): Boolean {
+ monitor.withLock {
+ if (!running || !sessionReady) return false
+ shutdownRequested = false
+ io.pageWanted = true
+ io.pageRequestSentAtMs = 0
+ fixedLayoutCreated = false
+ clearAllMessagesLocked("RayNeo iO resume")
+ displayedFingerprint = ""
+ imageRetryAfterMs = 0
+ }
+ interruptibleSleep.interrupt()
+ return true
+}
+
+// ---------------------------------------------------------------------------------------------
+// Inbound (BLE callback thread)
+
+internal fun GlassesSessionCore.ioOnNotification(address: String, characteristicUuid: String, data: ByteArray) {
+ if (RayNeoIoBle.NOTIFY_CHAR_UUID != characteristicUuid || !address.equals(rightAddress, ignoreCase = true)) return
+ val frames = monitor.withLock { io.reassembler.ingest(data) }
+ for (frame in frames) {
+ when (frame.business) {
+ RayNeoIoProtocol.BUSINESS_HANDSHAKE -> monitor.withLock {
+ val version = RayNeoIoProtocol.parseVersionReply(frame.payload)
+ if (version != null) io.versionReply = version
+ else if (RayNeoIoProtocol.isGuestAuthReply(frame.payload)) io.authReply = frame.payload
+ monitor.signalAll()
+ }
+ RayNeoIoProtocol.BUSINESS_LAUNCHER -> ioHandleLauncher(frame.payload)
+ RayNeoIoProtocol.BUSINESS_VOICE -> ioHandleVoice(frame.payload)
+ RayNeoIoProtocol.BUSINESS_OTA -> {
+ val envelope = RayNeoIoProtocol.decodeEnvelope(frame.payload) ?: continue
+ if (envelope.type != RayNeoIoProtocol.OTA_VERSION) continue
+ val os = try { Json.parse(envelope.json).asObject()?.get("OsVersion").asString() } catch (_: Exception) { null }
+ if (os != null) monitor.withLock {
+ io.osVersion = os
+ monitor.signalAll()
+ }
+ }
+ RayNeoIoProtocol.BUSINESS_CFW -> ioHandleCfw(address, frame)
+ }
+ }
+}
+
+private fun GlassesSessionCore.ioHandleLauncher(payload: ByteArray) {
+ val envelope = RayNeoIoProtocol.decodeEnvelope(payload) ?: return
+ val screen = RayNeoIoProtocol.screenStatusFromLauncherJson(envelope.json)
+ if (screen >= 0) {
+ val changed = monitor.withLock {
+ val was = io.screenStatus
+ io.screenStatus = screen
+ // Woken by the wearer (or the timeout ran out): re-assert promptly if Faceclaw is showing.
+ if (screen == 0) io.lastBrightnessAtMs = 0
+ was != screen
+ }
+ if (changed) logLine("RayNeo iO screen " + (if (screen == 1) "on" else "off"))
+ return
+ }
+ val battery = RayNeoIoProtocol.batteryFromLauncherJson(envelope.json)
+ if (battery < 0) {
+ // Replies to our commands and settings (the wake word's among them): logged for now.
+ logLine("RayNeo iO launcher type " + envelope.type + ": " + envelope.json.take(400))
+ return
+ }
+ val charging = if (envelope.json.contains("\"isCharging\":true")) 1 else if (envelope.json.contains("\"isCharging\":false")) 0 else -1
+ var changed = false
+ monitor.withLock {
+ lastIncomingAtMs = now()
+ if (battery != headsetBattery || (charging >= 0 && charging != headsetCharging)) {
+ headsetBattery = battery
+ if (charging >= 0) headsetCharging = charging
+ changed = true
+ }
+ }
+ if (changed) emitBatteryState(headsetBattery, headsetCharging)
+}
+
+/** The voice channel (business 13): mic packets, and the stock assistant's wake word. */
+private fun GlassesSessionCore.ioHandleVoice(payload: ByteArray) {
+ val envelope = RayNeoIoProtocol.decodeEnvelope(payload) ?: return
+ when (envelope.type) {
+ RayNeoIoProtocol.VOICE_STREAM_AUDIO, RayNeoIoProtocol.VOICE_AUDIO -> {
+ val opus = envelope.binary ?: return
+ val arrivalMs = now()
+ var first = false
+ val listener = monitor.withLock {
+ lastIncomingAtMs = arrivalMs
+ io.micPackets++
+ first = io.micPackets == 1L
+ io.lastMicPacketAtMs = arrivalMs
+ if (audioCaptureActive) audioPacketListener else null
+ }
+ if (first) logLine("RayNeo iO mic: first audio packet (type " + envelope.type + ", " + opus.size + " bytes)")
+ if (listener == null) return
+ try {
+ listener.onAudioPacket(opus, "R", arrivalMs)
+ } catch (t: Throwable) {
+ logLine("RayNeo iO mic packet listener failed: " + safeMessage(t))
+ }
+ }
+ RayNeoIoProtocol.VOICE_WAKE -> {
+ // The stock assistant heard "Hey RayNeo" and opened its session. Faceclaw's own
+ // assistant answers instead: end the stock one, and report the wake word as the
+ // G2's (sid 0x07 EVEN_AI_WAKE_UP), which the dashboard routes to its wake action.
+ var repeat = false
+ val forward = monitor.withLock {
+ val now = now()
+ io.voiceAbortPending = true
+ lastIncomingAtMs = now
+ lastConnectionOrInputAtMs = now
+ repeat = io.lastVoiceWakeAtMs != 0L && now - io.lastVoiceWakeAtMs < IoTimings.VOICE_WAKE_DEDUP_MS
+ val wanted = io.voiceWakeWanted == true && sessionReady
+ if (wanted && !repeat) {
+ io.lastVoiceWakeAtMs = now
+ ioReclaimPageOnInputLocked()
+ }
+ wanted && !repeat
+ }
+ interruptibleSleep.interrupt()
+ logLine("RayNeo iO: voice wake " + envelope.json + when {
+ forward -> ""
+ repeat -> " (same phrase as the last wake)"
+ else -> " (not forwarded: wake word off)"
+ })
+ if (!forward) return
+ val event = G2Event("even-ai", "", BleProtocol.EVEN_AI_STATUS_WAKE_UP, 0, 0)
+ val frameId = frameTimings.startFrame("input:even-ai wake")
+ frameTimings.log(frameId, "wake word from the RayNeo iO's voice channel")
+ emitRingEvent(event, frameId)
+ }
+ RayNeoIoProtocol.VOICE_EXITED -> {
+ // A voice session that held the recorder ended: ask for the stream again.
+ val reopen = monitor.withLock {
+ if (io.micWanted) io.micStreamOpen = false
+ io.micWanted
+ }
+ if (reopen) interruptibleSleep.interrupt()
+ logLine("RayNeo iO: voice session exited " + envelope.json + (if (reopen) "; reopening the mic stream" else ""))
+ }
+ RayNeoIoProtocol.VOICE_VAD -> logDebug("RayNeo iO: voice VAD " + envelope.json)
+ else -> logLine("RayNeo iO: voice message type " + envelope.type + " " + envelope.json.take(160))
+ }
+}
+
+private fun GlassesSessionCore.ioHandleCfw(address: String, frame: RayNeoIoProtocol.Frame) {
+ val payload = frame.payload
+ if (payload.isEmpty()) return
+ when (payload[0].toInt() and 255) {
+ RayNeoIoProtocol.KIND_ACK, RayNeoIoProtocol.KIND_NACK -> {
+ val ack = RayNeoIoProtocol.parseCfwAck(payload) ?: return
+ monitor.withLock {
+ acceptCfwAcksLocked(address, arrayOf(ack), frame.messageNumber and 255, payload)
+ }
+ interruptibleSleep.interrupt()
+ }
+ RayNeoIoProtocol.KIND_IDENT -> monitor.withLock {
+ io.ident = RayNeoIoProtocol.parseIdent(payload)
+ monitor.signalAll()
+ }
+ RayNeoIoProtocol.KIND_ALS -> {
+ val body = RayNeoIoProtocol.parseAlsReport(payload) ?: return
+ monitor.withLock {
+ lastIncomingAtMs = now()
+ brightnessPolicy.sample(body, lastIncomingAtMs)
+ }
+ emitAmbientLight(body)
+ interruptibleSleep.interrupt()
+ }
+ RayNeoIoProtocol.KIND_PAGE -> ioHandlePage(payload)
+ RayNeoIoProtocol.KIND_GESTURE -> ioHandleGesture(RayNeoIoProtocol.parseGesture(payload) ?: return)
+ else -> logDebug("RayNeo iO: CFW reply kind " + (payload[0].toInt() and 255) + " " + hex(payload.copyOf(minOf(payload.size, 24))))
+ }
+}
+
+private fun GlassesSessionCore.ioHandlePage(payload: ByteArray) {
+ val state = RayNeoIoProtocol.parsePageState(payload)
+ val reason = if (payload.size >= 3) payload[2].toInt() and 255 else 0
+ var lost = false
+ monitor.withLock {
+ io.pageState = state
+ io.pageReason = reason
+ io.pageReplies++
+ lastIncomingAtMs = now()
+ if (state == 1) {
+ if (io.pageWanted && !fixedLayoutCreated && sessionReady) {
+ // (Re)opened: the drive loop resends the desired frame from scratch.
+ fixedLayoutCreated = true
+ displayedFingerprint = ""
+ imageRetryAfterMs = 0
+ io.lastKeepaliveAtMs = now()
+ io.lastBrightnessAtMs = 0
+ ioResetBrightnessLocked()
+ }
+ } else if (state == 0 && fixedLayoutCreated) {
+ // The page closed under us (lease, the wearer's long press): the firmware freed
+ // this session's resources, so start over once it reopens.
+ lost = true
+ fixedLayoutCreated = false
+ clearAllMessagesLocked("RayNeo iO page closed (reason $reason)")
+ displayedFingerprint = ""
+ if (reason == IoTimings.PAGE_REASON_USER) io.pageWanted = false
+ io.pageRequestSentAtMs = now()
+ }
+ monitor.signalAll()
+ }
+ if (lost) logLine("RayNeo iO page closed by the glasses (reason $reason)")
+ interruptibleSleep.interrupt()
+}
+
+/**
+ * The wearer gave input (a temple touch, or the R1's) after closing our page:
+ * take it back. Caller holds `monitor`.
+ */
+internal fun GlassesSessionCore.ioReclaimPageOnInputLocked() {
+ if (io.pageWanted || !sessionReady) return
+ io.pageWanted = true
+ shutdownRequested = false
+ io.pageRequestSentAtMs = 0
+}
+
+private fun GlassesSessionCore.ioHandleGesture(gesture: RayNeoIoProtocol.Gesture) {
+ val event: G2Event? = when (gesture.eventType) {
+ // Same numbering as the G2's OsEventTypeList; head up wakes like the G2 CFW's forward.
+ BleProtocol.EVENT_HEAD_UP -> G2Event("display-wake", "", BleProtocol.EVENT_HEAD_UP, BleProtocol.EVENT_SOURCE_GLASSES_R, 0)
+ BleProtocol.EVENT_HEAD_DOWN -> null
+ else -> G2Event("sys-event", "", gesture.eventType, BleProtocol.EVENT_SOURCE_GLASSES_R, 0)
+ }
+ monitor.withLock {
+ lastIncomingAtMs = now()
+ if (event != null) lastConnectionOrInputAtMs = lastIncomingAtMs
+ if (event != null && "sys-event" == event.kind) ioReclaimPageOnInputLocked()
+ }
+ logLine("RayNeo iO gesture type=" + gesture.eventType + " source=" + gesture.source + (if (event == null) " (ignored)" else ""))
+ if (event == null) return
+ val frameId = frameTimings.startFrame("input:" + event.kind + " type=" + event.eventType + " src=" + event.eventSource)
+ frameTimings.log(frameId, "input event decoded from RayNeo iO notification")
+ emitRingEvent(event, frameId)
+}
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionRing.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionRing.kt
index 63b46f7b..9388abce 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionRing.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionRing.kt
@@ -971,6 +971,13 @@ internal fun macWireBytes(address: String): ByteArray? {
internal fun GlassesSessionCore.queueGlassesRingLinkCommandLocked(
action: String, fallbackAddress: String, fallbackName: String,
): Boolean {
+ if (!isG2) {
+ // A RayNeo iO or a G1 has no ring link of its own; the phone holds the ring directly.
+ lastRingLinkCommand = "$action: not applicable ($glassesType)"
+ lastRingLinkCommandAtMs = now()
+ logLine("glasses ring $action skipped: $glassesType glasses have no ring link")
+ return false
+ }
val reported = glassesRingMac
val mac = reported ?: macWireBytes(fallbackAddress)
if (mac == null) {
@@ -1091,6 +1098,9 @@ internal fun GlassesSessionCore.queueRingConfigCommandLocked(
frame = RingProtocol.buildPairAuth(seq)
}
"targets-glasses" -> {
+ // The iO never connects to the ring: naming it would make the ring drop
+ // the phone's glasses-role link (the advStart check, ~20 s later).
+ if (!isG2) return "not sent: these glasses don't hold the ring"
val right = macWireBytes(rightAddress)
val left = macWireBytes(leftAddress)
if (right == null || left == null) return "not sent: glasses addresses unparseable"
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionSend.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionSend.kt
index fbfac3d2..01580acb 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionSend.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/GlassesSessionSend.kt
@@ -44,6 +44,8 @@ internal fun GlassesSessionCore.driveSession(): Long {
benchmarkReadyAtMs = now() + 1_000
}
}
+ if (isIo) ioMaintain()
+ if (isG1) g1Maintain()
var messageToWrite: OutboundMessage? = null
var messageToPrewrite: OutboundMessage? = null
var heartbeatToWrite: OutboundMessage? = null
@@ -74,7 +76,7 @@ internal fun GlassesSessionCore.driveSession(): Long {
clearPendingMessagesLocked("after CFW cleanup")
return 250
}
- if (sessionReady
+ if (sessionReady && isG2
&& now - lastFaceclawFramebufferLeaseQueuedAtMs >= FACECLAW_WAKE_LEASE_RENEW_MS
&& !hasPendingOrInflightKindLocked("framebuffer-lease-control")) {
enqueueFaceclawFramebufferControlLocked(
@@ -83,7 +85,7 @@ internal fun GlassesSessionCore.driveSession(): Long {
)
}
if (faceclawWakeLeaseEnabled
- && sessionReady
+ && sessionReady && isG2
&& now - lastFaceclawWakeLeaseQueuedAtMs >= FACECLAW_WAKE_LEASE_RENEW_MS
&& !hasPendingOrInflightKindLocked("wake-lease-control")) {
enqueueFaceclawWakeControlLocked(
@@ -158,6 +160,7 @@ internal fun GlassesSessionCore.driveSession(): Long {
}
} else {
if (messageToPrewrite == null
+ && isG2 // the iO's page lease is ioMaintain's; a G1 has none
&& !shutdownRequested
&& !fixedLayoutCreated
&& pendingMessages.isEmpty()
@@ -168,14 +171,14 @@ internal fun GlassesSessionCore.driveSession(): Long {
// Prewrite outside the lock; the logical message remains pending until
// its final BLE frame is sent after the current protocol ACK.
}
- if (messageToPrewrite == null && !shutdownRequested && fixedLayoutCreated
+ if (messageToPrewrite == null && isG2 && !shutdownRequested && fixedLayoutCreated
&& (if (firmwareDebugFlagsEnabled) 2 else 1) != firmwareDebugFlagsLastSent
&& pendingMessages.isEmpty() && inFlightMessages.isEmpty()) {
logLine("enqueueing firmware debug flags " + (if (firmwareDebugFlagsEnabled) "show" else "hide"))
enqueueFirmwareDebugFlagsLocked()
}
- if (messageToPrewrite == null && !shutdownRequested && fixedLayoutCreated
+ if (messageToPrewrite == null && isG2 && !shutdownRequested && fixedLayoutCreated
&& caseInfoReadPending
&& pendingMessages.isEmpty() && inFlightMessages.isEmpty()) {
caseInfoReadPending = false
@@ -183,7 +186,7 @@ internal fun GlassesSessionCore.driveSession(): Long {
pendingMessages.addLast(messageBuilder.caseInfoQuery())
}
- if (messageToPrewrite == null && !shutdownRequested && fixedLayoutCreated
+ if (messageToPrewrite == null && isG2 && !shutdownRequested && fixedLayoutCreated
&& (if (compassOwners.isEmpty()) 0 else 1) != compassControlLastSent
&& pendingMessages.isEmpty() && inFlightMessages.isEmpty()) {
val wanted = compassOwners.isNotEmpty()
@@ -194,7 +197,9 @@ internal fun GlassesSessionCore.driveSession(): Long {
if (benchmarkActive) {
maintainBenchmarkLocked(now)
}
- if (!benchmarkActive) maintainBrightnessLocked(now)
+ // A G1's brightness follows the policy's target; its light sensor isn't wired up yet.
+ if (!benchmarkActive && isG1) enqueueBrightnessLocked()
+ else if (!benchmarkActive && (!isIo || ioFirmwareOwnsBrightness)) maintainBrightnessLocked(now)
// Up to WINDOW_SIZE messages may be in flight at once (full
// pipelining); a slot frees when an ack arrives. An active
@@ -337,6 +342,7 @@ internal enum class HeartbeatStep {
}
internal fun GlassesSessionCore.heartbeatStepLocked(imageWaiting: Boolean): HeartbeatStep {
+ if (!isG2) return HeartbeatStep.NONE
val now = now()
val heartbeatEligible = !shutdownRequested && fixedLayoutCreated
val heartbeatPending = heartbeatEligible && hasPendingOrInflightKindLocked("heartbeat")
@@ -387,6 +393,21 @@ internal fun GlassesSessionCore.createHeartbeatMessage(): OutboundMessage {
}
internal fun GlassesSessionCore.writeMessage(message: OutboundMessage): Boolean {
+ if (isG1 && !g1SupportsMessage(message)) {
+ // G2-only traffic a shared feature queued anyway: it would only wait for an ACK that never comes.
+ ioDropUnsupported(message)
+ return true
+ }
+ if (isG1 && g1ArmIsAway(message)) {
+ ioDropUnsupported(message)
+ return true
+ }
+ if (isIo && !ioSupportsMessage(message)) {
+ // G2-only traffic (EvenHub/settings frames, the G2 hardware CFW modes) that a feature
+ // queued anyway: the iO would NACK it into the replay limit, so it never goes out.
+ ioDropUnsupported(message)
+ return true
+ }
val now = now()
message.writeStartedAtMs = now
message.sentAtMs = now
@@ -416,6 +437,10 @@ internal fun GlassesSessionCore.writeMessage(message: OutboundMessage): Boolean
frames = listOf(prewrittenFrames[prewrittenFrames.size - 1])
prewrittenMessage = null
prewrittenFrames = emptyList()
+ } else if (isIo) {
+ frames = ioCfwWrites(message, link.negotiatedMtu(writeAddress))
+ } else if (isG1) {
+ frames = g1CfwWrites(message, link.negotiatedMtu(writeAddress))
} else if (message.sid == CfwTransport.SID) {
if (message.cfwRetries > 0) cfwTransports[if (message.isLeftArmMessage) 0 else 1].reset()
frames = cfwTransports[if (message.isLeftArmMessage) 0 else 1].encode(
@@ -431,9 +456,9 @@ internal fun GlassesSessionCore.writeMessage(message: OutboundMessage): Boolean
}
val result = link.writeFrames(
writeAddress,
- BleProtocol.WRITE_CHAR_UUID,
+ if (isIo) RayNeoIoBle.WRITE_CHAR_UUID else if (isG1) G1Ble.FC_CHAR_UUID else BleProtocol.WRITE_CHAR_UUID,
frames,
- ConnectionOptions.WRITE_MODE,
+ if (isIo || isG1) GattWriteMode.WITHOUT_RESPONSE else ConnectionOptions.WRITE_MODE,
ConnectionOptions.WRITE_TIMEOUT_MS
)
@@ -836,6 +861,10 @@ internal fun GlassesSessionCore.enqueueDesiredImageLocked() {
frameTimings.spanEnd(frameId, "pack-4bpp")
// Visibility belongs to this immutable composite, not the latest UI request.
enqueueBrightnessLocked(!fingerprint.startsWith("blanked:"))
+ if (isG1 && packedFrame.size > 0) {
+ g1EnqueueFrameLocked(packedFrame, width, height, scene, fingerprint, paintMs, frameId)
+ return
+ }
if (customFirmwareDetected && packedFrame.size > 0) {
val rendered = try {
scenePlanner.plan(packedFrame, width, height, draws, scene, nextImageFrameId,
@@ -981,10 +1010,13 @@ internal fun GlassesSessionCore.enqueueCustomImageLocked(
fingerprint: String,
updateId: Int,
messageNumber: Int,
- messageCount: Int
+ messageCount: Int,
+ leftArm: Boolean = connectionOptions.sendImagesToLeft,
+ requiredLenses: Int = CfwTransport.BOTH,
) {
val message = messageBuilder.customMessage("image", payload,
- "image " + plan.tile.name + "#" + messageNumber, plan.tileIndex, connectionOptions.sendImagesToLeft)
+ "image " + plan.tile.name + "#" + messageNumber, plan.tileIndex, leftArm)
+ message.cfwRequiredLenses = requiredLenses
message.setImageUpdatePosition(updateId, messageNumber, messageCount)
message.onAck = MessageCallback {
imageRetryAfterMs = 0
@@ -1037,7 +1069,8 @@ internal fun GlassesSessionCore.createAudioControlMessageLocked(enable: Boolean)
}
internal fun GlassesSessionCore.shouldPollBatteryLocked(now: Long): Boolean {
- return !shutdownRequested
+ return isG2 // the others' status polls are their own maintain's
+ && !shutdownRequested
&& sessionReady
&& pendingMessages.isEmpty()
&& inFlightMessages.isEmpty()
@@ -1344,6 +1377,7 @@ internal fun GlassesSessionCore.clearMessagesOfKindLocked(kind: String) {
// drop the pipelined delta base so the next image is a full keyframe.
lastEnqueuedPacked = ByteArray(0)
lastEnqueuedFingerprint = ""
+ g1ForgetFramesLocked()
}
}
@@ -1351,12 +1385,14 @@ internal fun GlassesSessionCore.clearAllMessagesLocked(reason: String) {
brightnessSentVisible = null
brightnessSentLevel = -1
brightnessAlsStartedAt = -2000
+ io.alsIntervalSent = -1
clearPendingMessagesLocked(reason)
clearInFlightMessagesLocked(reason)
// The image pipeline is gone: drop the pipelined delta base so the next
// image is a full keyframe rather than a delta onto a stale base.
lastEnqueuedPacked = ByteArray(0)
lastEnqueuedFingerprint = ""
+ g1ForgetFramesLocked()
// Queued resource commands (if any) were dropped with the rest, and the
// session churn behind a full clear may have freed the on-glasses
// cache; forget it phone-side so glyphs re-upload lazily.
@@ -1372,6 +1408,7 @@ internal fun GlassesSessionCore.clearAllMessagesPreservingWakeLeaseLocked(reason
brightnessSentVisible = null
brightnessSentLevel = -1
brightnessAlsStartedAt = -2000
+ io.alsIntervalSent = -1
val pendingIterator = pendingMessages.iterator()
while (pendingIterator.hasNext()) {
val message = pendingIterator.next()
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/SessionPorts.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/SessionPorts.kt
index 94f5e0d2..aaa076b6 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/SessionPorts.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g2protocol/session/SessionPorts.kt
@@ -68,6 +68,18 @@ interface SessionLink {
/** Whether the OS still holds a pairing bond for the address (iOS: always true). */
fun isBonded(address: String): Boolean
+ /** Ask the OS to bond with a connected device, without waiting. A no-op where it pairs on demand only (CoreBluetooth). */
+ fun requestBond(address: String) {}
+
+ /** Remove this phone's half of a pairing; false where the platform can't or refused. */
+ fun removeBond(address: String): Boolean = false
+
+ /** After discovery: whether the service table has this characteristic. Enabling notifications on one it lacks may throw. */
+ fun hasCharacteristic(address: String, characteristicUuid: String): Boolean = true
+
+ /** Read the service table again, past whatever the OS cached for this address. */
+ fun refreshServices(address: String, timeoutMs: Int): Boolean = discoverServices(address, timeoutMs)
+
/** Bandwidth-benchmark link tuning; 0: current link, 1: HIGH priority, 2: 2M PHY, 3: both. */
fun prepareBenchmarkLink(address: String, mode: Int)
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/ColorGlyphArt.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/ColorGlyphArt.kt
new file mode 100644
index 00000000..f16289fc
--- /dev/null
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/ColorGlyphArt.kt
@@ -0,0 +1,120 @@
+package com.faceclaw.app
+
+import kotlin.jvm.JvmStatic
+import kotlin.math.max
+import kotlin.math.pow
+import kotlin.math.roundToInt
+
+/**
+ * Turns a color glyph (an emoji from a color font the text stack fell back to) into the
+ * lit-on-black coverage the glyph pipeline carries, so it keeps its internal detail instead of
+ * showing as its alpha silhouette (a face as a plain disc, ✅ as a plain square). Platform
+ * rasterizers draw the glyph in white and pass unpremultiplied ARGB; this object owns the
+ * pixel math so Android and iOS agree.
+ *
+ * Shading is by OKLab lightness relative to the glyph's body, its median lightness:
+ * - the body lights fully, so a one-color emoji (❤️, ⭐, 🖤) reads as its shape at full
+ * brightness whatever its color, the way the alpha did, rather than dim for being dark;
+ * - darker detail (eyes, mouths, the digits on 📅) falls toward [DARKEST_LIT], never off, so
+ * the silhouette stays whole;
+ * - when a fair share of the glyph is clearly lighter than the body (the check on ✅, the
+ * circle on 🎱, the eyes on 💩) the body dims toward [DIMMEST_BODY] to leave that detail
+ * room above it. Small highlights (❤️'s glint) don't count.
+ * Lit values go through the notification icons' tone curve ([NotificationIconArt.GAMMA]),
+ * then scale by the pixel's alpha, which stays the glyph's coverage.
+ */
+object ColorGlyphArt {
+ /** A pixel this opaque that is not white means the glyph was not drawn in the paint's white. */
+ private const val MIN_COLOR_ALPHA = 32
+
+ /** How far below 255 a channel may sit and still count as white (unpremultiply rounding). */
+ private const val WHITE_TOLERANCE = 24
+
+ /** Lit level of the glyph's darkest detail, before the tone curve. */
+ private const val DARKEST_LIT = 0.3
+
+ /** Lit level the body dims to when the glyph has plenty of detail lighter than it. */
+ private const val DIMMEST_BODY = 0.6
+
+ /** Lightness quantile that must be clearly above the body for the body to dim: about the lightest 10%. */
+ private const val LIGHT_DETAIL_QUANTILE = 0.9
+
+ /** OKLab lightness above the body where light detail starts to dim the body, and the span to fully dimmed. */
+ private const val LIGHT_DETAIL_START = 0.05
+ private const val LIGHT_DETAIL_SPAN = 0.2
+
+ /**
+ * The smallest lightness spans the ramps above and below the body stretch over, so faint
+ * shading on a nearly one-color glyph stays faint instead of stretching to the full range.
+ */
+ private const val MIN_LIGHT_SPAN = 0.15
+ private const val MIN_DARK_SPAN = 0.3
+
+ /**
+ * Whether a glyph drawn in white came out in other colors, i.e. came from a color font.
+ * Ordinary glyphs are white wherever they have coverage.
+ */
+ @JvmStatic
+ fun isColor(argb: IntArray): Boolean {
+ val threshold = 255 - WHITE_TOLERANCE
+ for (p in argb) {
+ if (alpha(p) < MIN_COLOR_ALPHA) continue
+ if (((p shr 16) and 0xff) < threshold || ((p shr 8) and 0xff) < threshold || (p and 0xff) < threshold) {
+ return true
+ }
+ }
+ return false
+ }
+
+ /**
+ * Coverage (one byte per pixel) of a glyph drawn in white as unpremultiplied ARGB: its alpha,
+ * or for a color glyph its [shade].
+ */
+ @JvmStatic
+ fun coverage(argb: IntArray): ByteArray =
+ if (isColor(argb)) shade(argb) else ByteArray(argb.size) { alpha(argb[it]).toByte() }
+
+ /** Lit-on-black shade (one byte per pixel) of a color glyph as unpremultiplied ARGB. */
+ @JvmStatic
+ fun shade(argb: IntArray): ByteArray {
+ var peak = 0
+ for (p in argb) peak = max(peak, alpha(p))
+ val out = ByteArray(argb.size)
+ if (peak == 0) return out
+
+ // Statistics over the solid part, so antialiased edges don't skew the body.
+ val cutoff = max(1, (peak + 1) / 2)
+ var solid = 0
+ for (p in argb) if (alpha(p) >= cutoff) solid += 1
+ val sorted = DoubleArray(solid)
+ var next = 0
+ for (p in argb) if (alpha(p) >= cutoff) sorted[next++] = Oklab.lightness(p)
+ sorted.sort()
+ val body = quantile(sorted, 0.5)
+ val darkest = quantile(sorted, 0.05)
+ val lightest = quantile(sorted, 0.95)
+ val lightDetail = quantile(sorted, LIGHT_DETAIL_QUANTILE) - body
+ val dimming = ((lightDetail - LIGHT_DETAIL_START) / LIGHT_DETAIL_SPAN).coerceIn(0.0, 1.0)
+ val bodyLit = 1.0 - (1.0 - DIMMEST_BODY) * dimming
+ val lightSpan = max(lightest - body, MIN_LIGHT_SPAN)
+ val darkSpan = max(body - darkest, MIN_DARK_SPAN)
+
+ for (i in argb.indices) {
+ val p = argb[i]
+ val a = alpha(p)
+ if (a == 0) continue
+ val l = Oklab.lightness(p)
+ val lit = if (l >= body) {
+ bodyLit + (1.0 - bodyLit) * ((l - body) / lightSpan).coerceAtMost(1.0)
+ } else {
+ bodyLit - (bodyLit - DARKEST_LIT) * ((body - l) / darkSpan).coerceAtMost(1.0)
+ }
+ out[i] = (a * lit.pow(NotificationIconArt.GAMMA)).roundToInt().coerceIn(0, 255).toByte()
+ }
+ return out
+ }
+
+ private fun quantile(sorted: DoubleArray, q: Double): Double = sorted[((sorted.size - 1) * q).roundToInt()]
+
+ private fun alpha(p: Int): Int = (p ushr 24) and 0xff
+}
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/NotificationIconArt.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/NotificationIconArt.kt
index b650a725..52d22561 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/NotificationIconArt.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/NotificationIconArt.kt
@@ -2,7 +2,6 @@ package com.faceclaw.app
import kotlin.jvm.JvmStatic
import kotlin.math.abs
-import kotlin.math.cbrt
import kotlin.math.max
import kotlin.math.min
import kotlin.math.pow
@@ -72,12 +71,6 @@ object NotificationIconArt {
class Art(val kind: Kind, val gray: ByteArray)
- /** sRGB byte value to linear light. */
- private val SRGB_TO_LINEAR = DoubleArray(256) { value ->
- val c = value / 255.0
- if (c <= 0.04045) c / 12.92 else ((c + 0.055) / 1.055).pow(2.4)
- }
-
/**
* Classify and convert an icon rendered at (outputSize * ANALYSIS_SCALE) square, row-major
* ARGB (not premultiplied).
@@ -232,7 +225,7 @@ object NotificationIconArt {
private fun readTile(argb: IntArray, mask: BooleanArray, size: Int, maxAlpha: Int, outputSize: Int): Art {
val lab = DoubleArray(argb.size * 3)
for (i in argb.indices) {
- if (mask[i]) toOklab(argb[i], lab, i * 3)
+ if (mask[i]) Oklab.toOklab(argb[i], lab, i * 3)
}
// The background is the color of the tile's rim, about one output pixel deep.
@@ -347,18 +340,6 @@ object NotificationIconArt {
return gray
}
- private fun toOklab(pixel: Int, out: DoubleArray, offset: Int) {
- val r = SRGB_TO_LINEAR[(pixel shr 16) and 0xff]
- val g = SRGB_TO_LINEAR[(pixel shr 8) and 0xff]
- val b = SRGB_TO_LINEAR[pixel and 0xff]
- val l = cbrt(0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b)
- val m = cbrt(0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b)
- val s = cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b)
- out[offset] = 0.2104542553 * l + 0.7936177850 * m - 0.0040720468 * s
- out[offset + 1] = 1.9779984951 * l - 2.4285922050 * m + 0.4505937099 * s
- out[offset + 2] = 0.0259040371 * l + 0.7827717662 * m - 0.8086757660 * s
- }
-
private fun distance(lab: DoubleArray, index: Int, background: DoubleArray): Double {
val dl = lab[index * 3] - background[0]
val da = lab[index * 3 + 1] - background[1]
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/Oklab.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/Oklab.kt
new file mode 100644
index 00000000..df5672cf
--- /dev/null
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/Oklab.kt
@@ -0,0 +1,40 @@
+package com.faceclaw.app
+
+import kotlin.math.cbrt
+import kotlin.math.pow
+
+/**
+ * OKLab, a perceptual color space: L is lightness (0 = black, 1 = white) and equal distances
+ * look about equally different. The color analysis of icons and color glyphs works in it.
+ */
+internal object Oklab {
+ /** sRGB byte value to linear light. */
+ private val SRGB_TO_LINEAR = DoubleArray(256) { value ->
+ val c = value / 255.0
+ if (c <= 0.04045) c / 12.92 else ((c + 0.055) / 1.055).pow(2.4)
+ }
+
+ /** Writes the (L, a, b) of an ARGB pixel's color (its alpha ignored) at out[offset]. */
+ fun toOklab(pixel: Int, out: DoubleArray, offset: Int) {
+ val r = SRGB_TO_LINEAR[(pixel shr 16) and 0xff]
+ val g = SRGB_TO_LINEAR[(pixel shr 8) and 0xff]
+ val b = SRGB_TO_LINEAR[pixel and 0xff]
+ val l = cbrt(0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b)
+ val m = cbrt(0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b)
+ val s = cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b)
+ out[offset] = 0.2104542553 * l + 0.7936177850 * m - 0.0040720468 * s
+ out[offset + 1] = 1.9779984951 * l - 2.4285922050 * m + 0.4505937099 * s
+ out[offset + 2] = 0.0259040371 * l + 0.7827717662 * m - 0.8086757660 * s
+ }
+
+ /** The OKLab lightness of an ARGB pixel's color (its alpha ignored). */
+ fun lightness(pixel: Int): Double {
+ val r = SRGB_TO_LINEAR[(pixel shr 16) and 0xff]
+ val g = SRGB_TO_LINEAR[(pixel shr 8) and 0xff]
+ val b = SRGB_TO_LINEAR[pixel and 0xff]
+ val l = cbrt(0.4122214708 * r + 0.5363325363 * g + 0.0514459929 * b)
+ val m = cbrt(0.2119034982 * r + 0.6806995451 * g + 0.1073969566 * b)
+ val s = cbrt(0.0883024619 * r + 0.2817188376 * g + 0.6299787005 * b)
+ return 0.2104542553 * l + 0.7936177850 * m - 0.0040720468 * s
+ }
+}
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/ShellScene.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/ShellScene.kt
index 7818e75d..b98a7368 100644
--- a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/ShellScene.kt
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/graphics/ShellScene.kt
@@ -64,6 +64,21 @@ class ShellScene(val layers: List, val selections: List
return output
}
+ /** Whether the lenses differ: stereo depth somewhere in the scene. */
+ val hasStereoDepth: Boolean get() = screenDepth != 0 || layers.any { it.depth != 0 } || allSelections.isNotEmpty()
+
+ /**
+ * What one lens shows of [screen] (packed 4bpp) with this scene over it and every animation settled, for
+ * glasses that have no display lists (a G1). [screen] itself when there is no scene.
+ */
+ fun composed(screen: ByteArray, width: Int, height: Int, rightLens: Boolean): ByteArray {
+ if (layers.isEmpty() && selections.isEmpty() && screenDepth == 0) return screen
+ val output = ByteArray(screen.size)
+ DisplayListRenderer(rendererResources(width, height), rightLens = rightLens).render(511,
+ DisplayListRenderer.Target(screen, width, height), DisplayListRenderer.Target(output, width, height), SETTLED_MS)
+ return output
+ }
+
/** Layer surfaces, then retained resources, by index, and the root list at 511. */
private fun rendererResources(width: Int, height: Int): HashMap {
val resources = HashMap()
diff --git a/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/rayneo/RayNeoIoProtocol.kt b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/rayneo/RayNeoIoProtocol.kt
new file mode 100644
index 00000000..95874185
--- /dev/null
+++ b/native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/rayneo/RayNeoIoProtocol.kt
@@ -0,0 +1,540 @@
+package com.faceclaw.app
+
+import kotlin.jvm.JvmField
+import kotlin.jvm.JvmStatic
+
+/**
+ * RayNeo iO wire codecs (stock link plus the Faceclaw custom-firmware link). Pure functions
+ * and small value types; no I/O, threads or platform APIs.
+ *
+ * The iO is one SoC driving both eyes over ONE BLE connection. Everything travels in AA55
+ * frames on one write characteristic and one notify characteristic; the frame's "business"
+ * byte selects the subsystem: 0x10 handshake (TLV), 9 OTA and 13..22 apps (protobuf-style
+ * envelope + JSON), 0xF0 the custom-firmware link. The CFW link carries Faceclaw's G2 records
+ * unchanged (see [CfwTransport.encodeRecord]) inside `[opt][stream][chunk]` packets, and the
+ * firmware answers with the G2's 9-byte ACK body, one ACK per targeted lens.
+ *
+ * Protocol knowledge from the MIT-licensed Glassly SDK and CFW (tetramo-labs/glassly,
+ * tetramo-labs/glassly-rayneo-cfw); the Faceclaw firmware fork documents its additions in
+ * faceclaw-rayneo-cfw/docs/FACECLAW.md.
+ */
+object RayNeoIoBle {
+ const val SERVICE_UUID = "0000b81d-0000-1000-8000-00805f9b34fb"
+ /** Phone -> glasses, write without response. */
+ const val WRITE_CHAR_UUID = "ea8b70d5-2bd3-49ab-9c31-9c38b2c3c4f9"
+ /** Glasses -> phone, notifications. */
+ const val NOTIFY_CHAR_UUID = "7db3e235-3608-41f3-a03c-955fcbd2ea4b"
+ const val REQUESTED_MTU = 512
+ /** Advertised manufacturer data company id; the payload is `[07][MAC x6]...` (not in pairing mode). */
+ const val MANUFACTURER_ID = 0x5716
+
+ @JvmStatic fun matchesName(name: String?): Boolean = name != null && name.contains("rayneo", ignoreCase = true)
+
+ /** The glasses' MAC ("00:6A:5E:5F:33:C2") from manufacturer data, or null. */
+ @JvmStatic
+ fun macFromManufacturerData(data: ByteArray?): String? {
+ if (data == null || data.size < 7 || data[0].toInt() != 7) return null
+ return (1..6).joinToString(":") { i -> (data[i].toInt() and 255).toString(16).padStart(2, '0').uppercase() }
+ }
+}
+
+object RayNeoIoProtocol {
+ const val BUSINESS_OTA = 9
+ const val BUSINESS_VOICE = 13
+ const val BUSINESS_LAUNCHER = 15
+ const val BUSINESS_HANDSHAKE = 0x10
+ const val BUSINESS_CFW = 0xf0
+
+ const val FRAME_OVERHEAD = 10
+ const val MIN_FRAME_BYTES = 10
+
+ /** Program constant of the stock app's guest authentication (not a secret). */
+ private val SALT = byteArrayOf(
+ 0x07, 0x12, 0xc8.toByte(), 0xad.toByte(), 0x27, 0x74, 0x41, 0x95.toByte(),
+ 0xde.toByte(), 0x5f, 0xa1.toByte(), 0xea.toByte(), 0x6d, 0x02, 0x5f, 0xb8.toByte(),
+ )
+
+ // ---- CRC-16/XMODEM (poly 0x1021, init 0) -----------------------------------------------
+
+ @JvmStatic
+ fun crc16Xmodem(bytes: ByteArray, from: Int = 0, to: Int = bytes.size): Int {
+ var crc = 0
+ for (i in from until to) {
+ crc = crc xor ((bytes[i].toInt() and 255) shl 8)
+ repeat(8) { crc = if (crc and 0x8000 != 0) ((crc shl 1) xor 0x1021) and 0xffff else (crc shl 1) and 0xffff }
+ }
+ return crc
+ }
+
+ // ---- AA55 frames --------------------------------------------------------------------------
+
+ class Frame(
+ @JvmField val messageNumber: Int,
+ @JvmField val packetType: Int,
+ @JvmField val business: Int,
+ @JvmField val payload: ByteArray,
+ )
+
+ /** `AA 55 [len u16 BE = total-6] [msg u16 BE] [packetType] [business] payload [crc16 BE of bytes 4..end-2]`. */
+ @JvmStatic
+ fun encodeFrame(messageNumber: Int, business: Int, payload: ByteArray, packetType: Int = 0): ByteArray {
+ val frame = ByteArray(FRAME_OVERHEAD + payload.size)
+ val length = frame.size - 6
+ frame[0] = 0xaa.toByte()
+ frame[1] = 0x55
+ frame[2] = (length ushr 8).toByte()
+ frame[3] = length.toByte()
+ frame[4] = (messageNumber ushr 8).toByte()
+ frame[5] = messageNumber.toByte()
+ frame[6] = packetType.toByte()
+ frame[7] = business.toByte()
+ payload.copyInto(frame, 8)
+ val crc = crc16Xmodem(frame, 4, frame.size - 2)
+ frame[frame.size - 2] = (crc ushr 8).toByte()
+ frame[frame.size - 1] = crc.toByte()
+ return frame
+ }
+
+ /** Split a frame into ATT writes of at most `mtu - 3` bytes. */
+ @JvmStatic
+ fun writes(frame: ByteArray, mtu: Int): List {
+ val chunk = (mtu - 3).coerceAtLeast(20)
+ return (frame.indices step chunk).map { frame.copyOfRange(it, minOf(it + chunk, frame.size)) }
+ }
+
+ @JvmStatic
+ fun decodeFrame(bytes: ByteArray): Frame? {
+ if (bytes.size < MIN_FRAME_BYTES || bytes[0] != 0xaa.toByte() || bytes[1] != 0x55.toByte()) return null
+ val total = (((bytes[2].toInt() and 255) shl 8) or (bytes[3].toInt() and 255)) + 6
+ if (total != bytes.size) return null
+ val crc = ((bytes[total - 2].toInt() and 255) shl 8) or (bytes[total - 1].toInt() and 255)
+ if (crc != crc16Xmodem(bytes, 4, total - 2)) return null
+ val number = ((bytes[4].toInt() and 255) shl 8) or (bytes[5].toInt() and 255)
+ return Frame(number, bytes[6].toInt() and 255, bytes[7].toInt() and 255, bytes.copyOfRange(8, total - 2))
+ }
+
+ /**
+ * Frames from notification chunks: a frame may span several notifications. Bytes before a
+ * frame head are skipped; a head whose CRC fails is skipped past its magic.
+ */
+ class FrameReassembler {
+ private var buffer = ByteArray(0)
+
+ fun reset() {
+ buffer = ByteArray(0)
+ }
+
+ fun ingest(chunk: ByteArray): List {
+ buffer += chunk
+ val out = ArrayList()
+ var offset = 0
+ while (true) {
+ while (offset + 1 < buffer.size && !(buffer[offset] == 0xaa.toByte() && buffer[offset + 1] == 0x55.toByte())) offset++
+ if (buffer.size - offset < 4) break
+ val total = (((buffer[offset + 2].toInt() and 255) shl 8) or (buffer[offset + 3].toInt() and 255)) + 6
+ if (total < MIN_FRAME_BYTES) { offset += 2; continue }
+ if (buffer.size - offset < total) break
+ val frame = decodeFrame(buffer.copyOfRange(offset, offset + total))
+ if (frame == null) { offset += 2; continue }
+ out.add(frame)
+ offset += total
+ }
+ buffer = buffer.copyOfRange(minOf(offset, buffer.size), buffer.size)
+ return out
+ }
+
+ val pendingBytes: Int get() = buffer.size
+ }
+
+ // ---- TLV (tag u8, length u16 BE) ------------------------------------------------------------
+
+ class Tlv(@JvmField val tag: Int, @JvmField val value: ByteArray)
+
+ @JvmStatic
+ fun tlv(tag: Int, value: ByteArray): ByteArray {
+ val out = ByteArray(3 + value.size)
+ out[0] = tag.toByte()
+ out[1] = (value.size ushr 8).toByte()
+ out[2] = value.size.toByte()
+ value.copyInto(out, 3)
+ return out
+ }
+
+ @JvmStatic
+ fun decodeTlvs(bytes: ByteArray): List? {
+ val out = ArrayList()
+ var i = 0
+ while (i < bytes.size) {
+ if (bytes.size - i < 3) return null
+ val len = ((bytes[i + 1].toInt() and 255) shl 8) or (bytes[i + 2].toInt() and 255)
+ if (bytes.size - i - 3 < len) return null
+ out.add(Tlv(bytes[i].toInt() and 255, bytes.copyOfRange(i + 3, i + 3 + len)))
+ i += 3 + len
+ }
+ return out
+ }
+
+ private fun List.value(tag: Int): ByteArray? = firstOrNull { it.tag == tag }?.value
+
+ // ---- Handshake (business 0x10) ----------------------------------------------------------------
+
+ const val PLATFORM_IOS = 1
+ const val PLATFORM_ANDROID = 2
+
+ /** Version request. `phoneId` is a stable 6-byte protocol identity the glasses bind to. */
+ @JvmStatic
+ fun versionRequest(phoneId: ByteArray, phoneName: String, manufacturer: String, model: String, platform: Int = PLATFORM_ANDROID): ByteArray {
+ require(phoneId.size == 6)
+ val inner = tlv(0x10, byteArrayOf(1)) + tlv(0x11, phoneId) + tlv(0x12, phoneName.encodeToByteArray()) +
+ tlv(0x13, byteArrayOf(platform.toByte())) + tlv(0x16, manufacturer.encodeToByteArray()) +
+ tlv(0x17, model.encodeToByteArray())
+ return tlv(0x11, inner)
+ }
+
+ class VersionReply(
+ @JvmField val protocolVersion: Int,
+ /** The glasses' Bluetooth MAC, which the auth proof covers. */
+ @JvmField val glassesId: ByteArray,
+ @JvmField val serial: String?,
+ /** Tags 0x19/0x1a: bound to another phone's account; guest auth will not work. */
+ @JvmField val accountBound: Boolean,
+ )
+
+ @JvmStatic
+ fun parseVersionReply(payload: ByteArray): VersionReply? {
+ val body = decodeTlvs(payload)?.value(0x11) ?: return null
+ val fields = decodeTlvs(body) ?: return null
+ val id = fields.value(0x11)?.takeIf { it.size == 6 } ?: return null
+ return VersionReply(
+ fields.value(0x10)?.firstOrNull()?.toInt()?.and(255) ?: 0,
+ id,
+ fields.value(0x14)?.decodeToString()?.trimEnd('\u0000'),
+ fields.value(0x19) != null || fields.value(0x1a) != null,
+ )
+ }
+
+ /** `SHA-256(random4 ‖ phoneId6 ‖ glassesId6 ‖ SALT)`, both directions. */
+ @JvmStatic
+ fun authProof(random: ByteArray, phoneId: ByteArray, glassesId: ByteArray): ByteArray {
+ val digest = Sha256Digest()
+ digest.update(random)
+ digest.update(phoneId)
+ digest.update(glassesId)
+ digest.update(SALT)
+ return digest.digest()
+ }
+
+ @JvmStatic
+ fun guestAuthRequest(random: ByteArray, phoneId: ByteArray, glassesId: ByteArray): ByteArray {
+ require(random.size == 4 && phoneId.size == 6 && glassesId.size == 6)
+ return tlv(0x18, tlv(0x10, random) + tlv(0x11, authProof(random, phoneId, glassesId)))
+ }
+
+ /** The glasses' answer proves they know the same phone and glasses ids. */
+ @JvmStatic
+ fun verifyGuestAuthReply(payload: ByteArray, phoneId: ByteArray, glassesId: ByteArray): Boolean {
+ val body = decodeTlvs(payload)?.value(0x19) ?: return false
+ val fields = decodeTlvs(body) ?: return false
+ val random = fields.value(0x10)?.takeIf { it.size == 4 } ?: return false
+ val proof = fields.value(0x11)?.takeIf { it.size == 32 } ?: return false
+ return proof.contentEquals(authProof(random, phoneId, glassesId))
+ }
+
+ /** True for a guest-auth reply (outer tag 0x19), valid or not. */
+ @JvmStatic fun isGuestAuthReply(payload: ByteArray): Boolean = decodeTlvs(payload)?.value(0x19) != null
+
+ // ---- Business envelope (9, 13..22): 08 version, 10 type, 1A json, 22 bytes, 28 seq, 30 mode ----
+
+ const val MODE_REQUEST = 1
+ const val MODE_REPLY = 2
+ const val LAUNCHER_GENERAL_STATUS = 1
+ const val LAUNCHER_BRIGHTNESS = 2
+ const val LAUNCHER_GENERAL_SETTINGS = 4
+ const val LAUNCHER_AI_VOICE_WAKEUP = 16
+ const val OTA_VERSION = 1
+ const val GENERAL_STATUS_REQUEST = """{"cmd":"request_general_status","payload":{"data":"","mode":0,"value":0}}"""
+ /** The reply (type 4) carries `generalSettings`, among them the wake-word preferences. */
+ const val GENERAL_SETTINGS_REQUEST = """{"cmd":"request_general_settings","payload":{"value":0,"mode":0,"data":""}}"""
+
+ /**
+ * The launcher's wake-word switch. Every `set_ai_*` handler takes the new value from
+ * `mode` and ignores `value` (RnLinkMsgProcessor::handleAssistantSettingCommand, see
+ * notes/rayneo-io-wakeword-re.md): mode 1 on, 0 off.
+ */
+ @JvmStatic
+ fun launcherSetAiVoiceWakeup(enabled: Boolean): String =
+ """{"cmd":"set_ai_voice_wakeup","payload":{"value":0,"mode":${if (enabled) 1 else 0},"data":""}}"""
+
+ // ---- Voice assistant (business 13), as Glassly's RayNeoIOProtocol maps it ----
+ // The stock assistant: the wake word (or a temple long/double press) opens a session
+ // and sends VOICE_WAKE; the phone answers VOICE_RC {"rc":1} for Opus as VOICE_AUDIO,
+ // or {"rc":2} plus VOICE_ABORT to end it; VOICE_EXITED reports it gone. The remote
+ // stream (VOICE_STREAM_CONTROL {"rc":1|2}, packets as VOICE_STREAM_AUDIO) needs
+ // IDENT_FLAG_MIC firmware and runs without a session or its page, until a session,
+ // a call, SCO or a recording takes the recorder. Packets are 16 kHz mono Opus in
+ // the envelope's bytes field.
+
+ const val VOICE_WAKE = 1
+ const val VOICE_RC = 2
+ const val VOICE_AUDIO = 3
+ const val VOICE_VAD = 4
+ const val VOICE_ABORT = 7
+ const val VOICE_EXITED = 8
+ const val VOICE_STREAM_CONTROL = 58
+ const val VOICE_STREAM_AUDIO = 59
+ const val VOICE_RC_START = 1
+ const val VOICE_RC_STOP = 2
+ const val VOICE_SAMPLE_RATE = 16_000
+
+ /** A voice-channel message: `{"rc":n}` as [type] (VOICE_RC, VOICE_STREAM_CONTROL or VOICE_ABORT). */
+ @JvmStatic
+ fun voiceRc(type: Int, rc: Int): ByteArray = encodeEnvelope(Envelope(type, """{"rc":$rc}"""))
+
+ class Envelope(
+ @JvmField val type: Int,
+ @JvmField val json: String,
+ @JvmField val binary: ByteArray? = null,
+ @JvmField val sequence: Int? = null,
+ @JvmField val mode: Int? = null,
+ )
+
+ private fun varint(out: MutableList, value: Long) {
+ var v = value
+ while (v and 0x7fL.inv() != 0L) { out.add(((v and 0x7f) or 0x80).toByte()); v = v ushr 7 }
+ out.add(v.toByte())
+ }
+
+ @JvmStatic
+ fun encodeEnvelope(e: Envelope): ByteArray {
+ val out = ArrayList()
+ out.add(0x08); varint(out, 1)
+ out.add(0x10); varint(out, e.type.toLong())
+ val json = e.json.encodeToByteArray()
+ out.add(0x1a); varint(out, json.size.toLong()); json.forEach { out.add(it) }
+ e.binary?.let { b -> out.add(0x22); varint(out, b.size.toLong()); b.forEach { out.add(it) } }
+ e.sequence?.let { out.add(0x28); varint(out, it.toLong()) }
+ e.mode?.let { out.add(0x30); varint(out, it.toLong()) }
+ return out.toByteArray()
+ }
+
+ @JvmStatic
+ fun decodeEnvelope(bytes: ByteArray): Envelope? {
+ var pos = 0
+ fun readVarint(): Long? {
+ var shift = 0
+ var result = 0L
+ while (pos < bytes.size && shift <= 63) {
+ val b = bytes[pos++].toInt() and 255
+ result = result or ((b and 0x7f).toLong() shl shift)
+ if (b and 0x80 == 0) return result
+ shift += 7
+ }
+ return null
+ }
+ var type: Int? = null
+ var json = ""
+ var binary: ByteArray? = null
+ var sequence: Int? = null
+ var mode: Int? = null
+ while (pos < bytes.size) {
+ val key = readVarint() ?: return null
+ when ((key and 7).toInt()) {
+ 0 -> {
+ val v = readVarint() ?: return null
+ when ((key ushr 3).toInt()) { 2 -> type = v.toInt(); 5 -> sequence = v.toInt(); 6 -> mode = v.toInt() }
+ }
+ 2 -> {
+ val len = readVarint() ?: return null
+ if (len < 0 || len > bytes.size - pos) return null
+ val v = bytes.copyOfRange(pos, pos + len.toInt())
+ pos += len.toInt()
+ when ((key ushr 3).toInt()) { 3 -> json = v.decodeToString(); 4 -> binary = v }
+ }
+ 1 -> pos += 8
+ 5 -> pos += 4
+ else -> return null
+ }
+ }
+ return Envelope(type ?: return null, json, binary, sequence, mode)
+ }
+
+ /**
+ * Set the launcher's brightness (1..8). The stock handler also turns the screen on
+ * (BrightnessMonitor::setBrightness -> turnOnScreenForSetting), which is how the phone
+ * wakes the iO's display and keeps the stock auto-off from blanking a static page.
+ * Only for firmware without [Ident.brightnessControl]: stock auto-brightness soon
+ * replaces the level, and each one writes the glasses' preferences.
+ */
+ @JvmStatic
+ fun launcherBrightness(level: Int): String =
+ """{"cmd":"brightness_change","payload":{"value":${level.coerceIn(1, 8)},"mode":0,"data":""}}"""
+
+ /** Faceclaw's 0..100 brightness target on the launcher's 1..8 scale. */
+ @JvmStatic fun brightnessLevel(target: Int): Int = maxOf(1, (target.coerceIn(0, 100) * 8 + 50) / 100)
+
+ /** `screen_status` push value (1 on, 0 off), or -1 for anything else. */
+ @JvmStatic
+ fun screenStatusFromLauncherJson(json: String): Int {
+ val root = try { Json.parse(json).asObject() } catch (_: Exception) { null } ?: return -1
+ if (root["cmd"].asString() != "screen_status") return -1
+ return root["payload"].asObject()?.get("value").asInt() ?: -1
+ }
+
+ /** `generalStatus.battery` from a launcher reply or push, or -1. */
+ @JvmStatic
+ fun batteryFromLauncherJson(json: String): Int {
+ val root = try { Json.parse(json).asObject() } catch (_: Exception) { null } ?: return -1
+ val status = root["generalStatus"].asObject() ?: root["payload"].asObject()?.get("generalStatus").asObject()
+ status?.get("battery").asInt()?.let { return it }
+ // pushes: {"cmd":"battery_change","payload":{"value":N,...}}
+ if (root["cmd"].asString() == "battery_change") return root["payload"].asObject()?.get("value").asInt() ?: -1
+ return -1
+ }
+
+ // ---- Custom-firmware link (business 0xF0) -----------------------------------------------------
+
+ const val OPT_LENS = 0x01
+ const val OPT_CONTROL = 0x10
+ const val OPT_END = 0x40
+ const val OPT_RESET = 0x80
+ const val CTRL_QUERY = 1
+ const val CTRL_PAGE_OPEN = 2
+ const val CTRL_PAGE_CLOSE = 3
+ const val CTRL_KEEPALIVE = 4
+ /** Records up to this many bytes per packet (IDENT reports the firmware's maxChunk). */
+ const val DEFAULT_MAX_CHUNK = 240
+ /** The page closes this long after the last PAGE_OPEN/KEEPALIVE. */
+ const val PAGE_LEASE_MS = 120_000L
+
+ @JvmStatic
+ fun controlPacket(ctrl: Int, arg: Int? = null): ByteArray =
+ if (arg == null) byteArrayOf(OPT_CONTROL.toByte(), 0, ctrl.toByte())
+ else byteArrayOf(OPT_CONTROL.toByte(), 0, ctrl.toByte(), arg.toByte())
+
+ /**
+ * One record (from [CfwTransport.encodeRecord]) as business-0xF0 payloads
+ * `[opt][stream][chunk]`. `stream` is echoed in the ACKs, so it plays the G2 stream id's role.
+ */
+ @JvmStatic
+ fun cfwPackets(record: ByteArray, streamId: Int, maxChunk: Int = DEFAULT_MAX_CHUNK): List {
+ require(streamId in 0..255 && maxChunk > 0)
+ val out = ArrayList()
+ var offset = 0
+ do {
+ val end = minOf(offset + maxChunk, record.size)
+ var opt = OPT_LENS
+ if (offset == 0) opt = opt or OPT_RESET
+ if (end >= record.size) opt = opt or OPT_END
+ val p = ByteArray(2 + end - offset)
+ p[0] = opt.toByte()
+ p[1] = streamId.toByte()
+ record.copyInto(p, 2, offset, end)
+ out.add(p)
+ offset = end
+ } while (offset < record.size)
+ return out
+ }
+
+ const val KIND_ACK = 1
+ const val KIND_NACK = 3
+ const val KIND_REPLY = 5
+ const val KIND_GESTURE = 7
+ const val KIND_IDENT = 0x11
+ const val KIND_PAGE = 0x13
+ const val KIND_DIAG = 0x15
+ const val KIND_ALS = 0x1f
+
+ /** `[01|03][stream][ordinal u16][lens][size u16][crc u16]`: the G2 ACK body, one per lens. */
+ @JvmStatic
+ fun parseCfwAck(payload: ByteArray): CfwTransport.Ack? {
+ if (payload.size != 9) return null
+ val kind = payload[0].toInt() and 255
+ val lens = payload[4].toInt() and 255
+ if ((kind != KIND_ACK && kind != KIND_NACK) || (lens != 1 && lens != 2)) return null
+ fun u16(o: Int) = (payload[o].toInt() and 255) or ((payload[o + 1].toInt() and 255) shl 8)
+ return CfwTransport.Ack(kind == KIND_NACK, payload[1].toInt() and 255, u16(2), lens, u16(5), u16(7))
+ }
+
+ const val IDENT_FLAG_ZLIB = 0x01
+ const val IDENT_FLAG_STEREO = 0x08
+ /** The assistant's remote audio stream (type 58/59 below) is allowed (CFW revision 10). */
+ const val IDENT_FLAG_MIC = 0x20
+ const val IDENT_FLAG_FACECLAW = 0x80
+ /** Message 30: the firmware sets the panel level and runs fades, with stock auto-brightness off. */
+ const val FEATURE_BRIGHTNESS = "bright30"
+ /** Message 16: the firmware reads the light sensor and sends [KIND_ALS] reports. */
+ const val FEATURE_ALS = "als16"
+
+ class Ident(
+ @JvmField val width: Int,
+ @JvmField val height: Int,
+ @JvmField val maxChunk: Int,
+ @JvmField val revision: Int,
+ @JvmField val flags: Int,
+ @JvmField val name: String,
+ /** "Faceclaw/" -> n when the firmware runs the Faceclaw display lists, else -1. */
+ @JvmField val faceclawRevision: Int,
+ /** What the firmware adds to the display lists (a third string in IDENT). */
+ @JvmField val features: List = emptyList(),
+ ) {
+ val acceptsCompressed: Boolean get() = flags and IDENT_FLAG_ZLIB != 0
+ val micStream: Boolean get() = flags and IDENT_FLAG_MIC != 0
+ val faceclaw: Boolean get() = flags and IDENT_FLAG_FACECLAW != 0 && faceclawRevision > 0
+ /** Faceclaw owns brightness and the light sensor, as on the G2 custom firmware. */
+ val brightnessControl: Boolean get() = faceclaw && FEATURE_BRIGHTNESS in features && FEATURE_ALS in features
+ }
+
+ /** `[11][ver][w u16][h u16][maxChunk u16][storeKiB u16][rev u16][flags]name\0[lineHeight]["Faceclaw/n"\0["features"\0]]`. */
+ @JvmStatic
+ fun parseIdent(payload: ByteArray): Ident? {
+ if (payload.size < 13 || payload[0].toInt() != KIND_IDENT) return null
+ fun u16(o: Int) = (payload[o].toInt() and 255) or ((payload[o + 1].toInt() and 255) shl 8)
+ var end = 13
+ while (end < payload.size && payload[end].toInt() != 0) end++
+ val name = payload.copyOfRange(13, end).decodeToString()
+ var faceclaw = -1
+ var features = emptyList()
+ val extra = end + 2 // NUL, line height
+ if (extra < payload.size) {
+ var e = extra
+ while (e < payload.size && payload[e].toInt() != 0) e++
+ val text = payload.copyOfRange(extra, e).decodeToString()
+ if (text.startsWith("Faceclaw/")) faceclaw = text.removePrefix("Faceclaw/").toIntOrNull() ?: -1
+ val more = e + 1
+ if (more < payload.size) {
+ var f = more
+ while (f < payload.size && payload[f].toInt() != 0) f++
+ features = payload.copyOfRange(more, f).decodeToString().split(' ').filter { it.isNotEmpty() }
+ }
+ }
+ return Ident(u16(2), u16(4), u16(6), u16(10), payload[12].toInt() and 255, name, faceclaw, features)
+ }
+
+ /**
+ * `[1f]` + the 24-byte `['A','L',1,reason,...]` body the G2 custom firmware sends as settings
+ * field 105 (value in tenths of a lux), or null. The body goes to the same consumers.
+ */
+ @JvmStatic
+ fun parseAlsReport(payload: ByteArray): ByteArray? {
+ if (payload.size < 25 || (payload[0].toInt() and 255) != KIND_ALS) return null
+ val body = payload.copyOfRange(1, 25)
+ return if (body[0].toInt() == 65 && body[1].toInt() == 76 && body[2].toInt() == 1) body else null
+ }
+
+ /** PAGE `[13][state][reason]`: state 1 open. */
+ @JvmStatic fun parsePageState(payload: ByteArray): Int = if (payload.size >= 2 && payload[0].toInt() == KIND_PAGE) payload[1].toInt() and 255 else -1
+
+ class Gesture(@JvmField val eventType: Int, @JvmField val source: Int, @JvmField val tick: Long)
+
+ /**
+ * GESTURE `[07][eventType][source][tick u32]`. Event types use the G2's OsEventTypeList numbering:
+ * 0 single tap, 1 swipe up, 2 swipe down, 3 double tap, 11 tap-then-hold, 12 head up, 15 head down.
+ */
+ @JvmStatic
+ fun parseGesture(payload: ByteArray): Gesture? {
+ if (payload.size < 7 || payload[0].toInt() != KIND_GESTURE) return null
+ val tick = (payload[3].toLong() and 255) or ((payload[4].toLong() and 255) shl 8) or
+ ((payload[5].toLong() and 255) shl 16) or ((payload[6].toLong() and 255) shl 24)
+ return Gesture(payload[1].toInt() and 255, payload[2].toInt() and 255, tick)
+ }
+}
diff --git a/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/ble/IosBleCentral.kt b/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/ble/IosBleCentral.kt
index 2cc2ddb8..68c31f7e 100644
--- a/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/ble/IosBleCentral.kt
+++ b/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/ble/IosBleCentral.kt
@@ -461,6 +461,20 @@ class IosBleCentral(private val platform: ProtocolPlatform = IosProtocolPlatform
override fun isBonded(address: String): Boolean = true
+ /** CoreBluetooth pairs by itself when an attribute needs it. */
+ override fun requestBond(address: String) {}
+
+ /** Only iOS Settings can remove a pairing. */
+ override fun removeBond(address: String): Boolean = false
+
+ override fun hasCharacteristic(address: String, characteristicUuid: String): Boolean {
+ val peer = connectedPeer(address) ?: return false
+ return cond.withLock { peer.characteristics.containsKey(characteristicUuid.lowercase()) }
+ }
+
+ /** CoreBluetooth follows Service Changed itself; discovering again is all there is. */
+ override fun refreshServices(address: String, timeoutMs: Int): Boolean = discoverServices(address, timeoutMs)
+
override fun prepareBenchmarkLink(address: String, mode: Int) {}
override fun recordDisplayFrameSent() {
diff --git a/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/ble/IosGlassesSession.kt b/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/ble/IosGlassesSession.kt
index 18acc3bd..4ad21dda 100644
--- a/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/ble/IosGlassesSession.kt
+++ b/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/ble/IosGlassesSession.kt
@@ -86,6 +86,9 @@ class IosGlassesSession internal constructor(
fun setRequiredFirmwareRevision(revision: Int) = core.setRequiredFirmwareRevision(revision)
+ /** Drive an Even G1 on g1v0 (see GlassesSessionG1.kt). Before [start]. */
+ fun useG1() = core.useG1()
+
fun start(): Boolean = core.start()
fun disconnect() = core.disconnect()
@@ -105,6 +108,8 @@ class IosGlassesSession internal constructor(
fun isAncsAuthorized(): Boolean = central?.isAncsAuthorized(rightIdentifier) ?: false
+ fun ancsRelayAvailable(): Boolean = core.ancsRelayAvailable()
+
fun setAncsListener(listener: IosAncsListener?) {
if (listener == null) {
core.setRawFrameTap(null)
diff --git a/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/ble/IosStockFlows.kt b/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/ble/IosStockFlows.kt
index a8146eba..f655eebd 100644
--- a/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/ble/IosStockFlows.kt
+++ b/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/ble/IosStockFlows.kt
@@ -171,3 +171,57 @@ class IosFirmwareFlasher(rightAddress: String, leftAddress: String, firmwarePath
lock.withLock { listener }?.let(action)
}
}
+
+/** iOS host for the shared [G1ArmFlashFlow]: one G1 arm's install, its restore to Even's firmware, or a question about what it runs. */
+class IosG1Flasher(address: String, side: String, firmwarePath: String, netCorePath: String, mode: String, connectWindowMs: Int) {
+ private val link = IosBleCentral()
+ private val lock = IosProtocolPlatform.createLock()
+ private var started = false
+ private var listener: FaceclawFirmwareFlasherListener? = null
+
+ private val flow = G1ArmFlashFlow(
+ link,
+ address,
+ side,
+ firmwarePath,
+ netCorePath,
+ G1ArmFlashFlow.mode(mode),
+ connectWindowMs,
+ object : FaceclawFirmwareFlasherListener {
+ override fun onLog(line: String?) {
+ PlatformLog.i(G1ArmFlashFlow.TAG, line ?: "")
+ post { it.onLog(line) }
+ }
+
+ override fun onProgress(lens: String?, componentIndex: Int, componentCount: Int, blockIndex: Int, blockCount: Int, bytesSent: Long, bytesTotal: Long) =
+ post { it.onProgress(lens, componentIndex, componentCount, blockIndex, blockCount, bytesSent, bytesTotal) }
+
+ override fun onState(state: String?, detail: String?) = post { it.onState(state, detail ?: "") }
+
+ override fun onComplete(success: Boolean, detail: String?) = post { it.onComplete(success, detail ?: "") }
+ },
+ )
+
+ fun setListener(listener: FaceclawFirmwareFlasherListener?) {
+ lock.withLock { this.listener = listener }
+ }
+
+ fun start() {
+ lock.withLock {
+ if (started) return
+ started = true
+ }
+ runOnThread("faceclaw-g1-flash") { flow.run() }
+ }
+
+ fun cancel() = flow.cancel()
+
+ fun close() {
+ cancel()
+ runCatching { link.close() }
+ }
+
+ private fun post(action: (FaceclawFirmwareFlasherListener) -> Unit) = main {
+ lock.withLock { listener }?.let(action)
+ }
+}
diff --git a/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/graphics/IosColorGlyph.kt b/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/graphics/IosColorGlyph.kt
new file mode 100644
index 00000000..9a036b9a
--- /dev/null
+++ b/native/kotlin/shared/src/iosMain/kotlin/com/faceclaw/app/graphics/IosColorGlyph.kt
@@ -0,0 +1,28 @@
+@file:OptIn(kotlinx.cinterop.ExperimentalForeignApi::class)
+
+package com.faceclaw.app
+
+import platform.Foundation.NSData
+
+/** ColorGlyphArt for FaceclawFontRenderer.m, which draws color glyphs with CoreGraphics. */
+object IosColorGlyph {
+ /**
+ * The shade (one byte per pixel) of a color glyph drawn as premultiplied RGBA bytes, as a
+ * kCGImageAlphaPremultipliedLast context lays them out. Empty data for a malformed buffer
+ * rather than an exception, which would terminate the app on its way into Objective-C.
+ */
+ fun shade(rgba: NSData): NSData {
+ val bytes = rgba.byteArray()
+ if (bytes.isEmpty() || bytes.size % 4 != 0) return NSData()
+ val argb = IntArray(bytes.size / 4) { i ->
+ val a = bytes[i * 4 + 3].toInt() and 0xff
+ fun channel(offset: Int): Int {
+ if (a == 0) return 0
+ val premultiplied = bytes[i * 4 + offset].toInt() and 0xff
+ return ((premultiplied * 255 + a / 2) / a).coerceAtMost(255)
+ }
+ (a shl 24) or (channel(0) shl 16) or (channel(1) shl 8) or channel(2)
+ }
+ return ColorGlyphArt.shade(argb).data()
+ }
+}
diff --git a/scripts/apple-watch-embed.cjs b/scripts/apple-watch-embed.cjs
index 2c2dc392..a8796c43 100644
--- a/scripts/apple-watch-embed.cjs
+++ b/scripts/apple-watch-embed.cjs
@@ -26,10 +26,14 @@ function embedEnabled() {
/** Xcode's own builds of the watch project read this too, so they sign the same way. */
function writeLocalConfig() {
const version = /FACECLAW_VERSION = "(.*)"/.exec(fs.readFileSync(path.join(root, 'app/version.ts'), 'utf8'))[1];
+ const build = execFileSync('/usr/libexec/PlistBuddy', [
+ '-c', 'Print :CFBundleVersion', path.join(root, 'App_Resources/iOS/Info.plist'),
+ ], { encoding: 'utf8' }).trim();
const lines = [
`FACECLAW_IOS_BUNDLE_ID = ${process.env.IOS_BUNDLE_ID || 'com.faceclaw.app'}`,
// An embedded watch app has to carry the phone app's version.
`MARKETING_VERSION = ${version}`,
+ `CURRENT_PROJECT_VERSION = ${build}`,
];
if (process.env.IOS_TEAM_ID) lines.push(`DEVELOPMENT_TEAM = ${process.env.IOS_TEAM_ID}`);
fs.writeFileSync(path.join(root, 'apple-watch/Local.xcconfig'), `${lines.join('\n')}\n`);
diff --git a/scripts/config-transfer.md b/scripts/config-transfer.md
index 1c105633..dde3045c 100644
--- a/scripts/config-transfer.md
+++ b/scripts/config-transfer.md
@@ -102,6 +102,12 @@ Use `--device` / `-d` or set `IOS_DEVICE` when more than one device is connected
Without either, the script selects the only device with an active Xcode tunnel.
For the simulator, add `--simulator` (defaults to `booted`; `--device` selects one).
+`scripts/resetOnboardingIos.sh` is the iOS counterpart of `scripts/resetOnboarding.sh`.
+It pulls the config, then pushes every `onboarding.*` key that is set back to its empty
+value, which the app reads the same as a missing key. Pushes can't remove keys, and the
+plist can't be edited directly (see below). Its `--all` uninstalls the app, since iOS has
+no equivalent of `pm clear`.
+
Transfers use `devicectl` app-container access. The app consumes a uniquely
identified request at bootstrap, before loading settings getters and workers;
it applies imports through NSUserDefaults rather than overwriting a plist that
diff --git a/scripts/ios_config.py b/scripts/ios_config.py
index a9f8020c..62f79d5b 100644
--- a/scripts/ios_config.py
+++ b/scripts/ios_config.py
@@ -18,6 +18,7 @@ BUNDLE = os.environ.get('IOS_BUNDLE_ID') or 'com.faceclaw.app'
REMOTE = 'Library/FaceclawConfigPort'
# The app reads requests of up to 8 MiB: a 2 MiB document embedded as an escaped JSON string.
REQUEST_LIMIT = 8 * 1024 * 1024
+ONBOARDING_PREFIX = 'onboarding.'
def run(args, tolerate=False):
@@ -46,96 +47,160 @@ def atomic_write(path, data):
temporary.unlink(missing_ok=True)
+def resolve_device(args, work):
+ device = args.device or os.environ.get('IOS_DEVICE')
+ if args.simulator:
+ return device or 'booted'
+ if device:
+ return device
+ listing = work / 'devices.json'
+ run(['devicectl', 'list', 'devices', '--json-output', str(listing)])
+ devices = json.loads(listing.read_text())['result']['devices']
+ available = [d for d in devices if d.get('connectionProperties', {}).get('tunnelState') == 'connected']
+ if len(available) != 1:
+ raise ValueError('Specify the iPhone with --device UDID (or IOS_DEVICE)')
+ return available[0]['identifier']
+
+
+def exchange(args, work, device, operation, document=None):
+ """Restart the app with one request for it to consume at launch; returns its successful reply."""
+ if args.simulator:
+ container = Path(run(['simctl', 'get_app_container', device, BUNDLE, 'data']).stdout.strip())
+ identifier = str(uuid.uuid4())
+ payload = {'id': identifier, 'operation': operation}
+ if document is not None:
+ payload['document'] = document
+ encoded = json.dumps(payload, ensure_ascii=False, allow_nan=False).encode()
+ if len(encoded) > REQUEST_LIMIT:
+ raise ValueError('Config request exceeds 8 MiB')
+ stage = work / 'FaceclawConfigPort'
+ stage.mkdir(mode=0o700, exist_ok=True)
+ atomic_write(stage / 'request.json', encoded)
+ if args.simulator:
+ remote = container / REMOTE
+ remote.mkdir(parents=True, exist_ok=True)
+ atomic_write(remote / 'request.json', encoded)
+ run(['simctl', 'terminate', device, BUNDLE], tolerate=True)
+ run(['simctl', 'launch', device, BUNDLE])
+ else:
+ run(['devicectl', 'device', 'copy', 'to', '--device', device, '--domain-type', 'appDataContainer',
+ '--domain-identifier', BUNDLE, '--source', str(stage), '--destination', REMOTE])
+ run(['devicectl', 'device', 'process', 'launch', '--device', device, '--terminate-existing', BUNDLE])
+ deadline = time.monotonic() + 25
+ response = None
+ while time.monotonic() < deadline:
+ if args.simulator:
+ response_path = remote / 'response.json'
+ else:
+ response_path = work / 'response.json'
+ run(['devicectl', 'device', 'copy', 'from', '--device', device, '--domain-type', 'appDataContainer',
+ '--domain-identifier', BUNDLE, '--source', REMOTE + '/response.json', '--destination', str(response_path)], tolerate=True)
+ try:
+ candidate = json.loads(response_path.read_text())
+ if candidate.get('id') == identifier:
+ response = candidate
+ break
+ except (OSError, ValueError):
+ pass
+ time.sleep(0.5)
+ if response is None:
+ raise RuntimeError('No matching config response. Unlock the phone and install a build with config-port support, then retry.')
+ if not response.get('ok'):
+ message = response.get('message', 'Config transfer failed')
+ if message == 'Invalid config request':
+ message += ' (does the installed build predate JSON config documents?)'
+ raise RuntimeError(message)
+ return response
+
+
+def pull_document(args, work, device):
+ response = exchange(args, work, device, 'pull')
+ if not isinstance(response.get('document'), str):
+ raise RuntimeError('The installed build predates JSON config documents; update it and retry.')
+ return response
+
+
def transfer(args):
# Parse and validate before touching the device or restarting its app.
document = read_document(args.file) if args.operation == 'push' else None
with tempfile.TemporaryDirectory(prefix='faceclaw-config-') as work:
work = Path(work)
- device = args.device or os.environ.get('IOS_DEVICE')
- if args.simulator:
- device = device or 'booted'
- container = Path(run(['simctl', 'get_app_container', device, BUNDLE, 'data']).stdout.strip())
- else:
- if not device:
- listing = work / 'devices.json'
- run(['devicectl', 'list', 'devices', '--json-output', str(listing)])
- devices = json.loads(listing.read_text())['result']['devices']
- available = [d for d in devices if d.get('connectionProperties', {}).get('tunnelState') == 'connected']
- if len(available) != 1:
- raise ValueError('Specify the iPhone with --device UDID (or IOS_DEVICE)')
- device = available[0]['identifier']
- identifier = str(uuid.uuid4())
- payload = {'id': identifier, 'operation': args.operation}
- if document is not None:
- payload['document'] = document
- encoded = json.dumps(payload, ensure_ascii=False, allow_nan=False).encode()
- if len(encoded) > REQUEST_LIMIT:
- raise ValueError('Config request exceeds 8 MiB')
- stage = work / 'FaceclawConfigPort'
- stage.mkdir(mode=0o700)
- atomic_write(stage / 'request.json', encoded)
- if args.simulator:
- remote = container / REMOTE
- remote.mkdir(parents=True, exist_ok=True)
- atomic_write(remote / 'request.json', encoded)
- run(['simctl', 'terminate', device, BUNDLE], tolerate=True)
- run(['simctl', 'launch', device, BUNDLE])
- else:
- run(['devicectl', 'device', 'copy', 'to', '--device', device, '--domain-type', 'appDataContainer',
- '--domain-identifier', BUNDLE, '--source', str(stage), '--destination', REMOTE])
- run(['devicectl', 'device', 'process', 'launch', '--device', device, '--terminate-existing', BUNDLE])
- deadline = time.monotonic() + 25
- response = None
- while time.monotonic() < deadline:
- if args.simulator:
- response_path = remote / 'response.json'
- else:
- response_path = work / 'response.json'
- run(['devicectl', 'device', 'copy', 'from', '--device', device, '--domain-type', 'appDataContainer',
- '--domain-identifier', BUNDLE, '--source', REMOTE + '/response.json', '--destination', str(response_path)], tolerate=True)
- try:
- candidate = json.loads(response_path.read_text())
- if candidate.get('id') == identifier:
- response = candidate
- break
- except (OSError, ValueError):
- pass
- time.sleep(0.5)
- if response is None:
- raise RuntimeError('No matching config response. Unlock the phone and install a build with config-port support, then retry.')
- if not response.get('ok'):
- message = response.get('message', 'Config transfer failed')
- if message == 'Invalid config request':
- message += ' (does the installed build predate JSON config documents?)'
- raise RuntimeError(message)
+ device = resolve_device(args, work)
if args.operation == 'pull':
- if not isinstance(response.get('document'), str):
- raise RuntimeError('The installed build predates JSON config documents; update it and retry.')
+ response = pull_document(args, work, device)
atomic_write(args.file, response['document'].encode())
print(f'Pulled {response.get("count", "?")} settings to {args.file} (mode 600). App restarted.')
else:
+ response = exchange(args, work, device, 'push', document)
skipped = response.get('skipped') or []
note = f' Left out {len(skipped)} {response.get("sourcePlatform") or "other-platform"}-only settings.' if skipped else ''
print(f'Pushed {response["count"]} settings; app restarted.{note} Unspecified settings preserved; '
f'previous preferences backed up in {REMOTE}/previous.plist.')
+def onboarding_reset_document(pulled):
+ """A document clearing the onboarding keys set in a pulled config, or None if none are.
+
+ Pushes merge, so a key can be overwritten but not removed. Every onboarding key reads the
+ value written here the same as a missing key: false for flags, "" for the finished version.
+ """
+ cleared = {}
+ for key, value in json.loads(pulled).get('platformSettings', {}).items():
+ if not key.startswith(ONBOARDING_PREFIX):
+ continue
+ blank = False if isinstance(value, bool) else 0 if isinstance(value, (int, float)) else ''
+ if value != blank:
+ cleared[key] = blank
+ if not cleared:
+ return None
+ return json.dumps({'schema': 2, 'platform': 'ios', 'settings': {}, 'platformSettings': cleared})
+
+
+def reset_onboarding(args):
+ with tempfile.TemporaryDirectory(prefix='faceclaw-config-') as work:
+ work = Path(work)
+ device = resolve_device(args, work)
+ if args.all:
+ print(f'Uninstalling {BUNDLE}, which removes ALL of its data...')
+ if args.simulator:
+ run(['simctl', 'uninstall', device, BUNDLE])
+ else:
+ run(['devicectl', 'device', 'uninstall', 'app', '--device', device, BUNDLE])
+ print('Done. Reinstall (npm run run:ios) to start from a clean onboarding.')
+ return
+ print(f'Clearing onboarding preference keys ({ONBOARDING_PREFIX}*) for {BUNDLE}...')
+ document = onboarding_reset_document(pull_document(args, work, device)['document'])
+ if document is None:
+ print('No onboarding keys were set. App is already in pre-onboarding state.')
+ return
+ keys = json.loads(document)['platformSettings']
+ exchange(args, work, device, 'push', document)
+ for key in keys:
+ print(f' cleared {key}')
+ print(f'Done. Faceclaw has restarted into onboarding; previous preferences backed up in {REMOTE}/previous.plist.')
+
+
def main():
os.umask(0o077)
- parser = argparse.ArgumentParser(description='Pull/push iOS Faceclaw config; restarts the app. Requires Xcode and an unlocked development device. Push merges supplied keys; accepts Faceclaw JSON from either platform, or legacy Android XML.')
- parser.add_argument('operation', choices=['pull', 'push'])
+ parser = argparse.ArgumentParser(description='Pull/push iOS Faceclaw config, or reset its onboarding state; restarts the app. Requires Xcode and an unlocked development device. Push merges supplied keys; accepts Faceclaw JSON from either platform, or legacy Android XML.')
+ parser.add_argument('operation', choices=['pull', 'push', 'reset-onboarding'])
parser.add_argument('path', nargs='?')
parser.add_argument('-f', '--file')
parser.add_argument('-d', '--device', help='iPhone UDID/name, or simulator ID with --simulator; defaults to IOS_DEVICE or the only connected device')
parser.add_argument('--simulator', action='store_true', help='Use simctl (default device: booted)')
+ parser.add_argument('--all', action='store_true', help='With reset-onboarding: uninstall the app, wiping ALL of its data')
args = parser.parse_args()
+ if args.operation == 'reset-onboarding' and (args.path or args.file):
+ parser.error('reset-onboarding does not take a file')
+ if args.all and args.operation != 'reset-onboarding':
+ parser.error('--all only applies to reset-onboarding')
if args.path and args.file:
parser.error('Specify one file, either positional or with -f')
args.file = args.file or args.path or 'faceclaw_settings.ios.json'
if args.operation == 'pull' and Path(args.file).suffix.lower() == '.xml':
parser.error('Configs are pulled as JSON; choose a .json filename')
try:
- transfer(args)
+ (reset_onboarding if args.operation == 'reset-onboarding' else transfer)(args)
except (OSError, ValueError, RuntimeError, ET.ParseError) as error:
print(f'Error: {error}', file=sys.stderr)
return 1
diff --git a/scripts/resetOnboarding.sh b/scripts/resetOnboarding.sh
index 9daed669..55c0162a 100755
--- a/scripts/resetOnboarding.sh
+++ b/scripts/resetOnboarding.sh
@@ -15,20 +15,21 @@
# scripts/resetOnboarding.sh --all # full `pm clear` (wipes everything)
# scripts/resetOnboarding.sh -s # target a specific adb device
#
-# The device id defaults to $FACECLAW_DEVICE_ID, then to the id used by
-# build_and_run.sh. adb is located the same way build.sh finds its tools.
+# The device id defaults to DEVICE_ID from build_paths.sh, the same device
+# build_and_run.sh targets. adb must be on PATH, or added to it in build_paths.sh.
+
+# Sourced ahead of strict mode, since the build scripts source it without one.
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+if [ -f "$ROOT/build_paths.sh" ]; then
+ source "$ROOT/build_paths.sh"
+fi
set -euo pipefail
PACKAGE="com.faceclaw.app"
PREF_KEY_PREFIX="onboarding."
-DEVICE_ID="${FACECLAW_DEVICE_ID:-3A101JEHN12330}"
WIPE_ALL=0
-# Match build.sh's tool locations so adb is on PATH even from a bare shell.
-export ANDROID_HOME="${ANDROID_HOME:-/Users/jbabcock/Library/Android/sdk}"
-export PATH="$ANDROID_HOME/platform-tools:$PATH"
-
while [ $# -gt 0 ]; do
case "$1" in
--all) WIPE_ALL=1; shift ;;
@@ -44,8 +45,19 @@ done
command -v adb >/dev/null 2>&1 || { echo "error: adb not found on PATH" >&2; exit 1; }
+if [ -z "${DEVICE_ID:-}" ]; then
+ echo "error: no adb device; set DEVICE_ID in build_paths.sh or pass -s ." >&2
+ exit 2
+fi
+
ADB="adb -s $DEVICE_ID"
+# Network devices (host:port) need an explicit connect first. A failure here is
+# reported by the connected-device check below.
+case "$DEVICE_ID" in
+ *:*) adb connect "$DEVICE_ID" >/dev/null 2>&1 || true ;;
+esac
+
# Confirm the device is actually there before doing anything.
if ! $ADB get-state >/dev/null 2>&1; then
echo "error: adb device '$DEVICE_ID' not connected." >&2
diff --git a/scripts/resetOnboardingIos.sh b/scripts/resetOnboardingIos.sh
new file mode 100755
index 00000000..ad0d5a64
--- /dev/null
+++ b/scripts/resetOnboardingIos.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+#
+# resetOnboardingIos.sh — reset Faceclaw on an iPhone back to its pre-onboarding
+# state, for testing the onboarding flow repeatedly. The iOS counterpart of
+# resetOnboarding.sh.
+#
+# By default this only clears the onboarding-related preference keys
+# (onboarding.complete, onboarding.previewOnly, the on-glasses onboarding's
+# onboarding.glassesFinishedVersion, ...) and leaves everything else, notably
+# the saved glasses/ring identities, intact. It restarts Faceclaw twice, and
+# leaves it running in onboarding. Pass --all to uninstall the app instead,
+# which wipes ALL of its data and permissions; you then have to reinstall it.
+#
+# Usage:
+# scripts/resetOnboardingIos.sh # reset onboarding flags only
+# scripts/resetOnboardingIos.sh --all # uninstall (wipes everything)
+# scripts/resetOnboardingIos.sh -d # target a specific iPhone
+# scripts/resetOnboardingIos.sh --simulator # target the booted simulator
+#
+# The device defaults to IOS_DEVICE from build_paths.sh, then to the only iPhone
+# connected. Needs Xcode and an unlocked phone with a development build installed;
+# see config-transfer.md.
+
+# Sourced ahead of strict mode, since the build scripts source it without one.
+ROOT="$(cd "$(dirname "$0")/.." && pwd)"
+if [ -f "$ROOT/build_paths.sh" ]; then
+ source "$ROOT/build_paths.sh"
+fi
+
+set -euo pipefail
+
+# ios_config.py reads these from its environment.
+export IOS_DEVICE IOS_BUNDLE_ID
+
+exec python3 "$ROOT/scripts/ios_config.py" reset-onboarding "$@"
diff --git a/scripts/update_g1_firmware.sh b/scripts/update_g1_firmware.sh
new file mode 100755
index 00000000..d179b3c6
--- /dev/null
+++ b/scripts/update_g1_firmware.sh
@@ -0,0 +1,213 @@
+#!/usr/bin/env bash
+#
+# Build the sibling ScouterKit G1 firmware (g1v0), then update Faceclaw's
+# embedded copy of it (app/g1/firmware/, via tools/g1_firmware_bundle.py).
+#
+# Usage:
+# scripts/update_g1_firmware.sh [--gate] [--skip-build] [--allow-uncommitted] VERSION
+#
+# VERSION is the g1v0 version to build and ship, e.g. 0.5.67. It must be newer
+# than the one Faceclaw ships now: the app only offers an install to arms older
+# than that, and every build gets a fresh (RSA-PSS) signature, so a rebuild
+# under the same version would never reach arms that already run it.
+#
+# --gate also run ScouterKit's emulator gate (scripts/gate.sh
+# VERSION) before bundling. Needs `scripts/setup.sh
+# emulator` to have been run once in g1_firmware/.
+# --skip-build bundle the existing build of VERSION (e.g. one that has
+# already been gated) instead of rebuilding. With the
+# version Faceclaw already ships, this refreshes the
+# manifest's source commit after committing scouter_kit.
+# --allow-uncommitted bundle firmware whose sources in scouter_kit are not
+# committed (tests/g1-firmware.test.cjs then fails).
+#
+# Set SCOUTER_KIT_DIR to use a scouter_kit checkout somewhere other than
+# ~/src/scouter_kit. The build uses ScouterKit's podman containers (its
+# `scripts/setup.sh build`). If g1_firmware/work/macos/env.sh exists (a native
+# macOS build environment with a podman stand-in) it is sourced for the build
+# and the gate; set G1_BUILD_ENV to source a different script instead.
+
+set -euo pipefail
+
+usage() {
+ sed -n '6,7p' "${BASH_SOURCE[0]}" | sed 's/^# //' >&2
+ exit "${1:-2}"
+}
+
+GATE=0
+SKIP_BUILD=0
+ALLOW_UNCOMMITTED=0
+VERSION=
+while [ $# -gt 0 ]; do
+ case "$1" in
+ --gate) GATE=1 ;;
+ --skip-build) SKIP_BUILD=1 ;;
+ --allow-uncommitted) ALLOW_UNCOMMITTED=1 ;;
+ -h|--help) usage 0 ;;
+ -*) echo "error: unknown option $1" >&2; usage ;;
+ *)
+ [ -z "$VERSION" ] || usage
+ VERSION=$1
+ ;;
+ esac
+ shift
+done
+
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
+FACECLAW_DIR="$(cd -- "$SCRIPT_DIR/.." && pwd)"
+SCOUTER_KIT_DIR="${SCOUTER_KIT_DIR:-"$HOME/src/scouter_kit"}"
+FW="$SCOUTER_KIT_DIR/g1_firmware"
+BUNDLER="$FACECLAW_DIR/tools/g1_firmware_bundle.py"
+MANIFEST_TS="$FACECLAW_DIR/app/g1/firmware/g1v0-image.ts"
+BUILD_ENV="${G1_BUILD_ENV:-"$FW/work/macos/env.sh"}"
+
+# The manifest's top-level fields are indented by two spaces; its parts' by six.
+manifest_field() {
+ sed -n "s/^ \"$1\": \"\\(.*\\)\",\$/\\1/p" "$MANIFEST_TS"
+}
+SHIPPED_VERSION="$(manifest_field version)"
+SHIPPED_SHA256="$(manifest_field sha256)"
+
+if [ -z "$VERSION" ]; then
+ echo "error: no VERSION given (Faceclaw ships g1v0 ${SHIPPED_VERSION:-?} now)" >&2
+ usage
+fi
+if ! [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+ echo "error: VERSION must look like 0.5.67, not $VERSION" >&2
+ exit "${1:-2}"
+fi
+if [ ! -x "$FW/scripts/build.sh" ]; then
+ echo "error: ScouterKit build script not found or not executable: $FW/scripts/build.sh" >&2
+ exit 1
+fi
+if ! command -v python3 >/dev/null 2>&1; then
+ echo "error: python3 is required" >&2
+ exit 1
+fi
+if [ -z "$SHIPPED_VERSION" ] || [ -z "$SHIPPED_SHA256" ]; then
+ echo "error: cannot read the shipped version and sha256 from $MANIFEST_TS" >&2
+ exit 1
+fi
+
+# Prints -1, 0 or 1 as $1 is older than, the same as or newer than $2.
+compare_versions() {
+ awk -v a="$1" -v b="$2" 'BEGIN {
+ split(a, x, "."); split(b, y, ".")
+ for (i = 1; i <= 3; i++) {
+ if (x[i] + 0 < y[i] + 0) { print -1; exit }
+ if (x[i] + 0 > y[i] + 0) { print 1; exit }
+ }
+ print 0
+ }'
+}
+case "$(compare_versions "$VERSION" "$SHIPPED_VERSION")" in
+ -1)
+ echo "error: Faceclaw already ships g1v0 $SHIPPED_VERSION, newer than $VERSION" >&2
+ exit 1
+ ;;
+ 0)
+ if [ "$SKIP_BUILD" = 0 ]; then
+ echo "error: Faceclaw already ships g1v0 $VERSION; a rebuild needs a new version, or arms" >&2
+ echo "already on $VERSION would never be offered it. (--skip-build re-bundles the shipped build.)" >&2
+ exit 1
+ fi
+ ;;
+esac
+
+# The same paths tools/g1_firmware_bundle.py checks to mark a source "+uncommitted".
+UNCOMMITTED="$(git -C "$FW" status --porcelain -- firmware ../src/vm)"
+if [ -n "$UNCOMMITTED" ]; then
+ if [ "$ALLOW_UNCOMMITTED" = 0 ]; then
+ echo "error: the firmware sources in $SCOUTER_KIT_DIR have uncommitted changes:" >&2
+ echo "$UNCOMMITTED" >&2
+ echo "Commit them first, or pass --allow-uncommitted (tests/g1-firmware.test.cjs then fails)." >&2
+ exit 1
+ fi
+ echo "warning: bundling firmware built from uncommitted sources" >&2
+fi
+
+# Runs a command in g1_firmware/, in the build environment if there is one.
+in_scouter_kit() {
+ (
+ if [ -f "$BUILD_ENV" ]; then
+ # shellcheck disable=SC1090
+ . "$BUILD_ENV"
+ fi
+ cd "$FW"
+ "$@"
+ )
+}
+
+# Where scripts/build.sh puts its output (G1_WORK and G1_BUILD may come from the build environment).
+BUILD_DIR="$(in_scouter_kit sh -c 'w=${G1_WORK:-$PWD/work}; echo "${G1_BUILD:-$w/build}"')"
+v="$(echo "$VERSION" | tr -d .)"
+IMAGE="$BUILD_DIR/g1v0-v$v/zephyr/app_update.bin"
+
+if [ "$SKIP_BUILD" = 0 ]; then
+ echo "Building g1v0 $VERSION in $FW (four variants; logs in $BUILD_DIR/logs)..."
+ BUILD_OUTPUT="$(in_scouter_kit scripts/build.sh "$VERSION" 2>&1)" || true
+ echo "$BUILD_OUTPUT"
+ # build.sh reports each variant but exits 0 even when one fails, and a failed
+ # build can leave an older image behind, so trust only its "ok" line.
+ if ! grep -qx "g1v0-v$v ok" <<<"$BUILD_OUTPUT"; then
+ LOG="$BUILD_DIR/logs/build-g1v0-v$v.log"
+ echo "error: the g1v0 $VERSION build failed" >&2
+ if [ -f "$LOG" ]; then
+ echo "--- last lines of $LOG:" >&2
+ tail -20 "$LOG" >&2
+ fi
+ exit 1
+ fi
+fi
+
+if [ ! -f "$IMAGE" ]; then
+ echo "error: no build of g1v0 $VERSION at $IMAGE" >&2
+ exit 1
+fi
+IMAGE_VERSION="$(python3 -I - "$IMAGE" <<'PY'
+import struct
+import sys
+
+with open(sys.argv[1], "rb") as f:
+ header = f.read(24)
+if len(header) < 24 or header[:4] != bytes.fromhex("3db8f396"):
+ print("not an MCUboot image")
+else:
+ print("%d.%d.%d" % struct.unpack_from("&2
+ exit 1
+fi
+if [ "$VERSION" = "$SHIPPED_VERSION" ]; then
+ IMAGE_SHA256="$(python3 -I -c 'import hashlib, sys; print(hashlib.sha256(open(sys.argv[1], "rb").read()).hexdigest())' "$IMAGE")"
+ if [ "$IMAGE_SHA256" != "$SHIPPED_SHA256" ]; then
+ echo "error: $IMAGE is not the g1v0 $VERSION build Faceclaw ships (sha256 $IMAGE_SHA256," >&2
+ echo "shipped $SHIPPED_SHA256); a different image needs a new version" >&2
+ exit 1
+ fi
+fi
+
+if [ "$GATE" = 1 ]; then
+ echo "Running the emulator gate for g1v0 $VERSION..."
+ if ! in_scouter_kit scripts/gate.sh "$VERSION"; then
+ echo "error: the emulator gate failed for g1v0 $VERSION. Results are in its work/runs/gate-*/;" >&2
+ echo "rerun failing tests with scripts/gate.sh $VERSION TEST..., then this script with --skip-build." >&2
+ exit 1
+ fi
+fi
+
+python3 -I "$BUNDLER" "$IMAGE" --firmware-dir "$FW"
+
+if [ "$VERSION" = "$SHIPPED_VERSION" ]; then
+ echo "Re-bundled g1v0 $VERSION (same image)."
+else
+ echo "Faceclaw now ships g1v0 $VERSION (was $SHIPPED_VERSION)."
+ echo "If Faceclaw now requires it, also bump REQUIRED_FIRMWARE in native/kotlin/shared/src/commonMain/kotlin/com/faceclaw/app/g1/G1Protocol.kt."
+fi
+if [ "$GATE" = 0 ] && [ "$SKIP_BUILD" = 0 ]; then
+ echo "This build has not been through the emulator gate: before shipping it, run"
+ echo " (cd $FW && scripts/gate.sh $VERSION)"
+ echo "which tests this same build, or rerun this script with --gate."
+fi
diff --git a/tests/ai-chat.test.cjs b/tests/ai-chat.test.cjs
index 635ce280..769a74ed 100644
--- a/tests/ai-chat.test.cjs
+++ b/tests/ai-chat.test.cjs
@@ -258,6 +258,7 @@ function shellEnv({ wakeAction = 'voice-input', skipConfirmation = false } = {})
const layers = load('app/ui/layers.ts', {
'../graphics/image': images, '../graphics/plane': { dimPlanes: (planes) => planes },
'../native/frame-timings': timings, './gestures': gestures,
+ '../graphics/screen-size': { screenWidth: () => 640, screenHeight: () => 480 },
});
class Menu {
constructor(title, items) { this.title = title; this.items = items; this.selectedIndex = 0; }
@@ -282,9 +283,11 @@ function shellEnv({ wakeAction = 'voice-input', skipConfirmation = false } = {})
'../notifications': {}, '../dashboard-settings': settings, './ambient-cards': {},
'./chrome-layer': { ShellChromeLayer: class {} }, './modal-layer': {}, './tool-debug-layer': {},
'./brightness-picker-layer': {}, './notification-modal-queue': load('app/ui/shell/notification-modal-queue.ts', {}),
+ './notification-popup-timeout': {},
'../../native/notification-icons': {}, '../../native/notification-sources': {},
'../../assistant/tool-registry': {}, './geometry': {
sidebarWidth: () => 64, minWindowTop: () => 96, switcherPosition: () => 'left', uiDepth: () => 0,
+ screenWidth: () => 640, screenHeight: () => 480,
appViewportRect: () => ({ x: 64, y: 124, width: 576, height: 260 }),
},
});
diff --git a/tests/ancs-client.test.cjs b/tests/ancs-client.test.cjs
index 392abe78..85bfe633 100644
--- a/tests/ancs-client.test.cjs
+++ b/tests/ancs-client.test.cjs
@@ -32,6 +32,17 @@ test('receives fragmented UTF-8 notifications; pre-existing and modified items d
x.source(8,0,4);x.feed(3,[]);x.details(8);x.feed(3,[]);x.metadata(8);assert.equal(x.changed.at(-1)[1],false)
assert.ok(x.sent.every(p=>p.length<=20))
})
+test('a phone that is not sharing ANCS says so and is asked again, and an unknown status restarts',t=>{
+ const x=setup(t);x.client.stop()
+ const sent=[],c=new AncsClient(async b=>sent.push([...b]),()=>{})
+ t.after(()=>c.stop());c.start(5,20)
+ c.receive(new Uint8Array([65,78,1,0,...le(5),0,0,3,0]))
+ c.receive(new Uint8Array([65,78,1,0,...le(5),1,0,3,3]))
+ assert.equal(c.state,'unavailable');assert.match(c.statusMessage,/Share System Notifications/)
+ const d=new AncsClient(async()=>{},()=>{});t.after(()=>d.stop());d.start(6,20)
+ d.receive(new Uint8Array([65,78,1,0,...le(6),0,0,3,4]))
+ assert.equal(d.state,'unavailable');assert.doesNotMatch(d.statusMessage,/Share System Notifications/)
+})
test('removal during retrieval cannot resurrect notification',t=>{
const x=setup(t);x.source(7);x.source(7,2);x.details(7);x.feed(3,[])
assert.deepEqual(x.client.read(),[])
diff --git a/tests/app-layout.test.cjs b/tests/app-layout.test.cjs
index 533ae0e8..23503aca 100644
--- a/tests/app-layout.test.cjs
+++ b/tests/app-layout.test.cjs
@@ -9,20 +9,21 @@ const js = (source) => ts.transpileModule(source, {
compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 },
}).outputText;
-function geometry() {
+// The shell geometry over a G2's 640x480 screen, or `screen` (a RayNeo iO is 540x220).
+function geometry(screen = { width: 640, height: 480 }) {
const settings = Object.fromEntries(Object.entries({
displayLayoutSetting: 'band-middle', navigateDisplayLayoutSetting: 'global', terminalDisplayLayoutSetting: 'default',
appSwitcherPositionSetting: 'left', uiDepthSetting: '0', statusBarPositionSetting: 'top',
statusBarVisibilitySetting: 'always', windowBorderSetting: true,
}).map(([name, value]) => [name, { value, get() { return this.value; } }]));
const context = { exports: {}, require: (name) => {
- if (name === '../../graphics/image') return { G2_LENS_WIDTH: 640, G2_LENS_HEIGHT: 480 };
+ if (name === '../../graphics/screen-size') return { screenWidth: () => screen.width, screenHeight: () => screen.height };
assert.equal(name, '../dashboard-settings');
return settings;
} };
vm.runInNewContext(js(read('app/ui/shell/geometry.ts')), context);
const rect = (mode, appId) => ({ ...context.exports.appViewportRect(mode, appId) });
- return { ...context.exports, settings, rect };
+ return { ...context.exports, settings, screen, rect };
}
const LAYOUTS = ['band-top', 'band-high', 'band-middle', 'band-low', 'band-bottom', 'tall', 'fullscreen'];
@@ -263,6 +264,78 @@ test('an immersive app fills the panel without chrome rows, frame or depth, in a
}
});
+test('on a RayNeo iO\'s 540x220 screen windows take every row under the bar, beside the strip or over the row', () => {
+ const g = geometry({ width: 540, height: 220 });
+ const panel = { x: 0, y: 0, width: 540, height: 220 };
+ // A band is the whole screen's height, so every band position is the same.
+ for (const layout of LAYOUTS) {
+ g.settings.displayLayoutSetting.value = layout;
+ g.settings.appSwitcherPositionSetting.value = 'left';
+ assert.equal(g.minWindowHeight(), 220);
+ assert.equal(g.minWindowTop(), 0);
+ for (const mode of ['min', 'medium', 'max']) assert.deepEqual(g.rect(mode), { x: 64, y: 28, width: 476, height: 192 }, layout);
+ assert.deepEqual({ ...g.switcherRect('min') }, { x: 0, y: 0, width: 64, height: 220 });
+ g.settings.appSwitcherPositionSetting.value = 'right';
+ assert.deepEqual(g.rect('min'), { x: 0, y: 28, width: 476, height: 192 });
+ assert.deepEqual({ ...g.switcherRect('min') }, { x: 476, y: 0, width: 64, height: 220 });
+ }
+ assert.equal(g.isOnSwitcherEdge(500, 10, 'min'), true);
+ assert.equal(g.screenCenterInViewportX(), 270);
+ // A bottom row: the window centred above it, its sides room for the deepest shift.
+ g.settings.appSwitcherPositionSetting.value = 'bottom';
+ g.settings.displayLayoutSetting.value = 'band-middle';
+ assert.deepEqual(g.rect('min'), { x: 32, y: 28, width: 476, height: 156 });
+ assert.deepEqual({ ...g.switcherRect('min') }, { x: 32, y: 184, width: 476, height: 36 });
+ g.settings.displayLayoutSetting.value = 'fullscreen';
+ assert.deepEqual(g.rect('min'), { x: 0, y: 28, width: 540, height: 156 });
+ // The phone mirror shows the whole screen, at its 27:11.
+ g.settings.displayLayoutSetting.value = 'band-middle';
+ for (const position of ['left', 'bottom', 'popup']) {
+ g.settings.appSwitcherPositionSetting.value = position;
+ assert.deepEqual({ ...g.phonePreviewRect({ ...g.usedScreenRect('min') }) }, panel, position);
+ }
+ // Every layout stays on the screen.
+ g.settings.uiDepthSetting.value = '62';
+ for (const switcher of ['left', 'right', 'bottom', 'popup']) {
+ g.settings.appSwitcherPositionSetting.value = switcher;
+ for (const statusBar of ['top', 'bottom']) {
+ g.settings.statusBarPositionSetting.value = statusBar;
+ for (const layout of LAYOUTS) {
+ g.settings.displayLayoutSetting.value = layout;
+ for (const mode of ['min', 'medium', 'max']) {
+ const rect = g.rect(mode), row = g.switcherRect(mode);
+ const where = `${switcher} ${statusBar} ${layout} ${mode}`;
+ assert.ok(rect.x >= 0 && rect.y >= 0 && rect.x + rect.width <= 540 && rect.y + rect.height <= 220, where);
+ assert.ok(row.y >= 0 && row.y + row.height <= 220, where);
+ if (g.windowFramed()) assert.ok(rect.x - 1 - 31 >= 0 && rect.x + rect.width + 31 < 540, where);
+ }
+ }
+ }
+ }
+ // The G2's band is unchanged.
+ assert.equal(geometry().minWindowHeight(), 288);
+});
+
+test('on a RayNeo iO the chrome paints the screen\'s size, its strip and row within it', () => {
+ for (const position of ['left', 'right', 'bottom', 'popup']) {
+ const g = geometry({ width: 540, height: 220 });
+ g.settings.appSwitcherPositionSetting.value = position;
+ const { chrome, state } = chromeLayer(g, { windows: 3, notifications: 2, phoneBattery: 80 });
+ state.focus = 'sidebar';
+ const image = chrome.paint();
+ assert.deepEqual([image.width, image.height], [540, 220], position);
+ const parts = chrome.paintParts();
+ assert.ok(parts.length > 0, position);
+ for (const part of parts) {
+ assert.ok(part.x >= 0 && part.y >= 0 && part.x + part.image.width <= 540 && part.y + part.image.height <= 220,
+ `${position} part ${part.shellKey} at ${[part.x, part.y, part.image.width, part.image.height]}`);
+ }
+ // And it draws something there.
+ const lit = (x0, y0, w, h) => { for (let y = y0; y < y0 + h; y++) for (let x = x0; x < x0 + w; x++) if (image.pixels[y * 540 + x]) return true; return false; };
+ assert.ok(lit(0, 0, 540, 220), position);
+ }
+});
+
test('the phone mirror zooms to the area the shell uses, centred at the panel\'s 4:3', () => {
const g = geometry();
const preview = (mode, appId) => {
@@ -356,8 +429,9 @@ const shellScene = require('../.test-build/app/graphics/shell-scene.js');
const displayList = require('../.test-build/app/graphics/display-list.js');
const notificationTypes = require('../.test-build/app/native/notification-types.js');
const ICON = notificationTypes.NOTIFICATION_ICON_SIZE;
-function chromeLayer(g, { notifications = 0, phoneBattery = null, windows = 1, trayIcons = [] } = {}) {
- const font = { lineHeight: 12, ascent: 10, measureText: (text) => text.length * 4,
+function chromeLayer(g, { notifications = 0, phoneBattery = null, windows = 1, trayIcons = [], glassesModel = 'G2' } = {}) {
+ const measuredText = [];
+ const font = { lineHeight: 12, ascent: 10, measureText: (text) => { measuredText.push(text); return text.length * 4; },
drawText: (image, x, y, text, value) => { for (let i = 0; i < text.length; i++) image.fillRect(x + i * 4, y + 2, 2, 6, value); } };
let nextKey = 100;
const requested = [];
@@ -378,7 +452,7 @@ function chromeLayer(g, { notifications = 0, phoneBattery = null, windows = 1, t
'../../native/phone-battery': { readPhoneBatteryState: () => ({ battery: phoneBattery, charging: false }) },
'../../util/render-freshness': { renderPassAllowsStaleData: () => false },
'../dashboard-settings': { batteryDisplayModeSetting: { get: () => 'icon' }, phoneBatteryVisibilitySetting: settings,
- batteryIndicatorVisible: () => true },
+ glassesBatteryVisibilitySetting: settings, glassesModelName: () => glassesModel, batteryIndicatorVisible: () => true },
'../clock-format': { formatClockDate: () => 'Thu Oct 2', formatClockTime: () => '9:41' },
'../layers': { LayerStack: { allocateShellKey: () => nextKey++ } },
// As in menu.ts.
@@ -396,11 +470,19 @@ function chromeLayer(g, { notifications = 0, phoneBattery = null, windows = 1, t
};
let heightChanges = 0;
const chrome = new context.exports.ShellChromeLayer(() => state, () => heightChanges++);
- return { chrome, state, requested, planBottomBar: context.exports.planBottomBar, heightChanges: () => heightChanges };
+ return { chrome, state, requested, measuredText, planBottomBar: context.exports.planBottomBar, heightChanges: () => heightChanges };
}
const notification = (key) => ({ kind: 'notification', key });
const keysOf = (items) => Array.from(items, (item) => item.key);
+test('the top bar labels the glasses battery with the paired model', () => {
+ const { chrome, state, measuredText } = chromeLayer(geometry(), { glassesModel: 'G1' });
+ state.battery.headset = 72;
+ chrome.paintParts();
+ assert.ok(measuredText.includes('G1'));
+ assert.ok(!measuredText.includes('G2'));
+});
+
test('a bottom app switcher frames the foreground window\'s content in a rounded border', () => {
const g = geometry();
g.settings.appSwitcherPositionSetting.value = 'bottom';
@@ -911,7 +993,7 @@ test('Terminal resize keeps the view identity, negotiates its grid and skips pos
client: { stop: () => calls.push('stop'), setViewport: (...size) => calls.push(size) },
};
const resize = resizeHandler('app/apps/terminal/terminal-app.worker.ts', {
- windows: new Map([['test', window]]), clearTimeout: (timer) => calls.push(timer),
+ windows: new Map([['test', window]]), pendingHeightChanges: new Map(), clearTimeout: (timer) => calls.push(timer),
TerminalEmulator: class { constructor(cols, rows) { this.cols = cols; this.rows = rows; } },
reconnectView: (view) => { assert.equal(view, window); calls.push('reconnect'); },
scheduleRender: () => calls.push('paint'),
diff --git a/tests/assistant-settings-visibility.test.cjs b/tests/assistant-settings-visibility.test.cjs
index 43e96713..e7a8846c 100644
--- a/tests/assistant-settings-visibility.test.cjs
+++ b/tests/assistant-settings-visibility.test.cjs
@@ -60,7 +60,6 @@ function settingsEnv(initialUrl = '', initialModel = 'openai-compatible') {
deleteAsrModel() {}, startAsrModelDownload() {}, onAsrModelStateChanged: () => () => {},
},
'../../apps/files/text-viewer': { TextViewerLayer: class {} },
- '../../analytics/privacy-disclosure': { IOS_PRIVACY_NOTICE: '' },
'../menu': {
drawRightValueMenuItem() {}, openModalMenu() {},
submenuItem: label => ({ label, onSelect() {} }),
@@ -73,6 +72,7 @@ function settingsEnv(initialUrl = '', initialModel = 'openai-compatible') {
openSettingsSubMenu() {},
},
'../font-picker': { uiFontPickerMenuItem: () => ({ label: 'Font' }) },
+ '../notification-filter': { NotificationFilterLayer: class {} },
'../openai-compatible-model-picker': {
compatibleModelDiscoveryMenuItem: () => ({ label: 'Discover models' }),
},
diff --git a/tests/ble-proximity.test.cjs b/tests/ble-proximity.test.cjs
index c9bf8298..68f51279 100644
--- a/tests/ble-proximity.test.cjs
+++ b/tests/ble-proximity.test.cjs
@@ -12,7 +12,6 @@ const {
MINIMUM_METERS,
MAXIMUM_METERS,
zoneFromMeters,
- zoneLabel,
sortedByProximity,
} = require("../.test-build/app/g2/ble-proximity.js");
@@ -59,7 +58,6 @@ test("zones and their boundaries", () => {
assert.equal(zoneFromMeters(3), "far");
assert.equal(zoneFromMeters(9.9), "far");
assert.equal(zoneFromMeters(10), "distant");
- assert.equal(zoneLabel("immediate"), "In your hand");
});
test("weak signals carry lower confidence", () => {
diff --git a/tests/brightness-curve.test.cjs b/tests/brightness-curve.test.cjs
index 0d4c2aa9..3427275a 100644
--- a/tests/brightness-curve.test.cjs
+++ b/tests/brightness-curve.test.cjs
@@ -1,6 +1,6 @@
const { test } = require('node:test');
const assert = require('node:assert/strict');
-const { normalizeBrightnessCurve, brightnessCurveError, DEFAULT_BRIGHTNESS_CURVE } = require('../.test-build/app/g2/brightness-curve.js');
+const { normalizeBrightnessCurve, brightnessCurveError, DEFAULT_BRIGHTNESS_CURVE, G1_BRIGHTNESS_CURVE, RAYNEO_IO_BRIGHTNESS_CURVE } = require('../.test-build/app/g2/brightness-curve.js');
test('brightness curve accepts monotone knots and canonicalizes spacing', () => {
assert.equal(normalizeBrightnessCurve(' 0:0, 2.5:20,1000:100 '), '0:0,2.5:20,1000:100');
});
@@ -43,6 +43,21 @@ test('the screen fade speed scales the 280 ms on/off fade, or makes it instant',
const fadeAt = (speed) => { api.screenFadeSetting.set(speed); return api.getBrightnessPreferences().fadeMs; };
assert.deepEqual(['very-fast', 'fast', 'normal', 'slow', 'disabled'].map(fadeAt), [56, 140, 280, 560, 0]);
});
+test('an unset curve follows the paired glasses; a chosen one stays', () => {
+ const store = new Map();
+ const api = settingsFixture(store);
+ assert.equal(api.getBrightnessPreferences().curve, DEFAULT_BRIGHTNESS_CURVE);
+ store.set('deviceType', 'rayneo-io');
+ assert.equal(api.getBrightnessPreferences().curve, RAYNEO_IO_BRIGHTNESS_CURVE);
+ assert.equal(brightnessCurveError(RAYNEO_IO_BRIGHTNESS_CURVE), null);
+ store.set('deviceType', 'g1');
+ assert.equal(api.getBrightnessPreferences().curve, G1_BRIGHTNESS_CURVE);
+ assert.equal(brightnessCurveError(G1_BRIGHTNESS_CURVE), null);
+ api.autoBrightnessCurveSetting.set('0:0,2:50,8:100');
+ assert.equal(api.getBrightnessPreferences().curve, '0:0,2:50,8:100');
+ store.set('deviceType', 'g2');
+ assert.equal(api.getBrightnessPreferences().curve, '0:0,2:50,8:100');
+});
test('curve drafts preview exactly while brightness keeps the previous valid saved curve', () => {
const store = new Map([['display.autoBrightnessCurve', '0:0,2:50,8:100']]);
let api = settingsFixture(store), curve = api.autoBrightnessCurveSetting;
diff --git a/tests/brightness-picker.test.cjs b/tests/brightness-picker.test.cjs
index bc212b57..1052869b 100644
--- a/tests/brightness-picker.test.cjs
+++ b/tests/brightness-picker.test.cjs
@@ -25,9 +25,10 @@ const fonts = { getDefaultSmallFont: () => font };
const layers = load('app/ui/layers.ts', {
'../graphics/image': graphics, '../graphics/plane': plane, './gestures': gestures,
'../native/frame-timings': { spanCurrent: (_name, paint) => paint() },
+ '../graphics/screen-size': { screenWidth: () => 640, screenHeight: () => 480 },
});
const menu = load('app/ui/menu.ts', {
- './menu-animation-pref': require('../.test-build/app/ui/menu-animation-pref.js'), './animation-speed': require('../.test-build/app/ui/animation-speed.js'), '../native/settings-store': { getStringSetting: (_key, fallback) => fallback },
+ './menu-animation-pref': require('../.test-build/app/ui/menu-animation-pref.js'), './animation-speed': require('../.test-build/app/ui/animation-speed.js'), '../native/settings-store': { getStringSetting: (_key, fallback) => fallback }, '../graphics/screen-size': { screenWidth: () => 640, screenHeight: () => 480 },
'./menu-highlight-motion': require('../.test-build/app/ui/menu-highlight-motion.js'), '../graphics/menu-scroll-list': require('../.test-build/app/graphics/menu-scroll-list.js'), './menu-scroll-motion': require('../.test-build/app/ui/menu-scroll-motion.js'), '../graphics/draw-expression': require('../.test-build/app/graphics/draw-expression.js'),
'../graphics/image': graphics, '../graphics/ui-fonts': fonts, '../graphics/textwrap': textwrap,
'../util/numeric-util': numeric, './gestures': gestures, './metrics': load('app/ui/metrics.ts'),
@@ -108,6 +109,22 @@ test('the thin bar fills upward in proportion to brightness in each viewport', (
}
});
+test('in a short window (a RayNeo iO\'s) the bar shrinks so the dialog stays inside it', () => {
+ for (const viewport of [{ x: 64, y: 28, width: 476, height: 192 }, { x: 32, y: 1, width: 476, height: 155 }]) {
+ const f = fixture('100', viewport);
+ const image = f.stack.paint().at(-1).image;
+ // The dialog's border (110) and the full bar (255), all within the window.
+ let top = Infinity, bottom = -1, fill = 0;
+ for (let y = 0; y < image.height; y++) for (let x = 0; x < image.width; x++) {
+ const value = image.getPixel(x, y);
+ if (value === 110) { top = Math.min(top, y); bottom = Math.max(bottom, y); }
+ if (value === 255) fill++;
+ }
+ assert.ok(top >= viewport.y && bottom < viewport.y + viewport.height, `dialog ${top}..${bottom} in ${JSON.stringify(viewport)}`);
+ assert.ok(fill > 0 && fill < 12 * 100, 'a shorter bar, still drawn');
+ }
+});
+
test('system menu hides brightness in Auto and opens its picker between Voice input and Debug', async () => {
const f = fixture('auto');
const { shell } = load('app/ui/shell/shell.ts', {
diff --git a/tests/compass-readout.test.cjs b/tests/compass-readout.test.cjs
index 7a801134..fd772a58 100644
--- a/tests/compass-readout.test.cjs
+++ b/tests/compass-readout.test.cjs
@@ -23,7 +23,7 @@ const font = (size) => BdfFont.parse(fs.readFileSync(path.join(__dirname, `../ap
const small = font(18), large = font(32);
const diagnostics = { magneticAccuracy: 3, magneticAnomalies: 2, orientationSource: 3, flags: 0x8c, sampleTimeMs: 1234 };
-function compass(width = 576, height = 260) {
+function compass(width = 576, height = 260, glasses = 'g2') {
let listener, window;
class RecordingImage extends graphics.GrayImage {
texts = [];
@@ -55,6 +55,7 @@ function compass(width = 576, height = 260) {
},
'../../ui/shell/shell': { shell: { isWindowVisible: () => true } },
'../../native/location-permissions': { hasLocationPermission: () => false },
+ '../../ui/dashboard-settings': { glassesHaveCompass: () => glasses === 'g2' },
'./calibration': calibration,
'./calibration-layer': {}, './declination': { onDeclinationChanged: () => () => {} },
'./heading': { getNorthReference: () => 'magnetic', resolveHeading: (v) => ({ displayDegrees: v }) },
@@ -63,6 +64,7 @@ function compass(width = 576, height = 260) {
app.createCompassAppWindow({ onClosed() {} });
return { menu: () => window.menuItems(),
paint: () => window.baseLayer.paint(ctx),
+ tap: () => window.baseLayer.handleInput({ type: 'click' }, ctx),
heading: (info) => listener({ command: 15, headingDegrees: 359, diagnostics: info }) };
}
@@ -110,3 +112,13 @@ test('calibration readout fits the viewport without overlapping the heading or s
}
}
});
+
+test('glasses without a magnetometer say so and offer no calibration', () => {
+ const app = compass(576, 260, 'g1');
+ const image = app.paint();
+ assert.ok(image.texts.some((t) => t.text === 'These glasses have no compass sensor'));
+ assert.equal(calibrationText(image), undefined);
+ assert.equal(app.menu().length, 0);
+ // ctx.stack has no push or topMatches here, so opening calibration would throw.
+ app.tap();
+});
diff --git a/tests/compass-texture-cache.test.cjs b/tests/compass-texture-cache.test.cjs
index 740a313e..702daebe 100644
--- a/tests/compass-texture-cache.test.cjs
+++ b/tests/compass-texture-cache.test.cjs
@@ -44,6 +44,7 @@ const compass = load('app/apps/compass/compass-app.ts', {
'../../ui/shell/in-process-window': {},
'../../ui/shell/shell': {},
'../../native/location-permissions': {},
+ '../../ui/dashboard-settings': { glassesHaveCompass: () => true },
'./calibration': calibration,
'./calibration-layer': {},
'./compass-rose': rose,
diff --git a/tests/config-transfer-scripts.test.cjs b/tests/config-transfer-scripts.test.cjs
index 311b8671..31f46532 100644
--- a/tests/config-transfer-scripts.test.cjs
+++ b/tests/config-transfer-scripts.test.cjs
@@ -41,6 +41,13 @@ with tempfile.TemporaryDirectory() as d:
try: m.read_document(p)
except (ValueError, m.ET.ParseError): pass
else: raise AssertionError(f'accepted invalid config {invalid!r}')
+pulled = {'schema': 2, 'platform': 'ios', 'settings': {'onboarding.lookalike': True, 'display.timeFormat': '24h'}, 'platformSettings': {
+ 'onboarding.complete': True, 'onboarding.previewOnly': False, 'onboarding.glassesFinishedVersion': '0.8.6', 'onboarding.step': 3, 'deviceAddress.left': 'AA'}}
+reset = json.loads(ios.onboarding_reset_document(json.dumps(pulled)))
+assert reset == {'schema': 2, 'platform': 'ios', 'settings': {}, 'platformSettings': {
+ 'onboarding.complete': False, 'onboarding.glassesFinishedVersion': '', 'onboarding.step': 0}}, reset
+assert m.check_document(json.dumps(reset)) == (2, 'ios', 3)
+assert ios.onboarding_reset_document(json.dumps({**pulled, 'platformSettings': {'onboarding.complete': False, 'onboarding.glassesFinishedVersion': '', 'deviceAddress.left': 'AA'}})) is None
`], { stdio: 'inherit' });
});
diff --git a/tests/display-layout-setting.test.cjs b/tests/display-layout-setting.test.cjs
index 55e44f71..d9027ddf 100644
--- a/tests/display-layout-setting.test.cjs
+++ b/tests/display-layout-setting.test.cjs
@@ -35,6 +35,14 @@ test('the display mode starts as the middle band, or carries over the old mode a
assert.equal(api.displayLayoutSetting.get(), 'band-bottom');
});
+test('the glasses model name follows the paired glasses type', () => {
+ const model = (entries) => settingsFixture(new Map(entries)).glassesModelName();
+ assert.equal(model([]), 'G2');
+ assert.equal(model([['deviceType', 'g2']]), 'G2');
+ assert.equal(model([['deviceType', 'g1']]), 'G1');
+ assert.equal(model([['deviceType', 'rayneo-io']]), 'iO');
+});
+
test('per-app display modes carry over their old mode and position where the merged values can say it', () => {
const app = (appId, entries) => settingsFixture(new Map(entries))[`${appId}DisplayLayoutSetting`].get();
assert.equal(app('navigate', []), 'global');
@@ -64,3 +72,48 @@ test('Full Screen is offered only with a bottom or popup app switcher', () => {
assert.deepEqual(Array.from(api.DISPLAY_LAYOUT_VALUES, (value) => api.displayLayoutLabel(value)),
['Band · Top', 'Band · High', 'Band · Middle', 'Band · Low', 'Band · Bottom', 'Tall', 'Full Screen']);
});
+
+test('a RayNeo iO defaults the app switcher to the left, and keeps a chosen position and the band', () => {
+ const store = new Map();
+ const api = settingsFixture(store);
+ assert.equal(api.appSwitcherPositionSetting.get(), 'bottom');
+ api.glassesTypeSetting.set('rayneo-io');
+ assert.equal(api.appSwitcherPositionSetting.get(), 'left');
+ assert.equal(api.displayLayoutSetting.get(), 'band-middle');
+ assert.equal(store.has('display.appSwitcherPosition'), false);
+ // A stored position is the user's, on either glasses.
+ api.appSwitcherPositionSetting.set('right');
+ assert.equal(api.appSwitcherPositionSetting.get(), 'right');
+ api.glassesTypeSetting.set('g2');
+ assert.equal(api.appSwitcherPositionSetting.get(), 'right');
+ store.delete('display.appSwitcherPosition');
+ assert.equal(api.appSwitcherPositionSetting.get(), 'bottom');
+ // An unknown stored value falls back to the glasses' default.
+ store.set('display.appSwitcherPosition', 'sideways');
+ api.glassesTypeSetting.set('rayneo-io');
+ assert.equal(api.appSwitcherPositionSetting.get(), 'left');
+});
+
+test('a RayNeo iO always takes the R1 directly, leaving the G2\'s ring connection setting alone', () => {
+ const store = new Map();
+ const api = settingsFixture(store);
+ assert.equal(api.effectiveRingConnectionMode(), 'glasses');
+ api.ringConnectionModeSetting.set('health');
+ assert.equal(api.effectiveRingConnectionMode(), 'health');
+ api.glassesTypeSetting.set('rayneo-io');
+ assert.equal(api.effectiveRingConnectionMode(), 'direct');
+ assert.equal(api.ringConnectionModeSetting.get(), 'health');
+ api.glassesTypeSetting.set('g2');
+ assert.equal(api.effectiveRingConnectionMode(), 'health');
+});
+
+test('only a G2 has a compass', () => {
+ const api = settingsFixture();
+ assert.equal(api.glassesHaveCompass(), true);
+ api.glassesTypeSetting.set('g1');
+ assert.equal(api.glassesHaveCompass(), false);
+ api.glassesTypeSetting.set('rayneo-io');
+ assert.equal(api.glassesHaveCompass(), false);
+ api.glassesTypeSetting.set('g2');
+ assert.equal(api.glassesHaveCompass(), true);
+});
diff --git a/tests/even-advertisement.test.cjs b/tests/even-advertisement.test.cjs
index 37372daf..99a9befa 100644
--- a/tests/even-advertisement.test.cjs
+++ b/tests/even-advertisement.test.cjs
@@ -162,3 +162,116 @@ test("a bare R1 substring is not a ring — only the stock EVEN R1 prefix is", (
const ad = classifyAdvertisement(raw({ address: "DA:7F:D2:B5:6E:E2", name: "EVEN R1_B56EE2", manufacturerData: "" }));
assert.equal(ad.role, "ring");
});
+
+// RayNeo iO-2229 as captured 2026-11-01: company 0x5716 + [07][MAC]; pairing mode omits the data.
+test("RayNeo iO advertisements classify as one device with its MAC", () => {
+ const io = classifyAdvertisement(raw({
+ address: "00:6A:5E:5F:33:C2",
+ name: "RayNeo iO-2229",
+ manufacturerData: "1657" + "07006a5e5f33c2130000000000000001",
+ }));
+ assert.equal(io.role, "rayneo-io");
+ assert.equal(io.embeddedMac, "00:6A:5E:5F:33:C2");
+ assert.equal(io.embeddedMacMismatch, false);
+ assert.equal(io.serial, null);
+ const pairing = classifyAdvertisement(raw({ address: "00:6A:5E:5F:33:C2", name: "RayNeo iO-2229", manufacturerData: "" }));
+ assert.equal(pairing.role, "rayneo-io");
+ assert.equal(pairing.embeddedMac, null);
+ // G2 advertisements are untouched
+ assert.equal(classifyAdvertisement(raw({})).role, "left");
+});
+
+// ---------------------------------------------------------------------------
+// Even G1
+// ---------------------------------------------------------------------------
+
+const g1Ascii = (text) => Array.from(text).map((c) => c.charCodeAt(0).toString(16).padStart(2, "0")).join("");
+const g1Raw = (name, manufacturerData, address = "F4:27:E9:CA:E8:3F") => ({
+ address,
+ name,
+ manufacturerData,
+ rssi: -50,
+ txPower: null,
+ connectable: true,
+ bonded: false,
+ source: "scan",
+ seenAtMs: 1000,
+});
+
+test("a G1 arm on Even's firmware: side from the name, serial after the side byte", () => {
+ const ad = classifyAdvertisement(g1Raw("Even G1_70_L_EF50E5", "02" + g1Ascii("S110LABC030139") + "0000000000"));
+ assert.equal(ad.role, "left");
+ assert.equal(ad.g1Firmware, "stock");
+ assert.equal(ad.serial, "S110LABC030139");
+ assert.equal(ad.embeddedMac, null);
+});
+
+test("a G1 arm on g1v0: the name says all, the serial is in the 0xFFFF record", () => {
+ const ad = classifyAdvertisement(g1Raw("G1v0_R", "ffff" + "01" + "04" + g1Ascii("S110LABC030139")));
+ assert.equal(ad.role, "right");
+ assert.equal(ad.g1Firmware, "g1v0");
+ assert.equal(ad.serial, "S110LABC030139");
+ assert.equal(classifyAdvertisement(g1Raw("G1v0S_L", "")).g1Firmware, "g1v0-safe");
+ assert.equal(classifyAdvertisement(g1Raw("G1v0S_L", "")).serial, null);
+});
+
+const g1Record = (flags, version, serial = "S110LABC030139") => "ffff" + "02" + flags + version + g1Ascii(serial);
+
+test("a G1 arm on g1v0 0.5.66+: its name tells pairs apart, its record says what it runs", () => {
+ const ad = classifyAdvertisement(g1Raw("G1CFW_L_EF50E5", g1Record("05", "000542")));
+ assert.equal(ad.role, "left");
+ assert.equal(ad.g1Firmware, "g1v0");
+ assert.equal(ad.g1Version, "0.5.66");
+ assert.equal(ad.serial, "S110LABC030139");
+ assert.equal(classifyAdvertisement(g1Raw("G1CFW_R_CBE689", g1Record("04", "000542"))).role, "right");
+});
+
+test("a G1 arm in safe mode says so in its record, not its name", () => {
+ const ad = classifyAdvertisement(g1Raw("G1CFW_L_EF50E5", g1Record("0d", "000542")));
+ assert.equal(ad.g1Firmware, "g1v0-safe");
+ assert.equal(ad.g1Version, "0.5.66");
+});
+
+test("a G1 arm whose record hasn't arrived yet still shows, without a version or serial", () => {
+ const ad = classifyAdvertisement(g1Raw("G1CFW_L_EF50E5", ""));
+ assert.equal(ad.g1Firmware, "g1v0");
+ assert.equal(ad.g1Version, undefined);
+ assert.equal(ad.serial, null);
+});
+
+test("g1v0 before 0.5.66 and Even's firmware advertise no version", () => {
+ assert.equal(classifyAdvertisement(g1Raw("G1v0_R", "ffff" + "01" + "04" + g1Ascii("S110LABC030139"))).g1Version, undefined);
+ assert.equal(classifyAdvertisement(g1Raw("Even G1_70_L_EF50E5", "02" + g1Ascii("S110LABC030139"))).g1Version, undefined);
+});
+
+test("a G1 pair joins on its serial across firmware, so an install in progress stays one pair", () => {
+ const stock = classifyAdvertisement(g1Raw("Even G1_70_L_EF50E5", "02" + g1Ascii("S110LABC030139") + "0000000000"));
+ const custom = classifyAdvertisement(g1Raw("G1CFW_R_CBE689", g1Record("04", "000542")));
+ assert.equal(stock.serial, custom.serial);
+});
+
+test("on iOS a G1 arm gets an address from its peripheral identifier, and is found at all", () => {
+ const { identifyIosPeripheral, g1IosAddress } = require("../.test-build/app/g2/ios-peripheral-identity.js");
+ const identifier = "14b99254-0798-d1a8-3eec-b141bdabfae8";
+ assert.equal(g1IosAddress(identifier), "14:B9:92:54:07:98");
+ for (const [name, manufacturerData, firmware] of [
+ ["G1CFW_L_EF50E5", g1Record("05", "000542"), "g1v0"],
+ ["Even G1_70_L_EF50E5", "02" + g1Ascii("S110LABC030139"), "stock"],
+ ["G1v0_L", "ffff" + "01" + "05" + g1Ascii("S110LABC030139"), "g1v0"],
+ ]) {
+ const device = identifyIosPeripheral({ identifier, name, manufacturerData, rssi: -50, connectable: true });
+ assert.ok(device, name);
+ assert.equal(device.address, "14:B9:92:54:07:98", name);
+ assert.equal(device.identifier, identifier.toUpperCase(), name);
+ assert.equal(device.role, "left", name);
+ assert.equal(device.g1Firmware, firmware, name);
+ assert.equal(device.serial, "S110LABC030139", name);
+ }
+ assert.equal(identifyIosPeripheral({ identifier: "not-a-uuid", name: "G1CFW_L_EF50E5", manufacturerData: "", rssi: 0, connectable: true }), null);
+});
+
+test("names that only look like a G1 are not admitted", () => {
+ for (const name of ["G1v0_X", "G1v0", "G1 Tracker", "Even G1", "Pixel G1v0_L", "G1CFW_L", "G1CFW_X_EF50E5", "G1CFW_L_EF50E", "Pixel G1CFW_L_EF50E5"]) {
+ assert.equal(classifyAdvertisement(g1Raw(name, "")), null, name);
+ }
+});
diff --git a/tests/evenhub-containers.test.cjs b/tests/evenhub-containers.test.cjs
index 7527df66..98ffa986 100644
--- a/tests/evenhub-containers.test.cjs
+++ b/tests/evenhub-containers.test.cjs
@@ -130,9 +130,9 @@ test("a layout font is the default for text and list containers, which override
page.containers.map((c) => [c.name, c.font]),
[
["l", { family: "Inter", size: 24, weight: 700 }],
- ["i", undefined],
["t", { family: "Inter", size: 24 }],
["u", { family: "Terminus", size: 24 }],
+ ["i", undefined],
],
);
});
diff --git a/tests/evenhub-image-pipeline.test.cjs b/tests/evenhub-image-pipeline.test.cjs
new file mode 100644
index 00000000..b0fca69f
--- /dev/null
+++ b/tests/evenhub-image-pipeline.test.cjs
@@ -0,0 +1,126 @@
+// updateImageRawData conversion (app/apps/evenhub/image-pipeline.ts), checked
+// against what the Even phone app's decompiled _prepare / _prepareLegacyRaw do.
+const test = require("node:test");
+const assert = require("node:assert/strict");
+const UPNG = require("upng-js");
+
+const {
+ IMAGE_EXCEPTION,
+ IMAGE_SEND_FAILED,
+ IMAGE_SIZE_INVALID,
+ IMAGE_SUCCESS,
+ detectImageFormat,
+ grayLevel,
+ prepareImageUpdate,
+ resizeRgbaCover,
+} = require("../.test-build/app/apps/evenhub/image-pipeline.js");
+
+const noNative = () => null;
+const request = (over) => ({
+ imageData: [],
+ compressMode: 2,
+ requestWidth: 0,
+ requestHeight: 0,
+ geometry: { width: 20, height: 20 },
+ decodeNative: noNative,
+ stockLimits: true,
+ ...over,
+});
+
+/** A PNG of the given RGBA pixels. */
+function png(width, height, rgba) {
+ return Array.from(new Uint8Array(UPNG.encode([Uint8Array.from(rgba).buffer], width, height, 0)));
+}
+
+test("imageData must be an array of integers", () => {
+ assert.equal(prepareImageUpdate(request({ imageData: "AAAA" })).result, IMAGE_SEND_FAILED);
+ assert.equal(prepareImageUpdate(request({ imageData: { 0: 1, 1: 2 } })).result, IMAGE_SEND_FAILED);
+ assert.equal(prepareImageUpdate(request({ imageData: [1, 2.5] })).result, IMAGE_SEND_FAILED);
+});
+
+test("formats are recognized by their magic bytes", () => {
+ assert.equal(detectImageFormat(Uint8Array.from(png(1, 1, [0, 0, 0, 255]))), "png");
+ assert.equal(detectImageFormat(Uint8Array.from([0xff, 0xd8, 0xff, 0xe0])), "jpeg");
+ assert.equal(detectImageFormat(Uint8Array.from([0x52, 0x49, 0x46, 0x46, 0, 0, 0, 0, 0x57, 0x45, 0x42, 0x50])), "webp");
+ assert.equal(detectImageFormat(Uint8Array.from([0x47, 0x49, 0x46, 0x38, 0x39, 0x61])), "gif");
+ assert.equal(detectImageFormat(Uint8Array.from([0x42, 0x4d, 0, 0])), "bmp");
+ assert.equal(detectImageFormat(Uint8Array.from([1, 2, 3])), "raw");
+});
+
+test("grey uses 299/587/114 weights rounded to 16 levels, ignoring alpha", () => {
+ assert.equal(grayLevel(255, 0, 0), 4);
+ assert.equal(grayLevel(255, 255, 255), 15);
+ assert.equal(grayLevel(0, 0, 0), 0);
+ // A transparent white pixel is white: the phone app never looks at alpha.
+ const result = prepareImageUpdate(request({ imageData: png(20, 20, new Array(20 * 20).fill([255, 255, 255, 0]).flat()) }));
+ assert.equal(result.result, IMAGE_SUCCESS);
+ assert.ok(result.levels.every((level) => level === 15));
+});
+
+test("an encoded image is scaled to cover the container and centre-cropped", () => {
+ // 4x2: columns 0..3 lit 0, 85, 170, 255. Covering 20x20 scales by 10 to
+ // 40x20 and crops 10px a side, so only columns 1 and 2 survive.
+ const row = [0, 85, 170, 255].flatMap((v) => [v, v, v, 255]);
+ const result = prepareImageUpdate(request({ imageData: png(4, 2, [...row, ...row]) }));
+ assert.equal(result.result, IMAGE_SUCCESS);
+ assert.deepEqual([result.width, result.height], [20, 20]);
+ assert.deepEqual(Array.from(result.levels.slice(0, 20)), [...new Array(10).fill(grayLevel(85, 85, 85)), ...new Array(10).fill(grayLevel(170, 170, 170))]);
+});
+
+test("the cover resize samples source pixel centres", () => {
+ const source = { width: 3, height: 1, rgba: Uint8Array.from([10, 0, 0, 0, 20, 0, 0, 0, 30, 0, 0, 0]) };
+ const wide = resizeRgbaCover(source, 6, 2);
+ assert.deepEqual(Array.from(wide.rgba.filter((_, i) => i % 4 === 0)), [10, 10, 20, 20, 30, 30, 10, 10, 20, 20, 30, 30]);
+});
+
+test("width and height sent with the update replace the container's", () => {
+ const black = new Array(30 * 30).fill([0, 0, 0, 255]).flat();
+ const result = prepareImageUpdate(request({ imageData: png(30, 30, black), requestWidth: 40, requestHeight: 25 }));
+ assert.deepEqual([result.width, result.height], [40, 25]);
+});
+
+test("without a usable container size, the decoded size must itself be in range", () => {
+ const tiny = new Array(10 * 10).fill([0, 0, 0, 255]).flat();
+ assert.equal(prepareImageUpdate(request({ imageData: png(10, 10, tiny), geometry: null })).result, IMAGE_SIZE_INVALID);
+});
+
+test("JPEG, WebP and GIF go to the native decoder; a failed decode is an exception", () => {
+ const jpeg = [0xff, 0xd8, 0xff, 0xe0];
+ const decoded = prepareImageUpdate(request({
+ imageData: jpeg,
+ decodeNative: () => ({ width: 20, height: 20, rgba: new Uint8Array(20 * 20 * 4).fill(255) }),
+ }));
+ assert.equal(decoded.result, IMAGE_SUCCESS);
+ assert.equal(decoded.format, "jpeg");
+ assert.equal(prepareImageUpdate(request({ imageData: jpeg })).result, IMAGE_EXCEPTION);
+});
+
+test("raw pixels need compressMode 2 and exactly the container's size", () => {
+ const raw = new Array(400).fill(0);
+ assert.equal(prepareImageUpdate(request({ imageData: raw })).result, IMAGE_SUCCESS);
+ assert.equal(prepareImageUpdate(request({ imageData: raw, compressMode: 0 })).result, IMAGE_EXCEPTION);
+ assert.equal(prepareImageUpdate(request({ imageData: raw.slice(1) })).result, IMAGE_EXCEPTION);
+ assert.equal(prepareImageUpdate(request({ imageData: raw, geometry: { width: 400, height: 1 } })).result, IMAGE_SIZE_INVALID);
+});
+
+test("raw bytes up to 15 are already 4-bit levels; larger ones are 8-bit grey", () => {
+ const raw = new Array(400).fill(0);
+ raw.splice(0, 4, 15, 16, 128, 255);
+ const { levels } = prepareImageUpdate(request({ imageData: raw }));
+ assert.deepEqual(Array.from(levels.slice(0, 4)), [15, 1, 8, 15]);
+});
+
+test("4-bit raw rows are padded to whole bytes", () => {
+ // 21 wide: 11 bytes a row, high nibble first, the last low nibble unused.
+ const rows = [];
+ for (let y = 0; y < 20; y++) rows.push(0xf0, ...new Array(9).fill(0), 0x0f << 4);
+ const { result, levels } = prepareImageUpdate(request({ imageData: rows, geometry: { width: 21, height: 20 } }));
+ assert.equal(result, IMAGE_SUCCESS);
+ assert.deepEqual([levels[0], levels[1], levels[20], levels[21]], [15, 0, 15, 15]);
+});
+
+test("extended layouts skip the stock size and compressMode rules", () => {
+ const big = new Array(400 * 200).fill(0);
+ const result = prepareImageUpdate(request({ imageData: big, compressMode: 0, geometry: { width: 400, height: 200 }, stockLimits: false }));
+ assert.equal(result.result, IMAGE_SUCCESS);
+});
diff --git a/tests/evenhub-layout-debug.test.cjs b/tests/evenhub-layout-debug.test.cjs
new file mode 100644
index 00000000..17257d6f
--- /dev/null
+++ b/tests/evenhub-layout-debug.test.cjs
@@ -0,0 +1,63 @@
+// The EvenHub layout debug log (app/apps/evenhub/layout-debug.ts): page notes
+// and the per-update lines it writes to logcat.
+const test = require("node:test");
+const assert = require("node:assert/strict");
+
+const { parsePage } = require("../.test-build/app/apps/evenhub/containers.js");
+const { describeImageUpdate, describePage, pageNotes } = require("../.test-build/app/apps/evenhub/layout-debug.js");
+
+const iconOverBody = (extra = {}) =>
+ parsePage({
+ containerTotalNum: 2,
+ textObject: [{ containerID: 1, containerName: "body", xPosition: 0, yPosition: 0, width: 576, height: 288, isEventCapture: 1, ...extra.text }],
+ imageObject: [{ containerID: 2, containerName: "icon", xPosition: 8, yPosition: 8, width: 24, height: 24, ...extra.image }],
+ });
+
+test("describePage lists containers bottom to top and ends with the raw payload", () => {
+ const lines = describePage("rebuildPageContainer", iconOverBody(), { containerTotalNum: 2 });
+ assert.match(lines[0], /^rebuildPageContainer: 2 containers \(0 list, 1 text, 1 image\), containerTotalNum=2/);
+ assert.match(lines[1], /^ {2}0: text#1 "body" @0,0 576x288 capture len=0 ""$/);
+ assert.match(lines[2], /^ {2}1: image#2 "icon" @8,8 24x24 no pixels yet$/);
+ assert.equal(lines.at(-1), ' raw: {"containerTotalNum":2}');
+});
+
+test("a shared container id is noted with the container it resolves to", () => {
+ assert.ok(pageNotes(iconOverBody({ image: { containerID: 1 } })).includes(
+ 'id 1 is shared by text#1 "body", image#1 "icon"; updates and events resolve to text#1 "body" only',
+ ));
+});
+
+test("capture-container problems and a wrong containerTotalNum are noted", () => {
+ assert.ok(pageNotes(iconOverBody({ text: { isEventCapture: 0 } })).some((n) => n.startsWith("no event-capture container")));
+ assert.ok(pageNotes(iconOverBody(), 3).some((n) => n.startsWith("containerTotalNum is 3 but 2")));
+ assert.deepEqual(pageNotes(iconOverBody(), 2), []);
+});
+
+const prepared = (over = {}) => ({ result: 0, levels: null, width: 0, height: 0, format: "raw", reason: "", ...over });
+
+test("an update lists payload, size, lit pixels and outcome", () => {
+ const page = iconOverBody();
+ const levels = new Uint8Array(24 * 24);
+ levels[24 * 3 + 5] = 9;
+ levels[24 * 10 + 7] = 15;
+ const [line] = describeImageUpdate({
+ sentId: 2, sentName: "icon", raw: Array.from(levels), target: page.containers[1],
+ prepared: prepared({ levels, width: 24, height: 24 }), shown: true, result: 0,
+ });
+ assert.equal(line, 'updateImageRawData id=2 "icon" -> image#2 "icon" payload=number[576] format=raw 24x24 lit=2px max=15/15 bbox=5,3-7,10 result=0 shown');
+});
+
+test("an update says why it wasn't shown", () => {
+ const page = iconOverBody({ image: { containerID: 1 } });
+ const toText = describeImageUpdate({
+ sentId: 1, sentName: "", raw: [], target: page.containers[0],
+ prepared: prepared({ levels: new Uint8Array(1), width: 1, height: 1 }), shown: false, result: 4,
+ });
+ assert.ok(toText.some((line) => line.includes('resolves to text#1 "body", so the glasses refuse')));
+ const failed = describeImageUpdate({
+ sentId: 2, sentName: "", raw: "AAAA", target: undefined,
+ prepared: prepared({ result: 4, format: null, reason: "imageData is not an array of integers" }), shown: false, result: 4,
+ });
+ assert.match(failed[0], /payload=string\(4 chars\) result=4 not shown$/);
+ assert.equal(failed[1], " imageData is not an array of integers");
+});
diff --git a/tests/evenhub-payload-validation.test.cjs b/tests/evenhub-payload-validation.test.cjs
new file mode 100644
index 00000000..05a25686
--- /dev/null
+++ b/tests/evenhub-payload-validation.test.cjs
@@ -0,0 +1,61 @@
+// The Even phone app's checks before it sends a page or text upgrade to the
+// glasses (app/apps/evenhub/payload-validation.ts).
+const test = require("node:test");
+const assert = require("node:assert/strict");
+
+const { stockPayloadError } = require("../.test-build/app/apps/evenhub/payload-validation.js");
+
+// What SDK 0.0.16 sends for a small page (captured with a stub bridge).
+const sdkPage = () => ({
+ containerTotalNum: 2,
+ textObject: [{ containerID: 1, containerName: "t", xPosition: 0, yPosition: 0, width: 200, height: 100, content: "hi", isEventCapture: 1, borderWidth: 2 }],
+ imageObject: [{ containerID: 2, containerName: "i", xPosition: 0, yPosition: 0, width: 40, height: 40 }],
+ listObject: [{ containerID: 3, containerName: "l", itemContainer: { itemCount: 2, itemName: ["a", "b"], isItemSelectBorderEn: 1 } }],
+ menuObject: { menuItems: [{ itemName: "Pause", itemID: 1 }] },
+});
+
+test("SDK-shaped payloads pass", () => {
+ assert.equal(stockPayloadError("create", sdkPage()), null);
+ assert.equal(stockPayloadError("rebuild", sdkPage()), null);
+ assert.equal(stockPayloadError("textUpgrade", { containerID: 1, containerName: "t", contentOffset: 2, contentLength: 3, content: "abc" }), null);
+});
+
+test("unknown keys fail, numeric tag keys pass", () => {
+ const page = sdkPage();
+ page.textObject[0].Container_ID = 1;
+ assert.match(stockPayloadError("create", page), /unknown key textObject\[0\]\.Container_ID/);
+ assert.match(stockPayloadError("rebuild", { ...sdkPage(), widgetId: 1 }), /unknown key widgetId/);
+ assert.equal(stockPayloadError("create", { ...sdkPage(), 7: 1 }), null);
+});
+
+test("numeric fields take integers or numeric strings only", () => {
+ const withField = (value) => {
+ const page = sdkPage();
+ page.textObject[0].xPosition = value;
+ return stockPayloadError("create", page);
+ };
+ assert.equal(withField(-10), null, "negative values wrap rather than fail");
+ assert.equal(withField("12"), null);
+ assert.match(withField(10.5), /must be an integer/);
+ assert.match(withField(true), /must be an integer/);
+ assert.match(withField(null), /is null/);
+ assert.match(withField("left"), /must be an integer/);
+});
+
+test("string and repeated fields are type-checked", () => {
+ const page = sdkPage();
+ page.textObject[0].content = 5;
+ assert.match(stockPayloadError("create", page), /content must be a string/);
+ const list = sdkPage();
+ list.listObject[0].itemContainer.itemName = "a";
+ assert.match(stockPayloadError("create", list), /itemName must be an array/);
+});
+
+test("textColor must be an integer 0..4 wherever it appears", () => {
+ const page = sdkPage();
+ page.textObject[0].textColor = 4;
+ assert.equal(stockPayloadError("create", page), null);
+ page.textObject[0].textColor = 15;
+ assert.match(stockPayloadError("create", page), /textColor must be an integer from 0 to 4/);
+ assert.match(stockPayloadError("textUpgrade", { containerID: 1, content: "x", textColor: "3" }), /textColor/);
+});
diff --git a/tests/evenhub-rayneo.test.cjs b/tests/evenhub-rayneo.test.cjs
new file mode 100644
index 00000000..f0995ae4
--- /dev/null
+++ b/tests/evenhub-rayneo.test.cjs
@@ -0,0 +1,299 @@
+// EvenHub with a RayNeo iO paired: the store shows only a notice (and loads
+// nothing), and each sideloaded app warns once that it won't display
+// correctly. The real layers run with their dependencies mocked; what they
+// paint is collected as text.
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const { loader } = require('./helpers/load-typescript.cjs');
+
+const gestures = loader({}, {})('app/ui/gestures.ts');
+const font = { lineHeight: 10, measureText: (text) => text.length * 6 };
+
+/** Records drawn text; every other drawing call is a no-op. */
+const makeImageClass = (drawn) => class {
+ drawText(_font, _x, _y, text) { drawn.push(text); }
+ fillRect() {}
+ fillRoundedRect() {}
+ drawRoundedRect() {}
+};
+
+const settle = () => new Promise((resolve) => setImmediate(resolve));
+
+// ---- the store -----------------------------------------------------------
+
+const emptyPage = { apps: [], total: 0, page: 1, pageSize: 20 };
+
+class FakeMenu {
+ constructor(options) { this.options = options; this.items = options.items; this.selectedIndex = 0; }
+ setItems(items) { this.items = items; }
+ get selectedItem() { return this.items[this.selectedIndex] ?? null; }
+ handleInput() {}
+ paint(image, box) { this.items.forEach((item, index) => this.options.draw({ image, item, index, x: box.x, y: box.y, width: box.width })); }
+ drawScrollbar() {}
+}
+
+const loadStore = () => {
+ const drawn = [];
+ const glasses = { available: false };
+ const calls = { listApps: 0, yields: 0 };
+ const setting = { get: () => '', set() {} };
+ const load = loader({}, {
+ '../../graphics/ui-fonts': { getDefaultSmallFont: () => font },
+ '../../graphics/image': { GrayImage: makeImageClass(drawn) },
+ '../../graphics/textwrap': { truncateText: (_f, text) => text, wrapText: (_f, text) => [text] },
+ '../../ui/gestures': { ...gestures, GESTURE_CLICK: 'click' },
+ '../../ui/menu': { drawSelectionHighlight() {} },
+ '../../ui/menu-core': { Menu: FakeMenu },
+ '../../ui/shell/shell': { shell: { yieldFocusToSidebar() { calls.yields++; } } },
+ '../../ui/metrics': { lineStep: () => 12 },
+ '../../ui/dashboard-settings': {
+ ConfigSettingString: class { constructor(options) { this.value = options.defaultValue ?? ''; }
+ get() { return this.value; } set(next) { this.value = next; return next; } },
+ },
+ './even-api': {
+ evenHubApi: {
+ listApps: async () => { calls.listApps++; return emptyPage; },
+ listNewApps: async () => emptyPage,
+ searchApps: async () => emptyPage,
+ },
+ EvenHubAuthenticationError: class extends Error {},
+ isEvenHubStoreConfigured: () => true,
+ },
+ './credentials': {
+ evenHubLoginEmailSetting: setting, evenHubLoginPasswordSetting: setting, evenHubRememberMeSetting: setting,
+ clearEvenHubLoginForm() {}, resetEvenHubLoginForm() {}, clearEvenHubSession() {}, clearTransientEvenHubSession() {},
+ },
+ './installed-apps': { getInstalledEvenHubApps: () => [], uninstallEvenHubPackage: () => true },
+ './store-detail-layer': { EvenHubStoreDetailLayer: class {} },
+ './store-install': { cleanError: (error) => String(error), installStoreApp: async () => ({}) },
+ './updates': { checkForEvenHubUpdates: async () => [], describeUpdate: () => ({}) },
+ './glasses-compat': { isEvenHubStoreAvailable: () => glasses.available },
+ });
+ const { EvenHubStoreLayer } = load('app/apps/evenhub/store-layer.ts');
+ const layer = new EvenHubStoreLayer({ launchApp: async () => {}, appendLog: () => {} });
+ const stackCalls = { push: 0, clearToBase: 0 };
+ const ctx = {
+ stack: {
+ getBaseSize: () => ({ width: 476, height: 180 }),
+ isFocused: () => true,
+ clearToBase() { stackCalls.clearToBase++; },
+ push() { stackCalls.push++; },
+ pop() {},
+ },
+ actions: { requestRender() {}, endTextSettingEdit() {}, startTextSettingsEdit() {} },
+ };
+ const repaint = () => {
+ drawn.length = 0;
+ layer.paint(ctx);
+ return [...drawn];
+ };
+ return { layer, ctx, glasses, calls, stackCalls, repaint };
+};
+
+const NOTICE = 'Using the Even Realities app store requires Even Realities glasses.';
+
+test('with a RayNeo iO the store shows the notice and loads nothing', async () => {
+ const { layer, ctx, calls, repaint } = loadStore();
+ const painted = repaint();
+ assert.ok(painted.includes(NOTICE), JSON.stringify(painted));
+ assert.ok(!painted.includes('Top'), 'no tabs');
+ await settle();
+ assert.equal(calls.listApps, 0, 'no request to the store');
+ assert.equal(layer.buildMenuItems().length, 0, 'no store actions in the window menu');
+
+ await layer.handleInput({ type: 'click', source: 'ring' }, ctx);
+ await layer.handleInput({ type: 'scroll-down' }, ctx);
+ layer.receiveTextInput('chess', ctx);
+ await settle();
+ assert.equal(calls.listApps, 0, 'input and dictation do nothing');
+ assert.ok(repaint().includes(NOTICE));
+
+ await layer.handleInput({ type: 'double-click', source: 'ring' }, ctx);
+ await layer.handleInput({ type: 'swipe-left', source: 'watch', timestampMs: 0 }, ctx);
+ assert.equal(calls.yields, 2, 'double-click and a back swipe leave the window');
+});
+
+test('an installed app\'s store page opens to the notice, naming the app', () => {
+ const { layer, ctx, stackCalls, repaint } = loadStore();
+ layer.showInstalledPackage(ctx.stack, { packageId: 'com.example.alpha', name: 'Alpha', version: '1' });
+ assert.equal(stackCalls.push, 0, 'no store page is opened');
+ assert.equal(stackCalls.clearToBase, 1, 'pages above the notice are closed');
+ const painted = repaint();
+ assert.ok(painted.includes("Alpha's package is missing."), JSON.stringify(painted));
+ assert.ok(painted.includes(NOTICE));
+});
+
+test('the store comes back once Even Realities glasses are paired', async () => {
+ const { glasses, calls, repaint } = loadStore();
+ repaint();
+ glasses.available = true;
+ repaint();
+ await settle();
+ assert.equal(calls.listApps, 1, 'the Top tab loads on the first paint it gets');
+ const painted = repaint();
+ assert.ok(!painted.includes(NOTICE));
+ assert.ok(painted.includes('Public apps by popularity'), JSON.stringify(painted));
+});
+
+// ---- the display warning ---------------------------------------------------
+
+const loadWarning = () => {
+ const drawn = [];
+ const load = loader({}, {
+ '../../graphics/ui-fonts': { getDefaultSmallFont: () => font },
+ '../../graphics/image': { GrayImage: makeImageClass(drawn) },
+ '../../graphics/textwrap': { wrapText: (_f, text) => [text] },
+ '../../ui/gestures': gestures,
+ '../../ui/layers': {},
+ '../../ui/menu': { drawListScrollbar() {}, drawSelectionHighlight() {} },
+ '../../ui/metrics': { lineStep: () => 12, listRowHeight: () => 20 },
+ });
+ const { EvenHubDisplayWarningLayer } = load('app/apps/evenhub/display-warning-dialog.ts');
+ const ImageClass = makeImageClass(drawn);
+ const outcome = { answered: 0, closed: 0, popped: 0 };
+ const dialog = new EvenHubDisplayWarningLayer(
+ 'Demo',
+ () => { outcome.answered++; },
+ () => { outcome.closed++; },
+ );
+ // The real stack calls onRemoved as it pops.
+ const ctx = {
+ stack: {
+ getBaseSize: () => ({ width: 476, height: 180 }),
+ isFocused: () => true,
+ pop() { outcome.popped++; dialog.onRemoved(); },
+ },
+ };
+ const paint = () => {
+ drawn.length = 0;
+ dialog.paint(ctx, () => new ImageClass());
+ return [...drawn];
+ };
+ return { dialog, ctx, paint, outcome };
+};
+
+test('the display warning names the app and the reason', () => {
+ const { paint } = loadWarning();
+ const painted = paint();
+ assert.ok(painted.includes('Compatibility warning'));
+ const message = painted.find((text) => text.includes('Demo'));
+ assert.ok(message, JSON.stringify(painted));
+ assert.match(message, /will not display correctly on the RayNeo iO/);
+ assert.match(message, /different resolution/);
+ assert.ok(painted.includes('Continue') && painted.includes('Close app'));
+});
+
+test('Continue dismisses the warning and leaves the app running', () => {
+ const { dialog, ctx, paint, outcome } = loadWarning();
+ paint();
+ dialog.handleInput({ type: 'click', source: 'ring' }, ctx);
+ assert.deepEqual(outcome, { answered: 1, closed: 0, popped: 1 });
+});
+
+test('Close app dismisses the warning and closes the app', () => {
+ const { dialog, ctx, paint, outcome } = loadWarning();
+ paint();
+ dialog.handleInput({ type: 'scroll-down' }, ctx);
+ dialog.handleInput({ type: 'click', source: 'ring' }, ctx);
+ assert.deepEqual(outcome, { answered: 1, closed: 1, popped: 1 });
+});
+
+test('double-click dismisses the warning; closing the window under it does not count', () => {
+ const backedOut = loadWarning();
+ backedOut.paint();
+ backedOut.dialog.handleInput({ type: 'double-click', source: 'ring' }, backedOut.ctx);
+ assert.deepEqual(backedOut.outcome, { answered: 1, closed: 0, popped: 1 });
+
+ const abandoned = loadWarning();
+ abandoned.paint();
+ abandoned.dialog.onRemoved();
+ assert.deepEqual(abandoned.outcome, { answered: 0, closed: 0, popped: 0 }, 'shown again next launch');
+});
+
+// ---- which launches warn -------------------------------------------------
+
+const loadCompat = (glassesType) => {
+ const store = new Map();
+ const glasses = { type: glassesType };
+ const compat = loader({}, {
+ '../../ui/dashboard-settings': { glassesTypeSetting: { get: () => glasses.type } },
+ '../../native/settings-store': {
+ getStringSetting: (key, fallback) => (store.has(key) ? store.get(key) : fallback),
+ setStringSetting: (key, value) => { store.set(key, value); },
+ },
+ })('app/apps/evenhub/glasses-compat.ts');
+ return { compat, glasses };
+};
+
+test('each app warns once with a RayNeo iO paired, and never with Even glasses', () => {
+ const { compat, glasses } = loadCompat('rayneo-io');
+ assert.equal(compat.isEvenHubStoreAvailable(), false);
+ assert.equal(compat.needsDisplayWarning('com.example.a'), true);
+ compat.markDisplayWarningShown('com.example.a');
+ compat.markDisplayWarningShown('com.example.a');
+ assert.equal(compat.needsDisplayWarning('com.example.a'), false, 'answered once');
+ assert.equal(compat.needsDisplayWarning('com.example.b'), true, 'another app still warns');
+
+ glasses.type = 'g2';
+ assert.equal(compat.isEvenHubStoreAvailable(), true);
+ assert.equal(compat.needsDisplayWarning('com.example.b'), false);
+ glasses.type = 'g1';
+ assert.equal(compat.isEvenHubStoreAvailable(), true);
+ assert.equal(compat.needsDisplayWarning('com.example.b'), false);
+});
+
+// ---- the app window ------------------------------------------------------
+
+const loadWindow = (needsWarning) => {
+ const pushed = [];
+ const closed = [];
+ const marked = [];
+ class FakeWarning { constructor(appName, onAnswered, closeApp) { Object.assign(this, { appName, onAnswered, closeApp }); } }
+ const load = loader({}, {
+ '../../graphics/image': { GrayImage: class {} },
+ './compositor': { EVENHUB_SCREEN_WIDTH: 576 },
+ '../../ui/gestures': gestures,
+ '../../ui/layers': {},
+ '../../ui/shell/in-process-window': {
+ createInProcessWindow: () => ({
+ stack: { push: (layer) => pushed.push(layer) },
+ window: { handleInput: async () => {} },
+ requestRender() {},
+ setHeightMode() {},
+ }),
+ },
+ '../../ui/shell/shell': { shell: { closeWindow: (id) => closed.push(id), foregroundWindow: () => null } },
+ '../../ui/shell/chrome-layer': { makeImageWindowIcon: () => () => {}, windowIcon: () => () => {} },
+ './session': { EvenHubSession: class {} },
+ './installed-apps': { renderInstalledEvenHubIcon: () => null },
+ './glasses-compat': {
+ needsDisplayWarning: () => needsWarning,
+ markDisplayWarningShown: (id) => marked.push(id),
+ },
+ './display-warning-dialog': { EvenHubDisplayWarningLayer: FakeWarning },
+ });
+ const { createEvenHubWindow } = load('app/apps/evenhub/evenhub-window.ts');
+ const session = {
+ manifest: { packageId: 'com.example.demo', name: 'Demo' },
+ attachWindow() {},
+ };
+ const options = { actions: {}, submitFrame() {}, setSurfaceVisible() {}, removeSurface() {}, onClosed() {} };
+ createEvenHubWindow('evenhub:app:7', 'evenhub', session, options, () => {}, () => {});
+ return { pushed, closed, marked, FakeWarning };
+};
+
+test('an EvenHub window opens under the warning when the app needs one', () => {
+ const { pushed, closed, marked, FakeWarning } = loadWindow(true);
+ assert.equal(pushed.length, 1);
+ const warning = pushed[0];
+ assert.ok(warning instanceof FakeWarning);
+ assert.equal(warning.appName, 'Demo');
+ warning.onAnswered();
+ assert.deepEqual(marked, ['com.example.demo']);
+ warning.closeApp();
+ assert.deepEqual(closed, ['evenhub:app:7']);
+});
+
+test('an EvenHub window opens straight to the app otherwise', () => {
+ assert.equal(loadWindow(false).pushed.length, 0);
+});
diff --git a/tests/evenhub-session-stock.test.cjs b/tests/evenhub-session-stock.test.cjs
new file mode 100644
index 00000000..39e1191b
--- /dev/null
+++ b/tests/evenhub-session-stock.test.cjs
@@ -0,0 +1,161 @@
+// EvenHubSession behaviors that follow stock (the Even phone app plus
+// firmware 2.2.9.22, as decompiled and run in the firmware emulator): text
+// scrolling and its boundary events, text upgrades, image routing, and what a
+// page the firmware can't build does.
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const vm = require('node:vm');
+const { loader } = require('./helpers/load-typescript.cjs');
+
+// A face with 10px characters and 27px lines, wrapping only at '\n'.
+const face = {
+ lineHeight: 27,
+ measureLine: text => text.length * 10,
+ wrap: text => text.split('\n'),
+ drawText() {},
+ drawTextWrapped() {},
+};
+
+function harness() {
+ const timers = [];
+ const load = loader({ global: { isIOS: true }, setTimeout: fn => { timers.push(fn); return timers.length; }, clearTimeout() {}, Promise }, {
+ '@nativescript/core': { ApplicationSettings: { getString: (_k, d) => d, setString() {} } },
+ 'upng-js': require('upng-js'),
+ '../../graphics/evenhub-font': { EvenHubFont: { get: () => face } },
+ './fonts': { containerFace: () => face, availableFontFamilies: () => [], measureContainerText: () => ({ width: 0, lineHeight: 27 }) },
+ '../../ui/dashboard-settings': {}, '../../ui/sound-effects': {}, './api-key-dialog': {},
+ './mic-router': { evenHubMicRouter: {} }, './imu-router': { evenHubImuRouter: {} },
+ './compass-router': { evenHubCompassRouter: {} }, '../../assistant/tool-registry': {},
+ '../../native/location': {}, '../../native/location-tracker': {}, '../../native/location-permissions': {},
+ '../../native/image-rgba': { decodeImageRgba: () => null },
+ });
+ const api = load('app/apps/evenhub/session.ts');
+ const session = new api.EvenHubSession({ name: 'Probe', packageId: 'test.stock', permissions: [] }, '/test/dist', () => {}, '');
+ let windowClosed = false;
+ session.attachWindow({ requestRender() {}, windowId: 'probe', closeWindow: () => { windowClosed = true; } });
+ const web = vm.createContext({ Promise, Map, Date, console });
+ web.window = web;
+ web.__faceclawEvenHub = { postMessage: (name, args, id) => session.handleBridgeCall(name, args, id) };
+ session.attachWebView({ evaluateJs: script => vm.runInContext(script, web), destroy() {} });
+ vm.runInContext(api.EVENHUB_BRIDGE_INJECT_SCRIPT, web);
+ const events = [];
+ web._listenEvenAppMessage = value => {
+ const message = typeof value === 'string' ? JSON.parse(value) : value;
+ if (message.method === 'evenHubEvent') events.push(JSON.parse(JSON.stringify(message.data)));
+ };
+ const call = (method, data = {}) => web.flutter_inappwebview.callHandler('evenAppMessage', JSON.stringify({ method, data }));
+ const runTimers = () => { for (const fn of timers.splice(0)) fn(); };
+ return { session, call, events, runTimers, windowClosed: () => windowClosed };
+}
+
+const lines = n => Array.from({ length: n }, (_, i) => `line ${i}`).join('\n');
+const textPage = (content, extra = {}) => ({
+ containerTotalNum: 1,
+ textObject: [{ containerID: 1, containerName: 'body', xPosition: 0, yPosition: 0, width: 300, height: 100, content, isEventCapture: 1, ...extra }],
+});
+const swipe = (h, direction) => h.session.handleGesture({ type: direction === 'down' ? 'scroll-down' : 'scroll-up' });
+
+test('an overflowing capture text container scrolls itself and reports only at its ends', async () => {
+ const h = harness();
+ // 6 lines = 162px in a 100px window: 62px to scroll, three 28px swipes.
+ assert.equal(await h.call('createStartUpPageContainer', textPage(lines(6))), 0);
+ h.events.length = 0;
+ swipe(h, 'down'); swipe(h, 'down'); swipe(h, 'down');
+ assert.deepEqual(h.events, [], 'no events while scrolling, nor for the swipe that reaches the end');
+ swipe(h, 'down');
+ assert.deepEqual(h.events, [{ type: 'textEvent', jsonData: { containerID: 1, containerName: 'body', eventType: 2 } }]);
+ h.events.length = 0;
+ swipe(h, 'up'); swipe(h, 'up'); swipe(h, 'up');
+ assert.deepEqual(h.events, []);
+ swipe(h, 'up');
+ assert.deepEqual(h.events, [{ type: 'textEvent', jsonData: { containerID: 1, containerName: 'body', eventType: 1 } }]);
+});
+
+test('text that fits reports every swipe as reaching an end', async () => {
+ const h = harness();
+ await h.call('createStartUpPageContainer', textPage('short'));
+ h.events.length = 0;
+ swipe(h, 'down'); swipe(h, 'down');
+ assert.equal(h.events.filter(e => e.type === 'textEvent' && e.jsonData.eventType === 2).length, 2);
+});
+
+test('text upgrades replace the whole text by id, ignore offsets, and keep old text when emptied', async () => {
+ const h = harness();
+ await h.call('createStartUpPageContainer', textPage('Hello world'));
+ const body = () => h.session.page.containers[0];
+ assert.equal(await h.call('textContainerUpgrade', { containerID: 1, containerName: 'other name', contentOffset: 3, contentLength: 2, content: 'XY' }), true);
+ assert.equal(body().content, 'XY');
+ assert.equal(await h.call('textContainerUpgrade', { containerID: 1, content: '' }), true);
+ assert.equal(body().content, 'XY', 'an empty upgrade leaves the old text showing');
+ assert.equal(await h.call('textContainerUpgrade', { containerID: 9, content: 'nope' }), false);
+ assert.equal(await h.call('textContainerUpgrade', { containerID: 1, content: 'x', junk: 1 }), false, 'unknown keys are refused');
+});
+
+test('an upgrade scrolls the text back to the top', async () => {
+ const h = harness();
+ await h.call('createStartUpPageContainer', textPage(lines(6)));
+ swipe(h, 'down');
+ assert.equal(h.session.page.containers[0].scrollY, 28);
+ await h.call('textContainerUpgrade', { containerID: 1, content: lines(7) });
+ assert.equal(h.session.page.containers[0].scrollY, 0);
+});
+
+test('image updates need a page, an image at that id, and a usable payload', async () => {
+ const h = harness();
+ const raw = new Array(400).fill(0);
+ assert.equal(await h.call('updateImageRawData', { containerID: 2, imageData: raw, compressMode: 2 }), 4, 'no page yet');
+ await h.call('createStartUpPageContainer', {
+ containerTotalNum: 3,
+ textObject: [{ containerID: 1, containerName: 'body', width: 300, height: 100, content: 'x', isEventCapture: 1 },
+ { containerID: 3, containerName: 'label', width: 50, height: 30, content: 'y' }],
+ imageObject: [{ containerID: 2, containerName: 'icon', width: 20, height: 20 }, { containerID: 3, containerName: 'shadowed', width: 20, height: 20 }],
+ });
+ assert.equal(await h.call('updateImageRawData', { containerID: 2, imageData: raw, compressMode: 2 }), 0);
+ assert.equal(await h.call('updateImageRawData', { containerID: 2, imageData: 'AAAA', compressMode: 2 }), 4, 'base64 is refused');
+ assert.equal(await h.call('updateImageRawData', { containerID: 3, imageData: raw, compressMode: 2 }), 4, 'id 3 resolves to the text container');
+ // With no image at that id the Even app has no size for raw pixels: 0x0 is out of range.
+ assert.equal(await h.call('updateImageRawData', { containerID: 7, imageData: raw, compressMode: 2 }), 2);
+});
+
+test('a page the firmware cannot build fails create, and a failed rebuild closes the app', async () => {
+ const h = harness();
+ const tinyImage = { ...textPage('x'), imageObject: [{ containerID: 2, containerName: 'dot', width: 10, height: 10 }] };
+ assert.equal(await h.call('createStartUpPageContainer', tinyImage), 1);
+ assert.equal(await h.call('rebuildPageContainer', textPage('x')), false, 'nothing to rebuild before a page exists');
+ assert.equal(await h.call('createStartUpPageContainer', textPage('x')), 0);
+ h.events.length = 0;
+ assert.equal(await h.call('rebuildPageContainer', tinyImage), false);
+ assert.equal(h.session.page.containers.length, 0);
+ assert.ok(h.events.some(e => e.type === 'sysEvent' && e.jsonData.eventType === 6), 'ABNORMAL_EXIT');
+ h.runTimers();
+ assert.equal(h.windowClosed(), true);
+});
+
+test('the Even app refuses malformed pages before they reach the glasses', async () => {
+ const h = harness();
+ assert.equal(await h.call('createStartUpPageContainer', textPage('x', { isEventCapture: true })), 1);
+ assert.equal(await h.call('createStartUpPageContainer', textPage('x', { textColor: 7 })), 1);
+ assert.equal(await h.call('createStartUpPageContainer', textPage('x')), 0);
+ assert.equal(await h.call('rebuildPageContainer', { ...textPage('y'), Container_Total_Num: 1 }), false);
+ assert.equal(h.session.page.containers[0].content, 'x', 'a refused rebuild leaves the page alone');
+});
+
+test('borders use the colour index, overflowing text gets a scrollbar, and images cover text', async () => {
+ const h = harness();
+ // 300x100 with a 2px border of colour 3; 6 lines overflow the 96px window by 66px.
+ await h.call('createStartUpPageContainer', {
+ containerTotalNum: 2,
+ textObject: [{ containerID: 1, containerName: 'body', xPosition: 0, yPosition: 0, width: 300, height: 100, content: lines(6), isEventCapture: 1, borderWidth: 2, borderColor: 3 }],
+ imageObject: [{ containerID: 2, containerName: 'icon', xPosition: 0, yPosition: 40, width: 20, height: 20 }],
+ });
+ await h.call('updateImageRawData', { containerID: 2, imageData: new Array(400).fill(0), compressMode: 2 });
+ const image = h.session.paint({ width: 576, height: 288 }, true);
+ const at = (x, y) => image.pixels[y * 576 + x];
+ assert.equal(at(150, 0), 3 * 17, 'border grey');
+ assert.equal(at(0, 50), 0, 'the black image covers the border under it');
+ // Track 6..94 (88px); length floor(88 * 100 / 166) = 53; x 290..293.
+ assert.deepEqual([at(290, 7), at(291, 7), at(293, 7), at(289, 7), at(294, 7)], [187, 187, 187, 0, 0]);
+ assert.deepEqual([at(290, 6), at(291, 6), at(292, 6), at(293, 6)], [0, 187, 187, 0], 'chamfered top row');
+ assert.equal(at(291, 58), 187);
+ assert.equal(at(291, 59), 0, 'bar ends after 53 rows');
+});
diff --git a/tests/evenhub-signin.test.cjs b/tests/evenhub-signin.test.cjs
index a3ed4923..c7bf17cc 100644
--- a/tests/evenhub-signin.test.cjs
+++ b/tests/evenhub-signin.test.cjs
@@ -17,6 +17,8 @@ const setting = (initial = '') => {
class AuthError extends Error {}
+const gestures = loader({}, {})('app/ui/gestures.ts');
+
/**
* Load the store layer, by default with a signed-out account and no stored
* credentials. `api` overrides evenHubApi methods; text the layer paints is
@@ -34,7 +36,7 @@ const loadStoreLayer = ({ configured = false, api = {} } = {}) => {
'../../graphics/image': { GrayImage: class { drawText(_f, _x, _y, text) { drawn.push(text); } fillRect() {} } },
'../../graphics/textwrap': { truncateText: (_f, text) => text, wrapText: (_f, text) => [text] },
'../../util/numeric-util': { clamp: (v, lo, hi) => Math.min(hi, Math.max(lo, v)) },
- '../../ui/gestures': { GESTURE_CLICK: 'click' },
+ '../../ui/gestures': { ...gestures, GESTURE_CLICK: 'click' },
'../../ui/menu': { drawSelectionHighlight() {} },
'../../ui/menu-core': require('../.test-build/app/ui/menu-core.js'),
'../../ui/shell/shell': { shell: { yieldFocusToSidebar() {} } },
@@ -60,6 +62,7 @@ const loadStoreLayer = ({ configured = false, api = {} } = {}) => {
'./store-detail-layer': { EvenHubStoreDetailLayer: class { constructor(_app, options) { detailOptions.push(options); } } },
'./store-install': { cleanError: (error) => String(error?.message ?? error), installStoreApp: async () => {} },
'./updates': { checkForEvenHubUpdates: async () => [], describeUpdate: () => '' },
+ './glasses-compat': { isEvenHubStoreAvailable: () => true },
});
const { EvenHubStoreLayer } = load('app/apps/evenhub/store-layer.ts');
return { EvenHubStoreLayer, email, password, drawn, detailOptions };
diff --git a/tests/evenhub-stock-layout.test.cjs b/tests/evenhub-stock-layout.test.cjs
new file mode 100644
index 00000000..f8bc218f
--- /dev/null
+++ b/tests/evenhub-stock-layout.test.cjs
@@ -0,0 +1,81 @@
+// Stock container-model rules the EvenHub emulation follows: stacking order,
+// which container captures input, id resolution, firmware clamps and border
+// greys. Source: the evenRealities-openCFW reconstruction of firmware 2.2.6.10
+// (evenhub_ui_containers.c, evenhub_ui_page.c, common_text/list_container.c).
+const test = require("node:test");
+const assert = require("node:assert/strict");
+
+const {
+ borderGrey,
+ clampToStockLimits,
+ containerById,
+ eventCaptureContainer,
+ paintOrder,
+ parsePage,
+} = require("../.test-build/app/apps/evenhub/containers.js");
+
+const names = (containers) => containers.map((c) => c.name);
+
+test("without zOrderIndex containers stack lists, then texts, then images", () => {
+ const page = parsePage({
+ imageObject: [{ containerID: 1, containerName: "img" }],
+ textObject: [{ containerID: 2, containerName: "txt" }],
+ listObject: [{ containerID: 3, containerName: "lst" }],
+ });
+ assert.deepEqual(names(paintOrder(page.containers)), ["lst", "txt", "img"]);
+});
+
+test("zOrderIndex sorts only when every container has one", () => {
+ const all = parsePage({
+ textObject: [{ containerID: 1, containerName: "body", zOrderIndex: 2 }],
+ imageObject: [{ containerID: 2, containerName: "icon", zOrderIndex: 1 }],
+ });
+ assert.deepEqual(names(paintOrder(all.containers)), ["icon", "body"]);
+ const some = parsePage({
+ textObject: [{ containerID: 1, containerName: "body", zOrderIndex: 2 }],
+ imageObject: [{ containerID: 2, containerName: "icon" }],
+ });
+ assert.deepEqual(names(paintOrder(some.containers)), ["body", "icon"]);
+});
+
+test("the first capture container in stacking order owns input", () => {
+ const page = parsePage({
+ textObject: [
+ { containerID: 1, containerName: "a", isEventCapture: 1, zOrderIndex: 5 },
+ { containerID: 2, containerName: "b", isEventCapture: 1, zOrderIndex: 3 },
+ ],
+ });
+ assert.equal(eventCaptureContainer(page).name, "b");
+});
+
+test("an id resolves to its first container in stacking order, whatever the kind", () => {
+ const page = parsePage({
+ textObject: [{ containerID: 7, containerName: "label" }],
+ imageObject: [{ containerID: 7, containerName: "icon" }],
+ });
+ assert.equal(containerById(page, 7).kind, "text");
+ assert.equal(containerById(page, 8), undefined);
+});
+
+test("stock clamps text and list geometry but leaves image sizes alone", () => {
+ const page = parsePage({
+ textObject: [{ containerID: 1, containerName: "t", xPosition: 900, yPosition: 400, width: 800, height: 400, borderColor: 40, borderRadius: 30, paddingLength: 50 }],
+ listObject: [{ containerID: 2, containerName: "l", itemContainer: { itemName: Array.from({ length: 25 }, (_, i) => `item ${i}`) } }],
+ imageObject: [{ containerID: 3, containerName: "i", xPosition: 600, width: 400, height: 200 }],
+ });
+ clampToStockLimits(page);
+ const [list, text, image] = page.containers;
+ assert.deepEqual([text.x, text.y, text.width, text.height], [576, 288, 576, 288]);
+ assert.deepEqual([text.borderColor, text.borderRadius, text.paddingLength], [16, 10, 32]);
+ assert.equal(list.itemNames.length, 20);
+ assert.deepEqual([image.x, image.width, image.height], [576, 400, 200]);
+});
+
+test("border color indices are 16 grey steps, with 16 meaning white", () => {
+ assert.equal(borderGrey(0), 0);
+ assert.equal(borderGrey(3), 0x33);
+ assert.equal(borderGrey(15), 0xff);
+ assert.equal(borderGrey(16), 0xff);
+ const page = parsePage({ textObject: [{ containerID: 1, containerName: "t", borderWidth: 2 }] });
+ assert.equal(page.containers[0].borderColor, 0, "an omitted borderColor is the protobuf default, black");
+});
diff --git a/tests/evenhub-store-navigation.test.cjs b/tests/evenhub-store-navigation.test.cjs
new file mode 100644
index 00000000..f3d6c6e6
--- /dev/null
+++ b/tests/evenhub-store-navigation.test.cjs
@@ -0,0 +1,263 @@
+// EvenHub store navigation: watch swipes on the tab strip, the Updates tab's
+// Update All row, and page-at-a-time scrolling in the permission dialog.
+//
+// The real layers run with their dependencies mocked; what they paint is
+// collected as text, so these assert what the user would see.
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const { loader } = require('./helpers/load-typescript.cjs');
+
+const gestures = loader({}, {})('app/ui/gestures.ts');
+const font = { lineHeight: 10, measureText: (text) => text.length * 6 };
+
+/** Records drawn text; every other drawing call is a no-op. */
+const makeImageClass = (drawn) => class {
+ drawText(_font, _x, _y, text) { drawn.push(text); }
+ fillRect() {}
+ fillRoundedRect() {}
+ drawRoundedRect() {}
+};
+
+/** Stand-in for ui/menu-core's Menu: draws every row in order, scrolls the selection by one. */
+class FakeMenu {
+ constructor(options) {
+ this.options = options;
+ this.items = options.items;
+ this.selectedIndex = 0;
+ this.scrollTop = 0;
+ }
+ setItems(items, selectedIndex) {
+ this.items = items;
+ if (selectedIndex !== undefined) this.selectedIndex = selectedIndex;
+ this.selectedIndex = Math.max(0, Math.min(this.selectedIndex, items.length - 1));
+ }
+ get selectedItem() { return this.items[this.selectedIndex] ?? null; }
+ handleInput(event) {
+ if (event.type === 'scroll-down') this.selectedIndex = Math.min(this.items.length - 1, this.selectedIndex + 1);
+ if (event.type === 'scroll-up') this.selectedIndex = Math.max(0, this.selectedIndex - 1);
+ }
+ paint(image, box) {
+ this.items.forEach((item, index) => this.options.draw({ image, item, index, x: box.x, y: box.y, width: box.width }));
+ }
+ drawScrollbar() {}
+}
+
+const storeApp = (packageId, name, version) => ({
+ id: 1, packageId, name, version, creatorName: '', tagline: '', description: '', categories: [],
+ installCount: 0, likeCount: 0, firstPublishedAt: '', iconPath: '', changelog: '', fileSize: 0,
+});
+
+const emptyPage = { apps: [], total: 0, page: 1, pageSize: 20 };
+
+/** A signed-in store layer; `updates` is what the update check reports. */
+const loadStore = ({ updates = [] } = {}) => {
+ const drawn = [];
+ const installs = [];
+ const setting = { get: () => '', set() {} };
+ const load = loader({}, {
+ '../../graphics/ui-fonts': { getDefaultSmallFont: () => font },
+ '../../graphics/image': { GrayImage: makeImageClass(drawn) },
+ '../../graphics/textwrap': { truncateText: (_f, text) => text, wrapText: (_f, text) => [text] },
+ '../../ui/gestures': { ...gestures, GESTURE_CLICK: 'click' },
+ '../../ui/menu': { drawSelectionHighlight() {} },
+ '../../ui/menu-core': { Menu: FakeMenu },
+ '../../ui/shell/shell': { shell: { yieldFocusToSidebar() {} } },
+ '../../ui/metrics': { lineStep: () => 12 },
+ '../../ui/dashboard-settings': {
+ ConfigSettingString: class { constructor(options) { this.value = options.defaultValue ?? ''; }
+ get() { return this.value; } set(next) { this.value = next; return next; } },
+ },
+ './even-api': {
+ evenHubApi: { listApps: async () => emptyPage, listNewApps: async () => emptyPage, searchApps: async () => emptyPage },
+ EvenHubAuthenticationError: class extends Error {},
+ isEvenHubStoreConfigured: () => true,
+ },
+ './credentials': {
+ evenHubLoginEmailSetting: setting, evenHubLoginPasswordSetting: setting, evenHubRememberMeSetting: setting,
+ clearEvenHubLoginForm() {}, resetEvenHubLoginForm() {}, clearEvenHubSession() {}, clearTransientEvenHubSession() {},
+ },
+ './installed-apps': { getInstalledEvenHubApps: () => updates.map((update) => update.installed), uninstallEvenHubPackage: () => true },
+ './store-detail-layer': { EvenHubStoreDetailLayer: class {} },
+ './store-install': {
+ cleanError: (error) => String(error?.message ?? error),
+ installStoreApp: async (_ctx, app) => { installs.push(app.packageId); return { packageId: app.packageId }; },
+ },
+ './updates': {
+ checkForEvenHubUpdates: async () => updates,
+ describeUpdate: () => ({ updateAvailable: false, packageMissing: false }),
+ },
+ './glasses-compat': { isEvenHubStoreAvailable: () => true },
+ });
+ const { EvenHubStoreLayer } = load('app/apps/evenhub/store-layer.ts');
+ const layer = new EvenHubStoreLayer({ launchApp: async () => {}, appendLog: () => {} });
+ return { layer, drawn, installs };
+};
+
+const makeCtx = () => ({
+ stack: {
+ getBaseSize: () => ({ width: 576, height: 288 }),
+ isFocused: () => true,
+ clearToBase() {},
+ push() {},
+ pop() {},
+ },
+ actions: { requestRender() {}, endTextSettingEdit() {}, startTextSettingsEdit() {} },
+});
+
+const settle = () => new Promise((resolve) => setImmediate(resolve));
+
+/** Repaint and return the drawn text. */
+const repaint = (layer, drawn, ctx) => {
+ drawn.length = 0;
+ layer.paint(ctx);
+ return [...drawn];
+};
+
+const watch = (type) => ({ type, source: 'watch', timestampMs: 0 });
+
+test('watch swipes left and right switch tabs while the tab strip is focused', async () => {
+ const { layer, drawn } = loadStore();
+ const ctx = makeCtx();
+ layer.paint(ctx);
+ await settle();
+ assert.ok(repaint(layer, drawn, ctx).includes('Public apps by popularity'));
+
+ // In the list, a right swipe is "select" and must not change tabs.
+ await layer.handleInput(watch('swipe-right'), ctx);
+ await settle();
+ assert.ok(repaint(layer, drawn, ctx).includes('Public apps by popularity'), 'still on Top');
+
+ // A left swipe in the list is "back", which focuses the tab strip.
+ await layer.handleInput(watch('swipe-left'), ctx);
+ await layer.handleInput(watch('swipe-right'), ctx);
+ await settle();
+ assert.ok(repaint(layer, drawn, ctx).includes('Recently published apps'), 'right moved to New');
+
+ await layer.handleInput(watch('swipe-left'), ctx);
+ await settle();
+ assert.ok(repaint(layer, drawn, ctx).includes('Public apps by popularity'), 'left moved back to Top');
+
+ // Up/down still switch tabs too.
+ await layer.handleInput(watch('swipe-down'), ctx);
+ await settle();
+ assert.ok(repaint(layer, drawn, ctx).includes('Recently published apps'), 'down moved to New');
+});
+
+/** Open the store and move to the Updates tab, with focus back in its list. */
+const openUpdatesTab = async (layer, ctx) => {
+ layer.paint(ctx);
+ await settle();
+ await layer.handleInput({ type: 'double-click', source: 'ring' }, ctx);
+ for (let i = 0; i < 3; i++) await layer.handleInput({ type: 'scroll-down' }, ctx);
+ await settle();
+ await layer.handleInput({ type: 'click', source: 'ring' }, ctx);
+};
+
+test('the Updates tab lists Update All first and it installs every update', async () => {
+ const updates = [
+ { installed: { packageId: 'a', name: 'Alpha', version: '1' }, latest: storeApp('a', 'Alpha', '2'), packageMissing: false },
+ { installed: { packageId: 'b', name: 'Beta', version: '1' }, latest: storeApp('b', 'Beta', '3'), packageMissing: false },
+ { installed: { packageId: 'c', name: 'Gamma', version: '1' } },
+ ];
+ const { layer, drawn, installs } = loadStore({ updates });
+ const ctx = makeCtx();
+ await openUpdatesTab(layer, ctx);
+
+ const painted = repaint(layer, drawn, ctx);
+ assert.ok(painted.includes('Updates (3)'), `the tab count is apps, not rows: ${JSON.stringify(painted)}`);
+ assert.ok(painted.includes('3 apps need attention'));
+ const updateAll = painted.indexOf('Update All');
+ assert.ok(updateAll >= 0, `painted: ${JSON.stringify(painted)}`);
+ assert.ok(painted.includes('Install all 2 available updates'), 'the orphan is not counted');
+ assert.ok(updateAll < painted.indexOf('Alpha') && updateAll < painted.indexOf('Gamma'), 'Update All is the first row');
+
+ // The list opens on Update All; clicking it installs both updatable apps.
+ await layer.handleInput({ type: 'click', source: 'ring' }, ctx);
+ await settle();
+ assert.deepEqual(installs, ['a', 'b']);
+ const after = repaint(layer, drawn, ctx);
+ assert.ok(!after.includes('Update All'), 'nothing left to update, so the row goes');
+ assert.ok(after.includes('Gamma'), 'the missing package stays listed');
+ assert.ok(after.includes('Updated 2 apps.'));
+});
+
+test('the Updates tab has no Update All row when nothing can be installed', async () => {
+ const updates = [{ installed: { packageId: 'c', name: 'Gamma', version: '1' } }];
+ const { layer, drawn } = loadStore({ updates });
+ const ctx = makeCtx();
+ await openUpdatesTab(layer, ctx);
+ const painted = repaint(layer, drawn, ctx);
+ assert.ok(painted.includes('Gamma'));
+ assert.ok(!painted.includes('Update All'));
+});
+
+// ---- permission dialog ---------------------------------------------------
+
+const loadDialog = (detailLines) => {
+ const drawn = [];
+ const load = loader({}, {
+ '../../graphics/ui-fonts': { getDefaultSmallFont: () => font },
+ '../../graphics/image': { GrayImage: makeImageClass(drawn) },
+ '../../graphics/textwrap': { truncateText: (_f, text) => text, wrapText: (_f, text) => text.split('|') },
+ '../../ui/gestures': gestures,
+ '../../ui/layers': {},
+ '../../ui/menu': { drawListScrollbar() {}, drawSelectionHighlight() {} },
+ './permissions': { permissionDetail: (permission) => permission.detail, permissionLabel: (name) => name },
+ './privacy-policy': { openPrivacyPolicyOnPhone() {} },
+ '../../ui/metrics': { lineStep: () => 12, listRowHeight: () => 20 },
+ });
+ const { EvenHubPermissionDialogLayer } = load('app/apps/evenhub/permission-dialog.ts');
+ const ImageClass = makeImageClass(drawn);
+ const outcome = { confirmed: null };
+ const dialog = new EvenHubPermissionDialogLayer(
+ 'Demo',
+ [{ name: 'network', detail: detailLines.join('|') }],
+ '',
+ () => { outcome.confirmed = true; },
+ () => { outcome.confirmed = false; },
+ );
+ const ctx = { stack: { getBaseSize: () => ({ width: 576, height: 136 }), isFocused: () => true, pop() {} } };
+ const paint = () => {
+ drawn.length = 0;
+ dialog.paint(ctx, () => new ImageClass());
+ return [...drawn];
+ };
+ return { dialog, ctx, paint, outcome };
+};
+
+test('the permission dialog scrolls a page at a time with one line of overlap', () => {
+ const lines = Array.from({ length: 30 }, (_, i) => `line ${i + 1}`);
+ const { dialog, ctx, paint, outcome } = loadDialog(lines);
+
+ const pages = [paint()];
+ while (!pages[pages.length - 1].includes('Allow')) {
+ assert.ok(pages.length < 20, 'paging reaches the actions');
+ dialog.handleInput({ type: 'scroll-down' }, ctx);
+ pages.push(paint());
+ }
+ assert.ok(pages.length >= 3, `the list is long enough to need several pages (${pages.length})`);
+ // Every page but the last (which stops at the bottom) starts on the line the previous one ended on.
+ for (let page = 1; page < pages.length - 1; page++) {
+ const previous = pages[page - 1];
+ assert.equal(pages[page][0], previous[previous.length - 1], `page ${page + 1} overlaps page ${page} by one line`);
+ assert.ok(pages[page].length > 2, 'a page moves by more than one line');
+ }
+ // Every line was on screen on some page.
+ for (const line of lines) assert.ok(pages.some((page) => page.includes(line)), `${line} was shown`);
+
+ // Paging up from the bottom: the old first line becomes the new last one.
+ const bottom = pages[pages.length - 1];
+ dialog.handleInput({ type: 'scroll-up' }, ctx);
+ const up = paint();
+ assert.equal(up[up.length - 1], bottom[0], 'one line of overlap going up');
+ assert.ok(up.length > 2);
+ for (let i = 0; i < pages.length; i++) dialog.handleInput({ type: 'scroll-up' }, ctx);
+ assert.deepEqual(paint(), pages[0], 'back at the top');
+
+ // A click before the bottom pages down rather than allowing; scrolling up returns.
+ dialog.handleInput({ type: 'click', source: 'ring' }, ctx);
+ assert.deepEqual(paint(), pages[1]);
+ assert.equal(outcome.confirmed, null);
+ dialog.handleInput({ type: 'scroll-up' }, ctx);
+ assert.deepEqual(paint(), pages[0]);
+});
diff --git a/tests/firmware-compat.test.cjs b/tests/firmware-compat.test.cjs
index ada86113..0d3e50c1 100644
--- a/tests/firmware-compat.test.cjs
+++ b/tests/firmware-compat.test.cjs
@@ -74,3 +74,17 @@ test("reportedFirmwareVersion picks the higher arm", () => {
assert.equal(compat.reportedFirmwareVersion(info("", "", "2.2.9.22")), "2.2.9.22");
assert.equal(compat.reportedFirmwareVersion(info("", "", "")), "");
});
+
+test("a G1's report names what the arms run and offers the install, stock or too old", () => {
+ const stock = compat.firmwareIncompatibilityMessage(info("", "Even's firmware", "Even's firmware"));
+ assert.match(stock, /G1/);
+ assert.match(stock, /Even's firmware/);
+ assert.match(stock, /install/);
+ assert.doesNotMatch(stock, /revision/);
+ const older = compat.firmwareIncompatibilityMessage(info("", "g1v0 0.5.62", "g1v0 0.5.63"));
+ assert.match(older, /L=g1v0 0\.5\.62 R=g1v0 0\.5\.63/);
+ assert.match(older, /install/);
+ // A compatible G1 reports the extension, and a G2's stock report is unchanged.
+ assert.equal(compat.firmwareIncompatibilityMessage(info(`Faceclaw/${REQUIRED}`, "g1v0 0.5.63", "g1v0 0.5.63")), null);
+ assert.match(compat.firmwareIncompatibilityMessage(info("")), /stock firmware/);
+});
diff --git a/tests/font-picker.test.cjs b/tests/font-picker.test.cjs
new file mode 100644
index 00000000..5f890b99
--- /dev/null
+++ b/tests/font-picker.test.cjs
@@ -0,0 +1,88 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+const vm = require('node:vm');
+const ts = require('typescript');
+
+function load(file, modules) {
+ const source = fs.readFileSync(path.join(__dirname, '..', file), 'utf8');
+ const context = { exports: {}, console, require(name) { assert.ok(name in modules, `${file}: ${name}`); return modules[name]; } };
+ vm.runInNewContext(ts.transpileModule(source, {
+ compilerOptions: { module: ts.ModuleKind.CommonJS, target: ts.ScriptTarget.ES2020 },
+ }).outputText, context);
+ return context.exports;
+}
+
+const build = (name) => require(`../.test-build/app/${name}.js`);
+const graphics = build('graphics/image');
+const metrics = build('ui/metrics');
+const { BdfFont } = load('app/graphics/bdffont.ts', { '@nativescript/core': {} });
+const bdf = (size) => BdfFont.parse(fs.readFileSync(path.join(__dirname, `../app/fonts/terminus/ter-u${size}n.bdf`), 'utf8'));
+const font = bdf(14);
+const textwrap = load('app/graphics/textwrap.ts', {});
+const coreDeps = {
+ '../graphics/image': graphics, './menu-highlight-motion': build('ui/menu-highlight-motion'),
+ '../graphics/menu-scroll-list': build('graphics/menu-scroll-list'), './menu-scroll-motion': build('ui/menu-scroll-motion'),
+ '../graphics/draw-expression': build('graphics/draw-expression'),
+};
+const menuCore = load('app/ui/menu-core.ts', coreDeps);
+const menu = load('app/ui/menu.ts', {
+ ...coreDeps, './menu-animation-pref': build('ui/menu-animation-pref'), './animation-speed': build('ui/animation-speed'),
+ '../native/settings-store': { getStringSetting: (_key, fallback) => fallback },
+ '../graphics/screen-size': { screenWidth: () => 540, screenHeight: () => 220 },
+ '../graphics/textwrap': textwrap, '../graphics/ui-fonts': { getDefaultSmallFont: () => font },
+ '../util/numeric-util': { clamp: (n, lo, hi) => Math.max(lo, Math.min(hi, n)) }, './gestures': {}, './metrics': metrics, './menu-core': menuCore,
+});
+// The UI font picker on Roboto Light 20, drawn in Terminus (TTF rendering is native).
+const preview = bdf(20);
+const picker = load('app/ui/font-picker.ts', {
+ '../graphics/bdffont': { getFont: () => font }, '../graphics/image': graphics, '../graphics/textwrap': textwrap,
+ '../graphics/ttf-font': { TtfFont: { load: () => preview } },
+ '../graphics/installed-fonts': { listInstalledFonts: () => [{ path: '/fonts/Roboto-Light.ttf', fileName: 'Roboto-Light.ttf',
+ family: 'Roboto', style: 'Light', weightOrder: 300, monospace: false }] },
+ '../graphics/ui-fonts': { fontSelectionLabel: () => 'Roboto Light 20', getDefaultSmallFont: () => font, uiFontSizeAllowed: () => true,
+ getTerminalFontSelection: () => null, getUiFontSelection: () => ({ kind: 'ttf', file: 'Roboto-Light.ttf', size: 20 }),
+ setTerminalFontSelection() {}, setUiFontSelection() {} },
+ './gestures': {}, './menu': menu, './menu-core': menuCore, './metrics': metrics,
+});
+
+function stackOf(size) {
+ const layers = [];
+ return { layers, ctx: { stack: { getBaseSize: () => size, isFocused: () => true, push: (layer) => layers.push(layer) } } };
+}
+const glyphRuns = (image, f) => image.draws.filter((d) => d.kind === 'glyph' && d.font === f);
+
+test('the font picker previews under its rows where they fit, else beside them, on the window either way', () => {
+ // At 192 rows either fits, by the font's metrics: only the bounds are checked.
+ for (const [size, beside] of [[{ width: 576, height: 260 }, false], [{ width: 476, height: 192 }, null], [{ width: 476, height: 155 }, true]]) {
+ const { layers, ctx } = stackOf(size);
+ picker.uiFontPickerMenuItem().onSelect(ctx);
+ const image = layers[0].paint(ctx);
+ const sample = glyphRuns(image, preview);
+ // The rows' labels and values (255 selected, 200 not; the title is 220, the info line 110).
+ const rows = glyphRuns(image, font).filter((d) => d.value === 255 || d.value === 200);
+ assert.ok(sample.length > 20, `the sample is drawn at ${size.height}`);
+ for (const d of image.draws) {
+ if (d.kind !== 'glyph') continue;
+ assert.ok(d.x >= 0 && d.y >= 0 && d.x + d.glyph.bbxWidth <= size.width && d.y + d.font.lineHeight <= size.height,
+ `glyph at ${d.x},${d.y} outside ${size.width}x${size.height}`);
+ }
+ const rowsRight = Math.max(...rows.map((d) => d.x)), rowsBottom = Math.max(...rows.map((d) => d.y));
+ if (beside === true) assert.ok(Math.min(...sample.map((d) => d.x)) > rowsRight, 'the sample right of the rows');
+ if (beside === false) assert.ok(Math.min(...sample.map((d) => d.y)) > rowsBottom, 'the sample under the rows');
+ }
+});
+
+test('a modal menu in a short window (a RayNeo iO\'s) keeps narrow margins, so four choices all show', () => {
+ const items = ['Left', 'Right', 'Bottom', 'Popup'].map((label) => ({ label, onSelect() {} }));
+ for (const [size, margin] of [[{ width: 576, height: 260 }, 20], [{ width: 476, height: 155 }, 8]]) {
+ const { layers, ctx } = stackOf(size);
+ menu.openModalMenu(ctx, 'App switcher position', items, 0);
+ const { layout } = layers[0];
+ assert.ok(layout.y >= margin && layout.y + layout.maxHeight <= size.height - margin, `${size.height}: ${layout.y}+${layout.maxHeight}`);
+ // Title, body padding (8 above and below) and the four rows.
+ const natural = metrics.menuTitleHeight(font) + 2 * 8 + items.length * metrics.listRowHeight(font);
+ assert.equal(layout.maxHeight, natural, `${size.height}: every row fits`);
+ }
+});
diff --git a/tests/g1-firmware.test.cjs b/tests/g1-firmware.test.cjs
new file mode 100644
index 00000000..3e17fdd6
--- /dev/null
+++ b/tests/g1-firmware.test.cjs
@@ -0,0 +1,220 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const crypto = require('node:crypto');
+const zlib = require('node:zlib');
+
+const { readZipEntry, assembleG1Image, decodeG1OwnBytes, extractEvenG1Images, G1FirmwareError } = require('../.test-build/app/g1/firmware-image.js');
+const { EVEN_G1_RESTORE } = require('../.test-build/app/g1/even-firmware.js');
+const plan = require('../.test-build/app/g1/flash-plan.js');
+const { G1V0_IMAGE } = require('../.test-build/app/g1/firmware/g1v0-image.js');
+const { G1V0_OWN_BYTES_BASE64 } = require('../.test-build/app/g1/firmware/g1v0-own-bytes.js');
+
+const sha = (bytes) => crypto.createHash('sha256').update(bytes).digest('hex');
+const noise = (length, seed) => Uint8Array.from({ length }, (_, i) => (i * 31 + seed * 17 + (i >> 3)) & 0xff);
+const fromBase64 = (text) => new Uint8Array(Buffer.from(text, 'base64'));
+
+/** A zip the way Even's are made: one entry stored, the others deflated, under a folder. */
+function zipOf(entries) {
+ const locals = [];
+ const directory = [];
+ let offset = 0;
+ for (const { name, data, deflate } of entries) {
+ const packed = deflate ? zlib.deflateRawSync(data) : Buffer.from(data);
+ const nameBytes = Buffer.from(name);
+ const local = Buffer.alloc(30);
+ local.writeUInt32LE(0x04034b50, 0);
+ local.writeUInt16LE(deflate ? 8 : 0, 8);
+ local.writeUInt32LE(packed.length, 18);
+ local.writeUInt32LE(data.length, 22);
+ local.writeUInt16LE(nameBytes.length, 26);
+ const central = Buffer.alloc(46);
+ central.writeUInt32LE(0x02014b50, 0);
+ central.writeUInt16LE(deflate ? 8 : 0, 10);
+ central.writeUInt32LE(packed.length, 20);
+ central.writeUInt32LE(data.length, 24);
+ central.writeUInt16LE(nameBytes.length, 28);
+ central.writeUInt32LE(offset, 42);
+ locals.push(local, nameBytes, packed);
+ directory.push(central, nameBytes);
+ offset += local.length + nameBytes.length + packed.length;
+ }
+ const centralBytes = Buffer.concat(directory);
+ const end = Buffer.alloc(22);
+ end.writeUInt32LE(0x06054b50, 0);
+ end.writeUInt16LE(entries.length, 8);
+ end.writeUInt16LE(entries.length, 10);
+ end.writeUInt32LE(centralBytes.length, 12);
+ end.writeUInt32LE(offset, 16);
+ return new Uint8Array(Buffer.concat([...locals, centralBytes, end]));
+}
+
+function fixture() {
+ const net = noise(5000, 1);
+ const app = noise(9000, 2);
+ const image = noise(20000, 3);
+ const table = app.subarray(4000, 4352);
+ image.set(net, 3000);
+ image.set(table, 12000);
+ const parts = [
+ { offset: 3000, length: net.length, file: 'net.bin', fileOffset: 0, sha256: sha(net) },
+ { offset: 12000, length: table.length, file: 'app.bin', fileOffset: 4000, sha256: sha(table) },
+ ];
+ const own = Buffer.concat([image.subarray(0, 3000), image.subarray(8000, 12000), image.subarray(12352)]);
+ const manifest = { version: '0.0.1', sha256: sha(image), size: image.length, source: 't', stockVersion: 's', stockZipUrl: 'u', stockZipSha256: 'z', parts };
+ return { net, app, image, own: new Uint8Array(own), manifest };
+}
+
+test('a zip entry is found, deflated or stored, also under a folder', () => {
+ const stored = noise(300, 4);
+ const packed = noise(70000, 5);
+ const zip = zipOf([{ name: 'manifest.json', data: stored }, { name: 'firmware/app.bin', data: packed, deflate: true }]);
+ assert.deepEqual(readZipEntry(zip, 'manifest.json'), stored);
+ assert.deepEqual(Buffer.from(readZipEntry(zip, 'app.bin')), Buffer.from(packed));
+ assert.throws(() => readZipEntry(zip, 'missing.bin'), /no missing\.bin/);
+ assert.throws(() => readZipEntry(noise(100, 6), 'x'), /not a zip/);
+});
+
+test('the parts go back where they were, byte for byte', () => {
+ const { net, app, image, own, manifest } = fixture();
+ const files = { 'net.bin': net, 'app.bin': app };
+ const out = assembleG1Image(manifest, own, (name) => files[name], sha);
+ assert.deepEqual(Buffer.from(out), Buffer.from(image));
+});
+
+test('a part that is not the one it was built with is refused', () => {
+ const { net, app, own, manifest } = fixture();
+ const bad = net.slice();
+ bad[100] ^= 1;
+ const files = { 'net.bin': bad, 'app.bin': app };
+ assert.throws(() => assembleG1Image(manifest, own, (name) => files[name], sha), G1FirmwareError);
+ const short = { 'net.bin': net.subarray(0, 100), 'app.bin': app };
+ assert.throws(() => assembleG1Image(manifest, own, (name) => short[name], sha), /not the one/);
+});
+
+test('damaged bundled bytes never pass as an image', () => {
+ const { net, app, own, manifest } = fixture();
+ const files = { 'net.bin': net, 'app.bin': app };
+ const flipped = own.slice();
+ flipped[10] ^= 1;
+ assert.throws(() => assembleG1Image(manifest, flipped, (name) => files[name], sha), /failed verification/);
+ assert.throws(() => assembleG1Image(manifest, own.subarray(0, own.length - 1), (name) => files[name], sha), G1FirmwareError);
+});
+
+test('the bundled firmware is whole and carries none of Even\'s bytes in its manifest ranges', () => {
+ const own = decodeG1OwnBytes(G1V0_OWN_BYTES_BASE64, fromBase64);
+ const taken = G1V0_IMAGE.parts.reduce((sum, part) => sum + part.length, 0);
+ assert.equal(own.length + taken, G1V0_IMAGE.size);
+ // MCUboot's magic and the version in its header, ahead of the first part.
+ assert.equal(Buffer.from(own.subarray(0, 4)).toString('hex'), '3db8f396');
+ assert.equal(`${own[20]}.${own[21]}.${own[22] | (own[23] << 8)}`, G1V0_IMAGE.version);
+ assert.match(G1V0_IMAGE.stockZipUrl, /^https:\/\/cdn\.evenreal\.co\//);
+ assert.match(G1V0_IMAGE.sha256, /^[0-9a-f]{64}$/);
+ const sorted = [...G1V0_IMAGE.parts].sort((a, b) => a.offset - b.offset);
+ assert.ok(sorted[0].offset > 512 && sorted.at(-1).offset + sorted.at(-1).length < G1V0_IMAGE.size);
+ assert.doesNotMatch(G1V0_IMAGE.source, /uncommitted/, 'ship only a firmware that was committed');
+});
+
+test('versions compare by number, not by text', () => {
+ assert.ok(plan.compareG1Versions('0.5.100', '0.5.63') > 0);
+ assert.ok(plan.compareG1Versions('0.5.9', '0.5.63') < 0);
+ assert.equal(plan.compareG1Versions('0.5.63', '0.5.63'), 0);
+ assert.equal(plan.compareG1Versions('0.5', '0.5.0'), 0);
+ assert.ok(plan.compareG1Versions('', '0.5.63') < 0);
+});
+
+test('a pair is chosen by serial, then address, and never guessed between two', () => {
+ const g1 = (serial, left, right) => ({ g1Firmware: 'g1v0', serial, left: left && { address: left }, right: right && { address: right } });
+ const ours = g1('S1', 'L1', 'R1');
+ const theirs = g1('S2', 'L2', 'R2');
+ assert.equal(plan.pickG1Pair([theirs, ours], { serial: 's1' }), ours);
+ assert.equal(plan.pickG1Pair([theirs, ours], { left: 'L1' }), ours);
+ assert.equal(plan.pickG1Pair([theirs, ours], { right: 'R2' }), theirs);
+ assert.equal(plan.pickG1Pair([theirs, ours], {}), null);
+ assert.equal(plan.pickG1Pair([ours], {}), ours);
+ // A flash changed the addresses: the serial still finds it.
+ assert.equal(plan.pickG1Pair([g1('S1', 'NEW', 'NEW2'), theirs], { serial: 'S1', left: 'OLD', right: 'OLD2' }).left.address, 'NEW');
+ // Our serial with one arm heard so far: wait, even if another pair is complete.
+ assert.equal(plan.pickG1Pair([g1('S1', 'L1', null), theirs], { serial: 'S1' }), null);
+ // The wanted glasses weren't heard: another pair is never a stand-in, even the only one around.
+ assert.equal(plan.pickG1Pair([theirs], { serial: 'S1' }), null);
+ assert.equal(plan.pickG1Pair([theirs], { left: 'L1', right: 'R1' }), null);
+ // A wanted address on one side doesn't match a pair for lacking the other.
+ assert.equal(plan.pickG1Pair([g1('S2', 'L2', null)], { left: 'L1' }), null);
+ // G2 pairs don't count.
+ assert.equal(plan.pickG1Pair([{ serial: 'S9', left: { address: 'a' }, right: { address: 'b' } }], {}), null);
+});
+
+test('the state of the two arms is that of the arm that needs the most', () => {
+ const on = (version, extra = {}) => ({ firmware: 'g1v0', version, safeMode: false, ...extra });
+ const state = (...arms) => plan.g1FirmwareState(arms, '0.5.63');
+ assert.equal(state(on('0.5.63'), on('0.5.63')), 'current');
+ assert.equal(state(on('0.5.64'), on('0.5.63')), 'current');
+ assert.equal(state(on('0.5.62'), on('0.5.63')), 'older');
+ assert.equal(state(on('0.5.63', { safeMode: true }), on('0.5.62')), 'safe-mode');
+ assert.equal(state({ firmware: 'stock' }, on('0.5.63', { safeMode: true })), 'stock');
+});
+
+test('what the advertising alone says about the arms', () => {
+ const arm = (g1Firmware, g1Version) => ({ g1Firmware, g1Version });
+ const state = (left, right) => plan.g1StateFromAdvertising({ left, right }, '0.5.66');
+ assert.deepEqual(state(arm('g1v0', '0.5.66'), arm('g1v0', '0.5.66')), { state: 'current', version: '0.5.66' });
+ assert.deepEqual(state(arm('g1v0', '0.5.67'), arm('g1v0', '0.5.66')), { state: 'current', version: '0.5.66' });
+ assert.deepEqual(state(arm('g1v0', '0.5.66'), arm('g1v0', '0.5.100')), { state: 'current', version: '0.5.66' });
+ assert.deepEqual(state(arm('stock'), arm('g1v0', '0.5.66')), { state: 'stock', version: '' });
+ assert.deepEqual(state(arm('g1v0-safe', '0.5.66'), arm('g1v0', '0.5.66')), { state: 'safe-mode', version: '' });
+ // Firmware before 0.5.66, or a record that hasn't arrived: an arm has to be asked.
+ assert.equal(state(arm('g1v0'), arm('g1v0', '0.5.66')), null);
+ assert.equal(state(arm('g1v0'), arm('g1v0')), null);
+});
+
+test('an older arm wins over a newer one', () => {
+ const arm = (g1Version) => ({ g1Firmware: 'g1v0', g1Version });
+ assert.deepEqual(plan.g1StateFromAdvertising({ left: arm('0.5.67'), right: arm('0.5.65') }, '0.5.66'), { state: 'older', version: '0.5.65' });
+});
+
+test('the native flow\'s answer is read, and nonsense is no answer', () => {
+ assert.deepEqual(plan.parseG1FlashResult('{"flashed":true,"version":"0.5.64"}'), { flashed: true, version: '0.5.64' });
+ assert.deepEqual(plan.parseG1FlashResult('nonsense'), {});
+ assert.deepEqual(plan.parseG1FlashResult(''), {});
+ assert.deepEqual(plan.parseG1FlashResult('null'), {});
+});
+
+test('an uninstall goes right first, and its bar follows that order', () => {
+ assert.deepEqual([...plan.G1_UNINSTALL_SIDES], ['right', 'left']);
+ assert.equal(plan.g1FlashPercent('right', 0, 100, plan.G1_UNINSTALL_SIDES), 0);
+ assert.equal(plan.g1FlashPercent('right', 100, 100, plan.G1_UNINSTALL_SIDES), 50);
+ assert.equal(plan.g1FlashPercent('left', 50, 100, plan.G1_UNINSTALL_SIDES), 75);
+});
+
+test('Even\'s two images come out of its download only when each is the one published', () => {
+ const app = noise(9000, 7);
+ const netCore = noise(4000, 8);
+ const zip = zipOf([
+ { name: 'app_update.bin', data: app },
+ { name: 'net_core_app_update.bin', data: netCore, deflate: true },
+ { name: 'manifest.json', data: noise(100, 9) },
+ ]);
+ const release = { version: '9.9.9', zipUrl: 'u', zipSha256: sha(zip), appSha256: sha(app), netCoreSha256: sha(netCore) };
+ const out = extractEvenG1Images(zip, release, sha);
+ assert.deepEqual(Buffer.from(out.app), Buffer.from(app));
+ assert.deepEqual(Buffer.from(out.netCore), Buffer.from(netCore));
+ assert.throws(() => extractEvenG1Images(zip, { ...release, zipSha256: sha(app) }, sha), (e) => e instanceof G1FirmwareError && /download failed/.test(e.message));
+ assert.throws(() => extractEvenG1Images(zip, { ...release, netCoreSha256: sha(app) }, sha), /net_core_app_update\.bin in Even's download/);
+});
+
+test('the release an uninstall puts back is the one the bundled firmware was built from', () => {
+ // g1v0 embeds Even's network core from this same download, which the bundle's manifest checks by hash.
+ assert.equal(EVEN_G1_RESTORE.version, G1V0_IMAGE.stockVersion);
+ assert.equal(EVEN_G1_RESTORE.zipUrl, G1V0_IMAGE.stockZipUrl);
+ assert.equal(EVEN_G1_RESTORE.zipSha256, G1V0_IMAGE.stockZipSha256);
+ const net = G1V0_IMAGE.parts.find((part) => part.file === 'net_core_app_update.bin' && part.fileOffset === 0);
+ assert.equal(net?.sha256, EVEN_G1_RESTORE.netCoreSha256);
+});
+
+test('each arm counts for half of the bar', () => {
+ assert.equal(plan.g1FlashPercent('left', 0, 100), 0);
+ assert.equal(plan.g1FlashPercent('left', 100, 100), 50);
+ assert.equal(plan.g1FlashPercent('right', 0, 100), 50);
+ assert.equal(plan.g1FlashPercent('right', 100, 100), 100);
+ assert.equal(plan.g1FlashPercent('right', 5, 0), 50);
+});
diff --git a/tests/glanceboard-settings.test.cjs b/tests/glanceboard-settings.test.cjs
index ebb171f9..47dc8358 100644
--- a/tests/glanceboard-settings.test.cjs
+++ b/tests/glanceboard-settings.test.cjs
@@ -20,18 +20,26 @@ function load(file, dependencies) {
function harness() {
const values = new Map();
const listeners = new Set();
+ const live = new Set();
+ const glasses = { haveCompass: true };
class Setting {
constructor(options) { Object.assign(this, options); }
- get() { return values.get(this.storageKey) ?? this.defaultValue; }
+ get() {
+ const value = values.get(this.storageKey) ?? this.defaultValue;
+ return this.normalize ? this.normalize(value) : value;
+ }
set(value) { values.set(this.storageKey, value); }
}
const config = {
ConfigSettingBoolean: Setting, ConfigSettingEnum: Setting,
+ glassesHaveCompass: () => glasses.haveCompass,
onAnySettingChanged: (listener) => { listeners.add(listener); return () => listeners.delete(listener); },
};
const widgets = {
glanceWidgetSpans: (choice) => choice === 'calendar' || choice === 'terminal',
- findGlanceWidget: () => ({ create: () => ({ start() {}, stop() {}, paint() {} }) }),
+ findGlanceWidget: (choice) => ({ create: () => ({
+ start() { live.add(choice); }, stop() { live.delete(choice); }, paint() {},
+ }) }),
};
const settings = load('app/apps/glanceboard/glanceboard-settings.ts', {
'../../ui/dashboard-settings': config, './layout': layout, './widgets': widgets,
@@ -45,7 +53,7 @@ function harness() {
'../../graphics/image': { GrayImage }, '../../ui/dashboard-settings': config,
'./glanceboard-settings': settings, './layout': layout, './widgets': widgets,
});
- return { settings, GlanceBoard, values, listeners, notify: () => [...listeners].forEach((listener) => listener()) };
+ return { settings, GlanceBoard, values, listeners, live, glasses, notify: () => [...listeners].forEach((listener) => listener()) };
}
test('layout defaults to 2x2; expanding preserves stored slots and remembers the extra row', () => {
@@ -97,3 +105,38 @@ test('an active empty board resizes and requests a frame when the layout changes
board.stop();
assert.equal(h.listeners.size, 0);
});
+
+test('glasses without a compass: no compass in the picker, and a stored one reads as Empty until a G2 returns', () => {
+ const h = harness();
+ h.values.set('glanceboard.quadrants.slot.0', 'compass');
+ assert.ok(h.settings.glanceSlotSettings()[0].values.includes('compass'));
+ assert.equal(h.settings.glanceSlotSettings()[0].get(), 'compass');
+
+ h.glasses.haveCompass = false;
+ const [slot] = h.settings.glanceSlotSettings();
+ assert.ok(!slot.values.includes('compass'));
+ // Empty, not the slot's default: System card may already be elsewhere on the board.
+ assert.equal(slot.get(), 'none');
+ assert.equal(h.values.get('glanceboard.quadrants.slot.0'), 'compass');
+
+ h.glasses.haveCompass = true;
+ assert.equal(h.settings.glanceSlotSettings()[0].get(), 'compass');
+});
+
+test('an unknown stored slot value still falls back to the slot default', () => {
+ const { settings: s, values } = harness();
+ values.set('glanceboard.quadrants.slot.0', 'removed-widget');
+ assert.equal(s.glanceSlotSettings()[0].get(), 'system-card');
+});
+
+test('a live board drops the compass widget when the paired glasses have no compass', () => {
+ const h = harness();
+ h.values.set('glanceboard.quadrants.slot.0', 'compass');
+ const board = new h.GlanceBoard(() => {});
+ board.start();
+ assert.ok(h.live.has('compass'));
+ h.glasses.haveCompass = false;
+ h.notify();
+ assert.ok(!h.live.has('compass'));
+ board.stop();
+});
diff --git a/tests/glasses-display-state.test.cjs b/tests/glasses-display-state.test.cjs
index 369bf045..355ea9ee 100644
--- a/tests/glasses-display-state.test.cjs
+++ b/tests/glasses-display-state.test.cjs
@@ -15,6 +15,7 @@ const connected = {
silentMode: false,
screenOn: true,
battery: 72,
+ glassesModel: "G2",
caseBattery: null,
caseCharging: null,
foregroundTitle: "Music",
@@ -37,22 +38,23 @@ test("only the Display off state counts as asleep (the watch face's wake hint)",
assert.equal(glassesDisplayAsleep({ ...connected, phase: "disconnected", screenOn: false }), false);
});
-test("charging takes precedence and includes the last-known G2 battery", () => {
+test("charging takes precedence and includes the glasses' model and last-known battery", () => {
assert.equal(
glassesDisplayLabel({ ...connected, phase: "charging", silentMode: true, screenOn: false }),
- "Charging · G2 72%",
+ "Charging: G2 72%",
);
- assert.equal(chargingDisplayLabel(null), "Charging");
- assert.equal(chargingDisplayLabel(-1), "Charging");
- assert.equal(chargingDisplayLabel(101), "Charging");
+ assert.equal(glassesDisplayLabel({ ...connected, phase: "charging", glassesModel: "G1" }), "Charging: G1 72%");
+ assert.equal(chargingDisplayLabel(null, "G2"), "Charging");
+ assert.equal(chargingDisplayLabel(-1, "G2"), "Charging");
+ assert.equal(chargingDisplayLabel(101, "G2"), "Charging");
});
test("while charging, the case level is the watch face's second line and joins the mirror's message", () => {
const charging = { ...connected, phase: "charging", caseBattery: 64, caseCharging: false };
- assert.equal(glassesDisplayLabel(charging), "Charging · G2 72%");
+ assert.equal(glassesDisplayLabel(charging), "Charging: G2 72%");
assert.equal(glassesDisplayDetail(charging), "Case 64%");
assert.equal(glassesDisplayDetail({ ...charging, caseCharging: true }), "Case 64% ⚡");
- assert.equal(chargingPreviewMessage(charging), "Charging · G2 72% · Case 64%");
+ assert.equal(chargingPreviewMessage(charging), "Charging: G2 72% · Case 64%");
// No case level yet: the label alone.
assert.equal(glassesDisplayDetail({ ...charging, caseBattery: null }), "");
assert.equal(chargingPreviewMessage({ ...charging, caseBattery: null, battery: null }), "Charging");
@@ -65,14 +67,19 @@ const levels = {
};
test("the Settings battery line lists each known level, with ⚡ only while the reading is live", () => {
- assert.equal(formatBatteryLine(levels, true), "G2 87% ⚡ · Case 64% ⚡ · R1 72%");
+ assert.equal(formatBatteryLine(levels, true, "G2"), "G2 87% ⚡ · Case 64% ⚡ · R1 72%");
// Without a link to the glasses their charging state and the case's are stale.
- assert.equal(formatBatteryLine({ ...levels, ringCharging: true }, false), "G2 87% · Case 64% · R1 72% ⚡");
+ assert.equal(formatBatteryLine({ ...levels, ringCharging: true }, false, "G2"), "G2 87% · Case 64% · R1 72% ⚡");
// caseCharging is null while the glasses are out of the case.
- assert.equal(formatBatteryLine({ ...levels, caseCharging: null }, true), "G2 87% ⚡ · Case 64% · R1 72%");
- assert.equal(formatBatteryLine({ ...levels, case: null, ring: null }, true), "G2 87% ⚡");
+ assert.equal(formatBatteryLine({ ...levels, caseCharging: null }, true, "G2"), "G2 87% ⚡ · Case 64% · R1 72%");
+ assert.equal(formatBatteryLine({ ...levels, case: null, ring: null }, true, "G2"), "G2 87% ⚡");
assert.equal(
- formatBatteryLine({ headset: null, headsetCharging: null, case: null, caseCharging: null, ring: null, ringCharging: null }, true),
+ formatBatteryLine({ headset: null, headsetCharging: null, case: null, caseCharging: null, ring: null, ringCharging: null }, true, "G2"),
"",
);
});
+
+test("the Settings battery line names the paired glasses", () => {
+ assert.equal(formatBatteryLine({ ...levels, case: null, ring: null }, true, "G1"), "G1 87% ⚡");
+ assert.equal(formatBatteryLine({ ...levels, case: null, ring: null }, true, "iO"), "iO 87% ⚡");
+});
diff --git a/tests/gray-image.test.cjs b/tests/gray-image.test.cjs
new file mode 100644
index 00000000..bce7b1b9
--- /dev/null
+++ b/tests/gray-image.test.cjs
@@ -0,0 +1,23 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const { GrayImage } = require('../.test-build/app/graphics/image.js');
+
+test('a non-integer size rounds up, warns, and leaves every pixel addressable', t => {
+ const warn = t.mock.method(console, 'warn', () => {});
+ const image = new GrayImage(78.625, 23.5, 7);
+ assert.deepEqual([image.width, image.height, image.pixels.length], [79, 24, 79 * 24]);
+ assert.ok(image.pixels.every(value => value === 7));
+ for (let y = 0; y < image.height; y++) {
+ image.setPixel(78, y, 200);
+ assert.equal(image.getPixel(78, y), 200, `row ${y}`);
+ }
+ assert.equal(warn.mock.callCount(), 1);
+ assert.match(warn.mock.calls[0].arguments[0], /78\.625x23\.5/);
+});
+
+test('a whole-number size is kept as given, without a warning', t => {
+ const warn = t.mock.method(console, 'warn', () => {});
+ const image = new GrayImage(79, 24);
+ assert.deepEqual([image.width, image.height], [79, 24]);
+ assert.equal(warn.mock.callCount(), 0);
+});
diff --git a/tests/icon-grid.test.cjs b/tests/icon-grid.test.cjs
index 634b9570..fc1e784f 100644
--- a/tests/icon-grid.test.cjs
+++ b/tests/icon-grid.test.cjs
@@ -65,6 +65,7 @@ function loadIconGrid({ lastInputWasWatch = false } = {}) {
'./menu-animation-pref': build('ui/menu-animation-pref'),
'./animation-speed': build('ui/animation-speed'),
'../native/settings-store': { getStringSetting: (_key, fallback) => fallback },
+ '../graphics/screen-size': { screenWidth: () => 640, screenHeight: () => 480 },
});
const grid = load('app/ui/icon-grid.ts', {
...common,
diff --git a/tests/ios-app-host.test.cjs b/tests/ios-app-host.test.cjs
index 37cf988f..2b50043b 100644
--- a/tests/ios-app-host.test.cjs
+++ b/tests/ios-app-host.test.cjs
@@ -212,7 +212,7 @@ test('iOS bandwidth footer toggles live, polls only in foreground and resets its
'./phone-gestures': { PhoneGestureRecognizer: class { cancel() {} } },
'./ble-bandwidth-meter': require('../.test-build/app/phone-ui/ble-bandwidth-meter.js'),
'../native/ble-traffic': { sampleBleTraffic: () => totals },
- '../ui/dashboard-settings': { brightnessSetting: { get: () => 'auto' }, displayLayoutSetting: { displayValue: () => 'Tall' }, showBleBandwidthSetting: { get: () => enabled },
+ '../ui/dashboard-settings': { brightnessSetting: { get: () => 'auto' }, displayLayoutSetting: { displayValue: () => 'Tall' }, showBleBandwidthSetting: { get: () => enabled }, glassesModelName: () => 'G2',
onAnySettingChanged: fn => { settingListeners.add(fn); return () => settingListeners.delete(fn); } },
'../g2/device-addresses': { loadDeviceAddresses: () => ({}) },
'../g2/ios-peripheral-identity': { deviceAddressError: () => 'no test devices' },
diff --git a/tests/ios-evenhub.test.cjs b/tests/ios-evenhub.test.cjs
index 7e9921f3..3447a9cc 100644
--- a/tests/ios-evenhub.test.cjs
+++ b/tests/ios-evenhub.test.cjs
@@ -87,7 +87,8 @@ function sessionHarness(overrides = {}, playBuzzer = () => {}, { packageId = 'te
'../../ui/dashboard-settings': {}, '../../ui/sound-effects': {}, './api-key-dialog': {},
'./mic-router': { evenHubMicRouter: {} }, './imu-router': { evenHubImuRouter: {} },
'./compass-router': { evenHubCompassRouter: {} }, '../../assistant/tool-registry': {},
- '../../native/location': {}, '../../native/location-tracker': {}, '../../native/location-permissions': {}, ...overrides,
+ '../../native/location': {}, '../../native/location-tracker': {}, '../../native/location-permissions': {},
+ '../../native/image-rgba': { decodeImageRgba: () => null }, ...overrides,
});
const api = load('app/apps/evenhub/session.ts');
const session = new api.EvenHubSession({ name: 'Probe', packageId, permissions: [] }, '/test/dist', line => logs.push(line), '', playBuzzer);
@@ -105,10 +106,12 @@ function sessionHarness(overrides = {}, playBuzzer = () => {}, { packageId = 'te
test('injected EvenHub RPC creates, updates and composites an image page with no Android globals', async () => {
const h = sessionHarness();
assert.equal(await h.call('createStartUpPageContainer', { containerTotalNum: 1,
- imageObject: [{ containerID: 1, containerName: 'board', xPosition: 0, yPosition: 0, width: 2, height: 2 }] }), 0);
- assert.equal(await h.call('updateImageRawData', { containerID: 1, containerName: 'board', imageData: [0, 80, 160, 255] }), 0);
+ imageObject: [{ containerID: 1, containerName: 'board', xPosition: 0, yPosition: 0, width: 20, height: 20 }] }), 0);
+ // Raw 8-bit grey as the SDK sends it (compressMode 2), quantized to 4-bit levels as the Even app does.
+ const raw = new Array(400).fill(0); raw.splice(0, 4, 0, 80, 160, 255);
+ assert.equal(await h.call('updateImageRawData', { containerID: 1, containerName: 'board', imageData: raw, compressMode: 2 }), 0);
const painted = h.session.paint({ width: 576, height: 288 }, true);
- assert.deepEqual([painted.pixels[0], painted.pixels[1], painted.pixels[576], painted.pixels[577]], [0, 80, 160, 255]);
+ assert.deepEqual(Array.from(painted.pixels.slice(0, 4)), [0, 5 * 17, 9 * 17, 255]);
assert.equal(await h.call('setLocalStorage', { key: 'score', value: '42' }), true);
assert.equal(await h.call('getLocalStorage', { key: 'score' }), '42');
const events = [];
diff --git a/tests/ios-glanceboard.test.cjs b/tests/ios-glanceboard.test.cjs
index 073ebf05..caaee81f 100644
--- a/tests/ios-glanceboard.test.cjs
+++ b/tests/ios-glanceboard.test.cjs
@@ -21,7 +21,10 @@ const planes = load('app/graphics/plane.ts', { './image': images });
const timings = load('app/native/frame-timings.ts', {});
const LAUNCHER_GRAY = 75;
+let glassesType = 'g2';
+
function fixture() {
+ const relay = { available: true, starts: 0, client: null, message: undefined };
const observers = new Map(), phoneState = { protectedDataAvailable: true };
let settingsChanged, remoteHost, controller, bridge = null;
let now = 1000, nextTask = 0, screenOn = true, shellOptions;
@@ -104,12 +107,12 @@ function fixture() {
const noop = () => () => {};
class FaceclawCommunicatorBridge extends Display {
phase = 'disconnected'; listeners = {};
- constructor() { super(); bridge = this; }
+ constructor(addresses) { super(); bridge = this; this.addresses = addresses; }
on(kind, fn) { this.listeners[kind] = fn; return () => { if (this.listeners[kind] === fn) delete this.listeners[kind]; }; }
onStateChange(fn) { return this.on('state', fn); } onRingEvent(fn) { return this.on('ring', fn); }
- onWearState(fn) { return this.on('wear', fn); } onBatteryState(fn) { return this.on('battery', fn); } onCaseState(fn) { return this.on('case', fn); } onFirmwareInfo() { return noop(); }
+ onWearState(fn) { return this.on('wear', fn); } onBatteryState(fn) { return this.on('battery', fn); } onCaseState(fn) { return this.on('case', fn); } onFirmwareInfo(fn) { return this.on('firmware', fn); }
onFrameMetrics() { return noop(); } onPreviewAnimationFrame() { return noop(); } addCompassListener() { return noop(); } onAncsRelayFrame() { return noop(); }
- onAncsAuthorization() { return noop(); } setRequiresAncs() {} rightWriteLimit() { return 20; } onPhoneLockSignal() {}
+ onAncsAuthorization() { return noop(); } setRequiresAncs() {} ancsRelayAvailable() { return relay.available; } rightWriteLimit() { return 20; } onPhoneLockSignal() {}
async writeRawToRight() {} async configureBrightness() {} async setBrightness() {} async enableWearDetectionAndRequestState() {} async playBuzzerSequence() {} async close() {}
emitState(phase, status = phase) { if (phase === 'connected' || phase === 'disconnected') this.phase = phase; this.listeners.state?.({ phase, status }); }
emitRing(input) { this.listeners.ring?.(input); }
@@ -148,7 +151,10 @@ function fixture() {
'../ui/shell/voice-activity': { voiceActivity: { setActive() {}, isActive: () => false, subscribe: () => () => {} } },
'../native/faceclaw-communicator.ios': { FaceclawCommunicatorBridge, resolveIosPeripherals: async addresses => addresses },
'../native/preview-display.ios': { PreviewDisplayTarget },
- './ancs-client': { ANCS_FIRMWARE_VERSION: 16, AncsClient: class { state = 'disconnected'; start() {} stop() {} stopCommand() { return new Uint8Array(); } receive() { return false; } } },
+ '../g1/firmware/g1v0-image': { G1V0_IMAGE: { version: '0.5.65' } },
+ './ancs-client': { ANCS_FIRMWARE_VERSION: 16, AncsClient: class { state = 'disconnected'; constructor() { relay.client = this; }
+ start() { this.state = 'starting'; relay.starts++; } stop(message) { this.state = 'disconnected'; relay.message = message; }
+ stopCommand() { return new Uint8Array(); } receive() { return false; } } },
'../native/nightscout-bridge': { nightscoutBridge: { async start() {}, async stop() {} } },
'../native/weather': { weatherBridge: { setSessionActive() {} } },
'./glance-host': { GlanceHost }, './events': events,
@@ -172,7 +178,7 @@ function fixture() {
'../apps/all-apps': { ALL_APPS: [{ appId: 'glanceboard', glanceboard: provider }] },
'../apps/onboarding/onboarding-progress': { claimGlassesOnboardingAutoLaunch: () => false },
'../ui/shell/worker-window': {}, '../ui/shell/in-process-window': {},
- '../ui/dashboard-settings': { brightnessSetting: { get: () => 'auto' }, brightnessSettingToLevel: () => null, getBrightnessPreferences: () => ({ auto: true, level: 50, minimum: 2, maximum: 100, curve: '0:0,1000:100', fadeMs: 280 }), lockScreenEnabledSetting: { get: () => settings.lock }, ringConnectionModeSetting: { get: () => 'glasses' }, onAnySettingChanged: fn => { settingsChanged = fn; return () => {}; }, previewColorSetting: { get: () => 'white' } },
+ '../ui/dashboard-settings': { glassesTypeSetting: { get: () => glassesType }, brightnessSetting: { get: () => 'auto' }, brightnessSettingToLevel: () => null, getBrightnessPreferences: () => ({ auto: true, level: 50, minimum: 2, maximum: 100, curve: '0:0,1000:100', fadeMs: 280 }), lockScreenEnabledSetting: { get: () => settings.lock }, ringConnectionModeSetting: { get: () => 'glasses' }, onAnySettingChanged: fn => { settingsChanged = fn; return () => {}; }, previewColorSetting: { get: () => 'white' } },
'../native/phone-battery': { readPhoneBatteryState: () => ({ battery: 80, charging: false }) },
'../apps/ios-availability': { iosAppUnavailableReason: () => null },
'../graphics/glyph-wire': { prepareFrameDraws: () => null },
@@ -214,10 +220,41 @@ function fixture() {
}
async function phone(type, origin = 'ring') { controller.gesture(type, origin); await render(); }
async function connect() { await controller.connect(); await render(); }
- return { controller, shell, battery, remoteHost, keyboardChanged: session => shellOptions.onKeyboardInputChanged(session), settings, phoneState, observers,
+ return { relay, controller, shell, battery, remoteHost, keyboardChanged: session => shellOptions.onKeyboardInputChanged(session), settings, phoneState, observers,
get shellOptions() { return shellOptions; }, registered, inProcessApps,
get bridge() { return bridge; }, connect, wear: wearing => bridge.emitWear(wearing), settingsChanged: () => settingsChanged(), sent, previews, received, boardStats, hardware, phone, advance, render };
}
+test('the session is told which glasses it drives, as a G2 session gets nowhere on a G1', async () => {
+ for (const type of ['g1', 'g2']) {
+ glassesType = type;
+ const f = fixture();
+ await f.connect();
+ assert.equal(f.bridge.addresses.glassesType, type);
+ assert.ok('right' in f.bridge.addresses && 'left' in f.bridge.addresses, 'the arms still come with it');
+ }
+ glassesType = 'g2';
+});
+
+test('a link that comes back asks for the notification relay again; a G1 without one is told to update', async () => {
+ const f = fixture();
+ await f.connect();
+ const firmware = { leftVersion: 'g1v0 0.5.65', rightVersion: 'g1v0 0.5.65', extension: 'Faceclaw/38' };
+ f.bridge.listeners.firmware(firmware);
+ assert.equal(f.relay.starts, 1);
+ // Connected and running: nothing to do.
+ f.bridge.emitState('connected');
+ assert.equal(f.relay.starts, 1);
+ // The firmware's relay ended with the link, so the client must not go on thinking it's ready.
+ f.bridge.emitState('retrying', 'Reconnecting');
+ assert.equal(f.relay.client.state, 'disconnected');
+ f.bridge.emitState('connected');
+ assert.equal(f.relay.starts, 2);
+ f.bridge.emitState('retrying', 'Reconnecting');
+ f.relay.available = false;
+ f.bridge.emitState('connected');
+ assert.equal(f.relay.starts, 2);
+ assert.match(f.relay.message, /firmware 0\.5\.65/);
+});
const assertBlank = pixels => assert.ok(pixels.every(p => p === 0));
const assertBoard = pixels => {
assert.equal(pixels[48 * 640 + 270], 200);
diff --git a/tests/ios-permissions.test.cjs b/tests/ios-permissions.test.cjs
new file mode 100644
index 00000000..66f2a6ad
--- /dev/null
+++ b/tests/ios-permissions.test.cjs
@@ -0,0 +1,131 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const { loader } = require('./helpers/load-typescript.cjs');
+
+const NOT_DETERMINED = 0, DENIED = 2, ALLOWED = 3;
+const STATE_UNAUTHORIZED = 3, STATE_POWERED_ON = 5;
+
+/**
+ * The Permissions page and the real scan layer over a fake Kotlin central. As in
+ * IosBleCentral, registering the scan listener is what creates the CBCentralManager, so
+ * `registrations` counting up from 0 is the moment iOS would show its permission prompt.
+ */
+function harness({ authorization = NOT_DETERMINED, onboarding = true } = {}) {
+ const central = {
+ authorizationValue: authorization,
+ listener: null,
+ registrations: 0,
+ authorization() { return this.authorizationValue; },
+ setScanListenerListener(listener) { this.registrations++; this.listener = listener; },
+ // CoreBluetooth answering: the state arrives some time after the central is created.
+ report(state, value) {
+ this.authorizationValue = value;
+ this.listener.onBluetoothStateStateAuthorization(state, value);
+ },
+ };
+ const alerts = [];
+ const timers = [];
+ const appListeners = new Set();
+ const load = loader({
+ global: { isIOS: true },
+ setTimeout: (fn, delay) => { timers.push({ fn, delay }); return timers.length; },
+ clearTimeout: id => { timers[id - 1].cleared = true; },
+ FaceclawKitIosBleCentral: { alloc: () => ({ initWithPlatform: () => central }) },
+ FaceclawKitIosProtocolPlatform: { shared: {} },
+ FaceclawKitIosBleScanListener: {},
+ }, {
+ '@nativescript/core': {
+ Application: { resumeEvent: 'resume', on: (_name, fn) => appListeners.add(fn), off: (_name, fn) => appListeners.delete(fn) },
+ ApplicationSettings: { getString: (_key, fallback) => fallback, setString() {}, remove() {} },
+ Dialogs: { alert: async options => { alerts.push(options.message); }, confirm: async () => true },
+ Frame: { topmost: () => null },
+ Observable: class { notifyPropertyChange() {} },
+ },
+ '../g2/ios-peripheral-identity': {},
+ '../util/hex-util': { hexToBytes() {} },
+ './kotlin-listener.ios': { kotlinListener: (_protocol, methods) => methods },
+ '../g2/android-permissions': {},
+ '../native/calendar-permissions': { hasCalendarPermission: () => false, ensureCalendarPermission: async () => false },
+ '../native/battery-optimization': {},
+ '../native/file-access': {},
+ '../native/notification-access': {},
+ '../native/media-controller': { mediaControllerBridge: { hasAccess: () => false, requestAccess: async () => false } },
+ });
+ const { PermissionsViewModel } = load('app/phone-ui/permissions-view-model.ts');
+ const model = new PermissionsViewModel({ onboarding });
+ const card = () => model.cards.find(item => item.id === 'nearby-devices');
+ return {
+ central, alerts, timers, appListeners, model, card,
+ checked: () => card().checkVisibility === 'visible',
+ tap: () => card().onCardTap({ object: { bindingContext: card() } }),
+ flush: () => new Promise(resolve => setImmediate(resolve)),
+ };
+}
+
+test('opening the page does not prompt; tapping the card does, and allowing checks it', async () => {
+ const page = harness();
+ page.model.onPageLoaded();
+ assert.equal(page.central.registrations, 0, 'rendering the card must not create the central');
+ assert.equal(page.checked(), false);
+ assert.match(page.model.primaryClass, /dimmed/);
+
+ page.tap();
+ assert.equal(page.central.registrations, 1, 'the tap creates the central, which shows the prompt');
+
+ page.central.report(STATE_POWERED_ON, ALLOWED);
+ await page.flush();
+ assert.equal(page.checked(), true);
+ assert.equal(page.model.primaryClass, '-primary');
+ assert.equal(page.alerts.length, 0);
+});
+
+test('Bluetooth already allowed is checked on the first render, with no central and no prompt', () => {
+ // A central's state arrives asynchronously, which is why a card reading it rendered unchecked
+ // and then had its tap ignored once the state said granted.
+ const page = harness({ authorization: ALLOWED });
+ assert.equal(page.checked(), true);
+ assert.equal(page.model.primaryClass, '-primary');
+ page.tap();
+ assert.equal(page.central.registrations, 0);
+});
+
+test('an answer arriving after the wait timed out still updates the page', async () => {
+ const page = harness();
+ page.model.onPageLoaded();
+ page.tap();
+ page.timers.find(timer => timer.delay === 30_000).fn();
+ await page.flush();
+ assert.match(page.alerts[0], /timed out/);
+ assert.equal(page.checked(), false);
+
+ page.central.report(STATE_POWERED_ON, ALLOWED);
+ assert.equal(page.checked(), true);
+ assert.equal(page.model.primaryClass, '-primary');
+});
+
+test('denied stays unchecked, and tapping again re-reads the state and explains', async () => {
+ const page = harness();
+ page.model.onPageLoaded();
+ page.tap();
+ page.central.report(STATE_UNAUTHORIZED, DENIED);
+ await page.flush();
+ assert.equal(page.checked(), false);
+ assert.match(page.alerts[0], /iPhone Settings/);
+
+ page.tap();
+ assert.equal(page.central.registrations, 2, 'an existing central re-reports its state when registered again');
+ page.central.report(STATE_UNAUTHORIZED, DENIED);
+ await page.flush();
+ assert.equal(page.alerts.length, 2);
+});
+
+test('leaving the page stops watching Bluetooth', () => {
+ const page = harness();
+ page.model.onPageLoaded();
+ page.tap();
+ page.model.onPageUnloaded();
+ assert.equal(page.appListeners.size, 0);
+ const before = page.model.cards;
+ page.central.report(STATE_POWERED_ON, ALLOWED);
+ assert.equal(page.model.cards, before, 'no refresh once unloaded');
+});
diff --git a/tests/ios-privacy-page.test.cjs b/tests/ios-privacy-page.test.cjs
deleted file mode 100644
index 98394fcf..00000000
--- a/tests/ios-privacy-page.test.cjs
+++ /dev/null
@@ -1,57 +0,0 @@
-const test = require('node:test');
-const assert = require('node:assert/strict');
-const { loader } = require('./helpers/load-typescript.cjs');
-
-function harness(width, height) {
- const font = { lineHeight: 20, measureText: text => text.length * 10, getGlyph: () => ({ dwidthX: 10 }) };
- const load = loader({}, { './onboarding-fonts': { onboardingFont: () => font } });
- const { IosPrivacyPage } = load('app/apps/onboarding/ios-privacy-page.ts');
- const { IOS_PRIVACY_NOTICE } = load('app/analytics/privacy-disclosure.ts');
- const page = new IosPrivacyPage();
- let next = 0;
- return {
- page, notice: IOS_PRIVACY_NOTICE, get next() { return next; },
- input(type) { page.handleInput({ type }, { next: () => next++ }); },
- paint() {
- const rows = [];
- page.paint({ width, height, drawText(font, x, y, text) {
- assert.ok(x + font.measureText(text) <= width, `horizontal overflow: ${text}`);
- assert.ok(y >= 0 && y + font.lineHeight <= height, `vertical overflow: ${text}`);
- rows.push({ y, text });
- } });
- return rows;
- },
- };
-}
-
-for (const [width, height] of [[576, 188], [576, 260], [640, 432]]) {
- test(`entire iOS notice is readable before continuing at ${width}x${height}`, () => {
- const h = harness(width, height);
- const shown = [];
- for (let i = 0; !h.next && i < 30; i++) {
- const rows = h.paint();
- const footer = rows.at(-1);
- for (const row of rows.slice(1, -1)) {
- assert.ok(row.y + 20 <= footer.y, 'body must not overlap navigation');
- shown.push(row.text);
- }
- h.input('click');
- }
- assert.equal(h.next, 1);
- // Line breaking may also split after punctuation (e.g. device/app).
- assert.equal(shown.join('').replace(/\s+/g, ''), h.notice.replace(/\s+/g, ''));
- });
-}
-
-test('scrolling stays inside the notice; revisiting starts at the beginning', () => {
- const h = harness(576, 188);
- const first = h.paint().map(row => row.text);
- h.input('scroll-up');
- assert.deepEqual(h.paint().map(row => row.text), first);
- h.input('scroll-down');
- assert.notDeepEqual(h.paint().map(row => row.text), first);
- for (let i = 0; i < 30; i++) h.input('scroll-down');
- assert.equal(h.next, 0, 'scrolling must not accept the notice');
- h.page.enter();
- assert.deepEqual(h.paint().map(row => row.text), first);
-});
diff --git a/tests/ios-sensors.test.cjs b/tests/ios-sensors.test.cjs
index 94bec3b8..d84dffd2 100644
--- a/tests/ios-sensors.test.cjs
+++ b/tests/ios-sensors.test.cjs
@@ -57,6 +57,16 @@ function alsRecord(alsValue) {
return body;
}
+test('only a G1 session runs the G1 connect path', () => {
+ for (const [glassesType, expected] of [['g1', 1], ['g2', 0], [undefined, 0]]) {
+ const { session, FaceclawCommunicatorBridge } = harness();
+ let used = 0;
+ session.useG1 = () => { used++; };
+ new FaceclawCommunicatorBridge({ right: 'r', left: 'l', glassesType });
+ assert.equal(used, expected, String(glassesType));
+ }
+});
+
test('the bridge is the active session from start() until close()', async () => {
const h = harness();
const bridge = new h.FaceclawCommunicatorBridge({ right: 'r', left: 'l' });
diff --git a/tests/ios-watch-remote.test.cjs b/tests/ios-watch-remote.test.cjs
index 316b854b..f656885c 100644
--- a/tests/ios-watch-remote.test.cjs
+++ b/tests/ios-watch-remote.test.cjs
@@ -125,6 +125,7 @@ function loadRemote({ phase = 'disconnected', preview = false, now = 1_800_000_0
'../apps/evenhub/installed-apps': { getInstalledEvenHubApps: () => [], installedEvenHubAppId: id => id },
'../native/wear-bridge': { wearBridge: bridge, WEAR_PATHS: types().WEAR_PATHS },
'../ui/dashboard-settings': {
+ glassesModelName: () => 'G1',
onAnySettingChanged() {}, watchCanUnlockSetting: setting(true), watchCrownClockwiseNextSetting: setting(false),
watchMirrorAssistantSetting: setting(true), watchRemoteEnabledSetting: setting(true),
watchVibrateOnInputSetting: setting(true), watchSoundEffectsSetting: setting(false),
@@ -135,7 +136,7 @@ function loadRemote({ phase = 'disconnected', preview = false, now = 1_800_000_0
})[id] ?? {},
});
const remote = new WearRemote({
- apps: [{ appId: 'timer', title: 'Timer' }],
+ apps: () => [{ appId: 'timer', title: 'Timer' }],
injectInput: async kind => { inputs.push(kind); },
launchApp: async () => {}, connect: async () => {}, disconnect: async () => {},
setGlassesLocked() {}, requestShellRender() {},
@@ -214,6 +215,10 @@ test('the mirrored state carries the Apple Watch feedback settings', () => {
assert.equal(state.soundEffects, false);
});
+test('the mirrored state names the glasses for the charging line', () => {
+ assert.equal(loadRemote({ phase: 'charging' }).remote.buildState().glassesModel, 'G1');
+});
+
test('the mirrored state says when gestures are landing on the preview', () => {
const state = loadRemote({ preview: true }).remote.buildState();
assert.equal(state.preview, true);
diff --git a/tests/kotlin/src/commonTest/kotlin/com/faceclaw/app/ColorGlyphArtTest.kt b/tests/kotlin/src/commonTest/kotlin/com/faceclaw/app/ColorGlyphArtTest.kt
new file mode 100644
index 00000000..7e5b9ba6
--- /dev/null
+++ b/tests/kotlin/src/commonTest/kotlin/com/faceclaw/app/ColorGlyphArtTest.kt
@@ -0,0 +1,108 @@
+package com.faceclaw.app
+
+import kotlin.math.pow
+import kotlin.math.roundToInt
+import kotlin.test.*
+
+class ColorGlyphArtTest {
+ private val size = 16
+
+ private val clear = 0
+ private val white = argb(255, 255, 255, 255)
+ private val yellow = argb(255, 255, 204, 50)
+ private val brown = argb(255, 90, 50, 20)
+ private val darkGray = argb(255, 60, 60, 60)
+ private val green = argb(255, 120, 170, 60)
+ private val red = argb(255, 230, 60, 50)
+ private val lightRed = argb(255, 250, 140, 130)
+
+ private fun argb(a: Int, r: Int, g: Int, b: Int): Int = (a shl 24) or (r shl 16) or (g shl 8) or b
+
+ private fun glyph(pixel: (x: Int, y: Int) -> Int): IntArray = IntArray(size * size) { pixel(it % size, it / size) }
+
+ private fun inDisc(x: Int, y: Int): Boolean {
+ val dx = x + 0.5 - size / 2.0
+ val dy = y + 0.5 - size / 2.0
+ return dx * dx + dy * dy <= 7.0 * 7.0
+ }
+
+ private fun at(shade: ByteArray, x: Int, y: Int): Int = shade[y * size + x].toInt() and 0xff
+
+ private fun lit(level: Double): Int = (255 * level.pow(NotificationIconArt.GAMMA)).roundToInt()
+
+ @Test fun whiteGlyphIsItsAlpha() {
+ // An ordinary glyph drawn in white: antialiased edges, no color anywhere.
+ val pixels = glyph { x, y -> if (x in 4..11) argb(if (x == 4 || x == 11) 90 else 255, 255, 255, 255) else clear }
+ assertFalse(ColorGlyphArt.isColor(pixels))
+ assertContentEquals(ByteArray(pixels.size) { ((pixels[it] ushr 24) and 0xff).toByte() }, ColorGlyphArt.coverage(pixels))
+ }
+
+ @Test fun faintColorFringeIsNotColor() {
+ // Unpremultiplying a nearly transparent pixel can land anywhere; only real ink counts.
+ val pixels = glyph { x, _ -> if (x == 3) argb(8, 0, 0, 0) else if (x in 4..11) white else clear }
+ assertFalse(ColorGlyphArt.isColor(pixels))
+ }
+
+ @Test fun oneColorGlyphLightsFully() {
+ // 🖤: dark by lightness, but its shape is what matters.
+ val pixels = glyph { x, y -> if (inDisc(x, y)) darkGray else clear }
+ assertTrue(ColorGlyphArt.isColor(pixels))
+ val shade = ColorGlyphArt.coverage(pixels)
+ assertEquals(255, at(shade, 8, 8))
+ assertEquals(0, at(shade, 0, 0))
+ }
+
+ @Test fun darkDetailOnALightBodyStaysVisibleButDim() {
+ // 😀: a yellow disc with dark eyes and mouth; the body stays full, the features dim.
+ val pixels = glyph { x, y ->
+ when {
+ !inDisc(x, y) -> clear
+ (y in 5..6 && (x == 5 || x == 10)) || (y == 11 && x in 5..10) -> brown
+ else -> yellow
+ }
+ }
+ val shade = ColorGlyphArt.coverage(pixels)
+ assertEquals(255, at(shade, 8, 8))
+ assertEquals(lit(0.3), at(shade, 5, 5))
+ assertTrue(at(shade, 5, 5) > 0)
+ }
+
+ @Test fun lightDetailOnADarkerBodyDimsTheBody() {
+ // ✅: a green tile with a large white check; the check lights fully above a dimmer tile.
+ val pixels = glyph { x, y ->
+ when {
+ x !in 1..14 || y !in 1..14 -> clear
+ (x in 4..7 && y in 9..11) || (x in 7..12 && y in 4..8) -> white
+ else -> green
+ }
+ }
+ val shade = ColorGlyphArt.coverage(pixels)
+ assertEquals(255, at(shade, 9, 6))
+ assertEquals(lit(0.6), at(shade, 2, 2))
+ }
+
+ @Test fun smallHighlightLeavesTheBodyFull() {
+ // ❤️: a red body with a small glint; the glint is not detail worth dimming the body for.
+ val pixels = glyph { x, y ->
+ when {
+ !inDisc(x, y) -> clear
+ x in 4..5 && y in 4..5 -> lightRed
+ else -> red
+ }
+ }
+ val shade = ColorGlyphArt.coverage(pixels)
+ assertEquals(255, at(shade, 8, 8))
+ assertEquals(255, at(shade, 4, 4))
+ }
+
+ @Test fun edgeAlphaScalesTheShade() {
+ val pixels = glyph { x, y -> if (x == 2) argb(128, 60, 60, 60) else if (x in 3..12 && y in 3..12) darkGray else clear }
+ val shade = ColorGlyphArt.coverage(pixels)
+ assertEquals(128, at(shade, 2, 8))
+ assertEquals(0, at(shade, 1, 8))
+ }
+
+ @Test fun emptyGlyphIsEmpty() {
+ assertTrue(ColorGlyphArt.shade(IntArray(size * size)).all { it.toInt() == 0 })
+ }
+}
diff --git a/tests/kotlin/src/commonTest/kotlin/com/faceclaw/app/G1FlashTest.kt b/tests/kotlin/src/commonTest/kotlin/com/faceclaw/app/G1FlashTest.kt
new file mode 100644
index 00000000..a089bbb3
--- /dev/null
+++ b/tests/kotlin/src/commonTest/kotlin/com/faceclaw/app/G1FlashTest.kt
@@ -0,0 +1,986 @@
+package com.faceclaw.app
+
+import kotlin.test.Test
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertTrue
+
+private const val ARM = "F4:27:E9:CA:E8:3F"
+
+private fun hex(text: String): ByteArray = ByteArray(text.length / 2) { text.substring(it * 2, it * 2 + 2).toInt(16).toByte() }
+
+/** An image the way MCUboot lays one out: header, payload, then a TLV area with its SHA-256. */
+private fun testImage(version: Triple = Triple(0, 5, 64), payloadSize: Int = 5000): ByteArray {
+ val headerSize = 512
+ val hash = ByteArray(32) { (it * 3 + version.third).toByte() }
+ val image = ByteArray(headerSize + payloadSize + 4 + 4 + 32)
+ fun put16(at: Int, value: Int) {
+ image[at] = value.toByte()
+ image[at + 1] = (value ushr 8).toByte()
+ }
+ fun put32(at: Int, value: Int) {
+ put16(at, value and 0xffff)
+ put16(at + 2, value ushr 16)
+ }
+ put32(0, 0x96f3b83d.toInt())
+ put16(8, headerSize)
+ put32(12, payloadSize)
+ image[20] = version.first.toByte()
+ image[21] = version.second.toByte()
+ put16(22, version.third)
+ for (i in 0 until payloadSize) image[headerSize + i] = (i * 7).toByte()
+ val tlv = headerSize + payloadSize
+ put16(tlv, 0x6907)
+ put16(tlv + 2, 4 + 4 + 32)
+ put16(tlv + 4, 0x10)
+ put16(tlv + 6, 32)
+ hash.copyInto(image, tlv + 8)
+ return image
+}
+
+/**
+ * One arm behind the StockLink port: MCUmgr's image and OS groups as flash.py meets them on real arms, and g1v0's HELLO,
+ * PROPS and asset store. Requests are answered synchronously, from the write. [netImage] is what a restore puts in image
+ * 1's slot.
+ */
+private class FakeArm(private val image: ByteArray, var stock: Boolean = false, private val netImage: ByteArray? = null) : StockLink {
+ var inbound: StockLinkListener? = null
+ var connected = false
+ var bond = BondState.BONDED
+ var bondRequests = 0
+ var bondResult = BondState.BONDED
+ val subscribed = ArrayList()
+ val heartbeats = ArrayList()
+ val calls = ArrayList()
+
+ var runningVersion = "0.5.63"
+ var safeMode = false
+ var battery = 80
+
+ /** The hash in each image's second slot. */
+ val slotHashes = HashMap()
+ var slot1Hash: ByteArray?
+ get() = slotHashes[0]
+ set(value) {
+ if (value == null) slotHashes.remove(0) else slotHashes[0] = value
+ }
+ /** Images marked for the next boot, and whether permanently. */
+ val pending = HashMap()
+ val confirms = ArrayList>()
+ /** The image of the upload in progress, and what each image's last whole upload was. */
+ var uploadImage = -1
+ val uploads = HashMap()
+ var uploaded = ByteArray(0)
+ var uploadOffset = 0
+ var uploadRefusal = 0
+ /** After the upload the list shows this instead of the image's hash. */
+ var corruptAfterUpload = false
+ var confirmRefusal = 0
+ /** Only this image's confirm is refused; -1: any. */
+ var confirmRefusalImage = -1
+ /** This image's confirm is answered, and the list doesn't show it pending. */
+ var unmarkedImage = -1
+
+ /** No `ASSET_INFO`, as before 0.5.56. */
+ var storeSupported = true
+ var storeAvailable = true
+ var storeAssets = 0
+ var storeSeq = 0L
+ var storeState = 0
+ var storeError = 0
+ /** Bytes that aren't 0xFF in the store's directory sectors: Even's data, until a format. */
+ var directoryNonErased = 4096L
+ /** The format's NOTICE 8 never comes. */
+ var loseStoreNotice = false
+ /** The arm restarts during the wipe: no notice, and the job state back to idle. */
+ var wipeInterrupted = false
+ val formats = ArrayList()
+ var dropAtOffset = -1
+ var silentRequests = 0
+ /** The chunk at this offset gets no answer, once. */
+ var silentAtOffset = -1
+ var onChunk: (() -> Unit)? = null
+ var connects = 0
+ /** The OS remembers a table without g1v0's services, as after an install at the same address. */
+ var staleTable = false
+ var refreshes = 0
+ /** Android says bonded and the arm has lost its half. */
+ var staleBond = false
+ var removedBonds = 0
+ var inCase = false
+ /** Even's firmware's answer to its battery query; null: it says nothing. */
+ var stockBatteryReply: ByteArray? = null
+
+ val wantHash = G1Smp.imageHash(image)
+
+ override fun setListener(listener: StockLinkListener?) { inbound = listener }
+ override fun connect(address: String, timeoutMs: Int): Boolean {
+ connects++
+ connected = true
+ return true
+ }
+ override fun prepareLink(address: String, desiredMtu: Int, timeoutMs: Int) {}
+ override fun discoverServices(address: String, timeoutMs: Int): Boolean = connected
+ /** As FaceclawBleManager: a characteristic the table lacks throws, a refused one (no encryption) returns false. */
+ override fun enableNotifications(address: String, characteristicUuid: String, timeoutMs: Int): Boolean {
+ if (!connected) throw IllegalStateException("Not connected")
+ if (!hasCharacteristic(address, characteristicUuid)) throw IllegalStateException("Characteristic not found: $characteristicUuid")
+ if (stock && staleBond && characteristicUuid == G1Smp.NUS_TX_UUID) return false
+ subscribed.add(characteristicUuid)
+ return true
+ }
+ override fun hasCharacteristic(address: String, characteristicUuid: String): Boolean = when (characteristicUuid) {
+ G1Ble.EVT_CHAR_UUID -> !stock && !staleTable
+ G1Smp.NUS_TX_UUID -> stock
+ else -> true
+ }
+ override fun refreshServices(address: String, timeoutMs: Int): Boolean {
+ refreshes++
+ staleTable = false
+ return connected
+ }
+ override fun removeBond(address: String): Boolean {
+ removedBonds++
+ bond = BondState.NONE
+ staleBond = false
+ connected = false
+ return true
+ }
+ override fun isConnected(address: String): Boolean = connected
+ override fun bondState(address: String): BondState = bond
+ override fun requestBond(address: String) {
+ bondRequests++
+ bond = bondResult
+ }
+ override fun negotiatedMtu(address: String): Int = 100
+ override fun disconnect(address: String) { connected = false }
+ override fun close() { connected = false }
+
+ fun drop() {
+ connected = false
+ inbound?.onConnectionStateChange(ARM, false)
+ }
+
+ override fun writeFrames(address: String, characteristicUuid: String, frames: List, mode: GattWriteMode, timeoutMs: Int): Boolean {
+ if (!connected) throw IllegalStateException("Not connected")
+ when (characteristicUuid) {
+ G1Smp.NUS_RX_UUID -> {
+ val frame = frames.single()
+ if (frame[0].toInt() == 0x2c) {
+ stockBatteryReply?.let { inbound?.onNotification(ARM, G1Smp.NUS_TX_UUID, it) }
+ } else {
+ heartbeats.add(frame)
+ }
+ }
+ G1Ble.PAIR_CHAR_UUID -> return bond == BondState.BONDED && !staleBond
+ G1Ble.CTRL_CHAR_UUID -> control(frames.single())
+ G1Smp.SMP_CHAR_UUID -> {
+ for (frame in frames) assertTrue(frame.size <= 97, "a write longer than the MTU allows")
+ smp(frames.reduce { a, b -> a + b })
+ }
+ else -> throw IllegalStateException("write to $characteristicUuid")
+ }
+ return true
+ }
+
+ private fun control(request: ByteArray) {
+ val op = request[0].toInt() and 0xff
+ val tag = request[1]
+ val args = request.copyOfRange(2, request.size)
+ var status = 0
+ var after: (() -> Unit)? = null
+ val body = when (op) {
+ G1Protocol.OP_HELLO -> {
+ val parts = runningVersion.split(".").map { it.toInt().toByte() }
+ val flags = (if (safeMode) 1 else 0) or 2 or (if (staleBond) 0 else 64) or (if (inCase) 128 else 0)
+ byteArrayOf(5, parts[0], parts[1], parts[2], 1, flags.toByte(), 0)
+ }
+ G1Protocol.OP_PROPS -> byteArrayOf(battery.toByte(), 0, 0, 0)
+ G1Protocol.OP_ASSET_INFO -> {
+ if (!storeSupported) {
+ status = 2
+ ByteArray(0)
+ } else {
+ ByteArray(12) + byteArrayOf(storeAssets.toByte(), storeState.toByte(), storeError.toByte(), if (storeAvailable) 1 else 0) +
+ le32(storeSeq.toInt())
+ }
+ }
+ G1Protocol.OP_FLASH_CRC -> {
+ calls.add("crc")
+ assertContentEquals(G1Protocol.flashCrcRequest(G1Protocol.STORE_ADDRESS, G1Protocol.STORE_DIRECTORY_BYTES), args)
+ if (safeMode) {
+ status = 7
+ } else {
+ after = { storeNotice(G1Protocol.STORE_JOB_CRC, 0, args + le32(0x1234) + le32(directoryNonErased.toInt())) }
+ }
+ ByteArray(0)
+ }
+ G1Protocol.OP_ASSET_FORMAT -> {
+ calls.add("format")
+ assertContentEquals(G1Protocol.assetFormatRequest(wipe = true), args)
+ when {
+ safeMode -> status = 7
+ storeState in 1..3 -> status = 13
+ else -> {
+ formats.add(true)
+ storeAssets = 0
+ storeSeq = 0
+ directoryNonErased = 0
+ if (wipeInterrupted) {
+ storeState = 0
+ } else {
+ storeState = 4
+ storeError = 0
+ if (!loseStoreNotice) after = { storeNotice(G1Protocol.STORE_JOB_FORMAT, 0, ByteArray(16)) }
+ }
+ }
+ }
+ ByteArray(0)
+ }
+ else -> ByteArray(0)
+ }
+ val event = ByteArray(9) + byteArrayOf(tag, status.toByte()) + body
+ event[0] = (0x80 or op).toByte()
+ inbound?.onNotification(ARM, G1Ble.EVT_CHAR_UUID, event)
+ after?.invoke()
+ }
+
+ private fun storeNotice(job: Int, result: Int, detail: ByteArray) {
+ val event = ByteArray(9) + byteArrayOf(G1Protocol.NOTICE_STORE_JOB.toByte(), job.toByte(), result.toByte()) + detail
+ event[0] = G1Protocol.EV_NOTICE.toByte()
+ inbound?.onNotification(ARM, G1Ble.EVT_CHAR_UUID, event)
+ }
+
+ private fun le32(value: Int): ByteArray = byteArrayOf(value.toByte(), (value ushr 8).toByte(), (value ushr 16).toByte(), (value ushr 24).toByte())
+
+ private fun imageOf(index: Int): ByteArray = when (index) {
+ 0 -> image
+ 1 -> netImage ?: throw AssertionError("an upload to image 1")
+ else -> throw AssertionError("an upload to image $index")
+ }
+
+ private fun smp(frame: ByteArray) {
+ val op = frame[0].toInt()
+ val group = frame[5].toInt()
+ val seq = frame[6].toInt() and 0xff
+ val cmd = frame[7].toInt()
+ val body = G1Cbor.decode(frame, 8) as Map<*, *>
+ if (silentRequests > 0) {
+ silentRequests--
+ return
+ }
+ when {
+ group == 1 && cmd == 1 -> {
+ calls.add("upload")
+ val off = (body["off"] as Long).toInt()
+ onChunk?.invoke()
+ if (off == silentAtOffset) {
+ silentAtOffset = -1
+ return
+ }
+ if (uploadRefusal != 0) return reply(op, group, seq, cmd, mapOf("rc" to uploadRefusal))
+ if (off == 0) {
+ // A first chunk names the image; the same file again resumes where it stopped, as MCUmgr does.
+ val index = (body["image"] as Long).toInt()
+ val expected = imageOf(index)
+ assertEquals(expected.size.toLong(), body["len"])
+ assertContentEquals(sha256(expected), body["sha"] as ByteArray)
+ if (index != uploadImage || uploadOffset >= expected.size) {
+ uploadImage = index
+ uploadOffset = 0
+ uploaded = ByteArray(0)
+ }
+ }
+ if (off == uploadOffset) {
+ val data = body["data"] as ByteArray
+ uploaded += data
+ uploadOffset += data.size
+ if (uploadOffset == imageOf(uploadImage).size) {
+ uploads[uploadImage] = uploaded
+ slotHashes[uploadImage] = if (corruptAfterUpload) ByteArray(32) else G1Smp.imageHash(uploaded)
+ }
+ }
+ if (uploadOffset >= dropAtOffset && dropAtOffset >= 0) {
+ dropAtOffset = -1
+ drop()
+ return
+ }
+ reply(op, group, seq, cmd, mapOf("rc" to 0, "off" to uploadOffset))
+ }
+ group == 1 && cmd == 0 && op == G1Smp.OP_READ -> {
+ calls.add("list")
+ val images = ArrayList