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

kbdfans/kbd67/rev2: Fix ISO layout macro #9329

Merged
merged 1 commit into from
Jun 10, 2020
Merged

kbdfans/kbd67/rev2: Fix ISO layout macro #9329

merged 1 commit into from
Jun 10, 2020

Conversation

sigprof
Copy link
Contributor

@sigprof sigprof commented Jun 7, 2020

Description

A user in Discord reported that the right bracket and ISO hash keys on KBD67 rev2 using LAYOUT_65_iso were swapped:

https://discord.com/channels/440868230475677696/473506116718952450/719224587812077588
https://discord.com/channels/440868230475677696/473506116718952450/719226060310446160

Swapping the mappings of those keys in configurator produced a firmware which worked properly for that user:

https://discord.com/channels/440868230475677696/473506116718952450/719226879629852765

When comparing LAYOUT_65_iso with LAYOUT_65_ansi, the problem with a wrong assignment of the right bracket key is obvious — that key is K1D in the ANSI layout macro, but the ISO layout macro had K1E there, and K1D was at the position of the ISO hash key. The proper assignment for the ISO hash key is less obvious, but given the fact that the user was able to work around the problem by swapping the mappings for those keys, K1E should be the correct matrix position for that key.

Fix the LAYOUT_65_iso macro by swapping those arguments (and also align the K1D argument for the right bracket key properly).

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

@sigprof
kbdfans/kbd67/rev2: Fix ISO layout macro
7569ca7 
A user in Discord reported that the right bracket and ISO hash keys on
KBD67 rev2 using LAYOUT_65_iso were swapped.  When comparing
LAYOUT_65_iso with LAYOUT_65_ansi, the problem with a wrong assignment
of the right bracket key is obvious — that key is K1D in the ANSI layout
macro, but the ISO layout macro had K1E there, and K1D at the position
of the ISO hash key.

Fix the LAYOUT_65_iso macro by swapping those arguments (and also align
the K1D argument for the right bracket key properly).
@Erovia Erovia requested a review from a team June 7, 2020 17:42
@sigprof
Copy link
Contributor Author

sigprof commented Jun 7, 2020

The yanfali userspace breaks CI by making the corresponding firmware too large (it enables too much features).

@drashna drashna requested a review from a team June 8, 2020 06:55
@zvecr zvecr merged commit cce301a into qmk:master Jun 10, 2020
@zvecr
Copy link
Member

zvecr commented Jun 10, 2020

Thanks!

