diff options
| author | Danilo de Klerk <danilodeklerk@gmail.com> | 2020-08-06 19:36:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-06 10:36:26 -0700 |
| commit | c8b721d7c6cf683473bcf3d0af6ec561471b1dcc (patch) | |
| tree | 380de15fcd2c9ce1047fc3f2cefbeb8684f2a4c4 /keyboards/crkbd/rev1 | |
| parent | 60d8d8677aa596120e4f3f0926b93b4d5cc0201a (diff) | |
| download | qmk_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/crkbd/rev1')
| -rw-r--r-- | keyboards/crkbd/rev1/rev1.h | 21 | ||||
| -rw-r--r-- | keyboards/crkbd/rev1/rules.mk | 2 |
2 files changed, 20 insertions, 3 deletions
diff --git a/keyboards/crkbd/rev1/rev1.h b/keyboards/crkbd/rev1/rev1.h index 6580d73fe..2244b87f1 100644 --- a/keyboards/crkbd/rev1/rev1.h +++ b/keyboards/crkbd/rev1/rev1.h | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | #endif | 22 | #endif |
| 23 | 23 | ||
| 24 | // clang-format off | 24 | // clang-format off |
| 25 | #define LAYOUT( \ | 25 | #define LAYOUT_split_3x6_3( \ |
| 26 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | 26 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ |
| 27 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | 27 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ |
| 28 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ | 28 | L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ |
| @@ -39,6 +39,23 @@ | |||
| 39 | { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ | 39 | { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | #define LAYOUT_split_3x5_3( \ | ||
| 43 | L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ | ||
| 44 | L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ | ||
| 45 | L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ | ||
| 46 | L30, L31, L32, R30, R31, R32 \ | ||
| 47 | ) \ | ||
| 48 | { \ | ||
| 49 | { KC_NO, L00, L01, L02, L03, L04 }, \ | ||
| 50 | { KC_NO, L10, L11, L12, L13, L14 }, \ | ||
| 51 | { KC_NO, L20, L21, L22, L23, L24 }, \ | ||
| 52 | { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \ | ||
| 53 | { KC_NO, R04, R03, R02, R01, R00 }, \ | ||
| 54 | { KC_NO, R14, R13, R12, R11, R10 }, \ | ||
| 55 | { KC_NO, R24, R23, R22, R21, R20 }, \ | ||
| 56 | { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ | ||
| 57 | } | ||
| 58 | |||
| 42 | #define LAYOUT_kc( \ | 59 | #define LAYOUT_kc( \ |
| 43 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ | 60 | L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ |
| 44 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ | 61 | L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ |
| @@ -53,4 +70,4 @@ | |||
| 53 | ) | 70 | ) |
| 54 | // clang-format on | 71 | // clang-format on |
| 55 | 72 | ||
| 56 | #define LAYOUT_split_3x6_3 LAYOUT | 73 | #define LAYOUT LAYOUT_split_3x6_3 |
diff --git a/keyboards/crkbd/rev1/rules.mk b/keyboards/crkbd/rev1/rules.mk index a921e6030..21cee6bcf 100644 --- a/keyboards/crkbd/rev1/rules.mk +++ b/keyboards/crkbd/rev1/rules.mk | |||
| @@ -2,4 +2,4 @@ SRC += matrix.c \ | |||
| 2 | split_util.c \ | 2 | split_util.c \ |
| 3 | split_scomm.c | 3 | split_scomm.c |
| 4 | 4 | ||
| 5 | LAYOUTS = split_3x6_3 | 5 | LAYOUTS = split_3x5_3 split_3x6_3 |
