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

Cherry-pick Teensy 4.1 support into qmk/ChibiOS-Contrib? #12843

Closed
stapelberg opened this issue May 9, 2021 · 10 comments · Fixed by #13056
Closed

Cherry-pick Teensy 4.1 support into qmk/ChibiOS-Contrib? #12843

stapelberg opened this issue May 9, 2021 · 10 comments · Fixed by #13056

Comments

@stapelberg
Copy link
Contributor

Could we please cherry-pick the following 3 merge commits into https://github.com/qmk/ChibiOS-Contrib?

  1. ChibiOS/ChibiOS-Contrib@b377424
  2. ChibiOS/ChibiOS-Contrib@cec8098
  3. ChibiOS/ChibiOS-Contrib@b387cc8

These add support for the Teensy 4.1 micro controller, so they’re a strict addition, without the risk of breaking any existing controllers.

This support is a requirement for my kint41 controller.

For the last controller support I have added (kint36 with the Teensy 3.6), it took quite a while to wait for the changes to ChibiOS-Contrib to trickle down to the qmk repository, so I figured I’d ask this time to skip the lengthy waiting period :)

Thanks in advance

cc @tzarc

@tzarc
Copy link
Member

tzarc commented May 9, 2021

Will get updated next time we update the downstream repos. Should be this coming develop merge cycle.

@stapelberg
Copy link
Contributor Author

Will get updated next time we update the downstream repos. Should be this coming develop merge cycle.

Ah, thanks! On https://beta.docs.qmk.fm/developing-qmk/breaking-changes/breaking_changes, I see May 29th listed as the end of that cycle with “Merge develop to master”.

Looks like May 29th is when we can proceed with PRs to develop, then :)

@stapelberg
Copy link
Contributor Author

So May 29th was yesterday and I do see a bunch of “2021 May 29 Breaking Changes” commits, but ChibiOS and ChibiOS-Contrib still seem to be at their old versions.

Any word on updating ChibiOS-Contrib to latest, or alternatively cherry-picking the commits we need the kint41 controller?

Thanks

@tzarc
Copy link
Member

tzarc commented May 31, 2021

Already doing a bunch of sanity checks. Base ChibiOS 20.3.3 upgrade as well as latest ChibiOS-Contrib coming.

@tzarc
Copy link
Member

tzarc commented May 31, 2021

@tzarc
Copy link
Member

tzarc commented May 31, 2021

Re-reading, I think there was a misinterpretation of my comment -- ChibiOS and ChibiOS-Contrib upgrades happen during a develop merge cycle, and for stability's sake we chose not to upgrade them during the last cycle due to timing.

develop will be picking up the new ChibiOS and ChibiOS-Contrib, with the intent of using the next three months to test compatibility.

@stapelberg
Copy link
Contributor Author

Thanks for the status update! Getting the ChibiOS-Contrib tree you linked into the develop branch works for me :)

@tzarc
Copy link
Member

tzarc commented May 31, 2021

Good to hear! Will be attempting to get it into normal QMK submodules over the next couple of days, and the corresponding develop PR so that it's locked in will follow.

@tzarc tzarc linked a pull request May 31, 2021 that will close this issue
14 tasks
@tzarc
Copy link
Member

tzarc commented May 31, 2021

develop should be good to go!

@stapelberg
Copy link
Contributor Author

Can confirm this works, I have rebased my changes on top of your update commits at https://github.com/kinx-project/qmk_firmware/commits/kint41-upstream and will work to send pull requests now. Thank you!

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

Successfully merging a pull request may close this issue.

2 participants