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.

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

Update ChibiOS Contrib module #6826

Closed
wants to merge 1 commit into from

Conversation

drashna
Copy link
Member

@drashna drashna commented Sep 26, 2019

This updates the ChibiOS Contrib submodule to the latest version. This contains the k type fix, as that was merged upstream.

This should be reset back to the qmk fork, once it's updated.
Additionally, we may want to wait on qmk/ChibiOS-Contrib#10 getting merged (to upstream, even).

@drashna drashna requested review from a team September 26, 2019 18:32
@drashna drashna added breaking_change Changes that need to wait for a version increment core enhancement optimization labels Sep 26, 2019
@drashna
Copy link
Member Author

drashna commented Sep 26, 2019

Meant to open as draft ...

@yanfali yanfali self-requested a review September 28, 2019 00:53
@yanfali
Copy link
Contributor

yanfali commented Sep 28, 2019

Oof 220+ commits to review

@drashna
Copy link
Member Author

drashna commented Sep 28, 2019

Yeah ....

We should be more aggressive about maintaining these. But at least the breaking changes stuff gives us a good way to manage this, and an excuse to do so.

Just wish that updating chibiOS was as easy.

@drashna drashna requested a review from a team December 1, 2019 08:04
@drashna drashna changed the base branch from master to future December 1, 2019 08:05
@drashna drashna changed the base branch from future to master December 1, 2019 08:05
@@ -3,8 +3,7 @@
url = https://github.com/qmk/ChibiOS
[submodule "lib/chibios-contrib"]
path = lib/chibios-contrib
url = https://github.com/qmk/ChibiOS-Contrib
branch = k-type-fix
url = https://github.com/drashna/ChibiOS-Contrib
Copy link
Member Author

@drashna drashna Dec 1, 2019

Choose a reason for hiding this comment

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

This should/will be changed back to QMK's fork once qmk/ChibiOS-Contrib#12 has been merged in.

Right now, this is pointing at my repo, since it's "up to date"

@drashna
Copy link
Member Author

drashna commented Dec 6, 2019

This requires chibiOS to be updated, as well.... At least for the K12 and K20 MCUs.

@drashna drashna closed this Dec 6, 2019
@drashna drashna deleted the update_chibios-contrib branch March 9, 2020 18:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
breaking_change Changes that need to wait for a version increment core enhancement optimization
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants