Make sure 'shutdown_user' is called

Fix Audio code when resetting keyboard
I incorrectly disabled a bunch of code that shouldn't have been disabled. This should only disable music mode stuff, not general audio.
2018-08-04 16:49:57 -04:00 · 2018-08-04 16:49:57 -04:00 · 2018-08-04 16:49:10 -04:00 · 2018-08-04 09:09:22 -07:00 · 2018-08-04 09:01:26 -07:00 · 2018-08-04 08:50:17 -07:00
18 changed files with 412 additions and 422 deletions
@@ -8,40 +8,8 @@ This is a reference only. Each group of keys links to the page documenting their
 |Key                    |Aliases             |Description                                    |
 |-----------------------|--------------------|-----------------------------------------------|
-|`KC_1`                 |                    |`1` and `!`                                    |
+|`KC_NO`                |`XXXXXXX`           |Ignore this key (NOOP)                         |
-|`KC_2`                 |                    |`2` and `@`                                    |
+|`KC_TRANSPARENT`       |`KC_TRNS`, `_______`|Use the next lowest non-transparent key        |
 |`KC_3`                 |                    |`3` and `#`                                    |
 |`KC_4`                 |                    |`4` and `$`                                    |
 |`KC_5`                 |                    |`5` and `%`                                    |
 |`KC_6`                 |                    |`6` and `^`                                    |
 |`KC_7`                 |                    |`7` and `&`                                    |
 |`KC_8`                 |                    |`8` and `*`                                    |
 |`KC_9`                 |                    |`9` and `(`                                    |
 |`KC_0`                 |                    |`0` and `)`                                    |
 |`KC_F1`                |                    |                                               |
 |`KC_F2`                |                    |                                               |
 |`KC_F3`                |                    |                                               |
 |`KC_F4`                |                    |                                               |
 |`KC_F5`                |                    |                                               |
 |`KC_F6`                |                    |                                               |
 |`KC_F7`                |                    |                                               |
 |`KC_F8`                |                    |                                               |
 |`KC_F9`                |                    |                                               |
 |`KC_F10`               |                    |                                               |
 |`KC_F11`               |                    |                                               |
 |`KC_F12`               |                    |                                               |
 |`KC_F13`               |                    |                                               |
 |`KC_F14`               |                    |                                               |
 |`KC_F15`               |                    |                                               |
 |`KC_F16`               |                    |                                               |
 |`KC_F17`               |                    |                                               |
 |`KC_F18`               |                    |                                               |
 |`KC_F19`               |                    |                                               |
 |`KC_F20`               |                    |                                               |
 |`KC_F21`               |                    |                                               |
 |`KC_F22`               |                    |                                               |
 |`KC_F23`               |                    |                                               |
 |`KC_F24`               |                    |                                               |
 |`KC_A`                 |                    |`a` and `A`                                    |
 |`KC_B`                 |                    |`b` and `B`                                    |
 |`KC_C`                 |                    |`c` and `C`                                    |
@@ -68,6 +36,16 @@ This is a reference only. Each group of keys links to the page documenting their
 |`KC_X`                 |                    |`x` and `X`                                    |
 |`KC_Y`                 |                    |`y` and `Y`                                    |
 |`KC_Z`                 |                    |`z` and `Z`                                    |
 |`KC_1`                 |                    |`1` and `!`                                    |
 |`KC_2`                 |                    |`2` and `@`                                    |
 |`KC_3`                 |                    |`3` and `#`                                    |
 |`KC_4`                 |                    |`4` and `$`                                    |
 |`KC_5`                 |                    |`5` and `%`                                    |
 |`KC_6`                 |                    |`6` and `^`                                    |
 |`KC_7`                 |                    |`7` and `&`                                    |
 |`KC_8`                 |                    |`8` and `*`                                    |
 |`KC_9`                 |                    |`9` and `(`                                    |
 |`KC_0`                 |                    |`0` and `)`                                    |
 |`KC_ENTER`             |`KC_ENT`            |Return (Enter)                                 |
 |`KC_ESCAPE`            |`KC_ESC`            |Escape                                         |
 |`KC_BSPACE`            |`KC_BSPC`           |Delete (Backspace)                             |
@@ -79,33 +57,28 @@ This is a reference only. Each group of keys links to the page documenting their
 |`KC_RBRACKET`          |`KC_RBRC`           |`]` and `}`                                    |
 |`KC_BSLASH`            |`KC_BSLS`           |`\` and <code>&#124;</code>                    |
 |`KC_NONUS_HASH`        |`KC_NUHS`           |Non-US `#` and `~`                             |
 |`KC_NONUS_BSLASH`      |`KC_NUBS`           |Non-US `\` and <code>&#124;</code>             |
 |`KC_INT1`              |`KC_RO`             |JIS `\` and <code>&#124;</code>                |
 |`KC_INT2`              |`KC_KANA`           |JIS Katakana/Hiragana                          |
 |`KC_INT3`              |`KC_JYEN`           |JIS `¥`                                        |
 |`KC_SCOLON`            |`KC_SCLN`           |`;` and `:`                                    |
 |`KC_QUOTE`             |`KC_QUOT`           |`'` and `"`                                    |
-|`KC_GRAVE`             |`KC_GRV`            |<code>&#96;</code> and `~`                     |
+|`KC_GRAVE`             |`KC_GRV`, `KC_ZKHK` |<code>&#96;</code> and `~`, JIS Zenkaku/Hankaku|
 |`KC_COMMA`             |`KC_COMM`           |`,` and `<`                                    |
 |`KC_DOT`               |                    |`.` and `>`                                    |
 |`KC_SLASH`             |`KC_SLSH`           |`/` and `?`                                    |
-|`KC_CAPSLOCK`          |`KC_CAPS`           |Caps Lock                                      |
+|`KC_CAPSLOCK`          |`KC_CLCK`, `KC_CAPS`|Caps Lock                                      |
-|`KC_LCTRL`             |`KC_LCTL`           |Left Control                                   |
+|`KC_F1`                |                    |F1                                             |
-|`KC_LSHIFT`            |`KC_LSFT`           |Left Shift                                     |
+|`KC_F2`                |                    |F2                                             |
-|`KC_LALT`              |                    |Left Alt                                       |
+|`KC_F3`                |                    |F3                                             |
-|`KC_LGUI`              |`KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Meta key)            |
+|`KC_F4`                |                    |F4                                             |
-|`KC_RCTRL`             |`KC_RCTL`           |Right Control                                  |
+|`KC_F5`                |                    |F5                                             |
-|`KC_RSHIFT`            |`KC_RSFT`           |Right Shift                                    |
+|`KC_F6`                |                    |F6                                             |
-|`KC_RALT`              |                    |Right Alt                                      |
+|`KC_F7`                |                    |F7                                             |
-|`KC_RGUI`              |`KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Meta key)           |
+|`KC_F8`                |                    |F8                                             |
-|`KC_LOCKING_CAPS`      |`KC_LCAP`           |Locking Caps Lock                              |
+|`KC_F9`                |                    |F9                                             |
-|`KC_LOCKING_NUM`       |`KC_LNUM`           |Locking Num Lock                               |
+|`KC_F10`               |                    |F10                                            |
-|`KC_LOCKING_SCROLL`    |`KC_LSCR`           |Locking Scroll Lock                            |
+|`KC_F11`               |                    |F11                                            |
-|`KC_INT4`              |`KC_HENK`           |JIS Henkan                                     |
+|`KC_F12`               |                    |F12                                            |
 |`KC_INT5`              |`KC_MHEN`           |JIS Muhenkan                                   |
 |`KC_PSCREEN`           |`KC_PSCR`           |Print Screen                                   |
 |`KC_SCROLLLOCK`        |`KC_SLCK`           |Scroll Lock                                    |
-|`KC_PAUSE`             |`KC_PAUS`           |Pause                                          |
+|`KC_PAUSE`             |`KC_PAUS`, `KC_BRK` |Pause                                          |
 |`KC_INSERT`            |`KC_INS`            |Insert                                         |
 |`KC_HOME`              |                    |Home                                           |
 |`KC_PGUP`              |                    |Page Up                                        |
