Skip to content

mpconfigport.h: fix MICROBIT_RELEASE #229

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

Closed

Conversation

blackteahamburger
Copy link

No description provided.

@martinwork
Copy link
Collaborator

Check master...v2.1.2

@blackteahamburger
Copy link
Author

Then that's fine. But I'm not quite sure why that branch is many commits behind master. If the master branch is more updated, you may consider merging these commits into master.

@martinwork
Copy link
Collaborator

I see what you mean... It seems 2.1.x-branch was created at the same time as the 2.1.1 tag, the only change in 2.1.2 is a patch of the codal-nrf52 library neopixel code timings in 2.1.x-branch, and the main development has continued in master.

It seems unlikely that the commits in 2.1.x-branch, including the patch, will ever need to be merged into master, because it now uses an updated version of codal-microbit-v2 which references a codal-nrf52 version that includes the same change as the patch.

@blackteahamburger
Copy link
Author

Thanks!

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

Successfully merging this pull request may close these issues.

2 participants