Merge remote-tracking branch 'upstream/main' into underglow/state-persistence

1 files changed, 94 insertions, 82 deletions

diff --git a/app/src/rgb_underglow.c b/app/src/rgb_underglow.c
index cb98e8d..d453755 100644
--- a/app/src/rgb_underglow.c
+++ b/app/src/rgb_underglow.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Nick Winans <nick@winans.codes>
+ * Copyright (c) 2020 The ZMK Contributors
  *
  * SPDX-License-Identifier: MIT
  */
@@ -18,8 +18,8 @@
 
 LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
-#define STRIP_LABEL		    DT_LABEL(DT_CHOSEN(zmk_underglow))
-#define STRIP_NUM_PIXELS	DT_PROP(DT_CHOSEN(zmk_underglow), chain_length)
+#define STRIP_LABEL DT_LABEL(DT_CHOSEN(zmk_underglow))
+#define STRIP_NUM_PIXELS DT_PROP(DT_CHOSEN(zmk_underglow), chain_length)
 
 enum rgb_underglow_effect {
     UNDERGLOW_EFFECT_SOLID,
@@ -30,19 +30,19 @@ enum rgb_underglow_effect {
 };
 
 struct led_hsb {
-	u16_t h;
-	u8_t  s;
-	u8_t  b;
+    u16_t h;
+    u8_t s;
+    u8_t b;
 };
 
 struct rgb_underglow_state {
     u16_t hue;
-    u8_t  saturation;
-    u8_t  brightness;
-    u8_t  animation_speed;
-    u8_t  current_effect;
+    u8_t saturation;
+    u8_t brightness;
+    u8_t animation_speed;
+    u8_t current_effect;
     u16_t animation_step;
-    bool  on;
+    bool on;
 };
 
 struct device *led_strip;
@@ -92,17 +92,40 @@ static struct led_rgb hsb_to_rgb(struct led_hsb hsb)
     double q = v * (1 - f * s);
     double t = v * (1 - (1 - f) * s);
 
-    switch (i % 6)
-    {
-        case 0: r = v; g = t; b = p; break;
-        case 1: r = q; g = v; b = p; break;
-        case 2: r = p; g = v; b = t; break;
-        case 3: r = p; g = q; b = v; break;
-        case 4: r = t; g = p; b = v; break;
-        case 5: r = v; g = p; b = q; break;
+    switch (i % 6) {
+    case 0:
+        r = v;
+        g = t;
+        b = p;
+        break;
+    case 1:
+        r = q;
+        g = v;
+        b = p;
+        break;
+    case 2:
+        r = p;
+        g = v;
+        b = t;
+        break;
+    case 3:
+        r = p;
+        g = q;
+        b = v;
+        break;
+    case 4:
+        r = t;
+        g = p;
+        b = v;
+        break;
+    case 5:
+        r = v;
+        g = p;
+        b = q;
+        break;
     }
 
-    struct led_rgb rgb = { r: r*255, g: g*255, b: b*255 };
+    struct led_rgb rgb = {r : r * 255, g : g * 255, b : b * 255};
 
     return rgb;
 }
@@ -125,41 +148,37 @@ static void zmk_rgb_underglow_effect_solid()
         int sat = state.saturation;
         int brt = state.brightness;
 
-        struct led_hsb hsb = { hue, sat, brt };
+        struct led_hsb hsb = {hue, sat, brt};
 
         pixels[i] = hsb_to_rgb(hsb);
     }
 }
 