@@ -116,58 +89,6 @@ This is a reference only. Each group of keys links to the page documenting their
 |`KC_LEFT`              |                    |Left Arrow                                     |
 |`KC_DOWN`              |                    |Down Arrow                                     |
 |`KC_UP`                |                    |Up Arrow                                       |
 |`KC_APPLICATION`       |`KC_APP`            |Application (Windows Menu Key)                 |
 |`KC_POWER`             |                    |Deprecated by MS in favor of `KC_SYSTEM_POWER`.|
 |`KC_EXECUTE`           |                    |Execute                                        |
 |`KC_HELP`              |                    |Help                                           |
 |`KC_MENU`              |                    |Menu                                           |
 |`KC_SELECT`            |                    |Select                                         |
 |`KC_AGAIN`             |                    |Again                                          |
 |`KC_UNDO`              |                    |Undo                                           |
 |`KC_CUT`               |                    |Cut                                            |
 |`KC_COPY`              |                    |Copy                                           |
 |`KC_PASTE`             |                    |Paste                                          |
 |`KC_FIND`              |                    |Find                                           |
 |`KC_ALT_ERASE`         |                    |Alternate Erase                                |
 |`KC_SYSREQ`            |                    |SysReq/Attention                               |
 |`KC_CANCEL`            |                    |Cancel                                         |
 |`KC_CLEAR`             |                    |Clear                                          |
 |`KC_PRIOR`             |                    |Prior                                          |
 |`KC_RETURN`            |                    |Return                                         |
 |`KC_SEPARATOR`         |                    |Separator                                      |
 |`KC_OUT`               |                    |Out                                            |
 |`KC_OPER`              |                    |Oper                                           |
 |`KC_CLEAR_AGAIN`       |                    |Clear/Again                                    |
 |`KC_CRSEL`             |                    |CrSel/Props                                    |
 |`KC_EXSEL`             |                    |ExSel                                          |
 |`KC_SYSTEM_POWER`      |`KC_PWR`            |System Power Down. Recommended over `KC_POWER`.|
 |`KC_SYSTEM_SLEEP`      |`KC_SLEP`           |System Sleep                                   |
 |`KC_SYSTEM_WAKE`       |`KC_WAKE`           |System Wake                                    |
 |`KC_MAIL`              |`KC_MAIL`           |                                               |
 |`KC_CALCULATOR`        |`KC_CALC`           |                                               |
 |`KC_MY_COMPUTER`       |`KC_MYCM`           |                                               |
 |`KC_WWW_SEARCH`        |`KC_WSCH`           |                                               |
 |`KC_WWW_HOME`          |`KC_WHOM`           |                                               |
 |`KC_WWW_BACK`          |`KC_WBAK`           |                                               |
 |`KC_WWW_FORWARD`       |`KC_WFWD`           |                                               |
 |`KC_WWW_STOP`          |`KC_WSTP`           |                                               |
 |`KC_WWW_REFRESH`       |`KC_WREF`           |                                               |
 |`KC_WWW_FAVORITES`     |`KC_WFAV`           |                                               |
 |`KC_STOP`              |                    |Stop                                           |
 |`KC__MUTE`             |                    |Mute (macOS)                                   |
 |`KC__VOLUP`            |                    |Volume Up (macOS)                              |
 |`KC__VOLDOWN`          |                    |Volume Down (macOS)                            |
 |`KC_AUDIO_MUTE`        |`KC_MUTE`           |Mute (Windows/macOS/Linux)                     |
 |`KC_AUDIO_VOL_UP`      |`KC_VOLU`           |Volume Up (Windows/macOS/Linux)                |
 |`KC_AUDIO_VOL_DOWN`    |`KC_VOLD`           |Volume Down (Windows/macOS/Linux)              |
 |`KC_MEDIA_NEXT_TRACK`  |`KC_MNXT`           |Next Track (Windows)                           |
 |`KC_MEDIA_PREV_TRACK`  |`KC_MPRV`           |Previous Track (Windows)                       |
 |`KC_MEDIA_FAST_FORWARD`|`KC_MFFD`           |Next Track (macOS)                             |
 |`KC_MEDIA_REWIND`      |`KC_MRWD`           |Previous Track (macOS)                         |
 |`KC_MEDIA_STOP`        |`KC_MSTP`           |Stop Track                                     |
 |`KC_MEDIA_PLAY_PAUSE`  |`KC_MPLY`           |Play/Pause Track                               |
 |`KC_MEDIA_SELECT`      |`KC_MSEL`           |                                               |
 |`KC_MEDIA_EJECT`       |`KC_EJCT`           |Eject (macOS)                                  |
 |`KC_NUMLOCK`           |`KC_NLCK`           |Keypad Num Lock and Clear                      |
 |`KC_KP_SLASH`          |`KC_PSLS`           |Keypad `/`                                     |
 |`KC_KP_ASTERISK`       |`KC_PAST`           |Keypad `*`                                     |
