pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Initial RGB Underglow implementation

Browse source
This commit is contained in:
Nick 2020-07-24 22:37:00 -05:00
parent bb09707bd2
commit ca569c8143
8 changed files with 355 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/CMakeLists.txt
View file

@ -44,6 +44,7 @@ target_sources(app PRIVATE src/behaviors/behavior_mod_tap.c)
target_sources(app PRIVATE src/behaviors/behavior_momentary_layer.c) target_sources(app PRIVATE src/behaviors/behavior_momentary_layer.c)
target_sources(app PRIVATE src/behaviors/behavior_transparent.c) target_sources(app PRIVATE src/behaviors/behavior_transparent.c)
target_sources(app PRIVATE src/behaviors/behavior_sensor_rotate_key_press.c) target_sources(app PRIVATE src/behaviors/behavior_sensor_rotate_key_press.c)
target_sources(app PRIVATE src/behaviors/behavior_rgb_underglow.c)
target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/ble.c) target_sources_ifdef(CONFIG_ZMK_BLE app PRIVATE src/ble.c)
target_sources_ifdef(CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL app PRIVATE src/split_listener.c) target_sources_ifdef(CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL app PRIVATE src/split_listener.c)
target_sources_ifdef(CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL app PRIVATE src/split/bluetooth/service.c) target_sources_ifdef(CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL app PRIVATE src/split/bluetooth/service.c)

1
app/dts/behaviors.dtsi
View file

@ -4,3 +4,4 @@
#include <behaviors/momentary_layer.dtsi> #include <behaviors/momentary_layer.dtsi>
#include <behaviors/reset.dtsi> #include <behaviors/reset.dtsi>
#include <behaviors/sensor_rotate_key_press.dtsi> #include <behaviors/sensor_rotate_key_press.dtsi>
#include <behaviors/rgb_underglow.dtsi>

9
app/dts/behaviors/rgb_underglow.dtsi Normal file
View file

@ -0,0 +1,9 @@
/ {
behaviors {
rgb_ug: behavior_rgb_underglow {
compatible = "zmk,behavior-rgb-underglow";
label = "RGB_UNDERGLOW_ACTION";
#binding-cells = <1>;
};
};
};

8
app/dts/bindings/behaviors/zmk,behavior-rgb-underglow.yaml Normal file
View file

@ -0,0 +1,8 @@
# Copyright (c) 2020, Nick Winans
# SPDX-License-Identifier: MIT
description: RGB Underglow Action
compatible: "zmk,behavior-rgb-underglow"
include: one_param.yaml

12
app/include/dt-bindings/zmk/rgb.h Normal file
View file

@ -0,0 +1,12 @@
#define RGB_TOG 0
#define RGB_HUI 1
#define RGB_HUD 2
#define RGB_SAI 3
#define RGB_SAD 4
#define RGB_BRI 5
#define RGB_BRD 6
#define RGB_SPI 7
#define RGB_SPD 8
#define RGB_EFF 9
#define RGB_EFR 10

8
app/include/zmk/rgb_underglow.h Normal file
View file

@ -0,0 +1,8 @@
#pragma once
void zmk_rgb_underglow_toggle();
void zmk_rgb_underglow_cycle_effect(int direction);
void zmk_rgb_underglow_change_hue(int direction);
void zmk_rgb_underglow_change_sat(int direction);
void zmk_rgb_underglow_change_brt(int direction);
void zmk_rgb_underglow_change_spd(int direction);

59
app/src/behaviors/behavior_rgb_underglow.c
View file