-static void zmk_rgb_underglow_effect_breathe()
-{
-    for (int i=0; i<STRIP_NUM_PIXELS; i++)
-    {
+static void zmk_rgb_underglow_effect_breathe() {
+    for (int i = 0; i < STRIP_NUM_PIXELS; i++) {
         int hue = state.hue;
         int sat = state.saturation;
         int brt = abs(state.animation_step - 1200) / 12;
 
-        struct led_hsb hsb = { hue, sat, brt };
+        struct led_hsb hsb = {hue, sat, brt};
 
         pixels[i] = hsb_to_rgb(hsb);
     }
 
     state.animation_step += state.animation_speed * 10;
-    
+
     if (state.animation_step > 2400) {
         state.animation_step = 0;
     }
 }
 
-static void zmk_rgb_underglow_effect_spectrum()
-{
-    for (int i=0; i<STRIP_NUM_PIXELS; i++)
-    {
+static void zmk_rgb_underglow_effect_spectrum() {
+    for (int i = 0; i < STRIP_NUM_PIXELS; i++) {
         int hue = state.animation_step;
         int sat = state.saturation;
         int brt = state.brightness;
 
-        struct led_hsb hsb = { hue, sat, brt };
+        struct led_hsb hsb = {hue, sat, brt};
 
         pixels[i] = hsb_to_rgb(hsb);
     }
@@ -168,15 +187,13 @@ static void zmk_rgb_underglow_effect_spectrum()
     state.animation_step = state.animation_step % 360;
 }
 
-static void zmk_rgb_underglow_effect_swirl()
-{
-    for (int i=0; i<STRIP_NUM_PIXELS; i++)
-    {
+static void zmk_rgb_underglow_effect_swirl() {
+    for (int i = 0; i < STRIP_NUM_PIXELS; i++) {
         int hue = (360 / STRIP_NUM_PIXELS * i + state.animation_step) % 360;
         int sat = state.saturation;
         int brt = state.brightness;
 
-        struct led_hsb hsb = { hue, sat, brt };
+        struct led_hsb hsb = {hue, sat, brt};
 
         pixels[i] = hsb_to_rgb(hsb);
     }
@@ -185,22 +202,20 @@ static void zmk_rgb_underglow_effect_swirl()
     state.animation_step = state.animation_step % 360;
 }
 
-static void zmk_rgb_underglow_tick(struct k_work *work)
-{
-    switch (state.current_effect)
-    {
-        case UNDERGLOW_EFFECT_SOLID:
-            zmk_rgb_underglow_effect_solid();
-            break;
-        case UNDERGLOW_EFFECT_BREATHE:
-            zmk_rgb_underglow_effect_breathe();
-            break;
-        case UNDERGLOW_EFFECT_SPECTRUM:
-            zmk_rgb_underglow_effect_spectrum();
-            break;
-        case UNDERGLOW_EFFECT_SWIRL:
-            zmk_rgb_underglow_effect_swirl();
-            break;
+static void zmk_rgb_underglow_tick(struct k_work *work) {
+    switch (state.current_effect) {
+    case UNDERGLOW_EFFECT_SOLID:
+        zmk_rgb_underglow_effect_solid();
+        break;
+    case UNDERGLOW_EFFECT_BREATHE:
+        zmk_rgb_underglow_effect_breathe();
+        break;
+    case UNDERGLOW_EFFECT_SPECTRUM:
+        zmk_rgb_underglow_effect_spectrum();
+        break;
+    case UNDERGLOW_EFFECT_SWIRL:
+        zmk_rgb_underglow_effect_swirl();
+        break;
     }
 
     led_strip_update_rgb(led_strip, pixels, STRIP_NUM_PIXELS);
@@ -224,15 +239,14 @@ static void zmk_rgb_underglow_tick_handler(struct k_timer *timer)
 
 K_TIMER_DEFINE(underglow_tick, zmk_rgb_underglow_tick_handler, NULL);
 
-static int zmk_rgb_underglow_init(struct device *_arg)
-{
-	led_strip = device_get_binding(STRIP_LABEL);
-	if (led_strip) {
-		LOG_INF("Found LED strip device %s", STRIP_LABEL);
-	} else {
-		LOG_ERR("LED strip device %s not found", STRIP_LABEL);
-		return -EINVAL;
-	}
+static int zmk_rgb_underglow_init(struct device *_arg) {
+    led_strip = device_get_binding(STRIP_LABEL);
+    if (led_strip) {
+        LOG_INF("Found LED strip device %s", STRIP_LABEL);
+    } else {
+        LOG_ERR("LED strip device %s not found", STRIP_LABEL);
+        return -EINVAL;
+    }
 
     state = (struct rgb_underglow_state){
         hue: CONFIG_ZMK_RGB_UNDERGLOW_HUE_START,
@@ -276,15 +290,15 @@ int zmk_rgb_underglow_cycle_effect(int direction)
     if (state.current_effect >= UNDERGLOW_EFFECT_NUMBER) {
         state.current_effect = 0;
     }
-    
+
     state.animation_step = 0;
 
     return zmk_rgb_underglow_save_state();
 }
 
-int zmk_rgb_underglow_toggle()
-{
-    if (!led_strip) return -ENODEV;
+int zmk_rgb_underglow_toggle() {
+    if (!led_strip)
+        return -ENODEV;
 
     state.on = !state.on;
 
@@ -300,15 +314,15 @@ int zmk_rgb_underglow_toggle()
     return zmk_rgb_underglow_save_state();
 }
 
-int zmk_rgb_underglow_change_hue(int direction)
-{
-    if (!led_strip) return -ENODEV;
+int zmk_rgb_underglow_change_hue(int direction) {
+    if (!led_strip)
+        return -ENODEV;
 
     if (state.hue == 0 && direction < 0) {
         state.hue = 360 - CONFIG_ZMK_RGB_UNDERGLOW_HUE_STEP;
         return 0;
     }
-    
+
     state.hue += direction * CONFIG_ZMK_RGB_UNDERGLOW_HUE_STEP;
 
     state.hue = state.hue % 360;
@@ -316,9 +330,9 @@ int zmk_rgb_underglow_change_hue(int direction)
     return zmk_rgb_underglow_save_state();
 }
 
-int zmk_rgb_underglow_change_sat(int direction)
-{
-    if (!led_strip) return -ENODEV;
+int zmk_rgb_underglow_change_sat(int direction) {
+    if (!led_strip)
+        return -ENODEV;
 
     if (state.saturation == 0 && direction < 0) {
         return 0;
@@ -333,9 +347,9 @@ int zmk_rgb_underglow_change_sat(int direction)
     return zmk_rgb_underglow_save_state();
 }
 
-int zmk_rgb_underglow_change_brt(int direction)
-{
-    if (!led_strip) return -ENODEV;
+int zmk_rgb_underglow_change_brt(int direction) {
+    if (!led_strip)
+        return -ENODEV;
 
     if (state.brightness == 0 && direction < 0) {
         return 0;
@@ -350,9 +364,9 @@ int zmk_rgb_underglow_change_brt(int direction)
     return zmk_rgb_underglow_save_state();
 }
 
-int zmk_rgb_underglow_change_spd(int direction)
-{
-    if (!led_strip) return -ENODEV;
+int zmk_rgb_underglow_change_spd(int direction) {
+    if (!led_strip)
+        return -ENODEV;
 
     if (state.animation_speed == 1 && direction < 0) {
         return 0;
@@ -367,6 +381,4 @@ int zmk_rgb_underglow_change_spd(int direction)
     return zmk_rgb_underglow_save_state();
 }
 
-SYS_INIT(zmk_rgb_underglow_init,
-        APPLICATION,
-        CONFIG_APPLICATION_INIT_PRIORITY);
+SYS_INIT(zmk_rgb_underglow_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);