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

Fix building layouts from JSON #13310

Merged
merged 1 commit into from
Jun 27, 2021
Merged

Conversation

firetech
Copy link
Contributor

Description

This commit fixes usage of keymap.json files in the layouts directory.
Support for this was added in #9553, but was recently broken by #12632.

Due to the changes introduced in #12632, it was now necessary to duplicate the json2c command in build_layout.mk. I'm not sure if there's a cleaner way to solve this, but I'm by no means a Makefile guru.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@github-actions github-actions bot added the core label Jun 23, 2021
@drashna drashna requested a review from a team June 26, 2021 06:14
@skullydazed skullydazed requested a review from a team June 27, 2021 02:26
@tzarc tzarc merged commit ed56fc7 into qmk:develop Jun 27, 2021
@firetech firetech deleted the fix_layouts_json_build branch July 12, 2021 15:47
nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants