fix(bt): Fix BT tests after soft off work.

* Move to explicit enable of `ZMK_PM_SOFT_OFF` to turn on the feature and use the behaviors, which matches how other features work, and helps with split and testing schemes.
petejohanson · Dec 9, 2023 · cf270be · cf270be
1 parent d2d0fec
commit cf270be
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/app/Kconfig.behaviors b/app/Kconfig.behaviors
@@ -25,8 +25,7 @@ config ZMK_BEHAVIOR_MOUSE_KEY_PRESS
 config ZMK_BEHAVIOR_SOFT_OFF
     bool
     default y
-    select ZMK_PM_SOFT_OFF
-    depends on DT_HAS_ZMK_BEHAVIOR_SOFT_OFF_ENABLED
+    depends on DT_HAS_ZMK_BEHAVIOR_SOFT_OFF_ENABLED && ZMK_PM_SOFT_OFF
 
 config ZMK_BEHAVIOR_SENSOR_ROTATE_COMMON
     bool

diff --git a/app/boards/shields/zmk_uno/boards/nrf52840dk_nrf52840.conf b/app/boards/shields/zmk_uno/boards/nrf52840dk_nrf52840.conf
@@ -0,0 +1 @@
+CONFIG_ZMK_PM_SOFT_OFF=y
diff --git a/app/dts/behaviors/soft_off.dtsi b/app/dts/behaviors/soft_off.dtsi
@@ -6,8 +6,9 @@
 
 / {
     behaviors {
-        soft_off: soft_off {
+        /omit-if-no-ref/ soft_off: soft_off {
             compatible = "zmk,behavior-soft-off";
+            label = "SOFTOFF";
             #binding-cells = <0>;
         };
     };

diff --git a/docs/docs/config/power.md b/docs/docs/config/power.md
@@ -24,6 +24,18 @@ Definition file: [zmk/app/Kconfig](https://github.com/zmkfirmware/zmk/blob/main/
 | `CONFIG_ZMK_SLEEP`              | bool | Enable deep sleep support                             | n       |
 | `CONFIG_ZMK_IDLE_SLEEP_TIMEOUT` | int  | Milliseconds of inactivity before entering deep sleep | 900000  |
 
+## Soft Off
+
+The [soft off feature](../features/soft-off.md) allows turning the keyboard on/off from either dedicated hardware of using the [`&soft_off` behavior](../behaviors/soft-off.md) to turn off and a reset button to turn back on again.
+
+### Kconfig
+
+Definition file: [zmk/app/Kconfig](https://github.com/zmkfirmware/zmk/blob/main/app/Kconfig)
+
+| Config                   | Type | Description                                                         | Default |
+| ------------------------ | ---- | ------------------------------------------------------------------- | ------- |
+| `CONFIG_ZMK_PM_SOFT_OFF` | bool | Enable soft off functionality from the keymap of dedicated hardware | n       |
+
 ## External Power Control
 
 Driver for enabling or disabling power to peripherals such as displays and lighting. This driver must be configured to use [power management behaviors](../behaviors/power.md).