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.

Sign up for GitHub

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

Jump to bottom

JSON encoder: improve sorting of layout dict keys #19974

Merged
merged 6 commits into from
Mar 13, 2023
Merged

JSON encoder: improve sorting of layout dict keys #19974

merged 6 commits into from
Mar 13, 2023

Conversation

fauxpark
Copy link
Member

Description

  • Removed w: 1 from default key entry since it does not get filtered out of the qmk info output
  • Improved sorting of layout keys: label, x, y, w, h, flags (LED/RGB Matrix), matrix
  • Make rotary encoder config render on a single line too

Types of Changes

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

Issues Fixed or Closed by This PR

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

@fauxpark fauxpark requested a review from a team February 28, 2023 23:57
@fauxpark fauxpark mentioned this pull request Mar 1, 2023
Closed
9 tasks
tzarc
tzarc approved these changes Mar 10, 2023
View reviewed changes
Copy link
Member

@tzarc tzarc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a couple of non-essentials, up to you if you want to address them.

lib/python/qmk/json_encoders.py Outdated Show resolved Hide resolved
lib/python/qmk/json_encoders.py Show resolved Hide resolved
fauxpark
fauxpark commented Mar 13, 2023
View reviewed changes
lib/python/qmk/tests/test_cli_commands.py Outdated Show resolved Hide resolved
lib/python/qmk/tests/test_cli_commands.py Outdated Show resolved Hide resolved
@fauxpark fauxpark merged commit 91e0457 into qmk:develop Mar 13, 2023
@fauxpark fauxpark deleted the json-encoder-layouts-improvement branch March 13, 2023 12:20
coquizen pushed a commit to coquizen/qmk_firmware that referenced this pull request Jun 22, 2023
@fauxpark @coquizen
JSON encoder: improve sorting of layout dict keys (qmk#19974)
b001dc0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@noroadsleft noroadsleft noroadsleft left review comments

@tzarc tzarc tzarc approved these changes

Assignees
No one assigned
Labels
cli qmk cli command enhancement python
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fauxpark @tzarc @noroadsleft