@ -10,6 +10,9 @@
#include <drivers/behavior.h> #include <drivers/behavior.h>
#include <logging/log.h> #include <logging/log.h>
#include <dt-bindings/zmk/rgb.h>
#include <zmk/rgb_underglow.h>
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
struct behavior_rgb_underglow_config { }; struct behavior_rgb_underglow_config { };
@ -19,3 +22,59 @@ static int behavior_rgb_underglow_init(struct device *dev)
{ {
return 0; return 0;
} }
static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t action, u32_t _)
{
switch (action)
{
case RGB_TOG:
zmk_rgb_underglow_toggle();
break;
case RGB_HUI:
zmk_rgb_underglow_change_hue(1);
break;
case RGB_HUD:
zmk_rgb_underglow_change_hue(-1);
break;
case RGB_SAI:
zmk_rgb_underglow_change_sat(1);
break;
case RGB_SAD:
zmk_rgb_underglow_change_sat(-1);
break;
case RGB_BRI:
zmk_rgb_underglow_change_brt(1);
break;
case RGB_BRD:
zmk_rgb_underglow_change_brt(-1);
break;
case RGB_SPI:
zmk_rgb_underglow_change_spd(1);
break;
case RGB_SPD:
zmk_rgb_underglow_change_spd(-1);
break;
case RGB_EFF:
zmk_rgb_underglow_cycle_effect(1);
break;
case RGB_EFR:
zmk_rgb_underglow_cycle_effect(-1);
break;
}
return 0;
}
static const struct behavior_driver_api behavior_rgb_underglow_driver_api = {
.binding_pressed = on_keymap_binding_pressed,
};
static const struct behavior_rgb_underglow_config behavior_rgb_underglow_config = {};
static struct behavior_rgb_underglow_data behavior_rgb_underglow_data;
DEVICE_AND_API_INIT(behavior_rgb_underglow, DT_INST_LABEL(0), behavior_rgb_underglow_init,
&behavior_rgb_underglow_data,
&behavior_rgb_underglow_config,
APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT,
&behavior_rgb_underglow_driver_api);

282
app/src/rgb_underglow.c
View file

