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

ChibiOS-Contrib: pull latest changes from upstream #13

Closed
wants to merge 42 commits into from

Conversation

stapelberg
Copy link

This is a prerequisite for the next QMK Pull Request I’m working on, which adds support for the kinesis kint36 controller based on the Teensy 3.6

ObKo and others added 30 commits January 5, 2020 12:11
Update NRF52832 device headers to latest version from NRF5 SDK
Driver for new ADC peripheral (called SAADC) in NRF52 devices.
In the case of KINETIS_SERIAL0_IS_UARTLP:
* the argument to `sd_lld_init_driver` needs to be explicitly coerced to a pointer of type `UART_TypeDef`;
* the initialization of `c4_p` needs to be patched, as its position is different in the underlying `UARTLP_TypeDef`.
Fix up SD1 initialization for KL2x
@stapelberg
Copy link
Author

The travis failure seems to be because tools/travis/script.sh references ../ChibiOS-RT/ext/lwip-2.0.3-patched.7z by full path, but that file is now named lwip-2.1.2.7z upstream.

So, that failure is not related to whether this pull request works with QMK or not.

@tzarc
Copy link
Member

tzarc commented Sep 3, 2020

This will not be merged in its current form.
We do not track the master branch in qmk_firmware -- the branches from upstream get replicated in this repository.
As I've noted on qmk#10171 I'm in the process of bringing all ARM keyboards up to ChibiOS 20.x -- the ChibiOS-Contrib repository will get updated at the same time.

@stapelberg
Copy link
Author

Alright, I’ll close this PR then and just wait for your changes to land.

@stapelberg stapelberg closed this Sep 3, 2020
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.

6 participants