Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Allow setting wakeup-source on composite. #2673

Closed
wants to merge 1 commit into from
Closed

fix: Allow setting wakeup-source on composite. #2673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/dts/bindings/zmk,kscan-composite.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ description: |
compatible: "zmk,kscan-composite"

include: kscan.yaml

properties:
label:
type: string
Expand Down
9 changes: 5 additions & 4 deletions docs/docs/config/kscan.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. |
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
| `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. |
| `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:

Expand Down