aboutsummaryrefslogtreecommitdiff
path: root/keyboards/centromere
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/centromere
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/centromere')
-rw-r--r--keyboards/centromere/centromere.h32
-rw-r--r--keyboards/centromere/info.json42
-rw-r--r--keyboards/centromere/keymaps/default/keymap.c6
-rw-r--r--keyboards/centromere/keymaps/default_u2/keymap.c6
-rw-r--r--keyboards/centromere/keymaps/mini/keymap.c32
-rw-r--r--keyboards/centromere/rules.mk2
6 files changed, 88 insertions, 32 deletions
diff --git a/keyboards/centromere/centromere.h b/keyboards/centromere/centromere.h
index d07a53b1a..bf13aa7b0 100644
--- a/keyboards/centromere/centromere.h
+++ b/keyboards/centromere/centromere.h
@@ -28,22 +28,38 @@
28#define set_led_cyan red_led_off; grn_led_on; blu_led_on 28#define set_led_cyan red_led_off; grn_led_on; blu_led_on
29#define set_led_white red_led_on; grn_led_on; blu_led_on 29#define set_led_white red_led_on; grn_led_on; blu_led_on
30 30
31// For readability
32#define ___ KC_NO
31 33
32// This a shortcut to help you visually see your layout. 34// This a shortcut to help you visually see your layout.
33// The first section contains all of the arguments 35// The first section contains all of the arguments
34// The second converts the arguments into a two-dimensional array 36// The second converts the arguments into a two-dimensional array
35#define LAYOUT( \ 37#define LAYOUT_split_3x6_3( \
36 k0a, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0b, \ 38 k0a, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0b, \
37 k1a, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1b,\ 39 k1a, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1b,\
38 k2a, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2b,\ 40 k2a, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2b,\
39 k32, k33, k34, k35, k36, k37 \ 41 k32, k33, k34, k35, k36, k37 \
40) \ 42) \
41 { \ 43 { \
42 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ 44 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
43 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ 45 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
44 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \ 46 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
45 { KC_NO, KC_NO, k32, k33, k34, k35, k36, k37, KC_NO, KC_NO }, \ 47 { ___, ___, k32, k33, k34, k35, k36, k37, ___, ___ }, \
46 { KC_NO, KC_NO, k2a, k1a, k0a, k0b, k1b, k2b, KC_NO, KC_NO } \ 48 { ___, ___, k2a, k1a, k0a, k0b, k1b, k2b, ___, ___ } \
47 } 49 }
48 50
49#define LAYOUT_split_3x6_3 LAYOUT 51#define LAYOUT_split_3x5_3( \
52 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
53 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,\
54 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,\
55 k32, k33, k34, k35, k36, k37 \
56) \
57 { \
58 { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
59 { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
60 { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
61 { ___, ___, k32, k33, k34, k35, k36, k37, ___, ___ }, \
62 { ___, ___, ___, ___, ___, ___, ___, ___, ___, ___ } \
63 }
64
65#define LAYOUT LAYOUT_split_3x6_3
diff --git a/keyboards/centromere/info.json b/keyboards/centromere/info.json
index aa9bcdce1..8fb421313 100644
--- a/keyboards/centromere/info.json
+++ b/keyboards/centromere/info.json
@@ -5,7 +5,7 @@
5 "width": 14, 5 "width": 14,
6 "height": 4, 6 "height": 4,
7 "layouts": { 7 "layouts": {
8 "LAYOUT": { 8 "LAYOUT_split_3x6_3": {
9 "layout": [ 9 "layout": [
10 {"label":"Tab", "x":0, "y":0.25}, 10 {"label":"Tab", "x":0, "y":0.25},
11 {"label":"Q", "x":1, "y":0.25}, 11 {"label":"Q", "x":1, "y":0.25},
@@ -50,6 +50,46 @@
50 {"label":"MO(_NUM)", "x":8.5, "y":3.25}, 50 {"label":"MO(_NUM)", "x":8.5, "y":3.25},
51 {"label":"RAlt", "x":9.5, "y":3.125} 51 {"label":"RAlt", "x":9.5, "y":3.125}
52 ] 52 ]
53 },
54 "LAYOUT_split_3x5_3": {
55 "layout": [
56 {"label":"Q", "x":0, "y":0.25},
57 {"label":"W", "x":1, "y":0.125},
58 {"label":"E", "x":2, "y":0},
59 {"label":"R", "x":3, "y":0.125},
60 {"label":"T", "x":4, "y":0.25},
61 {"label":"Y", "x":7, "y":0.25},
62 {"label":"U", "x":8, "y":0.125},
63 {"label":"I", "x":9, "y":0},
64 {"label":"O", "x":10, "y":0.125},
65 {"label":"P", "x":11, "y":0.25},
66 {"label":"A", "x":0, "y":1.25},
67 {"label":"S", "x":1, "y":1.125},
68 {"label":"D", "x":2, "y":1},
69 {"label":"F", "x":3, "y":1.125},
70 {"label":"G", "x":4, "y":1.25},
71 {"label":"H", "x":7, "y":1.25},
72 {"label":"J", "x":8, "y":1.125},
73 {"label":"K", "x":9, "y":1},
74 {"label":"L", "x":10, "y":1.125},
75 {"label":";", "x":11, "y":1.25},
76 {"label":"Z", "x":0, "y":2.25},
77 {"label":"X", "x":1, "y":2.125},
78 {"label":"C", "x":2, "y":2},
79 {"label":"V", "x":3, "y":2.125},
80 {"label":"B", "x":4, "y":2.25},
81 {"label":"N", "x":7, "y":2.25},
82 {"label":"M", "x":8, "y":2.125},
83 {"label":",", "x":9, "y":2},
84 {"label":".", "x":10, "y":2.125},
85 {"label":"/", "x":11, "y":2.25},
86 {"label":"LGUI", "x":2.5, "y":3.125},
87 {"label":"MO(_FN)", "x":3.5, "y":3.25},
88 {"label":"Space", "x":4.5, "y":3.375},
89 {"label":"Space", "x":6.5, "y":3.375},
90 {"label":"MO(_NUM)", "x":7.5, "y":3.25},
91 {"label":"RAlt", "x":8.5, "y":3.125}
92 ]
53 } 93 }
54 } 94 }
55} 95}
diff --git a/keyboards/centromere/keymaps/default/keymap.c b/keyboards/centromere/keymaps/default/keymap.c
index ca235f61f..6c830ec2c 100644
--- a/keyboards/centromere/keymaps/default/keymap.c
+++ b/keyboards/centromere/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ enum centromere_layers
10 10
11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 11const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
12 12
13 [_STD] = LAYOUT( \ 13 [_STD] = LAYOUT_split_3x6_3( \
14 //,-----------------------------------------------------. ,-----------------------------------------------------. 14 //,-----------------------------------------------------. ,-----------------------------------------------------.
15 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\ 15 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\
16 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 16 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
24 ), 24 ),
25 25
26 26
27 [_NUM] = LAYOUT( \ 27 [_NUM] = LAYOUT_split_3x6_3( \
28 //,-----------------------------------------------------. ,-----------------------------------------------------. 28 //,-----------------------------------------------------. ,-----------------------------------------------------.
29 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,\ 29 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,\
30 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 30 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
36 //`--------------------------' `--------------------------' 36 //`--------------------------' `--------------------------'
37 ), 37 ),
38 38
39 [_FN] = LAYOUT( \ 39 [_FN] = LAYOUT_split_3x6_3( \
40 //,-----------------------------------------------------. ,-----------------------------------------------------. 40 //,-----------------------------------------------------. ,-----------------------------------------------------.
41 KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,\ 41 KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,\
42 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 42 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/centromere/keymaps/default_u2/keymap.c b/keyboards/centromere/keymaps/default_u2/keymap.c
index c704adc58..3a3707a47 100644
--- a/keyboards/centromere/keymaps/default_u2/keymap.c
+++ b/keyboards/centromere/keymaps/default_u2/keymap.c
@@ -9,7 +9,7 @@ enum centromere_layers
9 9
10const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 10const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
11 11
12 [_STD] = LAYOUT( \ 12 [_STD] = LAYOUT_split_3x6_3( \
13 //,-----------------------------------------------------. ,-----------------------------------------------------. 13 //,-----------------------------------------------------. ,-----------------------------------------------------.
14 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\ 14 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\
15 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 15 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
23 ), 23 ),
24 24
25 25
26 [_NUM] = LAYOUT( \ 26 [_NUM] = LAYOUT_split_3x6_3( \
27 //,-----------------------------------------------------. ,-----------------------------------------------------. 27 //,-----------------------------------------------------. ,-----------------------------------------------------.
28 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,\ 28 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,\
29 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 29 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35 //`--------------------------' `--------------------------' 35 //`--------------------------' `--------------------------'
36 ), 36 ),
37 37
38 [_FN] = LAYOUT( \ 38 [_FN] = LAYOUT_split_3x6_3( \
39 //,-----------------------------------------------------. ,-----------------------------------------------------. 39 //,-----------------------------------------------------. ,-----------------------------------------------------.
40 KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,\ 40 KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,\
41 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| 41 //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/centromere/keymaps/mini/keymap.c b/keyboards/centromere/keymaps/mini/keymap.c
index 3d6de56f2..4241e28a3 100644
--- a/keyboards/centromere/keymaps/mini/keymap.c
+++ b/keyboards/centromere/keymaps/mini/keymap.c
@@ -38,10 +38,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
38 * | | | | 38 * | | | |
39 * `------' `------' 39 * `------' `------'
40 */ 40 */
41[_QWERTY] = LAYOUT( 41[_QWERTY] = LAYOUT_split_3x5_3(
42 KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NO, 42 KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
43 KC_NO, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_NO, 43 KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
44 KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, 44 KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
45 KC_LCTL, LOWER, KC_SPC, KC_BSPC, RAISE, OSM(MOD_LSFT) 45 KC_LCTL, LOWER, KC_SPC, KC_BSPC, RAISE, OSM(MOD_LSFT)
46), 46),
47 47
@@ -60,10 +60,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
60 * | | | | 60 * | | | |
61 * `------' `------' 61 * `------' `------'
62 */ 62 */
63[_RAISE] = LAYOUT( 63[_RAISE] = LAYOUT_split_3x5_3(
64 KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO, 64 KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
65 KC_NO, KC_TAB, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_NO, 65 KC_TAB, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC,
66 KC_NO, KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, _______, _______, _______, _______, KC_BSLS, KC_QUOT, KC_NO, 66 KC_LCTL, KC_GRV, KC_LGUI, KC_LALT, _______, _______, _______, _______, KC_BSLS, KC_QUOT,
67 _______, _______, _______, _______, _______, _______ 67 _______, _______, _______, _______, _______, _______
68), 68),
69 69
@@ -82,10 +82,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
82 * | | | | 82 * | | | |
83 * `------' `------' 83 * `------' `------'
84 */ 84 */
85[_LOWER] = LAYOUT( 85[_LOWER] = LAYOUT_split_3x5_3(
86 KC_NO, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_NO, 86 KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
87 KC_NO, KC_ESC, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_NO, 87 KC_ESC, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR,
88 KC_NO, KC_CAPS, KC_TILD, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_DQT, KC_NO, 88 KC_CAPS, KC_TILD, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_DQT,
89 _______, _______, _______, KC_ENT, _______, KC_DEL 89 _______, _______, _______, KC_ENT, _______, KC_DEL
90), 90),
91 91
@@ -104,10 +104,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
104 * | | | | 104 * | | | |
105 * `------' `------' 105 * `------' `------'
106 */ 106 */
107[_ADJUST] = LAYOUT( 107[_ADJUST] = LAYOUT_split_3x5_3(
108 KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO, 108 KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
109 KC_NO, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, TSKMGR, CALTDEL, KC_NO, 109 KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, TSKMGR, CALTDEL,
110 KC_NO, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_NO, 110 RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______,
111 _______, _______, _______, _______, _______, _______ 111 _______, _______, _______, _______, _______, _______
112) 112)
113}; 113};
diff --git a/keyboards/centromere/rules.mk b/keyboards/centromere/rules.mk
index 866c33138..f08f6e6eb 100644
--- a/keyboards/centromere/rules.mk
+++ b/keyboards/centromere/rules.mk
@@ -41,4 +41,4 @@ OPT_DEFS += -DCENTROMERE_PROMICRO
41# # project specific files 41# # project specific files
42SRC = matrix.c 42SRC = matrix.c
43 43
44LAYOUTS = split_3x6_3 44LAYOUTS = split_3x5_3 split_3x6_3
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-01 20:51:54 +0000