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

Jump to bottom

Zephyr 3.2 Upgrade #1499

Merged
merged 21 commits into from
Apr 6, 2023
Merged

Zephyr 3.2 Upgrade #1499

merged 21 commits into from
Apr 6, 2023

Conversation

petejohanson
Copy link
Contributor

@petejohanson petejohanson commented Oct 19, 2022 •
edited
Loading

Draft PR for now, but the start of the Zephyr 3.2 upgrade work here. Will flesh out the description here more later.

Areas needing testing:

  • RP2040 additions
  • LVGL 8.x update refactors.
  • Sensor refactors for DTS label changes.
  • Battery code consuming those sensors.
  • kscan label usage changes.
  • Docker bits since the updated Zephyr SDK installation changed.

Testing steps

Local dev

  1. If not building w/ VSCode docker integration, install https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.15.1
  2. gh pr checkout 1499
  3. west update
  4. Use new build directory to build ZMK as usual.

GitHub Actions

Make two edits in the branch of your config repo:

  1. Update .github/workflowr/build.yaml to contain:

    on: [push, pull_request, workflow_dispatch]

jobs:
  build:
    uses: petejohanson/zmk/.github/workflows/build-user-config.yml@zephyr/3.1-upgrade

  2. Update config/west.yaml according to the https://zmk.dev/docs/features/beta-testing/ instructions to test this PR.

Outstanding Work

  • Finish pinctrl refactor
  • Add pinctrl refactor docs to blog post
  • Document GATT notification Kconfig to get windows battery reporting working.
  • Tons of testing
  • Make keymap upgrader fix &reset rename
  • Add &reset check to GHA workflow with specific error message with how to fix.
  • Move ADC to channel config in DT.
  • Complete blog post, including RP2040 status, other changes, etc.
  • fix label usage in board pinmux files.
  • investigate encoder regression
  • Fix CiZ display issue.

@petejohanson petejohanson added the core Core functionality/behavior of ZMK label Oct 19, 2022
@petejohanson petejohanson self-assigned this Oct 19, 2022
@petejohanson petejohanson force-pushed the zephyr/3.1-upgrade branch 19 times, most recently from b2295b1 to 30a8ee8 Compare October 22, 2022 04:35
@petejohanson petejohanson mentioned this pull request Oct 22, 2022
Closed
@petejohanson petejohanson force-pushed the zephyr/3.1-upgrade branch 5 times, most recently from 246f8e9 to e6d851c Compare October 24, 2022 04:07
@petejohanson petejohanson force-pushed the zephyr/3.1-upgrade branch 2 times, most recently from b25e1c1 to 355d908 Compare November 6, 2022 05:33
@alinelena
Copy link

basic matrix seems to work on both my xiao ble and rp2040... what I noticed is that the encoder does not work with 3.2 while is fine with 3.0

joelspadin
joelspadin reviewed Apr 4, 2023
View reviewed changes
app/Kconfig
default USB_DRIVER_LOG_LEVEL_OFF

endchoice

# We do this to avoid log loop where logging to USB generates more log messages.
Copy link
Collaborator

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?

Copy link
Contributor Author

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.

app/boards/boardsource_blok.overlay Outdated Show resolved Hide resolved
app/boards/rpi_pico.overlay Outdated Show resolved Hide resolved
app/boards/seeeduino_xiao_rp2040.overlay Outdated Show resolved Hide resolved
app/boards/01space_rp2040_042lcd.overlay Outdated Show resolved Hide resolved
app/boards/adafruit_qt_py_rp2040.overlay Outdated Show resolved Hide resolved
app/boards/sparkfun_pro_micro_rp2040.overlay Outdated Show resolved Hide resolved
app/boards/usb_console.dtsi Outdated Show resolved Hide resolved
docs/docs/features/bluetooth.md Outdated Show resolved Hide resolved
docs/docs/features/bluetooth.md Outdated Show resolved Hide resolved
petejohanson and others added 6 commits April 4, 2023 03:51
@petejohanson @joelspadin
fix(boards): Base config/overlay for rp2040 boards
cf6fddd 
Baseline config and overlay for the following:

* `rpi_pico`
* `adafruit_kb2040`
* `sparkfun_pro_micro_rp2040`
* `adafruit_qt_py_rp2040`
* `seeeduino_xiao_rp2040`
* `boardsource_blok`
* `01space_rp2040_042lcd`

Co-authored-by: Joel Spadin <[email protected]>
@petejohanson
fix(logging): Disable USB driver logging.
29bebf7 
When enabling our high level USB logging, disable the USB driver
logging itself entirely, to avoid logging in the driver causing
errors when USB isn't up yet to send the logs.
@petejohanson
fix(kscan): Default wait between outputs on RP2040.
3a9216f
@petejohanson
fix(core): Bump system work queue stack on RP2040.
a654b2d
@petejohanson
fix(shields): Don't try to disable xiao_i2c on Hummingbird.
48b5877
@petejohanson
fix(underglow): Use DT_HAS_CHOSEN properly.
0b37bae
@petejohanson petejohanson force-pushed the zephyr/3.1-upgrade branch 5 times, most recently from 7335b47 to 3bba687 Compare April 4, 2023 19:23
caksoylar
caksoylar reviewed Apr 4, 2023
View reviewed changes
Copy link
Contributor

@caksoylar caksoylar left a comment

Choose a reason for hiding this comment

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

A final pass on the docs pages, including some corrections on the blog post.

docs/docs/features/bluetooth.md Outdated Show resolved Hide resolved
docs/docs/features/bluetooth.md Outdated Show resolved Hide resolved
docs/blog/2023-04-06-zephyr-3-2.md Outdated Show resolved Hide resolved
docs/blog/2023-04-06-zephyr-3-2.md Outdated Show resolved Hide resolved
docs/blog/2023-04-06-zephyr-3-2.md Outdated Show resolved Hide resolved
@petejohanson petejohanson force-pushed the zephyr/3.1-upgrade branch 2 times, most recently from 38022c0 to e6c2982 Compare April 4, 2023 21:52
petejohanson and others added 4 commits April 5, 2023 00:16
@petejohanson
refactor(boards): Move to pinctrl.
b74830b
@petejohanson @caksoylar
feat(docs): Add BLE feature/config pages.
6e0d742 
Co-authored-by: Cem Aksoylar <[email protected]>
@petejohanson
fix(display): Tweak EPD driver init/blanking.
1015dda 
Ensure we only clear the display when turning blanking off the
first time, not every time, to avoid duplicate clears.
@petejohanson @caksoylar
feat(docs): Add blog post for Zephyr 3.2.
66ffaac 
Co-authored-by: Cem Aksoylar <[email protected]>
@petejohanson petejohanson merged commit 2614b85 into zmkfirmware:main Apr 6, 2023
@FrostKiwi FrostKiwi mentioned this pull request Apr 6, 2023
Closed
@caksoylar caksoylar mentioned this pull request Apr 15, 2023
Open
@lesshonor lesshonor mentioned this pull request Nov 14, 2023
Closed
vvin0 added a commit to vvin0/zmk-config that referenced this pull request Dec 3, 2023
@vvin0
Update build.yml added zmkfirmware/zmk#1499
f62fae3
vvin0 added a commit to vvin0/zmk-config that referenced this pull request Dec 3, 2023
@vvin0
Update build.yml zmkfirmware/zmk#1499
a88acd5
vvin0 added a commit to vvin0/zmk-config that referenced this pull request Dec 3, 2023
@vvin0
Update build.yml zmkfirmware/zmk#1499
e5ba193
@lttb lttb mentioned this pull request Feb 25, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nguyendown nguyendown nguyendown left review comments

@caksoylar caksoylar caksoylar left review comments

@urob urob urob left review comments

@joelspadin joelspadin joelspadin requested changes

Assignees

@petejohanson petejohanson

Labels
core Core functionality/behavior of ZMK
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@petejohanson @alinelena @joelspadin @urob @caksoylar @nguyendown