Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Zephyr 3.2 Upgrade#1499

Merged
petejohanson merged 21 commits into
zmkfirmware:mainfrom
petejohanson:zephyr/3.1-upgrade
Apr 6, 2023
Merged

Zephyr 3.2 Upgrade#1499
petejohanson merged 21 commits into
zmkfirmware:mainfrom
petejohanson:zephyr/3.1-upgrade

Conversation

@petejohanson
Copy link
Copy Markdown
Contributor

@petejohanson petejohanson commented Oct 19, 2022

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 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
Copy Markdown

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

Copy link
Copy Markdown
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.

The blog post looks good to me with these changes, I will also give the new docs pages a review later.

Comment thread docs/blog/2023-03-31-zephyr-3-2.md Outdated
Comment thread docs/blog/2023-03-31-zephyr-3-2.md Outdated
Comment thread docs/blog/2023-03-31-zephyr-3-2.md Outdated
Comment thread docs/blog/2023-03-31-zephyr-3-2.md Outdated
* LV_ prefix from new LVGL official Kconfig now used.
* API changes for themes, container object removal, etc.
* Add our own Kconfig and code for theme default small font.
* Remove some hardcoded sizes.
* Upstream now has a node w/ label `reset` on many boards, so
  renaming our reset behavior node label to `sys_reset`.
* Zephyr moved to properly namespaced headers, so major "rip
  the bandaid" commit to move us to those everywhere.
* Move away from DT_LABEL.
* Move to DEVICE_DT_GET for non-behavior device access.
* Move various drivers to `gpio_spec_dt` and `DT` related macros.
* Remove mcp23017 while at it, since better upstream driver is
  available.
Comment thread app/Kconfig

endchoice

# We do this to avoid log loop where logging to USB generates more log messages.
Copy link
Copy Markdown
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
Copy Markdown
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.

Comment thread app/boards/boardsource_blok.overlay Outdated
Comment thread app/boards/rpi_pico.overlay Outdated
Comment thread app/boards/seeeduino_xiao_rp2040.overlay Outdated
Comment thread app/boards/01space_rp2040_042lcd.overlay Outdated
Comment thread app/boards/adafruit_qt_py_rp2040.overlay Outdated
Comment thread app/boards/sparkfun_pro_micro_rp2040.overlay Outdated
Comment thread app/boards/usb_console.dtsi Outdated
Comment thread docs/docs/features/bluetooth.md Outdated
Comment thread docs/docs/features/bluetooth.md Outdated
petejohanson and others added 6 commits April 4, 2023 03:51
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]>
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.
Copy link
Copy Markdown
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.

Comment thread docs/docs/features/bluetooth.md Outdated
Comment thread docs/docs/features/bluetooth.md Outdated
Comment thread docs/blog/2023-04-06-zephyr-3-2.md Outdated
Comment thread docs/blog/2023-04-06-zephyr-3-2.md Outdated
Comment thread docs/blog/2023-04-06-zephyr-3-2.md Outdated
petejohanson and others added 4 commits April 5, 2023 00:16
Ensure we only clear the display when turning blanking off the
first time, not every time, to avoid duplicate clears.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

core Core functionality/behavior of ZMK

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants