Merge latest upstream changes #2
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
These are derived from `make clean` in tmp_core/rules.mk
Note that the upstream repo has added a couple fof submodules of its own since fb1fb12. We must init those with --recurse before the build will work. See: https://github.com/tmk/tmk_keyboard/tree/7cf3060a6dbfe57909668833cb3edb702b0899bb
adammck
added a commit
to adammck/kc60
that referenced
this pull request
Jun 19, 2020
It appears that these files (Makefile, keymap_common, matrix, led) were originally copied from tmk_core/keyboard/gh60. I've re-copied these from upstream at 7cf3060 to bring them up to date. They don't yet include the patches previously applied, so won't actually work until the next commit. I did this deliberately, so we can see the patch.
This was derived from @jpec's work in: jpec@92b6ec1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This updates the
tmk_coresubmodule to 7cf3060 (master as of 2020-06-19) and pulls in the latest changes from the GH60 directory, which this repo seems to be based on. I re-applied @jpec's KC60 patch on top, which I don't fully understand, but it seems to work as expected.I wanted the latest upstream to get the brightness keys working on macOS.