Change Command keycode defaults to match corresponding Bootmagic codes (#5078 )

* Change Command keycode defaults to match corresponding Bootmagic codes * Make alternate magic key keycodes consistent * Reflect changes from previous commit in tmk_core/common/command.c * Remove unnecessary MAGIC_KEY_* definitions from keymaps compatible with these changes * Swap E and BSPACE for MAGIC_KEY_EEPROM * Add MAGIC_KEY_EEPROM_CLEAR instead of MAGIC_KEY_EEPROM_ALT * Remove BOOTMAGIC_ENABLE checks around EECONFIG stuff * Update Command descriptions
Move RGBLIGHT_LIMIT_VAL definition from rgblight.c to rgblight.h (#5167 )
2019-02-17 22:23:32 -08:00 · 2019-02-17 19:05:12 -08:00 · 2019-02-17 17:47:01 -08:00 · 2019-02-17 11:33:10 -08:00 · 2019-02-17 08:59:19 -08:00 · 2019-02-17 08:59:19 -08:00
412 changed files with 2257 additions and 1264 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -0,0 +1,26 @@
+---
+BasedOnStyle: Google
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: 'true'
+AlignConsecutiveDeclarations: 'true'
+AlignOperands: 'true'
+AllowAllParametersOfDeclarationOnNextLine: 'false'
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: 'false'
+BinPackArguments: 'true'
+BinPackParameters: 'true'
+ColumnLimit: '1000'
+IndentCaseLabels: 'true'
+IndentPPDirectives: AfterHash
+IndentWidth: '2'
+MaxEmptyLinesToKeep: '1'
+PointerAlignment: Right
+SortIncludes: 'false'
+SpaceBeforeAssignmentOperators: 'true'
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: 'false'
+TabWidth: '2'
+UseTab: Never
+
+...
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -91,6 +91,18 @@ int foo(void) {
 }
 ```

+# Auto-formatting with clang-format
+
+[Clang-format](https://clang.llvm.org/docs/ClangFormat.html) is part of LLVM and can automatically format your code for you, because ain't nobody got time to do it manually. We supply a configuration file for it that applies most of the coding conventions listed above. It will only change whitespace and newlines, so you will still have to remember to include optional braces yourself.
+
+Use the [full LLVM installer](http://llvm.org/builds/) to get clang-format on Windows, or use `sudo apt install clang-format` on Ubuntu.
+
+If you run it from the command-line, pass `-style=file` as an option and it will automatically find the .clang-format configuration file in the QMK root directory.
+
+If you use VSCode, the standard C/C++ plugin supports clang-format, alternatively there is a [separate extension](https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.ClangFormat) for it.
+
+Some things (like LAYOUT macros) are destroyed by clang-format, so either don't run it on those files, or wrap the sensitive code in `// clang-format off` and `// clang-format on`.
+
 # General Guidelines

 We have a few different types of changes in QMK, each requiring a different level of rigor. We'd like you to keep the following guidelines in mind no matter what type of change you're making.
--- a/docs/feature_command.md
+++ b/docs/feature_command.md
@@ -29,9 +29,10 @@ If you would like to change the key assignments for Command, `#define` these in
 |`MAGIC_KEY_CONSOLE`                 |`C`                                                                        |Enable the Command console                      |
 |`MAGIC_KEY_VERSION`                 |`V`                                                                        |Print the running QMK version to the console    |
 |`MAGIC_KEY_STATUS`                  |`S`                                                                        |Print the current keyboard status to the console|
-|`MAGIC_KEY_HELP1`                   |`H`                                                                        |Print Command help to the console               |
-|`MAGIC_KEY_HELP2`                   |`SLASH`                                                                    |Print Command help to the console (alternate)   |
+|`MAGIC_KEY_HELP`                    |`H`                                                                        |Print Command help to the console               |
+|`MAGIC_KEY_HELP_ALT`                |`SLASH`                                                                    |Print Command help to the console (alternate)   |
 |`MAGIC_KEY_LAYER0`                  |`0`                                                                        |Make layer 0 the default layer                  |
+|`MAGIC_KEY_LAYER0_ALT`              |`GRAVE`                                                                    |Make layer 0 the default layer (alternate)      |
 |`MAGIC_KEY_LAYER1`                  |`1`                                                                        |Make layer 1 the default layer                  |
 |`MAGIC_KEY_LAYER2`                  |`2`                                                                        |Make layer 2 the default layer                  |
 |`MAGIC_KEY_LAYER3`                  |`3`                                                                        |Make layer 3 the default layer                  |
@@ -41,10 +42,10 @@ If you would like to change the key assignments for Command, `#define` these in
 |`MAGIC_KEY_LAYER7`                  |`7`                                                                        |Make layer 7 the default layer                  |
 |`MAGIC_KEY_LAYER8`                  |`8`                                                                        |Make layer 8 the default layer                  |
 |`MAGIC_KEY_LAYER9`                  |`9`                                                                        |Make layer 9 the default layer                  |
-|`MAGIC_KEY_LAYER0_ALT1`             |`ESC`                                                                      |Make layer 0 the default layer (alternate)      |
-|`MAGIC_KEY_LAYER0_ALT2`             |`GRAVE`                                                                    |Make layer 0 the default layer (alternate)      |
-|`MAGIC_KEY_BOOTLOADER`              |`PAUSE`                                                                    |Enter the bootloader                            |
+|`MAGIC_KEY_BOOTLOADER`              |`B`                                                                        |Jump to bootloader                              |
+|`MAGIC_KEY_BOOTLOADER_ALT`          |`ESC`                                                                      |Jump to bootloader (alternate)                  |
 |`MAGIC_KEY_LOCK`                    |`CAPS`                                                                     |Lock the keyboard so nothing can be typed       |
-|`MAGIC_KEY_EEPROM`                  |`E`                                                                        |Clear the EEPROM                                |
+|`MAGIC_KEY_EEPROM`                  |`E`                                                                        |Print stored EEPROM config to the console       |
+|`MAGIC_KEY_EEPROM_CLEAR`            |`BSPACE`                                                                   |Clear the EEPROM                                |
 |`MAGIC_KEY_NKRO`                    |`N`                                                                        |Toggle N-Key Rollover (NKRO)                    |
 |`MAGIC_KEY_SLEEP_LED`               |`Z`                                                                        |Toggle LED when computer is sleeping            |
--- a/docs/newbs_testing_debugging.md
+++ b/docs/newbs_testing_debugging.md
@@ -15,7 +15,17 @@ Note: These programs are not provided by or endorsed by QMK.

 ## Debugging With QMK Toolbox

-[QMK Toolbox](https://github.com/qmk/qmk_toolbox) will show messages from your keyboard if you have `CONSOLE_ENABLE = yes` in your `rules.mk`. By default the output is very limited, but you can turn on debug mode to increase the amount of debug output. Use the `DEBUG` keycode in your keymap, or use the [Command](feature_command.md) feature to enable debug mode.
+[QMK Toolbox](https://github.com/qmk/qmk_toolbox) will show messages from your keyboard if you have `CONSOLE_ENABLE = yes` in your `rules.mk`. By default the output is very limited, but you can turn on debug mode to increase the amount of debug output. Use the `DEBUG` keycode in your keymap, use the [Command](feature_command.md) feature to enable debug mode, or add the following code to your keymap.
+
+```c
+void keyboard_post_init_user(void) {
+  // Customise these values to desired behaviour
+  debug_enable=true;
+  debug_matrix=true;
+  //debug_keyboard=true;
+  //debug_mouse=true;
+}
+```

 <!-- FIXME: Describe the debugging messages here. -->

--- a/keyboards/amj40/keymaps/default/keymap.c
+++ b/keyboards/amj40/keymaps/default/keymap.c
@@ -21,14 +21,6 @@ enum custom_keycodes {
  ADJUST,
 };

-
-
-
-
-// increase readability 
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        /* Default Layer
     * ,-----------------------------------------------------------.
--- a/keyboards/amj40/keymaps/fabian/keymap.c
+++ b/keyboards/amj40/keymaps/fabian/keymap.c
@@ -50,9 +50,6 @@ enum custom_keycodes {
  EXT_PLV
 };

-#define XXXXXXX KC_NO
-#define _______ KC_TRNS
-
 #define CTL_ESC CTL_T(KC_ESC)  // Tap for Escape, hold for Control
 #define HPR_TAB ALL_T(KC_TAB)  // Tap for Tab, hold for Hyper (Super+Ctrl+Alt+Shift)
 #define MEH_GRV MEH_T(KC_GRV)  // Tap for Backtick, hold for Meh (Ctrl+Alt+Shift)
--- a/keyboards/amj40/keymaps/myee/keymap.c
+++ b/keyboards/amj40/keymaps/myee/keymap.c
@@ -22,10 +22,6 @@ enum custom_keycodes {
  ADJUST,
 };

-// increase readability 
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

    [_QWERTY] = LAYOUT( \
--- a/keyboards/amj60/keymaps/default/keymap.c
+++ b/keyboards/amj60/keymaps/default/keymap.c
@@ -11,10 +11,6 @@
 // dual-role shortcuts
 #define SPACEDUAL LT(_SPC, KC_SPACE)

-
-// increase readability 
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Keymap _DEF: Default Layer
     * ,-----------------------------------------------------------.
--- a/keyboards/amj60/keymaps/iso_split_rshift/keymap.c
+++ b/keyboards/amj60/keymaps/iso_split_rshift/keymap.c
@@ -30,10 +30,6 @@
 #define GER_BRC_L RALT(KC_8)    // [
 #define GER_BRC_R RALT(KC_9)    // ]

-// increase readability 
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Keymap _DEF: Default Layer
     * ,-----------------------------------------------------------.
--- a/keyboards/amj60/keymaps/maximized/keymap.c
+++ b/keyboards/amj60/keymaps/maximized/keymap.c
@@ -11,10 +11,6 @@
 // dual-role shortcuts
 #define SPACEDUAL LT(_SPC, KC_SPACE)

-
-// increase readability 
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Keymap _DEF: Default Layer
     * ,-----------------------------------------------------------.
--- a/keyboards/amjpad/keymaps/default/keymap.c
+++ b/keyboards/amjpad/keymaps/default/keymap.c
@@ -11,8 +11,6 @@
 #define _BL 0
 #define _FL 1

-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Keymap _BL: (Base Layer) Default Layer
   * ,-------------------.
--- a/keyboards/amjpad/keymaps/max/keymap.c
+++ b/keyboards/amjpad/keymaps/max/keymap.c
@@ -14,8 +14,6 @@
 #define _BL 0
 #define _FL 1

-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Keymap _BL: (Base Layer) Default Layer
   * ,-------------------.
--- a/keyboards/amjpad/keymaps/ortho_left/keymap.c
+++ b/keyboards/amjpad/keymaps/ortho_left/keymap.c
@@ -11,8 +11,6 @@
 #define _BL 0
 #define _FL 1

-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Keymap _BL: (Base Layer) Default Layer
   * ,-------------------.
--- a/keyboards/amjpad/keymaps/ortho_right/keymap.c
+++ b/keyboards/amjpad/keymaps/ortho_right/keymap.c
@@ -11,8 +11,6 @@
 #define _BL 0
 #define _FL 1

-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Keymap _BL: (Base Layer) Default Layer
   * ,-------------------.
--- a/keyboards/atom47/keymaps/LEdiodes/keymap.c
+++ b/keyboards/atom47/keymaps/LEdiodes/keymap.c
@@ -6,8 +6,6 @@
 #define _L2 2
 #define _L3 3

-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_L0] = LAYOUT(
  KC_ESC,		KC_Q,		KC_W,		KC_E,		KC_R,		KC_T,		KC_Y,		KC_U,		KC_I,		KC_O,		KC_P,		KC_DEL,		KC_BSPC,	\
--- a/keyboards/atom47/keymaps/default/keymap.c
+++ b/keyboards/atom47/keymaps/default/keymap.c
@@ -10,8 +10,6 @@
 #define _FN1 2 //Fn1
 #define _PN 3 //Pn

-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_MA] = LAYOUT(
  KC_ESC,		KC_Q,		KC_W,		KC_E,		KC_R,		KC_T,		KC_Y,		KC_U,		KC_I,		KC_O,		KC_P,		KC_DEL,		KC_BSPC,	\
--- a/keyboards/atom47/keymaps/maartenwut/keymap.c
+++ b/keyboards/atom47/keymaps/maartenwut/keymap.c
@@ -9,8 +9,6 @@
 #define _LO 1 //FN1
 #define _RA 2 //FN

-#define _______ KC_TRNS
-
 enum custom_keycodes {
    CTRLZ = SAFE_RANGE,
    CTRLX,
--- a/keyboards/atomic/keymaps/default/keymap.c
+++ b/keyboards/atomic/keymaps/default/keymap.c
@@ -1,9 +1,7 @@
 #include QMK_KEYBOARD_H

 // Fillers to make layering more clear
-#define _______ KC_TRNS
 #define ___T___ KC_TRNS
-#define XXXXXXX KC_NO

 // Layer shorthand
 #define _QW 0
--- a/keyboards/atomic/keymaps/pvc/keymap.c
+++ b/keyboards/atomic/keymaps/pvc/keymap.c
@@ -104,8 +104,6 @@ enum keyboard_macros {
 #define TG_NKRO             MAGIC_TOGGLE_NKRO
 #define OS_SHFT             KC_FN0

-#define _______             KC_TRNS
-#define XXXXXXX             KC_NO
 #define ________________    _______, _______
 #define XXXXXXXXXXXXXXXX    XXXXXXX, XXXXXXX

@@ -608,4 +606,4 @@ void music_scale_user(void)
 	PLAY_SONG(music_scale);
 }

-#endif /* AUDIO_ENABLE */
+#endif /* AUDIO_ENABLE */
--- a/keyboards/atreus/keymaps/erlandsona/keymap.c
+++ b/keyboards/atreus/keymaps/erlandsona/keymap.c
@@ -11,11 +11,6 @@
 #define NUMS 1
 #define MOUS 2

-// Some quick aliases, just to make it look pretty
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [BASE] = LAYOUT( /* Qwerty */
    KC_Q       , KC_W   , KC_E   , KC_R   ,  KC_T   ,                 KC_Y  ,  KC_U   , KC_I   , KC_O   , KC_P          ,
--- a/keyboards/atreus/keymaps/xk/keymap.c
+++ b/keyboards/atreus/keymaps/xk/keymap.c
@@ -57,9 +57,6 @@ WINSH,
 OSX,
 };

-#define _______     KC_TRNS
-#define XXXXXXX     KC_NO
-
 // action-TAP for key/mod behavior LT(layer, KC)
 #define XK_TAB      LT(_KAMELOC, KC_TAB)
 #define XK_BSP      LT(_KAMELOC, KC_BSPC)
--- a/keyboards/atreus/keymaps/xyverz/keymap.c
+++ b/keyboards/atreus/keymaps/xyverz/keymap.c
@@ -38,10 +38,6 @@ enum planck_keycodes {
 #define ESCTRL CTL_T(KC_ESC)
 #define TABALT ALT_T(KC_TAB)

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Dvorak Layer
 	,----------------------------------.              ,----------------------------------.
--- a/keyboards/atreus/keymaps/yttyx/keymap.c
+++ b/keyboards/atreus/keymaps/yttyx/keymap.c
@@ -9,9 +9,6 @@ enum layers {
  R3            // (momentary)
 };

-#define xxxxxxx    KC_NO
-#define _______    KC_TRNS
-
 // Aliases from replicaJunction's atreus layout
 #define KCX_LST   LSFT(KC_TAB)
 #define KX_COPY   LCTL(KC_C)
@@ -58,7 +55,7 @@ const uint16_t PROGMEM keymaps[][ MATRIX_ROWS ][ MATRIX_COLS ] = {
  [L1] = LAYOUT(
    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,       KC_8,    KC_9,    KC_0,
    KC_TAB,  KC_QUES, KC_EQL,  KC_MINS, KC_UNDS,                   KC_QUOT, LSFT(KC_2), KC_PLUS, KC_ASTR, KC_ENT,
-    KC_ESC,  KC_EXLM, KC_AMPR, xxxxxxx, xxxxxxx,                   _______, _______,    _______, xxxxxxx, _______,
+    KC_ESC,  KC_EXLM, KC_AMPR, XXXXXXX, XXXXXXX,                   _______, _______,    _______, XXXXXXX, _______,
    _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______
  ),

@@ -74,9 +71,9 @@ const uint16_t PROGMEM keymaps[][ MATRIX_ROWS ][ MATRIX_COLS ] = {
  '---------------------------------------------------------------------------'
  */
  [R1] = LAYOUT(
-    KC_LABK, KC_RABK,  KC_LCBR,  KC_RCBR, KX_AT,                     KC_DLR,  KC_HASH,    xxxxxxx,       xxxxxxx, MO(R3),
+    KC_LABK, KC_RABK,  KC_LCBR,  KC_RCBR, KX_AT,                     KC_DLR,  KC_HASH,    XXXXXXX,       XXXXXXX, MO(R3),
    KC_LBRC, KC_RBRC,  KC_LPRN,  KC_RPRN, KC_NUHS,                   KC_QUOT, LSFT(KC_2), LSFT(KC_NUHS), KC_GRV,  KC_CAPS,
-    KC_SLSH, KC_NUBS,  KC_CIRC,  KX_PIPE, KC_PERC,                   _______, _______,    _______,       xxxxxxx, KC_PSCR,
+    KC_SLSH, KC_NUBS,  KC_CIRC,  KX_PIPE, KC_PERC,                   _______, _______,    _______,       XXXXXXX, KC_PSCR,
    _______, _______,  _______,  KC_DEL,  _______, _______, _______, _______, _______,    _______,       _______, _______
  ),

@@ -94,7 +91,7 @@ const uint16_t PROGMEM keymaps[][ MATRIX_ROWS ][ MATRIX_COLS ] = {
  [R2] = LAYOUT(
    KC_F12,  KC_F11,  KC_F10,  KC_F9,  KX_COPY,                   KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_INS, 
    KC_F8,   KC_F7,   KC_F6,   KC_F5,  KX_PAST,                   KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_ENT,
-    KC_F4,   KC_F3,   KC_F2,   KC_F1,  KX_CUT,                    KCX_LST, xxxxxxx, KC_TAB,  xxxxxxx, xxxxxxx, 
+    KC_F4,   KC_F3,   KC_F2,   KC_F1,  KX_CUT,                    KCX_LST, XXXXXXX, KC_TAB,  XXXXXXX, XXXXXXX, 
    _______, _______, _______, KC_DEL, KX_UNDO, _______, _______, _______, _______, _______, _______, KX_WINR
  ),

@@ -110,10 +107,10 @@ const uint16_t PROGMEM keymaps[][ MATRIX_ROWS ][ MATRIX_COLS ] = {
  '---------------------------------------------------------------'
  */
  [R3] = LAYOUT(
-    RESET,   xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,                   xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, _______,
-    xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,                   xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,
-    xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,                   xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, 
-    xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx
+    RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, 
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
  )
 };

--- a/keyboards/atreus62/keymaps/pcewing/keymap.c
+++ b/keyboards/atreus62/keymaps/pcewing/keymap.c
@@ -1,6 +1,5 @@
 #include QMK_KEYBOARD_H

-#define _______ KC_TRNS
 #define FN MO(_FN)
 #define TODO KC_NO

--- a/keyboards/atreus62/keymaps/xyverz/keymap.c
+++ b/keyboards/atreus62/keymaps/xyverz/keymap.c
@@ -63,10 +63,6 @@ enum atreus52_keycodes {
  RAISE
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 // Aliases to make the keymap clearer.
 #define CTL_ENT CTL_T(KC_ENT)

--- a/keyboards/blockey/keymaps/default/keymap.c
+++ b/keyboards/blockey/keymaps/default/keymap.c
@@ -20,11 +20,6 @@
 extern rgblight_config_t rgblight_config;
 #endif

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [0] = LAYOUT(
    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
--- a/keyboards/blockey/keymaps/eucalyn/keymap.c
+++ b/keyboards/blockey/keymaps/eucalyn/keymap.c
@@ -20,11 +20,6 @@
 extern rgblight_config_t rgblight_config;
 #endif

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [0] = LAYOUT(
    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
--- a/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
+++ b/keyboards/bpiphany/kitten_paw/keymaps/ickerwx/keymap.c
@@ -1,8 +1,6 @@
 #include QMK_KEYBOARD_H
 #include "mousekey.h"

-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #undef C
 #undef S
 #define C(kc) LCTL(KC_##kc)
--- a/keyboards/catch22/keymaps/default/keymap.c
+++ b/keyboards/catch22/keymaps/default/keymap.c
@@ -3,8 +3,6 @@
 #define _BASE 0
 #define _FN   1

-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BASE] = LAYOUT( /* Base */
           KC_NLCK, KC_PSLS,  KC_PAST,  KC_BSPC,  \
--- a/keyboards/chimera_ergo/keymaps/default/keymap.c
+++ b/keyboards/chimera_ergo/keymaps/default/keymap.c
@@ -36,10 +36,6 @@ enum chimera_ergo_layers
 #define LONGPRESS_DELAY 150
 //#define LAYER_TOGGLE_DELAY 300

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_QWERTY] = LAYOUT(
--- a/keyboards/christmas_tree/keymaps/default/keymap.c
+++ b/keyboards/christmas_tree/keymaps/default/keymap.c
@@ -28,8 +28,6 @@ enum custom_keycodes {
  BACKLIT
 };

-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  /* Base
@@ -82,4 +80,4 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
      break;
  }
  return true;
-}
+}
--- a/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
+++ b/keyboards/clueboard/66/keymaps/magicmonty/keymap.c
@@ -1,8 +1,5 @@
 #include QMK_KEYBOARD_H

-// Helpful defines
-#define xxxxxxx KC_NO
-
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
@@ -90,19 +87,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED)
  /* Keymap _MI: MIDI layer (Advanced)*/
  [_MI] = LAYOUT(
-    TO_BASE,MI_VEL_1,MI_VEL_2,MI_VEL_3,MI_VEL_4,MI_VEL_5,MI_VEL_6,MI_VEL_7,MI_VEL_8,MI_VEL_9,MI_VEL_10,  MI_CHD,   MI_CHU, xxxxxxx, xxxxxxx,          xxxxxxx,
-    xxxxxxx, xxxxxxx,   MI_Cs,   MI_Ds, xxxxxxx,   MI_Fs,   MI_Gs,   MI_As, xxxxxxx, MI_Cs_1,  MI_Ds_1, xxxxxxx,  MI_Fs_1, xxxxxxx,                   xxxxxxx,
-     MI_MOD,    MI_C,    MI_D,    MI_E,    MI_F,    MI_G,    MI_A,    MI_B,  MI_C_1,  MI_D_1,   MI_E_1,  MI_F_1,   MI_G_1, xxxxxxx,
-     MI_SUS, xxxxxxx, MI_OCTD, MI_OCTU,MI_MODSD,MI_MODSU, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, MI_TRNSD,MI_TRNSU,MI_TRNS_0,  MI_SUS,          xxxxxxx,
-    xxxxxxx, xxxxxxx, xxxxxxx,xxxxxxx,                 MI_ALLOFF, MI_ALLOFF,                   xxxxxxx, xxxxxxx,  xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx),
+    TO_BASE,MI_VEL_1,MI_VEL_2,MI_VEL_3,MI_VEL_4,MI_VEL_5,MI_VEL_6,MI_VEL_7,MI_VEL_8,MI_VEL_9,MI_VEL_10,  MI_CHD,   MI_CHU, XXXXXXX, XXXXXXX,          XXXXXXX,
+    XXXXXXX, XXXXXXX,   MI_Cs,   MI_Ds, XXXXXXX,   MI_Fs,   MI_Gs,   MI_As, XXXXXXX, MI_Cs_1,  MI_Ds_1, XXXXXXX,  MI_Fs_1, XXXXXXX,                   XXXXXXX,
+     MI_MOD,    MI_C,    MI_D,    MI_E,    MI_F,    MI_G,    MI_A,    MI_B,  MI_C_1,  MI_D_1,   MI_E_1,  MI_F_1,   MI_G_1, XXXXXXX,
+     MI_SUS, XXXXXXX, MI_OCTD, MI_OCTU,MI_MODSD,MI_MODSU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MI_TRNSD,MI_TRNSU,MI_TRNS_0,  MI_SUS,          XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX,XXXXXXX,                 MI_ALLOFF, MI_ALLOFF,                   XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
 #elif defined(MIDI_ENABLE) && defined(MIDI_BASIC)
  /* Keymap _MI: MIDI layer (Basic)*/
  [_MI] = LAYOUT(
-    TO_BASE, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,  xxxxxxx, xxxxxxx,  xxxxxxx, xxxxxxx, xxxxxxx,          xxxxxxx,
-    xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,  xxxxxxx, xxxxxxx,  xxxxxxx, xxxxxxx,                   xxxxxxx,
-    xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,  xxxxxxx, xxxxxxx,  xxxxxxx, xxxxxxx,
-    xxxxxxx, xxxxxxx,   MI_ON,  MI_OFF, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,  xxxxxxx, xxxxxxx,  xxxxxxx, xxxxxxx,          xxxxxxx,
-    xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx,                   xxxxxxx, xxxxxxx,                    xxxxxxx, xxxxxxx,  xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx, xxxxxxx),
+    TO_BASE, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,                   XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
+    XXXXXXX, XXXXXXX,   MI_ON,  MI_OFF, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,          XXXXXXX,
+    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX,                    XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
 #endif
 };

--- a/keyboards/clueboard/66/keymaps/smt/keymap.c
+++ b/keyboards/clueboard/66/keymaps/smt/keymap.c
@@ -16,9 +16,6 @@ enum planck_keycodes {
  DVORAK
 };

-// Helpful defines
-#define XXXXXXX KC_NO
-
 // Custom macros
 #define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
 #define HPR_TAB     ALL_T(KC_TAB)               // Tap for Tab, hold for Hyper (Super+Ctrl+Shift+Alt)
--- a/keyboards/clueboard/66/keymaps/xyverz/keymap.c
+++ b/keyboards/clueboard/66/keymaps/xyverz/keymap.c
@@ -24,8 +24,6 @@ enum planck_keycodes {
 };

 // Useful defines
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define MODS_CTRL_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
 #define FN_CAPS     LT(_FL, KC_CAPS)            // Tap for Caps Lock, Hold for Function Layer

--- a/keyboards/comet46/keymaps/default-rgbled/keymap.c
+++ b/keyboards/comet46/keymaps/default-rgbled/keymap.c
@@ -25,9 +25,6 @@ enum custom_keycodes {
  RAISE,
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define LOWER MO(_LOWER)
 #define RAISE MO(_RAISE)

--- a/keyboards/comet46/keymaps/default/keymap.c
+++ b/keyboards/comet46/keymaps/default/keymap.c
@@ -29,9 +29,6 @@ enum custom_keycodes {
  RAISE,
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define LOWER MO(_LOWER)
 #define RAISE MO(_RAISE)

--- a/keyboards/contra/keymaps/dana/keymap.c
+++ b/keyboards/contra/keymaps/dana/keymap.c
@@ -5,10 +5,6 @@

 extern keymap_config_t keymap_config;

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  /* Qwerty
--- a/keyboards/contra/keymaps/ryanm101/keymap.c
+++ b/keyboards/contra/keymaps/ryanm101/keymap.c
@@ -3,9 +3,6 @@

 extern keymap_config_t keymap_config;

-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 // Custom Key Combos
 #define LCKSCR LCTL(LGUI(KC_Q))
 //#define KC_CAD LCTL(LALT(KC_DEL)) // CTL+ALT+DEL (windows)
--- a/keyboards/cospad/keymaps/default/keymap.c
+++ b/keyboards/cospad/keymaps/default/keymap.c
@@ -12,8 +12,6 @@
 #define _BL 0
 #define _FL 1

-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Keymap _BL: (Base Layer) Default Layer
   * ,-------------------.
--- a/keyboards/cospad/keymaps/detrus/keymap.c
+++ b/keyboards/cospad/keymaps/detrus/keymap.c
@@ -6,8 +6,6 @@
 #include "rgblight.h"
 #endif

-#define _______ KC_TRNS
-
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 enum cospad_layers {
 	_QWERTY_LAYER,
--- a/keyboards/cu75/keymaps/default/keymap.c
+++ b/keyboards/cu75/keymaps/default/keymap.c
@@ -1,8 +1,5 @@
 #include QMK_KEYBOARD_H

-//Define a clearer 'transparent' key code
-#define _______ KC_TRNS
-
 enum keymap_layout {
    VANILLA = 0,
    FUNC,
--- a/keyboards/cu75/keymaps/iso/keymap.c
+++ b/keyboards/cu75/keymaps/iso/keymap.c
@@ -1,8 +1,5 @@
 #include QMK_KEYBOARD_H

-//Define a clearer 'transparent' key code
-#define _______ KC_TRNS
-
 enum keymap_layout {
    VANILLA = 0,
    FUNC,
--- a/keyboards/dc01/numpad/keymaps/default/keymap.c
+++ b/keyboards/dc01/numpad/keymaps/default/keymap.c
@@ -15,9 +15,6 @@
 */
 #include QMK_KEYBOARD_H

-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [0] = LAYOUT_numpad_5x4(
    TG(1),   KC_PSLS, KC_PAST, KC_PMNS, \
--- a/keyboards/dc01/numpad/keymaps/ortho_5x4/keymap.c
+++ b/keyboards/dc01/numpad/keymaps/ortho_5x4/keymap.c
@@ -15,9 +15,6 @@
 */
 #include QMK_KEYBOARD_H

-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 enum custom_keycodes {
    KC_P00 = SAFE_RANGE
 };
--- a/keyboards/deltasplit75/keymaps/default/keymap.c
+++ b/keyboards/deltasplit75/keymaps/default/keymap.c
@@ -7,11 +7,6 @@ extern keymap_config_t keymap_config;
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.

-// Fillers to make layering more clear
-
-#define _______ KC_TRNS
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  LAYOUT_v2(
    KC_ESC,  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_INS,  KC_HOME, KC_PGUP,
--- a/keyboards/deltasplit75/keymaps/itsaferbie/keymap.c
+++ b/keyboards/deltasplit75/keymaps/itsaferbie/keymap.c
@@ -7,11 +7,6 @@ extern keymap_config_t keymap_config;
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.

-// Fillers to make layering more clear
-
-#define _______ KC_TRNS
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Layer 0: Default Layer
   *,-----------------------------------------------------------------------.
--- a/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c
+++ b/keyboards/deltasplit75/keymaps/mbsurfer/keymap.c
@@ -9,9 +9,6 @@ extern keymap_config_t keymap_config;
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /* Layer 0: Default Layer
   * ,----------------------------     ----------------------------------------.
--- a/keyboards/deltasplit75/keymaps/protosplit/keymap.c
+++ b/keyboards/deltasplit75/keymaps/protosplit/keymap.c
@@ -7,11 +7,6 @@ extern keymap_config_t keymap_config;
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.

-// Fillers to make layering more clear
-
-#define _______ KC_TRNS
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  LAYOUT_protosplit(
    KC_ESC,  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_INS,  KC_HOME, KC_PGUP,
--- a/keyboards/dichotomy/keymaps/default/keymap.c
+++ b/keyboards/dichotomy/keymaps/default/keymap.c
@@ -40,10 +40,6 @@ enum dichotomy_keycodes
 #define GREEN_BRIGHTNESS 2
 #define BLUE_BRIGHTNESS 2

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_BS] = LAYOUT( /* Base layout, nearly qwerty but with modifications because it's not a full keyboard. Obviously. */
  CK_TE,   KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,           KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
--- a/keyboards/diverge3/keymaps/default/keymap.c
+++ b/keyboards/diverge3/keymaps/default/keymap.c
@@ -95,9 +95,6 @@ enum custom_keycodes {
  PSELF_MACRO
 };

-// Make layer undefined do nothing
-#define _______ KC_TRNS
-
 // Macros
 #define KC_PMAC PAREN_MACRO
 #define KC_AMAC ARROW_MACRO
--- a/keyboards/diverge3/keymaps/workman/keymap.c
+++ b/keyboards/diverge3/keymaps/workman/keymap.c
@@ -22,8 +22,6 @@ extern keymap_config_t keymap_config;
 #define _GAME 1
 #define _RAISE 2

-#define _______ KC_TRNS
-
 #define SHIFT_MOD   MOD_BIT(KC_LSFT)
 #define SPACE_RAISE LT(_RAISE, KC_SPC)
 #define ENT_RAISE   LT(_RAISE, KC_ENT)
@@ -209,4 +207,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        _______, _______, _______,   _______,   _______, _______, BL_BRTG,                         KC_MUTE,   _______,     _______, KC_MPRV, KC_MNXT, KC_MPLY, _______,
        _______, _______, _______,   _______,   _______, _______, BL_TOGG, _______,       _______, _______,   _______,     _______, _______, _______, _______, _______),

-};
+};
--- a/keyboards/dz60/keymaps/LEdiodes/keymap.c
+++ b/keyboards/dz60/keymaps/LEdiodes/keymap.c
@@ -6,8 +6,6 @@
 #define _L3 3
 #define _L4 4

-#define _______ KC_TRNS
-
 enum {
  TD_SPC_ENT = 0,
  TD_KC_LSFT_CAPS,
--- a/keyboards/dz60/keymaps/atlacat/keymap.c
+++ b/keyboards/dz60/keymaps/atlacat/keymap.c
@@ -1,8 +1,5 @@
 #include QMK_KEYBOARD_H

-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 #define RGB_STA RGB_M_P //rgb static
 #define RGB_BRE RGB_M_B //rgb breathe
 #define RGB_RAI RGB_M_R //rgb rainbow
--- a/keyboards/dz60/keymaps/hailbreno/keymap.c
+++ b/keyboards/dz60/keymaps/hailbreno/keymap.c
@@ -8,7 +8,6 @@
 #include QMK_KEYBOARD_H

 #define X KC_NO
-#define _______ KC_TRNS

 extern keymap_config_t keymap_config;

--- a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
+++ b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
@@ -9,11 +9,6 @@

 #include QMK_KEYBOARD_H

-
-// Helpful defines
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 /* 
 * Each layer gets a name for readability.
 * The underscores don't mean anything - you can
--- a/keyboards/dz60/keymaps/iso_uk/keymap.c
+++ b/keyboards/dz60/keymaps/iso_uk/keymap.c
@@ -10,12 +10,6 @@
 #define _CONTROL 2     // Control layer
 #define _CN _CONTROL

-// KEYCODES
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
-#define MO_FN MO(1)
-#define MO_FN MO(1)
 #define MO_FN MO(1)

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
--- a/keyboards/dz60/keymaps/krusli/keymap.c
+++ b/keyboards/dz60/keymaps/krusli/keymap.c
@@ -1,7 +1,5 @@
 #include QMK_KEYBOARD_H

-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

 	LAYOUT(
--- a/keyboards/dz60/keymaps/marianas/keyDefinitions.h
+++ b/keyboards/dz60/keymaps/marianas/keyDefinitions.h
@@ -70,7 +70,6 @@
 #define ____ KC_TRNS
 #define _____ KC_TRNS
 #define ______ KC_TRNS
-#define _______ KC_TRNS
 #define ________ KC_TRNS
 #define ___________ KC_TRNS
 #define _________________ KC_TRNS
--- a/keyboards/dz60/keymaps/n0velty/keymap.c
+++ b/keyboards/dz60/keymaps/n0velty/keymap.c
@@ -1,7 +1,5 @@
 #include QMK_KEYBOARD_H

-#define _______ KC_TRNS //readability
-
 #define _DL 0 //default
 #define _F1 1 //function 1
 #define _F2 2 //function 2
--- a/keyboards/dz60/keymaps/tailcall/keymap.c
+++ b/keyboards/dz60/keymaps/tailcall/keymap.c
@@ -1,8 +1,5 @@
 #include QMK_KEYBOARD_H

-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

    LAYOUT(
--- a/keyboards/eco/keymaps/default/keymap.c
+++ b/keyboards/eco/keymaps/default/keymap.c
@@ -18,10 +18,6 @@ enum eco_keycodes {
  QWERTY = SAFE_RANGE
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 // Defines for task manager and such
 #define CALTDEL LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
--- a/keyboards/eco/keymaps/hexwire/keymap.c
+++ b/keyboards/eco/keymaps/hexwire/keymap.c
@@ -23,8 +23,6 @@ enum eco_keycodes {

 // Fillers to make layering more clear
 #define KC_ KC_TRNS
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO

 #define KC_RST RESET
 #define KC_DBUG DEBUG
--- a/keyboards/eco/keymaps/that_canadian/keymap.c
+++ b/keyboards/eco/keymaps/that_canadian/keymap.c
@@ -25,10 +25,6 @@ enum eco_keycodes {
  RAISE
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 // Defines for task manager and such
 #define CALTDEL LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))
--- a/keyboards/eco/keymaps/xyverz/keymap.c
+++ b/keyboards/eco/keymaps/xyverz/keymap.c
@@ -28,10 +28,6 @@ enum planck_keycodes {
  BACKLIT
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 // Aliases to make reading the keymap easier
 #define GUIBSPC GUI_T(KC_BSPC) // GUI when held, BSPC when tapped.

--- a/keyboards/ergo42/keymaps/biacco-biacco/keymap.c
+++ b/keyboards/ergo42/keymaps/biacco-biacco/keymap.c
@@ -12,10 +12,6 @@ extern keymap_config_t keymap_config;
 #define BMETA 5
 #define BSYMB 6

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

 /* BASE
--- a/keyboards/ergo42/keymaps/biacco-macOS/keymap.c
+++ b/keyboards/ergo42/keymaps/biacco-macOS/keymap.c
@@ -7,10 +7,6 @@ extern keymap_config_t keymap_config;
 #define SYMB 2
 #define GAME 3

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  /* BASE
--- a/keyboards/ergo42/keymaps/biacco-underglow/keymap.c
+++ b/keyboards/ergo42/keymaps/biacco-underglow/keymap.c
@@ -8,10 +8,6 @@ extern keymap_config_t keymap_config;
 #define GAME 3
 #define RGB  4

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 #ifdef RGBLIGHT_ENABLE
 //Following line allows macro to read current RGB settings
 extern rgblight_config_t rgblight_config;
--- a/keyboards/ergo42/keymaps/biacco/keymap.c
+++ b/keyboards/ergo42/keymaps/biacco/keymap.c
@@ -7,10 +7,6 @@ extern keymap_config_t keymap_config;
 #define SYMB 2
 #define GAME 3

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  /* BASE
--- a/keyboards/ergo42/keymaps/default-illustrator/keymap.c
+++ b/keyboards/ergo42/keymaps/default-illustrator/keymap.c
@@ -8,10 +8,6 @@ extern keymap_config_t keymap_config;
 #define GAME 3
 #define ILLUST 4

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  /* BASE
--- a/keyboards/ergo42/keymaps/default-underglow/keymap.c
+++ b/keyboards/ergo42/keymaps/default-underglow/keymap.c
@@ -8,10 +8,6 @@ extern keymap_config_t keymap_config;
 #define GAME 3
 #define RGB  4

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 #ifdef RGBLIGHT_ENABLE
 //Following line allows macro to read current RGB settings
 extern rgblight_config_t rgblight_config;
--- a/keyboards/ergo42/keymaps/default/keymap.c
+++ b/keyboards/ergo42/keymaps/default/keymap.c
@@ -7,10 +7,6 @@ extern keymap_config_t keymap_config;
 #define SYMB 2
 #define GAME 3

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  /* BASE
--- a/keyboards/ergo42/keymaps/hdbx/keymap.c
+++ b/keyboards/ergo42/keymaps/hdbx/keymap.c
@@ -26,9 +26,6 @@ enum custom_keycodes {
 // Use Dynamic macro
 #include "dynamic_macro.h"

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define KC_LOWR LT(_LOWER, KC_MHEN)    // タップで無変換     ホールドでLower
 #define KC_RASE LT(_RAISE, KC_HENK)    // タップで変換       ホールドでRaise
 #define KC_LSLB MT(MOD_LSFT, JP_LBRC)  // タップで[          ホールドで左Shift
--- a/keyboards/ergo42/keymaps/ichi-t/keymap.c
+++ b/keyboards/ergo42/keymaps/ichi-t/keymap.c
@@ -8,10 +8,6 @@ extern keymap_config_t keymap_config;
 #define _CMOVE 3
 #define _WIN 4

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

 /* QWERTY
--- a/keyboards/ergo42/keymaps/yshrsmz/keymap.c
+++ b/keyboards/ergo42/keymaps/yshrsmz/keymap.c
@@ -17,10 +17,6 @@ enum custom_keycodes {
  KANA
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

 /* BASE
--- a/keyboards/ergodash/mini/keymaps/default/keymap.c
+++ b/keyboards/ergodash/mini/keymaps/default/keymap.c
@@ -14,9 +14,6 @@ enum custom_keycodes {
  ADJUST,
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define EISU LALT(KC_GRV)

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
--- a/keyboards/ergodash/rev1/keymaps/default/keymap.c
+++ b/keyboards/ergodash/rev1/keymaps/default/keymap.c
@@ -16,9 +16,6 @@ enum custom_keycodes {
  ADJUST,
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define KC_JPN LALT(KC_GRV)

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
--- a/keyboards/ergodash/rev2/keymaps/default/keymap.c
+++ b/keyboards/ergodash/rev2/keymaps/default/keymap.c
@@ -16,9 +16,6 @@ enum custom_keycodes {
  ADJUST,
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define EISU LALT(KC_GRV)

 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
--- a/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/smurmann/keymap.c
@@ -6,8 +6,6 @@
 #define BASE 0 // default layer
 #define MDIA 1 // media keys

-#define _______ KC_TRNS
-
 enum custom_keycodes {
  PLACEHOLDER = SAFE_RANGE, // can always be here
  EPRM,
--- a/keyboards/ergodox_ez/keymaps/vim/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/vim/keymap.c
@@ -5,7 +5,6 @@
 #include "vim.h"

 #define VERSION_STRING QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION
-#define _______ KC_TRNS
 #define X_____X KC_TRNS
 #define KC_ATM LGUI(LSFT(KC_P))
 #define KC_ATP LGUI(LCTL(KC_P))
--- a/keyboards/ergodox_infinity/keymaps/narze/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/narze/keymap.c
@@ -55,10 +55,6 @@ static uint16_t m_gui_unds_timer;
 static uint16_t m_sft_po_timer;
 static uint16_t m_sft_pc_timer;

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 // Narze : Custom Macros
 #define HPR_ESC ALL_T(KC_ESC)
 #define SFT_ENT SFT_T(KC_ENT)
--- a/keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c
+++ b/keyboards/ergodox_infinity/keymaps/nordic_ergo/keymap.c
@@ -13,8 +13,6 @@
 #define SYMB 2 // symbol layer
 #define MDIA 3 // media keys

-#define _______ KC_TRNS
-
 enum custom_keycodes {
    PLACEHOLDER = SAFE_RANGE, // can always be here
    EPRM,
@@ -272,4 +270,4 @@ void matrix_scan_user(void) {
            // none
            break;
    }   
-};
+};
--- a/keyboards/ergotravel/keymaps/ckofy/keymap.c
+++ b/keyboards/ergotravel/keymaps/ckofy/keymap.c
@@ -31,7 +31,6 @@ enum {
 };

 #define KC_ KC_TRNS
-#define _______ KC_TRNS
 #define KC_XXXX KC_NO

 #define KC_CMK COLEMAK
--- a/keyboards/ergotravel/keymaps/default/keymap.c
+++ b/keyboards/ergotravel/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include QMK_KEYBOARD_H

 extern keymap_config_t keymap_config;

@@ -14,8 +14,6 @@ enum custom_keycodes {
  ADJUST,
 };

-// #define KC_ KC_TRNS
-#define _______ KC_TRNS
 #define CALTDEL LCTL(LALT(KC_DEL))
 #define TSKMGR LCTL(LSFT(KC_ESC))

--- a/keyboards/ergotravel/keymaps/ian/keymap.c
+++ b/keyboards/ergotravel/keymaps/ian/keymap.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include QMK_KEYBOARD_H

 extern keymap_config_t keymap_config;

@@ -10,10 +10,6 @@ enum custom_layers {
    _QWERTY
 };

-
-
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define BASELYR TO(_COLEMAK) // base layer
 #define LOWER MO(_LOWER) // momentary lower layer
 #define RAISE MO(_RAISE) // momentary raise layer
--- a/keyboards/ergotravel/keymaps/jpconstantineau/keymap.c
+++ b/keyboards/ergotravel/keymaps/jpconstantineau/keymap.c
@@ -1,4 +1,4 @@
-#include QMK_KEYBOARD_H
+#include QMK_KEYBOARD_H

 extern keymap_config_t keymap_config;

@@ -15,7 +15,6 @@ enum custom_keycodes {
 };

 #define KC_ KC_TRNS
-#define _______ KC_TRNS

 #define KC_LOWR LOWER
 #define KC_RASE RAISE
--- a/keyboards/ergotravel/keymaps/viet/keymap.c
+++ b/keyboards/ergotravel/keymaps/viet/keymap.c
@@ -1,4 +1,4 @@
-#include "ergotravel.h"
+#include "ergotravel.h"
 #include "action_layer.h"
 #include "eeconfig.h"
 #include "mousekey.h"
@@ -26,7 +26,6 @@ enum custom_keycodes {
 };

 #define KC_ KC_TRNS
-#define _______ KC_TRNS

 #define KC_ADJT MO(_ADJUST)
 #define KC_RST RESET
--- a/keyboards/fleuron/keymaps/default/keymap.c
+++ b/keyboards/fleuron/keymaps/default/keymap.c
@@ -34,9 +34,6 @@ enum custom_keycodes {
 #define _RAISE 2
 */

-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_ortho_6x16(
  /* Qwerty
--- a/keyboards/fleuron/keymaps/dollartacos/keymap.c
+++ b/keyboards/fleuron/keymaps/dollartacos/keymap.c
@@ -34,9 +34,6 @@ enum custom_keycodes {
 #define _RAISE 2
 */

-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_QWERTY] = LAYOUT_fleuron_grid(
  /* Qwerty
--- a/keyboards/fortitude60/keymaps/default/keymap.c
+++ b/keyboards/fortitude60/keymaps/default/keymap.c
@@ -23,9 +23,6 @@ enum custom_keycodes {
  ADJUST,
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 #define LOWER MO(_LOWER)
 #define RAISE MO(_RAISE)

--- a/keyboards/gh60/keymaps/chaser/keymap.c
+++ b/keyboards/gh60/keymaps/chaser/keymap.c
@@ -13,10 +13,6 @@ extern keymap_config_t keymap_config;
 #define _FL 1
 #define _MC 2

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 bool git_duet = false;
 bool backlight_arrows = false;
 bool backlight_gaming = false;
--- a/keyboards/gh60/keymaps/default/keymap.c
+++ b/keyboards/gh60/keymaps/default/keymap.c
@@ -1,8 +1,5 @@
 #include QMK_KEYBOARD_H

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  /* 0: qwerty */
--- a/keyboards/gh60/keymaps/emiilsd/keymap.c
+++ b/keyboards/gh60/keymaps/emiilsd/keymap.c
@@ -15,9 +15,6 @@
 */
 #include QMK_KEYBOARD_H

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  /*
    ISO HHKB layout:
--- a/keyboards/gh60/keymaps/xyverz/keymap.c
+++ b/keyboards/gh60/keymaps/xyverz/keymap.c
@@ -18,10 +18,6 @@ extern keymap_config_t keymap_config;
 #define DVORAK M(_DV)
 #define COLEMAK M(_CM)

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  /*
--- a/keyboards/hadron/ver2/keymaps/default/keymap.c
+++ b/keyboards/hadron/ver2/keymaps/default/keymap.c
@@ -46,9 +46,6 @@ enum macro_keycodes {
  KC_DEMOMACRO,
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 // Custom macros
 #define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
 #define CTL_TTAB    CTL_T(KC_TAB)               // Tap for Esc, hold for Ctrl
@@ -445,4 +442,4 @@ void iota_gfx_task_user(void) {
  matrix_update(&display, &matrix);
 }

-#endif
+#endif
--- a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
+++ b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
@@ -47,9 +47,6 @@ enum macro_keycodes {
  KC_DEMOMACRO,
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 // Custom macros
 #define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
 #define CTL_TTAB    CTL_T(KC_TAB)               // Tap for Esc, hold for Ctrl
--- a/keyboards/hadron/ver3/keymaps/default/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/default/keymap.c
@@ -33,9 +33,6 @@ enum macro_keycodes {
  KC_DEMOMACRO,
 };

-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 // Custom macros
 #define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
 #define CTL_TTAB    CTL_T(KC_TAB)               // Tap for Esc, hold for Ctrl
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/default/keymap.c
@@ -11,10 +11,6 @@ extern keymap_config_t keymap_config;
 #define RAISE MO(_RAISE)
 #define LOWER MO(_LOWER)

-#define _______ KC_TRNS
-
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_QWERTY] = LAYOUT_5x6(
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/impstyle/keymap.c
@@ -12,10 +12,6 @@ extern keymap_config_t keymap_config;
 #define RAISE MO(_RAISE)
 #define LOWER MO(_LOWER)

-#define _______ KC_TRNS
-
-
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {


--- a/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/5x7/keymaps/default/keymap.c
@@ -10,10 +10,6 @@ extern keymap_config_t keymap_config;
 #define _FN     1
 #define _NUMPAD 2

-
-// Fillers to make layering more clear
-#define _______ KC_TRNS
-#define XXXXXXX KC_NO
 // Some basic macros
 #define TASK    LCTL(LSFT(KC_ESC))
 #define TAB_R   LCTL(KC_TAB)
--- a/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/6x6/keymaps/default/keymap.c
@@ -9,8 +9,6 @@ extern keymap_config_t keymap_config;
 #define RAISE MO(_RAISE)
 #define LOWER MO(_LOWER)

-#define _______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

  [_QWERTY] = LAYOUT_6x6(
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Konstantin Đorđević	5cb713148d	Change Command keycode defaults to match corresponding Bootmagic codes (#5078 ) * Change Command keycode defaults to match corresponding Bootmagic codes * Make alternate magic key keycodes consistent * Reflect changes from previous commit in tmk_core/common/command.c * Remove unnecessary MAGIC_KEY_* definitions from keymaps compatible with these changes * Swap E and BSPACE for MAGIC_KEY_EEPROM * Add MAGIC_KEY_EEPROM_CLEAR instead of MAGIC_KEY_EEPROM_ALT * Remove BOOTMAGIC_ENABLE checks around EECONFIG stuff * Update Command descriptions	2019-02-17 22:23:32 -08:00
Konstantin Đorđević	4e2369693f	Move RGBLIGHT_LIMIT_VAL definition from rgblight.c to rgblight.h (#5167 )	2019-02-17 19:05:12 -08:00
zvecr	657d055934	Inital port of xd84 (#5164 ) * Inital port of xd84 * Inital port of xd84 - review comments	2019-02-17 17:47:01 -08:00
Olivia Briggs	278a6c74f3	Add Olivia's TMO50 layout	2019-02-17 11:33:10 -08:00
James Churchill	dc5933aff7	Add clang-format section to contributing.md	2019-02-17 08:59:19 -08:00
James Churchill	ae9439a3f9	Add .clang-format file	2019-02-17 08:59:19 -08:00
rfvizarra	4eb7248401	[Keymap] rfvizarra's custom PK60 layout (#5156 ) * rfvizarra's custom PK60 layout * Update keyboards/playkbtw/pk60/keymaps/rfvizarra/keymap.c Co-Authored-By: rfvizarra <rfvizarra@gmail.com> * Update keyboards/playkbtw/pk60/keymaps/rfvizarra/readme.md Co-Authored-By: rfvizarra <rfvizarra@gmail.com>	2019-02-17 08:44:27 -08:00
QMK Bot	7cbfd8d4a1	convert to unix line-endings [skip ci]	2019-02-17 15:42:49 +00:00
fauxpark	3b2a484a5b	Remove redundant KC_TRNS and KC_NO fillers in remaining keymaps (#5154 )	2019-02-17 07:38:46 -08:00
Thomas Spurden	8911870b45	Add isolike iris layout (#5157 ) Keeps it simple and most keys in a similar position (at least relative to other keys) to a standard ISO layout.	2019-02-17 07:36:50 -08:00
takashiski	feabafd1f4	define new keyboard "Hecomi" (#5147 ) * update pinout for matrix * first commit * include split_common.h * change split_common.h to split_util.h * update config.h * update keymap & config * update * remove K70, add K77 * fixed test keymap * add Layer * define to HHKB pro 2 based keymap * change authoer name * define LAYOUT and LAYOUT_KC * replace from LAYOUT_KC to LAYOUT * change name hecomi_alpha to hecomi/alpha * fixed hecomi_alpha to hecomi/alpha * remove unnecessary files * update readme * add DEFAULT_FOLDER * remove hecomi_alpha because change name to hecomi * remove bad LAYOUT macro * remove IS_COMMAND macro * remove unnecessary RGB options * Update keyboards/hecomi/hecomi.h Co-Authored-By: takashiski <takashiskibb@gmail.com> * Update keyboards/hecomi/hecomi.h Co-Authored-By: takashiski <takashiskibb@gmail.com> * Update keyboards/hecomi/alpha/rules.mk Co-Authored-By: takashiski <takashiskibb@gmail.com> * Update keyboards/hecomi/alpha/rules.mk Co-Authored-By: takashiski <takashiskibb@gmail.com> * Update keyboards/hecomi/hecomi.h Co-Authored-By: takashiski <takashiskibb@gmail.com> * remove endif * update rule.mk with suggestions	2019-02-16 21:44:08 -08:00
QMK Bot	39b5958ae8	convert to unix line-endings [skip ci]	2019-02-17 05:38:26 +00:00
fauxpark	e2d3c92199	Remove redundant KC_TRNS and KC_NO fillers in default keymaps (#5152 )	2019-02-16 21:36:02 -08:00
zvecr	338ca3569a	Add docs on using keyboard_post_init_user to enable debug modes	2019-02-16 21:20:18 -08:00