@@ -185,11 +106,103 @@ This is a reference only. Each group of keys links to the page documenting their
 |`KC_KP_9`              |`KC_P9`             |Keypad `9` and Page Up                         |
 |`KC_KP_0`              |`KC_P0`             |Keypad `0` and Insert                          |
 |`KC_KP_DOT`            |`KC_PDOT`           |Keypad `.` and Delete                          |
 |`KC_NONUS_BSLASH`      |`KC_NUBS`           |Non-US `\` and <code>&#124;</code>             |
 |`KC_APPLICATION`       |`KC_APP`            |Application (Windows Menu Key)                 |
 |`KC_POWER`             |                    |System Power (macOS)                           |
 |`KC_KP_EQUAL`          |`KC_PEQL`           |Keypad `=`                                     |
 |`KC_F13`               |                    |F13                                            |
 |`KC_F14`               |                    |F14                                            |
 |`KC_F15`               |                    |F15                                            |
 |`KC_F16`               |                    |F16                                            |
 |`KC_F17`               |                    |F17                                            |
 |`KC_F18`               |                    |F18                                            |
 |`KC_F19`               |                    |F19                                            |
 |`KC_F20`               |                    |F20                                            |
 |`KC_F21`               |                    |F21                                            |
 |`KC_F22`               |                    |F22                                            |
 |`KC_F23`               |                    |F23                                            |
 |`KC_F24`               |                    |F24                                            |
 |`KC_EXECUTE`           |`KC_EXEC`           |Execute                                        |
 |`KC_HELP`              |                    |Help                                           |
 |`KC_MENU`              |                    |Menu                                           |
 |`KC_SELECT`            |`KC_SLCT`           |Select                                         |
 |`KC_STOP`              |                    |Stop                                           |
 |`KC_AGAIN`             |`KC_AGIN`           |Again                                          |
 |`KC_UNDO`              |                    |Undo                                           |
 |`KC_CUT`               |                    |Cut                                            |
 |`KC_COPY`              |                    |Copy                                           |
 |`KC_PASTE`             |`KC_PSTE`           |Paste                                          |
 |`KC_FIND`              |                    |Find                                           |
 |`KC__MUTE`             |                    |Mute (macOS)                                   |
 |`KC__VOLUP`            |                    |Volume Up (macOS)                              |
 |`KC__VOLDOWN`          |                    |Volume Down (macOS)                            |
 |`KC_LOCKING_CAPS`      |`KC_LCAP`           |Locking Caps Lock                              |
 |`KC_LOCKING_NUM`       |`KC_LNUM`           |Locking Num Lock                               |
 |`KC_LOCKING_SCROLL`    |`KC_LSCR`           |Locking Scroll Lock                            |
 |`KC_KP_COMMA`          |`KC_PCMM`           |Keypad `,`                                     |
 |`KC_KP_EQUAL_AS400`    |                    |Keypad `=` on AS/400 keyboards                 |
-|`KC_NO`                |                    |Ignore this key (NOOP)                         |
+|`KC_INT1`              |`KC_RO`             |JIS `\` and <code>&#124;</code>                |
-|`KC_TRANSPARENT`       |`KC_TRNS`           |Use the next lowest non-transparent key        |
+|`KC_INT2`              |`KC_KANA`           |JIS Katakana/Hiragana                          |
 |`KC_INT3`              |`KC_JYEN`           |JIS `¥`                                        |
 |`KC_INT4`              |`KC_HENK`           |JIS Henkan                                     |
 |`KC_INT5`              |`KC_MHEN`           |JIS Muhenkan                                   |
 |`KC_INT6`              |                    |JIS Numpad `,`                                 |
 |`KC_INT7`              |                    |International 7                                |
 |`KC_INT8`              |                    |International 8                                |
 |`KC_INT9`              |                    |International 9                                |
 |`KC_LANG1`             |`KC_HAEN`           |Hangul/English                                 |
 |`KC_LANG2`             |`KC_HANJ`           |Hanja                                          |
 |`KC_LANG3`             |                    |JIS Katakana                                   |
 |`KC_LANG4`             |                    |JIS Hiragana                                   |
 |`KC_LANG5`             |                    |JIS Zenkaku/Hankaku                            |
 |`KC_LANG6`             |                    |Language 6                                     |
 |`KC_LANG7`             |                    |Language 7                                     |
 |`KC_LANG8`             |                    |Language 8                                     |
 |`KC_LANG9`             |                    |Language 9                                     |
 |`KC_ALT_ERASE`         |`KC_ERAS`           |Alternate Erase                                |
 |`KC_SYSREQ`            |                    |SysReq/Attention                               |
 |`KC_CANCEL`            |                    |Cancel                                         |
 |`KC_CLEAR`             |`KC_CLR`            |Clear                                          |
 |`KC_PRIOR`             |                    |Prior                                          |
 |`KC_RETURN`            |                    |Return                                         |
 |`KC_SEPARATOR`         |                    |Separator                                      |
 |`KC_OUT`               |                    |Out                                            |
 |`KC_OPER`              |                    |Oper                                           |
 |`KC_CLEAR_AGAIN`       |                    |Clear/Again                                    |
 |`KC_CRSEL`             |                    |CrSel/Props                                    |
 |`KC_EXSEL`             |                    |ExSel                                          |
 |`KC_LCTRL`             |`KC_LCTL`           |Left Control                                   |
 |`KC_LSHIFT`            |`KC_LSFT`           |Left Shift                                     |
 |`KC_LALT`              |                    |Left Alt                                       |
 |`KC_LGUI`              |`KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Meta key)            |
 |`KC_RCTRL`             |`KC_RCTL`           |Right Control                                  |
 |`KC_RSHIFT`            |`KC_RSFT`           |Right Shift                                    |
 |`KC_RALT`              |                    |Right Alt                                      |
 |`KC_RGUI`              |`KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Meta key)           |
 |`KC_SYSTEM_POWER`      |`KC_PWR`            |System Power Down                              |
 |`KC_SYSTEM_SLEEP`      |`KC_SLEP`           |System Sleep                                   |
 |`KC_SYSTEM_WAKE`       |`KC_WAKE`           |System Wake                                    |
 |`KC_AUDIO_MUTE`        |`KC_MUTE`           |Mute                                           |
 |`KC_AUDIO_VOL_UP`      |`KC_VOLU`           |Volume Up                                      |
 |`KC_AUDIO_VOL_DOWN`    |`KC_VOLD`           |Volume Down                                    |
 |`KC_MEDIA_NEXT_TRACK`  |`KC_MNXT`           |Next Track (Windows)                           |
 |`KC_MEDIA_PREV_TRACK`  |`KC_MPRV`           |Previous Track (Windows)                       |
 |`KC_MEDIA_STOP`        |`KC_MSTP`           |Stop Track (Windows)                           |
 |`KC_MEDIA_PLAY_PAUSE`  |`KC_MPLY`           |Play/Pause Track                               |
 |`KC_MEDIA_SELECT`      |`KC_MSEL`           |Launch Media Player (Windows)                  |
 |`KC_MEDIA_EJECT`       |`KC_EJCT`           |Eject (macOS)                                  |
 |`KC_MAIL`              |                    |Launch Mail (Windows)                          |
 |`KC_CALCULATOR`        |`KC_CALC`           |Launch Calculator (Windows)                    |
 |`KC_MY_COMPUTER`       |`KC_MYCM`           |Launch My Computer (Windows)                   |
 |`KC_WWW_SEARCH`        |`KC_WSCH`           |Browser Search (Windows)                       |
 |`KC_WWW_HOME`          |`KC_WHOM`           |Browser Home (Windows)                         |
 |`KC_WWW_BACK`          |`KC_WBAK`           |Browser Back (Windows)                         |
 |`KC_WWW_FORWARD`       |`KC_WFWD`           |Browser Forward (Windows)                      |
 |`KC_WWW_STOP`          |`KC_WSTP`           |Browser Stop (Windows)                         |
 |`KC_WWW_REFRESH`       |`KC_WREF`           |Browser Refresh (Windows)                      |
 |`KC_WWW_FAVORITES`     |`KC_WFAV`           |Browser Favorites (Windows)                    |
 |`KC_MEDIA_FAST_FORWARD`|`KC_MFFD`           |Next Track (macOS)                             |
 |`KC_MEDIA_REWIND`      |`KC_MRWD`           |Previous Track (macOS)                         |
 ## [Quantum Keycodes](quantum_keycodes.md#qmk-keycodes)
@@ -391,29 +404,29 @@ This is a reference only. Each group of keys links to the page documenting their
 ## [US ANSI Shifted Keys](keycodes_us_ansi_shifted.md)
-|Key                     |Aliases           |Description        |
+|Key                     |Aliases            |Description        |
-|------------------------|------------------|-------------------|
+|------------------------|-------------------|-------------------|
-|`KC_TILDE`              |`KC_TILD`         |`~`                |
+|`KC_TILDE`              |`KC_TILD`          |`~`                |
-|`KC_EXCLAIM`            |`KC_EXLM`         |`!`                |
+|`KC_EXCLAIM`            |`KC_EXLM`          |`!`                |
-|`KC_AT`                 |                  |`@`                |
+|`KC_AT`                 |                   |`@`                |
-|`KC_HASH`               |                  |`#`                |
+|`KC_HASH`               |                   |`#`                |
-|`KC_DOLLAR`             |`KC_DLR`          |`$`                |
+|`KC_DOLLAR`             |`KC_DLR`           |`$`                |
-|`KC_PERCENT`            |`KC_PERC`         |`%`                |
+|`KC_PERCENT`            |`KC_PERC`          |`%`                |
-|`KC_CIRCUMFLEX`         |`KC_CIRC`         |`^`                |
+|`KC_CIRCUMFLEX`         |`KC_CIRC`          |`^`                |
-|`KC_AMPERSAND`          |`KC_AMPR`         |`&`                |
+|`KC_AMPERSAND`          |`KC_AMPR`          |`&`                |
-|`KC_ASTERISK`           |`KC_ASTR`         |`*`                |
+|`KC_ASTERISK`           |`KC_ASTR`          |`*`                |
-|`KC_LEFT_PAREN`         |`KC_LPRN`         |`(`                |
+|`KC_LEFT_PAREN`         |`KC_LPRN`          |`(`                |
-|`KC_RIGHT_PAREN`        |`KC_RPRN`         |`)`                |
+|`KC_RIGHT_PAREN`        |`KC_RPRN`          |`)`                |
-|`KC_UNDERSCORE`         |`KC_UNDS`         |`_`                |
+|`KC_UNDERSCORE`         |`KC_UNDS`          |`_`                |
-|`KC_PLUS`               |                  |`+`                |
+|`KC_PLUS`               |                   |`+`                |
-|`KC_LEFT_CURLY_BRACE`   |`KC_LCBR`         |`{`                |
+|`KC_LEFT_CURLY_BRACE`   |`KC_LCBR`          |`{`                |
-|`KC_RIGHT_CURLY_BRACE`  |`KC_RCBR`         |`}`                |
+|`KC_RIGHT_CURLY_BRACE`  |`KC_RCBR`          |`}`                |
-|`KC_PIPE`               |                  |<code>&#124;</code>|
+|`KC_PIPE`               |                   |<code>&#124;</code>|
-|`KC_COLON`              |`KC_COLN`         |`:`                |
+|`KC_COLON`              |`KC_COLN`          |`:`                |
-|`KC_DOUBLE_QUOTE`       |`KC_DQT`/`KC_DQUO`|`"`                |
+|`KC_DOUBLE_QUOTE`       |`KC_DQUO`, `KC_DQT`|`"`                |
-|`KC_LEFT_ANGLE_BRACKET` |`KC_LT`/`KC_LABK` |`<`                |
+|`KC_LEFT_ANGLE_BRACKET` |`KC_LABK`, `KC_LT` |`<`                |
-|`KC_RIGHT_ANGLE_BRACKET`|`KC_GT`/`KC_RABK` |`>`                |
+|`KC_RIGHT_ANGLE_BRACKET`|`KC_RABK`, `KC_GT` |`>`                |
-|`KC_QUESTION`           |`KC_QUES`         |`?`                |
+|`KC_QUESTION`           |`KC_QUES`          |`?`                |
 ## [Switching and Toggling Layers](feature_advanced_keycodes.md#switching-and-toggling-layers)
