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

Question

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

stapelberg opened this issue 3 years ago · comments

Michael Stapelberg commented 3 years ago

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

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

Nick Brassel · Answer 1 · Sun May 09 2021 19:45:33 GMT+0800 (China Standard Time)

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

Michael Stapelberg · Answer 2 · Sun May 09 2021 20:01:13 GMT+0800 (China Standard Time)

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 :)

Michael Stapelberg · Answer 3 · Mon May 31 2021 05:34:07 GMT+0800 (China Standard Time)

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

Nick Brassel · Answer 4 · Mon May 31 2021 09:46:45 GMT+0800 (China Standard Time)

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

Nick Brassel · Answer 5 · Mon May 31 2021 09:48:55 GMT+0800 (China Standard Time)

Using: https://github.com/tzarc/ChibiOS-Contrib/tree/9c2bfa6aeba993345f5425d82807c101f8e25e65

Nick Brassel · Answer 6 · Mon May 31 2021 09:53:04 GMT+0800 (China Standard Time)

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.

Michael Stapelberg · Answer 7 · Mon May 31 2021 12:56:14 GMT+0800 (China Standard Time)

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

Nick Brassel · Answer 8 · Mon May 31 2021 14:44:25 GMT+0800 (China Standard Time)

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.

Nick Brassel · Answer 9 · Tue Jun 01 2021 06:12:17 GMT+0800 (China Standard Time)

develop should be good to go!

Michael Stapelberg · Answer 10 · Wed Jun 02 2021 15:20:24 GMT+0800 (China Standard Time)

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!