summaryrefslogtreecommitdiffstats
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)
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 f14639806e..ba93405ecc 100644
--- a/keyboards/suihankey/split/alpha/alpha.h
+++ b/keyboards/suihankey/split/alpha/alpha.h
@@ -25,7 +25,7 @@
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
-#define LAYOUT( \
+#define LAYOUT_split_3x5_3( \
L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \
L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
@@ -42,3 +42,4 @@
{ R30, R31, R32 }, \
}
+#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/suihankey/split/info.json b/keyboards/suihankey/split/info.json
index f50012dd12..e95f2bd9ce 100644
--- a/keyboards/suihankey/split/info.json
+++ b/keyboards/suihankey/split/info.json
@@ -5,7 +5,7 @@
"width": 13.2,
"height": 4.85,
"layouts": {
- "LAYOUT": {
+ "LAYOUT_split_3x5_3": {
"layout": [
{"x": 0, "y": 0.375},
{"x": 1, "y": 0.125},
diff --git a/keyboards/suihankey/split/keymaps/default/keymap.c b/keyboards/suihankey/split/keymaps/default/keymap.c
index 9b8448ac27..e844db9ed5 100644
--- a/keyboards/suihankey/split/keymaps/default/keymap.c
+++ b/keyboards/suihankey/split/keymaps/default/keymap.c
@@ -29,25 +29,25 @@ enum layers{
#define KC_SET_CTRL LT(SETTING,KC_LCTRL)
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [BASE] = LAYOUT( /* Base */
+ [BASE] = LAYOUT_split_3x5_3( /* Base */
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLASH,
KC_SET_CTRL, KC_NUM_ALT, KC_CMD_SP, KC_CMD_ET, KC_BSPC, KC_LSFT
),
- [COMMAND] = LAYOUT( /* Base */
+ [COMMAND] = LAYOUT_split_3x5_3( /* Base */
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
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,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
),
- [NUMBER] = LAYOUT( /* Base */
+ [NUMBER] = LAYOUT_split_3x5_3( /* Base */
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_P7, KC_P8, KC_P9, KC_NO, KC_NO,
KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_P4, KC_P5, KC_P6, KC_NO, KC_NO,
KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_P1, KC_P2, KC_P3, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_P0, KC_PDOT, KC_NO
),
- [SETTING] = LAYOUT( /* Base */
+ [SETTING] = LAYOUT_split_3x5_3( /* Base */
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
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 bf5468234d..98618ba712 100644
--- a/keyboards/suihankey/split/rev1/rev1.h
+++ b/keyboards/suihankey/split/rev1/rev1.h
@@ -25,7 +25,7 @@
* The second converts the arguments into a two-dimensional array which
* represents the switch matrix.
*/
-#define LAYOUT( \
+#define LAYOUT_split_3x5_3( \
L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \
L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \
L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \
@@ -43,3 +43,5 @@
{ R03, R13, R23, KC_NO }, \
{ R04, R14, R24, KC_NO }, \
}
+
+#define LAYOUT LAYOUT_split_3x5_3
diff --git a/keyboards/suihankey/split/rev1/rules.mk b/keyboards/suihankey/split/rev1/rules.mk
index 1e3cebb145..d3661099d0 100644
--- a/keyboards/suihankey/split/rev1/rules.mk
+++ b/keyboards/suihankey/split/rev1/rules.mk
@@ -1 +1,2 @@
RGBLIGHT_ENABLE = yes
+LAYOUTS = split_3x5_3