From bb09707bd2627b29c150d85244f6f6295b6f0175 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 24 Jul 2020 01:06:56 -0500 Subject: Add base files and configuration for RGB underglow --- app/src/behaviors/behavior_rgb_underglow.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 app/src/behaviors/behavior_rgb_underglow.c (limited to 'app/src/behaviors') diff --git a/app/src/behaviors/behavior_rgb_underglow.c b/app/src/behaviors/behavior_rgb_underglow.c new file mode 100644 index 0000000..9239f37 --- /dev/null +++ b/app/src/behaviors/behavior_rgb_underglow.c @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2020 Nick Winans + * + * SPDX-License-Identifier: MIT + */ + +#define DT_DRV_COMPAT zmk_behavior_rgb_underglow + +#include +#include +#include + +LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); + +struct behavior_rgb_underglow_config { }; +struct behavior_rgb_underglow_data { }; + +static int behavior_rgb_underglow_init(struct device *dev) +{ + return 0; +} -- cgit v1.2.3 From ca569c814393b4ab90aedc5227523f9ce64dd581 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 24 Jul 2020 22:37:00 -0500 Subject: Initial RGB Underglow implementation --- app/src/behaviors/behavior_rgb_underglow.c | 59 ++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) (limited to 'app/src/behaviors') diff --git a/app/src/behaviors/behavior_rgb_underglow.c b/app/src/behaviors/behavior_rgb_underglow.c index 9239f37..7c83953 100644 --- a/app/src/behaviors/behavior_rgb_underglow.c +++ b/app/src/behaviors/behavior_rgb_underglow.c @@ -10,6 +10,9 @@ #include #include +#include +#include + LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); struct behavior_rgb_underglow_config { }; @@ -19,3 +22,59 @@ static int behavior_rgb_underglow_init(struct device *dev) { 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); \ No newline at end of file -- cgit v1.2.3 From 564f7872805e9fa823d767e6dd1b2b55fd5ebdf3 Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 25 Jul 2020 14:53:42 -0500 Subject: Add suggested changes --- app/src/behaviors/behavior_rgb_underglow.c | 44 +++++++++--------------------- 1 file changed, 13 insertions(+), 31 deletions(-) (limited to 'app/src/behaviors') diff --git a/app/src/behaviors/behavior_rgb_underglow.c b/app/src/behaviors/behavior_rgb_underglow.c index 7c83953..1207ed2 100644 --- a/app/src/behaviors/behavior_rgb_underglow.c +++ b/app/src/behaviors/behavior_rgb_underglow.c @@ -15,9 +15,6 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); -struct behavior_rgb_underglow_config { }; -struct behavior_rgb_underglow_data { }; - static int behavior_rgb_underglow_init(struct device *dev) { return 0; @@ -28,53 +25,38 @@ static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t a switch (action) { case RGB_TOG: - zmk_rgb_underglow_toggle(); - break; + return zmk_rgb_underglow_toggle(); case RGB_HUI: - zmk_rgb_underglow_change_hue(1); - break; + return zmk_rgb_underglow_change_hue(1); case RGB_HUD: - zmk_rgb_underglow_change_hue(-1); - break; + return zmk_rgb_underglow_change_hue(-1); case RGB_SAI: - zmk_rgb_underglow_change_sat(1); - break; + return zmk_rgb_underglow_change_sat(1); case RGB_SAD: - zmk_rgb_underglow_change_sat(-1); - break; + return zmk_rgb_underglow_change_sat(-1); case RGB_BRI: zmk_rgb_underglow_change_brt(1); - break; case RGB_BRD: - zmk_rgb_underglow_change_brt(-1); - break; + return zmk_rgb_underglow_change_brt(-1); case RGB_SPI: - zmk_rgb_underglow_change_spd(1); - break; + return zmk_rgb_underglow_change_spd(1); case RGB_SPD: - zmk_rgb_underglow_change_spd(-1); - break; + return zmk_rgb_underglow_change_spd(-1); case RGB_EFF: - zmk_rgb_underglow_cycle_effect(1); - break; + return zmk_rgb_underglow_cycle_effect(1); case RGB_EFR: - zmk_rgb_underglow_cycle_effect(-1); - break; + return zmk_rgb_underglow_cycle_effect(-1); } - return 0; + return -ENOTSUP; } 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, + NULL, + NULL, APPLICATION, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, &behavior_rgb_underglow_driver_api); \ No newline at end of file -- cgit v1.2.3 From 6956094ac023c3307a1207d358637bbe9073433b Mon Sep 17 00:00:00 2001 From: Nick Date: Sat, 25 Jul 2020 15:39:01 -0500 Subject: Add missing return To brightness up --- app/src/behaviors/behavior_rgb_underglow.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/behaviors') diff --git a/app/src/behaviors/behavior_rgb_underglow.c b/app/src/behaviors/behavior_rgb_underglow.c index 1207ed2..7a48e07 100644 --- a/app/src/behaviors/behavior_rgb_underglow.c +++ b/app/src/behaviors/behavior_rgb_underglow.c @@ -35,7 +35,7 @@ static int on_keymap_binding_pressed(struct device *dev, u32_t position, u32_t a case RGB_SAD: return zmk_rgb_underglow_change_sat(-1); case RGB_BRI: - zmk_rgb_underglow_change_brt(1); + return zmk_rgb_underglow_change_brt(1); case RGB_BRD: return zmk_rgb_underglow_change_brt(-1); case RGB_SPI: -- cgit v1.2.3