Added keycodes for swapping and unswapping the Control and OS keys #6110

1hella · 2019-06-09T22:36:13Z

Description

Key codes to swap and unswap the control and windows/cmd keys.

I was looking for this feature to have the ctrl key in the caps lock spot in my HHKB layout for when I'm on Windows, and to have the CMD key there when I moved to MacOS. I saw there are keycodes to swap some of the other keys so I adapted the logic to do the same thing with the Control and OS keys.

Types of Changes

Issues Fixed or Closed by This PR

None

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. (not sure where to do that)
I have tested the changes and verified that they work and don't break anything (as well as I can manage).

Key codes to swap and unswap the control and windows/cmd keys

docs/keycodes.md

quantum/keycode_config.h

Renamed swap/unswap lctl and lgui key codes, added key codes to swap/unswap rctl and rgui, and moved new bool inside keycode_config.h struct to the end

drashna

I see that you expanded the keycode_config function to handle this functionality.

However, could you make sure that the appropriate handling is added to mod_config as well.

quantum/quantum_keycodes.h

drashna · 2019-06-13T06:22:06Z

In addition to the mod_config option, could you also add a "both left and right" keycode for the swap, unswap and toggle?

1hella · 2019-06-13T06:29:04Z

@drashna sure will add both of those

docs/keycodes.md

drashna · 2019-06-17T23:29:49Z

Any updates on this?

1hella · 2019-06-18T01:54:09Z

@drashna Sorry I’ve been pretty busy. Will have time to work on it more tonight 👍

drashna · 2019-06-18T02:38:18Z

Okay, just wanted to follow up on this. :)

drashna · 2019-06-18T17:55:11Z

I don't know why it's not showing in the webui here, but it looks like the conflict is in the enum for the keycodes. Right before SAFE_RANGE.

You may need to update/rebase your branch to fix the merge conflict.

docs/feature_bootmagic.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

noroadsleft

Looks good to me.

1hella · 2019-08-22T06:25:11Z

@drashna 😍

ninjonas · 2019-08-27T00:30:52Z

To whom it may concern;

Long time user, first time poster. Recently merged master onto my repo and noticed the my LCTRL stopped working. After some digging, noticed this code was added .
I have a Lily58 and this is my keymap. My LCTRL is set up like this: LALT, LGUI, LCTRL See ninjonas.h

I don't have bootmagic enabled and yet this affecting my LCTRL key. Current workaround is comment out the keycode_config.c Line 36-44. Not the correct solution and need your expert advice.

Thanks

fauxpark · 2019-08-27T00:38:58Z

@ninjonas yeah, this is a known problem, please see #6589. In a nutshell, reset your EEPROM :)

ninjonas · 2019-08-27T00:54:24Z

@fauxpark - Thank you for the quick response! Reseting the EEPROM did the trick!

…mk#6110) * Add MAGIC_SWAP_CONTROL_LGUI and MAGIC_UNSWAP_CONTROL_LGUI keycodes Key codes to swap and unswap the control and windows/cmd keys * Fix issues with pull request qmk#6110 Renamed swap/unswap lctl and lgui key codes, added key codes to swap/unswap rctl and rgui, and moved new bool inside keycode_config.h struct to the end * Move new keycodes to the end of the enum (qmk#6110) * add cases for swapped control and OS keys to mod_config (qmk#6110) * Add new keycodes to feature_bootmagic.md (qmk#6110) * Add R+L swap codes to keep in parity with AG_* codes * Extend Magic range check to include new magic codes * Update audio docs * Combine 2 byte ranges into 1 word for EECONFG Fix names for Keymap config EEPROM * Update docs/feature_bootmagic.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update docs/feature_bootmagic.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update docs/feature_bootmagic.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com> * Update docs/feature_bootmagic.md Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

Add MAGIC_SWAP_CONTROL_LGUI and MAGIC_UNSWAP_CONTROL_LGUI keycodes

b9b30e9

Key codes to swap and unswap the control and windows/cmd keys

fauxpark requested changes Jun 10, 2019

View reviewed changes

docs/keycodes.md Outdated Show resolved Hide resolved

fauxpark reviewed Jun 10, 2019

View reviewed changes

quantum/keycode_config.h Outdated Show resolved Hide resolved

Fix issues with pull request qmk#6110

86f305f

Renamed swap/unswap lctl and lgui key codes, added key codes to swap/unswap rctl and rgui, and moved new bool inside keycode_config.h struct to the end

drashna requested changes Jun 10, 2019

View reviewed changes

wilba suggested changes Jun 11, 2019

View reviewed changes

quantum/quantum_keycodes.h Outdated Show resolved Hide resolved

quantum/quantum_keycodes.h Outdated Show resolved Hide resolved

Move new keycodes to the end of the enum (qmk#6110)

3e3fccf

fauxpark reviewed Jun 13, 2019

View reviewed changes

docs/keycodes.md Show resolved Hide resolved

add cases for swapped control and OS keys to mod_config (qmk#6110)

45bf472

1hella force-pushed the magic_swap_ctrl_gui branch from 6771389 to 45bf472 Compare June 18, 2019 09:19

noroadsleft requested changes Aug 19, 2019

View reviewed changes

docs/feature_bootmagic.md Outdated Show resolved Hide resolved

docs/feature_bootmagic.md Outdated Show resolved Hide resolved

docs/feature_bootmagic.md Outdated Show resolved Hide resolved

docs/feature_bootmagic.md Outdated Show resolved Hide resolved

1hella and others added 4 commits August 20, 2019 02:14

Update docs/feature_bootmagic.md

02ce4af

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

Update docs/feature_bootmagic.md

5c83048

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

Update docs/feature_bootmagic.md

f1a0d52

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

Update docs/feature_bootmagic.md

1ab2d25

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

noroadsleft approved these changes Aug 21, 2019

View reviewed changes

drashna merged commit d534c72 into qmk:master Aug 22, 2019

kyren mentioned this pull request Aug 22, 2019

Ctrl and OS keys swapped in Ergodox EZ #6589

Closed

3 tasks

noroadsleft mentioned this pull request Aug 23, 2019

Keycodes for Ctrl and OS are swapped. qmk/qmk_configurator#479

Closed

skullydazed mentioned this pull request Aug 25, 2019

EEPROM Settings Wiped Out #6609

Closed

fauxpark mentioned this pull request Jan 17, 2020

[Bug] EECONFIG_RGB_MATRIX_SPEED is unused #7916

Closed

1hella deleted the magic_swap_ctrl_gui branch November 9, 2020 21:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added keycodes for swapping and unswapping the Control and OS keys #6110

Added keycodes for swapping and unswapping the Control and OS keys #6110

1hella commented Jun 9, 2019 •

edited

Loading

drashna left a comment

drashna commented Jun 13, 2019

1hella commented Jun 13, 2019

drashna commented Jun 17, 2019

1hella commented Jun 18, 2019

drashna commented Jun 18, 2019

drashna commented Jun 18, 2019

noroadsleft left a comment

1hella commented Aug 22, 2019

ninjonas commented Aug 27, 2019

fauxpark commented Aug 27, 2019

ninjonas commented Aug 27, 2019

Added keycodes for swapping and unswapping the Control and OS keys #6110

Added keycodes for swapping and unswapping the Control and OS keys #6110

Conversation

1hella commented Jun 9, 2019 • edited Loading

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

drashna left a comment

Choose a reason for hiding this comment

drashna commented Jun 13, 2019

1hella commented Jun 13, 2019

drashna commented Jun 17, 2019

1hella commented Jun 18, 2019

drashna commented Jun 18, 2019

drashna commented Jun 18, 2019

noroadsleft left a comment

Choose a reason for hiding this comment

1hella commented Aug 22, 2019

ninjonas commented Aug 27, 2019

fauxpark commented Aug 27, 2019

ninjonas commented Aug 27, 2019

1hella commented Jun 9, 2019 •

edited

Loading