@ -6,6 +6,10 @@
#include <device.h> #include <device.h>
#include <init.h> #include <init.h>
#include <kernel.h>
#include <math.h>
#include <stdlib.h>
#include <logging/log.h> #include <logging/log.h>
@ -18,62 +22,274 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
#define STRIP_LABEL DT_LABEL(DT_ALIAS(led_strip)) #define STRIP_LABEL DT_LABEL(DT_ALIAS(led_strip))
#define STRIP_NUM_PIXELS DT_PROP(DT_ALIAS(led_strip), chain_length) #define STRIP_NUM_PIXELS DT_PROP(DT_ALIAS(led_strip), chain_length)
#define DELAY_TIME K_MSEC(50) enum rgb_underglow_effect {
UNDERGLOW_EFFECT_SOLID,
#define RGB(_r, _g, _b) { .r = (_r), .g = (_g), .b = (_b) } UNDERGLOW_EFFECT_BREATHE,
UNDERGLOW_EFFECT_SPECTRUM,
static const struct led_rgb colors[] = { UNDERGLOW_EFFECT_SWIRL,
RGB(0x0f, 0x00, 0x00), /* red */ UNDERGLOW_EFFECT_NUMBER // Used to track number of underglow effects
RGB(0x00, 0x0f, 0x00), /* green */
RGB(0x00, 0x00, 0x0f), /* blue */
}; };
struct led_hsb {
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;
u16_t animation_step;
bool on;
};
struct rgb_underglow_state state;
struct device *led_strip;
struct led_rgb pixels[STRIP_NUM_PIXELS]; struct led_rgb pixels[STRIP_NUM_PIXELS];
static void zmk_rgb_underglow_start() static struct led_rgb hsb_to_rgb(struct led_hsb hsb)
{ {
struct device *strip; double r, g, b;
size_t cursor = 0, color = 0;
int rc;
strip = device_get_binding(STRIP_LABEL); u8_t i = hsb.h / 60;
if (strip) { double v = hsb.b / 100.0;
LOG_INF("Found LED strip device %s", STRIP_LABEL); double s = hsb.s / 100.0;
} else { double f = hsb.h / 360.0 * 6 - i;
LOG_ERR("LED strip device %s not found", STRIP_LABEL); double p = v * (1 - s);
return; 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;
} }
LOG_INF("Displaying pattern on strip"); struct led_rgb rgb = { r: r*255, g: g*255, b: b*255 };
while (1) {
memset(&pixels, 0x00, sizeof(pixels));
memcpy(&pixels[cursor], &colors[color], sizeof(struct led_rgb));
rc = led_strip_update_rgb(strip, pixels, STRIP_NUM_PIXELS);
if (rc) { return rgb;
LOG_ERR("couldn't update strip: %d", rc);
} }
cursor++; static void zmk_rgb_underglow_effect_solid()
if (cursor >= STRIP_NUM_PIXELS) { {
cursor = 0; for (int i=0; i<STRIP_NUM_PIXELS; i++)
color++; {
if (color == ARRAY_SIZE(colors)) { int hue = state.hue;
color = 0; int sat = state.saturation;
int brt = state.brightness;
struct led_hsb hsb = { hue, sat, brt };
pixels[i] = hsb_to_rgb(hsb);
} }
} }
k_sleep(DELAY_TIME); 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 };
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++)
{
int hue = state.animation_step;
int sat = state.saturation;
int brt = state.brightness;
struct led_hsb hsb = { hue, sat, brt };
pixels[i] = hsb_to_rgb(hsb);
}
state.animation_step += state.animation_speed;
state.animation_step = state.animation_step % 360;
}
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 };
pixels[i] = hsb_to_rgb(hsb);
}
state.animation_step += state.animation_speed * 2;
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;
}
led_strip_update_rgb(led_strip, pixels, STRIP_NUM_PIXELS);
}
K_WORK_DEFINE(underglow_work, zmk_rgb_underglow_tick);
static void zmk_rgb_underglow_tick_handler(struct k_timer *timer)
{
k_work_submit(&underglow_work);
}
K_TIMER_DEFINE(underglow_tick, zmk_rgb_underglow_tick_handler, NULL);
static int zmk_rgb_underglow_init(struct device *_arg) static int zmk_rgb_underglow_init(struct device *_arg)
{ {
zmk_rgb_underglow_start(); 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 1;
}
state = (struct rgb_underglow_state){
hue: 0,
saturation: 100,
brightness: 100,
animation_speed: 3,
current_effect: 0,
animation_step: 0,
on: true
};
k_timer_start(&underglow_tick, K_NO_WAIT, K_MSEC(50));
return 0; return 0;
} }
void zmk_rgb_underglow_cycle_effect(int direction)
{
if (state.current_effect == 0 && direction < 0) {
state.current_effect = UNDERGLOW_EFFECT_NUMBER - 1;
} else {
state.current_effect += direction;
if (state.current_effect >= UNDERGLOW_EFFECT_NUMBER) {
state.current_effect = 0;
}
}
state.animation_step = 0;
}
void zmk_rgb_underglow_toggle()
{
state.on = !state.on;
if (state.on) {
state.animation_step = 0;
k_timer_start(&underglow_tick, K_NO_WAIT, K_MSEC(50));
} else {
for (int i=0; i<STRIP_NUM_PIXELS; i++)
{
pixels[i] = (struct led_rgb){ r: 0, g: 0, b: 0};
}
led_strip_update_rgb(led_strip, pixels, STRIP_NUM_PIXELS);
k_timer_stop(&underglow_tick);
}
}
void zmk_rgb_underglow_change_hue(int direction)
{
if (state.hue == 0 && direction < 0) {
state.hue = 350;
return;
}
state.hue += direction * CONFIG_ZMK_RGB_UNDERGLOW_HUE_STEP;
if (state.hue > 350) {
state.hue = 0;
}
}
void zmk_rgb_underglow_change_sat(int direction)
{
if (state.saturation == 0 && direction < 0) {
return;
}
state.saturation += direction * CONFIG_ZMK_RGB_UNDERGLOW_SAT_STEP;
if (state.saturation > 100) {
state.saturation = 100;
}
}
void zmk_rgb_underglow_change_brt(int direction)
{
if (state.brightness == 0 && direction < 0) {
return;
}
state.brightness += direction * CONFIG_ZMK_RGB_UNDERGLOW_BRT_STEP;
if (state.brightness > 100) {
state.brightness = 100;
}
}
void zmk_rgb_underglow_change_spd(int direction)
{
if (state.animation_speed == 1 && direction < 0) {
return;
}
state.animation_speed += direction;
if (state.animation_speed > 5) {
state.animation_speed = 5;
}
}
SYS_INIT(zmk_rgb_underglow_init, SYS_INIT(zmk_rgb_underglow_init,
APPLICATION, APPLICATION,
CONFIG_APPLICATION_INIT_PRIORITY); CONFIG_APPLICATION_INIT_PRIORITY);