diff options
-rw-r--r-- | keyboards/planck/keymaps/ishtob/keymap.c | 20 | ||||
-rw-r--r-- | users/ishtob/ishtob.h | 1 |
2 files changed, 10 insertions, 11 deletions
diff --git a/keyboards/planck/keymaps/ishtob/keymap.c b/keyboards/planck/keymaps/ishtob/keymap.c index 082257b89..e036d8a5a 100644 --- a/keyboards/planck/keymaps/ishtob/keymap.c +++ b/keyboards/planck/keymaps/ishtob/keymap.c | |||
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
24 | * | Esc | Caps | Alt | GUI |Lower | Space |Raise |NumLay| RAlt | Men | Del | | 24 | * | Esc | Caps | Alt | GUI |Lower | Space |Raise |NumLay| RAlt | Men | Del | |
25 | * `-----------------------------------------------------------------------------------' | 25 | * `-----------------------------------------------------------------------------------' |
26 | */ | 26 | */ |
27 | [_QWERTY] = LAYOUT_planck_grid( | 27 | [_QWERTY] = LAYOUT_ortho_4x12_wrapper( |
28 | LT_FN(KC_TAB), _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, | 28 | LT_FN(KC_TAB), _________________QWERTY_L1_________________, _________________QWERTY_R1_________________, KC_BSPC, |
29 | KC_LCTL, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, CTL_ENT, | 29 | KC_LCTL, _________________QWERTY_L2_________________, _________________QWERTY_R2_________________, CTL_ENT, |
30 | KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, LT_RAI(KC_MINS), | 30 | KC_LSFT, _________________QWERTY_L3_________________, _________________QWERTY_R3_________________, LT_RAI(KC_MINS), |
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
42 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | | 42 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | |
43 | * `-----------------------------------------------------------------------------------' | 43 | * `-----------------------------------------------------------------------------------' |
44 | */ | 44 | */ |
45 | [_COLEMAK] = LAYOUT_planck_grid( | 45 | [_COLEMAK] = LAYOUT_ortho_4x12_wrapper( |
46 | LT_FN(KC_TAB), _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_BSPC, | 46 | LT_FN(KC_TAB), _________________COLEMAK_L1________________, _________________COLEMAK_R1________________, KC_BSPC, |
47 | KC_LCTL, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_ENT, | 47 | KC_LCTL, _________________COLEMAK_L2________________, _________________COLEMAK_R2________________, KC_ENT, |
48 | KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, LT_RAI(KC_MINS), | 48 | KC_LSFT, _________________COLEMAK_L3________________, _________________COLEMAK_R3________________, LT_RAI(KC_MINS), |
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
60 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | | 60 | * | Brite| Ctrl | Alt | GUI |Lower | Space |Raise | Left | Down | Up |Right | |
61 | * `-----------------------------------------------------------------------------------' | 61 | * `-----------------------------------------------------------------------------------' |
62 | */ | 62 | */ |
63 | [_DVORAK] = LAYOUT_planck_grid( | 63 | [_DVORAK] = LAYOUT_ortho_4x12_wrapper( |
64 | LT_FN(KC_TAB), _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, KC_BSPC, | 64 | LT_FN(KC_TAB), _________________DVORAK_L1_________________, _________________DVORAK_R1_________________, KC_BSPC, |
65 | KC_LCTL, _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, KC_ENT, | 65 | KC_LCTL, _________________DVORAK_L2_________________, _________________DVORAK_R2_________________, KC_ENT, |
66 | KC_LSFT, _________________DVORAK_L3_________________, _________________DVORAK_R3_________________, LT_RAI(KC_MINS), | 66 | KC_LSFT, _________________DVORAK_L3_________________, _________________DVORAK_R3_________________, LT_RAI(KC_MINS), |
@@ -78,7 +78,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
78 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 78 | * | | | | | | | | Next | Vol- | Vol+ | Play | |
79 | * `-----------------------------------------------------------------------------------' | 79 | * `-----------------------------------------------------------------------------------' |
80 | */ | 80 | */ |
81 | [_LOWER] = LAYOUT_planck_grid( | 81 | [_LOWER] = LAYOUT_ortho_4x12_wrapper( |
82 | ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_GRV, KC_BSLS, | 82 | ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_GRV, KC_BSLS, |
83 | _______, __________________LONG_FUNC_LEFT___________________, KC_UNDS, KC_EQL, KC_LBRC, KC_RBRC, KC_PIPE, | 83 | _______, __________________LONG_FUNC_LEFT___________________, KC_UNDS, KC_EQL, KC_LBRC, KC_RBRC, KC_PIPE, |
84 | _______, __________________LONG_FUNC_RIGHT__________________,S(KC_NUHS),S(KC_NUBS),KC_LCBR, KC_RCBR, _______, | 84 | _______, __________________LONG_FUNC_RIGHT__________________,S(KC_NUHS),S(KC_NUBS),KC_LCBR, KC_RCBR, _______, |
@@ -96,7 +96,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
96 | * | | | | | | | 0 | | Left | Down | Right| NumLk| | 96 | * | | | | | | | 0 | | Left | Down | Right| NumLk| |
97 | * `-----------------------------------------------------------------------------------' | 97 | * `-----------------------------------------------------------------------------------' |
98 | */ | 98 | */ |
99 | [_RAISE] = LAYOUT_planck_grid( | 99 | [_RAISE] = LAYOUT_ortho_4x12_wrapper( |
100 | ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_PLUS, KC_BSLS, | 100 | ________________NUMBER_LEFT________________, ________________NUMBER_RIGHT_______________, KC_PLUS, KC_BSLS, |
101 | _______, KC_A, KC_UP, KC_D, KC_PSCR, KC_VOLU, KC_4, KC_5, KC_6, KC_PAST, KC_COLN, KC_QUOT, | 101 | _______, KC_A, KC_UP, KC_D, KC_PSCR, KC_VOLU, KC_4, KC_5, KC_6, KC_PAST, KC_COLN, KC_QUOT, |
102 | _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC__MUTE, KC_VOLD, KC_1, KC_2, KC_3, KC_UP, KC_SLSH, _______, | 102 | _______, KC_LEFT, KC_DOWN, KC_RIGHT,KC__MUTE, KC_VOLD, KC_1, KC_2, KC_3, KC_UP, KC_SLSH, _______, |
@@ -115,7 +115,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
115 | * `-----------------------------------------------------------------------------------' | 115 | * `-----------------------------------------------------------------------------------' |
116 | */ | 116 | */ |
117 | 117 | ||
118 | [_PLOVER] = LAYOUT_planck_grid( | 118 | [_PLOVER] = LAYOUT_ortho_4x12_wrapper( |
119 | KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 , | 119 | KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1, KC_1 , |
120 | XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, | 120 | XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, |
121 | XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, | 121 | XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, |
@@ -133,7 +133,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
133 | * | | | | | | | | Next | Vol- | Vol+ | Play | | 133 | * | | | | | | | | Next | Vol- | Vol+ | Play | |
134 | * `-----------------------------------------------------------------------------------' | 134 | * `-----------------------------------------------------------------------------------' |
135 | */ | 135 | */ |
136 | [_FNLAYER] = LAYOUT_planck_grid( | 136 | [_FNLAYER] = LAYOUT_ortho_4x12_wrapper( |
137 | _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS, | 137 | _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PLUS, |
138 | _______, __________________LONG_FUNC_LEFT___________________, KC_UNDS, KC_EQL, KC_LBRC, KC_RBRC, KC_QUOT, | 138 | _______, __________________LONG_FUNC_LEFT___________________, KC_UNDS, KC_EQL, KC_LBRC, KC_RBRC, KC_QUOT, |
139 | _______, __________________LONG_FUNC_RIGHT__________________,S(KC_NUHS),S(KC_NUBS),KC_LCBR, KC_RCBR, _______, | 139 | _______, __________________LONG_FUNC_RIGHT__________________,S(KC_NUHS),S(KC_NUBS),KC_LCBR, KC_RCBR, _______, |
@@ -151,7 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
151 | * | | | | | | | 0 | . | Exit | Vol- | Vol+ | Play | | 151 | * | | | | | | | 0 | . | Exit | Vol- | Vol+ | Play | |
152 | * `-----------------------------------------------------------------------------------' | 152 | * `-----------------------------------------------------------------------------------' |
153 | */ | 153 | */ |
154 | [_NUMLAY] = LAYOUT_planck_grid( | 154 | [_NUMLAY] = LAYOUT_ortho_4x12_wrapper( |
155 | _______, KC_Q, KC_UP, KC_H, XXXXXXX, XXXXXXX, KC_P7, KC_P8, KC_P9, KC_MINS, KC_PLUS, KC_BSPC, | 155 | _______, KC_Q, KC_UP, KC_H, XXXXXXX, XXXXXXX, KC_P7, KC_P8, KC_P9, KC_MINS, KC_PLUS, KC_BSPC, |
156 | _______, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, KC_P4, KC_P5, KC_P6, KC_PAST, KC_COLN, KC_ENT, | 156 | _______, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX, XXXXXXX, KC_P4, KC_P5, KC_P6, KC_PAST, KC_COLN, KC_ENT, |
157 | _______, KC_Z, KC_X, KC_C, KC_V, XXXXXXX, KC_P1, KC_P2, KC_P3, KC_PDOT, KC_PSLS, _______, | 157 | _______, KC_Z, KC_X, KC_C, KC_V, XXXXXXX, KC_P1, KC_P2, KC_P3, KC_PDOT, KC_PSLS, _______, |
@@ -170,7 +170,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
170 | * `-----------------------------------------------------------------------------------' | 170 | * `-----------------------------------------------------------------------------------' |
171 | */ | 171 | */ |
172 | 172 | ||
173 | [_MOUSECURSOR] = LAYOUT_planck_grid( | 173 | [_MOUSECURSOR] = LAYOUT_ortho_4x12_wrapper( |
174 | KC_ACL0, KC_ACL1, KC_ACL2, M_EMAIL,M_EMAIL2, KC_HOME, KC_PGUP, KC_WH_L, KC_MS_U, KC_WH_R, P_MPASS, P_META, | 174 | KC_ACL0, KC_ACL1, KC_ACL2, M_EMAIL,M_EMAIL2, KC_HOME, KC_PGUP, KC_WH_L, KC_MS_U, KC_WH_R, P_MPASS, P_META, |
175 | _______, XXXXXXX, XXXXXXX, XXXXXXX, O_RTQ6H, KC_END , KC_PGDN, KC_MS_L, KC_MS_D, KC_MS_R, _______, O_DAYRN, | 175 | _______, XXXXXXX, XXXXXXX, XXXXXXX, O_RTQ6H, KC_END , KC_PGDN, KC_MS_L, KC_MS_D, KC_MS_R, _______, O_DAYRN, |
176 | _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5, _______, _______, | 176 | _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5, _______, _______, |
@@ -188,7 +188,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
188 | * | | | | | | | | | | | | | 188 | * | | | | | | | | | | | | |
189 | * `-----------------------------------------------------------------------------------' | 189 | * `-----------------------------------------------------------------------------------' |
190 | */ | 190 | */ |
191 | [_ADJUST] = LAYOUT_planck_grid( | 191 | [_ADJUST] = LAYOUT_ortho_4x12_wrapper( |
192 | DFU, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_DEL, | 192 | DFU, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_DEL, |
193 | _______, MAGIC_TOGGLE_NKRO, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______, | 193 | _______, MAGIC_TOGGLE_NKRO, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, PLOVER, _______, |
194 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, BL_DEC, BL_INC, BL_STEP, BL_TOGG, | 194 | _______, MUV_DE, MUV_IN, MU_ON, MU_OFF, MI_ON, MI_OFF, _______, BL_DEC, BL_INC, BL_STEP, BL_TOGG, |
diff --git a/users/ishtob/ishtob.h b/users/ishtob/ishtob.h index 3e4d4ffbc..ced78a09d 100644 --- a/users/ishtob/ishtob.h +++ b/users/ishtob/ishtob.h | |||
@@ -85,7 +85,6 @@ expanded before being used as arguments to the LAYOUT_xxx macro. | |||
85 | #define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) | 85 | #define KEYMAP_wrapper(...) LAYOUT(__VA_ARGS__) |
86 | #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) | 86 | #define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__) |
87 | #define LAYOUT_ortho_4x12_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__) | 87 | #define LAYOUT_ortho_4x12_wrapper(...) LAYOUT_ortho_4x12(__VA_ARGS__) |
88 | #define LAYOUT_planck_grid(...) LAYOUT_planck_grid(__VA_ARGS__) | ||
89 | 88 | ||
90 | /* | 89 | /* |
91 | Blocks for each of the four major keyboard layouts | 90 | Blocks for each of the four major keyboard layouts |