@@ -47,117 +47,145 @@ The basic set of keycodes are based on the [HID Keyboard/Keypad Usage Page (0x07
 |Key     |Description|
 |--------|-----------|
-|`KC_F1` |           |
+|`KC_F1` |F1         |
-|`KC_F2` |           |
+|`KC_F2` |F2         |
-|`KC_F3` |           |
+|`KC_F3` |F3         |
-|`KC_F4` |           |
+|`KC_F4` |F4         |
-|`KC_F5` |           |
+|`KC_F5` |F5         |
-|`KC_F6` |           |
+|`KC_F6` |F6         |
-|`KC_F7` |           |
+|`KC_F7` |F7         |
-|`KC_F8` |           |
+|`KC_F8` |F8         |
-|`KC_F9` |           |
+|`KC_F9` |F9         |
-|`KC_F10`|           |
+|`KC_F10`|F10        |
-|`KC_F11`|           |
+|`KC_F11`|F11        |
-|`KC_F12`|           |
+|`KC_F12`|F12        |
-|`KC_F13`|           |
+|`KC_F13`|F13        |
-|`KC_F14`|           |
+|`KC_F14`|F14        |
-|`KC_F15`|           |
+|`KC_F15`|F15        |
-|`KC_F16`|           |
+|`KC_F16`|F16        |
-|`KC_F17`|           |
+|`KC_F17`|F17        |
-|`KC_F18`|           |
+|`KC_F18`|F18        |
-|`KC_F19`|           |
+|`KC_F19`|F19        |
-|`KC_F20`|           |
+|`KC_F20`|F20        |
-|`KC_F21`|           |
+|`KC_F21`|F21        |
-|`KC_F22`|           |
+|`KC_F22`|F22        |
-|`KC_F23`|           |
+|`KC_F23`|F23        |
-|`KC_F24`|           |
+|`KC_F24`|F24        |
 ## Punctuation
-|Key              |Aliases  |Description                       |
+|Key              |Aliases            |Description                                    |
-|-----------------|---------|----------------------------------|
+|-----------------|-------------------|-----------------------------------------------|
-|`KC_ENTER`       |`KC_ENT` |Return (Enter)                    |
+|`KC_ENTER`       |`KC_ENT`           |Return (Enter)                                 |
-|`KC_ESCAPE`      |`KC_ESC` |Escape                            |
+|`KC_ESCAPE`      |`KC_ESC`           |Escape                                         |
-|`KC_BSPACE`      |`KC_BSPC`|Delete (Backspace)                |
+|`KC_BSPACE`      |`KC_BSPC`          |Delete (Backspace)                             |
-|`KC_TAB`         |         |Tab                               |
+|`KC_TAB`         |                   |Tab                                            |
-|`KC_SPACE`       |`KC_SPC` |Spacebar                          |
+|`KC_SPACE`       |`KC_SPC`           |Spacebar                                       |
-|`KC_MINUS`       |`KC_MINS`|`-` and `_`                       |
+|`KC_MINUS`       |`KC_MINS`          |`-` and `_`                                    |
-|`KC_EQUAL`       |`KC_EQL` |`=` and `+`                       |
+|`KC_EQUAL`       |`KC_EQL`           |`=` and `+`                                    |
-|`KC_LBRACKET`    |`KC_LBRC`|`[` and `{`                       |
+|`KC_LBRACKET`    |`KC_LBRC`          |`[` and `{`                                    |
-|`KC_RBRACKET`    |`KC_RBRC`|`]` and `}`                       |
+|`KC_RBRACKET`    |`KC_RBRC`          |`]` and `}`                                    |
-|`KC_BSLASH`      |`KC_BSLS`|`\` and <code>&#124;</code>       |
+|`KC_BSLASH`      |`KC_BSLS`          |`\` and <code>&#124;</code>                    |
-|`KC_NONUS_HASH`  |`KC_NUHS`|Non-US `#` and `~`                |
+|`KC_NONUS_HASH`  |`KC_NUHS`          |Non-US `#` and `~`                             |
-|`KC_NONUS_BSLASH`|`KC_NUBS`|Non-US `\` and <code>&#124;</code>|
+|`KC_SCOLON`      |`KC_SCLN`          |`;` and `:`                                    |
-|`KC_INT1`        |`KC_RO`  |JIS `\` and <code>&#124;</code>   |
+|`KC_QUOTE`       |`KC_QUOT`          |`'` and `"`                                    |
-|`KC_INT2`        |`KC_KANA`|JIS Katakana/Hiragana             |
+|`KC_GRAVE`       |`KC_GRV`, `KC_ZKHK`|<code>&#96;</code> and `~`, JIS Zenkaku/Hankaku|
-|`KC_INT3`        |`KC_JYEN`|JIS `¥`                           |
+|`KC_COMMA`       |`KC_COMM`          |`,` and `<`                                    |
-|`KC_SCOLON`      |`KC_SCLN`|`;` and `:`                       |
+|`KC_DOT`         |                   |`.` and `>`                                    |
-|`KC_QUOTE`       |`KC_QUOT`|`'` and `"`                       |
+|`KC_SLASH`       |`KC_SLSH`          |`/` and `?`                                    |
-|`KC_GRAVE`       |`KC_GRV` |<code>&#96;</code> and `~`        |
+|`KC_NONUS_BSLASH`|`KC_NUBS`          |Non-US `\` and <code>&#124;</code>             |
-|`KC_COMMA`       |`KC_COMM`|`,` and `<`                       |
+
-|`KC_DOT`         |         |`.` and `>`                       |
+## Lock Keys
-|`KC_SLASH`       |`KC_SLSH`|`/` and `?`                       |
+
-|`KC_CAPSLOCK`    |`KC_CAPS`|Caps Lock                         |
+|Key                |Aliases             |Description              |
 |-------------------|--------------------|-------------------------|
 |`KC_CAPSLOCK`      |`KC_CLCK`, `KC_CAPS`|Caps Lock                |
 |`KC_SCROLLLOCK`    |`KC_SLCK`           |Scroll Lock              |
 |`KC_NUMLOCK`       |`KC_NLCK`           |Keypad Num Lock and Clear|
 |`KC_LOCKING_CAPS`  |`KC_LCAP`           |Locking Caps Lock        |
 |`KC_LOCKING_NUM`   |`KC_LNUM`           |Locking Num Lock         |
 |`KC_LOCKING_SCROLL`|`KC_LSCR`           |Locking Scroll Lock      |
 ## Modifiers
-|Key                |Aliases             |Description                         |
+|Key        |Aliases             |Description                         |
-|-------------------|--------------------|------------------------------------|
+|-----------|--------------------|------------------------------------|
-|`KC_LCTRL`         |`KC_LCTL`           |Left Control                        |
+|`KC_LCTRL` |`KC_LCTL`           |Left Control                        |
-|`KC_LSHIFT`        |`KC_LSFT`           |Left Shift                          |
+|`KC_LSHIFT`|`KC_LSFT`           |Left Shift                          |
-|`KC_LALT`          |                    |Left Alt                            |
+|`KC_LALT`  |                    |Left Alt                            |
-|`KC_LGUI`          |`KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Meta key) |
+|`KC_LGUI`  |`KC_LCMD`, `KC_LWIN`|Left GUI (Windows/Command/Meta key) |
-|`KC_RCTRL`         |`KC_RCTL`           |Right Control                       |
+|`KC_RCTRL` |`KC_RCTL`           |Right Control                       |
-|`KC_RSHIFT`        |`KC_RSFT`           |Right Shift                         |
+|`KC_RSHIFT`|`KC_RSFT`           |Right Shift                         |
-|`KC_RALT`          |                    |Right Alt                           |
+|`KC_RALT`  |                    |Right Alt                           |
-|`KC_RGUI`          |`KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Meta key)|
+|`KC_RGUI`  |`KC_RCMD`, `KC_RWIN`|Right GUI (Windows/Command/Meta key)|
-|`KC_LOCKING_CAPS`  |`KC_LCAP`           |Locking Caps Lock                   |
+
-|`KC_LOCKING_NUM`   |`KC_LNUM`           |Locking Num Lock                    |
+## International
-|`KC_LOCKING_SCROLL`|`KC_LSCR`           |Locking Scroll Lock                 |
+
-|`KC_INT4`          |`KC_HENK`           |JIS Henkan                          |
+|Key       |Aliases  |Description                    |
-|`KC_INT5`          |`KC_MHEN`           |JIS Muhenkan                        |
+|----------|---------|-------------------------------|
 |`KC_INT1` |`KC_RO`  |JIS `\` and <code>&#124;</code>|
 |`KC_INT2` |`KC_KANA`|JIS Katakana/Hiragana          |
 |`KC_INT3` |`KC_JYEN`|JIS `¥`                        |
 |`KC_INT4` |`KC_HENK`|JIS Henkan                     |
 |`KC_INT5` |`KC_MHEN`|JIS Muhenkan                   |
 |`KC_INT6` |         |JIS Numpad `,`                 |
 |`KC_INT7` |         |International 7                |
 |`KC_INT8` |         |International 8                |
 |`KC_INT9` |         |International 9                |
 |`KC_LANG1`|`KC_HAEN`|Hangul/English                 |
 |`KC_LANG2`|`KC_HANJ`|Hanja                          |
 |`KC_LANG3`|         |JIS Katakana                   |
 |`KC_LANG4`|         |JIS Hiragana                   |
 |`KC_LANG5`|         |JIS Zenkaku/Hankaku            |
 |`KC_LANG6`|         |Language 6                     |
 |`KC_LANG7`|         |Language 7                     |
 |`KC_LANG8`|         |Language 8                     |
 |`KC_LANG9`|         |Language 9                     |
 ## Commands
-|Key               |Aliases  |Description                   |
+|Key               |Aliases            |Description                   |
-|------------------|---------|------------------------------|
+|------------------|-------------------|------------------------------|
-|`KC_PSCREEN`      |`KC_PSCR`|Print Screen                  |
+|`KC_PSCREEN`      |`KC_PSCR`          |Print Screen                  |
-|`KC_SCROLLLOCK`   |`KC_SLCK`|Scroll Lock                   |
+|`KC_PAUSE`        |`KC_PAUS`, `KC_BRK`|Pause                         |
-|`KC_PAUSE`        |`KC_PAUS`|Pause                         |
+|`KC_INSERT`       |`KC_INS`           |Insert                        |
-|`KC_INSERT`       |`KC_INS` |Insert                        |
+|`KC_HOME`         |                   |Home                          |
-|`KC_HOME`         |         |Home                          |
+|`KC_PGUP`         |                   |Page Up                       |
-|`KC_PGUP`         |         |Page Up                       |
+|`KC_DELETE`       |`KC_DEL`           |Forward Delete                |
-|`KC_DELETE`       |`KC_DEL` |Forward Delete                |
+|`KC_END`          |                   |End                           |
-|`KC_END`          |         |End                           |
+|`KC_PGDOWN`       |`KC_PGDN`          |Page Down                     |
-|`KC_PGDOWN`       |`KC_PGDN`|Page Down                     |
+|`KC_RIGHT`        |`KC_RGHT`          |Right Arrow                   |
-|`KC_RIGHT`        |`KC_RGHT`|Right Arrow                   |
+|`KC_LEFT`         |                   |Left Arrow                    |
-|`KC_LEFT`         |         |Left Arrow                    |
+|`KC_DOWN`         |                   |Down Arrow                    |
-|`KC_DOWN`         |         |Down Arrow                    |
+|`KC_UP`           |                   |Up Arrow                      |
-|`KC_UP`           |         |Up Arrow                      |
+|`KC_APPLICATION`  |`KC_APP`           |Application (Windows Menu Key)|
-|`KC_APPLICATION`  |`KC_APP` |Application (Windows Menu Key)|
+|`KC_POWER`        |                   |System Power (macOS/Linux)    |
-|`KC_POWER`        |         |Power                         |
+|`KC_EXECUTE`      |`KC_EXEC`          |Execute                       |
-|`KC_EXECUTE`      |         |Execute                       |
+|`KC_HELP`         |                   |Help                          |
-|`KC_HELP`         |         |Help                          |
+|`KC_MENU`         |                   |Menu                          |
-|`KC_MENU`         |         |Menu                          |
+|`KC_SELECT`       |`KC_SLCT`          |Select                        |
-|`KC_SELECT`       |         |Select                        |
+|`KC_STOP`         |                   |Stop                          |
-|`KC_AGAIN`        |         |Again                         |
+|`KC_AGAIN`        |`KC_AGIN`          |Again                         |
-|`KC_UNDO`         |         |Undo                          |
+|`KC_UNDO`         |                   |Undo                          |
-|`KC_CUT`          |         |Cut                           |
+|`KC_CUT`          |                   |Cut                           |
-|`KC_COPY`         |         |Copy                          |
+|`KC_COPY`         |                   |Copy                          |
-|`KC_PASTE`        |         |Paste                         |
+|`KC_PASTE`        |`KC_PSTE`          |Paste                         |
-|`KC_FIND`         |         |Find                          |
+|`KC_FIND`         |                   |Find                          |
-|`KC_ALT_ERASE`    |         |Alternate Erase               |
+|`KC__MUTE`        |                   |Mute (macOS)                  |
-|`KC_SYSREQ`       |         |SysReq/Attention              |
+|`KC__VOLUP`       |                   |Volume Up (macOS)             |
-|`KC_CANCEL`       |         |Cancel                        |
+|`KC__VOLDOWN`     |                   |Volume Down (macOS)           |
-|`KC_CLEAR`        |         |Clear                         |
+|`KC_ALT_ERASE`    |`KC_ERAS`          |Alternate Erase               |
-|`KC_PRIOR`        |         |Prior                         |
+|`KC_SYSREQ`       |                   |SysReq/Attention              |
-|`KC_RETURN`       |         |Return                        |
+|`KC_CANCEL`       |                   |Cancel                        |
-|`KC_SEPARATOR`    |         |Separator                     |
+|`KC_CLEAR`        |`KC_CLR`           |Clear                         |
-|`KC_OUT`          |         |Out                           |
+|`KC_PRIOR`        |                   |Prior                         |
-|`KC_OPER`         |         |Oper                          |
+|`KC_RETURN`       |                   |Return                        |
-|`KC_CLEAR_AGAIN`  |         |Clear/Again                   |
+|`KC_SEPARATOR`    |                   |Separator                     |
-|`KC_CRSEL`        |         |CrSel/Props                   |
+|`KC_OUT`          |                   |Out                           |
-|`KC_EXSEL`        |         |ExSel                         |
+|`KC_OPER`         |                   |Oper                          |
 |`KC_CLEAR_AGAIN`  |                   |Clear/Again                   |
 |`KC_CRSEL`        |                   |CrSel/Props                   |
 |`KC_EXSEL`        |                   |ExSel                         |
 ## Media Keys
@@ -165,42 +193,37 @@ These keycodes are not part of the Keyboard/Keypad usage page. The `SYSTEM_` key
 Windows and macOS use different keycodes for "next track" and "previous track". Make sure you choose the keycode that corresponds to your OS.
-|Key                    |Aliases  |Description                      |
+|Key                    |Aliases  |Description                  |
-|-----------------------|---------|---------------------------------|
+|-----------------------|---------|-----------------------------|
-|`KC_SYSTEM_POWER`      |`KC_PWR` |System Power Down                |
+|`KC_SYSTEM_POWER`      |`KC_PWR` |System Power Down            |
-|`KC_SYSTEM_SLEEP`      |`KC_SLEP`|System Sleep                     |
+|`KC_SYSTEM_SLEEP`      |`KC_SLEP`|System Sleep                 |
-|`KC_SYSTEM_WAKE`       |`KC_WAKE`|System Wake                      |
+|`KC_SYSTEM_WAKE`       |`KC_WAKE`|System Wake                  |
-|`KC_MAIL`              |`KC_MAIL`|                                 |
+|`KC_AUDIO_MUTE`        |`KC_MUTE`|Mute                         |
-|`KC_CALCULATOR`        |`KC_CALC`|                                 |
+|`KC_AUDIO_VOL_UP`      |`KC_VOLU`|Volume Up                    |
-|`KC_MY_COMPUTER`       |`KC_MYCM`|                                 |
+|`KC_AUDIO_VOL_DOWN`    |`KC_VOLD`|Volume Down                  |
-|`KC_WWW_SEARCH`        |`KC_WSCH`|                                 |
+|`KC_MEDIA_NEXT_TRACK`  |`KC_MNXT`|Next Track (Windows)         |
-|`KC_WWW_HOME`          |`KC_WHOM`|                                 |
+|`KC_MEDIA_PREV_TRACK`  |`KC_MPRV`|Previous Track (Windows)     |
-|`KC_WWW_BACK`          |`KC_WBAK`|                                 |
+|`KC_MEDIA_STOP`        |`KC_MSTP`|Stop Track (Windows)         |
-|`KC_WWW_FORWARD`       |`KC_WFWD`|                                 |
+|`KC_MEDIA_PLAY_PAUSE`  |`KC_MPLY`|Play/Pause Track             |
-|`KC_WWW_STOP`          |`KC_WSTP`|                                 |
+|`KC_MEDIA_SELECT`      |`KC_MSEL`|Launch Media Player (Windows)|
-|`KC_WWW_REFRESH`       |`KC_WREF`|                                 |
+|`KC_MEDIA_EJECT`       |`KC_EJCT`|Eject (macOS)                |
-|`KC_STOP`              |         |Stop                             |
+|`KC_MAIL`              |         |Launch Mail (Windows)        |
-|`KC_WWW_FAVORITES`     |`KC_WFAV`|                                 |
+|`KC_CALCULATOR`        |`KC_CALC`|Launch Calculator (Windows)  |
-|`KC__MUTE`             |         |Mute (macOS)                     |
+|`KC_MY_COMPUTER`       |`KC_MYCM`|Launch My Computer (Windows) |
-|`KC__VOLUP`            |         |Volume Up (macOS)                |
+|`KC_WWW_SEARCH`        |`KC_WSCH`|Browser Search (Windows)     |
-|`KC__VOLDOWN`          |         |Volume Down (macOS)              |
+|`KC_WWW_HOME`          |`KC_WHOM`|Browser Home (Windows)       |
-|`KC_AUDIO_MUTE`        |`KC_MUTE`|Mute (Windows/macOS/Linux)       |
+|`KC_WWW_BACK`          |`KC_WBAK`|Browser Back (Windows)       |
-|`KC_AUDIO_VOL_UP`      |`KC_VOLU`|Volume Up (Windows/macOS/Linux)  |
+|`KC_WWW_FORWARD`       |`KC_WFWD`|Browser Forward (Windows)    |
-|`KC_AUDIO_VOL_DOWN`    |`KC_VOLD`|Volume Down (Windows/macOS/Linux)|
+|`KC_WWW_STOP`          |`KC_WSTP`|Browser Stop (Windows)       |
-|`KC_MEDIA_NEXT_TRACK`  |`KC_MNXT`|Next Track (Windows)             |
+|`KC_WWW_REFRESH`       |`KC_WREF`|Browser Refresh (Windows)    |
-|`KC_MEDIA_PREV_TRACK`  |`KC_MPRV`|Previous Track (Windows)         |
+|`KC_WWW_FAVORITES`     |`KC_WFAV`|Browser Favorites (Windows)  |
-|`KC_MEDIA_FAST_FORWARD`|`KC_MFFD`|Next Track (macOS)               |
+|`KC_MEDIA_FAST_FORWARD`|`KC_MFFD`|Next Track (macOS)           |
-|`KC_MEDIA_REWIND`      |`KC_MRWD`|Previous Track (macOS)           |
+|`KC_MEDIA_REWIND`      |`KC_MRWD`|Previous Track (macOS)       |
 |`KC_MEDIA_STOP`        |`KC_MSTP`|Stop Track                       |
 |`KC_MEDIA_PLAY_PAUSE`  |`KC_MPLY`|Play/Pause Track                 |
 |`KC_MEDIA_SELECT`      |`KC_MSEL`|                                 |
 |`KC_MEDIA_EJECT`       |`KC_EJCT`|Eject (macOS)                    |
 ## Number Pad
 |Key                |Aliases  |Description                   |
 |-------------------|---------|------------------------------|
 |`KC_NUMLOCK`       |`KC_NLCK`|Keypad Num Lock and Clear     |
 |`KC_KP_SLASH`      |`KC_PSLS`|Keypad `/`                    |
 |`KC_KP_ASTERISK`   |`KC_PAST`|Keypad `*`                    |
 |`KC_KP_MINUS`      |`KC_PMNS`|Keypad `-`                    |
@@ -225,7 +248,7 @@ Windows and macOS use different keycodes for "next track" and "previous track".
 In addition to these, keycodes in the range of `0xA5-DF` are reserved for internal use by TMK.
-|Key             |Aliases  |Description                            |
+|Key             |Aliases             |Description                            |
-|----------------|---------|---------------------------------------|
+|----------------|--------------------|---------------------------------------|
-|`KC_NO`         |         |Ignore this key (NOOP)                 |
+|`KC_NO`         |`XXXXXXX`           |Ignore this key (NOOP)                 |
-|`KC_TRANSPARENT`|`KC_TRNS`|Use the next lowest non-transparent key|
+|`KC_TRANSPARENT`|`KC_TRNS`, `_______`|Use the next lowest non-transparent key|
@@ -6,26 +6,26 @@ It's important to remember that all of these keycodes send a left shift - this m
 ## US ANSI Shifted Keycodes
-|Key                     |Aliases           |Description        |
+|Key                     |Aliases            |Description        |
-|------------------------|------------------|-------------------|
+|------------------------|-------------------|-------------------|
-|`KC_TILDE`              |`KC_TILD`         |`~`                |
+|`KC_TILDE`              |`KC_TILD`          |`~`                |
-|`KC_EXCLAIM`            |`KC_EXLM`         |`!`                |
+|`KC_EXCLAIM`            |`KC_EXLM`          |`!`                |
-|`KC_AT`                 |                  |`@`                |
+|`KC_AT`                 |                   |`@`                |
-|`KC_HASH`               |                  |`#`                |
+|`KC_HASH`               |                   |`#`                |
-|`KC_DOLLAR`             |`KC_DLR`          |`$`                |
+|`KC_DOLLAR`             |`KC_DLR`           |`$`                |
-|`KC_PERCENT`            |`KC_PERC`         |`%`                |
+|`KC_PERCENT`            |`KC_PERC`          |`%`                |
-|`KC_CIRCUMFLEX`         |`KC_CIRC`         |`^`                |
+|`KC_CIRCUMFLEX`         |`KC_CIRC`          |`^`                |
-|`KC_AMPERSAND`          |`KC_AMPR`         |`&`                |
+|`KC_AMPERSAND`          |`KC_AMPR`          |`&`                |
-|`KC_ASTERISK`           |`KC_ASTR`         |`*`                |
+|`KC_ASTERISK`           |`KC_ASTR`          |`*`                |
-|`KC_LEFT_PAREN`         |`KC_LPRN`         |`(`                |
+|`KC_LEFT_PAREN`         |`KC_LPRN`          |`(`                |
-|`KC_RIGHT_PAREN`        |`KC_RPRN`         |`)`                |
+|`KC_RIGHT_PAREN`        |`KC_RPRN`          |`)`                |
-|`KC_UNDERSCORE`         |`KC_UNDS`         |`_`                |
+|`KC_UNDERSCORE`         |`KC_UNDS`          |`_`                |
-|`KC_PLUS`               |                  |`+`                |
+|`KC_PLUS`               |                   |`+`                |
-|`KC_LEFT_CURLY_BRACE`   |`KC_LCBR`         |`{`                |
+|`KC_LEFT_CURLY_BRACE`   |`KC_LCBR`          |`{`                |
-|`KC_RIGHT_CURLY_BRACE`  |`KC_RCBR`         |`}`                |
+|`KC_RIGHT_CURLY_BRACE`  |`KC_RCBR`          |`}`                |
-|`KC_PIPE`               |                  |<code>&#124;</code>|
+|`KC_PIPE`               |                   |<code>&#124;</code>|
-|`KC_COLON`              |`KC_COLN`         |`:`                |
+|`KC_COLON`              |`KC_COLN`          |`:`                |
-|`KC_DOUBLE_QUOTE`       |`KC_DQT`/`KC_DQUO`|`"`                |
+|`KC_DOUBLE_QUOTE`       |`KC_DQUO`, `KC_DQT`|`"`                |
-|`KC_LEFT_ANGLE_BRACKET` |`KC_LT`/`KC_LABK` |`<`                |
+|`KC_LEFT_ANGLE_BRACKET` |`KC_LABK`, `KC_LT` |`<`                |
-|`KC_RIGHT_ANGLE_BRACKET`|`KC_GT`/`KC_RABK` |`>`                |
+|`KC_RIGHT_ANGLE_BRACKET`|`KC_RABK`, `KC_GT` |`>`                |
-|`KC_QUESTION`           |`KC_QUES`         |`?`                |
+|`KC_QUESTION`           |`KC_QUES`          |`?`                |
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* ,-----------------------------------------------------------------------------------------.
   * |  `  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |    Del    |
   * |-----------------------------------------------------------------------------------------+
-   * |        |     |     |     |     |     |     |     | UP  |     |     |     |     |  Reset |
+   * |        |     |     |     |     |     |     |     | UP  |     |     |     |     |        |
   * |-----------------------------------------------------------------------------------------+
   * |          |     |     |     |     |     |     | Left| Down|Right|     |     |            |
   * |-----------------------------------------------------------------------------------------+
@@ -44,15 +44,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   */
  [_FL] = LAYOUT(
    KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ______, KC_DEL,
-    ______, ______, ______, ______, ______, ______, ______, ______, KC_UP, ______, ______, ______, ______, RESET,
+    ______, ______, ______, ______, ______, ______, ______, ______, KC_UP, ______, ______, ______, ______, ______,
    ______, ______, ______, ______, ______, ______, ______, KC_LEFT, KC_DOWN, KC_RIGHT, ______, ______, ______,
    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______),
  /* ,-----------------------------------------------------------------------------------------.
-   * |     | BR- | BR+ | F3  | F4  |     |     |PREV |PLAY |NEXT |MUTE | V- | V+ |    Eject    |
+   * |Eject| BR- | BR+ | F3  | F4  |     |     |PREV |PLAY |NEXT |MUTE | V- | V+ |             |
   * |-----------------------------------------------------------------------------------------+
-   * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
+   * |        |     |     |     |     |     |     |     |     |     |     |     |     |  Reset |
   * |-----------------------------------------------------------------------------------------+
   * |          |     |     |     |     |     |     |     |     |     |     |     |            |
   * |-----------------------------------------------------------------------------------------+
@@ -62,8 +62,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   * `-----------------------------------------------------------------------------------------'
   */
  [_ML] = LAYOUT(
-    ______, BR_DOWN, BR_UP, ______, ______, KC_F5, KC_F6, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, ______, KC_MEDIA_EJECT,
+    KC_MEDIA_EJECT, BR_DOWN, BR_UP, ______, ______, KC_F5, KC_F6, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP, ______, ______,
-    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
+    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, RESET,
    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______,
    ______, ______, ______, ______, ______, ______, ______, ______, ______, ______, ______),
@@ -37,7 +37,7 @@ My build used the following components:
 ,-----------------------------------------------------------------------------------------.
 |  `  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |    Del    |
 |-----------------------------------------------------------------------------------------+
-|        |     |     |     |     |     |     |     | UP  |     |     |     |     |  Reset |
+|        |     |     |     |     |     |     |     | UP  |     |     |     |     |        |
 |-----------------------------------------------------------------------------------------+
 |          |     |     |     |     |     |     | Left| Down|Right|     |     |            |
 |-----------------------------------------------------------------------------------------+
@@ -55,7 +55,7 @@ The function layer is activated by the `Caps-Lock` (`Hyper`) key to access `F` k
 ,-----------------------------------------------------------------------------------------.
 |     | BR- | BR+ | F3  | F4  |     |     |PREV |PLAY |NEXT |MUTE | V- | V+ |    Eject    |
 |-----------------------------------------------------------------------------------------+
-|        |     |     |     |     |     |     |     |     |     |     |     |     |        |
+|        |     |     |     |     |     |     |     |     |     |     |     |     |  Reset |
 |-----------------------------------------------------------------------------------------+
 |          |     |     |     |     |     |     |     |     |     |     |     |            |
 |-----------------------------------------------------------------------------------------+
@@ -0,0 +1,2 @@
 BACKLIGHT_ENABLE = no
 RGBLIGHT_ENABLE = no
@@ -299,58 +299,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
    return true;
 };
 // getting the LEDs working...
 void led_set_user(uint8_t usb_led) {
    DDRF |= (1<<0); // Keypad LED
    if (usb_led & (1<<USB_LED_COMPOSE)) {
        PORTF |= (1<<0);
    } else {
        PORTF &= ~(1<<0);
    }
    DDRF |= (1<<1); // ScrLock LED
    if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
        PORTF |= (1<<1);
    } else {
        PORTF &= ~(1<<1);
    }
    DDRF |= (1<<2); // NumLock LED
    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
        PORTF |= (1<<2);
    } else {
        PORTF &= ~(1<<2);
    }
    DDRF |= (1<<3); // CapsLock LED
    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
        PORTF |= (1<<3);
    } else {
        PORTF &= ~(1<<3);
    }
 }
 // Runs just one time when the keyboard initializes.
 void matrix_init_user(void) {
 };
 void led_set_user(uint8_t usb_led) {
    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
        PORTF |= (1<<2);
    } else {
        PORTF &= ~(1<<2);
    }
    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
        PORTF |= (1<<3);
    } else {
        PORTF &= ~(1<<3);
    }
    if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
        PORTF |= (1<<1);
    } else {
        PORTF &= ~(1<<1);
    }
 }
@@ -10,9 +10,11 @@ The QWERTY layout shown here is based entirely on the Kinesis Advantage layout.
 I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts.
 As of August 4 2018, I've got the LEDs working ... mostly. Caps Lock and Num Lock LEDs work for me. The Scroll Lock LED does work on my keyboard, but I can't get it to work when I use the Scroll Lock key on my keyboard. I also have no idea how to get the Num Pad LED working when I switch to the Numpad layer.
 ## Still to do:
- * Implement the CapsLock, NumLock, and ScrLck LEDs on the off-chance that I decide to actually solder some to the keyboard.
+ * Figure out how to make the Numpad and ScrLck LEDs work properly.
 ### Function Keys on All Layers (keypad toggles):
 	,-----------------------------------------------------------------.
@@ -27,65 +27,35 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 }
 void led_init_ports() {
-    // * Set our LED pins as output
+  // * Set our LED pins as output
-    DDRF |= (1<<0); // Keypad LED
+  DDRF |= (1<<0); // Keypad LED
-    DDRF |= (1<<1); // ScrLock LED
+  DDRF |= (1<<1); // ScrLock LED
-    DDRF |= (1<<2); // NumLock LED
+  DDRF |= (1<<2); // NumLock LED
-    DDRF |= (1<<3); // CapsLock LED
+  DDRF |= (1<<3); // CapsLock LED
 }
 void led_set_kb(uint8_t usb_led) {
-    DDRF |= (1<<0); // Keypad LED
+  if (usb_led & (1<<USB_LED_COMPOSE)) {
-    if (usb_led & (1<<USB_LED_COMPOSE)) {
+      PORTF &= ~(1<<0);
-        PORTF |= (1<<0);
+  } else {
-    } else {
+      PORTF |= (1<<0);
-        PORTF &= ~(1<<0);
+  }
    }
-    DDRF |= (1<<1); // ScrLock LED
+  if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
-    if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
+      PORTF &= ~(1<<1);
-        PORTF |= (1<<1);
+  } else {
-    } else {
+      PORTF |= (1<<1);
-        PORTF &= ~(1<<1);
+  }
    }
    DDRF |= (1<<2); // NumLock LED
    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
        PORTF |= (1<<2);
    } else {
        PORTF &= ~(1<<2);
    }
    DDRF |= (1<<3); // CapsLock LED
    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
        PORTF |= (1<<3);
    } else {
        PORTF &= ~(1<<3);
    }
 	led_set_user(usb_led);
 inline void kinesis_keypad_led_on(void)    { DDRF |=  (1<<0); PORTF |=  (1<<0); }
 inline void kinesis_scroll_led_on(void)    { DDRF |=  (1<<1); PORTF |=  (1<<1); }
 inline void kinesis_num_led_on(void)    { DDRF |=  (1<<2); PORTF |=  (1<<2); }
 inline void kinesis_caps_led_on(void)    { DDRF |=  (1<<3); PORTF |=  (1<<3); }
 inline void kinesis_keypad_led_off(void)   { DDRF &= ~(1<<0); PORTF &= ~(1<<0); }
 inline void kinesis_scroll_led_off(void)   { DDRF &= ~(1<<1); PORTF &= ~(1<<1); }
 inline void kinesis_num_led_off(void)   { DDRF &= ~(1<<2); PORTF &= ~(1<<2); }
 inline void kinesis_caps_led_off(void)   { DDRF &= ~(1<<3); PORTF &= ~(1<<3); }
  if (usb_led & (1<<USB_LED_NUM_LOCK)) {
      PORTF &= ~(1<<2);
  } else {
      PORTF |= (1<<2);
  }
  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
      PORTF &= ~(1<<3);
  } else {
      PORTF |= (1<<3);
  }
 }
 /* This is the old code that has the port information in it.
 inline void kinesis_keypad_led_on(void)    { DDRF |=  (1<<0); PORTF |=  (1<<0); }
 inline void kinesis_scroll_led_on(void)    { DDRF |=  (1<<1); PORTF |=  (1<<1); }
 inline void kinesis_num_led_on(void)    { DDRF |=  (1<<2); PORTF |=  (1<<2); }
 inline void kinesis_caps_led_on(void)    { DDRF |=  (1<<3); PORTF |=  (1<<3); }
 inline void kinesis_keypad_led_off(void)   { DDRF &= ~(1<<0); PORTF &= ~(1<<0); }
 inline void kinesis_scroll_led_off(void)   { DDRF &= ~(1<<1); PORTF &= ~(1<<1); }
 inline void kinesis_num_led_off(void)   { DDRF &= ~(1<<2); PORTF &= ~(1<<2); }
 inline void kinesis_caps_led_off(void)   { DDRF &= ~(1<<3); PORTF &= ~(1<<3); }
 */
@@ -159,10 +159,12 @@ void matrix_scan_kb(void)
 void suspend_power_down_kb(void)
 {
    rgb_matrix_set_suspend_state(true);
    suspend_power_down_user();
 }
 void suspend_wakeup_init_kb(void)
 {
    rgb_matrix_set_suspend_state(false);
    suspend_wakeup_init_user();
 }
@@ -15,12 +15,11 @@
  #define RGBLED_NUM 12
 #elif defined(KEYBOARD_lets_split_rev2)
  #define RGBLED_NUM 8
 #elif defined(KEYBOARD_jj40)
  #define RGBLED_NUM 5
 #else
  #define RGBLED_NUM 1
 #endif
 #ifdef KEYBOARD_jj40
  #define RGBLED_NUM 5
 #endif
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_HUE_STEP 8
@@ -175,6 +175,16 @@ void persistent_default_layer_set(uint16_t default_layer) {
  default_layer_set(default_layer);
 }
 void matrix_init_user(void) {
 #ifdef BOOTLOADER_CATERINA
   // This will disable the red LEDs on the ProMicros
   DDRD &= ~(1<<5);
   PORTD &= ~(1<<5);
   DDRB &= ~(1<<0);
   PORTB &= ~(1<<0);
 #endif
 };
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case QWERTY:
@@ -1,5 +1,5 @@
 # Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
+#   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
 #
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
@@ -7,12 +7,18 @@ MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
 COMMAND_ENABLE = no         # Commands for debug and configuration
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+
 ifneq ("$(KEYBOARD)","nyquist")
  RGBLIGHT_ENABLE = yes
  BACKLIGHT_ENABLE = yes
 else
  RGBLIGHT_ENABLE = no
  BACKLIGHT_ENABLE = no
 endif
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
@@ -147,8 +147,10 @@ void reset_keyboard(void) {
 #if defined(MIDI_ENABLE) && defined(MIDI_BASIC)
  process_midi_all_notes_off();
 #endif
-#if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE)
+#ifdef AUDIO_ENABLE
-  music_all_notes_off();
+  #ifndef NO_MUSIC_MODE
    music_all_notes_off();
  #endif
  uint16_t timer_start = timer_read();
  PLAY_SONG(goodbye_song);
  shutdown_user();
@@ -156,6 +158,7 @@ void reset_keyboard(void) {
    wait_ms(1);
  stop_all_notes();
 #else
  shutdown_user();
  wait_ms(250);
 #endif
 // this is also done later in bootloader.c - not sure if it's neccesary here
@@ -931,7 +934,7 @@ uint8_t rgb_matrix_task_counter = 0;
 #endif
 void matrix_scan_quantum() {
-  #if defined(AUDIO_ENABLE)
+  #if defined(AUDIO_ENABLE) && !defined(NO_MUSIC_MODE)
    matrix_scan_music();
  #endif
@@ -53,6 +53,7 @@
 #include <stdlib.h>
 #include "print.h"
 #include "send_string_keycodes.h"
 #include "suspend.h"
 extern uint32_t default_layer_state;
@@ -52,6 +52,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
 // #define RGB_DI_PIN E2
 // #ifdef RGB_DI_PIN
 // #define RGBLIGHT_ANIMATIONS
 // #define RGBLED_NUM 16
 // #define RGBLIGHT_HUE_STEP 8
 // #define RGBLIGHT_SAT_STEP 8
 // #define RGBLIGHT_VAL_STEP 8
 // #endif
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCING_DELAY 5
@@ -61,6 +61,7 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
@@ -20,15 +20,17 @@
 // This a shortcut to help you visually see your layout.
 // The following is an example using the Planck MIT layout
-// The first section contains all of the arguments
+// The first section contains all of the arguments representing the physical
-// The second converts the arguments into a two-dimensional array
+// layout of the board and position of the keys
 // The second converts the arguments into a two-dimensional array which 
 // represents the switch matrix. 
 #define LAYOUT( \
-    k00, k01, k02, \
+    K00, K01, K02, \
-      k10,  k11   \
+      K10,  K11   \
 ) \
 { \
-    { k00, k01,   k02 }, \
+    { K00, K01,   K02 }, \
-    { k10, KC_NO, k11 }, \
+    { K10, KC_NO, K11 }, \
 }
 #endif
Author	SHA1	Message	Date
Drashna Jaelre	a2b4178245	Make sure 'shutdown_user' is called	2018-08-04 16:49:57 -04:00
Drashna Jaelre	ef5b161bb5	Fix Audio code when resetting keyboard I incorrectly disabled a bunch of code that shouldn't have been disabled. This should only disable music mode stuff, not general audio.	2018-08-04 16:49:57 -04:00
Drashna Jaelre	23d68d0ba1	Make sure Planck light calls user suspend functions (#3568 ) * Make sure Planck light calls user suspend functions * Add suspend.h include to quantum.h for kb/user function compatibility	2018-08-04 16:49:10 -04:00
fauxpark	435a1202e7	More improvements to keycode docs (#3567 ) * Reorder keycode list docs according to HID usage * Add missing keycodes/descriptions/aliases	2018-08-04 09:09:22 -07:00
Xyverz	3e8f272873	Keyboard: LED fixes for Kinesis Stapelberg controller, and keymap changes (#3564 ) * Rules for vitamins_included Added a section to disable RGB underglow for the Let's Split Vitamins Included board. * fixing ortho_4x12 configs * Using upstream/master version instead * Additions and Corrections Corrected the Kinesis/Stapelberg's .c file to allow LEDs to work Removed excess cruft from my Kinesis keymap to reflect this change Other minor tweaks and adjustments to my ortho_4x12 and 5x12 layouts * Updated readme	2018-08-04 09:01:26 -07:00
Olivier Poitrey	f8a915a2db	Keymap: dz60 macos arrow rev2 (#3561 ) * dz60/macos_arrow: move the eject key on esc to leave right cmd+bksp for move to trash * dz60/macos_arrow: move the reset key on the media layer This avoids accidental activation. * dz60/macos_arrow: disable LEDs	2018-08-04 08:50:17 -07:00
MechMerlin	ec26684491	Update templates used for new_project.sh (#3558 )	2018-08-03 10:00:06 -07:00
		`@@ -0,0 +1,2 @@`
							`BACKLIGHT_ENABLE = no`
							`RGBLIGHT_ENABLE = no`