Experimental: Automatic power domain handling for displays/RGB zmkfi…

…rmware#1775
gibking · Oct 23, 2023 · c6d4d2e · c6d4d2e
1 parent b866d40
commit c6d4d2e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/app/Kconfig b/app/Kconfig
@@ -208,9 +208,16 @@ if ZMK_RGB_UNDERGLOW
 config SPI
     default y
 
+
+config ZMK_RGB_UNDERGLOW_DEFAULT_POWER_DOMAIN
+    bool "Auto-assign the RGB underglow to the default power domain"
+    default y
+    depends on ZMK_POWER_DOMAINS_DYNAMIC_DEFAULT
+
 config ZMK_RGB_UNDERGLOW_EXT_POWER
     bool "RGB underglow toggling also controls external power"
-    default y if !POWER_DOMAIN
+    default y
+    depends on !ZMK_POWER_DOMAINS
 
 config ZMK_RGB_UNDERGLOW_BRT_MIN
     int "RGB underglow minimum brightness in percent"
@@ -273,6 +280,7 @@ config ZMK_RGB_UNDERGLOW_AUTO_OFF_USB
     bool "Turn off RGB underglow when USB is disconnected"
     depends on USB_DEVICE_STACK
 
+
 #ZMK_RGB_UNDERGLOW
 endif
 

diff --git a/app/src/display/Kconfig b/app/src/display/Kconfig
@@ -14,6 +14,11 @@ config ZMK_DISPLAY_BLANK_ON_IDLE
     bool "Blank display on idle"
     default y if SSD1306
 
+config ZMK_DISPLAY_DEFAULT_POWER_DOMAIN
+    bool "Auto-assign the display to the default power domain"
+    default y
+    depends on ZMK_POWER_DOMAINS_DYNAMIC_DEFAULT
+
 if LV_USE_THEME_MONO
 
 config ZMK_DISPLAY_INVERT

diff --git a/app/src/display/main.c b/app/src/display/main.c
@@ -119,7 +119,7 @@ void initialize_display(struct k_work *work) {
         return;
     }
 
-#if IS_ENABLED(CONFIG_ZMK_POWER_DOMAINS) && DT_HAS_CHOSEN(zmk_default_power_domain)
+#if IS_ENABLED(CONFIG_ZMK_DISPLAY_DEFAULT_POWER_DOMAIN) && DT_HAS_CHOSEN(zmk_default_power_domain)
 
     pm_device_runtime_enable(display);
     if (!pm_device_on_power_domain(display)) {

diff --git a/app/src/rgb_underglow.c b/app/src/rgb_underglow.c
@@ -251,7 +251,8 @@ static int zmk_rgb_underglow_init(const struct device *_arg) {
     }
 #endif
 
-#if IS_ENABLED(CONFIG_ZMK_POWER_DOMAINS) && DT_HAS_CHOSEN(zmk_default_power_domain)
+#if IS_ENABLED(CONFIG_ZMK_RGB_UNDERGLOW_DEFAULT_POWER_DOMAIN) &&                                   \
+    DT_HAS_CHOSEN(zmk_default_power_domain)
 
     pm_device_runtime_enable(led_strip);
     if (!pm_device_on_power_domain(led_strip)) {