-
-
Notifications
You must be signed in to change notification settings - Fork 3.9k
feats: prevent sleep while active BT profile connected and allow sleep while USB power connected #3288
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.
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
Open
newx-it
wants to merge
12
commits into
zmkfirmware:main
Choose a base branch
from
newx-it:feat-ble-prevent-sleep-feat-usb-allow-sleep
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+31
−8
Open
feats: prevent sleep while active BT profile connected and allow sleep while USB power connected #3288
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
8b4bf7d
feat(ble): prevent sleep while BT is active
newx-it 2d77d1d
feat(usb): allow sleeping while powered over USB
newx-it ba812cb
fix: formatting
newx-it f3d9aaa
fix: formatting
newx-it fd67eb2
fix: syntax error
newx-it 0511b3a
fix: more formatting
newx-it 7469360
fix: syntax
newx-it 2441c4b
Renamed config flags
newx-it c5c30a1
Fix formatting for pre-commit
newx-it 6bfae52
Updated docs to note interaction with sleep timer
newx-it 039d460
fix: docs formatting
newx-it 8c9ec64
fix: remove redundant kconfig default
newx-it File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,3 +1,5 @@ | ||||||
|
|
||||||
|
|
||||||
| --- | ||||||
| title: Power Management Configuration | ||||||
| sidebar_label: Power Management | ||||||
|
|
@@ -14,12 +16,14 @@ Configuration for entering [low power states](../features/low-power-states.md) w | |||||
|
|
||||||
| Definition file: [zmk/app/Kconfig](https://github.com/zmkfirmware/zmk/blob/main/app/Kconfig) | ||||||
|
|
||||||
| | Config | Type | Description | Default | | ||||||
| | ------------------------------- | ---- | ------------------------------------------------------------------- | ------- | | ||||||
| | `CONFIG_ZMK_IDLE_TIMEOUT` | int | Milliseconds of inactivity before entering idle state | 30000 | | ||||||
| | `CONFIG_ZMK_SLEEP` | bool | Enable deep sleep support | n | | ||||||
| | `CONFIG_ZMK_IDLE_SLEEP_TIMEOUT` | int | Milliseconds of inactivity before entering deep sleep | 900000 | | ||||||
| | `CONFIG_ZMK_PM_SOFT_OFF` | bool | Enable soft off functionality from the keymap or dedicated hardware | n | | ||||||
| | Config | Type | Description | Default | | ||||||
| | ----------------------------------------------------- | ---- | ------------------------------------------------------------------------------------------------------------------------------------------ | ------- | | ||||||
| | `CONFIG_ZMK_IDLE_TIMEOUT` | int | Milliseconds of inactivity before entering idle state | 30000 | | ||||||
| | `CONFIG_ZMK_SLEEP` | bool | Enable deep sleep support | n | | ||||||
| | `CONFIG_ZMK_IDLE_SLEEP_TIMEOUT` | int | Milliseconds of inactivity before entering deep sleep | 900000 | | ||||||
| | `CONFIG_ZMK_PM_SOFT_OFF` | bool | Enable soft off functionality from the keymap or dedicated hardware | n | | ||||||
| | `CONFIG_ZMK_BLE_PREVENT_SLEEP_WHILE_ACTIVE_CONNECTED` | bool | Prevent sleeping while the active BT profile is connected. If the device loses connection after the sleep timer, it will sleep immediately | n | | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
mismatching the Kconfig file; also will need a prettier pass to fix table formatting |
||||||
| | `CONFIG_ZMK_USB_PREVENT_SLEEP_WHILE_POWERED` | bool | Prevent sleeping while USB power is connected | y | | ||||||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
|
||||||
| ## External Power Control | ||||||
|
|
||||||
|
|
@@ -70,4 +74,4 @@ Applies to: `compatible = "zmk,soft-off-wakeup-sources"` | |||||
|
|
||||||
| | Property | Type | Description | | ||||||
| | ---------------- | ------------- | ------------------------------------------------------------------------------------------------- | | ||||||
| | `wakeup-sources` | phandle array | List of devices to enable during the shutdown process to be sure they can later wake the keyboard | | ||||||
| | `wakeup-sources` | phandle array | List of devices to enable during the shutdown process to be sure they can later wake the keyboard | | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One thing I missed; can you remove? See #2161
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.