nesth pushed a commit to nesth/qmk_firmware that referenced this pull request Jun 11, 2020
Merge remote-tracking branch 'upstream/master'
2ecd1de 
* upstream/master: (82 commits)
  Fix my personal keymap // Custom keymap for Kbdfans/kbd67/rev2 with improvements on Accessibility (qmk#9207)
  Murcielago: improve default keymap (qmk#9363)
  Really fix Ubuntu/Debian setup when $PATH contains spaces (qmk#9370)
  Fix Configurator layout data for clueboard/2x1800/2019 (qmk#9373)
  Fixing Iron165 VIA Keymap (qmk#9298)
  Fix Ubuntu/Debian setup when $PATH contains spaces (qmk#9307)
  Add documentation for selecting an Arm MCU (qmk#9046)
  [Docs] Fixed the hyperlink to `/users/_example/`. (qmk#9326)
  [keyboard] Project Keyboard Signature 87 (qmk#9062)
  Include `pointing_device_send` in docs (qmk#9185)
  Fix one shot swaphands compiler error when NO_ACTION_ONESHOT is defined (qmk#9296)
  [Keymap] WPM-responsive OLED animation in personal keymap (qmk#9264)
  Add bat43 rev2 (qmk#9319)
  [Keymap] Add dual layer keymap for xd002 macropad (qmk#9222)
  [Keyboard] Wazowski 23-19 PCB Support (qmk#9198)
  adds support for the atmega328 (qmk#9043)
  fix rgb mode selection and lighting increments for the 1894 (qmk#9336)
  Add Sinc keyboard (qmk#8986)
  Add new iris keymap 'fluffactually' (qmk#9325)
  kbdfans/kbd67/rev2: Fix ISO layout macro (qmk#9329)
  ...
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Jun 12, 2020
@Shinichi-Ohki
Merge branch 'master' of https://github.com/qmk/qmk_firmware
35ed72f 
* 'master' of https://github.com/qmk/qmk_firmware: (461 commits)
  Fix my personal keymap // Custom keymap for Kbdfans/kbd67/rev2 with improvements on Accessibility (qmk#9207)
  Murcielago: improve default keymap (qmk#9363)
  Really fix Ubuntu/Debian setup when $PATH contains spaces (qmk#9370)
  Fix Configurator layout data for clueboard/2x1800/2019 (qmk#9373)
  Fixing Iron165 VIA Keymap (qmk#9298)
  Fix Ubuntu/Debian setup when $PATH contains spaces (qmk#9307)
  Add documentation for selecting an Arm MCU (qmk#9046)
  [Docs] Fixed the hyperlink to `/users/_example/`. (qmk#9326)
  [keyboard] Project Keyboard Signature 87 (qmk#9062)
  Include `pointing_device_send` in docs (qmk#9185)
  Fix one shot swaphands compiler error when NO_ACTION_ONESHOT is defined (qmk#9296)
  [Keymap] WPM-responsive OLED animation in personal keymap (qmk#9264)
  Add bat43 rev2 (qmk#9319)
  [Keymap] Add dual layer keymap for xd002 macropad (qmk#9222)
  [Keyboard] Wazowski 23-19 PCB Support (qmk#9198)
  adds support for the atmega328 (qmk#9043)
  fix rgb mode selection and lighting increments for the 1894 (qmk#9336)
  Add Sinc keyboard (qmk#8986)
  Add new iris keymap 'fluffactually' (qmk#9325)
  kbdfans/kbd67/rev2: Fix ISO layout macro (qmk#9329)
  ...
turky pushed a commit to turky/qmk_firmware that referenced this pull request Jun 13, 2020
@sigprof @turky
kbdfans/kbd67/rev2: Fix ISO layout macro (qmk#9329)
92ed315 
A user in Discord reported that the right bracket and ISO hash keys on
KBD67 rev2 using LAYOUT_65_iso were swapped.  When comparing
LAYOUT_65_iso with LAYOUT_65_ansi, the problem with a wrong assignment
of the right bracket key is obvious — that key is K1D in the ANSI layout
macro, but the ISO layout macro had K1E there, and K1D at the position
of the ISO hash key.

Fix the LAYOUT_65_iso macro by swapping those arguments (and also align
the K1D argument for the right bracket key properly).
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
@sigprof @jakobaa
kbdfans/kbd67/rev2: Fix ISO layout macro (qmk#9329)
2c5067f 
A user in Discord reported that the right bracket and ISO hash keys on
KBD67 rev2 using LAYOUT_65_iso were swapped.  When comparing
LAYOUT_65_iso with LAYOUT_65_ansi, the problem with a wrong assignment
of the right bracket key is obvious — that key is K1D in the ANSI layout
macro, but the ISO layout macro had K1E there, and K1D at the position
of the ISO hash key.

Fix the LAYOUT_65_iso macro by swapping those arguments (and also align
the K1D argument for the right bracket key properly).
@sigprof sigprof deleted the kbdfans_kbd67_rev2-fix-iso-layout branch September 2, 2020 20:41
@arcturus140 arcturus140 mentioned this pull request Oct 1, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

@fauxpark fauxpark fauxpark approved these changes

@noroadsleft noroadsleft noroadsleft approved these changes

@mechmerlin mechmerlin mechmerlin approved these changes

Assignees
No one assigned
Labels
keyboard needs testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@sigprof @zvecr @drashna @fauxpark @noroadsleft @mechmerlin @Erovia