Skip to content
This repository has been archived by the owner on Dec 18, 2024. It is now read-only.

Combined MR of #319, #331 and #346 #347

Closed
wants to merge 18 commits into from

Conversation

benedekkupper
Copy link
Contributor

Opening this for easier evaluation of potential fixes for USB resume

@mondalaci
Copy link
Member

I freshly checked out the project, and vscode doesn't offer UHK 80 boards:

image

@benedekkupper
Copy link
Contributor Author

I have the same issue as mentioned in #346. Can you try to flash the build from the CI?

@mondalaci
Copy link
Member

Please base this PR on the master-paired branch, otherwise I can't test it.

@mondalaci
Copy link
Member

I could actually test this, and it seems rock-stable.

Waiting with the merge until Nordic resolves the build issues.

kareltucek and others added 18 commits October 28, 2024 21:07
* define all USB product parameters independently
* derive BT DIS parameters from USB parameters
* start phasing out board-specific overlays
prj.conf is for Kconfig options that can be altered per build type.
In order to support development vs release build targets,
prj.conf is cleared out, and prj_release.conf is added.
Moving forward we should better split the development
vs release options, see e.g. Kconfig hardening.

Extra conf files are used to achieve what prj.conf did so far,
for now the content is the same, but in the future they
should be better organized per functionality.

The make-release script is updated to parse the CMakePresets,
so the changes are automatically applied on the CI build,
without extra maintenance.
Step 1: use python script to update each board
python3 ../zephyr/scripts/utils/board_v1_to_v2.py -b uhk-dongle -g arm -v ugl -s nrf52840 --board-root .

Step 2: replace dashes to underscores in Kconfig.<board>
also update battery level on BLE
@benedekkupper
Copy link
Contributor Author

I wouldn't hold my breath for Nordic coming up with a fix soon...

What made it halfway usable in vscode is I first built all 3 configurations on the last 2.6.1 commit, so before "Bump to NCS 2.7.0". Afterwards vscode doesn't list the build configurations anymore, but the current build configuration can be rebuilt, and also the "Build All Configurations" button is usable as well.

The branch is rebased now.

@benedekkupper benedekkupper changed the base branch from master to master-paired October 28, 2024 21:48
@mondalaci
Copy link
Member

I want to merge this PR, but we need an easy way to create vscode build configurations afterward. Please suggest how.

@benedekkupper
Copy link
Contributor Author

I can add vscode tasks to run the builds somewhat simplified, no other idea comes to mind.

@mondalaci
Copy link
Member

The build should work as suggested, but how will I be able to flash various builds via their linked J-Link devices?

@mondalaci mondalaci deleted the branch master-paired November 2, 2024 08:46
@mondalaci mondalaci closed this Nov 2, 2024
@mondalaci
Copy link
Member

@benedekkupper I deleted the master-paired branch because it has been merged into master, which accidentally closed this PR. Can you reopen it or open a new PR?

3 vscode tasks for building and 3 for flashing the left, right and dongle should work. The serial numbers of J-Links should be specifiable per target without committing the serial numbers to git.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants