Update nRF Connect and McuX SDKs#1524
Conversation
There was a problem hiding this comment.
Pull request overview
Updates the firmware’s west manifests to newer nRF Connect SDK and MCUXpresso SDK versions, along with a set of compatibility adjustments (BLE advertising params, build system tweaks, and patch set updates) to keep builds working across UHK60/UHK80 targets.
Changes:
- Bump nRF Connect SDK to
v3.2.4and MCUX manifests tov26.03.00, adjusting imported module allowlists accordingly. - Update UHK80 board configuration (runner args, Kconfig defaults, PM hook stubs) and BLE advertising parameters for newer Zephyr/NCS APIs.
- Refresh patch set by updating the sysbuild CMakePresets patch and dropping multiple no-longer-needed patches.
Reviewed changes
Copilot reviewed 15 out of 15 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
west_nrfsdk.yml |
Updates NCS revision and imported module allowlist to match the new SDK layout. |
west_mcuxsdk.yml |
Updates MCUX manifest revision. |
right/src/macros/command_hash.gperf |
Suppresses a GCC warning during gperf-generated compilation. |
right/CMakeLists.txt |
Adjusts MCUX build configuration to work in a west workspace. |
patches/zephyr/0003-sysbuild-support-application-CMakePresets.json-files.patch |
Updates the sysbuild patch to pass APP_DIR via environment and adds sysbuild CMakePresets.json. |
patches/zephyr/0001-udc-nrf-disable-SOF-interrupts.patch |
Removed patch (presumably upstreamed/obsolete with the SDK bump). |
patches/zephyr/0001-drivers-udc-eliminate-C-compiler-warnings.patch |
Removed patch (presumably upstreamed/obsolete with the SDK bump). |
patches/sdk-nrf/0001-Remove-mcuboot-build-warnings.patch |
Removed patch (presumably upstreamed/obsolete with the SDK bump). |
patches/mcuboot/0003-zephyr-cmake-fails-early-and-with-meaningful-message.patch |
Removed patch (presumably upstreamed/obsolete with the SDK bump). |
patches/core/0003-cmake-add-ihex-binary-output-option.patch |
Removed patch (presumably upstreamed/obsolete with the SDK bump). |
device/src/keyboard/charger.c |
Removes an unused SoC header include. |
device/src/bt_advertise.c |
Updates advertising parameter macros/options to newer Zephyr/NCS API. |
boards/ugl/uhk-80/board.cmake |
Adds conditional nrfutil ext-mem runner arg and adjusts include ordering. |
boards/ugl/uhk-80/board.c |
Adds weak PM hook stubs (likely required by new PM defaults). |
boards/ugl/uhk-80/Kconfig.defconfig |
Enables PM/stack protection defaults and updates BT controller-related defaults. |
90c1a7d to
3c0736d
Compare
|
https://github.com/UltimateHackingKeyboard/firmware/actions/runs/24426227631 bricked my UHK 80. Please test it. |
3c0736d to
28aa67c
Compare
8837940 to
b5b49c5
Compare
|
@kareltucek please give this PR a try. I had to disable |
|
My bluetooth testing says:
What is worse, when trying to switch between connections, I am getting this crash. (Got it at least 5 times in the last 10 minutes.): Some logs from failing linux pairings: I don't have energy right now for further digging. Sorry! |
b5b49c5 to
fe0fac3
Compare
Update the nRF Connect and McuX SDKs to the latest available version. UHK60 is affected, but no meaningful changes expected. UHK80 shall be more carefully tested, with focus on BLE and also USB.
Closes #1043