From cb190c9f116be68b247e3b7214d62c305702ff24 Mon Sep 17 00:00:00 2001 From: Peter Johanson Date: Mon, 25 Nov 2024 08:42:47 -0700 Subject: [PATCH] fix: Allow setting `wakeup-source` on composite. Include the base `kscan.yaml` to allow settings `wakeup-source` on composite kscan devices. --- app/dts/bindings/zmk,kscan-composite.yaml | 2 ++ docs/docs/config/kscan.md | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/dts/bindings/zmk,kscan-composite.yaml b/app/dts/bindings/zmk,kscan-composite.yaml index ea6cc41619e..2600eab7be6 100644 --- a/app/dts/bindings/zmk,kscan-composite.yaml +++ b/app/dts/bindings/zmk,kscan-composite.yaml @@ -3,6 +3,8 @@ description: | compatible: "zmk,kscan-composite" +include: kscan.yaml + properties: label: type: string diff --git a/docs/docs/config/kscan.md b/docs/docs/config/kscan.md index 6e9aab02abe..e4096318b9a 100644 --- a/docs/docs/config/kscan.md +++ b/docs/docs/config/kscan.md @@ -216,10 +216,11 @@ Applies to : `compatible = "zmk,kscan-composite"` Definition file: [zmk/app/dts/bindings/zmk,kscan-composite.yaml](https://github.com/zmkfirmware/zmk/blob/main/app/dts/bindings/zmk,kscan-composite.yaml) -| Property | Type | Description | Default | -| --------- | ---- | --------------------------------------------- | ------- | -| `rows` | int | The number of rows in the composite matrix | | -| `columns` | int | The number of columns in the composite matrix | | +| Property | Type | Description | Default | +| --------------- | ---- | ----------------------------------------------------------------------------------------------------------------------------- | ------- | +| `rows` | int | The number of rows in the composite matrix | | +| `columns` | int | The number of columns in the composite matrix | | +| `wakeup-source` | bool | Mark this kscan instance as able to wake the keyboard. Required to keep the child kscan devices from being suspended as well. | The `zmk,kscan-composite` node should have one child node per keyboard scan driver that should be composited. Each child node can have the following properties: