diff options
| author | noroadsleft <18669334+noroadsleft@users.noreply.github.com> | 2018-05-25 08:40:36 -0700 |
|---|---|---|
| committer | Drashna Jaelre <drashna@live.com> | 2018-05-25 08:40:36 -0700 |
| commit | 220b5119fa38c73deab194affe65b74073890c8e (patch) | |
| tree | 2c9ef63f2c336fa86aee399b10d4d49231f1760e /keyboards/amj40 | |
| parent | 910c50bca109e998dd3fa0775d73b1030ed4827e (diff) | |
| download | qmk_firmware-220b5119fa38c73deab194affe65b74073890c8e.tar.gz qmk_firmware-220b5119fa38c73deab194affe65b74073890c8e.zip | |
Refactor for AMJ40 (#3047)
Diffstat (limited to 'keyboards/amj40')
| -rwxr-xr-x | keyboards/amj40/amj40.h | 2 | ||||
| -rwxr-xr-x | keyboards/amj40/keymaps/default/keymap.c | 10 | ||||
| -rwxr-xr-x | keyboards/amj40/keymaps/fabian/keymap.c | 18 | ||||
| -rwxr-xr-x | keyboards/amj40/keymaps/jetpacktuxedo/keymap.c | 12 | ||||
| -rw-r--r-- | keyboards/amj40/keymaps/myee/keymap.c | 10 |
5 files changed, 26 insertions, 26 deletions
diff --git a/keyboards/amj40/amj40.h b/keyboards/amj40/amj40.h index ab629cba7..613f3740f 100755 --- a/keyboards/amj40/amj40.h +++ b/keyboards/amj40/amj40.h | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | * | 30 | 31 | 32 | 34 | 35 | 39 | 3A | 3B | | 17 | * | 30 | 31 | 32 | 34 | 35 | 39 | 3A | 3B | |
| 18 | * `-----------------------------------------------------------' | 18 | * `-----------------------------------------------------------' |
| 19 | */ | 19 | */ |
| 20 | #define KEYMAP( \ | 20 | #define LAYOUT( \ |
| 21 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ | 21 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ |
| 22 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1b, \ | 22 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1b, \ |
| 23 | k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ | 23 | k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ |
diff --git a/keyboards/amj40/keymaps/default/keymap.c b/keyboards/amj40/keymaps/default/keymap.c index e4607eae5..c81317b84 100755 --- a/keyboards/amj40/keymaps/default/keymap.c +++ b/keyboards/amj40/keymaps/default/keymap.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | 1 | ||
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | #include "amj40.h" | 4 | #include QMK_KEYBOARD_H |
| 5 | 5 | ||
| 6 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 6 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
| 7 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. | 7 | // The underscores don't mean anything - you can have a layer called STUFF or any other name. |
| @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 41 | * | LCtl | LGui| LAlt| spc fn0 | spc fn1 |fn2|RAlt|RCtl | | 41 | * | LCtl | LGui| LAlt| spc fn0 | spc fn1 |fn2|RAlt|RCtl | |
| 42 | * `-----------------------------------------------------------' | 42 | * `-----------------------------------------------------------' |
| 43 | */ | 43 | */ |
| 44 | [_QWERTY] = KEYMAP( \ | 44 | [_QWERTY] = LAYOUT( \ |
| 45 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\ | 45 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\ |
| 46 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,\ | 46 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,\ |
| 47 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,\ | 47 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,\ |
| @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 59 | * | | | | | | Stop| App| | | 59 | * | | | | | | Stop| App| | |
| 60 | * `-----------------------------------------------------------' | 60 | * `-----------------------------------------------------------' |
| 61 | */ | 61 | */ |
| 62 | [_LOWER] = KEYMAP( \ | 62 | [_LOWER] = LAYOUT( \ |
| 63 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ | 63 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ |
| 64 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ | 64 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ |
| 65 | KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),BL_TOGG, BL_INC, BL_DEC, \ | 65 | KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),BL_TOGG, BL_INC, BL_DEC, \ |
| @@ -77,7 +77,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 77 | * | | | | | | Stop| App| | | 77 | * | | | | | | Stop| App| | |
| 78 | * `-----------------------------------------------------------' | 78 | * `-----------------------------------------------------------' |
| 79 | */ | 79 | */ |
| 80 | [_RAISE] = KEYMAP( \ | 80 | [_RAISE] = LAYOUT( \ |
| 81 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ | 81 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
| 82 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ | 82 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ |
| 83 | KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, KC_DEL, \ | 83 | KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, KC_DEL, \ |
| @@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 95 | * | | | | | | Stop| App| | | 95 | * | | | | | | Stop| App| | |
| 96 | * `-----------------------------------------------------------' | 96 | * `-----------------------------------------------------------' |
| 97 | */ | 97 | */ |
| 98 | [_ADJUST] = KEYMAP( \ | 98 | [_ADJUST] = LAYOUT( \ |
| 99 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ | 99 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ |
| 100 | _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, \ | 100 | _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, _______, _______, _______, _______, \ |
| 101 | _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, \ | 101 | _______, _______, _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, \ |
diff --git a/keyboards/amj40/keymaps/fabian/keymap.c b/keyboards/amj40/keymaps/fabian/keymap.c index 41a128e2b..5055771ff 100755 --- a/keyboards/amj40/keymaps/fabian/keymap.c +++ b/keyboards/amj40/keymaps/fabian/keymap.c | |||
| @@ -13,11 +13,11 @@ | |||
| 13 | * You should have received a copy of the GNU General Public License | 13 | * You should have received a copy of the GNU General Public License |
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 15 | */ | 15 | */ |
| 16 | #include "amj40.h" | 16 | #include QMK_KEYBOARD_H |
| 17 | 17 | ||
| 18 | // Set the custom keymap | 18 | // Set the custom keymap |
| 19 | #undef KEYMAP | 19 | #undef LAYOUT |
| 20 | #define KEYMAP( \ | 20 | #define LAYOUT( \ |
| 21 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ | 21 | k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \ |
| 22 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ | 22 | k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \ |
| 23 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ | 23 | k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ |
| @@ -73,7 +73,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 73 | * | Ctrl | Meh | Alt | GUI | Lower and Space | Raise | GUI |AltGr | Ctrl | | 73 | * | Ctrl | Meh | Alt | GUI | Lower and Space | Raise | GUI |AltGr | Ctrl | |
| 74 | * `-----------------------------------------------------------------------------------' | 74 | * `-----------------------------------------------------------------------------------' |
| 75 | */ | 75 | */ |
| 76 | [_QWERTY] = KEYMAP( \ | 76 | [_QWERTY] = LAYOUT( \ |
| 77 | HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ | 77 | HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
| 78 | CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 78 | CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
| 79 | SFT_BSP, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ | 79 | SFT_BSP, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ |
| @@ -91,7 +91,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 91 | * | Ctrl | Meh | Alt | GUI | Lower and Space | Raise | GUI |AltGr | Ctrl | | 91 | * | Ctrl | Meh | Alt | GUI | Lower and Space | Raise | GUI |AltGr | Ctrl | |
| 92 | * `-----------------------------------------------------------------------------------' | 92 | * `-----------------------------------------------------------------------------------' |
| 93 | */ | 93 | */ |
| 94 | [_COLEMAK] = KEYMAP( \ | 94 | [_COLEMAK] = LAYOUT( \ |
| 95 | HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ | 95 | HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ |
| 96 | CTL_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ | 96 | CTL_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ |
| 97 | SFT_BSP, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ | 97 | SFT_BSP, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ |
| @@ -109,7 +109,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 109 | * | Ctrl | Meh | Alt | GUI | Lower and Space | Raise | GUI |AltGr | Ctrl | | 109 | * | Ctrl | Meh | Alt | GUI | Lower and Space | Raise | GUI |AltGr | Ctrl | |
| 110 | * `-----------------------------------------------------------------------------------' | 110 | * `-----------------------------------------------------------------------------------' |
| 111 | */ | 111 | */ |
| 112 | [_DVORAK] = KEYMAP( \ | 112 | [_DVORAK] = LAYOUT( \ |
| 113 | HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ | 113 | HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ |
| 114 | CTL_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ | 114 | CTL_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ |
| 115 | SFT_BSP, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_ENT, \ | 115 | SFT_BSP, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_ENT, \ |
| @@ -127,7 +127,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 127 | * | | | | | | Next | Vol- | Vol+ | Play | | 127 | * | | | | | | Next | Vol- | Vol+ | Play | |
| 128 | * `-----------------------------------------------------------------------------------' | 128 | * `-----------------------------------------------------------------------------------' |
| 129 | */ | 129 | */ |
| 130 | [_LOWER] = KEYMAP( \ | 130 | [_LOWER] = LAYOUT( \ |
| 131 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ | 131 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ |
| 132 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ | 132 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ |
| 133 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN1, \ | 133 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN1, \ |
| @@ -145,7 +145,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 145 | * | | | | | | Next | Vol- | Vol+ | Play | | 145 | * | | | | | | Next | Vol- | Vol+ | Play | |
| 146 | * `-----------------------------------------------------------------------------------' | 146 | * `-----------------------------------------------------------------------------------' |
| 147 | */ | 147 | */ |
| 148 | [_RAISE] = KEYMAP( \ | 148 | [_RAISE] = LAYOUT( \ |
| 149 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ | 149 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
| 150 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ | 150 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ |
| 151 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BTN2, \ | 151 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_BTN2, \ |
| @@ -163,7 +163,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 163 | * | | | | | | | | | | | 163 | * | | | | | | | | | | |
| 164 | * `-----------------------------------------------------------------------------------' | 164 | * `-----------------------------------------------------------------------------------' |
| 165 | */ | 165 | */ |
| 166 | [_ADJUST] = KEYMAP( \ | 166 | [_ADJUST] = LAYOUT( \ |
| 167 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, RESET, KC_DEL, \ | 167 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, RESET, KC_DEL, \ |
| 168 | _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ | 168 | _______, _______, MU_MOD, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______, \ |
| 169 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ | 169 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, _______, _______, _______, _______, \ |
diff --git a/keyboards/amj40/keymaps/jetpacktuxedo/keymap.c b/keyboards/amj40/keymaps/jetpacktuxedo/keymap.c index 62f4376f5..caf6700bc 100755 --- a/keyboards/amj40/keymaps/jetpacktuxedo/keymap.c +++ b/keyboards/amj40/keymaps/jetpacktuxedo/keymap.c | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | #include "amj40.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | 2 | ||
| 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 4 | // Default Layer | 4 | // Default Layer |
| 5 | [0] = KEYMAP( \ | 5 | [0] = LAYOUT( \ |
| 6 | KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\ | 6 | KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\ |
| 7 | LT(2, KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(2, KC_ENT),\ | 7 | LT(2, KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(2, KC_ENT),\ |
| 8 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MT(MOD_RSFT, KC_SLSH),\ | 8 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, MT(MOD_RSFT, KC_SLSH),\ |
| @@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 10 | ), | 10 | ), |
| 11 | 11 | ||
| 12 | // Number Layer | 12 | // Number Layer |
| 13 | [1] = KEYMAP( \ | 13 | [1] = LAYOUT( \ |
| 14 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ | 14 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
| 15 | KC_TRNS, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, \ | 15 | KC_TRNS, KC_MINS, KC_EQL, KC_SCLN, KC_QUOT, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, \ |
| 16 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, MT(MOD_RSFT, KC_BSLS), \ | 16 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, MT(MOD_RSFT, KC_BSLS), \ |
| @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 18 | ), | 18 | ), |
| 19 | 19 | ||
| 20 | // Shifted Layer | 20 | // Shifted Layer |
| 21 | [2] = KEYMAP( \ | 21 | [2] = LAYOUT( \ |
| 22 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,\ | 22 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,\ |
| 23 | KC_TRNS, KC_UNDS, KC_PLUS, KC_COLN, KC_DQUO, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, \ | 23 | KC_TRNS, KC_UNDS, KC_PLUS, KC_COLN, KC_DQUO, KC_TRNS, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_TRNS, \ |
| 24 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_PIPE, \ | 24 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LCBR, KC_RCBR, KC_PIPE, \ |
| @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 26 | ), | 26 | ), |
| 27 | 27 | ||
| 28 | // Fkey Layer | 28 | // Fkey Layer |
| 29 | [3] = KEYMAP( \ | 29 | [3] = LAYOUT( \ |
| 30 | KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, RESET,\ | 30 | KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, RESET,\ |
| 31 | KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ | 31 | KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ |
| 32 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ | 32 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \ |
| @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 34 | ), | 34 | ), |
| 35 | 35 | ||
| 36 | // Gaming Layer | 36 | // Gaming Layer |
| 37 | [4] = KEYMAP( \ | 37 | [4] = LAYOUT( \ |
| 38 | KC_ESC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,\ | 38 | KC_ESC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, KC_TRNS, KC_TRNS,\ |
| 39 | KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,\ | 39 | KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,\ |
| 40 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\ | 40 | KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\ |
diff --git a/keyboards/amj40/keymaps/myee/keymap.c b/keyboards/amj40/keymaps/myee/keymap.c index b36d6c61e..baddea72d 100644 --- a/keyboards/amj40/keymaps/myee/keymap.c +++ b/keyboards/amj40/keymaps/myee/keymap.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | 1 | ||
| 2 | 2 | ||
| 3 | 3 | ||
| 4 | #include "amj40.h" | 4 | #include QMK_KEYBOARD_H |
| 5 | 5 | ||
| 6 | // Keymap myee | 6 | // Keymap myee |
| 7 | // Each layer gets a name for readability, which is then used in the keymap matrix below. | 7 | // Each layer gets a name for readability, which is then used in the keymap matrix below. |
| @@ -28,28 +28,28 @@ enum custom_keycodes { | |||
| 28 | 28 | ||
| 29 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 29 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 30 | 30 | ||
| 31 | [_QWERTY] = KEYMAP( \ | 31 | [_QWERTY] = LAYOUT( \ |
| 32 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\ | 32 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\ |
| 33 | F(2), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ | 33 | F(2), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ |
| 34 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ | 34 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ |
| 35 | KC_LCTL, KC_LGUI,KC_LALT, F(0), F(1), KC_RGUI,KC_RALT, KC_RCTL \ | 35 | KC_LCTL, KC_LGUI,KC_LALT, F(0), F(1), KC_RGUI,KC_RALT, KC_RCTL \ |
| 36 | ), | 36 | ), |
| 37 | 37 | ||
| 38 | [_LOWER] = KEYMAP( \ | 38 | [_LOWER] = LAYOUT( \ |
| 39 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_UP, KC_MINS, KC_EQL, KC_DEL, \ | 39 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_UP, KC_MINS, KC_EQL, KC_DEL, \ |
| 40 | _______, _______, KC_ASTR, KC_LBRC, KC_RBRC, KC_QUOT, KC_DQUO, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSLS, \ | 40 | _______, _______, KC_ASTR, KC_LBRC, KC_RBRC, KC_QUOT, KC_DQUO, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSLS, \ |
| 41 | _______, _______, _______, KC_LPRN, KC_RPRN, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, _______, \ | 41 | _______, _______, _______, KC_LPRN, KC_RPRN, KC_HOME, KC_PGUP, KC_PGDN, KC_END, _______, _______, \ |
| 42 | _______, _______, _______, _______, _______, _______, _______, _______ \ | 42 | _______, _______, _______, _______, _______, _______, _______, _______ \ |
| 43 | ), | 43 | ), |
| 44 | 44 | ||
| 45 | [_RAISE] = KEYMAP( \ | 45 | [_RAISE] = LAYOUT( \ |
| 46 | KC_GRV, KC_LPRN, KC_RPRN, KC_DQUO, KC_QUOT, KC_SCLN, KC_COLON,KC_UNDS, KC_PLUS, _______, _______, KC_BSPC, \ | 46 | KC_GRV, KC_LPRN, KC_RPRN, KC_DQUO, KC_QUOT, KC_SCLN, KC_COLON,KC_UNDS, KC_PLUS, _______, _______, KC_BSPC, \ |
| 47 | _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ | 47 | _______, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, \ |
| 48 | _______, _______, _______, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______, \ | 48 | _______, _______, _______, KC_LCBR, KC_RCBR, _______, _______, _______, _______, _______, _______, \ |
| 49 | _______, _______, _______, _______, _______, _______, BL_INC, BL_DEC \ | 49 | _______, _______, _______, _______, _______, _______, BL_INC, BL_DEC \ |
| 50 | ), | 50 | ), |
| 51 | 51 | ||
| 52 | [_ADJUST] = KEYMAP( \ | 52 | [_ADJUST] = LAYOUT( \ |
| 53 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ | 53 | _______, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, \ |
| 54 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 54 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 55 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 55 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
