Merge branch 'feature/animations'

Author: ice9js

app/dts/bindings/animations/animation_base.yaml

@@ -9,15 +9,14 @@ properties:
       Pixel positions to which the animation should apply.
 
   blending-mode:
-    type: int
-    required: false
+    type: string
     enum:
-      - 0
-      - 1
-      - 2
-      - 3
-      - 4
-      - 5
-    default: 0
+      - "normal"
+      - "multiply"
+      - "lighten"
+      - "darken"
+      - "screen"
+      - "subtract"
+    default: "normal"
     description: |
       Blending mode for the animation to use during render.

app/dts/bindings/animations/zmk,animation-control.yaml

@@ -21,7 +21,6 @@ properties:
 
   brightness-steps:
     type: int
-    required: false
     default: 5
     description: |
       How many brightness steps should be supported.

app/dts/bindings/animations/zmk,animation-ripple.yaml

@@ -11,7 +11,6 @@ include: animation_base.yaml
 properties:
   duration:
     type: int
-    required: false
     default: 1000
     description: |
       Approximate ripple travel time in milliseconds.
@@ -20,7 +19,7 @@ properties:
     type: int
     required: true
     description: |
-      Ripple color.
+      Ripple color in HSL format.
 
   buffer-size:
     type: int

app/dts/bindings/animations/zmk,animation-solid.yaml

@@ -11,7 +11,6 @@ include: animation_base.yaml
 properties:
   duration:
     type: int
-    required: false
     default: 5
     description: |
       Animation duration in seconds.
@@ -22,4 +21,4 @@ properties:
     type: array
     required: true
     description: |
-      The colors to cycle through during the animation.
+      The colors to cycle through during the animation in HSL format.

app/dts/bindings/zmk,animation.yaml

@@ -11,7 +11,13 @@ properties:
     required: true
     description: |
       This array should contain all driver devices responsible for illuminating animated LEDs.
-      The devices must implement Zephyr's LED Strip Interface and expose a chain-lenght devicetree property.
+      The devices must implement Zephyr's LED Strip Interface.
+
+  chain-lengths:
+    type: array
+    required: true
+    description: |
+      This field contains the number of LEDs controlled by each driver device.
 
   pixels:
     type: phandle-array
@@ -23,7 +29,6 @@ properties:
 
   key-pixels:
     type: array
-    required: false
     description: |
       Use this field to specify the pixel index corresponding to each key
       following the order used in your keymap.

app/src/animation/animation.c

@@ -25,9 +25,6 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 #define PHANDLE_TO_DEVICE(node_id, prop, idx) DEVICE_DT_GET(DT_PHANDLE_BY_IDX(node_id, prop, idx)),
 
-#define PHANDLE_TO_CHAIN_LENGTH(node_id, prop, idx)                                                \
-    DT_PROP_BY_PHANDLE_IDX(node_id, prop, idx, chain_length),
-
 #define PHANDLE_TO_PIXEL(node_id, prop, idx)                                                       \
     {                                                                                              \
         .position_x = DT_PHA_BY_IDX(node_id, prop, idx, position_x),                               \
@@ -47,8 +44,7 @@ static const size_t drivers_size = DT_INST_PROP_LEN(0, drivers);
 /**
  * Array containing the number of LEDs handled by each device.
  */
-static const uint8_t pixels_per_driver[] = {
-    DT_INST_FOREACH_PROP_ELEM(0, drivers, PHANDLE_TO_CHAIN_LENGTH)};
+static const size_t pixels_per_driver[] = DT_INST_PROP(0, chain_lengths);
 
 /**
  * Pointer to the root animation
@@ -125,7 +121,7 @@ static void zmk_animation_tick(struct k_work *work) {
     for (size_t i = 0; i < drivers_size; ++i) {
         led_strip_update_rgb(drivers[i], &px_buffer[pixels_updated], pixels_per_driver[i]);
 
-        pixels_updated += (size_t)pixels_per_driver;
+        pixels_updated += pixels_per_driver[i];
     }
 }
 

app/src/animation/animation_ripple.c

@@ -99,7 +99,8 @@ static void animation_ripple_render_frame(const struct device *dev, struct anima
 
         // Render all pixels for each event
         for (int j = 0; j < config->pixel_map_size; ++j) {
-            uint8_t pixel_distance = zmk_animation_get_pixel_distance(event->pixel_id, j);
+            uint8_t pixel_distance =
+                zmk_animation_get_pixel_distance(event->pixel_id, pixel_map[j]);
 
             if (config->ripple_width > abs(pixel_distance - event->distance)) {
                 float intensity = 1.0f - (float)abs(pixel_distance - event->distance) /
@@ -184,7 +185,7 @@ static const struct animation_api animation_ripple_api = {
         .pixel_map = &animation_ripple_##idx##_pixel_map[0],                                       \
         .pixel_map_size = DT_INST_PROP_LEN(idx, pixels),                                           \
         .event_buffer_size = DT_INST_PROP(idx, buffer_size),                                       \
-        .blending_mode = DT_INST_PROP(idx, blending_mode),                                         \
+        .blending_mode = DT_INST_ENUM_IDX(idx, blending_mode),                                     \
         .distance_per_frame =                                                                      \
             (255 * 1000 / DT_INST_PROP(idx, duration)) / CONFIG_ZMK_ANIMATION_FPS,                 \
         .ripple_width = DT_INST_PROP(idx, ripple_width) / 2,                                       \