aboutsummaryrefslogtreecommitdiff
path: root/keyboards/suihankey
diff options
context:
space:
mode:
authorDanilo de Klerk <danilodeklerk@gmail.com>2020-08-06 19:36:26 +0200
committerGitHub <noreply@github.com>2020-08-06 10:36:26 -0700
commitc8b721d7c6cf683473bcf3d0af6ec561471b1dcc (patch)
tree380de15fcd2c9ce1047fc3f2cefbeb8684f2a4c4 /keyboards/suihankey
parent60d8d8677aa596120e4f3f0926b93b4d5cc0201a (diff)
downloadqmk_firmware-c8b721d7c6cf683473bcf3d0af6ec561471b1dcc.tar.gz
qmk_firmware-c8b721d7c6cf683473bcf3d0af6ec561471b1dcc.zip
split_3x5_3 layout support (#9624)
* Add split_3x5_3 support to Minidox * Add split_3x5_3 support to Miniaxe * Add LAYOUT_mini to Centromere This layout macro removes the need or KC_NO keycodes in the keymap. * Add split_3x5_3 support to Centromere * Add split_3x5_3 support to suihankey split * Add LAYOUT_mini to centromere/info.json * Add LAYOUT_mini to crkbd * Add split_3x5_3 support to crkbd * Change mini layout names * Rename main layouts for split_3x6_3 keyboards * Use split_3x5_3 macro for remaining keyboards * Update relevant info.json files * Fix suihankey/split/alpha macro * Add layout aliases for suihankey
Diffstat (limited to 'keyboards/suihankey')
-rw-r--r--keyboards/suihankey/split/alpha/alpha.h3
-rw-r--r--keyboards/suihankey/split/info.json2
-rw-r--r--keyboards/suihankey/split/keymaps/default/keymap.c8
-rw-r--r--keyboards/suihankey/split/rev1/rev1.h4
-rw-r--r--keyboards/suihankey/split/rev1/rules.mk1
5 files changed, 11 insertions, 7 deletions
diff --git a/keyboards/suihankey/split/alpha/alpha.h b/keyboards/suihankey/split/alpha/alpha.h
index f14639806..ba93405ec 100644
--- a/keyboards/suihankey/split/alpha/alpha.h
+++ b/keyboards/suihankey/split/alpha/alpha.h
@@ -25,7 +25,7 @@
25 * The second converts the arguments into a two-dimensional array which 25 * The second converts the arguments into a two-dimensional array which
26 * represents the switch matrix. 26 * represents the switch matrix.
27 */ 27 */
28#define LAYOUT( \ 28#define LAYOUT_split_3x5_3( \
29 L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \ 29 L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \
30 L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ 30 L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
31 L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \ 31 L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
@@ -42,3 +42,4 @@
42 { R30, R31, R32 }, \ 42 { R30, R31, R32 }, \
43} 43}
44 44
45#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/suihankey/split/info.json b/keyboards/suihankey/split/info.json
index f50012dd1..e95f2bd9c 100644
--- a/keyboards/suihankey/split/info.json
+++ b/keyboards/suihankey/split/info.json
@@ -5,7 +5,7 @@
5 "width": 13.2, 5 "width": 13.2,
6 "height": 4.85, 6 "height": 4.85,
7 "layouts": { 7 "layouts": {
8 "LAYOUT": { 8 "LAYOUT_split_3x5_3": {
9 "layout": [ 9 "layout": [
10 {"x": 0, "y": 0.375}, 10 {"x": 0, "y": 0.375},
11 {"x": 1, "y": 0.125}, 11 {"x": 1, "y": 0.125},
diff --git a/keyboards/suihankey/split/keymaps/default/keymap.c b/keyboards/suihankey/split/keymaps/default/keymap.c
index 9b8448ac2..e844db9ed 100644
--- a/keyboards/suihankey/split/keymaps/default/keymap.c
+++ b/keyboards/suihankey/split/keymaps/default/keymap.c
@@ -29,25 +29,25 @@ enum layers{
29#define KC_SET_CTRL LT(SETTING,KC_LCTRL) 29#define KC_SET_CTRL LT(SETTING,KC_LCTRL)
30 30
31const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 31const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
32 [BASE] = LAYOUT( /* Base */ 32 [BASE] = LAYOUT_split_3x5_3( /* Base */
33 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 33 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
34 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, 34 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
35 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, 35 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH,
36 KC_SET_CTRL, KC_NUM_ALT, KC_CMD_SP, KC_CMD_ET, KC_BSPC, KC_LSFT 36 KC_SET_CTRL, KC_NUM_ALT, KC_CMD_SP, KC_CMD_ET, KC_BSPC, KC_LSFT
37 ), 37 ),
38 [COMMAND] = LAYOUT( /* Base */ 38 [COMMAND] = LAYOUT_split_3x5_3( /* Base */
39 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, 39 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
40 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, 40 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
41 LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_B), KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH, 41 LCTL(KC_Z), LCTL(KC_X), LCTL(KC_C), LCTL(KC_V), LCTL(KC_B), KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH,
42 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO 42 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
43 ), 43 ),
44 [NUMBER] = LAYOUT( /* Base */ 44 [NUMBER] = LAYOUT_split_3x5_3( /* Base */
45 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_P7, KC_P8, KC_P9, KC_NO, KC_NO, 45 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_P7, KC_P8, KC_P9, KC_NO, KC_NO,
46 KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_P4, KC_P5, KC_P6, KC_NO, KC_NO, 46 KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_P4, KC_P5, KC_P6, KC_NO, KC_NO,
47 KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_NO, KC_NO, 47 KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_NO, KC_NO,
48 KC_NO, KC_NO, KC_NO, KC_P0, KC_PDOT, KC_NO 48 KC_NO, KC_NO, KC_NO, KC_P0, KC_PDOT, KC_NO
49 ), 49 ),
50 [SETTING] = LAYOUT( /* Base */ 50 [SETTING] = LAYOUT_split_3x5_3( /* Base */
51 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 51 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
52 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 52 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
53 KC_NO, KC_NO, KC_NO, KC_NO, RGB_MOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, 53 KC_NO, KC_NO, KC_NO, KC_NO, RGB_MOD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
diff --git a/keyboards/suihankey/split/rev1/rev1.h b/keyboards/suihankey/split/rev1/rev1.h
index bf5468234..98618ba71 100644
--- a/keyboards/suihankey/split/rev1/rev1.h
+++ b/keyboards/suihankey/split/rev1/rev1.h
@@ -25,7 +25,7 @@
25 * The second converts the arguments into a two-dimensional array which 25 * The second converts the arguments into a two-dimensional array which
26 * represents the switch matrix. 26 * represents the switch matrix.
27 */ 27 */
28#define LAYOUT( \ 28#define LAYOUT_split_3x5_3( \
29 L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \ 29 L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \
30 L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ 30 L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
31 L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \ 31 L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
@@ -43,3 +43,5 @@
43 { R03, R13, R23, KC_NO }, \ 43 { R03, R13, R23, KC_NO }, \
44 { R04, R14, R24, KC_NO }, \ 44 { R04, R14, R24, KC_NO }, \
45} 45}
46
47#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/suihankey/split/rev1/rules.mk b/keyboards/suihankey/split/rev1/rules.mk
index 1e3cebb14..d3661099d 100644
--- a/keyboards/suihankey/split/rev1/rules.mk
+++ b/keyboards/suihankey/split/rev1/rules.mk
@@ -1 +1,2 @@
1RGBLIGHT_ENABLE = yes 1RGBLIGHT_ENABLE = yes
2LAYOUTS = split_3x5_3