@glassly/bluetooth-sdk 0.1.0-dev.111 → 0.1.0-dev.113

package/android/src/main/java/com/glassly/bluetoothsdk/GeneratedReleaseMetadata.kt

@@ -3,9 +3,9 @@ package com.glassly.bluetoothsdk
 /** Generated by release CI. Do not edit in a release checkout. */
 internal object GeneratedReleaseMetadata {
     const val FAMILY_BASE_VERSION: String = "0.1.0"
-    const val RELEASE_IDENTITY: String = "0.1.0-dev.111"
-    const val RELEASE_SET_ID: String = "glassly-0.1.0-dev.111"
-    const val SOURCE_COMMIT: String = "fa91a3665743b2d5e5ed12f8cf738b715c4d8458"
+    const val RELEASE_IDENTITY: String = "0.1.0-dev.113"
+    const val RELEASE_SET_ID: String = "glassly-0.1.0-dev.113"
+    const val SOURCE_COMMIT: String = "e63da43b467758373b960b0ee9167ef29938a11c"
     const val OTA_MANIFEST_URL: String = ""
     const val OTA_MANIFEST_SHA256: String = ""
 }

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

@@ -1578,6 +1578,10 @@ class G2 : SGCManager() {
             supportsCfwSceneRendering &&
                 listOf("scene17", "shapes16", "anim18", "texcache12", "teximg13", "font15").all { it in cfwFeatures }
 
+    /** TEXT_INLINE records: default text drawn by the glasses' font, no cache upload. */
+    private val supportsCfwInlineText: Boolean
+        get() = "inlinetext17" in cfwFeatures
+
     /** The on-glass slot table must be re-SET on the next vector frame. */
     private var cfwSceneInvalid = true
 
@@ -3104,9 +3108,10 @@ class G2 : SGCManager() {
         }
         if (cfwLastBoxes != boxes) cfwSceneInvalid = true
         val invalidate = cfwSceneInvalid
+        val inlineText = supportsCfwInlineText
         val encoded =
             kotlinx.coroutines.withContext(Dispatchers.Default) {
-                G2CfwRenderer.encodeVector(frame, boxes, cfwCacheGeneration, invalidate)
+                G2CfwRenderer.encodeVector(frame, boxes, cfwCacheGeneration, invalidate, inlineText)
             }
         if (encoded == null) {
             Bridge.log("G2: vector scene does not fit; using the raster path for this frame")

package/android/src/main/java/com/glassly/bluetoothsdk/sgcs/G2CfwRenderer.kt

@@ -87,6 +87,7 @@ internal object G2CfwRenderer {
         boxes: LensBoxes,
         cacheGeneration: Int,
         invalidate: Boolean,
+        inlineText: Boolean,
     ): G2CfwScene.Encoded? {
         if (textureCache.generation != cacheGeneration || textureCache.exhausted) {
             textureCache.reset(cacheGeneration)
@@ -103,11 +104,11 @@ internal object G2CfwRenderer {
                 h,
             )
         }
-        scene.encode(frame, boxes.leftX, boxes.leftY, textureCache, rasterizeOne)?.let { return it }
+        scene.encode(frame, boxes.leftX, boxes.leftY, textureCache, rasterizeOne, inlineText)?.let { return it }
         // Out of texture cache mid-frame: start a fresh cache and repack once.
         textureCache.reset(cacheGeneration)
         scene.reset(cacheGeneration)
-        return scene.encode(frame, boxes.leftX, boxes.leftY, textureCache, rasterizeOne)
+        return scene.encode(frame, boxes.leftX, boxes.leftY, textureCache, rasterizeOne, inlineText)
     }
     private val glyphRasterMemo = mutableMapOf<String, ByteArray>()
 

package/android/src/main/java/com/glassly/bluetoothsdk/sgcs/G2CfwScene.kt

@@ -6,13 +6,14 @@ import java.io.ByteArrayOutputStream
  * Retained vector scene for the Glassly CFW (firmware modes 16-18).
  *
  * Every scene element becomes one or more firmware slots (paint order = slot
- * order): vector shapes map 1:1, builtin-font text becomes one TEXT slot per
- * line with its bytes in the texture cache, and everything else (proportional
- * text, images) is rasterized on the phone and drawn as cached IMAGE slots
- * tiled to the 255 px slot limit. Frames diff against the last committed
- * layout: unchanged slots cost nothing, geometry changes on an element with a
- * transition become firmware TWEENs, and anything else is re-SET. Slot indices
- * stay stable per element id; a reorder or an over-budget frame repacks.
+ * order): vector shapes map 1:1; default and builtin text becomes one inline
+ * TEXT slot per line drawn by the glasses' font (or a cache-backed TEXT slot on
+ * firmware without inline records); mono text and images are rasterized on
+ * the phone and drawn as cached IMAGE slots tiled to the 255 px slot limit.
+ * Frames diff against the last committed layout: unchanged slots cost nothing,
+ * geometry changes on an element with a transition become firmware TWEENs, and
+ * anything else is re-SET. Slot indices stay stable per element id; a reorder
+ * or an over-budget frame repacks.
  */
 internal class G2CfwScene {
     companion object {
@@ -20,7 +21,9 @@ internal class G2CfwScene {
         const val RECORD_BYTES = 20
         const val FRAME_PERIOD_MS = 33.0
         const val TEXT_LINE_HEIGHT = 27
+        const val TEXT_INSET = 2
         const val MAX_TEXT_BYTES = 64
+        const val MAX_INLINE_BYTES = 128
         const val MAX_TILE_SIZE = 255
         /** Mode-13/15 options: identity ramp, transparent source color 0. */
         const val TEXT_OPTIONS = 0x1F
@@ -42,6 +45,7 @@ internal class G2CfwScene {
         const val TYPE_IMAGE = 14
         const val TYPE_TEXT = 15
         const val TYPE_TEXT_CACHED = 16
+        const val TYPE_TEXT_INLINE = 17
 
         /** Geometry parameters a TWEEN may interpolate, per type. Texture offsets and lengths never tween. */
         fun tweenableMask(type: Int): Int =
@@ -52,6 +56,7 @@ internal class G2CfwScene {
                 TYPE_TRI, TYPE_TRI_FILL, TYPE_BEZIER2 -> 0x3F
                 TYPE_QUAD, TYPE_QUAD_FILL, TYPE_BEZIER3 -> 0xFF
                 TYPE_IMAGE, TYPE_TEXT, TYPE_TEXT_CACHED -> 0x03
+                TYPE_TEXT_INLINE -> 0x0F
                 else -> 0
             }
 
@@ -71,7 +76,7 @@ internal class G2CfwScene {
         }
 
         /** UTF-8 bytes of a line without firmware control bytes (1..31), cut at a codepoint boundary. */
-        fun textBytes(line: String): ByteArray {
+        fun textBytes(line: String, limit: Int = MAX_TEXT_BYTES): ByteArray {
             val out = ByteArrayOutputStream()
             var i = 0
             while (i < line.length) {
@@ -79,7 +84,7 @@ internal class G2CfwScene {
                 i += Character.charCount(cp)
                 if (cp < 32) continue
                 val encoded = String(Character.toChars(cp)).toByteArray(Charsets.UTF_8)
-                if (out.size() + encoded.size > MAX_TEXT_BYTES) break
+                if (out.size() + encoded.size > limit) break
                 out.write(encoded)
             }
             return out.toByteArray()
@@ -96,7 +101,10 @@ internal class G2CfwScene {
             out.write((value ushr 8) and 0xFF)
         }
 
-        /** `[0][slot][type][flags=visible][color][width][p0..p7 LE]` */
+        /**
+         * `[0][slot][type][flags=visible][color][width][p0..p7 LE]`, or for TEXT_INLINE
+         * `[0][slot][17][1][color][width][x][y][w][h][len][bytes]`.
+         */
         fun setRecord(slot: Slot, index: Int): ByteArray {
             val out = ByteArrayOutputStream()
             out.write(0)
@@ -105,7 +113,13 @@ internal class G2CfwScene {
             out.write(1)
             out.write(slot.color)
             out.write(slot.width)
-            for (value in slot.params) le(out, value)
+            val inline = slot.type == TYPE_TEXT_INLINE
+            for (k in 0 until (if (inline) 4 else 8)) le(out, slot.params[k])
+            if (inline) {
+                val bytes = slot.text.take(MAX_INLINE_BYTES).toByteArray()
+                out.write(bytes.size)
+                out.write(bytes)
+            }
             return out.toByteArray()
         }
 
@@ -114,7 +128,7 @@ internal class G2CfwScene {
          * change is not a pure geometry/stroke change of the same shape type.
          */
         fun tweenRecord(old: Slot, new: Slot, index: Int, frames: Int, curve: IntArray): ByteArray? {
-            if (old.type != new.type) return null
+            if (old.type != new.type || !old.text.contentEquals(new.text)) return null
             val tweenable = tweenableMask(new.type)
             var mask = 0
             val values = mutableListOf<Int>()
@@ -126,7 +140,9 @@ internal class G2CfwScene {
             }
             val isTexture = new.type >= TYPE_IMAGE
             if (old.color != new.color) {
-                if (isTexture) return null
+                // Inline text may fade (low nibble) as long as its option bits stay put.
+                val inlineFade = new.type == TYPE_TEXT_INLINE && (old.color and 0xF0) == (new.color and 0xF0)
+                if (isTexture && !inlineFade) return null
                 mask = mask or 0x100
                 values.add(new.color)
             }
@@ -147,15 +163,19 @@ internal class G2CfwScene {
         }
     }
 
-    /** One firmware slot: type, 4-bit color (or options byte), stroke width, eight int16 parameters. */
-    class Slot(val type: Int, val color: Int, val width: Int, params: List<Int>) {
+    /**
+     * One firmware slot: type, 4-bit color (or options byte), stroke width, eight
+     * int16 parameters, and the record's own bytes for TEXT_INLINE.
+     */
+    class Slot(val type: Int, val color: Int, val width: Int, params: List<Int>, val text: ByteArray = ByteArray(0)) {
         val params: IntArray = IntArray(8) { params.getOrElse(it) { 0 } }
 
         override fun equals(other: Any?): Boolean =
             other is Slot && other.type == type && other.color == color && other.width == width &&
-                other.params.contentEquals(params)
+                other.params.contentEquals(params) && other.text.contentEquals(text)
 
-        override fun hashCode(): Int = ((type * 31 + color) * 31 + width) * 31 + params.contentHashCode()
+        override fun hashCode(): Int =
+            (((type * 31 + color) * 31 + width) * 31 + params.contentHashCode()) * 31 + text.contentHashCode()
     }
 
     class ElementState(val id: String, val contentHash: String, val slots: List<Slot>, val indices: List<Int>)
@@ -189,11 +209,15 @@ internal class G2CfwScene {
         return Triple(clampCoord(element.x + element.w / 2 + ox), clampCoord(element.y + element.h / 2 + oy), r)
     }
 
-    /** Slots for one element, or null when the texture cache cannot hold its content. */
+    /**
+     * Slots for one element, or null when the texture cache cannot hold its content.
+     * [inlineText] selects TEXT_INLINE records for default/builtin text.
+     */
     fun slotsFor(
         element: SceneElement,
         ox: Int,
         oy: Int,
+        inlineText: Boolean,
         cache: G2CfwTextureCache,
         rasterize: (SceneElement, Int, Int) -> ByteArray?,
     ): List<Slot>? {
@@ -245,13 +269,46 @@ internal class G2CfwScene {
                 val params = (0 until n).flatMap { point(element, it, ox, oy).toList() }
                 listOf(Slot(if (n == 3) TYPE_BEZIER2 else TYPE_BEZIER3, color, stroke(element), params))
             }
-            "text" -> if (element.font == "builtin") builtinTextSlots(element, x, y, cache)
-                      else rasterSlots(element, x, y, cache, rasterize)
+            "text" ->
+                when {
+                    element.font == "mono" -> rasterSlots(element, x, y, cache, rasterize)
+                    inlineText -> inlineTextSlots(element, x, y)
+                    element.font == "builtin" -> builtinTextSlots(element, x, y, cache)
+                    else -> rasterSlots(element, x, y, cache, rasterize)
+                }
             "image" -> rasterSlots(element, x, y, cache, rasterize)
             else -> emptyList()
         }
     }
 
+    /** One TEXT_INLINE slot per line, drawn by the glasses' font at the phone-raster 2 px inset, clipped to the box. */
+    private fun inlineTextSlots(element: SceneElement, x: Int, y: Int): List<Slot> {
+        val out = mutableListOf<Slot>()
+        val w = element.w.coerceIn(0, 2047)
+        val h = element.h.coerceIn(0, 2047)
+        if (element.border > 0) {
+            out.add(Slot(TYPE_RECT, gray(element), stroke(element), listOf(x, y, w, h, element.radius.coerceIn(0, 2047))))
+        }
+        val options = 0x10 or gray(element)
+        val maxLines = maxOf(1, element.h / TEXT_LINE_HEIGHT)
+        val lines = (element.text ?: "").split("\n").take(maxLines)
+        for ((index, line) in lines.withIndex()) {
+            val bytes = textBytes(line, MAX_INLINE_BYTES)
+            if (bytes.isEmpty()) continue
+            val lineY = y + TEXT_INSET + index * TEXT_LINE_HEIGHT
+            val clipW = maxOf(0, element.w - TEXT_INSET).coerceAtMost(2047)
+            val clipH = maxOf(0, element.h - TEXT_INSET - index * TEXT_LINE_HEIGHT).coerceAtMost(2047)
+            out.add(
+                Slot(
+                    TYPE_TEXT_INLINE, options, 0,
+                    listOf(clampCoord(x + TEXT_INSET), clampCoord(lineY), clipW, clipH, bytes.size),
+                    bytes,
+                ),
+            )
+        }
+        return out
+    }
+
     private fun builtinTextSlots(element: SceneElement, x: Int, y: Int, cache: G2CfwTextureCache): List<Slot>? {
         val out = mutableListOf<Slot>()
         if (element.border > 0) {
@@ -324,10 +381,11 @@ internal class G2CfwScene {
         originY: Int,
         cache: G2CfwTextureCache,
         rasterize: (SceneElement, Int, Int) -> ByteArray?,
+        inlineText: Boolean = false,
     ): Encoded? {
         val desired = mutableListOf<Desired>()
         for (element in frame.elements) {
-            val slots = slotsFor(element, originX, originY, cache, rasterize) ?: return null
+            val slots = slotsFor(element, originX, originY, inlineText, cache, rasterize) ?: return null
             desired.add(
                 Desired(element.id, element.contentHash, slots, transitionFrames(element.transitionMs), easingCurve(element.easing)),
             )

package/android/src/main/java/com/glassly/bluetoothsdk/sgcs/G2Flasher.kt

@@ -50,8 +50,8 @@ internal object G2FirmwareCatalog {
                 displayName = "Glassly CFW",
                 version = "2.2.9.22 CFW",
                 fileName = "g2-glassly-cfw-2.2.9.22.evenota.bin",
-                sha256 = "fe6051085507269c8007bc1245bfe8bd10d5c566540389ae976daaf753f536f9",
-                size = 4_527_476,
+                sha256 = "560d4d94344573d11ba58690221c0ea7d5a5e8c8d29c12f158e81078484b815c",
+                size = 4_528_184,
             ),
         )
 

package/android/src/test/java/com/glassly/bluetoothsdk/sgcs/G2CfwSceneTest.kt

@@ -35,8 +35,8 @@ class G2CfwSceneTest {
     private fun frame(elements: List<SceneElement>, replay: Boolean = false) =
         SceneFrame("app", 1, replay, elements, emptyList())
 
-    private fun encode(scene: G2CfwScene, cache: G2CfwTextureCache, elements: List<SceneElement>) =
-        scene.encode(frame(elements), 32, 96, cache) { _, w, h -> ByteArray(w * h) { 0xFF.toByte() } }
+    private fun encode(scene: G2CfwScene, cache: G2CfwTextureCache, elements: List<SceneElement>, inlineText: Boolean = false) =
+        scene.encode(frame(elements), 32, 96, cache, { _, w, h -> ByteArray(w * h) { 0xFF.toByte() } }, inlineText)
 
     private fun le(v: Int): List<Byte> = listOf((v and 0xFF).toByte(), ((v ushr 8) and 0xFF).toByte())
 
@@ -158,7 +158,7 @@ class G2CfwSceneTest {
         val (scene, cache) = fresh()
         assertNull(encode(scene, cache, (0 until 129).map { element("s$it", "circle", w = 11, h = 11) }))
         val huge = element("big", "image", w = 2000, h = 2000, hash = "big")
-        val full = scene.encode(frame(listOf(huge)), 0, 0, cache) { _, w, h -> ByteArray(w * h) { (it * 37).toByte() } }
+        val full = scene.encode(frame(listOf(huge)), 0, 0, cache, { _, w, h -> ByteArray(w * h) { (it * 37).toByte() } })
         assertNull(full)
     }
 
@@ -172,4 +172,38 @@ class G2CfwSceneTest {
         assertEquals(255, G2CfwScene.transitionFrames(60000))
         assertArrayEquals(intArrayOf(107, 0, 148, 255), G2CfwScene.easingCurve("ease-in-out"))
     }
+
+    @Test
+    fun inlineTextRecordsCarryTheirBytesAndAnimate() {
+        val (scene, cache) = fresh()
+        val mono = element("m", "text", y = 200, w = 100, h = 30, text = "grid", font = "mono", hash = "mono")
+        val first = requireNotNull(
+            encode(scene, cache, listOf(element("t", "text", x = 10, y = 10, w = 200, h = 60, text = "hi\nthere", color = 9), mono), true),
+        )
+        assertEquals(1, first.uploads.size)
+        assertEquals(listOf(listOf(0, 1), listOf(2)), scene.elements.map { it.indices })
+        val p = first.payload
+        assertEquals(listOf<Byte>(0, 0, 17, 1, 0x19, 0), bytes(p, 3, 9))
+        assertEquals(le(44) + le(108) + le(198) + le(58), bytes(p, 9, 17))
+        assertEquals(listOf<Byte>(2, 0x68, 0x69), bytes(p, 17, 20))
+        assertEquals(listOf<Byte>(0, 1, 17), bytes(p, 20, 23))
+        assertEquals(le(44) + le(135) + le(198) + le(31), bytes(p, 26, 34))
+        assertEquals("there".toByteArray().toList(), bytes(p, 35, 40))
+        assertEquals(0.toByte(), p[40])
+        assertEquals(14.toByte(), p[42])
+
+        val moved = requireNotNull(
+            encode(scene, cache, listOf(element("t", "text", x = 10, y = 40, w = 200, h = 60, text = "hi\nthere", color = 9, transitionMs = 330), mono), true),
+        )
+        assertEquals(listOf<Byte>(5, 0, 0x02, 0x00, 10), bytes(moved.payload, 3, 8))
+        val retexted = requireNotNull(
+            encode(scene, cache, listOf(element("t", "text", x = 10, y = 40, w = 200, h = 60, text = "ho\nthere", color = 9, transitionMs = 330), mono), true),
+        )
+        assertEquals(listOf<Byte>(0, 0, 17), bytes(retexted.payload, 3, 6))
+        val faded = requireNotNull(
+            encode(scene, cache, listOf(element("t", "text", x = 10, y = 40, w = 200, h = 60, text = "ho\nthere", color = 3, transitionMs = 330), mono), true),
+        )
+        assertEquals(listOf<Byte>(5, 0, 0x00, 0x01, 10), bytes(faded.payload, 3, 8))
+        assertEquals(le(0x13), bytes(faded.payload, 12, 14))
+    }
 }

package/build/generated/releaseMetadata.js

@@ -1,9 +1,9 @@
 export const BLUETOOTH_SDK_RELEASE_METADATA = Object.freeze({
     "schemaVersion": 1,
     "familyBaseVersion": "0.1.0",
-    "releaseIdentity": "0.1.0-dev.111",
-    "releaseSetId": "glassly-0.1.0-dev.111",
-    "sourceCommit": "fa91a3665743b2d5e5ed12f8cf738b715c4d8458",
+    "releaseIdentity": "0.1.0-dev.113",
+    "releaseSetId": "glassly-0.1.0-dev.113",
+    "sourceCommit": "e63da43b467758373b960b0ee9167ef29938a11c",
     "otaManifestUrl": null,
     "otaManifestSha256": null
 });

package/build/generated/releaseMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"0.1.0\",\n  \"releaseIdentity\": \"0.1.0-dev.111\",\n  \"releaseSetId\": \"glassly-0.1.0-dev.111\",\n  \"sourceCommit\": \"fa91a3665743b2d5e5ed12f8cf738b715c4d8458\",\n  \"otaManifestUrl\": null,\n  \"otaManifestSha256\": null\n})\n"]}
+{"version":3,"file":"releaseMetadata.js","sourceRoot":"","sources":["../../src/generated/releaseMetadata.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,8BAA8B,GAA0C,MAAM,CAAC,MAAM,CAAC;IACjG,eAAe,EAAE,CAAC;IAClB,mBAAmB,EAAE,OAAO;IAC5B,iBAAiB,EAAE,eAAe;IAClC,cAAc,EAAE,uBAAuB;IACvC,cAAc,EAAE,0CAA0C;IAC1D,gBAAgB,EAAE,IAAI;IACtB,mBAAmB,EAAE,IAAI;CAC1B,CAAC,CAAA","sourcesContent":["/** Generated by release CI. Do not edit in a release checkout. */\nexport interface BluetoothSdkReleaseMetadata {\n  schemaVersion: 1\n  familyBaseVersion: string | null\n  releaseIdentity: string | null\n  releaseSetId: string | null\n  sourceCommit: string | null\n  otaManifestUrl: string | null\n  otaManifestSha256: string | null\n}\n\nexport const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({\n  \"schemaVersion\": 1,\n  \"familyBaseVersion\": \"0.1.0\",\n  \"releaseIdentity\": \"0.1.0-dev.113\",\n  \"releaseSetId\": \"glassly-0.1.0-dev.113\",\n  \"sourceCommit\": \"e63da43b467758373b960b0ee9167ef29938a11c\",\n  \"otaManifestUrl\": null,\n  \"otaManifestSha256\": null\n})\n"]}

package/ios/Source/BluetoothSdkDefaults.swift

@@ -11,7 +11,7 @@ enum BluetoothSdkDefaults {
     static let voiceActivityDetectionEnabled = false
     static let loudnessGateEnabled = true
     private static let infoSdkVersionKey = "BluetoothSdkVersion"
-    private static let swiftPackageSdkVersion = "0.1.0-dev.111"
+    private static let swiftPackageSdkVersion = "0.1.0-dev.113"
     private static let swiftPackageSdkVersionPlaceholder = "__GLASSLY" + "_BLUETOOTH_SDK_VERSION__"
 
     private static func normalizedSdkVersion(_ value: String?) -> String? {

package/ios/Source/GeneratedReleaseMetadata.swift

@@ -3,9 +3,9 @@ import Foundation
 /// Generated by release CI. Do not edit in a release checkout.
 enum GeneratedReleaseMetadata {
     static let familyBaseVersion = "0.1.0"
-    static let releaseIdentity = "0.1.0-dev.111"
-    static let releaseSetId = "glassly-0.1.0-dev.111"
-    static let sourceCommit = "fa91a3665743b2d5e5ed12f8cf738b715c4d8458"
+    static let releaseIdentity = "0.1.0-dev.113"
+    static let releaseSetId = "glassly-0.1.0-dev.113"
+    static let sourceCommit = "e63da43b467758373b960b0ee9167ef29938a11c"
     static let otaManifestUrl = ""
     static let otaManifestSha256 = ""
 }

package/ios/Source/sgcs/G2.swift

@@ -1810,6 +1810,11 @@ final class G2: NSObject, SGCManager {
             .allSatisfy(cfwFeatures.contains)
     }
 
+    /// TEXT_INLINE records: default text drawn by the glasses' font, no cache upload.
+    private var supportsCfwInlineText: Bool {
+        cfwFeatures.contains("inlinetext17")
+    }
+
     /// The on-glass slot table must be re-SET on the next vector frame.
     private var cfwSceneInvalid = true
 
@@ -3126,7 +3131,8 @@ final class G2: NSObject, SGCManager {
         }
         if cfwLastBoxes != boxes { cfwSceneInvalid = true }
         guard let encoded = await cfwRenderer.encodeVector(
-            frame, boxes: boxes, cacheGeneration: cfwCacheGeneration, invalidate: cfwSceneInvalid
+            frame, boxes: boxes, cacheGeneration: cfwCacheGeneration, invalidate: cfwSceneInvalid,
+            inlineText: supportsCfwInlineText
         ) else {
             Bridge.log("G2: vector scene does not fit; using the raster path for this frame")
             cfwSceneInvalid = true

package/ios/Source/sgcs/G2CfwRenderer.swift

@@ -68,7 +68,7 @@ actor G2CfwRenderer {
     /// `invalidate` forces a full re-SET (the on-glass slot table is unknown).
     /// Nil when the frame does not fit the slot table or the texture cache.
     func encodeVector(
-        _ frame: SceneFrame, boxes: LensBoxes, cacheGeneration: Int, invalidate: Bool
+        _ frame: SceneFrame, boxes: LensBoxes, cacheGeneration: Int, invalidate: Bool, inlineText: Bool
     ) -> G2CfwScene.Encoded? {
         if textureCache.generation != cacheGeneration || textureCache.exhausted {
             textureCache.reset(generation: cacheGeneration)
@@ -90,13 +90,15 @@ actor G2CfwRenderer {
         }
         let ox = Int(boxes.left.x)
         let oy = Int(boxes.left.y)
-        if let encoded = scene.encode(frame, originX: ox, originY: oy, cache: textureCache, rasterize: rasterize) {
+        if let encoded = scene.encode(frame, originX: ox, originY: oy, inlineText: inlineText,
+                                      cache: textureCache, rasterize: rasterize) {
             return encoded
         }
         // Out of texture cache mid-frame: start a fresh cache and repack once.
         textureCache.reset(generation: cacheGeneration)
         scene.reset(generation: cacheGeneration)
-        return scene.encode(frame, originX: ox, originY: oy, cache: textureCache, rasterize: rasterize)
+        return scene.encode(frame, originX: ox, originY: oy, inlineText: inlineText,
+                            cache: textureCache, rasterize: rasterize)
     }
 
     /// Fixed cell metrics of the phone's monospaced face at `fontSize`.

package/ios/Source/sgcs/G2CfwScene.swift

@@ -3,19 +3,22 @@ import Foundation
 /// Retained vector scene for the Glassly CFW (firmware modes 16-18).
 ///
 /// Every scene element becomes one or more firmware slots (paint order = slot
-/// order): vector shapes map 1:1, builtin-font text becomes one TEXT slot per
-/// line with its bytes in the texture cache, and everything else (proportional
-/// text, images) is rasterized on the phone and drawn as cached IMAGE slots
-/// tiled to the 255 px slot limit. Frames diff against the last committed
-/// layout: unchanged slots cost nothing, geometry changes on an element with a
-/// transition become firmware TWEENs, and anything else is re-SET. Slot indices
-/// stay stable per element id; a reorder or an over-budget frame repacks.
+/// order): vector shapes map 1:1; default and builtin text becomes one inline
+/// TEXT slot per line drawn by the glasses' font (or a cache-backed TEXT slot on
+/// firmware without inline records); mono text and images are rasterized on
+/// the phone and drawn as cached IMAGE slots tiled to the 255 px slot limit.
+/// Frames diff against the last committed layout: unchanged slots cost nothing,
+/// geometry changes on an element with a transition become firmware TWEENs, and
+/// anything else is re-SET. Slot indices stay stable per element id; a reorder
+/// or an over-budget frame repacks.
 final class G2CfwScene {
     static let maxSlots = 128
     static let recordBytes = 20
     static let framePeriodMs = 33.0
     static let textLineHeight = 27
+    static let textInset = 2
     static let maxTextBytes = 64
+    static let maxInlineBytes = 128
     static let maxTileSize = 255
     /// Mode-13/15 options: identity ramp, transparent source color 0.
     static let textOptions: UInt8 = 0x1F
@@ -23,7 +26,7 @@ final class G2CfwScene {
 
     enum ShapeType: UInt8 {
         case line = 1, rect, rectFill, circle, circleFill, tri, triFill, quad, quadFill
-        case bezier2, bezier3, arc, pie, image, text, textCached
+        case bezier2, bezier3, arc, pie, image, text, textCached, textInline
     }
 
     struct Slot: Equatable {
@@ -31,14 +34,17 @@ final class G2CfwScene {
         var color: UInt8
         var width: UInt8
         var params: [Int16]
+        /// TEXT_INLINE bytes carried in the record.
+        var text: [UInt8]
 
-        init(_ type: ShapeType, color: UInt8, width: UInt8 = 0, _ params: [Int16]) {
+        init(_ type: ShapeType, color: UInt8, width: UInt8 = 0, _ params: [Int16], text: [UInt8] = []) {
             self.type = type.rawValue
             self.color = color
             self.width = width
             var padded = params
             while padded.count < 8 { padded.append(0) }
             self.params = Array(padded.prefix(8))
+            self.text = text
         }
     }
 
@@ -80,6 +86,7 @@ final class G2CfwScene {
         case .tri, .triFill, .bezier2: return 0x3F
         case .quad, .quadFill, .bezier3: return 0xFF
         case .image, .text, .textCached: return 0x03
+        case .textInline: return 0x0F
         case .none: return 0
         }
     }
@@ -124,8 +131,9 @@ final class G2CfwScene {
     }
 
     /// Slots for one element, or nil when the texture cache cannot hold its content.
+    /// `inlineText` selects TEXT_INLINE records for default/builtin text.
     func slots(
-        for element: SceneElement, originX ox: Int, originY oy: Int,
+        for element: SceneElement, originX ox: Int, originY oy: Int, inlineText: Bool,
         cache: G2CfwTextureCache, rasterize: (SceneElement, Int, Int) -> Data?
     ) -> [Slot]? {
         let x = Self.clampCoord(Int(element.x) + ox)
@@ -179,6 +187,10 @@ final class G2CfwScene {
                 params.append(contentsOf: [px, py])
             }
             return [Slot(n == 3 ? .bezier2 : .bezier3, color: color, width: Self.stroke(element), params)]
+        case "text" where element.font == "mono":
+            return rasterSlots(element, x: x, y: y, cache: cache, rasterize: rasterize)
+        case "text" where inlineText:
+            return inlineTextSlots(element, x: x, y: y)
         case "text" where element.font == "builtin":
             return builtinTextSlots(element, x: x, y: y, cache: cache)
         case "text", "image":
@@ -208,13 +220,40 @@ final class G2CfwScene {
         return out
     }
 
+    /// One TEXT_INLINE slot per line, drawn by the glasses' font at the same 2 px
+    /// inset as phone-rasterized text, clipped to the box.
+    private func inlineTextSlots(_ element: SceneElement, x: Int16, y: Int16) -> [Slot] {
+        var out: [Slot] = []
+        let w = Int16(max(0, min(2047, Int(element.w))))
+        let h = Int16(max(0, min(2047, Int(element.h))))
+        if element.border > 0 {
+            out.append(Slot(.rect, color: Self.gray(element), width: Self.stroke(element),
+                            [x, y, w, h, Int16(max(0, min(2047, Int(element.radius))))]))
+        }
+        let options = UInt8(0x10) | Self.gray(element)
+        let maxLines = max(1, Int(element.h) / Self.textLineHeight)
+        let lines = (element.text ?? "").split(separator: "\n", omittingEmptySubsequences: false).prefix(maxLines)
+        for (index, line) in lines.enumerated() {
+            let bytes = Self.textBytes(String(line), max: Self.maxInlineBytes)
+            if bytes.isEmpty { continue }
+            let lineY = Int(y) + Self.textInset + index * Self.textLineHeight
+            let clipW = max(0, Int(element.w) - Self.textInset)
+            let clipH = max(0, Int(element.h) - Self.textInset - index * Self.textLineHeight)
+            out.append(Slot(.textInline, color: options,
+                            [Self.clampCoord(Int(x) + Self.textInset), Self.clampCoord(lineY),
+                             Int16(min(2047, clipW)), Int16(min(2047, clipH)), Int16(bytes.count)],
+                            text: bytes))
+        }
+        return out
+    }
+
     /// UTF-8 bytes of a line without firmware control bytes (1..31), cut at a codepoint boundary.
-    static func textBytes(_ line: String) -> [UInt8] {
+    static func textBytes(_ line: String, max limit: Int = maxTextBytes) -> [UInt8] {
         let cleaned = line.unicodeScalars.filter { $0.value >= 32 }
         var bytes: [UInt8] = []
         for scalar in cleaned {
             let encoded = Array(String(scalar).utf8)
-            if bytes.count + encoded.count > maxTextBytes { break }
+            if bytes.count + encoded.count > limit { break }
             bytes.append(contentsOf: encoded)
         }
         return bytes
@@ -256,8 +295,8 @@ final class G2CfwScene {
     /// that must precede it. Nil when the frame does not fit the slot table or
     /// the texture cache; the caller then falls back to the raster path.
     func encode(
-        _ frame: SceneFrame, originX: Int, originY: Int, cache: G2CfwTextureCache,
-        rasterize: (SceneElement, Int, Int) -> Data?
+        _ frame: SceneFrame, originX: Int, originY: Int, inlineText: Bool = false,
+        cache: G2CfwTextureCache, rasterize: (SceneElement, Int, Int) -> Data?
     ) -> Encoded? {
         struct Desired {
             let id: String
@@ -268,7 +307,8 @@ final class G2CfwScene {
         }
         var desired: [Desired] = []
         for element in frame.elements {
-            guard let slots = slots(for: element, originX: originX, originY: originY, cache: cache, rasterize: rasterize)
+            guard let slots = slots(for: element, originX: originX, originY: originY, inlineText: inlineText,
+                                    cache: cache, rasterize: rasterize)
             else { return nil }
             desired.append(Desired(
                 id: element.id, contentHash: element.contentHash, slots: slots,
@@ -347,21 +387,27 @@ final class G2CfwScene {
         return Encoded(payload: payload, uploads: cache.takeUploadPayloads())
     }
 
-    /// `[0][slot][type][flags=visible][color][width][p0..p7 LE]`
+    /// `[0][slot][type][flags=visible][color][width][p0..p7 LE]`, or for TEXT_INLINE
+    /// `[0][slot][17][1][color][width][x][y][w][h][len][bytes]`.
     static func setRecord(_ slot: Slot, index: UInt8) -> Data {
         var out = Data([0, index, slot.type, 1, slot.color, slot.width])
-        for value in slot.params {
+        let count = slot.type == ShapeType.textInline.rawValue ? 4 : 8
+        for value in slot.params.prefix(count) {
             let bits = UInt16(bitPattern: value)
             out.append(UInt8(bits & 0xFF))
             out.append(UInt8(bits >> 8))
         }
+        if slot.type == ShapeType.textInline.rawValue {
+            out.append(UInt8(min(slot.text.count, maxInlineBytes)))
+            out.append(contentsOf: slot.text.prefix(maxInlineBytes))
+        }
         return out
     }
 
     /// `[5][slot][mask:u16][frames][curve x4][value:i16 per set bit]`, or nil when the
     /// change is not a pure geometry/stroke change of the same shape type.
     static func tweenRecord(from old: Slot, to new: Slot, index: UInt8, frames: UInt8, curve: [UInt8]) -> Data? {
-        guard old.type == new.type else { return nil }
+        guard old.type == new.type, old.text == new.text else { return nil }
         let tweenable = tweenableMask(new.type)
         var mask: UInt16 = 0
         var values: [Int16] = []
@@ -372,7 +418,9 @@ final class G2CfwScene {
         }
         let isTexture = new.type >= ShapeType.image.rawValue
         if old.color != new.color {
-            guard !isTexture else { return nil }
+            // Inline text may fade (low nibble) as long as its option bits stay put.
+            let inlineFade = new.type == ShapeType.textInline.rawValue && (old.color & 0xF0) == (new.color & 0xF0)
+            guard !isTexture || inlineFade else { return nil }
             mask |= 0x100
             values.append(Int16(new.color))
         }

package/ios/Source/sgcs/G2Flasher.swift

@@ -37,8 +37,8 @@ enum G2FirmwareCatalog {
             displayName: "Glassly CFW",
             version: "2.2.9.22 CFW",
             fileName: "g2-glassly-cfw-2.2.9.22.evenota.bin",
-            sha256: "fe6051085507269c8007bc1245bfe8bd10d5c566540389ae976daaf753f536f9",
-            size: 4_527_476
+            sha256: "560d4d94344573d11ba58690221c0ea7d5a5e8c8d29c12f158e81078484b815c",
+            size: 4_528_184
         ),
     ]
 

package/ios/Tests/BluetoothSDKTests/G2CfwSceneTests.swift

@@ -21,8 +21,9 @@ final class G2CfwSceneTests: XCTestCase {
     }
 
     private func encode(_ scene: G2CfwScene, _ cache: G2CfwTextureCache, _ elements: [SceneElement],
-                        replay: Bool = false) -> G2CfwScene.Encoded? {
-        scene.encode(frame(elements, replay: replay), originX: 32, originY: 96, cache: cache) { el, w, h in
+                        replay: Bool = false, inlineText: Bool = false) -> G2CfwScene.Encoded? {
+        scene.encode(frame(elements, replay: replay), originX: 32, originY: 96, inlineText: inlineText,
+                     cache: cache) { el, w, h in
             Data(repeating: 0xFF, count: w * h)
         }
     }
@@ -184,4 +185,47 @@ final class G2CfwSceneTests: XCTestCase {
         XCTAssertEqual(G2CfwScene.transitionFrames(ms: 60000), 255)
         XCTAssertEqual(G2CfwScene.easingCurve("ease-in-out"), [107, 0, 148, 255])
     }
+
+    func testInlineTextRecordsCarryTheirBytesAndAnimate() throws {
+        let scene = G2CfwScene()
+        let cache = G2CfwTextureCache()
+        cache.reset(generation: 1)
+        scene.reset(generation: 1)
+        let first = try XCTUnwrap(encode(scene, cache, [
+            element("t", type: "text", x: 10, y: 10, w: 200, h: 60, text: "hi\nthere", color: 9),
+            element("m", type: "text", x: 0, y: 200, w: 100, h: 30, text: "grid", font: "mono", hash: "mono"),
+        ], inlineText: true))
+        XCTAssertEqual(first.uploads.count, 1)                       // only the mono raster hits the cache
+        XCTAssertEqual(scene.elements.map(\.indices), [[0, 1], [2]])
+        let bytes = [UInt8](first.payload)
+        // slot 0: TEXT_INLINE, transparent + gray 9, x/y inset by 2, clip to the box, "hi"
+        XCTAssertEqual(Array(bytes[3 ..< 9]), [0, 0, 17, 1, 0x19, 0])
+        XCTAssertEqual(Array(bytes[9 ..< 17]), le(44, 108, 198, 58))
+        XCTAssertEqual(Array(bytes[17 ..< 20]), [2, 0x68, 0x69])
+        // slot 1 follows immediately: 13 + 2 bytes after the first record
+        XCTAssertEqual(Array(bytes[20 ..< 23]), [0, 1, 17])
+        XCTAssertEqual(Array(bytes[26 ..< 34]), le(44, 135, 198, 31))
+        XCTAssertEqual(Array(bytes[35 ..< 40]), Array("there".utf8))
+        XCTAssertEqual(bytes[40], 0)                                  // mono raster SET
+        XCTAssertEqual(bytes[42], 14)
+
+        // a new string is a SET even with a transition; a move alone tweens; a fade tweens the color
+        let moved = try XCTUnwrap(encode(scene, cache, [
+            element("t", type: "text", x: 10, y: 40, w: 200, h: 60, text: "hi\nthere", color: 9, transitionMs: 330),
+            element("m", type: "text", x: 0, y: 200, w: 100, h: 30, text: "grid", font: "mono", hash: "mono"),
+        ], inlineText: true))
+        XCTAssertEqual(Array([UInt8](moved.payload)[3 ..< 8]), [5, 0, 0x02, 0x00, 10])
+        let retexted = try XCTUnwrap(encode(scene, cache, [
+            element("t", type: "text", x: 10, y: 40, w: 200, h: 60, text: "ho\nthere", color: 9, transitionMs: 330),
+            element("m", type: "text", x: 0, y: 200, w: 100, h: 30, text: "grid", font: "mono", hash: "mono"),
+        ], inlineText: true))
+        XCTAssertEqual(Array([UInt8](retexted.payload)[3 ..< 6]), [0, 0, 17])
+        let faded = try XCTUnwrap(encode(scene, cache, [
+            element("t", type: "text", x: 10, y: 40, w: 200, h: 60, text: "ho\nthere", color: 3, transitionMs: 330),
+            element("m", type: "text", x: 0, y: 200, w: 100, h: 30, text: "grid", font: "mono", hash: "mono"),
+        ], inlineText: true))
+        let fade = [UInt8](faded.payload)
+        XCTAssertEqual(Array(fade[3 ..< 8]), [5, 0, 0x00, 0x01, 10])
+        XCTAssertEqual(Array(fade[12 ..< 14]), le(0x13))
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glassly/bluetooth-sdk",
-  "version": "0.1.0-dev.111",
+  "version": "0.1.0-dev.113",
   "description": "SDK for communicating with smart glasses",
   "main": "build/index.js",
   "react-native": "src/index.ts",

package/src/generated/releaseMetadata.ts

@@ -12,9 +12,9 @@ export interface BluetoothSdkReleaseMetadata {
 export const BLUETOOTH_SDK_RELEASE_METADATA: Readonly<BluetoothSdkReleaseMetadata> = Object.freeze({
   "schemaVersion": 1,
   "familyBaseVersion": "0.1.0",
-  "releaseIdentity": "0.1.0-dev.111",
-  "releaseSetId": "glassly-0.1.0-dev.111",
-  "sourceCommit": "fa91a3665743b2d5e5ed12f8cf738b715c4d8458",
+  "releaseIdentity": "0.1.0-dev.113",
+  "releaseSetId": "glassly-0.1.0-dev.113",
+  "sourceCommit": "e63da43b467758373b960b0ee9167ef29938a11c",
   "otaManifestUrl": null,
   "otaManifestSha256": null
 })