kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(underglow): Add runtime device PM support

Browse source 
* Properly get/put the LED strip instance when actively using
  the LEDs, to allow automatic power domain handling to cut
  power when the LEDs are not in use.
This commit is contained in:
Peter Johanson 2023-04-23 07:10:48 +00:00
parent 6c1d6fb3e4
commit 01ea0e44bd
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Kconfig
View file

@ -275,7 +275,7 @@ config SPI
config ZMK_RGB_UNDERGLOW_EXT_POWER config ZMK_RGB_UNDERGLOW_EXT_POWER
bool "RGB underglow toggling also controls external power" bool "RGB underglow toggling also controls external power"
default y default y if !POWER_DOMAIN
config ZMK_RGB_UNDERGLOW_BRT_MIN config ZMK_RGB_UNDERGLOW_BRT_MIN
int "RGB underglow minimum brightness in percent" int "RGB underglow minimum brightness in percent"

12
app/src/rgb_underglow.c
View file

@ -7,6 +7,7 @@
#include <zephyr/device.h> #include <zephyr/device.h>
#include <zephyr/init.h> #include <zephyr/init.h>
#include <zephyr/kernel.h> #include <zephyr/kernel.h>
#include <zephyr/pm/device_runtime.h>
#include <zephyr/settings/settings.h> #include <zephyr/settings/settings.h>
#include <math.h> #include <math.h>
@ -274,6 +275,7 @@ static int zmk_rgb_underglow_init(void) {
#endif #endif
if (state.on) { if (state.on) {
pm_device_runtime_get(led_strip);
k_timer_start(&underglow_tick, K_NO_WAIT, K_MSEC(50)); k_timer_start(&underglow_tick, K_NO_WAIT, K_MSEC(50));
} }
@ -300,6 +302,14 @@ int zmk_rgb_underglow_get_state(bool *on_off) {
int zmk_rgb_underglow_on(void) { int zmk_rgb_underglow_on(void) {
if (!led_strip) if (!led_strip)
return -ENODEV; return -ENODEV;
}
// Newer PM device approach to ensuring powered on when used.
const int rc = pm_device_runtime_get(led_strip);
if (rc < 0) {
LOG_ERR("Failed to enable/get the PM device (%d)", rc);
return rc;
}
#if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER) #if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_EXT_POWER)
if (ext_power != NULL) { if (ext_power != NULL) {
@ -345,6 +355,8 @@ int zmk_rgb_underglow_off(void) {
k_timer_stop(&underglow_tick); k_timer_stop(&underglow_tick);
state.on = false; state.on = false;
pm_device_runtime_put(led_strip);
return zmk_rgb_underglow_save_state(); return zmk_rgb_underglow_save_state();
} }