-
-
Notifications
You must be signed in to change notification settings - Fork 38.7k
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
Duck Octagon V1 Configurator cleanup #5957
Merged
Merged
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
This is a white-space-only change. Make it easier for me to read the file.
Going to be using them shortly.
Shows where each key is located in the switch matrix.
At this point, the macros for LAYOUT and LAYOUT_75_ansi are 100% identical, except for their names.
No need for two code blocks with the same data.
- move Pause 1u to the right - move K5O to the top row, between Print Screen and Pause - move Enter key 1u to the left and 1u wider (1.25u to 2.25u)
Don't need them anymore now that we know where everything is. I'm calling K5O as ScrLk so it has a label, even though that's not actually what it is. Also gave the Spacebar a label because I prefer when all the keys have labels.
mechmerlin
reviewed
May 22, 2019
drashna
approved these changes
May 23, 2019
Configure the codebase so LAYOUT_75_ansi is the only layout macro available.
mechmerlin
approved these changes
May 28, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
tenderlove
added a commit
to tenderlove/qmk_firmware
that referenced
this pull request
Jun 10, 2019
* master: (790 commits) [Keyboard] YMD96 refactor (qmk#5472) Update reference_configurator_support.md Use qmk docker image for travis CI builds [Keyboard] Remove file with same name and different case (qmk#6028) [Keyboard] Fix json for NK65 (qmk#6026) [Keymap] added hhkb layout for tada68 (qmk#6027) [Keymap] Added keymap for user jasondunsmore (qmk#6023) [Keyboard] Fix jc65 when RGB or BACKLIGHT disabled (qmk#6022) Update feature_encoders.md Copy avr teensy flash logic to arm (qmk#6016) [Keyboard] E6V2 R2 BMC PCB (qmk#6009) Add belgian layout for sendstring (qmk#6008) [Keyboard] Added XW60 PCB (qmk#6011) [Keymap] Georgi flippydippy layout (qmk#6005) Fix TO() and DF() calling layer_state_set_[kb,user] twice (qmk#6003) Update 333fred keymaps and add new iris map. (qmk#6010) [Keyboard] Changed LED positions for Massdrop CTRL and DZ60RGB (qmk#5801) [Keyboard] Add support for AKB boards (qmk#5996) Duck Octagon V1 Configurator cleanup (qmk#5957) Fixing matrix_scan so it properly returns changed status ...
Timbus
pushed a commit
to Timbus/qmk_firmware
that referenced
this pull request
Jun 23, 2019
* Expand info.json formatting to one line per key This is a white-space-only change. Make it easier for me to read the file. * Make sure every key object has a label Going to be using them shortly. * Insert key identifiers from v1.h into info.json labels Shows where each key is located in the switch matrix. * Move K5O to its correct location on the top row * Adjust white space in v1.h At this point, the macros for LAYOUT and LAYOUT_75_ansi are 100% identical, except for their names. * Redefine LAYOUT_75_ansi as an alias of LAYOUT No need for two code blocks with the same data. * Correct visual positioning in info.json - move Pause 1u to the right - move K5O to the top row, between Print Screen and Pause - move Enter key 1u to the left and 1u wider (1.25u to 2.25u) * Delete key identifiers from info.json labels Don't need them anymore now that we know where everything is. I'm calling K5O as ScrLk so it has a label, even though that's not actually what it is. Also gave the Spacebar a label because I prefer when all the keys have labels. * Enable 75_ansi Community Layout support * Reassign layout macro as LAYOUT_75_ansi and delete macro alias Configure the codebase so LAYOUT_75_ansi is the only layout macro available. * Add key_count key to info.json data
ridingqwerty
pushed a commit
to ridingqwerty/qmk_firmware
that referenced
this pull request
Jan 10, 2020
* Expand info.json formatting to one line per key This is a white-space-only change. Make it easier for me to read the file. * Make sure every key object has a label Going to be using them shortly. * Insert key identifiers from v1.h into info.json labels Shows where each key is located in the switch matrix. * Move K5O to its correct location on the top row * Adjust white space in v1.h At this point, the macros for LAYOUT and LAYOUT_75_ansi are 100% identical, except for their names. * Redefine LAYOUT_75_ansi as an alias of LAYOUT No need for two code blocks with the same data. * Correct visual positioning in info.json - move Pause 1u to the right - move K5O to the top row, between Print Screen and Pause - move Enter key 1u to the left and 1u wider (1.25u to 2.25u) * Delete key identifiers from info.json labels Don't need them anymore now that we know where everything is. I'm calling K5O as ScrLk so it has a label, even though that's not actually what it is. Also gave the Spacebar a label because I prefer when all the keys have labels. * Enable 75_ansi Community Layout support * Reassign layout macro as LAYOUT_75_ansi and delete macro alias Configure the codebase so LAYOUT_75_ansi is the only layout macro available. * Add key_count key to info.json data
JeffreyPalmer
pushed a commit
to JeffreyPalmer/qmk_firmware
that referenced
this pull request
Feb 27, 2020
* Expand info.json formatting to one line per key This is a white-space-only change. Make it easier for me to read the file. * Make sure every key object has a label Going to be using them shortly. * Insert key identifiers from v1.h into info.json labels Shows where each key is located in the switch matrix. * Move K5O to its correct location on the top row * Adjust white space in v1.h At this point, the macros for LAYOUT and LAYOUT_75_ansi are 100% identical, except for their names. * Redefine LAYOUT_75_ansi as an alias of LAYOUT No need for two code blocks with the same data. * Correct visual positioning in info.json - move Pause 1u to the right - move K5O to the top row, between Print Screen and Pause - move Enter key 1u to the left and 1u wider (1.25u to 2.25u) * Delete key identifiers from info.json labels Don't need them anymore now that we know where everything is. I'm calling K5O as ScrLk so it has a label, even though that's not actually what it is. Also gave the Spacebar a label because I prefer when all the keys have labels. * Enable 75_ansi Community Layout support * Reassign layout macro as LAYOUT_75_ansi and delete macro alias Configure the codebase so LAYOUT_75_ansi is the only layout macro available. * Add key_count key to info.json data
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.
Description
Was building default keymaps for the QMK Configurator and discovered some weirdness with the way the board looked visually (Configurator showed a layout not actually supported on the board). Discovered some non-ideal bits in the layout macros. This PR cleans that up and makes the rendering visually accurate.
Notes
I'd suggest to any reviewers to read each commit one-by-one, so it's easier to follow the process.
Tagging @mechmerlin, who is listed as the maintainer.