feat(protocol): ✨ add lighting effects and zero-based layers

Author: Patchself

app/src/main/java/com/patchself/codexmacro/bluetooth/CodexMicroService.kt

@@ -94,7 +94,7 @@ class CodexMicroService : Service() {
     private val rpcEngine by lazy {
         CodexRpcEngine(
             statusProvider = { DeviceStatus(_state.value.battery, _state.value.isCharging) },
-            layerProvider = { _settings.value.activeLayer + 1 },
+            layerProvider = { _settings.value.activeLayer },
             threadLightProvider = { _state.value.threads[it] },
             ambientProvider = { _state.value.ambient },
             keysProvider = { _state.value.keys },

app/src/main/java/com/patchself/codexmacro/protocol/CodexModels.kt

@@ -3,15 +3,18 @@ package com.patchself.codexmacro.protocol
 data class ThreadLight(
     val color: Long = 0,
     val brightness: Float = 0f,
-    val effect: String = "off",
+    val effect: Int = 0,
     val speed: Float = 0f,
+    val syncKeysLighting: Boolean = false,
+    val syncAmbientLighting: Boolean = false,
 )
 
 data class LightingSide(
     val color: Long = 0,
     val brightness: Float = 0f,
-    val effect: String = "off",
+    val effect: Int = 0,
     val speed: Float = 0f,
+    val magic: Float = 0f,
 )
 
 data class DeviceStatus(

app/src/main/java/com/patchself/codexmacro/protocol/CodexProtocol.kt

@@ -10,6 +10,13 @@ object CodexProtocol {
     const val payloadSize = 61
     const val messageType = 2
     const val maxRpcSize = 4096
+    const val effectOff = 0
+    const val effectSolid = 1
+    const val effectSnake = 2
+    const val effectRainbow = 3
+    const val effectBreath = 4
+    const val effectGradient = 5
+    const val effectShallowBreath = 6
 
     val reportMap = byteArrayOf(
         0x06, 0x00, 0xFF.toByte(),

app/src/main/java/com/patchself/codexmacro/protocol/CodexRpcEngine.kt

@@ -33,7 +33,7 @@ class CodexRpcEngine(
                     buildJsonObject {
                         put("version", firmwareVersion)
                         put("profile_index", 0)
-                        put("layer_index", layerProvider().coerceIn(1, 6))
+                        put("layer_index", layerProvider().coerceIn(0, 5))
                         put("battery", status.battery)
                         put("is_charging", status.isCharging)
                     },
@@ -64,8 +64,10 @@ class CodexRpcEngine(
                     id to ThreadLight(
                         color = value.longOr("c", current.color),
                         brightness = value.floatOr("b", current.brightness),
-                        effect = value.stringOr("e", current.effect),
+                        effect = value.intOr("e", current.effect),
                         speed = value.floatOr("s", current.speed),
+                        syncKeysLighting = value.booleanFlagOr("sk", current.syncKeysLighting),
+                        syncAmbientLighting = value.booleanFlagOr("sa", current.syncAmbientLighting),
                     ),
                 )
             }
@@ -84,8 +86,9 @@ class CodexRpcEngine(
     private fun JsonObject.toLightingSide(current: LightingSide) = LightingSide(
         color = longOr("c", current.color),
         brightness = floatOr("b", current.brightness),
-        effect = stringOr("e", current.effect),
+        effect = intOr("e", current.effect),
         speed = floatOr("s", current.speed),
+        magic = floatOr("m", current.magic),
     )
 
     private fun JsonObject.longOr(key: String, fallback: Long): Long =
@@ -94,8 +97,11 @@ class CodexRpcEngine(
     private fun JsonObject.floatOr(key: String, fallback: Float): Float =
         (this[key] as? JsonPrimitive)?.floatOrNull ?: fallback
 
-    private fun JsonObject.stringOr(key: String, fallback: String): String =
-        (this[key] as? JsonPrimitive)?.contentOrNull ?: fallback
+    private fun JsonObject.intOr(key: String, fallback: Int): Int =
+        (this[key] as? JsonPrimitive)?.intOrNull ?: fallback
+
+    private fun JsonObject.booleanFlagOr(key: String, fallback: Boolean): Boolean =
+        (this[key] as? JsonPrimitive)?.intOrNull?.let { it != 0 } ?: fallback
 
     private fun success(id: JsonElement) = response(id, buildJsonObject { put("ok", true) })