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
Zephyr 3.2 Upgrade #1499
Merged
petejohanson
merged 21 commits into
zmkfirmware:main
from
petejohanson:zephyr/3.1-upgrade
Apr 6, 2023
Merged
Zephyr 3.2 Upgrade #1499
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
4d0124f
refactor: Move to Zephyr 3.2 branch.
petejohanson 5027ed6
refactor(display): Updates for LVGL v8.x changes.
petejohanson 36cdac5
refactor: Move to LISTIFY/DT_FOREACH_PROP_ELEM macros.
petejohanson 67ccca6
refactor: Move to new PM API.
petejohanson 63e71a1
refactor(ble): New callback API for pairing complete.
petejohanson 09a84ce
refactor(behaviors): Rename `reset` behavior.
petejohanson af586e3
refactor: Move to `zephyr/` include paths.
petejohanson 7ba54de
refactor: Remove deprecated Kconfig override.
petejohanson efae1ba
refactor: Remove v1 logging vestiges.
petejohanson 5bad121
refactor: Move away from deprecated label usages.
petejohanson 8b7cc91
refactor: Move to updated Docker images.
petejohanson cf6fddd
fix(boards): Base config/overlay for rp2040 boards
petejohanson 29bebf7
fix(logging): Disable USB driver logging.
petejohanson 3a9216f
fix(kscan): Default wait between outputs on RP2040.
petejohanson a654b2d
fix(core): Bump system work queue stack on RP2040.
petejohanson 48b5877
fix(shields): Don't try to disable xiao_i2c on Hummingbird.
petejohanson 0b37bae
fix(underglow): Use `DT_HAS_CHOSEN` properly.
petejohanson b74830b
refactor(boards): Move to pinctrl.
petejohanson 6e0d742
feat(docs): Add BLE feature/config pages.
petejohanson 1015dda
fix(display): Tweak EPD driver init/blanking.
petejohanson 66ffaac
feat(docs): Add blog post for Zephyr 3.2.
petejohanson File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains 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,4 +1,4 @@ | ||
| FROM docker.io/zmkfirmware/zmk-dev-arm:3.0 | ||
| FROM docker.io/zmkfirmware/zmk-dev-arm:3.2 | ||
|
|
||
| COPY .bashrc tmp | ||
| RUN mv /tmp/.bashrc ~/.bashrc |
This file contains 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 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 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 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 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 |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| CONFIG_ZMK_DISPLAY=y | ||
| CONFIG_LV_FONT_UNSCII_8=n | ||
| CONFIG_ZMK_USB=y | ||
| CONFIG_I2C=y | ||
| CONFIG_I2C_DW=y | ||
| CONFIG_LV_Z_VDB_SIZE=50 |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /* | ||
| * Copyright (c) 2023 The ZMK Contributors | ||
| * | ||
| * SPDX-License-Identifier: MIT | ||
| */ | ||
|
|
||
| #include "usb_console.dtsi" | ||
|
|
||
| &xiao_serial { status = "disabled"; }; |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| CONFIG_CONSOLE=n | ||
| CONFIG_SERIAL=n | ||
| CONFIG_UART_CONSOLE=n | ||
| CONFIG_ZMK_USB=y |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /* | ||
| * Copyright (c) 2023 The ZMK Contributors | ||
| * | ||
| * SPDX-License-Identifier: MIT | ||
| */ | ||
|
|
||
| #include "usb_console.dtsi" | ||
|
|
||
| &pro_micro_serial { status = "disabled"; }; |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| CONFIG_CONSOLE=n | ||
| CONFIG_SERIAL=n | ||
| CONFIG_UART_CONSOLE=n | ||
| CONFIG_ZMK_USB=y |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| /* | ||
| * Copyright (c) 2023 The ZMK Contributors | ||
| * | ||
| * SPDX-License-Identifier: MIT | ||
| */ | ||
|
|
||
| #include "usb_console.dtsi" | ||
|
|
||
| &xiao_serial { status = "disabled"; }; |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| file_format: "1" | ||
| id: adafruit_kb2040 | ||
| name: Adafruit KB2040 | ||
| type: board | ||
| arch: arm | ||
| outputs: | ||
| - usb | ||
| url: https://www.adafruit.com/product/5302 | ||
| exposes: [pro_micro] |
9 changes: 9 additions & 0 deletions
9
app/boards/arm/adafruit_qt_py_rp2040/adafruit_qt_py_rp2040.zmk.yml
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| file_format: "1" | ||
| id: adafruit_qt_py_rp2040 | ||
| name: Adafruit QT Py RP2040 | ||
| type: board | ||
| arch: arm | ||
| outputs: | ||
| - usb | ||
| url: https://www.adafruit.com/product/4900 | ||
| exposes: [seeed_xiao] |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * Copyright (c) 2022 The ZMK Contributors | ||
| * SPDX-License-Identifier: MIT | ||
| */ | ||
|
|
||
| &pinctrl { | ||
| uart0_default: uart0_default { | ||
| group1 { | ||
| psels = <NRF_PSEL(UART_RX, 0, 8)>; | ||
| bias-pull-up; | ||
| }; | ||
| group2 { | ||
| psels = <NRF_PSEL(UART_TX, 0, 6)>; | ||
| }; | ||
| }; | ||
|
|
||
| uart0_sleep: uart0_sleep { | ||
| group1 { | ||
| psels = <NRF_PSEL(UART_RX, 0, 8)>, | ||
| <NRF_PSEL(UART_TX, 0, 6)>; | ||
| low-power-enable; | ||
| }; | ||
| }; | ||
|
|
||
| i2c0_default: i2c0_default { | ||
| group1 { | ||
| psels = <NRF_PSEL(TWIM_SDA, 0, 17)>, | ||
| <NRF_PSEL(TWIM_SCL, 0, 20)>; | ||
| }; | ||
| }; | ||
|
|
||
| i2c0_sleep: i2c0_sleep { | ||
| group1 { | ||
| psels = <NRF_PSEL(TWIM_SDA, 0, 17)>, | ||
| <NRF_PSEL(TWIM_SCL, 0, 20)>; | ||
| low-power-enable; | ||
| }; | ||
| }; | ||
| }; |
This file contains 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 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 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 |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| file_format: "1" | ||
| id: boardsource_blok | ||
| name: BoardSource blok | ||
| type: board | ||
| arch: arm | ||
| outputs: | ||
| - usb | ||
| url: https://peg.software/docs/blok | ||
| exposes: [pro_micro] |
This file contains 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 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 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 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 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
Oops, something went wrong.
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.
Is this comment no longer relevant, or does it still apply to the buffer size configs?
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.
I think above has 'nixed that issue, but there's probably still edge cases where this could occur.