diff options
Diffstat (limited to 'keyboards/jj40/keymaps')
| -rw-r--r-- | keyboards/jj40/keymaps/ajp10304/jj40.h | 70 | ||||
| -rw-r--r-- | keyboards/jj40/keymaps/ajp10304/keymap.c | 28 | ||||
| -rw-r--r-- | keyboards/jj40/keymaps/cockpit/keymap.c | 11 | ||||
| -rw-r--r-- | keyboards/jj40/keymaps/default/keymap.c | 10 | ||||
| -rw-r--r-- | keyboards/jj40/keymaps/fun40/jj40.h | 70 | ||||
| -rw-r--r-- | keyboards/jj40/keymaps/fun40/keymap.c | 13 | ||||
| -rw-r--r-- | keyboards/jj40/keymaps/krusli/keymap.c | 11 | ||||
| -rw-r--r-- | keyboards/jj40/keymaps/oscillope/keymap.c | 3 | ||||
| -rw-r--r-- | keyboards/jj40/keymaps/suzuken/jj40.h | 70 | ||||
| -rw-r--r-- | keyboards/jj40/keymaps/suzuken/keymap.c | 13 | ||||
| -rw-r--r-- | keyboards/jj40/keymaps/waples/jj40.h | 70 | ||||
| -rw-r--r-- | keyboards/jj40/keymaps/waples/keymap.c | 16 |
12 files changed, 46 insertions, 339 deletions
diff --git a/keyboards/jj40/keymaps/ajp10304/jj40.h b/keyboards/jj40/keymaps/ajp10304/jj40.h deleted file mode 100644 index a6162d9c0..000000000 --- a/keyboards/jj40/keymaps/ajp10304/jj40.h +++ /dev/null | |||
| @@ -1,70 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com> | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef KEYMAP_COMMON_H | ||
| 19 | #define KEYMAP_COMMON_H | ||
| 20 | |||
| 21 | #include "quantum.h" | ||
| 22 | // #include "keycode.h" | ||
| 23 | // #include "action.h" | ||
| 24 | |||
| 25 | #define KEYMAP_GRID( \ | ||
| 26 | K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \ | ||
| 27 | K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \ | ||
| 28 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \ | ||
| 29 | K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312 \ | ||
| 30 | ) \ | ||
| 31 | { \ | ||
| 32 | { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \ | ||
| 33 | { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \ | ||
| 34 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 35 | { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \ | ||
| 36 | { K312, K311, K310, K39, K35, K36, K37, K38, K34, K33, K32, K31 } \ | ||
| 37 | } | ||
| 38 | |||
| 39 | #define KEYMAP_MIT( \ | ||
| 40 | K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \ | ||
| 41 | K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \ | ||
| 42 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \ | ||
| 43 | K31, K32, K33, K34, K35, K3X, K38, K39, K310, K311, K312 \ | ||
| 44 | ) \ | ||
| 45 | { \ | ||
| 46 | { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \ | ||
| 47 | { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \ | ||
| 48 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 49 | { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \ | ||
| 50 | { K312, K311, K310, K39, K35, K3X, KC_NO, K38, K34, K33, K32, K31 } \ | ||
| 51 | } | ||
| 52 | |||
| 53 | #define KEYMAP_OFFSET( \ | ||
| 54 | K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \ | ||
| 55 | K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \ | ||
| 56 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \ | ||
| 57 | K31, K32, K33, K34, K35, K36, K3X, K39, K310, K311, K312 \ | ||
| 58 | ) \ | ||
| 59 | { \ | ||
| 60 | { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \ | ||
| 61 | { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \ | ||
| 62 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 63 | { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \ | ||
| 64 | { K312, K311, K310, K39, K35, K36, K3X, KC_NO, K34, K33, K32, K31 } \ | ||
| 65 | } | ||
| 66 | |||
| 67 | #define KEYMAP KEYMAP_GRID | ||
| 68 | #define LAYOUT_ortho_4x12 LAYOUT_planck_grid | ||
| 69 | |||
| 70 | #endif | ||
diff --git a/keyboards/jj40/keymaps/ajp10304/keymap.c b/keyboards/jj40/keymaps/ajp10304/keymap.c index b6d4d7b55..c0d0062c7 100644 --- a/keyboards/jj40/keymaps/ajp10304/keymap.c +++ b/keyboards/jj40/keymaps/ajp10304/keymap.c | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | #include "jj40.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | #include "eeconfig.h" | ||
| 4 | #include "keymap_uk.h" | 2 | #include "keymap_uk.h" |
| 5 | 3 | ||
| 6 | extern keymap_config_t keymap_config; | 4 | extern keymap_config_t keymap_config; |
| @@ -54,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 54 | * | Fn | Ctrl | Alt | GUI |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2 | | 52 | * | Fn | Ctrl | Alt | GUI |Lower | Bksp |Space |Raise | Shift| MENU | Ctrl | Fn2 | |
| 55 | * `-----------------------------------------------------------------------------------' | 53 | * `-----------------------------------------------------------------------------------' |
| 56 | */ | 54 | */ |
| 57 | [_QWERTY] = KEYMAP(\ | 55 | [_QWERTY] = LAYOUT_ortho_4x12(\ |
| 58 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC ,\ | 56 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC ,\ |
| 59 | MT(MOD_LSFT, KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, MT(MOD_RSFT, KC_ENT) ,\ | 57 | MT(MOD_LSFT, KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, MT(MOD_RSFT, KC_ENT) ,\ |
| 60 | KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSHIFT ,\ | 58 | KC_LSHIFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSHIFT ,\ |
| @@ -72,7 +70,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 72 | * | Fn | Ctrl | Alt | GUI |Lower | Bksp |Space |Mouse | MENU | Alt | Ctrl | Fn | | 70 | * | Fn | Ctrl | Alt | GUI |Lower | Bksp |Space |Mouse | MENU | Alt | Ctrl | Fn | |
| 73 | * `-----------------------------------------------------------------------------------' | 71 | * `-----------------------------------------------------------------------------------' |
| 74 | */ | 72 | */ |
| 75 | [_FUNC] = KEYMAP(\ | 73 | [_FUNC] = LAYOUT_ortho_4x12(\ |
| 76 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 ,\ | 74 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12 ,\ |
| 77 | KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, UK_TILD, KC_INSERT ,\ | 75 | KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, UK_TILD, KC_INSERT ,\ |
| 78 | KC_LSHIFT, KC_NONUS_BSLASH, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL, KC_BSLASH, KC_LBRC, KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,\ | 76 | KC_LSHIFT, KC_NONUS_BSLASH, KC_GRAVE, KC_NONUS_HASH, KC_PAST, KC_MINS, KC_EQL, KC_BSLASH, KC_LBRC, KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,\ |
| @@ -90,7 +88,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 90 | * | | | | |Lower | Del |Space | | Next | Vol- | Vol+ | Play | | 88 | * | | | | |Lower | Del |Space | | Next | Vol- | Vol+ | Play | |
| 91 | * `-----------------------------------------------------------------------------------' | 89 | * `-----------------------------------------------------------------------------------' |
| 92 | */ | 90 | */ |
| 93 | [_LOWER] = KEYMAP(\ | 91 | [_LOWER] = LAYOUT_ortho_4x12(\ |
| 94 | KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_BSPC ,\ | 92 | KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, KC_BSPC ,\ |
| 95 | LSFT(KC_1), LSFT(KC_2), LSFT(KC_3), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), LSFT(KC_7), LSFT(KC_8), LSFT(KC_9), LSFT(KC_0), LCTL(KC_DEL), LCTL(KC_BSPC) ,\ | 93 | LSFT(KC_1), LSFT(KC_2), LSFT(KC_3), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), LSFT(KC_7), LSFT(KC_8), LSFT(KC_9), LSFT(KC_0), LCTL(KC_DEL), LCTL(KC_BSPC) ,\ |
| 96 | KC_LSPO, KC_NONUS_BSLASH, KC_GRAVE, KC_NONUS_HASH, KC_QUOT, KC_MINS, KC_EQL, KC_NONUS_HASH, KC_LBRC, KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,\ | 94 | KC_LSPO, KC_NONUS_BSLASH, KC_GRAVE, KC_NONUS_HASH, KC_QUOT, KC_MINS, KC_EQL, KC_NONUS_HASH, KC_LBRC, KC_RBRC, KC_QUOT, MT(MOD_RSFT, KC_ENT) ,\ |
| @@ -108,7 +106,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 108 | * | Mouse| | | | | Alt | Enter|Raise | | | | | | 106 | * | Mouse| | | | | Alt | Enter|Raise | | | | | |
| 109 | * `-----------------------------------------------------------------------------------' | 107 | * `-----------------------------------------------------------------------------------' |
| 110 | */ | 108 | */ |
| 111 | [_RAISE] = KEYMAP(\ | 109 | [_RAISE] = LAYOUT_ortho_4x12(\ |
| 112 | KC_GRV, XXXXXXX, M(1), KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX, KC_PGUP, KC_HOME, KC_PGDOWN, XXXXXXX, KC_PSCREEN ,\ | 110 | KC_GRV, XXXXXXX, M(1), KC_LBRC, KC_RBRC, XXXXXXX, XXXXXXX, KC_PGUP, KC_HOME, KC_PGDOWN, XXXXXXX, KC_PSCREEN ,\ |
| 113 | KC_GRV, XXXXXXX, XXXXXXX, LSFT(KC_9), LSFT(KC_0), XXXXXXX, XXXXXXX, KC_HOME, KC_UP, KC_END, XXXXXXX, LCTL(LSFT(KC_EQL)) ,\ | 111 | KC_GRV, XXXXXXX, XXXXXXX, LSFT(KC_9), LSFT(KC_0), XXXXXXX, XXXXXXX, KC_HOME, KC_UP, KC_END, XXXXXXX, LCTL(LSFT(KC_EQL)) ,\ |
| 114 | _______, XXXXXXX, XXXXXXX, LSFT(KC_LBRC), LSFT(KC_RBRC), XXXXXXX, LCTL(KC_LEFT), KC_LEFT, KC_DOWN, KC_RIGHT, LCTL(KC_RIGHT), LCTL(KC_MINS) ,\ | 112 | _______, XXXXXXX, XXXXXXX, LSFT(KC_LBRC), LSFT(KC_RBRC), XXXXXXX, LCTL(KC_LEFT), KC_LEFT, KC_DOWN, KC_RIGHT, LCTL(KC_RIGHT), LCTL(KC_MINS) ,\ |
| @@ -126,7 +124,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 126 | * | | | | | | | | | | | | | 124 | * | | | | | | | | | | | | |
| 127 | * `-----------------------------------------------------------------------------------' | 125 | * `-----------------------------------------------------------------------------------' |
| 128 | */ | 126 | */ |
| 129 | [_ADJUST] = KEYMAP(\ | 127 | [_ADJUST] = LAYOUT_ortho_4x12(\ |
| 130 | M(0), RESET, QWERTY, BL_ON, BL_OFF, DYN_REC_START1, DYN_REC_START2, _______, _______, _______, _______, KC_DEL ,\ | 128 | M(0), RESET, QWERTY, BL_ON, BL_OFF, DYN_REC_START1, DYN_REC_START2, _______, _______, _______, _______, KC_DEL ,\ |
| 131 | KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, KC_AUDIO_MUTE, KC_AUDIO_VOL_UP, KC_MEDIA_PLAY_PAUSE, _______, _______ ,\ | 129 | KC_CAPS, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, KC_AUDIO_MUTE, KC_AUDIO_VOL_UP, KC_MEDIA_PLAY_PAUSE, _______, _______ ,\ |
| 132 | TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DYN_REC_STOP, DYN_REC_STOP, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK, _______, _______ ,\ | 130 | TG(_MAC), RGB_HUD, RGB_HUI, RGB_SAD, RGB_SAI, DYN_REC_STOP, DYN_REC_STOP, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK, _______, _______ ,\ |
| @@ -144,7 +142,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 144 | * | | | | | | | | | | | | | | 142 | * | | | | | | | | | | | | | |
| 145 | * `-----------------------------------------------------------------------------------' | 143 | * `-----------------------------------------------------------------------------------' |
| 146 | */ | 144 | */ |
| 147 | [_MOUSE] = KEYMAP(\ | 145 | [_MOUSE] = LAYOUT_ortho_4x12(\ |
| 148 | KC_ESC , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ | 146 | KC_ESC , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ |
| 149 | KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, _______, _______,\ | 147 | KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, _______, _______,\ |
| 150 | KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______,\ | 148 | KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2, _______, _______, _______, _______, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT, _______, _______,\ |
| @@ -162,42 +160,42 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 162 | * | | | | | | | | | | | | | | 160 | * | | | | | | | | | | | | | |
| 163 | * `-----------------------------------------------------------------------------------' | 161 | * `-----------------------------------------------------------------------------------' |
| 164 | */ | 162 | */ |
| 165 | [_FUNC2] = KEYMAP(\ | 163 | [_FUNC2] = LAYOUT_ortho_4x12(\ |
| 166 | _______, _______, M(1), _______, _______, _______, M(5), _______, _______, _______, _______, _______,\ | 164 | _______, _______, M(1), _______, _______, _______, M(5), _______, _______, _______, _______, _______,\ |
| 167 | _______, _______, M(3), M(7), _______, _______, _______, M(10), _______, _______, _______, _______,\ | 165 | _______, _______, M(3), M(7), _______, _______, _______, M(10), _______, _______, _______, _______,\ |
| 168 | _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), _______, _______, _______, _______, _______, _______, M(98), \ | 166 | _______, LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), _______, _______, _______, _______, _______, _______, M(98), \ |
| 169 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ | 167 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
| 170 | ), | 168 | ), |
| 171 | 169 | ||
| 172 | [_MAC]= KEYMAP(\ | 170 | [_MAC]= LAYOUT_ortho_4x12(\ |
| 173 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ | 171 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ |
| 174 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ | 172 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ |
| 175 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ | 173 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ |
| 176 | MFNC, _______, _______, _______, MLWR, _______, _______, MRSE, _______, _______, _______, MFNC2 \ | 174 | MFNC, _______, _______, _______, MLWR, _______, _______, MRSE, _______, _______, _______, MFNC2 \ |
| 177 | ), | 175 | ), |
| 178 | 176 | ||
| 179 | [_MLWR] = KEYMAP(\ | 177 | [_MLWR] = LAYOUT_ortho_4x12(\ |
| 180 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ | 178 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ |
| 181 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ | 179 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ |
| 182 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ | 180 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,\ |
| 183 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ | 181 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
| 184 | ), | 182 | ), |
| 185 | 183 | ||
| 186 | [_MRSE] = KEYMAP(\ | 184 | [_MRSE] = LAYOUT_ortho_4x12(\ |
| 187 | _______, _______, M(2), _______, _______, _______, _______, _______, _______, _______, _______, _______ ,\ | 185 | _______, _______, M(2), _______, _______, _______, _______, _______, _______, _______, _______, _______ ,\ |
| 188 | _______, _______, _______, _______, _______, _______, _______, LCTL(KC_A), _______, LCTL(KC_E), _______, LGUI(KC_EQL) ,\ | 186 | _______, _______, _______, _______, _______, _______, _______, LCTL(KC_A), _______, LCTL(KC_E), _______, LGUI(KC_EQL) ,\ |
| 189 | _______, _______, _______, _______, _______, _______, LALT(KC_LEFT), _______, _______, _______, LALT(KC_RIGHT), LGUI(KC_MINS) ,\ | 187 | _______, _______, _______, _______, _______, _______, LALT(KC_LEFT), _______, _______, _______, LALT(KC_RIGHT), LGUI(KC_MINS) ,\ |
| 190 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ | 188 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
| 191 | ), | 189 | ), |
| 192 | 190 | ||
| 193 | [_MFNC]= KEYMAP(\ | 191 | [_MFNC]= LAYOUT_ortho_4x12(\ |
| 194 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,\ | 192 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,\ |
| 195 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LGUI(KC_PENT) ,\ | 193 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LGUI(KC_PENT) ,\ |
| 196 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,\ | 194 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,\ |
| 197 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ | 195 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ |
| 198 | ), | 196 | ), |
| 199 | 197 | ||
| 200 | [_MFNC2] = KEYMAP(\ | 198 | [_MFNC2] = LAYOUT_ortho_4x12(\ |
| 201 | _______, _______, M(2), _______, _______, _______, M(6), _______, _______, _______, _______, _______,\ | 199 | _______, _______, M(2), _______, _______, _______, M(6), _______, _______, _______, _______, _______,\ |
| 202 | _______, _______, M(4), M(8), _______, _______, _______, M(10), _______, _______, _______, _______,\ | 200 | _______, _______, M(4), M(8), _______, _______, _______, M(10), _______, _______, _______, _______,\ |
| 203 | _______, LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), _______, _______, _______, _______, _______, _______, M(99), \ | 201 | _______, LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), _______, _______, _______, _______, _______, _______, M(99), \ |
diff --git a/keyboards/jj40/keymaps/cockpit/keymap.c b/keyboards/jj40/keymaps/cockpit/keymap.c index e8534b63d..02deaaa8e 100644 --- a/keyboards/jj40/keymaps/cockpit/keymap.c +++ b/keyboards/jj40/keymaps/cockpit/keymap.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #include "jj40.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | 2 | ||
| 4 | #define LT_1 RALT(KC_1) | 3 | #define LT_1 RALT(KC_1) |
| 5 | #define LT_2 RALT(KC_2) | 4 | #define LT_2 RALT(KC_2) |
| @@ -64,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 64 | * | Ctrl | Fn | GUI | Alt |Lower | Space |Raise | Left | Down | Up |Right | | 63 | * | Ctrl | Fn | GUI | Alt |Lower | Space |Raise | Left | Down | Up |Right | |
| 65 | * `-----------------------------------------------------------------------------------' | 64 | * `-----------------------------------------------------------------------------------' |
| 66 | */ | 65 | */ |
| 67 | [_QWERTY] = KEYMAP( \ | 66 | [_QWERTY] = LAYOUT_2U_space( \ |
| 68 | KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ | 67 | KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
| 69 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 68 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
| 70 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ | 69 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ |
| @@ -86,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 86 | * | Ctrl | | | Alt |Lower|| Space | | Home | PgDn | PgUp | End | | 85 | * | Ctrl | | | Alt |Lower|| Space | | Home | PgDn | PgUp | End | |
| 87 | * `-----------------------------------------------------------------------------------' | 86 | * `-----------------------------------------------------------------------------------' |
| 88 | */ | 87 | */ |
| 89 | [_LOWER] = KEYMAP( \ | 88 | [_LOWER] = LAYOUT_2U_space( \ |
| 90 | KC_GRV, LT_A_OG, LT_C_CA, LT_E_OG, LT_E_DO, LT_I_OG, LT_S_CA, LT_U_OG, LT_U_MA, LT_Z_CA, KC_MINS, KC_BSPC, \ | 89 | KC_GRV, LT_A_OG, LT_C_CA, LT_E_OG, LT_E_DO, LT_I_OG, LT_S_CA, LT_U_OG, LT_U_MA, LT_Z_CA, KC_MINS, KC_BSPC, \ |
| 91 | KC_TAB, LT_EXLM, LT_AT, LT_HASH, LT_DLR, LT_PERC, LT_CIRC, LT_AMPR, LT_ASTR, KC_LPRN, KC_RPRN, KC_DEL , \ | 90 | KC_TAB, LT_EXLM, LT_AT, LT_HASH, LT_DLR, LT_PERC, LT_CIRC, LT_AMPR, LT_ASTR, KC_LPRN, KC_RPRN, KC_DEL , \ |
| 92 | KC_LSFT, KC_PEQL, KC_PPLS, KC_PMNS, KC_PIPE, KC_LBRC, KC_RBRC, KC_LABK, KC_RABK, KC_LCBR, KC_RCBR, KC_INS , \ | 91 | KC_LSFT, KC_PEQL, KC_PPLS, KC_PMNS, KC_PIPE, KC_LBRC, KC_RBRC, KC_LABK, KC_RABK, KC_LCBR, KC_RCBR, KC_INS , \ |
| @@ -108,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 108 | * | Ctrl | | | Alt | | Space |Raise|| Left | Down | Up |Right | | 107 | * | Ctrl | | | Alt | | Space |Raise|| Left | Down | Up |Right | |
| 109 | * `-----------------------------------------------------------------------------------' | 108 | * `-----------------------------------------------------------------------------------' |
| 110 | */ | 109 | */ |
| 111 | [_RAISE] = KEYMAP( \ | 110 | [_RAISE] = LAYOUT_2U_space( \ |
| 112 | KC_GRV, LT_1, LT_2, LT_3, LT_4, LT_5, LT_6, LT_7, LT_8, LT_9, LT_0, KC_BSPC, \ | 111 | KC_GRV, LT_1, LT_2, LT_3, LT_4, LT_5, LT_6, LT_7, LT_8, LT_9, LT_0, KC_BSPC, \ |
| 113 | KC_TAB, LT_4, LT_5, LT_6, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, \ | 112 | KC_TAB, LT_4, LT_5, LT_6, _______, _______, _______, _______, _______, _______, _______, KC_BSLS, \ |
| 114 | KC_LSFT, LT_7, LT_8, LT_9, LT_0, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ | 113 | KC_LSFT, LT_7, LT_8, LT_9, LT_0, _______, _______, _______, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ |
| @@ -131,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 131 | * | Ctrl |||Fn||| Mode | Alt | | Space |MPrev |MStop |MNext |MPlay | Lock | | 130 | * | Ctrl |||Fn||| Mode | Alt | | Space |MPrev |MStop |MNext |MPlay | Lock | |
| 132 | * `-----------------------------------------------------------------------------------' | 131 | * `-----------------------------------------------------------------------------------' |
| 133 | */ | 132 | */ |
| 134 | [_FUNC] = KEYMAP( \ | 133 | [_FUNC] = LAYOUT_2U_space( \ |
| 135 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ | 134 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
| 136 | KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_BRTG, BL_INC, _______, _______, _______, KC_VOLU, \ | 135 | KC_CAPS, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_BRTG, BL_INC, _______, _______, _______, KC_VOLU, \ |
| 137 | KC_LSFT, KC_CALC, RGB_HUD, RGB_SAD, RGB_VAD, KC_WBAK, KC_WFWD, BL_DEC, _______, _______, KC_PSCR, KC_VOLD, \ | 136 | KC_LSFT, KC_CALC, RGB_HUD, RGB_SAD, RGB_VAD, KC_WBAK, KC_WFWD, BL_DEC, _______, _______, KC_PSCR, KC_VOLD, \ |
diff --git a/keyboards/jj40/keymaps/default/keymap.c b/keyboards/jj40/keymaps/default/keymap.c index 70c73c966..1db887bd0 100644 --- a/keyboards/jj40/keymaps/default/keymap.c +++ b/keyboards/jj40/keymaps/default/keymap.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #include "jj40.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | 2 | |
| 3 | 3 | ||
| 4 | #define _QWERTY 0 | 4 | #define _QWERTY 0 |
| 5 | #define _LOWER 1 | 5 | #define _LOWER 1 |
| @@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 23 | * | | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | | 23 | * | | Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | |
| 24 | * `-----------------------------------------------------------------------------------' | 24 | * `-----------------------------------------------------------------------------------' |
| 25 | */ | 25 | */ |
| 26 | [_QWERTY] = KEYMAP( \ | 26 | [_QWERTY] = LAYOUT_2U_space( \ |
| 27 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ | 27 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
| 28 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 28 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
| 29 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ | 29 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ |
| @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 41 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 41 | * | | | | | | | | Next | Vol- | Vol+ | Play | |
| 42 | * `-----------------------------------------------------------------------------------' | 42 | * `-----------------------------------------------------------------------------------' |
| 43 | */ | 43 | */ |
| 44 | [_LOWER] = KEYMAP( \ | 44 | [_LOWER] = LAYOUT_2U_space( \ |
| 45 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ | 45 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ |
| 46 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ | 46 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ |
| 47 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \ | 47 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),_______, _______, _______, \ |
| @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 59 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 59 | * | | | | | | | | Next | Vol- | Vol+ | Play | |
| 60 | * `-----------------------------------------------------------------------------------' | 60 | * `-----------------------------------------------------------------------------------' |
| 61 | */ | 61 | */ |
| 62 | [_RAISE] = KEYMAP( \ | 62 | [_RAISE] = LAYOUT_2U_space( \ |
| 63 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ | 63 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
| 64 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ | 64 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ |
| 65 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \ | 65 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, _______, _______, _______, \ |
diff --git a/keyboards/jj40/keymaps/fun40/jj40.h b/keyboards/jj40/keymaps/fun40/jj40.h deleted file mode 100644 index a6162d9c0..000000000 --- a/keyboards/jj40/keymaps/fun40/jj40.h +++ /dev/null | |||
| @@ -1,70 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com> | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef KEYMAP_COMMON_H | ||
| 19 | #define KEYMAP_COMMON_H | ||
| 20 | |||
| 21 | #include "quantum.h" | ||
| 22 | // #include "keycode.h" | ||
| 23 | // #include "action.h" | ||
| 24 | |||
| 25 | #define KEYMAP_GRID( \ | ||
| 26 | K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \ | ||
| 27 | K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \ | ||
| 28 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \ | ||
| 29 | K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312 \ | ||
| 30 | ) \ | ||
| 31 | { \ | ||
| 32 | { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \ | ||
| 33 | { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \ | ||
| 34 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 35 | { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \ | ||
| 36 | { K312, K311, K310, K39, K35, K36, K37, K38, K34, K33, K32, K31 } \ | ||
| 37 | } | ||
| 38 | |||
| 39 | #define KEYMAP_MIT( \ | ||
| 40 | K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \ | ||
| 41 | K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \ | ||
| 42 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \ | ||
| 43 | K31, K32, K33, K34, K35, K3X, K38, K39, K310, K311, K312 \ | ||
| 44 | ) \ | ||
| 45 | { \ | ||
| 46 | { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \ | ||
| 47 | { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \ | ||
| 48 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 49 | { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \ | ||
| 50 | { K312, K311, K310, K39, K35, K3X, KC_NO, K38, K34, K33, K32, K31 } \ | ||
| 51 | } | ||
| 52 | |||
| 53 | #define KEYMAP_OFFSET( \ | ||
| 54 | K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \ | ||
| 55 | K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \ | ||
| 56 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \ | ||
| 57 | K31, K32, K33, K34, K35, K36, K3X, K39, K310, K311, K312 \ | ||
| 58 | ) \ | ||
| 59 | { \ | ||
| 60 | { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \ | ||
| 61 | { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \ | ||
| 62 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 63 | { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \ | ||
| 64 | { K312, K311, K310, K39, K35, K36, K3X, KC_NO, K34, K33, K32, K31 } \ | ||
| 65 | } | ||
| 66 | |||
| 67 | #define KEYMAP KEYMAP_GRID | ||
| 68 | #define LAYOUT_ortho_4x12 LAYOUT_planck_grid | ||
| 69 | |||
| 70 | #endif | ||
diff --git a/keyboards/jj40/keymaps/fun40/keymap.c b/keyboards/jj40/keymaps/fun40/keymap.c index d6fcfe7c2..bbe6279e3 100644 --- a/keyboards/jj40/keymaps/fun40/keymap.c +++ b/keyboards/jj40/keymaps/fun40/keymap.c | |||
| @@ -1,9 +1,4 @@ | |||
| 1 | #include "jj40.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | #include "eeconfig.h" | ||
| 4 | #ifdef BACKLIGHT_ENABLE | ||
| 5 | #include "backlight.h" | ||
| 6 | #endif | ||
| 7 | 2 | ||
| 8 | #define _QWERTY 0 | 3 | #define _QWERTY 0 |
| 9 | #define _LOWER 1 | 4 | #define _LOWER 1 |
| @@ -31,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 31 | * | Ctrl | Del | Alt | GUI |Lower | Space|Space |Raise | Left | Down | Up |Right | | 26 | * | Ctrl | Del | Alt | GUI |Lower | Space|Space |Raise | Left | Down | Up |Right | |
| 32 | * `-----------------------------------------------------------------------------------' | 27 | * `-----------------------------------------------------------------------------------' |
| 33 | */ | 28 | */ |
| 34 | [_QWERTY] = KEYMAP( \ | 29 | [_QWERTY] = LAYOUT_ortho_4x12( \ |
| 35 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ | 30 | KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
| 36 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 31 | KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
| 37 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ | 32 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ |
| @@ -49,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 49 | * | Ctrl | nkro | Alt | NKRO |Lower | PgDn | PgUp |Raise | Next | Vol- | Vol+ | Play | | 44 | * | Ctrl | nkro | Alt | NKRO |Lower | PgDn | PgUp |Raise | Next | Vol- | Vol+ | Play | |
| 50 | * `-----------------------------------------------------------------------------------' | 45 | * `-----------------------------------------------------------------------------------' |
| 51 | */ | 46 | */ |
| 52 | [_LOWER] = KEYMAP( \ | 47 | [_LOWER] = LAYOUT_ortho_4x12( \ |
| 53 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, | 48 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6,KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, |
| 54 | KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, \ | 49 | KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, \ |
| 55 | KC_LSFT, KC_PSCR, S(KC_NUHS), S(KC_NUBS), _______, _______, _______, _______, _______, BL_ON, BL_STEP, KC_ENT, \ | 50 | KC_LSFT, KC_PSCR, S(KC_NUHS), S(KC_NUBS), _______, _______, _______, _______, _______, BL_ON, BL_STEP, KC_ENT, \ |
| @@ -67,7 +62,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 67 | * | Ctrl | | Alt | |Lower | | |Raise | 0 | | Home | End | | 62 | * | Ctrl | | Alt | |Lower | | |Raise | 0 | | Home | End | |
| 68 | * `-----------------------------------------------------------------------------------' | 63 | * `-----------------------------------------------------------------------------------' |
| 69 | */ | 64 | */ |
| 70 | [_RAISE] = KEYMAP( \ | 65 | [_RAISE] = LAYOUT_ortho_4x12( \ |
| 71 | KC_CAPS, KC_MINS, KC_PLUS, KC_EQL, KC_LPRN, KC_RPRN, _______, KC_7, KC_8, KC_9, KC_BSPC, KC_DEL, \ | 66 | KC_CAPS, KC_MINS, KC_PLUS, KC_EQL, KC_LPRN, KC_RPRN, _______, KC_7, KC_8, KC_9, KC_BSPC, KC_DEL, \ |
| 72 | KC_LOCK, KC_TILD, KC_UNDS, _______,KC_LBRC, KC_RBRC, _______, KC_4, KC_5, KC_6, _______, _______, \ | 67 | KC_LOCK, KC_TILD, KC_UNDS, _______,KC_LBRC, KC_RBRC, _______, KC_4, KC_5, KC_6, _______, _______, \ |
| 73 | KC_INS, KC_GRV, KC_BSLS, KC_PIPE, KC_LCBR, KC_RCBR, _______, KC_1, KC_2, KC_3, KC_DOT, _______, \ | 68 | KC_INS, KC_GRV, KC_BSLS, KC_PIPE, KC_LCBR, KC_RCBR, _______, KC_1, KC_2, KC_3, KC_DOT, _______, \ |
diff --git a/keyboards/jj40/keymaps/krusli/keymap.c b/keyboards/jj40/keymaps/krusli/keymap.c index 2e6e9a76e..73dd0b287 100644 --- a/keyboards/jj40/keymaps/krusli/keymap.c +++ b/keyboards/jj40/keymaps/krusli/keymap.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #include "jj40.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | 2 | ||
| 4 | #define _QWERTY 0 | 3 | #define _QWERTY 0 |
| 5 | #define _LOWER 1 | 4 | #define _LOWER 1 |
| @@ -36,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 36 | * | | Ctrl | GUI | Alt |Lower | Space |Raise | Left | Down | Up |Right | | 35 | * | | Ctrl | GUI | Alt |Lower | Space |Raise | Left | Down | Up |Right | |
| 37 | * `-----------------------------------------------------------------------------------' | 36 | * `-----------------------------------------------------------------------------------' |
| 38 | */ | 37 | */ |
| 39 | [_QWERTY] = KEYMAP( \ | 38 | [_QWERTY] = LAYOUT_2U_space( \ |
| 40 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ | 39 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
| 41 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 40 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
| 42 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ | 41 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT , \ |
| @@ -54,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 54 | * | | RGB | RGB | RGB | | | Next | Vol- | Vol+ | Play | | | 53 | * | | RGB | RGB | RGB | | | Next | Vol- | Vol+ | Play | | |
| 55 | * `-----------------------------------------------------------------------------------' | 54 | * `-----------------------------------------------------------------------------------' |
| 56 | */ | 55 | */ |
| 57 | [_LOWER] = KEYMAP( \ | 56 | [_LOWER] = LAYOUT_2U_space( \ |
| 58 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ | 57 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ |
| 59 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ | 58 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \ |
| 60 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, _______, \ | 59 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, _______, \ |
| @@ -72,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 72 | * | | Prev | Play | Next | | | | Next | Vol- | Vol+ | Play | | 71 | * | | Prev | Play | Next | | | | Next | Vol- | Vol+ | Play | |
| 73 | * `-----------------------------------------------------------------------------------' | 72 | * `-----------------------------------------------------------------------------------' |
| 74 | */ | 73 | */ |
| 75 | [_RAISE] = KEYMAP( \ | 74 | [_RAISE] = LAYOUT_2U_space( \ |
| 76 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ | 75 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
| 77 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ | 76 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ |
| 78 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_END, KC_PGUP, KC_PGDN, _______, \ | 77 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_HOME, KC_END, KC_PGUP, KC_PGDN, _______, \ |
| @@ -90,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 90 | * |Qwerty| 0 | . | . |Enter |Enter | | | | | | | 89 | * |Qwerty| 0 | . | . |Enter |Enter | | | | | | |
| 91 | * `-----------------------------------------------------------------------------------' | 90 | * `-----------------------------------------------------------------------------------' |
| 92 | */ | 91 | */ |
| 93 | [_NUMPAD] = KEYMAP( \ | 92 | [_NUMPAD] = LAYOUT_2U_space( \ |
| 94 | KC_ESC, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______, \ | 93 | KC_ESC, KC_P7, KC_P8, KC_P9, KC_PAST, KC_PSLS, _______, _______, _______, _______, _______, _______, \ |
| 95 | KC_BSPC, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______, \ | 94 | KC_BSPC, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_PMNS, _______, _______, _______, _______, _______, _______, \ |
| 96 | _______, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______, \ | 95 | _______, KC_P1, KC_P2, KC_P3, KC_PENT, KC_PENT, _______, _______, _______, _______, _______, _______, \ |
diff --git a/keyboards/jj40/keymaps/oscillope/keymap.c b/keyboards/jj40/keymaps/oscillope/keymap.c index d4bca0e49..710fa16f7 100644 --- a/keyboards/jj40/keymaps/oscillope/keymap.c +++ b/keyboards/jj40/keymaps/oscillope/keymap.c | |||
| @@ -15,8 +15,7 @@ You should have received a copy of the GNU General Public License | |||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include "jj40.h" | 18 | #include QMK_KEYBOARD_H |
| 19 | #include "action_layer.h" | ||
| 20 | 19 | ||
| 21 | #ifdef KEYMAP | 20 | #ifdef KEYMAP |
| 22 | #undef KEYMAP | 21 | #undef KEYMAP |
diff --git a/keyboards/jj40/keymaps/suzuken/jj40.h b/keyboards/jj40/keymaps/suzuken/jj40.h deleted file mode 100644 index a6162d9c0..000000000 --- a/keyboards/jj40/keymaps/suzuken/jj40.h +++ /dev/null | |||
| @@ -1,70 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com> | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef KEYMAP_COMMON_H | ||
| 19 | #define KEYMAP_COMMON_H | ||
| 20 | |||
| 21 | #include "quantum.h" | ||
| 22 | // #include "keycode.h" | ||
| 23 | // #include "action.h" | ||
| 24 | |||
| 25 | #define KEYMAP_GRID( \ | ||
| 26 | K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \ | ||
| 27 | K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \ | ||
| 28 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \ | ||
| 29 | K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312 \ | ||
| 30 | ) \ | ||
| 31 | { \ | ||
| 32 | { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \ | ||
| 33 | { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \ | ||
| 34 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 35 | { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \ | ||
| 36 | { K312, K311, K310, K39, K35, K36, K37, K38, K34, K33, K32, K31 } \ | ||
| 37 | } | ||
| 38 | |||
| 39 | #define KEYMAP_MIT( \ | ||
| 40 | K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \ | ||
| 41 | K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \ | ||
| 42 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \ | ||
| 43 | K31, K32, K33, K34, K35, K3X, K38, K39, K310, K311, K312 \ | ||
| 44 | ) \ | ||
| 45 | { \ | ||
| 46 | { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \ | ||
| 47 | { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \ | ||
| 48 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 49 | { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \ | ||
| 50 | { K312, K311, K310, K39, K35, K3X, KC_NO, K38, K34, K33, K32, K31 } \ | ||
| 51 | } | ||
| 52 | |||
| 53 | #define KEYMAP_OFFSET( \ | ||
| 54 | K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \ | ||
| 55 | K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \ | ||
| 56 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \ | ||
| 57 | K31, K32, K33, K34, K35, K36, K3X, K39, K310, K311, K312 \ | ||
| 58 | ) \ | ||
| 59 | { \ | ||
| 60 | { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \ | ||
| 61 | { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \ | ||
| 62 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 63 | { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \ | ||
| 64 | { K312, K311, K310, K39, K35, K36, K3X, KC_NO, K34, K33, K32, K31 } \ | ||
| 65 | } | ||
| 66 | |||
| 67 | #define KEYMAP KEYMAP_GRID | ||
| 68 | #define LAYOUT_ortho_4x12 LAYOUT_planck_grid | ||
| 69 | |||
| 70 | #endif | ||
diff --git a/keyboards/jj40/keymaps/suzuken/keymap.c b/keyboards/jj40/keymaps/suzuken/keymap.c index 10288ac8a..269e26cd7 100644 --- a/keyboards/jj40/keymaps/suzuken/keymap.c +++ b/keyboards/jj40/keymaps/suzuken/keymap.c | |||
| @@ -1,5 +1,4 @@ | |||
| 1 | #include "jj40.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | 2 | ||
| 4 | enum jj40_layers { | 3 | enum jj40_layers { |
| 5 | _QWERTY, | 4 | _QWERTY, |
| @@ -27,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 27 | * | Fn | Ctrl | Alt | GUI |Space |Lower |Raise |Space | Left | Down | Up |Right | | 26 | * | Fn | Ctrl | Alt | GUI |Space |Lower |Raise |Space | Left | Down | Up |Right | |
| 28 | * `-----------------------------------------------------------------------------------' | 27 | * `-----------------------------------------------------------------------------------' |
| 29 | */ | 28 | */ |
| 30 | [_QWERTY] = KEYMAP( \ | 29 | [_QWERTY] = LAYOUT_ortho_4x12( \ |
| 31 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ | 30 | KC_TAB, 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_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \ | 31 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT, \ |
| 33 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, \ | 32 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, \ |
| @@ -45,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 45 | * | | | | | | | | | Next | Vol- | Vol+ | Play | | 44 | * | | | | | | | | | Next | Vol- | Vol+ | Play | |
| 46 | * `-----------------------------------------------------------------------------------' | 45 | * `-----------------------------------------------------------------------------------' |
| 47 | */ | 46 | */ |
| 48 | [_LOWER] = KEYMAP( \ | 47 | [_LOWER] = LAYOUT_ortho_4x12( \ |
| 49 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ | 48 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ |
| 50 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_ENT, \ | 49 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_ENT, \ |
| 51 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, KC_PIPE, \ | 50 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, KC_PIPE, \ |
| @@ -63,13 +62,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 63 | * | | | | | | | | | Next | Vol- | Vol+ | Play | | 62 | * | | | | | | | | | Next | Vol- | Vol+ | Play | |
| 64 | * `-----------------------------------------------------------------------------------' | 63 | * `-----------------------------------------------------------------------------------' |
| 65 | */ | 64 | */ |
| 66 | [_RAISE] = KEYMAP( \ | 65 | [_RAISE] = LAYOUT_ortho_4x12( \ |
| 67 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ | 66 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
| 68 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_ENT, \ | 67 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_ENT, \ |
| 69 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, KC_BSLS, \ | 68 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, KC_BSLS, \ |
| 70 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ | 69 | _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ |
| 71 | ), | 70 | ), |
| 72 | 71 | ||
| 73 | /* Functions | 72 | /* Functions |
| 74 | * Note: Terminal uses Calculator shortcut, change your OS keyboard shortcut appropriately. | 73 | * Note: Terminal uses Calculator shortcut, change your OS keyboard shortcut appropriately. |
| 75 | * ,-----------------------------------------------------------------------------------. | 74 | * ,-----------------------------------------------------------------------------------. |
| @@ -86,7 +85,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 86 | * | |||Fn||| Mode | | | | | | | | | | | 85 | * | |||Fn||| Mode | | | | | | | | | | |
| 87 | * `-----------------------------------------------------------------------------------' | 86 | * `-----------------------------------------------------------------------------------' |
| 88 | */ | 87 | */ |
| 89 | [_FUNC] = KEYMAP( \ | 88 | [_FUNC] = LAYOUT_ortho_4x12( \ |
| 90 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ | 89 | KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, \ |
| 91 | _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_BRTG, BL_INC, _______, _______, _______, KC_VOLU, \ | 90 | _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, BL_TOGG, BL_BRTG, BL_INC, _______, _______, _______, KC_VOLU, \ |
| 92 | _______, KC_CALC, RGB_HUD, RGB_SAD, RGB_VAD, KC_WBAK, KC_WFWD, BL_DEC, _______, _______, KC_PSCR, KC_VOLD, \ | 91 | _______, KC_CALC, RGB_HUD, RGB_SAD, RGB_VAD, KC_WBAK, KC_WFWD, BL_DEC, _______, _______, KC_PSCR, KC_VOLD, \ |
diff --git a/keyboards/jj40/keymaps/waples/jj40.h b/keyboards/jj40/keymaps/waples/jj40.h deleted file mode 100644 index a6162d9c0..000000000 --- a/keyboards/jj40/keymaps/waples/jj40.h +++ /dev/null | |||
| @@ -1,70 +0,0 @@ | |||
| 1 | /* | ||
| 2 | Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com> | ||
| 3 | |||
| 4 | This program is free software: you can redistribute it and/or modify | ||
| 5 | it under the terms of the GNU General Public License as published by | ||
| 6 | the Free Software Foundation, either version 2 of the License, or | ||
| 7 | (at your option) any later version. | ||
| 8 | |||
| 9 | This program is distributed in the hope that it will be useful, | ||
| 10 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | GNU General Public License for more details. | ||
| 13 | |||
| 14 | You should have received a copy of the GNU General Public License | ||
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 16 | */ | ||
| 17 | |||
| 18 | #ifndef KEYMAP_COMMON_H | ||
| 19 | #define KEYMAP_COMMON_H | ||
| 20 | |||
| 21 | #include "quantum.h" | ||
| 22 | // #include "keycode.h" | ||
| 23 | // #include "action.h" | ||
| 24 | |||
| 25 | #define KEYMAP_GRID( \ | ||
| 26 | K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \ | ||
| 27 | K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \ | ||
| 28 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \ | ||
| 29 | K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312 \ | ||
| 30 | ) \ | ||
| 31 | { \ | ||
| 32 | { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \ | ||
| 33 | { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \ | ||
| 34 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 35 | { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \ | ||
| 36 | { K312, K311, K310, K39, K35, K36, K37, K38, K34, K33, K32, K31 } \ | ||
| 37 | } | ||
| 38 | |||
| 39 | #define KEYMAP_MIT( \ | ||
| 40 | K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \ | ||
| 41 | K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \ | ||
| 42 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \ | ||
| 43 | K31, K32, K33, K34, K35, K3X, K38, K39, K310, K311, K312 \ | ||
| 44 | ) \ | ||
| 45 | { \ | ||
| 46 | { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \ | ||
| 47 | { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \ | ||
| 48 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 49 | { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \ | ||
| 50 | { K312, K311, K310, K39, K35, K3X, KC_NO, K38, K34, K33, K32, K31 } \ | ||
| 51 | } | ||
| 52 | |||
| 53 | #define KEYMAP_OFFSET( \ | ||
| 54 | K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, \ | ||
| 55 | K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, \ | ||
| 56 | K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, \ | ||
| 57 | K31, K32, K33, K34, K35, K36, K3X, K39, K310, K311, K312 \ | ||
| 58 | ) \ | ||
| 59 | { \ | ||
| 60 | { K012, K011, K010, K09, K05, K06, K07, K08, K04, K03, K02, K01 }, \ | ||
| 61 | { K112, K111, K110, K19, K15, K16, K17, K18, K14, K13, K12, K11 }, \ | ||
| 62 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
| 63 | { K212, K211, K210, K29, K25, K26, K27, K28, K24, K23, K22, K21 }, \ | ||
| 64 | { K312, K311, K310, K39, K35, K36, K3X, KC_NO, K34, K33, K32, K31 } \ | ||
| 65 | } | ||
| 66 | |||
| 67 | #define KEYMAP KEYMAP_GRID | ||
| 68 | #define LAYOUT_ortho_4x12 LAYOUT_planck_grid | ||
| 69 | |||
| 70 | #endif | ||
diff --git a/keyboards/jj40/keymaps/waples/keymap.c b/keyboards/jj40/keymaps/waples/keymap.c index a8f2f631a..81416f982 100644 --- a/keyboards/jj40/keymaps/waples/keymap.c +++ b/keyboards/jj40/keymaps/waples/keymap.c | |||
| @@ -1,6 +1,4 @@ | |||
| 1 | #include "jj40.h" | 1 | #include QMK_KEYBOARD_H |
| 2 | #include "action_layer.h" | ||
| 3 | #include "eeconfig.h" | ||
| 4 | 2 | ||
| 5 | extern keymap_config_t keymap_config; | 3 | extern keymap_config_t keymap_config; |
| 6 | 4 | ||
| @@ -28,42 +26,42 @@ enum jj40_keycodes { | |||
| 28 | 26 | ||
| 29 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | 27 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { |
| 30 | 28 | ||
| 31 | [_QWERTY] = KEYMAP( \ | 29 | [_QWERTY] = LAYOUT_ortho_4x12( \ |
| 32 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ | 30 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ |
| 33 | CTLESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, SHFTENT, \ | 31 | CTLESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, SHFTENT, \ |
| 34 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, \ | 32 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_QUOT, \ |
| 35 | KC_PSCR, KC_BSPC, KC_LALT, _______, LEFTY, KC_LGUI, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | 33 | KC_PSCR, KC_BSPC, KC_LALT, _______, LEFTY, KC_LGUI, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
| 36 | ), | 34 | ), |
| 37 | 35 | ||
| 38 | [_DVORAK] = KEYMAP( \ | 36 | [_DVORAK] = LAYOUT_ortho_4x12( \ |
| 39 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ | 37 | KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ |
| 40 | CTLESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, SHFTENT, \ | 38 | CTLESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, SHFTENT, \ |
| 41 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_SLSH, \ | 39 | KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_SLSH, \ |
| 42 | KC_PSCR, KC_LGUI, KC_LALT, KC_CAPS, LEFTY, KC_BSPC, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | 40 | KC_PSCR, KC_LGUI, KC_LALT, KC_CAPS, LEFTY, KC_BSPC, KC_SPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
| 43 | ), | 41 | ), |
| 44 | 42 | ||
| 45 | [_GAME] = KEYMAP( \ | 43 | [_GAME] = LAYOUT_ortho_4x12( \ |
| 46 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, _______, _______, _______, _______, _______, QWERTY, \ | 44 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, _______, _______, _______, _______, _______, QWERTY, \ |
| 47 | CTLESC, KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, _______, _______, _______, _______, \ | 45 | CTLESC, KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, _______, _______, _______, _______, \ |
| 48 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, _______, _______, _______, _______, \ | 46 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, _______, _______, _______, _______, _______, _______, \ |
| 49 | KC_LCTL, KC_1, KC_2, KC_3, LEFTY, KC_SPC, KC_BSPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT \ | 47 | KC_LCTL, KC_1, KC_2, KC_3, LEFTY, KC_SPC, KC_BSPC, RIGHTY, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT \ |
| 50 | ), | 48 | ), |
| 51 | 49 | ||
| 52 | [_LEFTY] = KEYMAP( \ | 50 | [_LEFTY] = LAYOUT_ortho_4x12( \ |
| 53 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ | 51 | KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \ |
| 54 | KC_DEL, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, _______, \ | 52 | KC_DEL, _______, _______, _______, _______, _______, _______, KC_LPRN, KC_RPRN, KC_LBRC, KC_RBRC, _______, \ |
| 55 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ | 53 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ |
| 56 | _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END \ | 54 | _______, _______, _______, _______, _______, _______, KC_INS, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END \ |
| 57 | ), | 55 | ), |
| 58 | 56 | ||
| 59 | [_RIGHTY] = KEYMAP( \ | 57 | [_RIGHTY] = LAYOUT_ortho_4x12( \ |
| 60 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ | 58 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
| 61 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, _______, KC_EQL, KC_MINS, KC_BSLS, KC_SLSH, _______, _______, \ | 59 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, _______, KC_EQL, KC_MINS, KC_BSLS, KC_SLSH, _______, _______, \ |
| 62 | _______, KC_F5, KC_F6, KC_F7, KC_F8, _______, _______, _______, _______, _______, _______, _______, | 60 | _______, KC_F5, KC_F6, KC_F7, KC_F8, _______, _______, _______, _______, _______, _______, _______, |
| 63 | _______, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, _______, _______ \ | 61 | _______, KC_F9, KC_F10, KC_F11, _______, _______, _______, _______, _______, _______, _______, _______ \ |
| 64 | ), | 62 | ), |
| 65 | 63 | ||
| 66 | [_DUAL] = KEYMAP( \ | 64 | [_DUAL] = LAYOUT_ortho_4x12( \ |
| 67 | RESET, _______, _______, _______, _______, QWERTY, GAME, _______, _______, _______, BL_BRTG, RESET, \ | 65 | RESET, _______, _______, _______, _______, QWERTY, GAME, _______, _______, _______, BL_BRTG, RESET, \ |
| 68 | _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, AG_NORM, AG_SWAP, _______, _______, _______, BL_TOGG, _______, \ | 66 | _______, KC_MPRV, KC_MSTP, KC_MPLY, KC_MNXT, AG_NORM, AG_SWAP, _______, _______, _______, BL_TOGG, _______, \ |
| 69 | _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, TG_NKRO, _______, _______, _______, _______, _______, \ | 67 | _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, TG_NKRO, _______, _______, _______, _______, _______, \ |
